update PageServiceSftpSettings

client/ui/qml/Pages2/PageServiceSftpSettings.qml

@@ -24,64 +24,35 @@ PageType {
         }
     }
 
-    ColumnLayout {
-        id: backButtonLayout
-
-        anchors.top: parent.top
-        anchors.left: parent.left
-        anchors.right: parent.right
-
-        anchors.topMargin: 20
-
     BackButtonType {
         id: backButton
-        }
-    }
-
-    FlickableType {
-        id: fl
-        anchors.top: backButtonLayout.bottom
-        anchors.bottom: parent.bottom
-        contentHeight: content.implicitHeight
-
-        Column {
-            id: content
 
         anchors.top: parent.top
         anchors.left: parent.left
         anchors.right: parent.right
+        anchors.topMargin: 20
+
+        onFocusChanged: {
+            if (this.activeFocus) {
+                listView.positionViewAtBeginning()
+            }
+        }
+    }
+
+    ListViewType {
+        id: listView
+
+        anchors.top: backButton.bottom
+        anchors.bottom: parent.bottom
+        anchors.right: parent.right
+        anchors.left: parent.left
 
         enabled: ServersModel.isProcessedServerHasWriteAccess()
 
-            ListView {
-                id: listview
-
-                width: parent.width
-                height: listview.contentItem.height
-
-                clip: true
-                interactive: false
-
         model: SftpConfigModel
 
-                onFocusChanged: {
+        delegate: ColumnLayout {
-                    if (focus) {
+            width: listView.width
-                        listview.currentItem.listViewFocusItem.forceActiveFocus()
-                    }
-                }
-
-                delegate: Item {
-                    implicitWidth: listview.width
-                    implicitHeight: col.implicitHeight
-
-                    property alias listViewFocusItem: hostLabel.rightButton
-
-                    ColumnLayout {
-                        id: col
-
-                        anchors.top: parent.top
-                        anchors.left: parent.left
-                        anchors.right: parent.right
 
             spacing: 0
 
@@ -95,10 +66,11 @@ PageType {
 
             LabelWithButtonType {
                 id: hostLabel
+
                 Layout.fillWidth: true
                 Layout.topMargin: 32
-
+                Layout.leftMargin: 16
-                            parentFlickable: fl
+                Layout.rightMargin: 16
 
                 text: qsTr("Host")
                 descriptionText: ServersModel.getProcessedServerData("hostName")
@@ -111,69 +83,63 @@ PageType {
                 clickedFunction: function() {
                     GC.copyToClipBoard(descriptionText)
                     PageController.showNotificationMessage(qsTr("Copied"))
-                                if (!GC.isMobile()) {
-                                    this.rightButton.forceActiveFocus()
-                                }
                 }
             }
 
             LabelWithButtonType {
                 id: portLabel
+
                 Layout.fillWidth: true
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
 
                 text: qsTr("Port")
                 descriptionText: port
 
                 descriptionOnTop: true
 
-                            parentFlickable: fl
-
                 rightImageSource: "qrc:/images/controls/copy.svg"
                 rightImageColor: AmneziaStyle.color.paleGray
 
                 clickedFunction: function() {
                     GC.copyToClipBoard(descriptionText)
                     PageController.showNotificationMessage(qsTr("Copied"))
-                                if (!GC.isMobile()) {
-                                    this.rightButton.forceActiveFocus()
-                                }
                 }
             }
 
             LabelWithButtonType {
                 id: usernameLabel
+
                 Layout.fillWidth: true
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
 
                 text: qsTr("User name")
                 descriptionText: username
 
                 descriptionOnTop: true
 
-                            parentFlickable: fl
-
                 rightImageSource: "qrc:/images/controls/copy.svg"
                 rightImageColor: AmneziaStyle.color.paleGray
 
                 clickedFunction: function() {
                     GC.copyToClipBoard(descriptionText)
                     PageController.showNotificationMessage(qsTr("Copied"))
-                                if (!GC.isMobile()) {
-                                    this.rightButton.forceActiveFocus()
-                                }
                 }
             }
 
             LabelWithButtonType {
                 id: passwordLabel
+
                 Layout.fillWidth: true
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
 
                 text: qsTr("Password")
                 descriptionText: password
 
                 descriptionOnTop: true
 
-                            parentFlickable: fl
-
                 rightImageSource: "qrc:/images/controls/copy.svg"
                 rightImageColor: AmneziaStyle.color.paleGray
 
@@ -182,14 +148,12 @@ PageType {
                 clickedFunction: function() {
                     GC.copyToClipBoard(descriptionText)
                     PageController.showNotificationMessage(qsTr("Copied"))
-                                if (!GC.isMobile()) {
-                                    this.rightButton.forceActiveFocus()
-                                }
                 }
             }
 
             BasicButtonType {
                 id: mountButton
+
                 visible: !GC.isMobile()
 
                 Layout.fillWidth: true
@@ -205,8 +169,6 @@ PageType {
                 textColor: AmneziaStyle.color.paleGray
                 borderWidth: 1
 
-                            parentFlickable: fl
-
                 text: qsTr("Mount folder on device")
 
                 clickedFunc: function() {
@@ -246,7 +208,6 @@ PageType {
                     return str
                 }
 
-
                 MouseArea {
                     anchors.fill: parent
                     acceptedButtons: Qt.NoButton
@@ -256,6 +217,7 @@ PageType {
 
             BasicButtonType {
                 id: detailedInstructionsButton
+
                 Layout.topMargin: 16
                 Layout.bottomMargin: 16
                 Layout.leftMargin: 8
@@ -269,13 +231,8 @@ PageType {
 
                 text: qsTr("Detailed instructions")
 
-                            parentFlickable: fl
-
                 clickedFunc: function() {
-//                                Qt.openUrlExternally("https://github.com/amnezia-vpn/desktop-client/releases/latest")
+                    // Qt.openUrlExternally("https://github.com/amnezia-vpn/desktop-client/releases/latest")
-                            }
-                        }
-                    }
                 }
             }
         }