refactoring: improved stability of focus controller (#1464)

* change position view mode

* remove `parentFlickable` from `PageShare`

* replace `FlickableType` with `ListViewType` in `PageSettings`

* reorganize `PageSettingsAbout` for improved structure

* replace `Flickable` with `ListViewType` in drawer in `PageSettingsApiNativeConfigs`

* replace `FlickableType` with `ListViewType` in `PageSettingsApplication` and update layout structure

* replace `FlickableType` with `ListViewType` in `PageSettingsAppSplitTunneling` and adjust layout for better structure

* replace `FlickableType` with `ListViewType` in `PageSettingsBackup`

* replace `FlickableType` with `ListViewType` in `PageSettingsConnection`

* replace `FlickableType` with `ListViewType` in `PageSettingsDns`

* replace `FlickableType` with `ListViewType` in `PageSettingsLogging`

* replace `FlickableType` with `ListViewType` in `PageSettingsServerData`

* update structure of `PageSettingsServerProtocol`

* update `PageSettingsServersList`

* replace `ListView` with `ListViewType` in `PageSettingsSplitTunneling`

* replace `FlickableType` with `ListViewType` in `PageServiceDnsSettings`

* update `PageServiceSftpSettings`

* update `PageServiceSocksProxySettings`

* replace `FlickableType` with `ListViewType` in `PageServiceTorWebsiteSettings`

* replace `FlickableType` with `ListViewType` in `PageSetupWizardApiServiceInfo`

* update `PageSetupWizardApiServicesList`

* replace `ListView` with `ListViewType` in `PageSetupWizardConfigSource`

* replace `ListView` with `ListViewType` in `PageSetupWizardCredentials`

* replace `FlickableType` with `ListViewType` in `PageSetupWizardEasy`

* replace `FlickableType` with `ListViewType` in `PageSetupWizardInstalling`

* replace `ListView` with `ListViewType` in `PageSetupWizardProtocols`

* replace `FlickableType` with `ListViewType` in `PageSetupWizardProtocolSettings`

* replace `FlickableType` with `ListViewType` in `PageSetupWizardTextKey`

* replace `FlickableType` with `ListViewType` in `PageSetupWizardViewConfig`

* update `PageProtocolAwgClientSettings`

* update `PageProtocolAwgSettings`

* replace `FlickableType` with `ListViewType` in `PageProtocolCloakSettings`

* replace `FlickableType` with `ListViewType` in `PageProtocolRaw`

* replace `FlickableType` with `ListViewType` in `PageProtocolShadowSocksSettings`

* replace `FlickableType` with `ListViewType` in `PageProtocolWireGuardClientSettings`

* replace `FlickableType` with `ListViewType` in `PageProtocolWireGuardSettings`

* replace `FlickableType` with `ListViewType` in `PageProtocolXraySettings`

* replace `FlickableType` with `ListViewType` in `PageShareFullAccess`

* replace `FlickableType` with `ListViewType` in `PageDeinstalling`

* update `PageDevMenu`

* remove `Flickable` references in `LabelWithButtonType`

* remove useless key navigation handlers from `ListViewType`

* replace `ListView` with `ListViewType` in `ListViewWithRadioButtonType.qml` and remove unnecessary properties

* remove references to `Flickable` in `TextAreaType.qml`

* remove references to `Flickable` in `TextAreaWithFooterType`

* remove references to `FlickableType` in `TextFieldWithHeaderType`

* remove references to `FlickableType` in `SwitcherType`

* remove references to `FlickableType` in `CheckBoxType`

* remove references to `FlickableType` in `CardWithIconsType.qml`

* remove references to `FlickableType` in `BasicButtonType.qml`

* update `ServersListView`

* update `SettingsContainersListView`

* update `InstalledAppsDrawer`

* update `SelectLanguageDrawer`

* update `HomeContainersListView`

* update `HomeSplitTunnelingDrawer`

* fix `PageSetupWizardApiServicesList`

---------

Co-authored-by: vladimir.kuznetsov <nethiuswork@gmail.com>

client/ui/controllers/listViewFocusController.cpp

@@ -37,7 +37,7 @@ void ListViewFocusController::viewAtCurrentIndex() const
     }
     case Section::Delegate: {
         QMetaObject::invokeMethod(m_listView, "positionViewAtIndex", Q_ARG(int, m_delegateIndex), // Index
-                                  Q_ARG(int, 2)); // PositionMode (0 = Visible)
+                                  Q_ARG(int, 6)); // PositionMode (0 = Beginning; 1 = Center; 2 = End; 3 = Visible; 4 = Contain; 5 = SnapPosition)
         break;
     }
     case Section::Footer: {

client/ui/qml/Components/HomeContainersListView.qml

@@ -10,8 +10,7 @@ import ProtocolEnum 1.0
 import "../Controls2"
 import "../Controls2/TextTypes"
 
-
+ListViewType {
-ListView {
     id: menuContent
 
     property var rootWidth
@@ -21,13 +20,6 @@ ListView {
     anchors.top: parent.top
     anchors.bottom: parent.bottom
 
-    clip: true
-    snapMode: ListView.SnapToItem
-
-    ScrollBar.vertical: ScrollBarType {}
-
-    property bool isFocusable: true
-
     ButtonGroup {
         id: containersRadioButtonGroup
     }

client/ui/qml/Components/InstalledAppsDrawer.qml

@@ -57,7 +57,7 @@ DrawerType2 {
                 headerText: qsTr("Choose application")
             }
 
-            ListView {
+            ListViewType {
                 id: listView
 
                 Layout.fillWidth: true
@@ -66,11 +66,6 @@ DrawerType2 {
                 Layout.rightMargin: 16
                 Layout.leftMargin: 16
 
-                clip: true
-                interactive: true
-
-                property bool isFocusable: true
-
                 model: SortFilterProxyModel {
                     id: proxyInstalledAppsModel
                     sourceModel: installedAppsModel
@@ -81,20 +76,12 @@ DrawerType2 {
                     }
                 }
 
-                ScrollBar.vertical: ScrollBarType {}
-
                 ButtonGroup {
                     id: buttonGroup
                 }
 
-                delegate: Item {
+                delegate: ColumnLayout {
-                    implicitWidth: root.width
+                    width: listView.width
-                    implicitHeight: delegateContent.implicitHeight
-
-                    ColumnLayout {
-                        id: delegateContent
-
-                        anchors.fill: parent
 
                     RowLayout {
                         CheckBoxType {
@@ -121,7 +108,6 @@ DrawerType2 {
                 }
             }
         }
-        }
 
         TextFieldWithHeaderType {
             id: searchField

client/ui/qml/Components/SelectLanguageDrawer.qml

@@ -49,7 +49,7 @@ DrawerType2 {
             }
         }
 
-        ListView {
+        ListViewType {
             id: listView
 
             anchors.top: backButtonLayout.bottom
@@ -57,14 +57,8 @@ DrawerType2 {
             anchors.right: parent.right
             anchors.bottom: parent.bottom
 
-            property bool isFocusable: true
             property int selectedIndex: LanguageModel.currentLanguageIndex
 
-            clip: true
-            reuseItems: true
-
-            ScrollBar.vertical: ScrollBarType {}
-
             model: LanguageModel
 
             ButtonGroup {

client/ui/qml/Components/ServersListView.qml

@@ -15,7 +15,7 @@ import "../Controls2"
 import "../Controls2/TextTypes"
 import "../Config"
 
-ListView {
+ListViewType {
     id: root
 
     property int selectedIndex: ServersModel.defaultIndex
@@ -28,10 +28,6 @@ ListView {
 
     model: ServersModel
 
-    ScrollBar.vertical: ScrollBarType {}
-
-    property bool isFocusable: true
-
     Connections {
         target: ServersModel
         function onDefaultServerIndexChanged(serverIndex) {
@@ -39,9 +35,6 @@ ListView {
         }
     }
 
-    clip: true
-    reuseItems: true
-
     delegate: Item {
         id: menuContentDelegate
         objectName: "menuContentDelegate"

client/ui/qml/Components/SettingsContainersListView.qml

@@ -16,26 +16,13 @@ import "../Controls2/TextTypes"
 ListViewType {
     id: root
 
-    width: parent.width
-    height: root.contentItem.height
-
-    clip: true
-    reuseItems: true
-
-    property bool isFocusable: false
-
-    delegate: Item {
-        implicitWidth: root.width
-        implicitHeight: delegateContent.implicitHeight
-
-        ColumnLayout {
-            id: delegateContent
-
     anchors.fill: parent
 
+    delegate: ColumnLayout {
+        width: root.width
+
         LabelWithButtonType {
-                id: containerRadioButton
+            Layout.fillWidth: true
-                implicitWidth: parent.width
 
             text: name
             descriptionText: description
@@ -86,5 +73,4 @@ ListViewType {
 
         DividerType {}
     }
-    }
 }

client/ui/qml/Controls2/BasicButtonType.qml

@@ -29,8 +29,6 @@ Button {
 
     property bool squareLeftSide: false
 
-    property FlickableType parentFlickable
-
     property var clickedFunc
 
     property alias buttonTextLabel: buttonText
@@ -65,14 +63,6 @@ Button {
 
     hoverEnabled: true
 
-    onFocusChanged: {
-        if (root.activeFocus) {
-            if (root.parentFlickable) {
-                root.parentFlickable.ensureVisible(this)
-            }
-        }
-    }
-
     background: Rectangle {
         id: focusBorder
 

client/ui/qml/Controls2/CardWithIconsType.qml

@@ -27,8 +27,6 @@ Button {
 
     property alias focusItem: rightImage
 
-    property FlickableType parentFlickable
-
     hoverEnabled: true
 
     background: Rectangle {
@@ -44,22 +42,6 @@ Button {
         }
     }
 
-    function ensureVisible(item) {
-        if (item.activeFocus) {
-            if (root.parentFlickable) {
-                root.parentFlickable.ensureVisible(root)
-            }
-        }
-    }
-
-    onFocusChanged: {
-        ensureVisible(root)
-    }
-
-    focusItem.onFocusChanged: {
-        root.ensureVisible(focusItem)
-    }
-
     contentItem: Item {
         anchors.left: parent.left
         anchors.right: parent.right

client/ui/qml/Controls2/CheckBoxType.qml

@@ -34,13 +34,30 @@ CheckBox {
 
     property string imageSource: "qrc:/images/controls/check.svg"
 
-    property var parentFlickable
+    property bool isFocusable: true
-    onFocusChanged: {
+
-        if (root.activeFocus) {
+    Keys.onTabPressed: {
-            if (root.parentFlickable) {
+        FocusController.nextKeyTabItem()
-                root.parentFlickable.ensureVisible(root)
     }
+
+    Keys.onBacktabPressed: {
+        FocusController.previousKeyTabItem()
     }
+
+    Keys.onUpPressed: {
+        FocusController.nextKeyUpItem()
+    }
+    
+    Keys.onDownPressed: {
+        FocusController.nextKeyDownItem()
+    }
+    
+    Keys.onLeftPressed: {
+        FocusController.nextKeyLeftItem()
+    }
+
+    Keys.onRightPressed: {
+        FocusController.nextKeyRightItem()
     }
 
     hoverEnabled: enabled ? true : false

client/ui/qml/Controls2/LabelWithButtonType.qml

@@ -9,6 +9,7 @@ import "TextTypes"
 Item {
     id: root
 
+    // property alias focusObjectName: eyeImage.objectName
     property string text
     property int textMaximumLineCount: 2
     property int textElide: Qt.ElideRight
@@ -25,7 +26,6 @@ Item {
 
     property alias rightButton: rightImage
     property alias eyeButton: eyeImage
-    property FlickableType parentFlickable
 
     property string textColor: AmneziaStyle.color.paleGray
     property string textDisabledColor: AmneziaStyle.color.mutedGray
@@ -70,25 +70,6 @@ Item {
     implicitWidth: content.implicitWidth + content.anchors.topMargin + content.anchors.bottomMargin
     implicitHeight: content.implicitHeight + content.anchors.leftMargin + content.anchors.rightMargin
 
-    onFocusChanged: {
-        if (root.activeFocus) {
-            if (root.parentFlickable) {
-                root.parentFlickable.ensureVisible(root)
-            }
-        }
-    }
-
-    Connections {
-        target: rightImage
-        function onFocusChanged() {
-            if (rightImage.activeFocus) {
-                if (root.parentFlickable) {
-                    root.parentFlickable.ensureVisible(root)
-                }
-            }
-        }
-    }
-
     MouseArea {
         anchors.fill: parent
         cursorShape: Qt.PointingHandCursor

client/ui/qml/Controls2/ListViewType.qml

@@ -6,33 +6,16 @@ ListView {
 
     property bool isFocusable: true
 
-    Keys.onTabPressed: {
-        FocusController.nextKeyTabItem()
-    }
-
-    Keys.onBacktabPressed: {
-        FocusController.previousKeyTabItem()
-    }
-
-    Keys.onUpPressed: {
-        FocusController.nextKeyUpItem()
-    }
-
-    Keys.onDownPressed: {
-        FocusController.nextKeyDownItem()
-    }
-
-    Keys.onLeftPressed: {
-        FocusController.nextKeyLeftItem()
-    }
-
-    Keys.onRightPressed: {
-        FocusController.nextKeyRightItem()
-    }
-
     ScrollBar.vertical: ScrollBarType {}
 
     clip: true
     reuseItems: true
-    snapMode: ListView.SnapToItem
+
+    function findChildWithObjectName(items, name) {
+        for (var i = 0; i < items.length; ++i) {
+            if (items[i].objectName === name)
+                return items[i];
+        }
+        return null;
+    }
 }

client/ui/qml/Controls2/ListViewWithRadioButtonType.qml

@@ -6,7 +6,7 @@ import Style 1.0
 
 import "TextTypes"
 
-ListView {
+ListViewType {
     id: root
 
     property var rootWidth
@@ -25,13 +25,6 @@ ListView {
     width: rootWidth
     height: root.contentItem.height
 
-    clip: true
-    reuseItems: true
-
-    property bool isFocusable: true
-
-    ScrollBar.vertical: ScrollBarType {}
-
     ButtonGroup {
         id: buttonGroup
     }

client/ui/qml/Controls2/SwitcherType.qml

@@ -64,16 +64,6 @@ Switch {
     hoverEnabled: enabled ? true : false
     focusPolicy: Qt.TabFocus
 
-    property FlickableType parentFlickable: null
-
-    onFocusChanged: {
-        if (root.activeFocus) {
-            if (root.parentFlickable) {
-                root.parentFlickable.ensureVisible(root)
-            }
-        }
-    }
-
     indicator: Rectangle {
         id: switcher
 

client/ui/qml/Controls2/TextAreaType.qml

@@ -21,15 +21,6 @@ Rectangle {
     border.color: getBorderColor(borderNormalColor)
     radius: 16
 
-    property FlickableType parentFlickable: null
-    onFocusChanged: {
-        if (root.activeFocus) {
-            if (root.parentFlickable) {
-                root.parentFlickable.ensureVisible(root)
-            }
-        }
-    }
-
     MouseArea {
         id: parentMouse
         anchors.fill: parent
@@ -54,6 +45,32 @@ Rectangle {
                 anchors.topMargin: 16
                 anchors.bottomMargin: 16
 
+                property bool isFocusable: true
+
+                Keys.onTabPressed: {
+                    FocusController.nextKeyTabItem()
+                }
+
+                Keys.onBacktabPressed: {
+                    FocusController.previousKeyTabItem()
+                }
+
+                Keys.onUpPressed: {
+                    FocusController.nextKeyUpItem()
+                }
+                
+                Keys.onDownPressed: {
+                    FocusController.nextKeyDownItem()
+                }
+                
+                Keys.onLeftPressed: {
+                    FocusController.nextKeyLeftItem()
+                }
+
+                Keys.onRightPressed: {
+                    FocusController.nextKeyRightItem()
+                }
+
                 color: AmneziaStyle.color.paleGray
                 selectionColor:  AmneziaStyle.color.richBrown
                 selectedTextColor: AmneziaStyle.color.paleGray

client/ui/qml/Controls2/TextAreaWithFooterType.qml

@@ -31,15 +31,6 @@ Rectangle {
     border.color: getBorderColor(borderNormalColor)
     radius: 16
 
-    property FlickableType parentFlickable: null
-    onFocusChanged: {
-        if (root.activeFocus) {
-            if (root.parentFlickable) {
-                root.parentFlickable.ensureVisible(root)
-            }
-        }
-    }
-
     MouseArea {
         id: parentMouse
         anchors.fill: parent

client/ui/qml/Controls2/TextFieldWithHeaderType.qml

@@ -37,19 +37,6 @@ Item {
     implicitWidth: content.implicitWidth
     implicitHeight: content.implicitHeight
 
-    property FlickableType parentFlickable
-
-    Connections {
-        target: textField
-        function onFocusChanged() {
-            if (textField.activeFocus) {
-                if (root.parentFlickable) {
-                    root.parentFlickable.ensureVisible(root)
-                }
-            }
-        }
-    }
-
     ColumnLayout {
         id: content
         anchors.fill: parent

client/ui/qml/Pages2/PageDeinstalling.qml

@@ -20,7 +20,9 @@ PageType {
 
     SortFilterProxyModel {
         id: proxyServersModel
+
         sourceModel: ServersModel
+
         filters: [
             ValueFilter {
                 roleName: "isCurrentlyProcessed"
@@ -29,36 +31,23 @@ PageType {
         ]
     }
 
-    FlickableType {
+    ListViewType {
-        id: fl
+        id: listView
+
         anchors.fill: parent
-        contentHeight: content.height
-
-        Column {
-            id: content
-
-            anchors.top: parent.top
-            anchors.left: parent.left
-            anchors.right: parent.right
 
         spacing: 16
 
-            Repeater {
         model: proxyServersModel
-                delegate: Item {
-                    implicitWidth: parent.width
-                    implicitHeight: delegateContent.implicitHeight
 
-                    ColumnLayout {
+        delegate: ColumnLayout {
-                        id: delegateContent
+            width: listView.width
-
-                        anchors.fill: parent
-                        anchors.rightMargin: 16
-                        anchors.leftMargin: 16
 
             BaseHeaderType {
                 Layout.fillWidth: true
                 Layout.topMargin: 20
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
 
                 headerText: qsTr("Removing services from %1").arg(name)
             }
@@ -68,6 +57,8 @@ PageType {
 
                 Layout.fillWidth: true
                 Layout.topMargin: 32
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
 
                 Timer {
                     id: timer
@@ -84,12 +75,11 @@ PageType {
             ParagraphTextType {
                 Layout.fillWidth: true
                 Layout.topMargin: 8
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
 
                 text: qsTr("Usually it takes no more than 5 minutes")
             }
         }
     }
-            }
-        }
-    }
 }

client/ui/qml/Pages2/PageDevMenu.qml

@@ -25,23 +25,17 @@ PageType {
         anchors.topMargin: 20
     }
 
-    ListView {
+    ListViewType {
         id: listView
         anchors.top: backButton.bottom
         anchors.bottom: parent.bottom
         anchors.right: parent.right
         anchors.left: parent.left
 
-        property bool isFocusable: true
-
-        ScrollBar.vertical: ScrollBarType {}
-
         header: ColumnLayout {
             width: listView.width
 
             BaseHeaderType {
-                id: header
-
                 Layout.fillWidth: true
                 Layout.rightMargin: 16
                 Layout.leftMargin: 16
@@ -50,16 +44,14 @@ PageType {
             }
         }
         
-        model: 1
+        model: 1 // fake model to force the ListView to be created without a model
-        clip: true
+
         spacing: 16
 
         delegate: ColumnLayout {
             width: listView.width
 
             TextFieldWithHeaderType {
-                id: passwordTextField
-
                 Layout.fillWidth: true
                 Layout.topMargin: 16
                 Layout.rightMargin: 16
@@ -87,8 +79,6 @@ PageType {
             width: listView.width
 
             SwitcherType {
-                id: switcher
-
                 Layout.fillWidth: true
                 Layout.topMargin: 24
                 Layout.rightMargin: 16

client/ui/qml/Pages2/PageProtocolAwgClientSettings.qml

@@ -16,91 +16,60 @@ import "../Components"
 PageType {
     id: root
 
-    ColumnLayout {
+    BackButtonType {
-        id: backButtonLayout
+        id: backButton
 
         anchors.top: parent.top
         anchors.left: parent.left
         anchors.right: parent.right
-
         anchors.topMargin: 20
 
-        BackButtonType {
+        onActiveFocusChanged: {
-            id: backButton
+            if(backButton.enabled && backButton.activeFocus) {
+                listView.positionViewAtBeginning()
+            }
         }
     }
 
-    ListView {
+    ListViewType {
-        id: listview
+        id: listView
 
         anchors.top: backButtonLayout.bottom
         anchors.bottom: saveButton.top
+        anchors.right: parent.right
+        anchors.left: parent.left
 
-        width: parent.width
+        header: ColumnLayout {
+            width: listView.width
             
-        clip: true
+            BaseHeaderType {
+                Layout.fillWidth: true
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
 
-        property bool isFocusable: true
+                headerText: qsTr("AmneziaWG settings")
-
-        Keys.onTabPressed: {
-            FocusController.nextKeyTabItem()
             }
-
-        Keys.onBacktabPressed: {
-            FocusController.previousKeyTabItem()
-        }
-
-        Keys.onUpPressed: {
-            FocusController.nextKeyUpItem()
-        }
-
-        Keys.onDownPressed: {
-            FocusController.nextKeyDownItem()
-        }
-
-        Keys.onLeftPressed: {
-            FocusController.nextKeyLeftItem()
-        }
-
-        Keys.onRightPressed: {
-            FocusController.nextKeyRightItem()
         }
 
         model: AwgConfigModel
 
-        delegate: Item {
+        delegate: ColumnLayout {
-            id: delegateItem
+            width: listView.width
-            implicitWidth: listview.width
-            implicitHeight: col.implicitHeight
 
-            property alias mtuTextField: mtuTextField
             property bool isSaveButtonEnabled: mtuTextField.errorText === "" &&
                                                junkPacketMaxSizeTextField.errorText === "" &&
                                                junkPacketMinSizeTextField.errorText === "" &&
                                                junkPacketCountTextField.errorText === ""
 
-            ColumnLayout {
-                id: col
-
-                anchors.top: parent.top
-                anchors.left: parent.left
-                anchors.right: parent.right
-
-                anchors.leftMargin: 16
-                anchors.rightMargin: 16
-
             spacing: 0
 
-                BaseHeaderType {
-                    Layout.fillWidth: true
-
-                    headerText: qsTr("AmneziaWG settings")
-                }
-
             TextFieldWithHeaderType {
                 id: mtuTextField
+
                 Layout.fillWidth: true
                 Layout.topMargin: 40
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
 
                 headerText: qsTr("MTU")
                 textField.text: clientMtu
@@ -112,11 +81,14 @@ PageType {
                     }
                 }
                 checkEmptyText: true
-                    KeyNavigation.tab: junkPacketCountTextField.textField
             }
 
             AwgTextField {
                 id: junkPacketCountTextField
+
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
+
                 headerText: "Jc - Junk packet count"
                 textField.text: clientJunkPacketCount
 
@@ -125,12 +97,14 @@ PageType {
                         clientJunkPacketCount = textField.text
                     }
                 }
-
-                    KeyNavigation.tab: junkPacketMinSizeTextField.textField
             }
 
             AwgTextField {
                 id: junkPacketMinSizeTextField
+
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
+
                 headerText: "Jmin - Junk packet minimum size"
                 textField.text: clientJunkPacketMinSize
 
@@ -139,12 +113,14 @@ PageType {
                         clientJunkPacketMinSize = textField.text
                     }
                 }
-
-                    KeyNavigation.tab: junkPacketMaxSizeTextField.textField
             }
 
             AwgTextField {
                 id: junkPacketMaxSizeTextField
+
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
+
                 headerText: "Jmax - Junk packet maximum size"
                 textField.text: clientJunkPacketMaxSize
 
@@ -157,6 +133,10 @@ PageType {
 
             AwgTextField {
                 id: specialJunk1TextField
+
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
+
                 headerText: qsTr("I1 - First special junk packet")
                 textField.text: clientSpecialJunk1
                 textField.validator: null
@@ -171,6 +151,10 @@ PageType {
 
             AwgTextField {
                 id: specialJunk2TextField
+
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
+
                 headerText: qsTr("I2 - Second special junk packet")
                 textField.text: clientSpecialJunk2
                 textField.validator: null
@@ -185,6 +169,10 @@ PageType {
 
             AwgTextField {
                 id: specialJunk3TextField
+
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
+
                 headerText: qsTr("I3 - Third special junk packet")
                 textField.text: clientSpecialJunk3
                 textField.validator: null
@@ -199,6 +187,10 @@ PageType {
 
             AwgTextField {
                 id: specialJunk4TextField
+                
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
+
                 headerText: qsTr("I4 - Fourth special junk packet")
                 textField.text: clientSpecialJunk4
                 textField.validator: null
@@ -213,6 +205,10 @@ PageType {
 
             AwgTextField {
                 id: specialJunk5TextField
+
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
+
                 headerText: qsTr("I5 - Fifth special junk packet")
                 textField.text: clientSpecialJunk5
                 textField.validator: null
@@ -227,6 +223,10 @@ PageType {
 
             AwgTextField {
                 id: controlledJunk1TextField
+
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
+
                 headerText: qsTr("J1 - First controlled junk packet")
                 textField.text: clientControlledJunk1
                 textField.validator: null
@@ -241,6 +241,10 @@ PageType {
 
             AwgTextField {
                 id: controlledJunk2TextField
+
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
+
                 headerText: qsTr("J2 - Second controlled junk packet")
                 textField.text: clientControlledJunk2
                 textField.validator: null
@@ -255,6 +259,10 @@ PageType {
 
             AwgTextField {
                 id: controlledJunk3TextField
+
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
+
                 headerText: qsTr("J3 - Third controlled junk packet")
                 textField.text: clientControlledJunk3
                 textField.validator: null
@@ -269,6 +277,10 @@ PageType {
 
             AwgTextField {
                 id: iTimeTextField
+
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
+
                 headerText: qsTr("Itime - Special handshake timeout")
                 textField.text: clientSpecialHandshakeTimeout
                 checkEmptyText: false
@@ -283,12 +295,18 @@ PageType {
             Header2TextType {
                 Layout.fillWidth: true
                 Layout.topMargin: 16
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
 
                 text: qsTr("Server settings")
             }
 
             AwgTextField {
                 id: portTextField
+
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
+
                 enabled: false
 
                 headerText: qsTr("Port")
@@ -297,6 +315,10 @@ PageType {
 
             AwgTextField {
                 id: initPacketJunkSizeTextField
+
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
+
                 enabled: false
 
                 headerText: "S1 - Init packet junk size"
@@ -305,6 +327,10 @@ PageType {
 
             AwgTextField {
                 id: responsePacketJunkSizeTextField
+
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
+
                 enabled: false
 
                 headerText: "S2 - Response packet junk size"
@@ -313,6 +339,10 @@ PageType {
 
             // AwgTextField {
             //     id: cookieReplyPacketJunkSizeTextField
+
+            //     Layout.leftMargin: 16
+            //     Layout.rightMargin: 16
+
             //     enabled: false
 
             //     headerText: "S3 - Cookie Reply packet junk size"
@@ -321,6 +351,10 @@ PageType {
 
             // AwgTextField {
             //     id: transportPacketJunkSizeTextField
+
+            //     Layout.leftMargin: 16
+            //     Layout.rightMargin: 16
+
             //     enabled: false
 
             //     headerText: "S4 - Transport packet junk size"
@@ -329,6 +363,10 @@ PageType {
 
             AwgTextField {
                 id: initPacketMagicHeaderTextField
+
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
+
                 enabled: false
 
                 headerText: "H1 - Init packet magic header"
@@ -337,6 +375,10 @@ PageType {
 
             AwgTextField {
                 id: responsePacketMagicHeaderTextField
+
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
+
                 enabled: false
 
                 headerText: "H2 - Response packet magic header"
@@ -345,6 +387,10 @@ PageType {
 
             AwgTextField {
                 id: underloadPacketMagicHeaderTextField
+
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
+
                 enabled: false
 
                 headerText: "H3 - Underload packet magic header"
@@ -353,13 +399,15 @@ PageType {
 
             AwgTextField {
                 id: transportPacketMagicHeaderTextField
+
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
+
                 enabled: false
 
                 headerText: "H4 - Transport packet magic header"
                 textField.text: serverTransportPacketMagicHeader
             }
-
-            }
         }
     }
 
@@ -375,18 +423,17 @@ PageType {
         anchors.rightMargin: 16
         anchors.leftMargin: 16
 
-        enabled: listview.currentItem.isSaveButtonEnabled
+        enabled: listView.currentItem.isSaveButtonEnabled
 
         text: qsTr("Save")
 
         onActiveFocusChanged: {
             if(activeFocus) {
-                listview.positionViewAtEnd()
+                listView.positionViewAtEnd()
             }
         }
 
         clickedFunc: function() {
-            forceActiveFocus()
             var headerText = qsTr("Save settings?")
             var descriptionText = qsTr("Only the settings for this device will be changed")
             var yesButtonText = qsTr("Continue")
@@ -401,11 +448,9 @@ PageType {
                 PageController.goToPage(PageEnum.PageSetupWizardInstalling);
                 InstallController.updateContainer(AwgConfigModel.getConfig())
             }
-            var noButtonFunction = function() {
+
-                if (!GC.isMobile()) {
+            var noButtonFunction = function() {}
-                    saveButton.forceActiveFocus()
+
-                }
-            }
             showQuestionDrawer(headerText, descriptionText, yesButtonText, noButtonText, yesButtonFunction, noButtonFunction)
         }
     }

client/ui/qml/Pages2/PageProtocolAwgSettings.qml

@@ -19,80 +19,45 @@ import "../Components"
 PageType {
     id: root
 
-    ColumnLayout {
+    BackButtonType {
-        id: backButtonLayout
+        id: backButton
 
         anchors.top: parent.top
         anchors.left: parent.left
         anchors.right: parent.right
-
         anchors.topMargin: 20
 
-        BackButtonType {
+        onActiveFocusChanged: {
-            id: backButton
+            if(backButton.enabled && backButton.activeFocus) {
+                listView.positionViewAtBeginning()
+            }
         }
     }
 
-    ListView {
+    ListViewType {
-        id: listview
+        id: listView
-
-        property bool isFocusable: true
 
         anchors.top: backButtonLayout.bottom
         anchors.bottom: parent.bottom
-
-        width: parent.width
-
-        Keys.onTabPressed: {
-            FocusController.nextKeyTabItem()
-        }
-
-        Keys.onBacktabPressed: {
-            FocusController.previousKeyTabItem()
-        }
-
-        Keys.onUpPressed: {
-            FocusController.nextKeyUpItem()
-        }
-
-        Keys.onDownPressed: {
-            FocusController.nextKeyDownItem()
-        }
-
-        Keys.onLeftPressed: {
-            FocusController.nextKeyLeftItem()
-        }
-
-        Keys.onRightPressed: {
-            FocusController.nextKeyRightItem()
-        }
-
-        clip: true
-
-        model: AwgConfigModel
-
-        delegate: Item {
-            id: delegateItem
-            implicitWidth: listview.width
-            implicitHeight: col.implicitHeight
-
-            property alias vpnAddressSubnetTextField: vpnAddressSubnetTextField
-            property bool isEnabled: ServersModel.isProcessedServerHasWriteAccess()
-
-            ColumnLayout {
-                id: col
-
-                anchors.top: parent.top
         anchors.left: parent.left
         anchors.right: parent.right
 
-                anchors.leftMargin: 16
+        model: AwgConfigModel
-                anchors.rightMargin: 16
+
+        delegate: ColumnLayout {
+            id: delegateItem
+
+            width: listView.width
+
+            property alias vpnAddressSubnetTextField: vpnAddressSubnetTextField
+            property bool isEnabled: ServersModel.isProcessedServerHasWriteAccess()
 
             spacing: 0
 
             BaseHeaderType {
                 Layout.fillWidth: true
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
 
                 headerText: qsTr("AmneziaWG settings")
             }
@@ -102,6 +67,8 @@ PageType {
 
                 Layout.fillWidth: true
                 Layout.topMargin: 40
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
 
                 enabled: delegateItem.isEnabled
 
@@ -121,6 +88,8 @@ PageType {
                 id: portTextField
                 Layout.fillWidth: true
                 Layout.topMargin: 16
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
 
                 enabled: delegateItem.isEnabled
 
@@ -140,6 +109,10 @@ PageType {
 
             AwgTextField {
                 id: junkPacketCountTextField
+
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
+
                 headerText: qsTr("Jc - Junk packet count")
                 textField.text: serverJunkPacketCount
 
@@ -152,6 +125,10 @@ PageType {
 
             AwgTextField {
                 id: junkPacketMinSizeTextField
+
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
+
                 headerText: qsTr("Jmin - Junk packet minimum size")
                 textField.text: serverJunkPacketMinSize
 
@@ -164,6 +141,10 @@ PageType {
 
             AwgTextField {
                 id: junkPacketMaxSizeTextField
+
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
+
                 headerText: qsTr("Jmax - Junk packet maximum size")
                 textField.text: serverJunkPacketMaxSize
 
@@ -176,6 +157,10 @@ PageType {
 
             AwgTextField {
                 id: initPacketJunkSizeTextField
+
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
+
                 headerText: qsTr("S1 - Init packet junk size")
                 textField.text: serverInitPacketJunkSize
 
@@ -188,6 +173,10 @@ PageType {
 
             AwgTextField {
                 id: responsePacketJunkSizeTextField
+
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
+
                 headerText: qsTr("S2 - Response packet junk size")
                 textField.text: serverResponsePacketJunkSize
 
@@ -200,6 +189,10 @@ PageType {
 
             // AwgTextField {
             //     id: cookieReplyPacketJunkSizeTextField
+
+            //     Layout.leftMargin: 16
+            //     Layout.rightMargin: 16
+
             //     headerText: qsTr("S3 - Cookie reply packet junk size")
             //     textField.text: serverCookieReplyPacketJunkSize
 
@@ -212,6 +205,10 @@ PageType {
 
             // AwgTextField {
             //     id: transportPacketJunkSizeTextField
+
+            //     Layout.leftMargin: 16
+            //     Layout.rightMargin: 16
+
             //     headerText: qsTr("S4 - Transport packet junk size")
             //     textField.text: serverTransportPacketJunkSize
 
@@ -224,6 +221,10 @@ PageType {
 
             AwgTextField {
                 id: initPacketMagicHeaderTextField
+
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
+
                 headerText: qsTr("H1 - Init packet magic header")
                 textField.text: serverInitPacketMagicHeader
 
@@ -236,6 +237,10 @@ PageType {
 
             AwgTextField {
                 id: responsePacketMagicHeaderTextField
+
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
+
                 headerText: qsTr("H2 - Response packet magic header")
                 textField.text: serverResponsePacketMagicHeader
 
@@ -248,6 +253,10 @@ PageType {
 
             AwgTextField {
                 id: underloadPacketMagicHeaderTextField
+
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
+
                 headerText: qsTr("H3 - Underload packet magic header")
                 textField.text: serverUnderloadPacketMagicHeader
 
@@ -260,6 +269,10 @@ PageType {
 
             AwgTextField {
                 id: transportPacketMagicHeaderTextField
+
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
+
                 headerText: qsTr("H4 - Transport packet magic header")
                 textField.text: serverTransportPacketMagicHeader
 
@@ -270,13 +283,14 @@ PageType {
                 }
             }
 
-
             BasicButtonType {
                 id: saveRestartButton
 
                 Layout.fillWidth: true
                 Layout.topMargin: 24
                 Layout.bottomMargin: 24
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
 
                 enabled: underloadPacketMagicHeaderTextField.errorText === "" &&
                          transportPacketMagicHeaderTextField.errorText === "" &&
@@ -296,13 +310,11 @@ PageType {
 
                 onActiveFocusChanged: {
                     if(activeFocus) {
-                            listview.positionViewAtEnd()
+                        listView.positionViewAtEnd()
                     }
                 }
 
                 clickedFunc: function() {
-                        forceActiveFocus()
-
                     if (delegateItem.isEnabled) {
                         if (AwgConfigModel.isHeadersEqual(underloadPacketMagicHeaderTextField.textField.text,
                                                           transportPacketMagicHeaderTextField.textField.text,
@@ -340,15 +352,12 @@ PageType {
                         PageController.goToPage(PageEnum.PageSetupWizardInstalling);
                         InstallController.updateContainer(AwgConfigModel.getConfig())
                     }
-                        var noButtonFunction = function() {
+
-                            if (!GC.isMobile()) {
+                    var noButtonFunction = function() {}
-                                saveRestartButton.forceActiveFocus()
+
-                            }
-                        }
                     showQuestionDrawer(headerText, descriptionText, yesButtonText, noButtonText, yesButtonFunction, noButtonFunction)
                 }
             }
         }
     }
-    }
 }

client/ui/qml/Pages2/PageProtocolCloakSettings.qml

@@ -16,81 +16,61 @@ import "../Components"
 PageType {
     id: root
 
-    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
 
-            enabled: ServersModel.isProcessedServerHasWriteAccess()
+        onActiveFocusChanged: {
+            if(backButton.enabled && backButton.activeFocus) {
+                listView.positionViewAtBeginning()
+            }
+        }
+    }
 
-            ListView {
+    ListViewType {
-                id: listview
+        id: listView
+
+        anchors.top: backButton.bottom
+        anchors.bottom: parent.bottom
+        anchors.left: parent.left
+        anchors.right: parent.right
 
         property int selectedIndex: 0
 
-                width: parent.width
+        enabled: ServersModel.isProcessedServerHasWriteAccess()
-                height: listview.contentItem.height
 
-                clip: true
+        header: ColumnLayout {
-                reuseItems: true
+            width: listView.width
-
-                model: CloakConfigModel
-
-                delegate: Item {
-                    id: delegateItem
-
-                    property alias trafficFromField: trafficFromField
-                    property bool isEnabled: ServersModel.isProcessedServerHasWriteAccess()
-
-                    implicitWidth: listview.width
-                    implicitHeight: col.implicitHeight
-
-                    ColumnLayout {
-                        id: col
-
-                        anchors.top: parent.top
-                        anchors.left: parent.left
-                        anchors.right: parent.right
-
-                        anchors.leftMargin: 16
-                        anchors.rightMargin: 16
-
-                        spacing: 0
 
             BaseHeaderType {
                 Layout.fillWidth: true
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
+
                 headerText: qsTr("Cloak settings")
             }
+        }
+
+        model: CloakConfigModel
+
+        delegate: ColumnLayout {
+            width: listView.width
+
+            property alias trafficFromField: trafficFromField
+
+            spacing: 0
 
             TextFieldWithHeaderType {
                 id: trafficFromField
 
                 Layout.fillWidth: true
                 Layout.topMargin: 32
-
+                Layout.leftMargin: 16
-                            enabled: delegateItem.isEnabled
+                Layout.rightMargin: 16
 
                 headerText: qsTr("Disguised as traffic from")
                 textField.text: site
@@ -117,8 +97,8 @@ PageType {
 
                 Layout.fillWidth: true
                 Layout.topMargin: 16
-
+                Layout.leftMargin: 16
-                            enabled: delegateItem.isEnabled
+                Layout.rightMargin: 16
 
                 headerText: qsTr("Port")
                 textField.text: port
@@ -136,10 +116,11 @@ PageType {
 
             DropDownType {
                 id: cipherDropDown
+
                 Layout.fillWidth: true
                 Layout.topMargin: 16
-
+                Layout.leftMargin: 16
-                            enabled: delegateItem.isEnabled
+                Layout.rightMargin: 16
 
                 descriptionText: qsTr("Cipher")
                 headerText: qsTr("Cipher")
@@ -183,6 +164,8 @@ PageType {
                 Layout.fillWidth: true
                 Layout.topMargin: 24
                 Layout.bottomMargin: 24
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
 
                 enabled: trafficFromField.errorText === "" &&
                          portTextField.errorText === ""
@@ -221,7 +204,4 @@ PageType {
             }
         }
     }
-            }
-        }
-    }
 }

client/ui/qml/Pages2/PageProtocolRaw.qml

@@ -19,69 +19,53 @@ import "../Components"
 PageType {
     id: root
 
-    ColumnLayout {
+    BackButtonType {
-        id: header
+        id: backButton
 
         anchors.top: parent.top
         anchors.left: parent.left
         anchors.right: parent.right
-
         anchors.topMargin: 20
 
-        BackButtonType {
+        onFocusChanged: {
-            id: backButton
+            if (this.activeFocus) {
+                listView.positionViewAtBeginning()
             }
+        }
+    }
+
+    ListViewType {
+        id: listView
+
+        anchors.top: backButton.bottom
+        anchors.bottom: parent.bottom
+        anchors.right: parent.right
+        anchors.left: parent.left
+
+        header: ColumnLayout {
+            width: listView.width
 
             BaseHeaderType {
                 Layout.fillWidth: true
                 Layout.leftMargin: 16
                 Layout.rightMargin: 16
+                Layout.bottomMargin: 16
 
                 headerText: ContainersModel.getProcessedContainerName() + qsTr(" settings")
             }
         }
 
-    FlickableType {
-        id: fl
-        anchors.top: header.bottom
-        anchors.left: parent.left
-        anchors.right: parent.right
-        contentHeight: content.height
-
-        Column {
-            id: content
-
-            anchors.top: parent.top
-            anchors.left: parent.left
-            anchors.right: parent.right
-            anchors.topMargin: 32
-
-            ListView {
-                id: listView
-                width: parent.width
-                height: contentItem.height
-                clip: true
-                interactive: false
         model: ProtocolsModel
 
-                activeFocusOnTab: true
+        delegate: ColumnLayout {
-                focus: true
+            width: listView.width
-
-                delegate: Item {
-                    implicitWidth: parent.width
-                    implicitHeight: delegateContent.implicitHeight
-
-                    property alias focusItem: button
-
-                    ColumnLayout {
-                        id: delegateContent
-
-                        anchors.fill: parent
 
             LabelWithButtonType {
                 id: button
 
                 Layout.fillWidth: true
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
 
                 text: qsTr("Show connection options")
 
@@ -110,7 +94,7 @@ PageType {
                     implicitHeight: configContentDrawer.expandedHeight
 
                     BackButtonType {
-                                    id: backButton1
+                        id: drawerBackButton
 
                         anchors.top: parent.top
                         anchors.left: parent.left
@@ -122,36 +106,41 @@ PageType {
                         }
                     }
 
-                                FlickableType {
+                    ListViewType {
-                                    anchors.top: backButton1.bottom
+                        id: drawerListView
-                                    anchors.left: parent.left
+
-                                    anchors.right: parent.right
+                        anchors.top: drawerBackButton.bottom
                         anchors.bottom: parent.bottom
-                                    contentHeight: configContent.implicitHeight + configContent.anchors.topMargin + configContent.anchors.bottomMargin
+                        anchors.right: parent.right
+                        anchors.left: parent.left
 
-                                    ColumnLayout {
+                        header: ColumnLayout {
-                                        id: configContent
+                            width: drawerListView.width
-
-                                        anchors.fill: parent
-                                        anchors.rightMargin: 16
-                                        anchors.leftMargin: 16
 
                             Header2Type {
                                 Layout.fillWidth: true
                                 Layout.topMargin: 16
+                                Layout.leftMargin: 16
+                                Layout.rightMargin: 16
 
                                 headerText: qsTr("Connection options %1").arg(protocolName)
                             }
+                        }
+
+                        model: 1 // fake model to force the ListView to be created without a model
+
+                        delegate: ColumnLayout {
+                            width: drawerListView.width
 
                             TextArea {
                                 id: configText
 
                                 Layout.fillWidth: true
                                 Layout.topMargin: 16
-                                            Layout.bottomMargin: 16
+                                Layout.leftMargin: 16
+                                Layout.rightMargin: 16
 
                                 padding: 0
-                                            leftPadding: 0
                                 height: 24
 
                                 color: AmneziaStyle.color.paleGray
@@ -175,8 +164,9 @@ PageType {
                 }
             }
         }
-                }
+
-            }
+        footer: ColumnLayout {
+            width: listView.width
 
             LabelWithButtonType {
                 id: removeButton
@@ -198,11 +188,7 @@ PageType {
                         PageController.goToPage(PageEnum.PageDeinstalling)
                         InstallController.removeProcessedContainer()
                     }
-                    var noButtonFunction = function() {
+                    var noButtonFunction = function() {}
-                        if (!GC.isMobile()) {
-                            focusItem.forceActiveFocus()
-                        }
-                    }
 
                     showQuestionDrawer(headerText, descriptionText, yesButtonText, noButtonText, yesButtonFunction, noButtonFunction)
                 }

client/ui/qml/Pages2/PageProtocolShadowSocksSettings.qml

@@ -16,68 +16,43 @@ import "../Components"
 PageType {
     id: root
 
-    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: ShadowSocksConfigModel
 
-                delegate: Item {
+        delegate: ColumnLayout {
-                    id: delegateItem
+            width: listView.width
-
-                    property bool isEnabled: ServersModel.isProcessedServerHasWriteAccess()
-
-                    implicitWidth: listview.width
-                    implicitHeight: col.implicitHeight
-
-                    ColumnLayout {
-                        id: col
-
-                        anchors.top: parent.top
-                        anchors.left: parent.left
-                        anchors.right: parent.right
-
-                        anchors.leftMargin: 16
-                        anchors.rightMargin: 16
 
             spacing: 0
 
             BaseHeaderType {
                 Layout.fillWidth: true
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
+
                 headerText: qsTr("Shadowsocks settings")
             }
 
@@ -86,8 +61,10 @@ PageType {
 
                 Layout.fillWidth: true
                 Layout.topMargin: 40
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
 
-                            enabled: delegateItem.isEnabled
+                enabled: listView.enabled
 
                 headerText: qsTr("Port")
                 textField.text: port
@@ -105,10 +82,13 @@ PageType {
 
             DropDownType {
                 id: cipherDropDown
+
                 Layout.fillWidth: true
                 Layout.topMargin: 20
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
 
-                            enabled: delegateItem.isEnabled
+                enabled: listView.enabled
 
                 descriptionText: qsTr("Cipher")
                 headerText: qsTr("Cipher")
@@ -153,6 +133,8 @@ PageType {
                 Layout.fillWidth: true
                 Layout.topMargin: 24
                 Layout.bottomMargin: 24
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
 
                 enabled: portTextField.errorText === ""
 
@@ -188,7 +170,4 @@ PageType {
             }
         }
     }
-            }
-        }
-    }
 }

client/ui/qml/Pages2/PageProtocolWireGuardClientSettings.qml

@@ -16,77 +16,43 @@ import "../Components"
 PageType {
     id: root
 
-    Item {
-        id: focusItem
-        onFocusChanged: {
-            if (activeFocus) {
-                fl.ensureVisible(focusItem)
-            }
-        }
-        KeyNavigation.tab: backButton
-    }
-
-    ColumnLayout {
-        id: backButtonLayout
-
-        anchors.top: parent.top
-        anchors.left: parent.left
-        anchors.right: parent.right
-
-        anchors.topMargin: 20
-
     BackButtonType {
         id: backButton
-            KeyNavigation.tab: listview.currentItem.mtuTextField.textField
-        }
-    }
-
-    FlickableType {
-        id: fl
-        anchors.top: backButtonLayout.bottom
-        anchors.bottom: parent.bottom
-        contentHeight: content.implicitHeight + saveButton.implicitHeight + saveButton.anchors.bottomMargin + saveButton.anchors.topMargin
-
-        Column {
-            id: content
 
         anchors.top: parent.top
         anchors.left: parent.left
         anchors.right: parent.right
+        anchors.topMargin: 20
 
-            ListView {
+        onFocusChanged: {
-                id: listview
+            if (this.activeFocus) {
+                listView.positionViewAtBeginning()
+            }
+        }
+    }
 
-                width: parent.width
+    ListViewType {
-                height: listview.contentItem.height
+        id: listView
 
-                clip: true
+        anchors.top: backButton.bottom
-                interactive: false
+        anchors.bottom: parent.bottom
+        anchors.right: parent.right
+        anchors.left: parent.left
 
         model: WireGuardConfigModel
 
-                delegate: Item {
+        delegate: ColumnLayout {
-                    id: delegateItem
+            width: listView.width
-                    implicitWidth: listview.width
-                    implicitHeight: col.implicitHeight
 
             property alias mtuTextField: mtuTextField
             property bool isSaveButtonEnabled: mtuTextField.errorText === ""
 
-                    ColumnLayout {
-                        id: col
-
-                        anchors.top: parent.top
-                        anchors.left: parent.left
-                        anchors.right: parent.right
-
-                        anchors.leftMargin: 16
-                        anchors.rightMargin: 16
-
             spacing: 0
 
             BaseHeaderType {
                 Layout.fillWidth: true
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
 
                 headerText: qsTr("WG settings")
             }
@@ -95,6 +61,8 @@ PageType {
                 id: mtuTextField
                 Layout.fillWidth: true
                 Layout.topMargin: 40
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
 
                 headerText: qsTr("MTU")
                 textField.text: clientMtu
@@ -106,12 +74,13 @@ PageType {
                     } 
                 }
                 checkEmptyText: true
-                            KeyNavigation.tab: saveButton
             }
 
             Header2TextType {
                 Layout.fillWidth: true
                 Layout.topMargin: 16
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
 
                 text: qsTr("Server settings")
             }
@@ -120,6 +89,8 @@ PageType {
                 id: portTextField
                 Layout.fillWidth: true
                 Layout.topMargin: 8
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
 
                 enabled: false
 
@@ -127,29 +98,24 @@ PageType {
                 textField.text: port
             }
         }
-                }
+
-            }
+        footer: ColumnLayout {
-        }
+            width: listView.width
-    }
 
             BasicButtonType {
                 id: saveButton
 
-        anchors.right: root.right
+                Layout.fillWidth: true
-        anchors.left: root.left
+                Layout.topMargin: 24
-        anchors.bottom: root.bottom
+                Layout.bottomMargin: 24
+                Layout.rightMargin: 16
+                Layout.leftMargin: 16
 
-        anchors.topMargin: 24
+                enabled: listView.currentItem.isSaveButtonEnabled
-        anchors.bottomMargin: 24
-        anchors.rightMargin: 16
-        anchors.leftMargin: 16
-
-        enabled: listview.currentItem.isSaveButtonEnabled
 
                 text: qsTr("Save")
 
                 clickedFunc: function() {
-            forceActiveFocus()
                     var headerText = qsTr("Save settings?")
                     var descriptionText = qsTr("Only the settings for this device will be changed")
                     var yesButtonText = qsTr("Continue")
@@ -164,12 +130,10 @@ PageType {
                         PageController.goToPage(PageEnum.PageSetupWizardInstalling);
                         InstallController.updateContainer(WireGuardConfigModel.getConfig())
                     }
-            var noButtonFunction = function() {
+                    var noButtonFunction = function() {}
-                if (!GC.isMobile()) {
-                    saveButton.forceActiveFocus()
-                }
-            }
                     showQuestionDrawer(headerText, descriptionText, yesButtonText, noButtonText, yesButtonFunction, noButtonFunction)
                 }
             }
+        }
+    }
 }

client/ui/qml/Pages2/PageProtocolWireGuardSettings.qml

@@ -16,76 +16,55 @@ import "../Components"
 PageType {
     id: root
 
-    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: WireGuardConfigModel
 
-                delegate: Item {
+        delegate: ColumnLayout {
-                    id: delegateItem
+            width: listView.width
 
-                    property alias focusItemId: vpnAddressSubnetTextField
             property bool isEnabled: ServersModel.isProcessedServerHasWriteAccess()
 
-                    implicitWidth: listview.width
-                    implicitHeight: col.implicitHeight
-
-                    ColumnLayout {
-                        id: col
-
-                        anchors.top: parent.top
-                        anchors.left: parent.left
-                        anchors.right: parent.right
-
-                        anchors.leftMargin: 16
-                        anchors.rightMargin: 16
-
             spacing: 0
 
             BaseHeaderType {
                 Layout.fillWidth: true
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
+
                 headerText: qsTr("WG settings")
             }
 
             TextFieldWithHeaderType {
                 id: vpnAddressSubnetTextField
+
                 Layout.fillWidth: true
                 Layout.topMargin: 40
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
 
                 enabled: delegateItem.isEnabled
 
@@ -105,6 +84,8 @@ PageType {
                 id: portTextField
                 Layout.fillWidth: true
                 Layout.topMargin: 16
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
 
                 enabled: delegateItem.isEnabled
 
@@ -124,9 +105,12 @@ PageType {
 
             BasicButtonType {
                 id: saveButton
+                
                 Layout.fillWidth: true
                 Layout.topMargin: 24
                 Layout.bottomMargin: 24
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
 
                 enabled: portTextField.errorText === "" &&
                          vpnAddressSubnetTextField.errorText === ""
@@ -158,11 +142,8 @@ PageType {
                     showQuestionDrawer(headerText, descriptionText, yesButtonText, noButtonText, yesButtonFunction, noButtonFunction)
                 }
 
-                            Keys.onEnterPressed: this.clicked()
+                Keys.onEnterPressed: saveButton.clicked()
-                            Keys.onReturnPressed: this.clicked()
+                Keys.onReturnPressed: saveButton.clicked()
-                        }
-                    }
-                }
             }
         }
     }

client/ui/qml/Pages2/PageProtocolXraySettings.qml

@@ -17,78 +17,55 @@ import "../Components"
 PageType {
     id: root
 
-    ColumnLayout {
+    BackButtonType {
-        id: backButtonLayout
+        id: backButton
 
         anchors.top: parent.top
         anchors.left: parent.left
         anchors.right: parent.right
-
         anchors.topMargin: 20
 
-        BackButtonType {
+        onFocusChanged: {
-            id: backButton
+            if (this.activeFocus) {
+                listView.positionViewAtBeginning()
+            }
         }
     }
 
-    FlickableType {
+    ListViewType {
-        id: fl
+        id: listView
-        anchors.top: backButtonLayout.bottom
+
+        anchors.top: backButton.bottom
         anchors.bottom: parent.bottom
-        contentHeight: content.implicitHeight
-
-        Column {
-            id: content
-
-            anchors.top: parent.top
         anchors.left: parent.left
         anchors.right: parent.right
 
         enabled: ServersModel.isProcessedServerHasWriteAccess()
-
-            ListView {
-                id: listview
-
-                width: parent.width
-                height: listview.contentItem.height
-
-                clip: true
-                interactive: false
-
         model: XrayConfigModel
 
-                delegate: Item {
+        delegate: ColumnLayout {
-                    id: delegateItem
+            width: listView.width
 
             property alias focusItemId: textFieldWithHeaderType.textField
-                    property bool isEnabled: ServersModel.isProcessedServerHasWriteAccess()
-
-                    implicitWidth: listview.width
-                    implicitHeight: col.implicitHeight
-
-                    ColumnLayout {
-                        id: col
-
-                        anchors.top: parent.top
-                        anchors.left: parent.left
-                        anchors.right: parent.right
-
-                        anchors.leftMargin: 16
-                        anchors.rightMargin: 16
 
             spacing: 0
 
             BaseHeaderType {
                 Layout.fillWidth: true
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
                 headerText: qsTr("XRay settings")
             }
 
             TextFieldWithHeaderType {
                 id: textFieldWithHeaderType
+
                 Layout.fillWidth: true
                 Layout.topMargin: 32
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
 
-                            enabled: delegateItem.isEnabled
+                enabled: listView.enabled
 
                 headerText: qsTr("Disguised as traffic from")
                 textField.text: site
@@ -112,10 +89,13 @@ PageType {
 
             TextFieldWithHeaderType {
                 id: portTextField
+
                 Layout.fillWidth: true
                 Layout.topMargin: 16
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
 
-                            enabled: delegateItem.isEnabled
+                enabled: listView.enabled
 
                 headerText: qsTr("Port")
                 textField.text: port
@@ -133,9 +113,12 @@ PageType {
 
             BasicButtonType {
                 id: saveButton
+
                 Layout.fillWidth: true
                 Layout.topMargin: 24
                 Layout.bottomMargin: 24
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
 
                 enabled: portTextField.errorText === ""
 
@@ -157,7 +140,6 @@ PageType {
 
                         PageController.goToPage(PageEnum.PageSetupWizardInstalling);
                         InstallController.updateContainer(XrayConfigModel.getConfig())
-                                    //focusItem.forceActiveFocus()
                     }
                     var noButtonFunction = function() {
                         if (!GC.isMobile()) {
@@ -172,8 +154,4 @@ PageType {
             }
         }
     }
-            }
-        }
-    }
-
 }

client/ui/qml/Pages2/PageServiceDnsSettings.qml

@@ -16,50 +16,53 @@ import "../Components"
 PageType {
     id: root
 
-    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
-
-        ColumnLayout {
-            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
+
+        header: ColumnLayout {
+            width: listView.width
 
             BaseHeaderType {
-                id: header
-
                 Layout.fillWidth: true
                 Layout.rightMargin: 16
                 Layout.leftMargin: 16
+                Layout.bottomMargin: 24
 
                 headerText: "AmneziaDNS"
                 descriptionText: qsTr("A DNS service is installed on your server, and it is only accessible via VPN.\n") +
                                  qsTr("The DNS address is the same as the address of your server. You can configure DNS in the settings, under the connections tab.")
             }
+        }
+
+        model: 1 // fake model to force the ListView to be created without a model
+
+        delegate: ColumnLayout {
+            width: listView.width
 
             LabelWithButtonType {
-                id: removeButton
+                Layout.fillWidth: true
-
+                Layout.leftMargin: 16
-                Layout.topMargin: 24
+                Layout.rightMargin: 16
-                width: parent.width
 
                 text: qsTr("Remove ") + ContainersModel.getProcessedContainerName()
                 textColor: AmneziaStyle.color.vibrantRed
@@ -73,17 +76,12 @@ PageType {
                         if (ServersModel.isDefaultServerCurrentlyProcessed() && ConnectionController.isConnected
                                 && SettingsController.isAmneziaDnsEnabled()) {
                             PageController.showNotificationMessage(qsTr("Cannot remove AmneziaDNS from running server"))
-                        } else
+                        } else {
-                        {
                             PageController.goToPage(PageEnum.PageDeinstalling)
                             InstallController.removeProcessedContainer()
                         }
                     }
-                    var noButtonFunction = function() {
+                    var noButtonFunction = function() {}
-                        if (!GC.isMobile()) {
-                            removeButton.rightButton.forceActiveFocus()
-                        }
-                    }
 
                     showQuestionDrawer(headerText, "", yesButtonText, noButtonText, yesButtonFunction, noButtonFunction)
                 }

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")
-                            }
-                        }
-                    }
                 }
             }
         }

client/ui/qml/Pages2/PageServiceSocksProxySettings.qml

@@ -25,55 +25,33 @@ PageType {
         }
     }
 
-    ColumnLayout {
+    BackButtonType {
-        id: backButtonLayout
+        id: backButton
 
         anchors.top: parent.top
         anchors.left: parent.left
         anchors.right: parent.right
-
         anchors.topMargin: 20
 
-        BackButtonType {
+        onFocusChanged: {
-            id: backButton
+            if (this.activeFocus) {
+                listView.positionViewAtBeginning()
+            }
         }
     }
 
-    FlickableType {
+    ListViewType {
-        id: fl
+        id: listView
-        anchors.top: backButtonLayout.bottom
+
+        anchors.top: backButton.bottom
         anchors.bottom: parent.bottom
-        contentHeight: listview.implicitHeight
+        anchors.right: parent.right
-
+        anchors.left: parent.left
-        ListView {
-            id: listview
-
-            width: parent.width
-            height: listview.contentItem.height
-
-            clip: true
-            interactive: false
 
         model: Socks5ProxyConfigModel
 
-            onFocusChanged: {
+        delegate: ColumnLayout {
-                if (focus) {
+            width: listView.width
-                    listview.currentItem.focusItemId.forceActiveFocus()
-                }
-            }
-
-            delegate: Item {
-                implicitWidth: listview.width
-                implicitHeight: content.implicitHeight
-
-                property alias focusItemId: hostLabel.rightButton
-
-                ColumnLayout {
-                    id: content
-
-                    anchors.top: parent.top
-                    anchors.left: parent.left
-                    anchors.right: parent.right
 
             spacing: 0
 
@@ -86,11 +64,10 @@ PageType {
             }
 
             LabelWithButtonType {
-                        id: hostLabel
                 Layout.fillWidth: true
                 Layout.topMargin: 32
-
+                Layout.rightMargin: 16
-                        parentFlickable: fl
+                Layout.bottomMargin: 16
 
                 text: qsTr("Host")
                 descriptionText: ServersModel.getProcessedServerData("hostName")
@@ -103,69 +80,57 @@ PageType {
                 clickedFunction: function() {
                     GC.copyToClipBoard(descriptionText)
                     PageController.showNotificationMessage(qsTr("Copied"))
-                            if (!GC.isMobile()) {
-                                this.rightButton.forceActiveFocus()
-                            }
                 }
             }
 
             LabelWithButtonType {
-                        id: portLabel
                 Layout.fillWidth: true
+                Layout.rightMargin: 16
+                Layout.bottomMargin: 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.rightMargin: 16
+                Layout.bottomMargin: 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.rightMargin: 16
+                Layout.bottomMargin: 16
 
                 text: qsTr("Password")
                 descriptionText: password
 
                 descriptionOnTop: true
 
-                        parentFlickable: fl
-
                 rightImageSource: "qrc:/images/controls/copy.svg"
                 rightImageColor: AmneziaStyle.color.paleGray
 
@@ -174,9 +139,6 @@ PageType {
                 clickedFunction: function() {
                     GC.copyToClipBoard(descriptionText)
                     PageController.showNotificationMessage(qsTr("Copied"))
-                            if (!GC.isMobile()) {
-                                this.rightButton.forceActiveFocus()
-                            }
                 }
             }
 
@@ -219,6 +181,8 @@ PageType {
 
                     BaseHeaderType {
                         Layout.fillWidth: true
+                        Layout.rightMargin: 16
+                        Layout.bottomMargin: 16
 
                         headerText: qsTr("SOCKS5 settings")
                     }
@@ -228,7 +192,8 @@ PageType {
 
                         Layout.fillWidth: true
                         Layout.topMargin: 40
-                                parentFlickable: fl
+                        Layout.rightMargin: 16
+                        Layout.bottomMargin: 16
 
                         headerText: qsTr("Port")
                         textField.text: port
@@ -248,7 +213,8 @@ PageType {
 
                         Layout.fillWidth: true
                         Layout.topMargin: 16
-                                parentFlickable: fl
+                        Layout.rightMargin: 16
+                        Layout.bottomMargin: 16
 
                         headerText: qsTr("Username")
                         textField.placeholderText: "username"
@@ -270,7 +236,8 @@ PageType {
 
                         Layout.fillWidth: true
                         Layout.topMargin: 16
-                                parentFlickable: fl
+                        Layout.rightMargin: 16
+                        Layout.bottomMargin: 16
 
                         headerText: qsTr("Password")
                         textField.placeholderText: "password"
@@ -299,12 +266,11 @@ PageType {
                         Layout.fillWidth: true
                         Layout.topMargin: 24
                         Layout.bottomMargin: 24
+                        Layout.rightMargin: 16
 
                         text: qsTr("Change connection settings")
 
                         clickedFunc: function() {
-                                    forceActiveFocus()
-
                             if (!portTextField.textField.acceptableInput) {
                                 portTextField.errorText = qsTr("The port must be in the range of 1 to 65535")
                                 return
@@ -340,12 +306,9 @@ PageType {
                 text: qsTr("Change connection settings")
 
                 clickedFunc: function() {
-                            forceActiveFocus()
                     changeSettingsDrawer.openTriggered()
                 }
             }
         }
     }
-        }
-    }
 }

client/ui/qml/Pages2/PageServiceTorWebsiteSettings.qml

@@ -25,34 +25,31 @@ 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
-
-        ColumnLayout {
-            id: content
 
         anchors.top: parent.top
         anchors.left: parent.left
         anchors.right: parent.right
+        anchors.topMargin: 20
         
-            spacing: 0
+        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
+
+        header: ColumnLayout {
+            width: listView.width
 
             BaseHeaderType {
                 Layout.fillWidth: true
@@ -61,11 +58,19 @@ PageType {
 
                 headerText: qsTr("Tor website settings")
             }
+        }
+
+        model: 1 // fake model to force the ListView to be created without a model
+
+        delegate: ColumnLayout { // TODO(CyAn84): add DelegateChooser after migrate to 6.9
+            width: listView.width
 
             LabelWithButtonType {
                 id: websiteName
+
                 Layout.fillWidth: true
                 Layout.topMargin: 32
+                Layout.bottomMargin: 24
 
                 text: qsTr("Website address")
                 descriptionText: {
@@ -83,15 +88,16 @@ PageType {
                 clickedFunction: function() {
                     GC.copyToClipBoard(descriptionText)
                     PageController.showNotificationMessage(qsTr("Copied"))
-                    if (!GC.isMobile()) {
-                        this.rightButton.forceActiveFocus()
                 }
             }
         }
 
+        footer: ColumnLayout {
+            width: listView.width
+
             ParagraphTextType {
                 Layout.fillWidth: true
-                Layout.topMargin: 40
+                Layout.topMargin: 16
                 Layout.leftMargin: 16
                 Layout.rightMargin: 16
 

client/ui/qml/Pages2/PageSettings.qml

@@ -14,130 +14,62 @@ import "../Config"
 PageType {
     id: root
 
-    FlickableType {
+    ListViewType {
-        id: fl
+        id: listView
-        anchors.top: parent.top
-        anchors.bottom: parent.bottom
-        contentHeight: content.height
 
-        ColumnLayout {
+        anchors.fill: parent
-            id: content
 
-            anchors.top: parent.top
+        header: ColumnLayout {
-            anchors.left: parent.left
+            width: listView.width
-            anchors.right: parent.right
-
-            spacing: 0
 
             BaseHeaderType {
                 id: header
                 Layout.fillWidth: true
                 Layout.topMargin: 24
+                Layout.bottomMargin: 16
                 Layout.rightMargin: 16
                 Layout.leftMargin: 16
 
                 headerText: qsTr("Settings")
             }
+        }
+
+        model: settingsEntries
+
+        delegate: ColumnLayout {
+            width: listView.width
+
+            spacing: 0
 
             LabelWithButtonType {
-                id: account
                 Layout.fillWidth: true
-                Layout.topMargin: 16
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
 
-                text: qsTr("Servers")
+                visible: isVisible
+
+                text: title
                 rightImageSource: "qrc:/images/controls/chevron-right.svg"
-                leftImageSource: "qrc:/images/controls/server.svg"
+                leftImageSource: leftImagePath
 
-                clickedFunction: function() {
+                clickedFunction: clickedHandler
-                    PageController.goToPage(PageEnum.PageSettingsServersList)
-                }
-            }
-
-            DividerType {}
-
-            LabelWithButtonType {
-                id: connection
-                Layout.fillWidth: true
-
-                text: qsTr("Connection")
-                rightImageSource: "qrc:/images/controls/chevron-right.svg"
-                leftImageSource: "qrc:/images/controls/radio.svg"
-
-                clickedFunction: function() {
-                    PageController.goToPage(PageEnum.PageSettingsConnection)
-                }
-            }
-
-            DividerType {}
-
-            LabelWithButtonType {
-                id: application
-                Layout.fillWidth: true
-
-                text: qsTr("Application")
-                rightImageSource: "qrc:/images/controls/chevron-right.svg"
-                leftImageSource: "qrc:/images/controls/app.svg"
-
-                clickedFunction: function() {
-                    PageController.goToPage(PageEnum.PageSettingsApplication)
-                }
-            }
-
-            DividerType {}
-
-            LabelWithButtonType {
-                id: backup
-                Layout.fillWidth: true
-
-                text: qsTr("Backup")
-                rightImageSource: "qrc:/images/controls/chevron-right.svg"
-                leftImageSource: "qrc:/images/controls/save.svg"
-
-                clickedFunction: function() {
-                    PageController.goToPage(PageEnum.PageSettingsBackup)
-                }
-            }
-
-            DividerType {}
-
-            LabelWithButtonType {
-                id: about
-                Layout.fillWidth: true
-
-                text: qsTr("About AmneziaVPN")
-                rightImageSource: "qrc:/images/controls/chevron-right.svg"
-                leftImageSource: "qrc:/images/controls/amnezia.svg"
-
-                clickedFunction: function() {
-                    PageController.goToPage(PageEnum.PageSettingsAbout)
-                }
-            }
-
-            DividerType {}
-
-            LabelWithButtonType {
-                id: devConsole
-                visible: SettingsController.isDevModeEnabled
-                Layout.fillWidth: true
-
-                text: qsTr("Dev console")
-                rightImageSource: "qrc:/images/controls/chevron-right.svg"
-                leftImageSource: "qrc:/images/controls/bug.svg"
-
-                clickedFunction: function() {
-                    PageController.goToPage(PageEnum.PageDevMenu)
-                }
             }
 
             DividerType {
-                visible: SettingsController.isDevModeEnabled
+                visible: isVisible
             }
+        }
+
+        footer: ColumnLayout {
+            width: listView.width
 
             LabelWithButtonType {
                 id: close
+
                 visible: GC.isDesktop()
                 Layout.fillWidth: true
-                Layout.preferredHeight: about.height
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
 
                 text: qsTr("Close application")
                 leftImageSource: "qrc:/images/controls/x-circle.svg"
@@ -149,8 +81,87 @@ PageType {
             }
 
             DividerType {
+                Layout.fillWidth: true
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
+
                 visible: GC.isDesktop()
             }
         }
     }
+
+    property list<QtObject> settingsEntries: [
+        servers,
+        connection,
+        application,
+        backup,
+        about,
+        devConsole
+    ]
+
+    QtObject {
+        id: servers
+
+        property string title: qsTr("Servers")
+        readonly property string leftImagePath: "qrc:/images/controls/server.svg"
+        property bool isVisible: true
+        readonly property var clickedHandler: function() {
+            PageController.goToPage(PageEnum.PageSettingsServersList)
+        }
+    }
+
+    QtObject {
+        id: connection
+
+        property string title: qsTr("Connection")
+        readonly property string leftImagePath: "qrc:/images/controls/radio.svg"
+        property bool isVisible: true
+        readonly property var clickedHandler: function() {
+            PageController.goToPage(PageEnum.PageSettingsConnection)
+        }
+    }
+
+    QtObject {
+        id: application
+
+        property string title: qsTr("Application")
+        readonly property string leftImagePath: "qrc:/images/controls/app.svg"
+        property bool isVisible: true
+        readonly property var clickedHandler: function() {
+            PageController.goToPage(PageEnum.PageSettingsApplication)
+        }
+    }
+
+    QtObject {
+        id: backup
+
+        property string title: qsTr("Backup")
+        readonly property string leftImagePath: "qrc:/images/controls/save.svg"
+        property bool isVisible: true
+        readonly property var clickedHandler: function() {
+            PageController.goToPage(PageEnum.PageSettingsBackup)
+        }
+    }
+
+    QtObject {
+        id: about
+
+        property string title: qsTr("About AmneziaVPN")
+        readonly property string leftImagePath: "qrc:/images/controls/amnezia.svg"
+        property bool isVisible: true
+        readonly property var clickedHandler: function() {
+            PageController.goToPage(PageEnum.PageSettingsAbout)
+        }
+    }
+
+    QtObject {
+        id: devConsole
+
+        property string title: qsTr("Dev console")
+        readonly property string leftImagePath: "qrc:/images/controls/bug.svg"
+        property bool isVisible: SettingsController.isDevModeEnabled
+        readonly property var clickedHandler: function() {
+            PageController.goToPage(PageEnum.PageDevMenu)
+        }
+    }
 }

client/ui/qml/Pages2/PageSettingsAbout.qml

@@ -29,58 +29,7 @@ PageType {
         }
     }
 
-    QtObject {
+    ListViewType {
-        id: telegramGroup
-
-        readonly property string title: qsTr("Telegram group")
-        readonly property string description: qsTr("To discuss features")
-        readonly property string imageSource: "qrc:/images/controls/telegram.svg"
-        readonly property var handler: function() {
-            Qt.openUrlExternally(qsTr("https://t.me/amnezia_vpn_en"))
-        }
-    }
-
-    QtObject {
-        id: mail
-
-        readonly property string title: qsTr("support@amnezia.org")
-        readonly property string description: qsTr("For reviews and bug reports")
-        readonly property string imageSource: "qrc:/images/controls/mail.svg"
-        readonly property var handler: function() {
-            Qt.openUrlExternally(qsTr("mailto:support@amnezia.org"))
-        }
-    }
-
-    QtObject {
-        id: github
-
-        readonly property string title: qsTr("GitHub")
-        readonly property string description: qsTr("Discover the source code")
-        readonly property string imageSource: "qrc:/images/controls/github.svg"
-        readonly property var handler: function() {
-            Qt.openUrlExternally(qsTr("https://github.com/amnezia-vpn/amnezia-client"))
-        }
-    }
-
-    QtObject {
-        id: website
-
-        readonly property string title: qsTr("Website")
-        readonly property string description: qsTr("Visit official website")
-        readonly property string imageSource: "qrc:/images/controls/amnezia.svg"
-        readonly property var handler: function() {
-            Qt.openUrlExternally(LanguageModel.getCurrentSiteUrl())
-        }
-    }
-
-    property list<QtObject> contacts: [
-        telegramGroup,
-        mail,
-        github,
-        website
-    ]
-
-    ListView {
         id: listView
 
         anchors.top: backButton.bottom
@@ -88,38 +37,6 @@ PageType {
         anchors.right: parent.right
         anchors.left: parent.left
 
-        property bool isFocusable: true
-
-        Keys.onTabPressed: {
-            FocusController.nextKeyTabItem()
-        }
-
-        Keys.onBacktabPressed: {
-            FocusController.previousKeyTabItem()
-        }
-
-        Keys.onUpPressed: {
-            FocusController.nextKeyUpItem()
-        }
-
-        Keys.onDownPressed: {
-            FocusController.nextKeyDownItem()
-        }
-
-        Keys.onLeftPressed: {
-            FocusController.nextKeyLeftItem()
-        }
-
-        Keys.onRightPressed: {
-            FocusController.nextKeyRightItem()
-        }
-
-        ScrollBar.vertical: ScrollBarType {}
-
-        model: contacts
-
-        clip: true
-
         header: ColumnLayout {
             width: listView.width
 
@@ -170,11 +87,12 @@ PageType {
             }
         }
 
+        model: contacts
+
         delegate: ColumnLayout {
             width: listView.width
 
             LabelWithButtonType {
-                id: telegramButton
                 Layout.fillWidth: true
                 Layout.topMargin: 6
 
@@ -257,4 +175,55 @@ PageType {
             }
         }
     }
+    
+    property list<QtObject> contacts: [
+        telegramGroup,
+        mail,
+        github,
+        website
+    ]
+
+    QtObject {
+        id: telegramGroup
+
+        readonly property string title: qsTr("Telegram group")
+        readonly property string description: qsTr("To discuss features")
+        readonly property string imageSource: "qrc:/images/controls/telegram.svg"
+        readonly property var handler: function() {
+            Qt.openUrlExternally(qsTr("https://t.me/amnezia_vpn_en"))
+        }
+    }
+
+    QtObject {
+        id: mail
+
+        readonly property string title: qsTr("support@amnezia.org")
+        readonly property string description: qsTr("For reviews and bug reports")
+        readonly property string imageSource: "qrc:/images/controls/mail.svg"
+        readonly property var handler: function() {
+            Qt.openUrlExternally(qsTr("mailto:support@amnezia.org"))
+        }
+    }
+
+    QtObject {
+        id: github
+
+        readonly property string title: qsTr("GitHub")
+        readonly property string description: qsTr("Discover the source code")
+        readonly property string imageSource: "qrc:/images/controls/github.svg"
+        readonly property var handler: function() {
+            Qt.openUrlExternally(qsTr("https://github.com/amnezia-vpn/amnezia-client"))
+        }
+    }
+
+    QtObject {
+        id: website
+
+        readonly property string title: qsTr("Website")
+        readonly property string description: qsTr("Visit official website")
+        readonly property string imageSource: "qrc:/images/controls/amnezia.svg"
+        readonly property var handler: function() {
+            Qt.openUrlExternally(LanguageModel.getCurrentSiteUrl())
+        }
+    }
 }

client/ui/qml/Pages2/PageSettingsApiNativeConfigs.qml

@@ -22,22 +22,34 @@ PageType {
     property string configExtension: ".conf"
     property string configCaption: qsTr("Save AmneziaVPN config")
 
+    BackButtonType {
+        id: backButton
+
+        anchors.top: parent.top
+        anchors.left: parent.left
+        anchors.right: parent.right
+        anchors.topMargin: 20
+        
+        onActiveFocusChanged: {
+            if(backButton.enabled && backButton.activeFocus) {
+                listView.positionViewAtBeginning()
+            }
+        }
+    }
+
     ListViewType {
         id: listView
 
-        anchors.fill: parent
+        anchors.top: backButton.bottom
-        anchors.topMargin: 20
+        anchors.bottom: parent.bottom
-        anchors.bottomMargin: 24
+        anchors.right: parent.right
+        anchors.left: parent.left
 
         model: ApiCountryModel
 
         header: ColumnLayout {
             width: listView.width
 
-            BackButtonType {
-                id: backButton
-            }
-
             BaseHeaderType {
                 id: header
 
@@ -58,9 +70,9 @@ PageType {
                 Layout.topMargin: 6
 
                 text: countryName
-                descriptionText: isWorkerExpired ? qsTr("Download the update") : ""
+                descriptionText: isWorkerExpired ? qsTr("The configuration needs to be reissued") : ""
-                hideDescription: false
+                hideDescription: isWorkerExpired : true : false
-                descriptionColor: AmneziaStyle.color.mutedGray
+                descriptionColor: AmneziaStyle.color.vibrantRed
 
                 leftImageSource: "qrc:/countriesFlags/images/flagKit/" + countryImageCode + ".svg"
                 rightImageSource: isIssued ? "qrc:/images/controls/more-vertical.svg" : "qrc:/images/controls/download.svg"
@@ -105,30 +117,34 @@ PageType {
                 }
             }
 
-            FlickableType {
+            ListViewType {
+                id: drawerListView
+
                 anchors.top: moreOptionsDrawerBackButton.bottom
-                anchors.left: parent.left
-                anchors.right: parent.right
                 anchors.bottom: parent.bottom
-
-                contentHeight: moreOptionsDrawerContent.height
-
-                ColumnLayout {
-                    id: moreOptionsDrawerContent
-
-                    anchors.top: parent.top
                 anchors.left: parent.left
                 anchors.right: parent.right
 
+                header: ColumnLayout {
+                    width: drawerListView.width
+
                     Header2Type {
                         Layout.fillWidth: true
                         Layout.margins: 16
 
                         headerText: moreOptionsDrawer.countryName + qsTr(" configuration file")
                     }
+                }
+
+                model: 1 // fake model to force the ListView to be created without a model
+
+                delegate: ColumnLayout {
+                    width: drawerListView.width
 
                     LabelWithButtonType {
                         Layout.fillWidth: true
+                        Layout.leftMargin: 16
+                        Layout.rightMargin: 16
 
                         text: qsTr("Generate a new configuration file")
                         descriptionText: qsTr("The previously created one will stop working")
@@ -139,9 +155,16 @@ PageType {
                     }
 
                     DividerType {}
+                }
+
+                footer: ColumnLayout {
+                    width: drawerListView.width
 
                     LabelWithButtonType {
                         Layout.fillWidth: true
+                        Layout.leftMargin: 16
+                        Layout.rightMargin: 16
+
                         text: qsTr("Revoke the current configuration file")
 
                         clickedFunction: function() {
@@ -213,8 +236,7 @@ PageType {
             }
             moreOptionsDrawer.closeTriggered()
         }
-        var noButtonFunction = function() {
+        var noButtonFunction = function() {}
-        }
 
         showQuestionDrawer(headerText, descriptionText, yesButtonText, noButtonText, yesButtonFunction, noButtonFunction)
     }

client/ui/qml/Pages2/PageSettingsAppSplitTunneling.qml

@@ -50,6 +50,7 @@ PageType {
         readonly property string name: qsTr("Only the apps from the list should have access via VPN")
         readonly property int type: routeMode.onlyForwardApps
     }
+
     QtObject {
         id: allExceptApps
         
@@ -111,7 +112,7 @@ PageType {
 
             headerText: qsTr("Mode")
 
-            enabled: Qt.platform.os === "android" && root.pageEnabled
+            enabled: (Qt.platform.os === "android") && root.pageEnabled
 
             listView: ListViewWithRadioButtonType {
                 rootWidth: root.width
@@ -146,24 +147,14 @@ PageType {
         }
     }
 
-    FlickableType {
+    ListViewType {
+        id: listView
+
         anchors.top: header.bottom
-        anchors.topMargin: 16
+        anchors.bottom: addAppButton.top
-        contentHeight: col.implicitHeight + addAppButton.implicitHeight + addAppButton.anchors.bottomMargin + addAppButton.anchors.topMargin
-
-        enabled: root.pageEnabled
-
-        Column {
-            id: col
-            anchors.top: parent.top
         anchors.left: parent.left
         anchors.right: parent.right
 
-            ListView {
-                id: apps
-                width: parent.width
-                height: apps.contentItem.height
-
         model: SortFilterProxyModel {
             id: proxyAppSplitTunnelingModel
             sourceModel: AppSplitTunnelingModel
@@ -177,23 +168,15 @@ PageType {
             ]
         }
 
-                clip: true
+        delegate: ColumnLayout {
-                interactive: false
+            width: listView.width
-
-                delegate: Item {
-                    implicitWidth: apps.width
-                    implicitHeight: delegateContent.implicitHeight
-
-                    ColumnLayout {
-                        id: delegateContent
-
-                        anchors.top: parent.top
-                        anchors.left: parent.left
-                        anchors.right: parent.right
 
             LabelWithButtonType {
                 Layout.fillWidth: true
 
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
+
                 text: appPath
                 rightImageSource: "qrc:/images/controls/trash.svg"
                 rightImageColor: AmneziaStyle.color.paleGray
@@ -216,9 +199,6 @@ PageType {
             DividerType {}
         }
     }
-            }
-        }
-    }
 
     Rectangle {
         anchors.fill: addAppButton

client/ui/qml/Pages2/PageSettingsApplication.qml

@@ -21,22 +21,24 @@ PageType {
         anchors.left: parent.left
         anchors.right: parent.right
         anchors.topMargin: 20
+
+        onActiveFocusChanged: {
+            if(backButton.enabled && backButton.activeFocus) {
+                listView.positionViewAtBeginning()
+            }
+        }
     }
 
-    FlickableType {
+    ListViewType {
-        id: fl
+        id: listView
+
         anchors.top: backButton.bottom
         anchors.bottom: parent.bottom
-        contentHeight: content.height
-
-        ColumnLayout {
-            id: content
-
-            anchors.top: parent.top
         anchors.left: parent.left
         anchors.right: parent.right
 
-            spacing: 0
+        header: ColumnLayout {
+            width: listView.width
 
             BaseHeaderType {
                 Layout.fillWidth: true
@@ -45,9 +47,17 @@ PageType {
 
                 headerText: qsTr("Application")
             }
+        }
+
+        model: 1 // fake model to force the ListView to be created without a model
+
+        delegate: ColumnLayout { // TODO(CyAn84): add DelegateChooser when have migrated to 6.9
+
+            width: listView.width
 
             SwitcherType {
-                id: switcher
+                id: switcherAllowScreenshots
+
                 visible: GC.isMobile()
 
                 Layout.fillWidth: true
@@ -61,10 +71,6 @@ PageType {
                         SettingsController.toggleScreenshotsEnabled(checked)
                     }
                 }
-
-                // KeyNavigation.tab: Qt.platform.os === "android" && !SettingsController.isNotificationPermissionGranted ?
-                //     labelWithButtonNotification.rightButton : labelWithButtonLanguage.rightButton
-                parentFlickable: fl
             }
 
             DividerType {
@@ -73,15 +79,15 @@ PageType {
 
             LabelWithButtonType {
                 id: labelWithButtonNotification
+
                 visible: Qt.platform.os === "android" && !SettingsController.isNotificationPermissionGranted
+
                 Layout.fillWidth: true
 
                 text: qsTr("Enable notifications")
                 descriptionText: qsTr("Enable notifications to show the VPN state in the status bar")
                 rightImageSource: "qrc:/images/controls/chevron-right.svg"
 
-                parentFlickable: fl
-
                 clickedFunction: function() {
                     SettingsController.requestNotificationPermission()
                 }
@@ -93,6 +99,7 @@ PageType {
 
             SwitcherType {
                 id: switcherAutoStart
+
                 visible: !GC.isMobile()
 
                 Layout.fillWidth: true
@@ -101,8 +108,6 @@ PageType {
                 text: qsTr("Auto start")
                 descriptionText: qsTr("Launch the application every time the device is starts")
 
-                parentFlickable: fl
-
                 checked: SettingsController.isAutoStartEnabled()
                 onCheckedChanged: {
                     if (checked !== SettingsController.isAutoStartEnabled()) {
@@ -117,6 +122,7 @@ PageType {
 
             SwitcherType {
                 id: switcherAutoConnect
+
                 visible: !GC.isMobile()
 
                 Layout.fillWidth: true
@@ -125,8 +131,6 @@ PageType {
                 text: qsTr("Auto connect")
                 descriptionText: qsTr("Connect to VPN on app start")
 
-                parentFlickable: fl
-
                 checked: SettingsController.isAutoConnectEnabled()
                 onCheckedChanged: {
                     if (checked !== SettingsController.isAutoConnectEnabled()) {
@@ -141,6 +145,7 @@ PageType {
 
             SwitcherType {
                 id: switcherStartMinimized
+
                 visible: !GC.isMobile()
 
                 Layout.fillWidth: true
@@ -152,8 +157,6 @@ PageType {
                 enabled: switcherAutoStart.checked
                 opacity: enabled ? 1.0 : 0.5
 
-                parentFlickable: fl
-
                 checked: SettingsController.isStartMinimizedEnabled()
                 onCheckedChanged: {
                     if (checked !== SettingsController.isStartMinimizedEnabled()) {
@@ -165,17 +168,21 @@ PageType {
             DividerType {
                 visible: !GC.isMobile()
             }
+        }
+
+        footer: ColumnLayout {
+
+            width: listView.width
 
             LabelWithButtonType {
                 id: labelWithButtonLanguage
+
                 Layout.fillWidth: true
 
                 text: qsTr("Language")
                 descriptionText: LanguageModel.currentLanguageName
                 rightImageSource: "qrc:/images/controls/chevron-right.svg"
 
-                parentFlickable: fl
-
                 clickedFunction: function() {
                     selectLanguageDrawer.openTriggered()
                 }
@@ -185,14 +192,13 @@ PageType {
 
             LabelWithButtonType {
                 id: labelWithButtonLogging
+
                 Layout.fillWidth: true
 
                 text: qsTr("Logging")
                 descriptionText: SettingsController.isLoggingEnabled ? qsTr("Enabled") : qsTr("Disabled")
                 rightImageSource: "qrc:/images/controls/chevron-right.svg"
 
-                parentFlickable: fl
-
                 clickedFunction: function() {
                     PageController.goToPage(PageEnum.PageSettingsLogging)
                 }
@@ -202,14 +208,13 @@ PageType {
 
             LabelWithButtonType {
                 id: labelWithButtonReset
+                
                 Layout.fillWidth: true
 
                 text: qsTr("Reset settings and remove all data from the application")
                 rightImageSource: "qrc:/images/controls/chevron-right.svg"
                 textColor: AmneziaStyle.color.vibrantRed
 
-                parentFlickable: fl
-
                 clickedFunction: function() {
                     var headerText = qsTr("Reset settings and remove all data from the application?")
                     var descriptionText = qsTr("All settings will be reset to default. All installed AmneziaVPN services will still remain on the server.")

client/ui/qml/Pages2/PageSettingsBackup.qml

@@ -41,35 +41,51 @@ PageType {
         anchors.left: parent.left
         anchors.right: parent.right
         anchors.topMargin: 20
+
+        onActiveFocusChanged: {
+            if(backButton.enabled && backButton.activeFocus) {
+                listView.positionViewAtBeginning()
+            }
+        }
     }
 
-    FlickableType {
+    ListViewType {
-        id: fl
+        id: listView
+
         anchors.top: backButton.bottom
         anchors.bottom: parent.bottom
-        contentHeight: content.height
-
-        ColumnLayout {
-            id: content
-
-            anchors.top: parent.top
         anchors.left: parent.left
         anchors.right: parent.right
-            anchors.leftMargin: 16
+
-            anchors.rightMargin: 16
+        header: ColumnLayout {
+
+            width: listView.width
 
             spacing: 16
 
             BaseHeaderType {
                 Layout.fillWidth: true
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
 
                 headerText: qsTr("Back up your configuration")
                 descriptionText: qsTr("You can save your settings to a backup file to restore them the next time you install the application.")
             }
+        }
+
+        model: 1 // fake model to force the ListView to be created without a model
+
+        delegate: ColumnLayout { // TODO(CyAn84): add DelegateChooser when have migrated to 6.9
+
+            width: listView.width
+
+            spacing: 16
 
             WarningType {
-                Layout.topMargin: 16
                 Layout.fillWidth: true
+                Layout.topMargin: 16
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
 
                 textString: qsTr("The backup will contain your passwords and private keys for all servers added " +
                                  "to AmneziaVPN. Keep this information in a secure place.")
@@ -79,13 +95,14 @@ PageType {
 
             BasicButtonType {
                 id: makeBackupButton
+
                 Layout.fillWidth: true
                 Layout.topMargin: 14
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
 
                 text: qsTr("Make a backup")
 
-                parentFlickable: fl
-
                 clickedFunc: function() {
                     var fileName = ""
                     if (GC.isMobile()) {
@@ -108,8 +125,11 @@ PageType {
 
             BasicButtonType {
                 id: restoreBackupButton
+
                 Layout.fillWidth: true
                 Layout.topMargin: -8
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
 
                 defaultColor: AmneziaStyle.color.transparent
                 hoveredColor: AmneziaStyle.color.translucentWhite
@@ -120,8 +140,6 @@ PageType {
 
                 text: qsTr("Restore from backup")
 
-                parentFlickable: fl
-
                 clickedFunc: function() {
                     var filePath = SystemController.getFileName(qsTr("Open backup file"),
                                                                 qsTr("Backup files (*.backup)"))

client/ui/qml/Pages2/PageSettingsConnection.qml

@@ -21,21 +21,26 @@ PageType {
         anchors.left: parent.left
         anchors.right: parent.right
         anchors.topMargin: 20
+
+        onActiveFocusChanged: {
+            if(backButton.enabled && backButton.activeFocus) {
+                listView.positionViewAtBeginning()
+            }
+        }
     }
 
-    FlickableType {
+    ListViewType {
-        id: fl
+        id: listView
+
         anchors.top: backButton.bottom
         anchors.bottom: parent.bottom
-        contentHeight: content.height
-
-        ColumnLayout {
-            id: content
-
-            anchors.top: parent.top
         anchors.left: parent.left
         anchors.right: parent.right
 
+        header: ColumnLayout {
+
+            width: listView.width
+
             BaseHeaderType {
                 Layout.fillWidth: true
                 Layout.leftMargin: 16
@@ -43,9 +48,17 @@ PageType {
 
                 headerText: qsTr("Connection")
             }
+        }
+
+        model: 1 // fake model to force the ListView to be created without a model
+
+        delegate: ColumnLayout { // TODO(CyAn84): add DelegateChooser when have migrated to 6.9
+
+            width: listView.width
 
             SwitcherType {
                 id: amneziaDnsSwitch
+
                 Layout.fillWidth: true
                 Layout.margins: 16
 
@@ -64,14 +77,13 @@ PageType {
 
             LabelWithButtonType {
                 id: dnsServersButton
+
                 Layout.fillWidth: true
 
                 text: qsTr("DNS servers")
                 descriptionText: qsTr("When AmneziaDNS is not used or installed")
                 rightImageSource: "qrc:/images/controls/chevron-right.svg"
 
-                parentFlickable: fl
-
                 clickedFunction: function() {
                     PageController.goToPage(PageEnum.PageSettingsDns)
                 }
@@ -81,14 +93,13 @@ PageType {
 
             LabelWithButtonType {
                 id: splitTunnelingButton
+
                 Layout.fillWidth: true
 
                 text: qsTr("Site-based split tunneling")
                 descriptionText: qsTr("Allows you to select which sites you want to access through the VPN")
                 rightImageSource: "qrc:/images/controls/chevron-right.svg"
 
-                parentFlickable: fl
-
                 clickedFunction: function() {
                     PageController.goToPage(PageEnum.PageSettingsSplitTunneling)
                 }
@@ -96,8 +107,15 @@ PageType {
 
             DividerType {}
 
+        }
+
+        footer: ColumnLayout { // TODO(CyAn84): move to delegate,add DelegateChooser when have migrated to 6.9
+
+            width: listView.width
+
             LabelWithButtonType {
                 id: splitTunnelingButton2
+
                 visible: root.isAppSplitTinnelingEnabled
 
                 Layout.fillWidth: true
@@ -106,8 +124,6 @@ PageType {
                 descriptionText: qsTr("Allows you to use the VPN only for certain Apps")
                 rightImageSource: "qrc:/images/controls/chevron-right.svg"
 
-                parentFlickable: fl
-
                 clickedFunction: function() {
                     PageController.goToPage(PageEnum.PageSettingsAppSplitTunneling)
                 }
@@ -127,8 +143,6 @@ PageType {
                 descriptionText: qsTr("Blocks network connections without VPN")
                 rightImageSource: "qrc:/images/controls/chevron-right.svg"
 
-                parentFlickable: fl
-
                 clickedFunction: function() {
                     PageController.goToPage(PageEnum.PageSettingsKillSwitch)
                 }

client/ui/qml/Pages2/PageSettingsDns.qml

@@ -21,13 +21,21 @@ PageType {
         anchors.left: parent.left
         anchors.right: parent.right
         anchors.topMargin: 20
+
+        onFocusChanged: {
+            if (this.activeFocus) {
+                listView.positionViewAtBeginning()
+            }
+        }
     }
 
-    FlickableType {
+    ListViewType {
-        id: fl
+        id: listView
+
         anchors.top: backButton.bottom
         anchors.bottom: parent.bottom
-        contentHeight: content.height
+        anchors.right: parent.right
+        anchors.left: parent.left
 
         property var isServerFromApi: ServersModel.isServerFromApi(ServersModel.defaultIndex)
 
@@ -39,25 +47,23 @@ PageType {
             }
         }
 
-        ColumnLayout {
+        header: ColumnLayout {
-            id: content
+            width: listView.width
-
-            anchors.top: parent.top
-            anchors.left: parent.left
-            anchors.right: parent.right
-            anchors.leftMargin: 16
-            anchors.rightMargin: 16
-
             spacing: 16
 
             BaseHeaderType {
                 Layout.fillWidth: true
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
 
                 headerText: qsTr("DNS servers")
             }
 
             ParagraphTextType {
                 Layout.fillWidth: true
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
+                
                 text: qsTr("If AmneziaDNS is not used or installed")
             }
 
@@ -65,6 +71,9 @@ PageType {
                 id: primaryDns
 
                 Layout.fillWidth: true
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
+
                 headerText: qsTr("Primary DNS")
 
                 textField.text: SettingsController.primaryDns
@@ -77,6 +86,9 @@ PageType {
                 id: secondaryDns
 
                 Layout.fillWidth: true
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
+
                 headerText: qsTr("Secondary DNS")
 
                 textField.text: SettingsController.secondaryDns
@@ -84,10 +96,21 @@ PageType {
                     regularExpression: InstallController.ipAddressRegExp()
                 }
             }
+        }
+
+        model: 1 // fake model to force the ListView to be created without a model
+        spacing: 16
+
+        delegate: ColumnLayout {
+            width: listView.width
 
             BasicButtonType {
                 id: restoreDefaultButton
+
                 Layout.fillWidth: true
+                Layout.topMargin: 16
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
 
                 defaultColor: AmneziaStyle.color.transparent
                 hoveredColor: AmneziaStyle.color.translucentWhite
@@ -116,11 +139,16 @@ PageType {
                     showQuestionDrawer(headerText, "", yesButtonText, noButtonText, yesButtonFunction, noButtonFunction)
                 }
             }
+        }
+
+        footer: ColumnLayout {
+            width: listView.width
 
             BasicButtonType {
                 id: saveButton
 
                 Layout.fillWidth: true
+                Layout.margins: 16
 
                 text: qsTr("Save")
 
@@ -136,5 +164,4 @@ PageType {
             }
         }
     }
-
 }

client/ui/qml/Pages2/PageSettingsLogging.qml

@@ -23,9 +23,15 @@ PageType {
         anchors.left: parent.left
         anchors.right: parent.right
         anchors.topMargin: 20
+
+        onFocusChanged: {
+            if (this.activeFocus) {
+                listView.positionViewAtBeginning()
+            }
+        }
     }
 
-    ListView {
+    ListViewType {
         id: listView
 
         anchors.top: backButton.bottom
@@ -33,10 +39,6 @@ PageType {
         anchors.right: parent.right
         anchors.left: parent.left
 
-        property bool isFocusable: true
-
-        ScrollBar.vertical: ScrollBarType {}
-
         header: ColumnLayout {
             width: listView.width
 
@@ -101,8 +103,7 @@ PageType {
         }
 
         model: logTypes
-        clip: true
+
-        reuseItems: true
         snapMode: ListView.SnapOneItem
 
         delegate: ColumnLayout {

client/ui/qml/Pages2/PageSettingsServerData.qml

@@ -18,10 +18,6 @@ PageType {
 
     signal lastItemTabClickedSignal()
 
-    onFocusChanged: content.isServerWithWriteAccess ?
-                        labelWithButton.forceActiveFocus() :
-                        labelWithButton3.forceActiveFocus()
-
     Connections {
         target: InstallController
 
@@ -63,53 +59,73 @@ PageType {
         target: ServersModel
 
         function onProcessedServerIndexChanged() {
-            content.isServerWithWriteAccess = ServersModel.isProcessedServerHasWriteAccess()
+            listView.isServerWithWriteAccess = ServersModel.isProcessedServerHasWriteAccess()
         }
     }
 
-    FlickableType {
+    ListViewType {
-        id: fl
+        id: listView
-        anchors.top: parent.top
-        anchors.bottom: parent.bottom
-        contentHeight: content.height
-
-        ColumnLayout {
-            id: content
-
-            anchors.top: parent.top
-            anchors.left: parent.left
-            anchors.right: parent.right
 
         property bool isServerWithWriteAccess: ServersModel.isProcessedServerHasWriteAccess()
 
+        anchors.fill: parent
+
+        model: serverActions
+
+        delegate: ColumnLayout {
+            width: listView.width
+
             LabelWithButtonType {
-                id: labelWithButton
-                visible: content.isServerWithWriteAccess
                 Layout.fillWidth: true
 
-                text: qsTr("Check the server for previously installed Amnezia services")
+                visible: isVisible
-                descriptionText: qsTr("Add them to the application if they were not displayed")
+
+                text: title
+                descriptionText: description
+                textColor: tColor
 
                 clickedFunction: function() {
+                    clickedHandler()
+                }
+            }
+
+            DividerType {
+                visible: isVisible
+            }
+        }
+    }
+
+    property list<QtObject> serverActions: [
+        check,
+        reboot,
+        remove,
+        clear,
+        reset,
+        switch_to_premium,
+    ]
+
+    QtObject {
+        id: check
+
+        property bool isVisible: true
+        readonly property string title: qsTr("Check the server for previously installed Amnezia services")
+        readonly property string description: qsTr("Add them to the application if they were not displayed")
+        readonly property var tColor: AmneziaStyle.color.paleGray
+        readonly property var clickedHandler: function() {
             PageController.showBusyIndicator(true)
             InstallController.scanServerForInstalledContainers()
             PageController.showBusyIndicator(false)
         }
     }
 
-            DividerType {
+    QtObject {
-                visible: content.isServerWithWriteAccess
+        id: reboot
-            }
 
-            LabelWithButtonType {
+        property bool isVisible: true
-                id: labelWithButton2
+        readonly property string title: qsTr("Reboot server")
-                visible: content.isServerWithWriteAccess
+        readonly property string description: ""
-                Layout.fillWidth: true
+        readonly property var tColor: AmneziaStyle.color.vibrantRed
-
+        readonly property var clickedHandler: function() {
-                text: qsTr("Reboot server")
-                textColor: AmneziaStyle.color.vibrantRed
-
-                clickedFunction: function() {
             var headerText = qsTr("Do you want to reboot the server?")
             var descriptionText = qsTr("The reboot process may take approximately 30 seconds. Are you sure you wish to proceed?")
             var yesButtonText = qsTr("Continue")
@@ -123,32 +139,23 @@ PageType {
                     InstallController.rebootProcessedServer()
                     PageController.showBusyIndicator(false)
                 }
-                        if (!GC.isMobile()) {
-                            labelWithButton5.forceActiveFocus()
-                        }
             }
             var noButtonFunction = function() {
-                        if (!GC.isMobile()) {
+
-                            labelWithButton2.forceActiveFocus()
-                        }
             }
 
             showQuestionDrawer(headerText, descriptionText, yesButtonText, noButtonText, yesButtonFunction, noButtonFunction)
         }
     }
 
-            DividerType {
+    QtObject {
-                visible: content.isServerWithWriteAccess
+        id: remove
-            }
 
-            LabelWithButtonType {
+        property bool isVisible: true
-                id: labelWithButton3
+        readonly property string title: qsTr("Remove server from application")
-                Layout.fillWidth: true
+        readonly property string description: ""
-
+        readonly property var tColor: AmneziaStyle.color.vibrantRed
-                text: qsTr("Remove server from application")
+        readonly property var clickedHandler: function() {
-                textColor: AmneziaStyle.color.vibrantRed
-
-                clickedFunction: function() {
             var headerText = qsTr("Do you want to remove the server from application?")
             var descriptionText = qsTr("All installed AmneziaVPN services will still remain on the server.")
             var yesButtonText = qsTr("Continue")
@@ -162,31 +169,23 @@ PageType {
                     InstallController.removeProcessedServer()
                     PageController.showBusyIndicator(false)
                 }
-                        if (!GC.isMobile()) {
-                            labelWithButton5.forceActiveFocus()
-                        }
             }
             var noButtonFunction = function() {
-                        if (!GC.isMobile()) {
+
-                            labelWithButton3.forceActiveFocus()
-                        }
             }
 
             showQuestionDrawer(headerText, descriptionText, yesButtonText, noButtonText, yesButtonFunction, noButtonFunction)
         }
     }
 
-            DividerType {}
+    QtObject {
+        id: clear
 
-            LabelWithButtonType {
+        property bool isVisible: true
-                id: labelWithButton4
+        readonly property string title: qsTr("Clear server from Amnezia software")
-                visible: content.isServerWithWriteAccess
+        readonly property string description: ""
-                Layout.fillWidth: true
+        readonly property var tColor: AmneziaStyle.color.vibrantRed
-
+        readonly property var clickedHandler: function() {
-                text: qsTr("Clear server from Amnezia software")
-                textColor: AmneziaStyle.color.vibrantRed
-
-                clickedFunction: function() {
             var headerText = qsTr("Do you want to clear server from Amnezia software?")
             var descriptionText = qsTr("All users whom you shared a connection with will no longer be able to connect to it.")
             var yesButtonText = qsTr("Continue")
@@ -199,33 +198,23 @@ PageType {
                     PageController.goToPage(PageEnum.PageDeinstalling)
                     InstallController.removeAllContainers()
                 }
-                        if (!GC.isMobile()) {
-                            labelWithButton5.forceActiveFocus()
-                        }
             }
             var noButtonFunction = function() {
-                        if (!GC.isMobile()) {
+
-                            labelWithButton4.forceActiveFocus()
-                        }
             }
 
             showQuestionDrawer(headerText, descriptionText, yesButtonText, noButtonText, yesButtonFunction, noButtonFunction)
         }
     }
 
-            DividerType {
+    QtObject {
-                visible: content.isServerWithWriteAccess
+        id: reset
-            }
 
-            LabelWithButtonType {
+        property bool isVisible: ServersModel.getProcessedServerData("isServerFromTelegramApi")
-                id: labelWithButton5
+        readonly property string title: qsTr("Reset API config")
-                visible: ServersModel.getProcessedServerData("isServerFromTelegramApi")
+        readonly property string description: ""
-                Layout.fillWidth: true
+        readonly property var tColor: AmneziaStyle.color.vibrantRed
-
+        readonly property var clickedHandler: function() {
-                text: qsTr("Reset API config")
-                textColor: AmneziaStyle.color.vibrantRed
-
-                clickedFunction: function() {
             var headerText = qsTr("Do you want to reset API config?")
             var descriptionText = ""
             var yesButtonText = qsTr("Continue")
@@ -239,42 +228,25 @@ PageType {
                     InstallController.removeApiConfig(ServersModel.processedIndex)
                     PageController.showBusyIndicator(false)
                 }
-
-                        if (!GC.isMobile()) {
-                            labelWithButton5.forceActiveFocus()
-                        }
             }
             var noButtonFunction = function() {
-                        if (!GC.isMobile()) {
+
-                            labelWithButton5.forceActiveFocus()
-                        }
             }
 
             showQuestionDrawer(headerText, descriptionText, yesButtonText, noButtonText, yesButtonFunction, noButtonFunction)
         }
     }
 
-            DividerType {
+    QtObject {
-                visible: ServersModel.getProcessedServerData("isServerFromTelegramApi")
+        id: switch_to_premium
-            }
 
-            LabelWithButtonType {
+        property bool isVisible: ServersModel.getProcessedServerData("isServerFromTelegramApi")
-                id: labelWithButton6
+        readonly property string title: qsTr("Switch to the new Amnezia Premium subscription")
-                visible: ServersModel.getProcessedServerData("isServerFromTelegramApi") && ServersModel.processedServerIsPremium
+        readonly property string description: ""
-                Layout.fillWidth: true
+        readonly property var tColor: AmneziaStyle.color.vibrantRed
-
+        readonly property var clickedHandler: function() {
-                text: qsTr("Switch to the new Amnezia Premium subscription")
-                textColor: AmneziaStyle.color.vibrantRed
-
-                clickedFunction: function() {
             PageController.goToPageHome()
             ApiPremV1MigrationController.showMigrationDrawer()
         }
     }
-
-            DividerType {
-                visible: ServersModel.getProcessedServerData("isServerFromTelegramApi") && ServersModel.processedServerIsPremium
-            }
-        }
-    }
 }

client/ui/qml/Pages2/PageSettingsServerProtocol.qml

@@ -21,18 +21,31 @@ PageType {
 
     property bool isClearCacheVisible: ServersModel.isProcessedServerHasWriteAccess() && !ContainersModel.isServiceContainer(ContainersModel.getProcessedContainerIndex())
 
-    ColumnLayout {
+    BackButtonType {
-        id: header
+        id: backButton
 
         anchors.top: parent.top
         anchors.left: parent.left
         anchors.right: parent.right
-
         anchors.topMargin: 20
         
-        BackButtonType {
+        onFocusChanged: {
-            id: backButton
+            if (this.activeFocus) {
+                listView.positionViewAtBeginning()
             }
+        }
+    }
+
+    ListViewType {
+        id: listView
+
+        anchors.top: backButton.bottom
+        anchors.bottom: parent.bottom
+        anchors.right: parent.right
+        anchors.left: parent.left
+
+        header: ColumnLayout {
+            width: listView.width
 
             BaseHeaderType {
                 Layout.fillWidth: true
@@ -42,52 +55,16 @@ PageType {
 
                 headerText: ContainersModel.getProcessedContainerName() + qsTr(" settings")
             }
-
-        ListView {
-            id: protocols
-            Layout.fillWidth: true
-            height: protocols.contentItem.height
-            clip: true
-            interactive: true
-
-            property bool isFocusable: true
-
-            Keys.onTabPressed: {
-                FocusController.nextKeyTabItem()
-            }
-
-            Keys.onBacktabPressed: {
-                FocusController.previousKeyTabItem()
-            }
-
-            Keys.onUpPressed: {
-                FocusController.nextKeyUpItem()
-            }
-
-            Keys.onDownPressed: {
-                FocusController.nextKeyDownItem()
-            }
-
-            Keys.onLeftPressed: {
-                FocusController.nextKeyLeftItem()
-            }
-
-            Keys.onRightPressed: {
-                FocusController.nextKeyRightItem()
         }
 
         model: ProtocolsModel
 
-            delegate: Item {
+        delegate: ColumnLayout {
-                implicitWidth: protocols.width
-                implicitHeight: delegateContent.implicitHeight
-
-                ColumnLayout {
             id: delegateContent
 
-                    anchors.fill: parent
+            width: listView.width
 
-                    property bool isClientSettingsVisible: protocolIndex === ProtocolEnum.WireGuard || protocolIndex === ProtocolEnum.Awg
+            property bool isClientSettingsVisible: (protocolIndex === ProtocolEnum.WireGuard) || (protocolIndex === ProtocolEnum.Awg)
             property bool isServerSettingsVisible: ServersModel.isProcessedServerHasWriteAccess()
 
             LabelWithButtonType {
@@ -157,10 +134,10 @@ PageType {
                 visible: delegateContent.isServerSettingsVisible
             }
         }
-            }
 
         footer: ColumnLayout {
-                width: header.width
+
+            width: listView.width
 
             LabelWithButtonType {
                 id: clearCacheButton
@@ -188,10 +165,8 @@ PageType {
                         InstallController.clearCachedProfile()
                         PageController.showBusyIndicator(false)
                     }
+
                     var noButtonFunction = function() {
-                            // if (!GC.isMobile()) {
-                            //     focusItem.forceActiveFocus()
-                            // }
                     }
 
                     showQuestionDrawer(headerText, descriptionText, yesButtonText, noButtonText, yesButtonFunction, noButtonFunction)
@@ -205,10 +180,6 @@ PageType {
             }
 
             DividerType {
-                    Layout.fillWidth: true
-                    Layout.leftMargin: 16
-                    Layout.rightMargin: 16
-
                 visible: root.isClearCacheVisible
             }
 
@@ -239,9 +210,7 @@ PageType {
                         }
                     }
                     var noButtonFunction = function() {
-                            if (!GC.isMobile()) {
+
-                                focusItem.forceActiveFocus()
-                            }
                     }
 
                     showQuestionDrawer(headerText, descriptionText, yesButtonText, noButtonText, yesButtonFunction, noButtonFunction)
@@ -255,15 +224,8 @@ PageType {
             }
 
             DividerType {
-                    Layout.fillWidth: true
-                    Layout.leftMargin: 16
-                    Layout.rightMargin: 16
-
                 visible: ServersModel.isProcessedServerHasWriteAccess()
             }
         }
     }
-
-    }
 }
-

client/ui/qml/Pages2/PageSettingsServersList.qml

@@ -40,25 +40,20 @@ PageType {
         }
     }
 
-    ListView {
+    ListViewType {
         id: servers
         objectName: "servers"
 
         width: parent.width
         anchors.top: header.bottom
         anchors.topMargin: 16
+        anchors.bottom: parent.bottom
         anchors.left: parent.left
         anchors.right: parent.right
 
-        height: 500
-
-        property bool isFocusable: true
 
         model: ServersModel
 
-        clip: true
-        reuseItems: true
-
         delegate: Item {
             implicitWidth: servers.width
             implicitHeight: delegateContent.implicitHeight

client/ui/qml/Pages2/PageSettingsSplitTunneling.qml

@@ -161,7 +161,7 @@ PageType {
         }
     }
 
-    ListView {
+    ListViewType {
         id: listView
 
         anchors.top: header.bottom
@@ -172,8 +172,6 @@ PageType {
 
         enabled: root.pageEnabled
 
-        property bool isFocusable: true
-
         model: SortFilterProxyModel {
             id: proxySitesModel
             sourceModel: SitesModel
@@ -193,13 +191,7 @@ PageType {
             ]
         }
 
-        clip: true
-
-        reuseItems: true
-
         delegate: ColumnLayout {
-            id: delegateContent
-
             width: listView.width
 
             LabelWithButtonType {
@@ -236,7 +228,6 @@ PageType {
         }
     }
 
-
     Rectangle {
         anchors.fill: addSiteButton
         anchors.bottomMargin: -24
@@ -286,8 +277,8 @@ PageType {
                 moreActionsDrawer.openTriggered()
             }
 
-            Keys.onReturnPressed: this.clicked()
+            Keys.onReturnPressed: addSiteButtonImage.clicked()
-            Keys.onEnterPressed: this.clicked()
+            Keys.onEnterPressed: addSiteButtonImage.clicked()
         }
     }
 
@@ -402,22 +393,24 @@ PageType {
                 backButtonFunction: function() {
                     importSitesDrawer.closeTriggered()
                 }
+                
+                onFocusChanged: {
+                    if (this.activeFocus) {
+                        importSitesDrawerListView.positionViewAtBeginning()
+                    }
+                }
             }
 
-            FlickableType {
+            ListViewType {
+                id: importSitesDrawerListView
+
                 anchors.top: importSitesDrawerBackButton.bottom
                 anchors.left: parent.left
                 anchors.right: parent.right
                 anchors.bottom: parent.bottom
 
-                contentHeight: importSitesDrawerContent.height
+                header: ColumnLayout {
-
+                    width: importSitesDrawerListView.width
-                ColumnLayout {
-                    id: importSitesDrawerContent
-
-                    anchors.top: parent.top
-                    anchors.left: parent.left
-                    anchors.right: parent.right
 
                     Header2Type {
                         Layout.fillWidth: true
@@ -425,34 +418,58 @@ PageType {
 
                         headerText: qsTr("Import a list of sites")
                     }
+                }
+
+                model: importOptions
+
+                delegate: ColumnLayout {
+                    width: importSitesDrawerListView.width
 
                     LabelWithButtonType {
-                        id: importSitesButton2
                         Layout.fillWidth: true
+                        Layout.leftMargin: 16
+                        Layout.rightMargin: 16
 
-                        text: qsTr("Replace site list")
+                        text: title
 
                         clickedFunction: function() {
-                            var fileName = SystemController.getFileName(qsTr("Open sites file"),
+                            clickedHandler()
-                                                                        qsTr("Sites files (*.json)"))
-                            if (fileName !== "") {
-                                importSitesDrawerContent.importSites(fileName, true)
-                            }
                         }
                     }
 
                     DividerType {}
+                }
+            }
+        }
+    }
 
-                    LabelWithButtonType {
+    property list<QtObject> importOptions: [
-                        id: importSitesButton3
+        replaceOption,
-                        Layout.fillWidth: true
+        addOption,
-                        text: qsTr("Add imported sites to existing ones")
+    ]
 
-                        clickedFunction: function() {
+    QtObject {
+        id: replaceOption
+
+        readonly property string title: qsTr("Replace site list")
+        readonly property var clickedHandler: function() {
             var fileName = SystemController.getFileName(qsTr("Open sites file"),
                                                         qsTr("Sites files (*.json)"))
             if (fileName !== "") {
-                                importSitesDrawerContent.importSites(fileName, false)
+                root.importSites(fileName, true)
+            }
+        }
+    }
+
+    QtObject {
+        id: addOption
+
+        readonly property string title: qsTr("Add imported sites to existing ones")
+        readonly property var clickedHandler: function() {
+            var fileName = SystemController.getFileName(qsTr("Open sites file"),
+                                                        qsTr("Sites files (*.json)"))
+            if (fileName !== "") {
+                root.importSites(fileName, false)
             }
         }
     }
@@ -464,10 +481,4 @@ PageType {
         importSitesDrawer.closeTriggered()
         moreActionsDrawer.closeTriggered()
     }
-
-                    DividerType {}
-                }
-            }
-        }
-    }
 }

client/ui/qml/Pages2/PageSetupWizardApiServiceInfo.qml

@@ -15,25 +15,31 @@ import "../Components"
 PageType {
     id: root
 
-    FlickableType {
+    BackButtonType {
-        id: fl
+        id: backButton
-        anchors.top: parent.top
-        anchors.bottom: parent.bottom
-        contentHeight: content.height + continueButton.implicitHeight + continueButton.anchors.bottomMargin + continueButton.anchors.topMargin
-
-        ColumnLayout {
-            id: content
 
         anchors.top: parent.top
         anchors.left: parent.left
         anchors.right: parent.right
+        anchors.topMargin: 20
 
-            spacing: 0
+        onFocusChanged: {
-
+            if (this.activeFocus) {
-            BackButtonType {
+                listView.positionViewAtBeginning()
-                id: backButton
-                Layout.topMargin: 20
             }
+        }
+    }
+
+    ListViewType {
+        id: listView
+
+        anchors.top: backButton.bottom
+        anchors.bottom: parent.bottom
+        anchors.right: parent.right
+        anchors.left: parent.left
+
+        header: ColumnLayout {
+            width: listView.width
 
             BaseHeaderType {
                 Layout.fillWidth: true
@@ -45,53 +51,28 @@ PageType {
                 headerText: ApiServicesModel.getSelectedServiceData("name")
                 descriptionText: ApiServicesModel.getSelectedServiceData("serviceDescription")
             }
+        }
+
+        model: inputFields
+        spacing: 0
+
+        delegate: ColumnLayout {
+            width: listView.width
 
             LabelWithImageType {
                 Layout.fillWidth: true
                 Layout.margins: 16
 
-                imageSource: "qrc:/images/controls/map-pin.svg"
+                imageSource: imagePath
-                leftText: qsTr("For the region")
+                leftText: lText
-                rightText: ApiServicesModel.getSelectedServiceData("region")
+                rightText: rText
+            }
         }
 
-            LabelWithImageType {
+        footer: ColumnLayout {
-                Layout.fillWidth: true
+            width: listView.width
-                Layout.margins: 16
 
-                imageSource: "qrc:/images/controls/tag.svg"
+            spacing: 0
-                leftText: qsTr("Price")
-                rightText: ApiServicesModel.getSelectedServiceData("price")
-            }
-
-            LabelWithImageType {
-                Layout.fillWidth: true
-                Layout.margins: 16
-
-                imageSource: "qrc:/images/controls/history.svg"
-                leftText: qsTr("Work period")
-                rightText: ApiServicesModel.getSelectedServiceData("timeLimit")
-
-                visible: rightText !== ""
-            }
-
-            LabelWithImageType {
-                Layout.fillWidth: true
-                Layout.margins: 16
-
-                imageSource: "qrc:/images/controls/gauge.svg"
-                leftText: qsTr("Speed")
-                rightText: ApiServicesModel.getSelectedServiceData("speed")
-            }
-
-            LabelWithImageType {
-                Layout.fillWidth: true
-                Layout.margins: 16
-
-                imageSource: "qrc:/images/controls/info.svg"
-                leftText: qsTr("Features")
-                rightText: ""
-            }
 
             ParagraphTextType {
                 Layout.fillWidth: true
@@ -113,20 +94,15 @@ PageType {
                     cursorShape: parent.hoveredLink ? Qt.PointingHandCursor : Qt.ArrowCursor
                 }
             }
-        }
-    }
 
             BasicButtonType {
                 id: continueButton
 
-        anchors.right: parent.right
+                Layout.fillWidth: true
-        anchors.left: parent.left
+                Layout.topMargin: 32
-        anchors.bottom: parent.bottom
+                Layout.bottomMargin: 32
-
+                Layout.leftMargin: 16
-        anchors.topMargin: 32
+                Layout.rightMargin: 16
-        anchors.rightMargin: 16
-        anchors.leftMargin: 16
-        anchors.bottomMargin: 32
 
                 text: qsTr("Connect")
 
@@ -143,4 +119,59 @@ PageType {
                     }
                 }
             }
+        }
+    }
+
+    property list<QtObject> inputFields: [
+        region,
+        price,
+        timeLimit,
+        speed,
+        features
+    ]
+
+    QtObject {
+        id: region
+
+        readonly property string imagePath: "qrc:/images/controls/map-pin.svg"
+        readonly property string lText: qsTr("For the region")
+        readonly property string rText: ApiServicesModel.getSelectedServiceData("region")
+        property bool isVisible: true
+    }
+
+    QtObject {
+        id: price
+
+        readonly property string imagePath: "qrc:/images/controls/tag.svg"
+        readonly property string lText: qsTr("Price")
+        readonly property string rText: ApiServicesModel.getSelectedServiceData("price")
+        property bool isVisible: true
+    }
+
+    QtObject {
+        id: timeLimit
+
+        readonly property string imagePath: "qrc:/images/controls/history.svg"
+        readonly property string lText: qsTr("Work period")
+        readonly property string rText: ApiServicesModel.getSelectedServiceData("timeLimit")
+        property bool isVisible: rText !== ""
+    }
+
+    QtObject {
+        id: speed
+
+        readonly property string imagePath: "qrc:/images/controls/gauge.svg"
+        readonly property string lText: qsTr("Speed")
+        readonly property string rText: ApiServicesModel.getSelectedServiceData("speed")
+        property bool isVisible: true
+    }
+
+    QtObject {
+        id: features
+
+        readonly property string imagePath: "qrc:/images/controls/info.svg"
+        readonly property string lText: qsTr("Features")
+        readonly property string rText: ""
+        property bool isVisible: true
+    }
 }

client/ui/qml/Pages2/PageSetupWizardApiServicesList.qml

@@ -14,62 +14,54 @@ import "../Config"
 PageType {
     id: root
 
-    ColumnLayout {
+    BackButtonType {
-        id: header
+        id: backButton
 
         anchors.top: parent.top
         anchors.left: parent.left
         anchors.right: parent.right
-
-        spacing: 0
-
-        BackButtonType {
-            id: backButton
         Layout.topMargin: 20
+
+        onActiveFocusChanged: {
+            if(backButton.enabled && backButton.activeFocus) {
+                listView.positionViewAtBeginning()
             }
+        }
+    }
+
+    ListViewType {
+        id: listView
+
+        anchors.top: backButton.bottom
+        anchors.right: parent.right
+        anchors.left: parent.left
+        anchors.bottom: parent.bottom
+        anchors.topMargin: 16
+
+        header: ColumnLayout {
+            width: listView.width
 
             BaseHeaderType {
                 Layout.fillWidth: true
-            Layout.topMargin: 8
                 Layout.rightMargin: 16
                 Layout.leftMargin: 16
-            Layout.bottomMargin: 16
+                Layout.bottomMargin: 24
 
                 headerText: qsTr("VPN by Amnezia")
                 descriptionText: qsTr("Choose a VPN service that suits your needs.")
             }
         }
 
-    ListView {
-        id: servicesListView
-
-        anchors.top: header.bottom
-        anchors.right: parent.right
-        anchors.left: parent.left
-        anchors.bottom: parent.bottom
-        anchors.topMargin: 16
         spacing: 0
 
-        property bool isFocusable: true
-        
-        clip: true
-        reuseItems: true
-
         model: ApiServicesModel
 
-        ScrollBar.vertical: ScrollBarType {}
+        delegate: ColumnLayout {
 
-        delegate: Item {
+            width: listView.width
-            implicitWidth: servicesListView.width
-            implicitHeight: delegateContent.implicitHeight
 
             enabled: isServiceAvailable
 
-            ColumnLayout {
-                id: delegateContent
-
-                anchors.fill: parent
-
             CardWithIconsType {
                 id: card
 
@@ -91,9 +83,8 @@ PageType {
                     }
                 }
                 
-                    Keys.onEnterPressed: this.clicked()
+                Keys.onEnterPressed: clicked()
-                    Keys.onReturnPressed: this.clicked()
+                Keys.onReturnPressed: clicked()
-                }
             }
         }
     }

client/ui/qml/Pages2/PageSetupWizardConfigSource.qml

@@ -27,21 +27,11 @@ PageType {
         }
     }
 
-    ListView {
+    ListViewType {
         id: listView
 
         anchors.fill: parent
 
-        property bool isFocusable: true
-
-        ScrollBar.vertical: ScrollBarType {}
-
-        model: variants
-
-        clip: true
-
-        reuseItems: true
-
         header: ColumnLayout {
             width: listView.width
 
@@ -216,6 +206,8 @@ PageType {
             }
         }
 
+        model: variants
+
         delegate: ColumnLayout {
             width: listView.width
 

client/ui/qml/Pages2/PageSetupWizardCredentials.qml

@@ -28,41 +28,14 @@ PageType {
         }
     }
 
-    ListView {
+    ListViewType {
         id: listView
+
         anchors.top: backButton.bottom
         anchors.bottom: parent.bottom
         anchors.right: parent.right
         anchors.left: parent.left
 
-        property bool isFocusable: true
-
-        Keys.onTabPressed: {
-            FocusController.nextKeyTabItem()
-        }
-
-        Keys.onBacktabPressed: {
-            FocusController.previousKeyTabItem()
-        }
-
-        Keys.onUpPressed: {
-            FocusController.nextKeyUpItem()
-        }
-
-        Keys.onDownPressed: {
-            FocusController.nextKeyDownItem()
-        }
-
-        Keys.onLeftPressed: {
-            FocusController.nextKeyLeftItem()
-        }
-
-        Keys.onRightPressed: {
-            FocusController.nextKeyRightItem()
-        }
-
-        ScrollBar.vertical: ScrollBarType {}
-
         header: ColumnLayout {
             width: listView.width
 
@@ -78,8 +51,6 @@ PageType {
 
         model: inputFields
         spacing: 16
-        clip: true
-        reuseItems: true
 
         delegate: ColumnLayout {
             width: listView.width

client/ui/qml/Pages2/PageSetupWizardEasy.qml

@@ -20,6 +20,7 @@ PageType {
 
     SortFilterProxyModel {
         id: proxyContainersModel
+        
         sourceModel: ContainersModel
         filters: [
             ValueFilter {
@@ -40,70 +41,64 @@ PageType {
         anchors.left: parent.left
         anchors.right: parent.right
         anchors.topMargin: 20
+
+        onActiveFocusChanged: {
+            if(backButton.enabled && backButton.activeFocus) {
+                listView.positionViewAtBeginning()
+            }
         }
-
-    FlickableType {
-        id: fl
-        anchors.top: backButton.bottom
-        anchors.bottom: parent.bottom
-        contentHeight: content.implicitHeight + setupLaterButton.anchors.bottomMargin
-
-        Column {
-            id: content
-
-            anchors.top: parent.top
-            anchors.left: parent.left
-            anchors.right: parent.right
-            anchors.rightMargin: 16
-            anchors.leftMargin: 16
-
-            spacing: 16
-
-            BaseHeaderType {
-                id: header
-
-                implicitWidth: parent.width
-                headerTextMaximumLineCount: 10
-
-                headerText: qsTr("Choose Installation Type")
     }
 
     ButtonGroup {
         id: buttonGroup
     }
 
-            ListView {
+    ListViewType {
-                id: containers
+        id: listView
-                width: parent.width
-                height: containers.contentItem.height
-                spacing: 16
-
-                currentIndex: 0
-                clip: true
-                interactive: false
-                model: proxyContainersModel
 
         property int dockerContainer
         property int containerDefaultPort
         property int containerDefaultTransportProto
 
-                property bool isFocusable: true
+        anchors.top: backButton.bottom
-
+        anchors.bottom: parent.bottom
-                delegate: Item {
-                    implicitWidth: containers.width
-                    implicitHeight: delegateContent.implicitHeight
-
-                    ColumnLayout {
-                        id: delegateContent
-
-                        anchors.top: parent.top
         anchors.left: parent.left
         anchors.right: parent.right
 
+        spacing: 16
+
+        header: ColumnLayout {
+            width: listView.width
+
+            spacing: 16
+
+            BaseHeaderType {
+                id: header
+
+                Layout.fillWidth: true
+                Layout.rightMargin: 16
+                Layout.leftMargin: 16
+                Layout.bottomMargin: 16
+
+                headerTextMaximumLineCount: 10
+
+                headerText: qsTr("Choose Installation Type")
+            }
+        }
+
+        model: proxyContainersModel
+        currentIndex: 0
+
+        delegate: ColumnLayout {
+            width: listView.width
+
             CardType {
                 id: card
 
                 Layout.fillWidth: true
+                Layout.rightMargin: 16
+                Layout.leftMargin: 16
+                Layout.bottomMargin: 16
 
                 headerText: easySetupHeader
                 bodyText: easySetupDescription
@@ -114,33 +109,30 @@ PageType {
                     isEasySetup = true
                     var defaultContainerProto =  ContainerProps.defaultProtocol(dockerContainer)
 
-                                containers.dockerContainer = dockerContainer
+                    listView.dockerContainer = dockerContainer
-                                containers.containerDefaultPort = ProtocolProps.getPortForInstall(defaultContainerProto)
+                    listView.containerDefaultPort = ProtocolProps.getPortForInstall(defaultContainerProto)
-                                containers.containerDefaultTransportProto = ProtocolProps.defaultTransportProto(defaultContainerProto)
+                    listView.containerDefaultTransportProto = ProtocolProps.defaultTransportProto(defaultContainerProto)
                 }
 
-                            Keys.onEnterPressed: this.clicked()
                 Keys.onReturnPressed: this.clicked()
-                        }
+                Keys.onEnterPressed: this.clicked()
             }
         }
 
-                Component.onCompleted: {
+        footer: ColumnLayout {
-                    var item = containers.itemAtIndex(containers.currentIndex)
+            width: listView.width
-                    if (item !== null) {
+            spacing: 16
-                        var button = item.children[0].children[0]
-                        button.checked = true
-                        button.clicked()
-                    }
-                }
-            }
 
             DividerType {
-                implicitWidth: parent.width
+                Layout.fillWidth: true
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
             }
 
             CardType {
-                implicitWidth: parent.width
+                Layout.fillWidth: true
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
 
                 headerText: qsTr("Manual")
                 bodyText: qsTr("Choose a VPN protocol")
@@ -149,6 +141,7 @@ PageType {
 
                 onClicked: function() {
                     isEasySetup = false
+                    checked = true
                 }
 
                 Keys.onEnterPressed: this.clicked()
@@ -158,19 +151,19 @@ PageType {
             BasicButtonType {
                 id: continueButton
 
-                implicitWidth: parent.width
+                Layout.fillWidth: true
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
 
                 text: qsTr("Continue")
 
-                parentFlickable: fl
-
                 clickedFunc: function() {
                     if (root.isEasySetup) {
-                        ContainersModel.setProcessedContainerIndex(containers.dockerContainer)
+                        ContainersModel.setProcessedContainerIndex(listView.dockerContainer)
                         PageController.goToPage(PageEnum.PageSetupWizardInstalling)
-                        InstallController.install(containers.dockerContainer,
+                        InstallController.install(listView.dockerContainer,
-                                                  containers.containerDefaultPort,
+                                                  listView.containerDefaultPort,
-                                                  containers.containerDefaultTransportProto)
+                                                  listView.containerDefaultTransportProto)
                     } else {
                         PageController.goToPage(PageEnum.PageSetupWizardProtocols)
                     }
@@ -180,9 +173,11 @@ PageType {
             BasicButtonType {
                 id: setupLaterButton
 
-                implicitWidth: parent.width
+                Layout.fillWidth: true
-                anchors.topMargin: 8
+                Layout.topMargin: 8
-                anchors.bottomMargin: 24
+                Layout.bottomMargin: 24
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
 
                 defaultColor: AmneziaStyle.color.transparent
                 hoveredColor: AmneziaStyle.color.translucentWhite
@@ -191,9 +186,6 @@ PageType {
                 textColor: AmneziaStyle.color.paleGray
                 borderWidth: 1
 
-                Keys.onTabPressed: lastItemTabClicked(focusItem)
-                parentFlickable: fl
-
                 visible: {
                     if (PageController.isTriggeredByConnectButton()) {
                         PageController.setTriggeredByConnectButton(false)
@@ -211,5 +203,15 @@ PageType {
                 }
             }
         }
+
+        Component.onCompleted: {
+            var item = listView.itemAtIndex(listView.currentIndex)
+            if (item !== null) {
+                var button = item.children[0]
+                button.checked = true
+                button.clicked()
+            }
+        }
     }
 }
+

client/ui/qml/Pages2/PageSetupWizardInstalling.qml

@@ -85,42 +85,23 @@ PageType {
         ]
     }
 
-    FlickableType {
+    ListViewType {
+        id: listView
+
         anchors.fill: parent
-        contentHeight: content.height
 
-        Column {
-            id: content
-
-            anchors.top: parent.top
-            anchors.left: parent.left
-            anchors.right: parent.right
-
-            spacing: 16
-
-            ListView {
-                id: container
-                width: parent.width
-                height: container.contentItem.height
         currentIndex: -1
-                clip: true
+
-                interactive: false
         model: proxyContainersModel
 
-                delegate: Item {
+        delegate: ColumnLayout {
-                    implicitWidth: container.width
+            width: listView.width
-                    implicitHeight: delegateContent.implicitHeight
-
-                    ColumnLayout {
-                        id: delegateContent
-
-                        anchors.fill: parent
-                        anchors.rightMargin: 16
-                        anchors.leftMargin: 16
 
             BaseHeaderType {
                 Layout.fillWidth: true
                 Layout.topMargin: 20
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
 
                 headerText: qsTr("Installing")
                 descriptionText: name
@@ -131,6 +112,8 @@ PageType {
 
                 Layout.fillWidth: true
                 Layout.topMargin: 32
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
 
                 Timer {
                     id: timer
@@ -149,6 +132,8 @@ PageType {
 
                 Layout.fillWidth: true
                 Layout.topMargin: 8
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
 
                 text: root.progressBarText
             }
@@ -158,6 +143,8 @@ PageType {
 
                 Layout.fillWidth: true
                 Layout.topMargin: 24
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
 
                 visible: root.isCancelButtonVisible
 
@@ -170,7 +157,4 @@ PageType {
             }
         }
     }
-            }
-        }
-    }
 }

client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml

@@ -29,77 +29,42 @@ PageType {
         ]
     }
 
-    FlickableType {
+    BackButtonType {
-        anchors.fill: parent
+        id: backButton
-        contentHeight: content.height
-
-        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
 
-            ListView {
-                id: processedContainerListView
-                width: parent.width
-                height: contentItem.height
         currentIndex: -1
-                clip: true
+
-                interactive: false
         model: proxyContainersModel
 
-                property bool isFocusable: true
+        delegate: ColumnLayout {
-
+            width: listView.width
-                Keys.onTabPressed: {
-                    FocusController.nextKeyTabItem()
-                }
-
-                Keys.onBacktabPressed: {
-                    FocusController.previousKeyTabItem()
-                }
-
-                Keys.onUpPressed: {
-                    FocusController.nextKeyUpItem()
-                }
-
-                Keys.onDownPressed: {
-                    FocusController.nextKeyDownItem()
-                }
-
-                Keys.onLeftPressed: {
-                    FocusController.nextKeyLeftItem()
-                }
-
-                Keys.onRightPressed: {
-                    FocusController.nextKeyRightItem()
-                }
-
-                delegate: Item {
-                    implicitWidth: processedContainerListView.width
-                    implicitHeight: (delegateContent.implicitHeight > root.height) ? delegateContent.implicitHeight : root.height
-
-                    property alias port:port
-
-                    ColumnLayout {
-                        id: delegateContent
-
-                        anchors.fill: parent
-                        anchors.rightMargin: 16
-                        anchors.leftMargin: 16
-
-                        BackButtonType {
-                            id: backButton
-
-                            Layout.topMargin: 20
-                            Layout.rightMargin: -16
-                            Layout.leftMargin: -16
-                        }
 
             BaseHeaderType {
                 id: header
 
                 Layout.fillWidth: true
+                Layout.rightMargin: 16
+                Layout.leftMargin: 16
 
                 headerText: qsTr("Installing %1").arg(name)
                 descriptionText: description
@@ -109,7 +74,8 @@ PageType {
                 id: showDetailsButton
 
                 Layout.topMargin: 16
-                            Layout.leftMargin: -8
+                Layout.rightMargin: 16
+                Layout.leftMargin: 16
 
                 implicitHeight: 32
 
@@ -120,7 +86,6 @@ PageType {
                 textColor: AmneziaStyle.color.goldenApricot
 
                 text: qsTr("More detailed")
-                            KeyNavigation.tab: transportProtoSelector
 
                 clickedFunc: function() {
                     showDetailsDrawer.openTriggered()
@@ -149,39 +114,40 @@ PageType {
                         }
                     }
 
-                                FlickableType {
+                    ListViewType {
-                                    id: fl
+                        id: showDetailsListView
+
                         anchors.top: showDetailsBackButton.bottom
                         anchors.left: parent.left
                         anchors.right: parent.right
                         anchors.bottom: parent.bottom
-                                    contentHeight: {
-                                        var emptySpaceHeight = parent.height - showDetailsBackButton.implicitHeight - showDetailsBackButton.anchors.topMargin
-                                        return (showDetailsDrawerContent.height > emptySpaceHeight) ?
-                                                    showDetailsDrawerContent.height : emptySpaceHeight
-                                    }
 
-                                    ColumnLayout {
+                        header: ColumnLayout {
-                                        id: showDetailsDrawerContent
+                            width: showDetailsListView.width
-
-                                        anchors.top: parent.top
-                                        anchors.left: parent.left
-                                        anchors.right: parent.right
-                                        anchors.rightMargin: 16
-                                        anchors.leftMargin: 16
 
                             Header2Type {
                                 id: showDetailsDrawerHeader
+
                                 Layout.fillWidth: true
                                 Layout.topMargin: 16
+                                Layout.rightMargin: 16
+                                Layout.leftMargin: 16
 
                                 headerText: name
                             }
+                        }
+
+                        model: 1 // fake model to force the ListView to be created without a model
+
+                        delegate: ColumnLayout {
+                            width: showDetailsListView.width
 
                             ParagraphTextType {
                                 Layout.fillWidth: true
                                 Layout.topMargin: 16
                                 Layout.bottomMargin: 16
+                                Layout.leftMargin: 16
+                                Layout.rightMargin: 16
 
                                 text: detailedDescription
                                 textFormat: Text.MarkdownText
@@ -189,14 +155,22 @@ PageType {
 
                             Rectangle {
                                 Layout.fillHeight: true
+                                Layout.leftMargin: 16
+                                Layout.rightMargin: 16
+
                                 color: AmneziaStyle.color.transparent
                             }
+                        }
+
+                        footer: ColumnLayout {
+                            width: showDetailsListView.width
 
                             BasicButtonType {
                                 id: showDetailsCloseButton
                                 Layout.fillWidth: true
                                 Layout.bottomMargin: 32
-                                            parentFlickable: fl
+                                Layout.leftMargin: 16
+                                Layout.rightMargin: 16
 
                                 text: qsTr("Close")
 
@@ -213,6 +187,8 @@ PageType {
                 id: transportProtoHeader
 
                 Layout.topMargin: 16
+                Layout.rightMargin: 16
+                Layout.leftMargin: 16
 
                 text: qsTr("Network protocol")
             }
@@ -221,6 +197,9 @@ PageType {
                 id: transportProtoSelector
 
                 Layout.fillWidth: true
+                Layout.rightMargin: 16
+                Layout.leftMargin: 16
+
                 rootWidth: root.width
             }
 
@@ -229,6 +208,8 @@ PageType {
 
                 Layout.fillWidth: true
                 Layout.topMargin: 16
+                Layout.rightMargin: 16
+                Layout.leftMargin: 16
 
                 headerText: qsTr("Port")
                 textField.maximumLength: 5
@@ -237,6 +218,9 @@ PageType {
 
             Rectangle {
                 Layout.fillHeight: true
+                Layout.rightMargin: 16
+                Layout.leftMargin: 16
+
                 color: AmneziaStyle.color.transparent
             }
 
@@ -245,6 +229,8 @@ PageType {
 
                 Layout.fillWidth: true
                 Layout.bottomMargin: 32
+                Layout.rightMargin: 16
+                Layout.leftMargin: 16
 
                 text: qsTr("Install")
 
@@ -278,7 +264,4 @@ PageType {
             }
         }
     }
-            }
-        }
-    }
 }

client/ui/qml/Pages2/PageSetupWizardProtocols.qml

@@ -42,19 +42,21 @@ PageType {
         anchors.right: parent.right
 
         anchors.topMargin: 20
+
+        onActiveFocusChanged: {
+            if(backButton.enabled && backButton.activeFocus) {
+                listView.positionViewAtBeginning()
+            }
+        }
     }
 
-    ListView {
+    ListViewType {
         id: listView
         anchors.top: backButton.bottom
         anchors.bottom: parent.bottom
         anchors.right: parent.right
         anchors.left: parent.left
 
-        property bool isFocusable: true
-
-        ScrollBar.vertical: ScrollBarType {}
-
         header: ColumnLayout {
             width: listView.width
 
@@ -72,9 +74,8 @@ PageType {
         }
 
         model: proxyContainersModel
-        clip: true
+
         spacing: 0
-        reuseItems: true
         snapMode: ListView.SnapToItem
 
         delegate: ColumnLayout {
@@ -87,9 +88,9 @@ PageType {
                 descriptionText: description
                 rightImageSource: "qrc:/images/controls/chevron-right.svg"
 
-                clickedFunction: function() {
+                clickedFunction: function () {
-                    ContainersModel.setProcessedContainerIndex(proxyContainersModel.mapToSource(index))
+                    ContainersModel.setProcessedContainerIndex(proxyContainersModel.mapToSource(index));
-                    PageController.goToPage(PageEnum.PageSetupWizardProtocolSettings)
+                    PageController.goToPage(PageEnum.PageSetupWizardProtocolSettings);
                 }
             }
 

client/ui/qml/Pages2/PageSetupWizardTextKey.qml

@@ -13,25 +13,31 @@ import "../Config"
 PageType {
     id: root
 
-    FlickableType {
+    BackButtonType {
-        id: fl
+        id: backButton
-        anchors.top: parent.top
-        anchors.bottom: parent.bottom
-        contentHeight: content.height
-
-        ColumnLayout {
-            id: content
 
         anchors.top: parent.top
         anchors.left: parent.left
         anchors.right: parent.right
+        anchors.topMargin: 20
 
-            spacing: 16
+        onFocusChanged: {
-
+            if (this.activeFocus) {
-            BackButtonType {
+                listView.positionViewAtBeginning()
-                id: backButton
-                Layout.topMargin: 20
             }
+        }
+    }
+
+    ListViewType {
+        id: listView
+
+        anchors.top: backButton.bottom
+        anchors.bottom: parent.bottom
+        anchors.right: parent.right
+        anchors.left: parent.left
+
+        header: ColumnLayout {
+            width: listView.width
 
             BaseHeaderType {
                 Layout.fillWidth: true
@@ -41,6 +47,13 @@ PageType {
                 headerText: qsTr("Connection key")
                 descriptionText: qsTr("A line that starts with vpn://...")
             }
+        }
+
+        spacing: 16
+        model: 1 // fake model to force the ListView to be created without a model
+
+        delegate: ColumnLayout {
+            width: listView.width
 
             TextFieldWithHeaderType {
                 id: textKey
@@ -60,17 +73,18 @@ PageType {
                 }
             }
         }
-    }
+
+        footer: ColumnLayout {
+            width: listView.width
 
             BasicButtonType {
                 id: continueButton
 
-        anchors.bottom: parent.bottom
+                Layout.fillWidth: true
-        anchors.left: parent.left
+                Layout.rightMargin: 16
-        anchors.right: parent.right
+                Layout.leftMargin: 16
-        anchors.rightMargin: 16
+                Layout.topMargin: 16
-        anchors.leftMargin: 16
+                Layout.bottomMargin: 32
-        anchors.bottomMargin: 32
 
                 text: qsTr("Continue")
 
@@ -80,4 +94,6 @@ PageType {
                     }
                 }
             }
+        }
+    }
 }

client/ui/qml/Pages2/PageSetupWizardViewConfig.qml

@@ -23,6 +23,12 @@ PageType {
         anchors.left: parent.left
         anchors.right: parent.right
         anchors.topMargin: 20
+        
+        onActiveFocusChanged: {
+            if(backButton.enabled && backButton.activeFocus) {
+                listView.positionViewAtBeginning()
+            }
+        }
     }
 
     Connections {
@@ -46,27 +52,29 @@ PageType {
         }
     }
 
-    FlickableType {
+    ListViewType {
-        id: fl
+        id: listView
+
         anchors.top: backButton.bottom
         anchors.bottom: parent.bottom
-        contentHeight: content.implicitHeight + connectButton.implicitHeight
-
-        ColumnLayout {
-            id: content
-
-            anchors.top: parent.top
-            anchors.left: parent.left
         anchors.right: parent.right
-            anchors.rightMargin: 16
+        anchors.left: parent.left
-            anchors.leftMargin: 16
+
+        header: ColumnLayout {
+            width: listView.width
 
             BaseHeaderType {
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
+                
                 headerText: qsTr("New connection")
             }
 
             RowLayout {
                 Layout.topMargin: 32
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
+
                 spacing: 8
 
                 visible: fileName.text !== ""
@@ -88,7 +96,9 @@ PageType {
             BasicButtonType {
                 id: showContentButton
                 Layout.topMargin: 16
-                Layout.leftMargin: -8
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
+
                 implicitHeight: 32
 
                 defaultColor: AmneziaStyle.color.transparent
@@ -99,8 +109,6 @@ PageType {
 
                 text: showContent ? qsTr("Collapse content") : qsTr("Show content")
 
-                parentFlickable: fl
-
                 clickedFunc: function() {
                     showContent = !showContent
                 }
@@ -108,16 +116,28 @@ PageType {
 
             CheckBoxType {
                 id: cloakingCheckBox
+                objectName: "cloakingCheckBox"
 
                 visible: ImportController.isNativeWireGuardConfig()
 
                 Layout.fillWidth: true
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
+
                 text: qsTr("Enable WireGuard obfuscation. It may be useful if WireGuard is blocked on your provider.")
             }
+        }
+
+        model: 1 // fake model to force the ListView to be created without a model
+
+        delegate: ColumnLayout { // TODO(CyAn84): add DelegateChooser after have migrated to 6.9
+            width: listView.width
 
             WarningType {
-                Layout.topMargin: 16
                 Layout.fillWidth: true
+                Layout.topMargin: 16
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
 
                 textString: ImportController.getMaliciousWarningText()
                 textFormat: Qt.RichText
@@ -130,8 +150,10 @@ PageType {
             }
 
             WarningType {
-                Layout.topMargin: 16
                 Layout.fillWidth: true
+                Layout.topMargin: 16
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
 
                 textString: qsTr("Use connection codes only from sources you trust. Codes from public sources may have been created to intercept your data.")
 
@@ -140,7 +162,10 @@ PageType {
 
             Rectangle {
                 Layout.fillWidth: true
+                Layout.topMargin: 16
                 Layout.bottomMargin: 48
+                Layout.rightMargin: 16
+                Layout.leftMargin: 16
 
                 implicitHeight: configContent.implicitHeight
 
@@ -161,35 +186,39 @@ PageType {
                 }
             }
         }
-    }
 
-    Rectangle {
+        footer: ColumnLayout {
-        anchors.fill: columnContent
+            width: listView.width
-        anchors.bottomMargin: -24
-        color: AmneziaStyle.color.midnightBlack
-        opacity: 0.8
-    }
-
-    ColumnLayout {
-        id: columnContent
-        anchors.bottom: parent.bottom
-        anchors.left: parent.left
-        anchors.right: parent.right
-        anchors.rightMargin: 16
-        anchors.leftMargin: 16
 
             BasicButtonType {
                 id: connectButton
+
                 Layout.fillWidth: true
+                Layout.topMargin: 16
                 Layout.bottomMargin: 32
+                Layout.rightMargin: 16
+                Layout.leftMargin: 16
 
                 text: qsTr("Connect")
                 clickedFunc: function() {
-                if (cloakingCheckBox.checked) {
+                    const headerItem = listView.headerItem;
+                    if (!headerItem) {
+                        console.error("Header item not found in ListView")
+                        return
+                    }
+
+                    const cloakingCheckBoxItem = listView.findChildWithObjectName(headerItem.children, "cloakingCheckBox");
+                    if (!cloakingCheckBoxItem) {
+                        console.error("cloakingCheckBox not found")
+                        return
+                    }
+
+                    if (cloakingCheckBoxItem.checked) {
                         ImportController.processNativeWireGuardConfig()
                     }
                     ImportController.importConfig()
                 }
             }
         }
+    }
 }

client/ui/qml/Pages2/PageShare.qml

@@ -510,9 +510,6 @@ PageType {
                 text: qsTr("Share")
                 leftImageSource: "qrc:/images/controls/share-2.svg"
 
-
-                parentFlickable: a
-
                 clickedFunc: function(){
                     if (clientNameTextField.textField.text !== "") {
                         ExportController.generateConfig(root.connectionTypesModel[exportTypeSelector.currentIndex].type)

client/ui/qml/Pages2/PageShareFullAccess.qml

@@ -26,27 +26,29 @@ PageType {
         anchors.left: parent.left
         anchors.right: parent.right
         anchors.topMargin: 20
+
+        onFocusChanged: {
+            if (this.activeFocus) {
+                listView.positionViewAtBeginning()
+            }
+        }
     }
 
-    FlickableType {
+    ListViewType {
+        id: listView
+
         anchors.top: backButton.bottom
         anchors.bottom: parent.bottom
-        contentHeight: content.height
-
-        ColumnLayout {
-            id: content
-
-            anchors.top: parent.top
-            anchors.left: parent.left
         anchors.right: parent.right
+        anchors.left: parent.left
 
-            anchors.rightMargin: 16
+        header: ColumnLayout {
-            anchors.leftMargin: 16
+            width: listView.width
-
-            spacing: 0
 
             BaseHeaderType {
                 Layout.fillWidth: true
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
                 Layout.topMargin: 24
 
                 headerText: qsTr("Full access to the server and VPN")
@@ -54,6 +56,8 @@ PageType {
 
             ParagraphTextType {
                 Layout.fillWidth: true
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
                 Layout.topMargin: 24
                 Layout.bottomMargin: 24
 
@@ -64,11 +68,14 @@ PageType {
 
             DropDownType {
                 id: serverSelector
+                objectName: "serverSelector"
 
                 signal severSelectorIndexChanged
                 property int currentIndex: 0
 
                 Layout.fillWidth: true
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
                 Layout.topMargin: 16
 
                 drawerHeight: 0.4375
@@ -118,11 +125,20 @@ PageType {
                     }
                 }
             }
+        }
+
+        model: 1 // fake model to force the ListView to be created without a model
+        spacing: 0
+
+        delegate: ColumnLayout {
+            width: listView.width
 
             BasicButtonType {
                 id: shareButton
                 Layout.fillWidth: true
-                Layout.topMargin: 40
+                Layout.topMargin: 32
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
 
                 text: qsTr("Share")
                 leftImageSource: "qrc:/images/controls/share-2.svg"
@@ -146,5 +162,9 @@ PageType {
         }
     }
 
-}
+    ShareConnectionDrawer {
+        id: shareConnectionDrawer
 
+        anchors.fill: parent
+    }
+}