diff --git a/native/AddData.qml b/native/AddData.qml index 23de68f..ffe9b2c 100644 --- a/native/AddData.qml +++ b/native/AddData.qml @@ -22,10 +22,6 @@ Window { property string authToken: "" - ListModel { - id: groupsModel - } - TextField { id: nameT anchors { @@ -67,18 +63,6 @@ Window { text = text.replace(/[^0-9]/g, "") } - Keys.onReturnPressed: groupSelector.focus = true - } - - ComboBox { - id: groupSelector - anchors { - horizontalCenter: parent.horizontalCenter - topMargin: 5 - top: amountT.bottom - } - model: groupsModel - textRole: "name" Keys.onReturnPressed: submitB.focus = true } @@ -87,7 +71,7 @@ Window { anchors { horizontalCenter: parent.horizontalCenter topMargin: 5 - top: groupSelector.bottom + top: amountT.bottom } text: qsTr("Submit") @@ -112,31 +96,9 @@ Window { name: nameT.text, key: keyT.text, amount: parseInt(amountT.text), - group_id: groupSelector.currentIndex !== -1 ? groupsModel.get(groupSelector.currentIndex).id : "", + group_id: "ff664d29-68c9-45c2-a6bc-8f378876c90d", }); xhr.send(data); } - - function fetchGroups() { - var xhr = new XMLHttpRequest(); - xhr.open("GET", "https://api.clan-war.net/api/v1/licenses"); - xhr.setRequestHeader("Authorization", "Bearer " + authToken); - xhr.onreadystatechange = function() { - if (xhr.readyState === XMLHttpRequest.DONE) { - if (xhr.status === 200) { - var response = JSON.parse(xhr.responseText); - groupsModel.clear(); - for (var i = 0; i < response.length; i++) { - groupsModel.append(response[i]); - } - } else { - console.log("Failed to fetch groups: " + xhr.status); - } - } - } - xhr.send(); - } - - Component.onCompleted: fetchGroups() } diff --git a/native/MainPage.qml b/native/MainPage.qml index 1a159bd..23687a3 100644 --- a/native/MainPage.qml +++ b/native/MainPage.qml @@ -104,35 +104,30 @@ Rectangle { } } - ScrollView { + ListView { + id: listView Layout.fillWidth: true Layout.fillHeight: true + clip: true + boundsBehavior: Flickable.StopAtBounds + model: filteredApiDataModel // Use the filtered model - ListView { - id: listView - Layout.fillWidth: true - Layout.fillHeight: true - clip: true - boundsBehavior: Flickable.StopAtBounds - model: filteredApiDataModel // Use the filtered model + delegate: Rectangle { + width: listView.width + height: 50 + color: getColors().button - delegate: Rectangle { - width: listView.width - height: 50 - color: getColors().button + RowLayout { + anchors.fill: parent + spacing: 10 + anchors.margins: 5 - RowLayout { - anchors.fill: parent - spacing: 10 - anchors.margins: 5 - - Text { text: model.name; color: getColors().text; Layout.fillWidth: true } - Text { text: model.key; color: getColors().text; Layout.fillWidth: true } - Text { text: model.amount; color: getColors().text; Layout.fillWidth: true } - Text { text: model.start; color: getColors().text; Layout.fillWidth: true } - Text { text: model.end; color: getColors().text; Layout.fillWidth: true } - Text { text: model.group; color: getColors().text; Layout.fillWidth: true } - } + Text { text: model.name; color: getColors().text; Layout.fillWidth: true } + Text { text: model.key; color: getColors().text; Layout.fillWidth: true } + Text { text: model.amount; color: getColors().text; Layout.fillWidth: true } + Text { text: model.start; color: getColors().text; Layout.fillWidth: true } + Text { text: model.end; color: getColors().text; Layout.fillWidth: true } + Text { text: model.group; color: getColors().text; Layout.fillWidth: true } } } }