Merge 4a8877c2ed into 979ab42c5a

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: {
@@ -207,6 +207,7 @@ void ListViewFocusController::focusNextItem()
     m_focusedItemIndex++;
     m_focusedItem = qobject_cast<QQuickItem *>(m_focusChain.at(m_focusedItemIndex));
     m_focusedItem->forceActiveFocus(Qt::TabFocusReason);
+    qDebug() << "Next focus is set to item: " << m_focusedItem;
 }
 
 void ListViewFocusController::focusPreviousItem()
@@ -238,6 +239,7 @@ void ListViewFocusController::resetFocusChain()
     m_focusChain.clear();
     m_focusedItem = nullptr;
     m_focusedItemIndex = -1;
+    qDebug() << "Focus chain was reset";
 }
 
 void ListViewFocusController::reloadFocusChain()

client/ui/models/protocols/openvpnConfigModel.cpp

@@ -2,72 +2,128 @@
 
 #include "protocols/protocols_defs.h"
 
-OpenVpnConfigModel::OpenVpnConfigModel(QObject *parent) : QAbstractListModel(parent)
+OpenVpnConfigModel::OpenVpnConfigModel(QObject *parent)
+    : QObject(parent)
 {
 }
 
-int OpenVpnConfigModel::rowCount(const QModelIndex &parent) const
+QString OpenVpnConfigModel::subnetAddress() const
 {
-    Q_UNUSED(parent);
-    return 1;
+    return m_protocolConfig.value(amnezia::config_key::subnet_address).toString(amnezia::protocols::openvpn::defaultSubnetAddress);
 }
 
-bool OpenVpnConfigModel::setData(const QModelIndex &index, const QVariant &value, int role)
+void OpenVpnConfigModel::setSubnetAddress(const QString &subnetAddress)
 {
-    if (!index.isValid() || index.row() < 0 || index.row() >= ContainerProps::allContainers().size()) {
-        return false;
-    }
-
-    switch (role) {
-    case Roles::SubnetAddressRole: m_protocolConfig.insert(amnezia::config_key::subnet_address, value.toString()); break;
-    case Roles::TransportProtoRole: m_protocolConfig.insert(config_key::transport_proto, value.toString()); break;
-    case Roles::PortRole: m_protocolConfig.insert(config_key::port, value.toString()); break;
-    case Roles::AutoNegotiateEncryprionRole: m_protocolConfig.insert(config_key::ncp_disable, !value.toBool()); break;
-    case Roles::HashRole: m_protocolConfig.insert(config_key::hash, value.toString()); break;
-    case Roles::CipherRole: m_protocolConfig.insert(config_key::cipher, value.toString()); break;
-    case Roles::TlsAuthRole: m_protocolConfig.insert(config_key::tls_auth, value.toBool()); break;
-    case Roles::BlockDnsRole: m_protocolConfig.insert(config_key::block_outside_dns, value.toBool()); break;
-    case Roles::AdditionalClientCommandsRole: m_protocolConfig.insert(config_key::additional_client_config, value.toString()); break;
-    case Roles::AdditionalServerCommandsRole: m_protocolConfig.insert(config_key::additional_server_config, value.toString()); break;
-    }
-
-    emit dataChanged(index, index, QList { role });
-    return true;
+    m_protocolConfig.insert(amnezia::config_key::subnet_address, subnetAddress);
 }
 
-QVariant OpenVpnConfigModel::data(const QModelIndex &index, int role) const
+QString OpenVpnConfigModel::transportProto() const
 {
-    if (!index.isValid() || index.row() < 0 || index.row() >= rowCount()) {
-        return false;
-    }
+    return m_protocolConfig.value(config_key::transport_proto).toString(protocols::openvpn::defaultTransportProto);
+}
 
-    switch (role) {
-    case Roles::SubnetAddressRole:
-        return m_protocolConfig.value(amnezia::config_key::subnet_address).toString(amnezia::protocols::openvpn::defaultSubnetAddress);
-    case Roles::TransportProtoRole:
-        return m_protocolConfig.value(config_key::transport_proto).toString(protocols::openvpn::defaultTransportProto);
-    case Roles::PortRole: return m_protocolConfig.value(config_key::port).toString(protocols::openvpn::defaultPort);
-    case Roles::AutoNegotiateEncryprionRole:
-        return !m_protocolConfig.value(config_key::ncp_disable).toBool(protocols::openvpn::defaultNcpDisable);
-    case Roles::HashRole: return m_protocolConfig.value(config_key::hash).toString(protocols::openvpn::defaultHash);
-    case Roles::CipherRole: return m_protocolConfig.value(config_key::cipher).toString(protocols::openvpn::defaultCipher);
-    case Roles::TlsAuthRole: return m_protocolConfig.value(config_key::tls_auth).toBool(protocols::openvpn::defaultTlsAuth);
-    case Roles::BlockDnsRole:
-        return m_protocolConfig.value(config_key::block_outside_dns).toBool(protocols::openvpn::defaultBlockOutsideDns);
-    case Roles::AdditionalClientCommandsRole:
-        return m_protocolConfig.value(config_key::additional_client_config).toString(protocols::openvpn::defaultAdditionalClientConfig);
-    case Roles::AdditionalServerCommandsRole:
-        return m_protocolConfig.value(config_key::additional_server_config).toString(protocols::openvpn::defaultAdditionalServerConfig);
-    case Roles::IsPortEditable: return m_container == DockerContainer::OpenVpn ? true : false;
-    case Roles::IsTransportProtoEditable: return m_container == DockerContainer::OpenVpn ? true : false;
-    case Roles::HasRemoveButton: return m_container == DockerContainer::OpenVpn ? true : false;
-    }
-    return QVariant();
+void OpenVpnConfigModel::setTransportProto(const QString &transportProto)
+{
+    m_protocolConfig.insert(config_key::transport_proto, transportProto);
+}
+
+QString OpenVpnConfigModel::port() const
+{
+    return m_protocolConfig.value(config_key::port).toString(protocols::openvpn::defaultPort);
+}
+
+void OpenVpnConfigModel::setPort(const QString &port)
+{
+    m_protocolConfig.insert(config_key::port, port);
+}
+
+bool OpenVpnConfigModel::autoNegotiateEncryption() const
+{
+    return !m_protocolConfig.value(config_key::ncp_disable).toBool(protocols::openvpn::defaultNcpDisable);
+}
+
+void OpenVpnConfigModel::setAutoNegotiateEncryption(bool enabled)
+{
+    m_protocolConfig.insert(config_key::ncp_disable, !enabled);
+}
+
+QString OpenVpnConfigModel::hash() const
+{
+    return m_protocolConfig.value(config_key::hash).toString(protocols::openvpn::defaultHash);
+}
+
+void OpenVpnConfigModel::setHash(const QString &hash)
+{
+    m_protocolConfig.insert(config_key::hash, hash);
+}
+
+QString OpenVpnConfigModel::cipher() const
+{
+    return m_protocolConfig.value(config_key::cipher).toString(protocols::openvpn::defaultCipher);
+}
+
+void OpenVpnConfigModel::setCipher(const QString &cipher)
+{
+    m_protocolConfig.insert(config_key::cipher, cipher);
+}
+
+bool OpenVpnConfigModel::tlsAuth() const
+{
+    return m_protocolConfig.value(config_key::tls_auth).toBool(protocols::openvpn::defaultTlsAuth);
+}
+
+void OpenVpnConfigModel::setTlsAuth(bool enabled)
+{
+    m_protocolConfig.insert(config_key::tls_auth, enabled);
+}
+
+bool OpenVpnConfigModel::blockDns() const
+{
+    return m_protocolConfig.value(config_key::block_outside_dns).toBool(protocols::openvpn::defaultBlockOutsideDns);
+}
+
+void OpenVpnConfigModel::setBlockDns(bool enabled)
+{
+    m_protocolConfig.insert(config_key::block_outside_dns, enabled);
+}
+
+QString OpenVpnConfigModel::additionalClientCommands() const
+{
+    return m_protocolConfig.value(config_key::additional_client_config).toString(protocols::openvpn::defaultAdditionalClientConfig);
+}
+
+void OpenVpnConfigModel::setAdditionalClientCommands(const QString &commands)
+{
+    m_protocolConfig.insert(config_key::additional_client_config, commands);
+}
+
+QString OpenVpnConfigModel::additionalServerCommands() const
+{
+    return m_protocolConfig.value(config_key::additional_server_config).toString(protocols::openvpn::defaultAdditionalServerConfig);
+}
+
+void OpenVpnConfigModel::setAdditionalServerCommands(const QString &commands)
+{
+    m_protocolConfig.insert(config_key::additional_server_config, commands);
+}
+
+bool OpenVpnConfigModel::isPortEditable() const
+{
+    return m_container == DockerContainer::OpenVpn;
+}
+
+bool OpenVpnConfigModel::isTransportProtoEditable() const
+{
+    return m_container == DockerContainer::OpenVpn;
+}
+
+bool OpenVpnConfigModel::hasRemoveButton() const
+{
+    return m_container == DockerContainer::OpenVpn;
 }
 
 void OpenVpnConfigModel::updateModel(const QJsonObject &config)
 {
-    beginResetModel();
     m_container = ContainerProps::containerFromString(config.value(config_key::container).toString());
 
     m_fullConfig = config;
@@ -100,8 +156,6 @@ void OpenVpnConfigModel::updateModel(const QJsonObject &config)
     m_protocolConfig.insert(
             config_key::additional_server_config,
             protocolConfig.value(config_key::additional_server_config).toString(protocols::openvpn::defaultAdditionalServerConfig));
-
-    endResetModel();
 }
 
 QJsonObject OpenVpnConfigModel::getConfig()
@@ -109,26 +163,3 @@ QJsonObject OpenVpnConfigModel::getConfig()
     m_fullConfig.insert(config_key::openvpn, m_protocolConfig);
     return m_fullConfig;
 }
-
-QHash<int, QByteArray> OpenVpnConfigModel::roleNames() const
-{
-    QHash<int, QByteArray> roles;
-
-    roles[SubnetAddressRole] = "subnetAddress";
-    roles[TransportProtoRole] = "transportProto";
-    roles[PortRole] = "port";
-    roles[AutoNegotiateEncryprionRole] = "autoNegotiateEncryprion";
-    roles[HashRole] = "hash";
-    roles[CipherRole] = "cipher";
-    roles[TlsAuthRole] = "tlsAuth";
-    roles[BlockDnsRole] = "blockDns";
-    roles[AdditionalClientCommandsRole] = "additionalClientCommands";
-    roles[AdditionalServerCommandsRole] = "additionalServerCommands";
-
-    roles[IsPortEditable] = "isPortEditable";
-    roles[IsTransportProtoEditable] = "isTransportProtoEditable";
-
-    roles[HasRemoveButton] = "hasRemoveButton";
-
-    return roles;
-}

client/ui/models/protocols/openvpnConfigModel.h

@@ -1,47 +1,90 @@
 #ifndef OPENVPNCONFIGMODEL_H
 #define OPENVPNCONFIGMODEL_H
 
-#include <QAbstractListModel>
+#include <QObject>
 #include <QJsonObject>
 
 #include "containers/containers_defs.h"
 
-class OpenVpnConfigModel : public QAbstractListModel
+class OpenVpnConfigModel : public QObject
 {
     Q_OBJECT
+    Q_PROPERTY(QString subnetAddress READ subnetAddress WRITE setSubnetAddress NOTIFY subnetAddressChanged)
+    Q_PROPERTY(QString transportProto READ transportProto WRITE setTransportProto NOTIFY transportProtoChanged)
+    Q_PROPERTY(QString port READ port WRITE setPort NOTIFY portChanged)
+    Q_PROPERTY(bool autoNegotiateEncryption READ autoNegotiateEncryption WRITE setAutoNegotiateEncryption NOTIFY autoNegotiateEncryptionChanged)
+    Q_PROPERTY(QString hash READ hash WRITE setHash NOTIFY hashChanged)
+    Q_PROPERTY(QString cipher READ cipher WRITE setCipher NOTIFY cipherChanged)
+    Q_PROPERTY(bool tlsAuth READ tlsAuth WRITE setTlsAuth NOTIFY tlsAuthChanged)
+    Q_PROPERTY(bool blockDns READ blockDns WRITE setBlockDns NOTIFY blockDnsChanged)
+    Q_PROPERTY(QString additionalClientCommands READ additionalClientCommands WRITE setAdditionalClientCommands NOTIFY additionalClientCommandsChanged)
+    Q_PROPERTY(QString additionalServerCommands READ additionalServerCommands WRITE setAdditionalServerCommands NOTIFY additionalServerCommandsChanged)
+    Q_PROPERTY(bool isPortEditable READ isPortEditable NOTIFY isPortEditableChanged)
+    Q_PROPERTY(bool isTransportProtoEditable READ isTransportProtoEditable NOTIFY isTransportProtoEditableChanged)
+    Q_PROPERTY(bool hasRemoveButton READ hasRemoveButton NOTIFY hasRemoveButtonChanged)
 
 public:
-    enum Roles {
-        SubnetAddressRole = Qt::UserRole + 1,
-        TransportProtoRole,
-        PortRole,
-        AutoNegotiateEncryprionRole,
-        HashRole,
-        CipherRole,
-        TlsAuthRole,
-        BlockDnsRole,
-        AdditionalClientCommandsRole,
-        AdditionalServerCommandsRole,
-
-        IsPortEditable,
-        IsTransportProtoEditable,
-
-        HasRemoveButton
-    };
-
     explicit OpenVpnConfigModel(QObject *parent = nullptr);
+    ~OpenVpnConfigModel() override = default;
 
-    int rowCount(const QModelIndex &parent = QModelIndex()) const override;
+    OpenVpnConfigModel(const OpenVpnConfigModel &) = delete;
+    OpenVpnConfigModel &operator=(const OpenVpnConfigModel &) = delete;
+    OpenVpnConfigModel(OpenVpnConfigModel &&) = delete;
+    OpenVpnConfigModel &operator=(OpenVpnConfigModel &&) = delete;
 
-    bool setData(const QModelIndex &index, const QVariant &value, int role) override;
-    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
+    QString subnetAddress() const;
+    void setSubnetAddress(const QString &subnetAddress);
+
+    QString transportProto() const;
+    void setTransportProto(const QString &transportProto);
+
+    QString port() const;
+    void setPort(const QString &port);
+
+    bool autoNegotiateEncryption() const;
+    void setAutoNegotiateEncryption(bool enabled);
+
+    QString hash() const;
+    void setHash(const QString &hash);
+
+    QString cipher() const;
+    void setCipher(const QString &cipher);
+
+    bool tlsAuth() const;
+    void setTlsAuth(bool enabled);
+
+    bool blockDns() const;
+    void setBlockDns(bool enabled);
+
+    QString additionalClientCommands() const;
+    void setAdditionalClientCommands(const QString &commands);
+    
+    QString additionalServerCommands() const;
+    void setAdditionalServerCommands(const QString &commands);
+
+    bool isPortEditable() const;
+    bool isTransportProtoEditable() const;
+    bool hasRemoveButton() const;
+
+    Q_INVOKABLE QJsonObject getConfig();
+
+signals:
+    void subnetAddressChanged(const QString &);
+    void transportProtoChanged(const QString &);
+    void portChanged(const QString &);
+    void autoNegotiateEncryptionChanged(bool);
+    void hashChanged(const QString &);
+    void cipherChanged(const QString &);
+    void tlsAuthChanged(bool);
+    void blockDnsChanged(bool);
+    void additionalClientCommandsChanged(const QString &);
+    void additionalServerCommandsChanged(const QString &);
+    void isPortEditableChanged(bool);
+    void isTransportProtoEditableChanged(bool);
+    void hasRemoveButtonChanged(bool);
 
 public slots:
     void updateModel(const QJsonObject &config);
-    QJsonObject getConfig();
-
-protected:
-    QHash<int, QByteArray> roleNames() const override;
 
 private:
     DockerContainer m_container;

client/ui/qml/Components/HomeContainersListView.qml

@@ -10,8 +10,7 @@ import ProtocolEnum 1.0
 import "../Controls2"
 import "../Controls2/TextTypes"
 
-
-ListView {
+ListViewType {
     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/HomeSplitTunnelingDrawer.qml

@@ -47,8 +47,8 @@ DrawerType2 {
             rightImageSource: "qrc:/images/controls/chevron-right.svg"
 
             clickedFunction: function() {
-               PageController.goToPage(PageEnum.PageSettingsSplitTunneling)
-               root.closeTriggered()
+                PageController.goToPage(PageEnum.PageSettingsSplitTunneling)
+                root.closeTriggered()
             }
         }
 

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,44 +76,37 @@ DrawerType2 {
                     }
                 }
 
-                ScrollBar.vertical: ScrollBarType {}
-
                 ButtonGroup {
                     id: buttonGroup
                 }
 
-                delegate: Item {
-                    implicitWidth: root.width
-                    implicitHeight: delegateContent.implicitHeight
+                delegate: ColumnLayout {
+                    id: delegateContent
 
-                    ColumnLayout {
-                        id: delegateContent
+                    width: listView.width
 
-                        anchors.fill: parent
+                    RowLayout {
+                        CheckBoxType {
+                            Layout.fillWidth: true
 
-                        RowLayout {
-                            CheckBoxType {
-                                Layout.fillWidth: true
-
-                                text: appName
-                                checked: isAppSelected
-                                onCheckedChanged: {
-                                    installedAppsModel.selectedStateChanged(proxyInstalledAppsModel.mapToSource(index), checked)
-                                }
-                            }
-
-                            Image {
-                                source: "image://installedAppImage/" + appIcon
-
-                                sourceSize.width: 24
-                                sourceSize.height: 24
-
-                                Layout.rightMargin: 48
+                            text: appName
+                            checked: isAppSelected
+                            onCheckedChanged: {
+                                installedAppsModel.selectedStateChanged(proxyInstalledAppsModel.mapToSource(index), checked)
                             }
                         }
 
-                        DividerType {}
+                        Image {
+                            source: "image://installedAppImage/" + appIcon
+
+                            sourceSize.width: 24
+                            sourceSize.height: 24
+
+                            Layout.rightMargin: 48
+                        }
                     }
+
+                    DividerType {}
                 }
             }
         }

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

@@ -13,78 +13,64 @@ import "../Controls2"
 import "../Controls2/TextTypes"
 
 
-ListView {
+ListViewType {
     id: root
 
-    width: parent.width
-    height: root.contentItem.height
+    anchors.fill: parent
 
-    clip: true
-    reuseItems: true
+    delegate: ColumnLayout {
+        width: root.width
 
-    property bool isFocusable: false
+        LabelWithButtonType {
+            Layout.fillWidth: true
 
-    delegate: Item {
-        implicitWidth: root.width
-        implicitHeight: delegateContent.implicitHeight
+            text: name
+            descriptionText: description
+            rightImageSource: isInstalled ? "qrc:/images/controls/chevron-right.svg" : "qrc:/images/controls/download.svg"
 
-        ColumnLayout {
-            id: delegateContent
+            clickedFunction: function() {
+                if (isInstalled) {
+                    var containerIndex = root.model.mapToSource(index)
+                    ContainersModel.setProcessedContainerIndex(containerIndex)
 
-            anchors.fill: parent
-
-            LabelWithButtonType {
-                id: containerRadioButton
-                implicitWidth: parent.width
-
-                text: name
-                descriptionText: description
-                rightImageSource: isInstalled ? "qrc:/images/controls/chevron-right.svg" : "qrc:/images/controls/download.svg"
-
-                clickedFunction: function() {
-                    if (isInstalled) {
-                        var containerIndex = root.model.mapToSource(index)
-                        ContainersModel.setProcessedContainerIndex(containerIndex)
-
-                        if (serviceType !== ProtocolEnum.Other) {
-                            if (config[ContainerProps.containerTypeToString(containerIndex)]["isThirdPartyConfig"]) {
-                                ProtocolsModel.updateModel(config)
-                                PageController.goToPage(PageEnum.PageProtocolRaw)
-                                return
-                            }
-                        }
-
-                        switch (containerIndex) {
-                        case ContainerEnum.Ipsec: {
+                    if (serviceType !== ProtocolEnum.Other) {
+                        if (config[ContainerProps.containerTypeToString(containerIndex)]["isThirdPartyConfig"]) {
                             ProtocolsModel.updateModel(config)
                             PageController.goToPage(PageEnum.PageProtocolRaw)
-                            break
+                            return
                         }
-                        case ContainerEnum.Dns: {
-                            PageController.goToPage(PageEnum.PageServiceDnsSettings)
-                            break
-                        }
-                        default: {
-                            ProtocolsModel.updateModel(config)
-                            PageController.goToPage(PageEnum.PageSettingsServerProtocol)
-                        }
-                        }
-
-                    } else {
-                        ContainersModel.setProcessedContainerIndex(root.model.mapToSource(index))
-                        InstallController.setShouldCreateServer(false)
-                        PageController.goToPage(PageEnum.PageSetupWizardProtocolSettings)
                     }
-                }
 
-                MouseArea {
-                    anchors.fill: parent
-                    cursorShape: Qt.PointingHandCursor
-                    enabled: false
+                    switch (containerIndex) {
+                    case ContainerEnum.Ipsec: {
+                        ProtocolsModel.updateModel(config)
+                        PageController.goToPage(PageEnum.PageProtocolRaw)
+                        break
+                    }
+                    case ContainerEnum.Dns: {
+                        PageController.goToPage(PageEnum.PageServiceDnsSettings)
+                        break
+                    }
+                    default: {
+                        ProtocolsModel.updateModel(config)
+                        PageController.goToPage(PageEnum.PageSettingsServerProtocol)
+                    }
+                    }
+
+                } else {
+                    ContainersModel.setProcessedContainerIndex(root.model.mapToSource(index))
+                    InstallController.setShouldCreateServer(false)
+                    PageController.goToPage(PageEnum.PageSetupWizardProtocolSettings)
                 }
             }
 
-            DividerType {}
+            MouseArea {
+                anchors.fill: parent
+                cursorShape: Qt.PointingHandCursor
+                enabled: false
+            }
         }
+
+        DividerType {}
     }
 }

client/ui/qml/Components/ShareConnectionDrawer.qml

@@ -53,7 +53,7 @@ DrawerType2 {
             headerText: root.headerText
         }
 
-        ListView {
+        ListViewType {
             id: listView
 
             anchors.top: header.bottom
@@ -61,14 +61,7 @@ DrawerType2 {
             anchors.left: parent.left
             anchors.right: parent.right
 
-            property bool isFocusable: true
-
-            ScrollBar.vertical: ScrollBarType {}
-
-            model: 1
-
-            clip: true
-            reuseItems: true
+            model: 1 // fake model to force the ListView to be created without a model
 
             header: ColumnLayout {
                 width: listView.width
@@ -185,9 +178,21 @@ DrawerType2 {
                         Connections {
                             target: copyNativeConfigStringButton
                             function onClicked() {
-                                nativeConfigString.selectAll()
-                                nativeConfigString.copy()
-                                nativeConfigString.select(0, 0)
+                                const headerItem = configListView.headerItem;
+                                if (!headerItem) {
+                                    console.error("Failed to copy: header item not found in ListView")
+                                    return
+                                }
+
+                                const nativeConfigStringItem = configListView.findChildWithObjectName(headerItem.children, "nativeConfigString");
+                                if (!nativeConfigStringItem) {
+                                    console.error("Failed to copy: nativeConfigString item not found in ListView")
+                                    return
+                                }
+
+                                nativeConfigStringItem.selectAll()
+                                nativeConfigStringItem.copy()
+                                nativeConfigStringItem.select(0, 0)
                                 PageController.showNotificationMessage(qsTr("Copied"))
                             }
                         }
@@ -195,11 +200,22 @@ DrawerType2 {
                         Connections {
                             target: copyConfigTextButton
                             function onClicked() {
-                                configText.selectAll()
-                                configText.copy()
-                                configText.select(0, 0)
+                                const headerItem = configListView.headerItem;
+                                if (!headerItem) {
+                                    console.error("Failed to copy: header item not found in ListView")
+                                    return
+                                }
+
+                                const configTextItem = configListView.findChildWithObjectName(headerItem.children, "configText");
+                                if (!configTextItem) {
+                                    console.error("Failed to copy: configText item not found in ListView")
+                                    return
+                                }
+
+                                configTextItem.selectAll()
+                                configTextItem.copy()
+                                configTextItem.select(0, 0)
                                 PageController.showNotificationMessage(qsTr("Copied"))
-                                header.forceActiveFocus()
                             }
                         }
 
@@ -214,30 +230,37 @@ DrawerType2 {
                             backButtonFunction: function() { configContentDrawer.closeTriggered() }
                         }
 
-                        FlickableType {
+                        ListViewType {
+                            id: configListView
+
                             anchors.top: backButton.bottom
+                            anchors.bottom: parent.bottom
                             anchors.left: parent.left
                             anchors.right: parent.right
-                            anchors.bottom: parent.bottom
-                            contentHeight: configContent.implicitHeight + configContent.anchors.topMargin + configContent.anchors.bottomMargin
 
-                            ColumnLayout {
-                                id: configContent
+                            model: 1 // fake model to force the ListView to be created without a model
 
-                                anchors.fill: parent
-                                anchors.rightMargin: 16
-                                anchors.leftMargin: 16
+                            header: ColumnLayout {
+                                width: configListView.width
 
                                 Header2Type {
                                     id: configContentHeader
+
                                     Layout.fillWidth: true
                                     Layout.topMargin: 16
+                                    Layout.leftMargin: 16
+                                    Layout.rightMargin: 16
 
                                     headerText: root.configContentHeaderText
                                 }
 
                                 TextField {
                                     id: nativeConfigString
+                                    objectName: "nativeConfigString"
+
+                                    Layout.leftMargin: 16
+                                    Layout.rightMargin: 16
+
                                     visible: false
                                     text: ExportController.nativeConfigString
 
@@ -248,10 +271,13 @@ DrawerType2 {
 
                                 TextArea {
                                     id: configText
+                                    objectName: "configText"
 
                                     Layout.fillWidth: true
                                     Layout.topMargin: 16
                                     Layout.bottomMargin: 16
+                                    Layout.leftMargin: 16
+                                    Layout.rightMargin: 16
 
                                     padding: 0
                                     leftPadding: 0

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
-    onFocusChanged: {
-        if (root.activeFocus) {
-            if (root.parentFlickable) {
-                root.parentFlickable.ensureVisible(root)
-            }
-        }
+    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()
     }
 
     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,67 +31,55 @@ PageType {
         ]
     }
 
-    FlickableType {
-        id: fl
+    ListViewType {
+        id: listView
+
         anchors.fill: parent
-        contentHeight: content.height
 
-        Column {
-            id: content
+        spacing: 16
 
-            anchors.top: parent.top
-            anchors.left: parent.left
-            anchors.right: parent.right
+        model: proxyServersModel
 
-            spacing: 16
+        delegate: ColumnLayout {
+            width: listView.width
 
-            Repeater {
-                model: proxyServersModel
-                delegate: Item {
-                    implicitWidth: parent.width
-                    implicitHeight: delegateContent.implicitHeight
+            BaseHeaderType {
+                Layout.fillWidth: true
+                Layout.topMargin: 20
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
 
-                    ColumnLayout {
-                        id: delegateContent
+                headerText: qsTr("Removing services from %1").arg(name)
+            }
 
-                        anchors.fill: parent
-                        anchors.rightMargin: 16
-                        anchors.leftMargin: 16
+            ProgressBarType {
+                id: progressBar
 
-                        BaseHeaderType {
-                            Layout.fillWidth: true
-                            Layout.topMargin: 20
+                Layout.fillWidth: true
+                Layout.topMargin: 32
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
 
-                            headerText: qsTr("Removing services from %1").arg(name)
-                        }
+                Timer {
+                    id: timer
 
-                        ProgressBarType {
-                            id: progressBar
-
-                            Layout.fillWidth: true
-                            Layout.topMargin: 32
-
-                            Timer {
-                                id: timer
-
-                                interval: 300
-                                repeat: true
-                                running: true
-                                onTriggered: {
-                                    progressBar.value += 0.003
-                                }
-                            }
-                        }
-
-                        ParagraphTextType {
-                            Layout.fillWidth: true
-                            Layout.topMargin: 8
-
-                            text: qsTr("Usually it takes no more than 5 minutes")
-                        }
+                    interval: 300
+                    repeat: true
+                    running: true
+                    onTriggered: {
+                        progressBar.value += 0.003
                     }
                 }
             }
+
+            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
-        clip: true
+        model: 1 // fake model to force the ListView to be created without a model
+
         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

@@ -30,233 +30,223 @@ PageType {
         }
     }
 
-    ListView {
-        id: listview
+    ListViewType {
+        id: listView
 
         anchors.top: backButtonLayout.bottom
         anchors.bottom: saveButton.top
 
         width: parent.width
 
-        clip: 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: AwgConfigModel
 
-        delegate: Item {
-            id: delegateItem
-            implicitWidth: listview.width
-            implicitHeight: col.implicitHeight
+        delegate: ColumnLayout {
+            width: listView.width
 
-            property alias mtuTextField: mtuTextField
             property bool isSaveButtonEnabled: mtuTextField.errorText === "" &&
                                                junkPacketMaxSizeTextField.errorText === "" &&
                                                junkPacketMinSizeTextField.errorText === "" &&
                                                junkPacketCountTextField.errorText === ""
 
-            ColumnLayout {
-                id: col
+            spacing: 0
 
-                anchors.top: parent.top
-                anchors.left: parent.left
-                anchors.right: parent.right
+            BaseHeaderType {
+                Layout.fillWidth: true
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
 
-                anchors.leftMargin: 16
-                anchors.rightMargin: 16
+                headerText: qsTr("AmneziaWG settings")
+            }
 
-                spacing: 0
+            TextFieldWithHeaderType {
+                id: mtuTextField
 
-                BaseHeaderType {
-                    Layout.fillWidth: true
+                Layout.fillWidth: true
+                Layout.topMargin: 40
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
 
-                    headerText: qsTr("AmneziaWG settings")
-                }
+                headerText: qsTr("MTU")
+                textField.text: clientMtu
+                textField.validator: IntValidator { bottom: 576; top: 65535 }
 
-                TextFieldWithHeaderType {
-                    id: mtuTextField
-                    Layout.fillWidth: true
-                    Layout.topMargin: 40
-
-                    headerText: qsTr("MTU")
-                    textField.text: clientMtu
-                    textField.validator: IntValidator { bottom: 576; top: 65535 }
-
-                    textField.onEditingFinished: {
-                        if (textField.text !== clientMtu) {
-                            clientMtu = textField.text
-                        }
+                textField.onEditingFinished: {
+                    if (textField.text !== clientMtu) {
+                        clientMtu = textField.text
                     }
-                    checkEmptyText: true
-                    KeyNavigation.tab: junkPacketCountTextField.textField
                 }
+                checkEmptyText: true
+            }
 
-                TextFieldWithHeaderType {
-                    id: junkPacketCountTextField
-                    Layout.fillWidth: true
-                    Layout.topMargin: 16
+            TextFieldWithHeaderType {
+                id: junkPacketCountTextField
 
-                    headerText: "Jc - Junk packet count"
-                    textField.text: clientJunkPacketCount
-                    textField.validator: IntValidator { bottom: 0 }
+                Layout.fillWidth: true
+                Layout.topMargin: 16
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
 
-                    textField.onEditingFinished: {
-                        if (textField.text !== clientJunkPacketCount) {
-                            clientJunkPacketCount = textField.text
-                        }
+                headerText: "Jc - Junk packet count"
+                textField.text: clientJunkPacketCount
+                textField.validator: IntValidator { bottom: 0 }
+
+                textField.onEditingFinished: {
+                    if (textField.text !== clientJunkPacketCount) {
+                        clientJunkPacketCount = textField.text
                     }
-
-                    checkEmptyText: true
-
-                    KeyNavigation.tab: junkPacketMinSizeTextField.textField
                 }
 
-                TextFieldWithHeaderType {
-                    id: junkPacketMinSizeTextField
-                    Layout.fillWidth: true
-                    Layout.topMargin: 16
+                checkEmptyText: true
+            }
 
-                    headerText: "Jmin - Junk packet minimum size"
-                    textField.text: clientJunkPacketMinSize
-                    textField.validator: IntValidator { bottom: 0 }
+            TextFieldWithHeaderType {
+                id: junkPacketMinSizeTextField
 
-                    textField.onEditingFinished: {
-                        if (textField.text !== clientJunkPacketMinSize) {
-                            clientJunkPacketMinSize = textField.text
-                        }
+                Layout.fillWidth: true
+                Layout.topMargin: 16
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
+
+                headerText: "Jmin - Junk packet minimum size"
+                textField.text: clientJunkPacketMinSize
+                textField.validator: IntValidator { bottom: 0 }
+
+                textField.onEditingFinished: {
+                    if (textField.text !== clientJunkPacketMinSize) {
+                        clientJunkPacketMinSize = textField.text
                     }
-
-                    checkEmptyText: true
-
-                    KeyNavigation.tab: junkPacketMaxSizeTextField.textField
                 }
 
-                TextFieldWithHeaderType {
-                    id: junkPacketMaxSizeTextField
-                    Layout.fillWidth: true
-                    Layout.topMargin: 16
+                checkEmptyText: true
+            }
 
-                    headerText: "Jmax - Junk packet maximum size"
-                    textField.text: clientJunkPacketMaxSize
-                    textField.validator: IntValidator { bottom: 0 }
+            TextFieldWithHeaderType {
+                id: junkPacketMaxSizeTextField
 
-                    textField.onEditingFinished: {
-                        if (textField.text !== clientJunkPacketMaxSize) {
-                            clientJunkPacketMaxSize = textField.text
-                        }
+                Layout.fillWidth: true
+                Layout.topMargin: 16
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
+
+                headerText: "Jmax - Junk packet maximum size"
+                textField.text: clientJunkPacketMaxSize
+                textField.validator: IntValidator { bottom: 0 }
+
+                textField.onEditingFinished: {
+                    if (textField.text !== clientJunkPacketMaxSize) {
+                        clientJunkPacketMaxSize = textField.text
                     }
-
-                    checkEmptyText: true
-
                 }
 
-                Header2TextType {
-                    Layout.fillWidth: true
-                    Layout.topMargin: 16
+                checkEmptyText: true
 
-                    text: qsTr("Server settings")
-                }
+            }
 
-                TextFieldWithHeaderType {
-                    id: portTextField
-                    Layout.fillWidth: true
-                    Layout.topMargin: 8
+            Header2TextType {
+                Layout.fillWidth: true
+                Layout.topMargin: 16
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
 
-                    enabled: false
+                text: qsTr("Server settings")
+            }
 
-                    headerText: qsTr("Port")
-                    textField.text: port
-                }
+            TextFieldWithHeaderType {
+                id: portTextField
 
-                TextFieldWithHeaderType {
-                    id: initPacketJunkSizeTextField
-                    Layout.fillWidth: true
-                    Layout.topMargin: 16
+                Layout.fillWidth: true
+                Layout.topMargin: 8
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
 
-                    enabled: false
+                enabled: false
 
-                    headerText: "S1 - Init packet junk size"
-                    textField.text: serverInitPacketJunkSize
-                }
+                headerText: qsTr("Port")
+                textField.text: port
+            }
 
-                TextFieldWithHeaderType {
-                    id: responsePacketJunkSizeTextField
-                    Layout.fillWidth: true
-                    Layout.topMargin: 16
+            TextFieldWithHeaderType {
+                id: initPacketJunkSizeTextField
 
-                    enabled: false
+                Layout.fillWidth: true
+                Layout.topMargin: 16
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
 
-                    headerText: "S2 - Response packet junk size"
-                    textField.text: serverResponsePacketJunkSize
-                }
+                enabled: false
 
-                TextFieldWithHeaderType {
-                    id: initPacketMagicHeaderTextField
-                    Layout.fillWidth: true
-                    Layout.topMargin: 16
+                headerText: "S1 - Init packet junk size"
+                textField.text: serverInitPacketJunkSize
+            }
 
-                    enabled: false
+            TextFieldWithHeaderType {
+                id: responsePacketJunkSizeTextField
 
-                    headerText: "H1 - Init packet magic header"
-                    textField.text: serverInitPacketMagicHeader
-                }
+                Layout.fillWidth: true
+                Layout.topMargin: 16
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
 
-                TextFieldWithHeaderType {
-                    id: responsePacketMagicHeaderTextField
-                    Layout.fillWidth: true
-                    Layout.topMargin: 16
+                enabled: false
 
-                    enabled: false
+                headerText: "S2 - Response packet junk size"
+                textField.text: serverResponsePacketJunkSize
+            }
 
-                    headerText: "H2 - Response packet magic header"
-                    textField.text: serverResponsePacketMagicHeader
-                }
+            TextFieldWithHeaderType {
+                id: initPacketMagicHeaderTextField
 
-                TextFieldWithHeaderType {
-                    id: underloadPacketMagicHeaderTextField
-                    Layout.fillWidth: true
-                    Layout.topMargin: 16
+                Layout.fillWidth: true
+                Layout.topMargin: 16
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
 
-                    enabled: false
+                enabled: false
 
-                    headerText: "H3 - Underload packet magic header"
-                    textField.text: serverUnderloadPacketMagicHeader
-                }
+                headerText: "H1 - Init packet magic header"
+                textField.text: serverInitPacketMagicHeader
+            }
 
-                TextFieldWithHeaderType {
-                    id: transportPacketMagicHeaderTextField
-                    Layout.fillWidth: true
-                    Layout.topMargin: 16
+            TextFieldWithHeaderType {
+                id: responsePacketMagicHeaderTextField
 
-                    enabled: false
+                Layout.fillWidth: true
+                Layout.topMargin: 16
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
 
-                    headerText: "H4 - Transport packet magic header"
-                    textField.text: serverTransportPacketMagicHeader
-                }
+                enabled: false
+
+                headerText: "H2 - Response packet magic header"
+                textField.text: serverResponsePacketMagicHeader
+            }
+
+            TextFieldWithHeaderType {
+                id: underloadPacketMagicHeaderTextField
+
+                Layout.fillWidth: true
+                Layout.topMargin: 16
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
+
+                enabled: false
+
+                headerText: "H3 - Underload packet magic header"
+                textField.text: serverUnderloadPacketMagicHeader
+            }
+
+            TextFieldWithHeaderType {
+                id: transportPacketMagicHeaderTextField
+
+                Layout.fillWidth: true
+                Layout.topMargin: 16
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
+
+                enabled: false
+
+                headerText: "H4 - Transport packet magic header"
+                textField.text: serverTransportPacketMagicHeader
             }
         }
     }
@@ -273,18 +263,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")
@@ -299,11 +288,9 @@ PageType {
                 PageController.goToPage(PageEnum.PageSetupWizardInstalling);
                 InstallController.updateContainer(AwgConfigModel.getConfig())
             }
-            var noButtonFunction = function() {
-                if (!GC.isMobile()) {
-                    saveButton.forceActiveFocus()
-                }
-            }
+
+            var noButtonFunction = function() {}
+
             showQuestionDrawer(headerText, descriptionText, yesButtonText, noButtonText, yesButtonFunction, noButtonFunction)
         }
     }

client/ui/qml/Pages2/PageProtocolAwgSettings.qml

@@ -33,356 +33,339 @@ PageType {
         }
     }
 
-    ListView {
-        id: listview
-
-        property bool isFocusable: true
+    ListViewType {
+        id: listView
 
         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 {
+        delegate: ColumnLayout {
             id: delegateItem
-            implicitWidth: listview.width
-            implicitHeight: col.implicitHeight
+
+            width: listView.width
 
             property alias vpnAddressSubnetTextField: vpnAddressSubnetTextField
             property bool isEnabled: ServersModel.isProcessedServerHasWriteAccess()
 
-            ColumnLayout {
-                id: col
+            spacing: 0
 
-                anchors.top: parent.top
-                anchors.left: parent.left
-                anchors.right: parent.right
+            BaseHeaderType {
+                Layout.fillWidth: true
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
 
-                anchors.leftMargin: 16
-                anchors.rightMargin: 16
+                headerText: qsTr("AmneziaWG settings")
+            }
 
-                spacing: 0
+            TextFieldWithHeaderType {
+                id: vpnAddressSubnetTextField
 
-                BaseHeaderType {
-                    Layout.fillWidth: true
+                Layout.fillWidth: true
+                Layout.topMargin: 40
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
 
-                    headerText: qsTr("AmneziaWG settings")
-                }
+                enabled: delegateItem.isEnabled
 
-                TextFieldWithHeaderType {
-                    id: vpnAddressSubnetTextField
+                headerText: qsTr("VPN address subnet")
+                textField.text: subnetAddress
 
-                    Layout.fillWidth: true
-                    Layout.topMargin: 40
-
-                    enabled: delegateItem.isEnabled
-
-                    headerText: qsTr("VPN address subnet")
-                    textField.text: subnetAddress
-
-                    textField.onEditingFinished: {
-                        if (textField.text !== subnetAddress) {
-                            subnetAddress = textField.text
-                        }
-                    }
-
-                    checkEmptyText: true
-                }
-
-                TextFieldWithHeaderType {
-                    id: portTextField
-                    Layout.fillWidth: true
-                    Layout.topMargin: 16
-
-                    enabled: delegateItem.isEnabled
-
-                    headerText: qsTr("Port")
-                    textField.text: port
-                    textField.maximumLength: 5
-                    textField.validator: IntValidator { bottom: 1; top: 65535 }
-
-                    textField.onEditingFinished: {
-                        if (textField.text !== port) {
-                            port = textField.text
-                        }
-                    }
-
-                    checkEmptyText: true
-                }
-
-                TextFieldWithHeaderType {
-                    id: junkPacketCountTextField
-                    Layout.fillWidth: true
-                    Layout.topMargin: 16
-
-                    headerText: qsTr("Jc - Junk packet count")
-                    textField.text: serverJunkPacketCount
-                    textField.validator: IntValidator { bottom: 0 }
-
-                    textField.onEditingFinished: {
-                        if (textField.text === "") {
-                            textField.text = "0"
-                        }
-
-                        if (textField.text !== serverJunkPacketCount) {
-                            serverJunkPacketCount = textField.text
-                        }
-                    }
-
-                    checkEmptyText: true
-                }
-
-                TextFieldWithHeaderType {
-                    id: junkPacketMinSizeTextField
-                    Layout.fillWidth: true
-                    Layout.topMargin: 16
-
-                    headerText: qsTr("Jmin - Junk packet minimum size")
-                    textField.text: serverJunkPacketMinSize
-                    textField.validator: IntValidator { bottom: 0 }
-
-                    textField.onEditingFinished: {
-                        if (textField.text !== serverJunkPacketMinSize) {
-                            serverJunkPacketMinSize = textField.text
-                        }
-                    }
-
-                    checkEmptyText: true
-                }
-
-                TextFieldWithHeaderType {
-                    id: junkPacketMaxSizeTextField
-                    Layout.fillWidth: true
-                    Layout.topMargin: 16
-
-                    headerText: qsTr("Jmax - Junk packet maximum size")
-                    textField.text: serverJunkPacketMaxSize
-                    textField.validator: IntValidator { bottom: 0 }
-
-                    textField.onEditingFinished: {
-                        if (textField.text !== serverJunkPacketMaxSize) {
-                            serverJunkPacketMaxSize = textField.text
-                        }
-                    }
-
-                    checkEmptyText: true
-                }
-
-                TextFieldWithHeaderType {
-                    id: initPacketJunkSizeTextField
-                    Layout.fillWidth: true
-                    Layout.topMargin: 16
-
-                    headerText: qsTr("S1 - Init packet junk size")
-                    textField.text: serverInitPacketJunkSize
-                    textField.validator: IntValidator { bottom: 0 }
-
-                    textField.onEditingFinished: {
-                        if (textField.text !== serverInitPacketJunkSize) {
-                            serverInitPacketJunkSize = textField.text
-                        }
-                    }
-
-                    checkEmptyText: true
-
-                    onActiveFocusChanged: {
-                        if(activeFocus) {
-                            listview.positionViewAtEnd()
-                        }
+                textField.onEditingFinished: {
+                    if (textField.text !== subnetAddress) {
+                        subnetAddress = textField.text
                     }
                 }
 
-                TextFieldWithHeaderType {
-                    id: responsePacketJunkSizeTextField
-                    Layout.fillWidth: true
-                    Layout.topMargin: 16
+                checkEmptyText: true
+            }
 
-                    headerText: qsTr("S2 - Response packet junk size")
-                    textField.text: serverResponsePacketJunkSize
-                    textField.validator: IntValidator { bottom: 0 }
+            TextFieldWithHeaderType {
+                id: portTextField
+                Layout.fillWidth: true
+                Layout.topMargin: 16
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
 
-                    textField.onEditingFinished: {
-                        if (textField.text !== serverResponsePacketJunkSize) {
-                            serverResponsePacketJunkSize = textField.text
-                        }
-                    }
+                enabled: delegateItem.isEnabled
 
-                    checkEmptyText: true
+                headerText: qsTr("Port")
+                textField.text: port
+                textField.maximumLength: 5
+                textField.validator: IntValidator { bottom: 1; top: 65535 }
 
-                    onActiveFocusChanged: {
-                        if(activeFocus) {
-                            listview.positionViewAtEnd()
-                        }
+                textField.onEditingFinished: {
+                    if (textField.text !== port) {
+                        port = textField.text
                     }
                 }
 
-                TextFieldWithHeaderType {
-                    id: initPacketMagicHeaderTextField
-                    Layout.fillWidth: true
-                    Layout.topMargin: 16
+                checkEmptyText: true
+            }
 
-                    headerText: qsTr("H1 - Init packet magic header")
-                    textField.text: serverInitPacketMagicHeader
-                    textField.validator: IntValidator { bottom: 0 }
+            TextFieldWithHeaderType {
+                id: junkPacketCountTextField
+                Layout.fillWidth: true
+                Layout.topMargin: 16
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
 
-                    textField.onEditingFinished: {
-                        if (textField.text !== serverInitPacketMagicHeader) {
-                            serverInitPacketMagicHeader = textField.text
-                        }
+                headerText: qsTr("Jc - Junk packet count")
+                textField.text: serverJunkPacketCount
+                textField.validator: IntValidator { bottom: 0 }
+
+                textField.onEditingFinished: {
+                    if (textField.text === "") {
+                        textField.text = "0"
                     }
 
-                    checkEmptyText: true
+                    if (textField.text !== serverJunkPacketCount) {
+                        serverJunkPacketCount = textField.text
+                    }
                 }
 
-                TextFieldWithHeaderType {
-                    id: responsePacketMagicHeaderTextField
-                    Layout.fillWidth: true
-                    Layout.topMargin: 16
+                checkEmptyText: true
+            }
 
-                    headerText: qsTr("H2 - Response packet magic header")
-                    textField.text: serverResponsePacketMagicHeader
-                    textField.validator: IntValidator { bottom: 0 }
+            TextFieldWithHeaderType {
+                id: junkPacketMinSizeTextField
+                Layout.fillWidth: true
+                Layout.topMargin: 16
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
 
-                    textField.onEditingFinished: {
-                        if (textField.text !== serverResponsePacketMagicHeader) {
-                            serverResponsePacketMagicHeader = textField.text
-                        }
+                headerText: qsTr("Jmin - Junk packet minimum size")
+                textField.text: serverJunkPacketMinSize
+                textField.validator: IntValidator { bottom: 0 }
+
+                textField.onEditingFinished: {
+                    if (textField.text !== serverJunkPacketMinSize) {
+                        serverJunkPacketMinSize = textField.text
                     }
-
-                    checkEmptyText: true
                 }
 
-                TextFieldWithHeaderType {
-                    id: transportPacketMagicHeaderTextField
-                    Layout.fillWidth: true
-                    Layout.topMargin: 16
+                checkEmptyText: true
+            }
 
-                    headerText: qsTr("H4 - Transport packet magic header")
-                    textField.text: serverTransportPacketMagicHeader
-                    textField.validator: IntValidator { bottom: 0 }
+            TextFieldWithHeaderType {
+                id: junkPacketMaxSizeTextField
+                Layout.fillWidth: true
+                Layout.topMargin: 16
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
 
-                    textField.onEditingFinished: {
-                        if (textField.text !== serverTransportPacketMagicHeader) {
-                            serverTransportPacketMagicHeader = textField.text
-                        }
+                headerText: qsTr("Jmax - Junk packet maximum size")
+                textField.text: serverJunkPacketMaxSize
+                textField.validator: IntValidator { bottom: 0 }
+
+                textField.onEditingFinished: {
+                    if (textField.text !== serverJunkPacketMaxSize) {
+                        serverJunkPacketMaxSize = textField.text
                     }
-
-                    checkEmptyText: true
                 }
 
-                TextFieldWithHeaderType {
-                    id: underloadPacketMagicHeaderTextField
-                    Layout.fillWidth: true
-                    Layout.topMargin: 16
+                checkEmptyText: true
+            }
 
-                    headerText: qsTr("H3 - Underload packet magic header")
-                    textField.text: serverUnderloadPacketMagicHeader
-                    textField.validator: IntValidator { bottom: 0 }
+            TextFieldWithHeaderType {
+                id: initPacketJunkSizeTextField
+                Layout.fillWidth: true
+                Layout.topMargin: 16
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
 
-                    textField.onEditingFinished: {
-                        if (textField.text !== serverUnderloadPacketMagicHeader) {
-                            serverUnderloadPacketMagicHeader = textField.text
-                        }
+                headerText: qsTr("S1 - Init packet junk size")
+                textField.text: serverInitPacketJunkSize
+                textField.validator: IntValidator { bottom: 0 }
+
+                textField.onEditingFinished: {
+                    if (textField.text !== serverInitPacketJunkSize) {
+                        serverInitPacketJunkSize = textField.text
                     }
-
-                    checkEmptyText: true
                 }
 
-                BasicButtonType {
-                    id: saveRestartButton
+                checkEmptyText: true
 
-                    Layout.fillWidth: true
-                    Layout.topMargin: 24
-                    Layout.bottomMargin: 24
+                onActiveFocusChanged: {
+                    if(activeFocus) {
+                        listview.positionViewAtEnd()
+                    }
+                }
+            }
 
-                    enabled: underloadPacketMagicHeaderTextField.errorText === "" &&
-                             transportPacketMagicHeaderTextField.errorText === "" &&
-                             responsePacketMagicHeaderTextField.errorText === "" &&
-                             initPacketMagicHeaderTextField.errorText === "" &&
-                             responsePacketJunkSizeTextField.errorText === "" &&
-                             initPacketJunkSizeTextField.errorText === "" &&
-                             junkPacketMaxSizeTextField.errorText === "" &&
-                             junkPacketMinSizeTextField.errorText === "" &&
-                             junkPacketCountTextField.errorText === "" &&
-                             portTextField.errorText === "" &&
-                             vpnAddressSubnetTextField.errorText === ""
+            TextFieldWithHeaderType {
+                id: responsePacketJunkSizeTextField
+                Layout.fillWidth: true
+                Layout.topMargin: 16
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
 
-                    text: qsTr("Save")
+                headerText: qsTr("S2 - Response packet junk size")
+                textField.text: serverResponsePacketJunkSize
+                textField.validator: IntValidator { bottom: 0 }
 
-                    onActiveFocusChanged: {
-                        if(activeFocus) {
-                            listview.positionViewAtEnd()
+                textField.onEditingFinished: {
+                    if (textField.text !== serverResponsePacketJunkSize) {
+                        serverResponsePacketJunkSize = textField.text
+                    }
+                }
+
+                checkEmptyText: true
+
+                onActiveFocusChanged: {
+                    if(activeFocus) {
+                        listview.positionViewAtEnd()
+                    }
+                }
+            }
+
+            TextFieldWithHeaderType {
+                id: initPacketMagicHeaderTextField
+                Layout.fillWidth: true
+                Layout.topMargin: 16
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
+
+                headerText: qsTr("H1 - Init packet magic header")
+                textField.text: serverInitPacketMagicHeader
+                textField.validator: IntValidator { bottom: 0 }
+
+                textField.onEditingFinished: {
+                    if (textField.text !== serverInitPacketMagicHeader) {
+                        serverInitPacketMagicHeader = textField.text
+                    }
+                }
+
+                checkEmptyText: true
+            }
+
+            TextFieldWithHeaderType {
+                id: responsePacketMagicHeaderTextField
+                Layout.fillWidth: true
+                Layout.topMargin: 16
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
+
+                headerText: qsTr("H2 - Response packet magic header")
+                textField.text: serverResponsePacketMagicHeader
+                textField.validator: IntValidator { bottom: 0 }
+
+                textField.onEditingFinished: {
+                    if (textField.text !== serverResponsePacketMagicHeader) {
+                        serverResponsePacketMagicHeader = textField.text
+                    }
+                }
+
+                checkEmptyText: true
+            }
+
+            TextFieldWithHeaderType {
+                id: transportPacketMagicHeaderTextField
+                Layout.fillWidth: true
+                Layout.topMargin: 16
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
+
+                headerText: qsTr("H4 - Transport packet magic header")
+                textField.text: serverTransportPacketMagicHeader
+                textField.validator: IntValidator { bottom: 0 }
+
+                textField.onEditingFinished: {
+                    if (textField.text !== serverTransportPacketMagicHeader) {
+                        serverTransportPacketMagicHeader = textField.text
+                    }
+                }
+
+                checkEmptyText: true
+            }
+
+            TextFieldWithHeaderType {
+                id: underloadPacketMagicHeaderTextField
+                Layout.fillWidth: true
+                Layout.topMargin: 16
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
+
+                headerText: qsTr("H3 - Underload packet magic header")
+                textField.text: serverUnderloadPacketMagicHeader
+                textField.validator: IntValidator { bottom: 0 }
+
+                textField.onEditingFinished: {
+                    if (textField.text !== serverUnderloadPacketMagicHeader) {
+                        serverUnderloadPacketMagicHeader = textField.text
+                    }
+                }
+
+                checkEmptyText: true
+            }
+
+            BasicButtonType {
+                id: saveRestartButton
+
+                Layout.fillWidth: true
+                Layout.topMargin: 24
+                Layout.bottomMargin: 24
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
+
+                enabled: underloadPacketMagicHeaderTextField.errorText === "" &&
+                         transportPacketMagicHeaderTextField.errorText === "" &&
+                         responsePacketMagicHeaderTextField.errorText === "" &&
+                         initPacketMagicHeaderTextField.errorText === "" &&
+                         responsePacketJunkSizeTextField.errorText === "" &&
+                         initPacketJunkSizeTextField.errorText === "" &&
+                         junkPacketMaxSizeTextField.errorText === "" &&
+                         junkPacketMinSizeTextField.errorText === "" &&
+                         junkPacketCountTextField.errorText === "" &&
+                         portTextField.errorText === "" &&
+                         vpnAddressSubnetTextField.errorText === ""
+
+                text: qsTr("Save")
+
+                onActiveFocusChanged: {
+                    if(activeFocus) {
+                        listView.positionViewAtEnd()
+                    }
+                }
+
+                clickedFunc: function() {
+                    if (delegateItem.isEnabled) {
+                        if (AwgConfigModel.isHeadersEqual(underloadPacketMagicHeaderTextField.textField.text,
+                                                          transportPacketMagicHeaderTextField.textField.text,
+                                                          responsePacketMagicHeaderTextField.textField.text,
+                                                          initPacketMagicHeaderTextField.textField.text)) {
+                            PageController.showErrorMessage(qsTr("The values of the H1-H4 fields must be unique"))
+                            return
+                        }
+
+                        if (AwgConfigModel.isPacketSizeEqual(parseInt(initPacketJunkSizeTextField.textField.text),
+                                                             parseInt(responsePacketJunkSizeTextField.textField.text))) {
+                            PageController.showErrorMessage(qsTr("The value of the field S1 + message initiation size (148) must not equal S2 + message response size (92)"))
+                            return
                         }
                     }
 
-                    clickedFunc: function() {
-                        forceActiveFocus()
+                    var headerText = qsTr("Save settings?")
+                    var descriptionText = qsTr("All users with whom you shared a connection with will no longer be able to connect to it.")
+                    var yesButtonText = qsTr("Continue")
+                    var noButtonText = qsTr("Cancel")
 
-                        if (delegateItem.isEnabled) {
-                            if (AwgConfigModel.isHeadersEqual(underloadPacketMagicHeaderTextField.textField.text,
-                                                              transportPacketMagicHeaderTextField.textField.text,
-                                                              responsePacketMagicHeaderTextField.textField.text,
-                                                              initPacketMagicHeaderTextField.textField.text)) {
-                                PageController.showErrorMessage(qsTr("The values of the H1-H4 fields must be unique"))
-                                return
-                            }
-
-                            if (AwgConfigModel.isPacketSizeEqual(parseInt(initPacketJunkSizeTextField.textField.text),
-                                                                 parseInt(responsePacketJunkSizeTextField.textField.text))) {
-                                PageController.showErrorMessage(qsTr("The value of the field S1 + message initiation size (148) must not equal S2 + message response size (92)"))
-                                return
-                            }
+                    var yesButtonFunction = function() {
+                        if (ConnectionController.isConnected && ServersModel.getDefaultServerData("defaultContainer") === ContainersModel.getProcessedContainerIndex()) {
+                            PageController.showNotificationMessage(qsTr("Unable change settings while there is an active connection"))
+                            return
                         }
 
-                        var headerText = qsTr("Save settings?")
-                        var descriptionText = qsTr("All users with whom you shared a connection with will no longer be able to connect to it.")
-                        var yesButtonText = qsTr("Continue")
-                        var noButtonText = qsTr("Cancel")
-
-                        var yesButtonFunction = function() {
-                            if (ConnectionController.isConnected && ServersModel.getDefaultServerData("defaultContainer") === ContainersModel.getProcessedContainerIndex()) {
-                                PageController.showNotificationMessage(qsTr("Unable change settings while there is an active connection"))
-                                return
-                            }
-
-                            PageController.goToPage(PageEnum.PageSetupWizardInstalling);
-                            InstallController.updateContainer(AwgConfigModel.getConfig())
-                        }
-                        var noButtonFunction = function() {
-                            if (!GC.isMobile()) {
-                                saveRestartButton.forceActiveFocus()
-                            }
-                        }
-                        showQuestionDrawer(headerText, descriptionText, yesButtonText, noButtonText, yesButtonFunction, noButtonFunction)
+                        PageController.goToPage(PageEnum.PageSetupWizardInstalling);
+                        InstallController.updateContainer(AwgConfigModel.getConfig())
                     }
+
+                    var noButtonFunction = function() {}
+
+                    showQuestionDrawer(headerText, descriptionText, yesButtonText, noButtonText, yesButtonFunction, noButtonFunction)
                 }
             }
         }

client/ui/qml/Pages2/PageProtocolCloakSettings.qml

@@ -16,179 +16,161 @@ import "../Components"
 PageType {
     id: root
 
-    ColumnLayout {
-        id: backButtonLayout
+    BackButtonType {
+        id: backButton
 
         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
+    ListViewType {
+        id: listView
+
+        anchors.top: backButton.bottom
         anchors.bottom: parent.bottom
-        contentHeight: content.implicitHeight
+        anchors.left: parent.left
+        anchors.right: parent.right
 
-        Column {
-            id: content
+        property int selectedIndex: 0
 
-            anchors.top: parent.top
-            anchors.left: parent.left
-            anchors.right: parent.right
+        enabled: ServersModel.isProcessedServerHasWriteAccess()
 
-            enabled: ServersModel.isProcessedServerHasWriteAccess()
+        header: ColumnLayout {
 
-            ListView {
-                id: listview
+            width: listView.width
 
-                property int selectedIndex: 0
+            BaseHeaderType {
+                Layout.fillWidth: true
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
 
-                width: parent.width
-                height: listview.contentItem.height
+                headerText: qsTr("Cloak settings")
+            }
+        }
 
-                clip: true
-                reuseItems: true
+        model: CloakConfigModel
 
-                model: CloakConfigModel
+        delegate: ColumnLayout {
 
-                delegate: Item {
-                    implicitWidth: listview.width
-                    implicitHeight: col.implicitHeight
+            width: listView.width
 
-                    property alias trafficFromField: trafficFromField
+            property alias trafficFromField: trafficFromField
 
-                    ColumnLayout {
-                        id: col
+            spacing: 0
 
-                        anchors.top: parent.top
-                        anchors.left: parent.left
-                        anchors.right: parent.right
+            TextFieldWithHeaderType {
+                id: trafficFromField
 
-                        anchors.leftMargin: 16
-                        anchors.rightMargin: 16
+                Layout.fillWidth: true
+                Layout.topMargin: 32
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
 
-                        spacing: 0
+                headerText: qsTr("Disguised as traffic from")
+                textField.text: site
 
-                        BaseHeaderType {
-                            Layout.fillWidth: true
+                textField.onEditingFinished: {
+                    if (textField.text !== site) {
+                        var tmpText = textField.text
+                        tmpText = tmpText.toLocaleLowerCase()
 
-                            headerText: qsTr("Cloak settings")
+                        var indexHttps = tmpText.indexOf("https://")
+                        if (indexHttps === 0) {
+                            tmpText = textField.text.substring(8)
+                        } else {
+                            site = textField.text
                         }
+                    }
+                }
+            }
 
-                        TextFieldWithHeaderType {
-                            id: trafficFromField
+            TextFieldWithHeaderType {
+                id: portTextField
 
-                            Layout.fillWidth: true
-                            Layout.topMargin: 32
+                Layout.fillWidth: true
+                Layout.topMargin: 16
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
 
-                            headerText: qsTr("Disguised as traffic from")
-                            textField.text: site
+                headerText: qsTr("Port")
+                textField.text: port
+                textField.maximumLength: 5
+                textField.validator: IntValidator { bottom: 1; top: 65535 }
 
-                            textField.onEditingFinished: {
-                                if (textField.text !== site) {
-                                    var tmpText = textField.text
-                                    tmpText = tmpText.toLocaleLowerCase()
+                textField.onEditingFinished: {
+                    if (textField.text !== port) {
+                        port = textField.text
+                    }
+                }
+            }
 
-                                    var indexHttps = tmpText.indexOf("https://")
-                                    if (indexHttps === 0) {
-                                        tmpText = textField.text.substring(8)
-                                    } else {
-                                        site = textField.text
-                                    }
-                                }
-                            }
-                        }
+            DropDownType {
+                id: cipherDropDown
 
-                        TextFieldWithHeaderType {
-                            id: portTextField
+                Layout.fillWidth: true
+                Layout.topMargin: 16
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
 
-                            Layout.fillWidth: true
-                            Layout.topMargin: 16
+                descriptionText: qsTr("Cipher")
+                headerText: qsTr("Cipher")
 
-                            headerText: qsTr("Port")
-                            textField.text: port
-                            textField.maximumLength: 5
-                            textField.validator: IntValidator { bottom: 1; top: 65535 }
+                drawerParent: root
 
-                            textField.onEditingFinished: {
-                                if (textField.text !== port) {
-                                    port = textField.text
-                                }
-                            }
-                        }
+                listView: ListViewWithRadioButtonType {
+                    id: cipherListView
 
-                        DropDownType {
-                            id: cipherDropDown
-                            Layout.fillWidth: true
-                            Layout.topMargin: 16
+                    rootWidth: root.width
 
-                            descriptionText: qsTr("Cipher")
-                            headerText: qsTr("Cipher")
+                    model: ListModel {
+                        ListElement { name : "chacha20-ietf-poly1305" }
+                        ListElement { name : "xchacha20-ietf-poly1305" }
+                        ListElement { name : "aes-256-gcm" }
+                        ListElement { name : "aes-192-gcm" }
+                        ListElement { name : "aes-128-gcm" }
+                    }
 
-                            drawerParent: root
+                    clickedFunction: function() {
+                        cipherDropDown.text = selectedText
+                        cipher = cipherDropDown.text
+                        cipherDropDown.closeTriggered()
+                    }
 
-                            listView: ListViewWithRadioButtonType {
-                                id: cipherListView
+                    Component.onCompleted: {
+                        cipherDropDown.text = cipher
 
-                                rootWidth: root.width
-
-                                model: ListModel {
-                                    ListElement { name : "chacha20-ietf-poly1305" }
-                                    ListElement { name : "xchacha20-ietf-poly1305" }
-                                    ListElement { name : "aes-256-gcm" }
-                                    ListElement { name : "aes-192-gcm" }
-                                    ListElement { name : "aes-128-gcm" }
-                                }
-
-                                clickedFunction: function() {
-                                    cipherDropDown.text = selectedText
-                                    cipher = cipherDropDown.text
-                                    cipherDropDown.closeTriggered()
-                                }
-
-                                Component.onCompleted: {
-                                    cipherDropDown.text = cipher
-
-                                    for (var i = 0; i < cipherListView.model.count; i++) {
-                                        if (cipherListView.model.get(i).name === cipherDropDown.text) {
-                                            selectedIndex = i
-                                        }
-                                    }
-                                }
-                            }
-                        }
-
-                        BasicButtonType {
-                            id: saveRestartButton
-
-                            Layout.fillWidth: true
-                            Layout.topMargin: 24
-                            Layout.bottomMargin: 24
-
-                            text: qsTr("Save")
-
-                            clickedFunc: function() {
-                                forceActiveFocus()
-
-                                if (ConnectionController.isConnected && ServersModel.getDefaultServerData("defaultContainer") === ContainersModel.getProcessedContainerIndex()) {
-                                    PageController.showNotificationMessage(qsTr("Unable change settings while there is an active connection"))
-                                    return
-                                }
-
-                                PageController.goToPage(PageEnum.PageSetupWizardInstalling);
-                                InstallController.updateContainer(CloakConfigModel.getConfig())
+                        for (var i = 0; i < cipherListView.model.count; i++) {
+                            if (cipherListView.model.get(i).name === cipherDropDown.text) {
+                                selectedIndex = i
                             }
                         }
                     }
                 }
             }
+
+            BasicButtonType {
+                id: saveRestartButton
+
+                Layout.fillWidth: true
+                Layout.topMargin: 24
+                Layout.bottomMargin: 24
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
+
+                text: qsTr("Save")
+
+                clickedFunc: function() {
+                    if (ConnectionController.isConnected && ServersModel.getDefaultServerData("defaultContainer") === ContainersModel.getProcessedContainerIndex()) {
+                        PageController.showNotificationMessage(qsTr("Unable change settings while there is an active connection"))
+                        return
+                    }
+
+                    PageController.goToPage(PageEnum.PageSetupWizardInstalling);
+                    InstallController.updateContainer(CloakConfigModel.getConfig())
+                }
+            }
         }
     }
 }

client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml

@@ -17,401 +17,465 @@ import "../Components"
 PageType {
     id: root
 
-    ColumnLayout {
-        id: backButtonLayout
+    BackButtonType {
+        id: backButton
 
         anchors.top: parent.top
         anchors.left: parent.left
         anchors.right: parent.right
-
         anchors.topMargin: 20
 
-        BackButtonType {
-            id: backButton
+        onFocusChanged: {
+            if (this.activeFocus) {
+                listView.positionViewAtBeginning()
+            }
         }
     }
 
-    FlickableType {
-        id: fl
-        anchors.top: backButtonLayout.bottom
+    ListViewType {
+        id: listView
+
+        anchors.top: backButton.bottom
         anchors.bottom: parent.bottom
-        contentHeight: content.implicitHeight
+        anchors.right: parent.right
+        anchors.left: parent.left
 
-        Column {
-            id: content
+        enabled: ServersModel.isProcessedServerHasWriteAccess()
 
-            anchors.top: parent.top
-            anchors.left: parent.left
-            anchors.right: parent.right
+        header: ColumnLayout {
+            width: listView.width
 
-            enabled: ServersModel.isProcessedServerHasWriteAccess()
+            BaseHeaderType {
+                Layout.fillWidth: true
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
 
-            ListView {
-                id: listview
+                headerText: qsTr("OpenVPN settings")
+            }
+        }
 
-                width: parent.width
-                height: listview.contentItem.height
+        model: ListModel {
+            ListElement { type: "subnetHeader" }
+            ListElement { type: "networkProtocolText" }
+            ListElement { type: "protoSelector" }
+            ListElement { type: "portTextField" }
+            ListElement { type: "encryptionSection" }
+            ListElement { type: "checkboxSection" }
+            ListElement { type: "clientCommands" }
+            ListElement { type: "serverCommands" }
+        }
 
-                clip: true
-                interactive: false
+        delegate: DelegateChooser {
 
-                model: OpenVpnConfigModel             
+            role: "type"
 
-                delegate: Item {
-                    implicitWidth: listview.width
-                    implicitHeight: col.implicitHeight
+            DelegateChoice {
+                // property alias vpnAddressSubnetTextField: vpnAddressSubnetTextField
+                roleValue: "subnetHeader"
+                ColumnLayout {
+                    width: listView.width
 
-                    property alias vpnAddressSubnetTextField: vpnAddressSubnetTextField
+                    TextFieldWithHeaderType {
+                        id: vpnAddressSubnetTextField
 
-                    ColumnLayout {
-                        id: col
+                        Layout.fillWidth: true
+                        Layout.topMargin: 32
+                        Layout.leftMargin: 16
+                        Layout.rightMargin: 16
 
-                        anchors.top: parent.top
-                        anchors.left: parent.left
-                        anchors.right: parent.right
+                        headerText: qsTr("VPN address subnet")
+                        textField.text: OpenVpnConfigModel.subnetAddress
 
-                        anchors.leftMargin: 16
-                        anchors.rightMargin: 16
-
-                        spacing: 0
-
-                        BaseHeaderType {
-                            Layout.fillWidth: true
-
-                            headerText: qsTr("OpenVPN settings")
-                        }
-
-                        TextFieldWithHeaderType {
-                            id: vpnAddressSubnetTextField
-
-                            Layout.fillWidth: true
-                            Layout.topMargin: 32
-
-                            headerText: qsTr("VPN address subnet")
-                            textField.text: subnetAddress
-
-                            parentFlickable: fl
-
-                            textField.onEditingFinished: {
-                                if (textField.text !== subnetAddress) {
-                                    subnetAddress = textField.text
-                                }
+                        textField.onEditingFinished: {
+                            if (textField.text !== OpenVpnConfigModel.subnetAddress) {
+                                OpenVpnConfigModel.subnetAddress = textField.text
                             }
                         }
+                    }
+                }
+            }
 
-                        ParagraphTextType {
-                            Layout.fillWidth: true
-                            Layout.topMargin: 32
+            DelegateChoice {
+                roleValue: "networkProtocolText"
+                ColumnLayout {
+                    width: listView.width
 
-                            text: qsTr("Network protocol")
+                    ParagraphTextType {
+                        Layout.fillWidth: true
+                        Layout.topMargin: 32
+                        Layout.leftMargin: 16
+                        Layout.rightMargin: 16
+
+                        text: qsTr("Network protocol")
+                    }
+                }
+            }
+
+            DelegateChoice {
+                roleValue: "protoSelector"
+                ColumnLayout {
+                    width: listView.width
+
+                    TransportProtoSelector {
+                        id: transportProtoSelector
+
+                        Layout.fillWidth: true
+                        Layout.topMargin: 16
+                        Layout.leftMargin: 16
+                        Layout.rightMargin: 16
+                        rootWidth: root.width
+
+                        enabled: OpenVpnConfigModel.isTransportProtoEditable
+
+                        currentIndex: {
+                            return OpenVpnConfigModel.transportProto === "tcp" ? 1 : 0
                         }
 
-                        TransportProtoSelector {
-                            id: transportProtoSelector
-                            Layout.fillWidth: true
-                            Layout.topMargin: 16
+                        onCurrentIndexChanged: {
+                            if (OpenVpnConfigModel.transportProto === "tcp" && currentIndex === 0) {
+                                OpenVpnConfigModel.transportProto = "udp"
+                            } else if (OpenVpnConfigModel.transportProto === "udp" && currentIndex === 1) {
+                                OpenVpnConfigModel.transportProto = "tcp"
+                            }
+                        }
+                    }
+                }
+            }
+
+            DelegateChoice {
+                roleValue: "portTextField"
+                ColumnLayout {
+                    width: listView.width
+
+                    TextFieldWithHeaderType {
+                        id: portTextField
+
+                        Layout.fillWidth: true
+                        Layout.topMargin: 40
+                        Layout.leftMargin: 16
+                        Layout.rightMargin: 16
+
+                        enabled: OpenVpnConfigModel.isPortEditable
+
+                        headerText: qsTr("Port")
+                        textField.text: OpenVpnConfigModel.port
+                        textField.maximumLength: 5
+                        textField.validator: IntValidator { bottom: 1; top: 65535 }
+
+                        textField.onEditingFinished: {
+                            if (textField.text !== OpenVpnConfigModel.port) {
+                                OpenVpnConfigModel.port = textField.text
+                            }
+                        }
+                    }
+                }
+            }
+
+            DelegateChoice {
+                roleValue: "encryptionSection"
+                ColumnLayout {
+                    width: listView.width
+
+                    SwitcherType {
+                        id: autoNegotiateEncryprionSwitcher
+
+                        Layout.fillWidth: true
+                        Layout.topMargin: 24
+                        Layout.leftMargin: 16
+                        Layout.rightMargin: 16
+
+                        text: qsTr("Auto-negotiate encryption")
+                        checked: OpenVpnConfigModel.autoNegotiateEncryption
+
+                        onCheckedChanged: {
+                            if (checked !== OpenVpnConfigModel.autoNegotiateEncryprion) {
+                                OpenVpnConfigModel.autoNegotiateEncryprion = checked
+                            }
+                        }
+                    }
+
+                    DropDownType {
+                        id: hashDropDown
+
+                        Layout.fillWidth: true
+                        Layout.topMargin: 20
+                        Layout.leftMargin: 16
+                        Layout.rightMargin: 16
+
+                        enabled: !autoNegotiateEncryprionSwitcher.checked
+
+                        descriptionText: qsTr("Hash")
+                        headerText: qsTr("Hash")
+
+                        drawerParent: root
+
+                        listView: ListViewWithRadioButtonType {
+                            id: hashListView
+
                             rootWidth: root.width
 
-                            enabled: isTransportProtoEditable
-
-                            currentIndex: {
-                                return transportProto === "tcp" ? 1 : 0
+                            model: ListModel {
+                                ListElement { name : qsTr("SHA512") }
+                                ListElement { name : qsTr("SHA384") }
+                                ListElement { name : qsTr("SHA256") }
+                                ListElement { name : qsTr("SHA3-512") }
+                                ListElement { name : qsTr("SHA3-384") }
+                                ListElement { name : qsTr("SHA3-256") }
+                                ListElement { name : qsTr("whirlpool") }
+                                ListElement { name : qsTr("BLAKE2b512") }
+                                ListElement { name : qsTr("BLAKE2s256") }
+                                ListElement { name : qsTr("SHA1") }
                             }
 
-                            onCurrentIndexChanged: {
-                                if (transportProto === "tcp" && currentIndex === 0) {
-                                    transportProto = "udp"
-                                } else if (transportProto === "udp" && currentIndex === 1) {
-                                    transportProto = "tcp"
-                                }
+                            clickedFunction: function() {
+                                hashDropDown.text = selectedText
+                                OpenVpnConfigModel.hash = hashDropDown.text
+                                hashDropDown.closeTriggered()
                             }
-                        }
 
-                        TextFieldWithHeaderType {
-                            id: portTextField
+                            Component.onCompleted: {
+                                hashDropDown.text = OpenVpnConfigModel.hash
 
-                            Layout.fillWidth: true
-                            Layout.topMargin: 40
-                            parentFlickable: fl
-
-                            enabled: isPortEditable
-
-                            headerText: qsTr("Port")
-                            textField.text: port
-                            textField.maximumLength: 5
-                            textField.validator: IntValidator { bottom: 1; top: 65535 }
-
-                            textField.onEditingFinished: {
-                                if (textField.text !== port) {
-                                    port = textField.text
-                                }
-                            }
-                        }
-
-                        SwitcherType {
-                            id: autoNegotiateEncryprionSwitcher
-
-                            Layout.fillWidth: true
-                            Layout.topMargin: 24
-                            parentFlickable: fl
-
-                            text: qsTr("Auto-negotiate encryption")
-                            checked: autoNegotiateEncryprion
-
-                            onCheckedChanged: {
-                                if (checked !== autoNegotiateEncryprion) {
-                                    autoNegotiateEncryprion = checked
-                                }
-                            }
-                        }
-
-                        DropDownType {
-                            id: hashDropDown
-                            Layout.fillWidth: true
-                            Layout.topMargin: 20
-
-                            enabled: !autoNegotiateEncryprionSwitcher.checked
-
-                            descriptionText: qsTr("Hash")
-                            headerText: qsTr("Hash")
-
-                            drawerParent: root
-
-                            listView: ListViewWithRadioButtonType {
-                                id: hashListView
-
-                                rootWidth: root.width
-
-                                model: ListModel {
-                                    ListElement { name : qsTr("SHA512") }
-                                    ListElement { name : qsTr("SHA384") }
-                                    ListElement { name : qsTr("SHA256") }
-                                    ListElement { name : qsTr("SHA3-512") }
-                                    ListElement { name : qsTr("SHA3-384") }
-                                    ListElement { name : qsTr("SHA3-256") }
-                                    ListElement { name : qsTr("whirlpool") }
-                                    ListElement { name : qsTr("BLAKE2b512") }
-                                    ListElement { name : qsTr("BLAKE2s256") }
-                                    ListElement { name : qsTr("SHA1") }
-                                }
-
-                                clickedFunction: function() {
-                                    hashDropDown.text = selectedText
-                                    hash = hashDropDown.text
-                                    hashDropDown.closeTriggered()
-                                }
-
-                                Component.onCompleted: {
-                                    hashDropDown.text = hash
-
-                                    for (var i = 0; i < hashListView.model.count; i++) {
-                                        if (hashListView.model.get(i).name === hashDropDown.text) {
-                                            currentIndex = i
-                                        }
+                                for (var i = 0; i < hashListView.model.count; i++) {
+                                    if (hashListView.model.get(i).name === hashDropDown.text) {
+                                        currentIndex = i
                                     }
                                 }
                             }
                         }
+                    }
 
-                        DropDownType {
-                            id: cipherDropDown
-                            Layout.fillWidth: true
-                            Layout.topMargin: 16
+                    DropDownType {
+                        id: cipherDropDown
 
-                            enabled: !autoNegotiateEncryprionSwitcher.checked
+                        Layout.fillWidth: true
+                        Layout.topMargin: 16
+                        Layout.leftMargin: 16
+                        Layout.rightMargin: 16
 
-                            descriptionText: qsTr("Cipher")
-                            headerText: qsTr("Cipher")
+                        enabled: !autoNegotiateEncryprionSwitcher.checked
 
-                            drawerParent: root
+                        descriptionText: qsTr("Cipher")
+                        headerText: qsTr("Cipher")
 
-                            listView: ListViewWithRadioButtonType {
-                                id: cipherListView
+                        drawerParent: root
 
-                                rootWidth: root.width
+                        listView: ListViewWithRadioButtonType {
+                            id: cipherListView
 
-                                model: ListModel {
-                                    ListElement { name : qsTr("AES-256-GCM") }
-                                    ListElement { name : qsTr("AES-192-GCM") }
-                                    ListElement { name : qsTr("AES-128-GCM") }
-                                    ListElement { name : qsTr("AES-256-CBC") }
-                                    ListElement { name : qsTr("AES-192-CBC") }
-                                    ListElement { name : qsTr("AES-128-CBC") }
-                                    ListElement { name : qsTr("ChaCha20-Poly1305") }
-                                    ListElement { name : qsTr("ARIA-256-CBC") }
-                                    ListElement { name : qsTr("CAMELLIA-256-CBC") }
-                                    ListElement { name : qsTr("none") }
-                                }
+                            rootWidth: root.width
 
-                                clickedFunction: function() {
-                                    cipherDropDown.text = selectedText
-                                    cipher = cipherDropDown.text
-                                    cipherDropDown.closeTriggered()
-                                }
+                            model: ListModel {
+                                ListElement { name : qsTr("AES-256-GCM") }
+                                ListElement { name : qsTr("AES-192-GCM") }
+                                ListElement { name : qsTr("AES-128-GCM") }
+                                ListElement { name : qsTr("AES-256-CBC") }
+                                ListElement { name : qsTr("AES-192-CBC") }
+                                ListElement { name : qsTr("AES-128-CBC") }
+                                ListElement { name : qsTr("ChaCha20-Poly1305") }
+                                ListElement { name : qsTr("ARIA-256-CBC") }
+                                ListElement { name : qsTr("CAMELLIA-256-CBC") }
+                                ListElement { name : qsTr("none") }
+                            }
 
-                                Component.onCompleted: {
-                                    cipherDropDown.text = cipher
+                            clickedFunction: function() {
+                                cipherDropDown.text = selectedText
+                                OpenVpnConfigModel.cipher = cipherDropDown.text
+                                cipherDropDown.closeTriggered()
+                            }
 
-                                    for (var i = 0; i < cipherListView.model.count; i++) {
-                                        if (cipherListView.model.get(i).name === cipherDropDown.text) {
-                                            currentIndex = i
-                                        }
+                            Component.onCompleted: {
+                                cipherDropDown.text = OpenVpnConfigModel.cipher
+
+                                for (var i = 0; i < cipherListView.model.count; i++) {
+                                    if (cipherListView.model.get(i).name === cipherDropDown.text) {
+                                        currentIndex = i
                                     }
                                 }
                             }
                         }
+                    }
+                }
+            }
 
-                        Rectangle {
-                            id: contentRect
-                            Layout.fillWidth: true
-                            Layout.topMargin: 32
-                            Layout.preferredHeight: checkboxLayout.implicitHeight
-                            color: AmneziaStyle.color.onyxBlack
-                            radius: 16
+            DelegateChoice {
+                roleValue: "checkboxSection"
+                ColumnLayout {
+                    width: listView.width
 
-                            Connections {
-                                target: tlsAuthCheckBox
-                                enabled: !GC.isMobile()
+                    Rectangle {
+                        id: contentRect
 
-                                function onFocusChanged() {
-                                    if (tlsAuthCheckBox.activeFocus) {
-                                        fl.ensureVisible(contentRect)
+                        Layout.fillWidth: true
+                        Layout.topMargin: 32
+                        Layout.leftMargin: 16
+                        Layout.rightMargin: 16
+                        Layout.preferredHeight: checkboxLayout.implicitHeight
+                        color: AmneziaStyle.color.onyxBlack
+                        radius: 16
+
+                        ColumnLayout {
+                            id: checkboxLayout
+
+                            anchors.fill: parent
+
+                            CheckBoxType {
+                                id: tlsAuthCheckBox
+
+                                Layout.fillWidth: true
+
+                                text: qsTr("TLS auth")
+                                checked: OpenVpnConfigModel.tlsAuth
+
+                                onCheckedChanged: {
+                                    if (checked !== OpenVpnConfigModel.tlsAuth) {
+                                        console.log("tlsAuth changed to: " + checked)
+                                        OpenVpnConfigModel.tlsAuth = checked
                                     }
                                 }
                             }
 
-                            ColumnLayout {
-                                id: checkboxLayout
+                            DividerType {}
 
-                                anchors.fill: parent
-                                CheckBoxType {
-                                    id: tlsAuthCheckBox
-                                    Layout.fillWidth: true
+                            CheckBoxType {
+                                id: blockDnsCheckBox
 
-                                    text: qsTr("TLS auth")
-                                    checked: tlsAuth
+                                Layout.fillWidth: true
 
-                                    onCheckedChanged: {
-                                        if (checked !== tlsAuth) {
-                                            console.log("tlsAuth changed to: " + checked)
-                                            tlsAuth = checked
-                                        }
-                                    }
-                                }
+                                text: qsTr("Block DNS requests outside of VPN")
+                                checked: OpenVpnConfigModel.blockDns
 
-                                DividerType {}
-
-                                CheckBoxType {
-                                    id: blockDnsCheckBox
-                                    Layout.fillWidth: true
-
-                                    text: qsTr("Block DNS requests outside of VPN")
-                                    checked: blockDns
-
-                                    onCheckedChanged: {
-                                        if (checked !== blockDns) {
-                                            blockDns = checked
-                                        }
+                                onCheckedChanged: {
+                                    if (checked !== OpenVpnConfigModel.blockDns) {
+                                        OpenVpnConfigModel.blockDns = checked
                                     }
                                 }
                             }
                         }
+                    }
+                }
+            }
 
-                        SwitcherType {
-                            id: additionalClientCommandsSwitcher
-                            Layout.fillWidth: true
-                            Layout.topMargin: 32
-                            parentFlickable: fl
+            DelegateChoice {
+                roleValue: "clientCommands"
+                ColumnLayout {
 
-                            checked: additionalClientCommands !== ""
+                    width: listView.width
 
-                            text: qsTr("Additional client configuration commands")
+                    SwitcherType {
+                        id: additionalClientCommandsSwitcher
 
-                            onCheckedChanged: {
-                                if (!checked) {
-                                    additionalClientCommands = ""
-                                }
+                        Layout.fillWidth: true
+                        Layout.topMargin: 32
+                        Layout.leftMargin: 16
+                        Layout.rightMargin: 16
+
+                        checked: OpenVpnConfigModel.additionalClientCommands !== ""
+
+                        text: qsTr("Additional client configuration commands")
+
+                        onCheckedChanged: {
+                            if (!checked) {
+                                OpenVpnConfigModel.additionalClientCommands = ""
+                            }
+                            // listView.positionViewAtIndex(index, ListView.Beginning)
+                        }
+                    }
+
+                    TextAreaType {
+                        id: additionalClientCommandsTextArea
+
+                        Layout.fillWidth: true
+                        Layout.topMargin: 16
+                        Layout.leftMargin: 16
+                        Layout.rightMargin: 16
+
+                        visible: additionalClientCommandsSwitcher.checked
+
+                        textAreaText: OpenVpnConfigModel.additionalClientCommands
+                        placeholderText: qsTr("Commands:")
+
+                        textArea.onEditingFinished: {
+                            if (OpenVpnConfigModel.additionalClientCommands !== textAreaText) {
+                                OpenVpnConfigModel.additionalClientCommands = textAreaText
                             }
                         }
+                    }
+                }
+            }
 
-                        TextAreaType {
-                            id: additionalClientCommandsTextArea
-                            Layout.fillWidth: true
-                            Layout.topMargin: 16
+            DelegateChoice {
+                roleValue: "serverCommands"
+                ColumnLayout {
+                    width: listView.width
 
-                            visible: additionalClientCommandsSwitcher.checked
+                    SwitcherType {
+                        id: additionalServerCommandsSwitcher
 
-                            parentFlickable: fl
+                        Layout.fillWidth: true
+                        Layout.topMargin: 16
+                        Layout.leftMargin: 16
+                        Layout.rightMargin: 16
 
-                            textAreaText: additionalClientCommands
-                            placeholderText: qsTr("Commands:")
+                        checked: OpenVpnConfigModel.additionalServerCommands !== ""
 
-                            textArea.onEditingFinished: {
-                                if (additionalClientCommands !== textAreaText) {
-                                    additionalClientCommands = textAreaText
-                                }
+                        text: qsTr("Additional server configuration commands")
+
+                        onCheckedChanged: {
+                            if (!checked) {
+                                OpenVpnConfigModel.additionalServerCommands = ""
                             }
+                            // listView.positionViewAtIndex(index, ListView.Beginning)
                         }
+                    }
 
-                        SwitcherType {
-                            id: additionalServerCommandsSwitcher
-                            Layout.fillWidth: true
-                            Layout.topMargin: 16
-                            parentFlickable: fl
+                    TextAreaType {
+                        id: additionalServerCommandsTextArea
 
-                            checked: additionalServerCommands !== ""
+                        Layout.fillWidth: true
+                        Layout.topMargin: 16
+                        Layout.leftMargin: 16
+                        Layout.rightMargin: 16
 
-                            text: qsTr("Additional server configuration commands")
+                        visible: additionalServerCommandsSwitcher.checked
 
-                            onCheckedChanged: {
-                                if (!checked) {
-                                    additionalServerCommands = ""
-                                }
-                            }
-                        }
+                        textAreaText: OpenVpnConfigModel.additionalServerCommands
+                        placeholderText: qsTr("Commands:")
 
-                        TextAreaType {
-                            id: additionalServerCommandsTextArea
-                            Layout.fillWidth: true
-                            Layout.topMargin: 16
-
-                            visible: additionalServerCommandsSwitcher.checked
-
-                            textAreaText: additionalServerCommands
-                            placeholderText: qsTr("Commands:")
-                            parentFlickable: fl
-                            textArea.onEditingFinished: {
-                                if (additionalServerCommands !== textAreaText) {
-                                    additionalServerCommands = textAreaText
-                                }
-                            }
-                        }
-
-                        BasicButtonType {
-                            id: saveRestartButton
-
-                            Layout.fillWidth: true
-                            Layout.topMargin: 24
-                            Layout.bottomMargin: 24
-
-                            text: qsTr("Save")
-                            parentFlickable: fl
-
-                            clickedFunc: function() {
-                                forceActiveFocus()
-
-                                if (ConnectionController.isConnected && ServersModel.getDefaultServerData("defaultContainer") === ContainersModel.getProcessedContainerIndex()) {
-                                    PageController.showNotificationMessage(qsTr("Unable change settings while there is an active connection"))
-                                    return
-                                }
-
-                                PageController.goToPage(PageEnum.PageSetupWizardInstalling);
-                                InstallController.updateContainer(OpenVpnConfigModel.getConfig())
+                        textArea.onEditingFinished: {
+                            if (OpenVpnConfigModel.additionalServerCommands !== textAreaText) {
+                                OpenVpnConfigModel.additionalServerCommands = textAreaText
                             }
                         }
                     }
                 }
             }
         }
+        
+        footer: ColumnLayout {
+            width: listView.width
+
+            BasicButtonType {
+                id: saveRestartButton
+
+                Layout.fillWidth: true
+                Layout.topMargin: 24
+                Layout.bottomMargin: 24
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
+
+                text: qsTr("Save")
+
+                clickedFunc: function() {
+                    if (ConnectionController.isConnected && ServersModel.getDefaultServerData("defaultContainer") === ContainersModel.getProcessedContainerIndex()) {
+                        PageController.showNotificationMessage(qsTr("Unable change settings while there is an active connection"))
+                        return
+                    }
+
+                    PageController.goToPage(PageEnum.PageSetupWizardInstalling);
+                    InstallController.updateContainer(OpenVpnConfigModel.getConfig())
+                }
+            }
+        }
     }
 }

client/ui/qml/Pages2/PageProtocolRaw.qml

@@ -19,164 +19,154 @@ import "../Components"
 PageType {
     id: root
 
-    ColumnLayout {
-        id: header
+    BackButtonType {
+        id: backButton
 
         anchors.top: parent.top
         anchors.left: parent.left
         anchors.right: parent.right
-
         anchors.topMargin: 20
 
-        BackButtonType {
-            id: backButton
-        }
-
-        BaseHeaderType {
-            Layout.fillWidth: true
-            Layout.leftMargin: 16
-            Layout.rightMargin: 16
-
-            headerText: ContainersModel.getProcessedContainerName() + qsTr(" settings")
+        onFocusChanged: {
+            if (this.activeFocus) {
+                listView.positionViewAtBeginning()
+            }
         }
     }
 
-    FlickableType {
-        id: fl
-        anchors.top: header.bottom
-        anchors.left: parent.left
+    ListViewType {
+        id: listView
+
+        anchors.top: backButton.bottom
+        anchors.bottom: parent.bottom
         anchors.right: parent.right
-        contentHeight: content.height
+        anchors.left: parent.left
 
-        Column {
-            id: content
+        header: ColumnLayout {
+            width: listView.width
 
-            anchors.top: parent.top
-            anchors.left: parent.left
-            anchors.right: parent.right
-            anchors.topMargin: 32
+            BaseHeaderType {
+                Layout.fillWidth: true
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
+                Layout.bottomMargin: 16
 
-            ListView {
-                id: listView
-                width: parent.width
-                height: contentItem.height
-                clip: true
-                interactive: false
-                model: ProtocolsModel
+                headerText: ContainersModel.getProcessedContainerName() + qsTr(" settings")
+            }
+        }
 
-                activeFocusOnTab: true
-                focus: true
+        model: ProtocolsModel
 
-                delegate: Item {
-                    implicitWidth: parent.width
-                    implicitHeight: delegateContent.implicitHeight
+        delegate: ColumnLayout {
+            width: listView.width
 
-                    property alias focusItem: button
+            LabelWithButtonType {
+                id: button
 
-                    ColumnLayout {
-                        id: delegateContent
+                Layout.fillWidth: true
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
 
-                        anchors.fill: parent
+                text: qsTr("Show connection options")
 
-                        LabelWithButtonType {
-                            id: button
+                clickedFunction: function() {
+                    configContentDrawer.openTriggered()
+                }
 
-                            Layout.fillWidth: true
+                MouseArea {
+                    anchors.fill: button
+                    cursorShape: Qt.PointingHandCursor
+                    enabled: false
+                }
+            }
 
-                            text: qsTr("Show connection options")
+            DividerType {}
 
-                            clickedFunction: function() {
-                                configContentDrawer.openTriggered()
-                            }
+            DrawerType2 {
+                id: configContentDrawer
 
-                            MouseArea {
-                                anchors.fill: button
-                                cursorShape: Qt.PointingHandCursor
-                                enabled: false
+                expandedHeight: root.height * 0.9
+
+                parent: root
+                anchors.fill: parent
+
+                expandedStateContent: Item {
+                    implicitHeight: configContentDrawer.expandedHeight
+
+                    BackButtonType {
+                        id: drawerBackButton
+
+                        anchors.top: parent.top
+                        anchors.left: parent.left
+                        anchors.right: parent.right
+                        anchors.topMargin: 16
+
+                        backButtonFunction: function() {
+                            configContentDrawer.closeTriggered()
+                        }
+                    }
+
+                    ListViewType {
+                        id: drawerListView
+
+                        anchors.top: drawerBackButton.bottom
+                        anchors.bottom: parent.bottom
+                        anchors.right: parent.right
+                        anchors.left: parent.left
+
+                        header: ColumnLayout {
+                            width: drawerListView.width
+
+                            Header2Type {
+                                Layout.fillWidth: true
+                                Layout.topMargin: 16
+                                Layout.leftMargin: 16
+                                Layout.rightMargin: 16
+
+                                headerText: qsTr("Connection options %1").arg(protocolName)
                             }
                         }
 
-                        DividerType {}
+                        model: 1 // fake model to force the ListView to be created without a model
 
-                        DrawerType2 {
-                            id: configContentDrawer
+                        delegate: ColumnLayout {
+                            width: drawerListView.width
 
-                            expandedHeight: root.height * 0.9
+                            TextArea {
+                                id: configText
 
-                            parent: root
-                            anchors.fill: parent
+                                Layout.fillWidth: true
+                                Layout.topMargin: 16
+                                Layout.leftMargin: 16
+                                Layout.rightMargin: 16
 
-                            expandedStateContent: Item {
-                                implicitHeight: configContentDrawer.expandedHeight
+                                padding: 0
+                                height: 24
 
-                                BackButtonType {
-                                    id: backButton1
+                                color: AmneziaStyle.color.paleGray
+                                selectionColor: AmneziaStyle.color.richBrown
+                                selectedTextColor: AmneziaStyle.color.paleGray
 
-                                    anchors.top: parent.top
-                                    anchors.left: parent.left
-                                    anchors.right: parent.right
-                                    anchors.topMargin: 16
+                                font.pixelSize: 16
+                                font.weight: Font.Medium
+                                font.family: "PT Root UI VF"
 
-                                    backButtonFunction: function() {
-                                        configContentDrawer.closeTriggered()
-                                    }
-                                }
+                                text: rawConfig
 
-                                FlickableType {
-                                    anchors.top: backButton1.bottom
-                                    anchors.left: parent.left
-                                    anchors.right: parent.right
-                                    anchors.bottom: parent.bottom
-                                    contentHeight: configContent.implicitHeight + configContent.anchors.topMargin + configContent.anchors.bottomMargin
+                                wrapMode: Text.Wrap
 
-                                    ColumnLayout {
-                                        id: configContent
-
-                                        anchors.fill: parent
-                                        anchors.rightMargin: 16
-                                        anchors.leftMargin: 16
-
-                                        Header2Type {
-                                            Layout.fillWidth: true
-                                            Layout.topMargin: 16
-
-                                            headerText: qsTr("Connection options %1").arg(protocolName)
-                                        }
-
-                                        TextArea {
-                                            id: configText
-
-                                            Layout.fillWidth: true
-                                            Layout.topMargin: 16
-                                            Layout.bottomMargin: 16
-
-                                            padding: 0
-                                            leftPadding: 0
-                                            height: 24
-
-                                            color: AmneziaStyle.color.paleGray
-                                            selectionColor: AmneziaStyle.color.richBrown
-                                            selectedTextColor: AmneziaStyle.color.paleGray
-
-                                            font.pixelSize: 16
-                                            font.weight: Font.Medium
-                                            font.family: "PT Root UI VF"
-
-                                            text: rawConfig
-
-                                            wrapMode: Text.Wrap
-
-                                            background: Rectangle {
-                                                color: AmneziaStyle.color.transparent
-                                            }
-                                        }
-                                    }
+                                background: Rectangle {
+                                    color: AmneziaStyle.color.transparent
                                 }
                             }
                         }
                     }
                 }
             }
+        }
+
+        footer: ColumnLayout {
+            width: listView.width
 
             LabelWithButtonType {
                 id: removeButton
@@ -198,11 +188,7 @@ PageType {
                         PageController.goToPage(PageEnum.PageDeinstalling)
                         InstallController.removeProcessedContainer()
                     }
-                    var noButtonFunction = function() {
-                        if (!GC.isMobile()) {
-                            focusItem.forceActiveFocus()
-                        }
-                    }
+                    var noButtonFunction = function() {}
 
                     showQuestionDrawer(headerText, descriptionText, yesButtonText, noButtonText, yesButtonFunction, noButtonFunction)
                 }

client/ui/qml/Pages2/PageProtocolShadowSocksSettings.qml

@@ -16,164 +16,138 @@ import "../Components"
 PageType {
     id: root
 
-    ColumnLayout {
-        id: backButtonLayout
+    BackButtonType {
+        id: backButton
 
         anchors.top: parent.top
         anchors.left: parent.left
         anchors.right: parent.right
-
         anchors.topMargin: 20
 
-        BackButtonType {
-            id: backButton
+        onFocusChanged: {
+            if (this.activeFocus) {
+                listView.positionViewAtBeginning()
+            }
         }
     }
 
-    FlickableType {
-        id: fl
-        anchors.top: backButtonLayout.bottom
+    ListViewType {
+        id: listView
+
+        anchors.top: backButton.bottom
         anchors.bottom: parent.bottom
-        contentHeight: content.implicitHeight
+        anchors.right: parent.right
+        anchors.left: parent.left
 
-        Column {
-            id: content
+        enabled: ServersModel.isProcessedServerHasWriteAccess()
 
-            anchors.top: parent.top
-            anchors.left: parent.left
-            anchors.right: parent.right
+        model: ShadowSocksConfigModel
 
-            enabled: ServersModel.isProcessedServerHasWriteAccess()
+        delegate: ColumnLayout {
+            width: listView.width
 
-            ListView {
-                id: listview
+            spacing: 0
 
-                width: parent.width
-                height: listview.contentItem.height
+            BaseHeaderType {
+                Layout.fillWidth: true
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
 
-                clip: true
-                interactive: false
+                headerText: qsTr("Shadowsocks settings")
+            }
 
-                model: ShadowSocksConfigModel
+            TextFieldWithHeaderType {
+                id: portTextField
 
-                delegate: Item {
-                    implicitWidth: listview.width
-                    implicitHeight: col.implicitHeight
+                Layout.fillWidth: true
+                Layout.topMargin: 40
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
 
-                    property var focusItemId: portTextField.enabled ?
-                                                    portTextField :
-                                                    cipherDropDown.enabled ?
-                                                        cipherDropDown :
-                                                        saveRestartButton
+                enabled: isPortEditable
 
-                    ColumnLayout {
-                        id: col
+                headerText: qsTr("Port")
+                textField.text: port
+                textField.maximumLength: 5
+                textField.validator: IntValidator { bottom: 1; top: 65535 }
 
-                        anchors.top: parent.top
-                        anchors.left: parent.left
-                        anchors.right: parent.right
+                textField.onEditingFinished: {
+                    if (textField.text !== port) {
+                        port = textField.text
+                    }
+                }
+            }
 
-                        anchors.leftMargin: 16
-                        anchors.rightMargin: 16
+            DropDownType {
+                id: cipherDropDown
 
-                        spacing: 0
+                Layout.fillWidth: true
+                Layout.topMargin: 20
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
 
-                        BaseHeaderType {
-                            Layout.fillWidth: true
+                enabled: isCipherEditable
 
-                            headerText: qsTr("Shadowsocks settings")
-                        }
+                descriptionText: qsTr("Cipher")
+                headerText: qsTr("Cipher")
 
-                        TextFieldWithHeaderType {
-                            id: portTextField
+                drawerParent: root
 
-                            Layout.fillWidth: true
-                            Layout.topMargin: 40
+                listView: ListViewWithRadioButtonType {
 
-                            enabled: isPortEditable
+                    id: cipherListView
 
-                            headerText: qsTr("Port")
-                            textField.text: port
-                            textField.maximumLength: 5
-                            textField.validator: IntValidator { bottom: 1; top: 65535 }
+                    rootWidth: root.width
 
-                            textField.onEditingFinished: {
-                                if (textField.text !== port) {
-                                    port = textField.text
-                                }
-                            }
-                        }
+                    model: ListModel {
+                        ListElement { name : "chacha20-ietf-poly1305" }
+                        ListElement { name : "xchacha20-ietf-poly1305" }
+                        ListElement { name : "aes-256-gcm" }
+                        ListElement { name : "aes-192-gcm" }
+                        ListElement { name : "aes-128-gcm" }
+                    }
 
-                        DropDownType {
-                            id: cipherDropDown
-                            Layout.fillWidth: true
-                            Layout.topMargin: 20
+                    clickedFunction: function() {
+                        cipherDropDown.text = selectedText
+                        cipher = cipherDropDown.text
+                        cipherDropDown.closeTriggered()
+                    }
 
-                            enabled: isCipherEditable
+                    Component.onCompleted: {
+                        cipherDropDown.text = cipher
 
-                            descriptionText: qsTr("Cipher")
-                            headerText: qsTr("Cipher")
-
-                            drawerParent: root
-
-                            listView: ListViewWithRadioButtonType {
-
-                                id: cipherListView
-
-                                rootWidth: root.width
-
-                                model: ListModel {
-                                    ListElement { name : "chacha20-ietf-poly1305" }
-                                    ListElement { name : "xchacha20-ietf-poly1305" }
-                                    ListElement { name : "aes-256-gcm" }
-                                    ListElement { name : "aes-192-gcm" }
-                                    ListElement { name : "aes-128-gcm" }
-                                }
-
-                                clickedFunction: function() {
-                                    cipherDropDown.text = selectedText
-                                    cipher = cipherDropDown.text
-                                    cipherDropDown.closeTriggered()
-                                }
-
-                                Component.onCompleted: {
-                                    cipherDropDown.text = cipher
-
-                                    for (var i = 0; i < cipherListView.model.count; i++) {
-                                        if (cipherListView.model.get(i).name === cipherDropDown.text) {
-                                            currentIndex = i
-                                        }
-                                    }
-                                }
-                            }
-                        }
-
-                        BasicButtonType {
-                            id: saveRestartButton
-
-                            Layout.fillWidth: true
-                            Layout.topMargin: 24
-                            Layout.bottomMargin: 24
-
-                            enabled: isPortEditable | isCipherEditable
-
-                            text: qsTr("Save")
-
-                            clickedFunc: function() {
-                                forceActiveFocus()
-
-                                if (ConnectionController.isConnected && ServersModel.getDefaultServerData("defaultContainer") === ContainersModel.getProcessedContainerIndex()) {
-                                    PageController.showNotificationMessage(qsTr("Unable change settings while there is an active connection"))
-                                    return
-                                }
-
-                                PageController.goToPage(PageEnum.PageSetupWizardInstalling);
-                                InstallController.updateContainer(ShadowSocksConfigModel.getConfig())
+                        for (var i = 0; i < cipherListView.model.count; i++) {
+                            if (cipherListView.model.get(i).name === cipherDropDown.text) {
+                                currentIndex = i
                             }
                         }
                     }
                 }
             }
+
+            BasicButtonType {
+                id: saveRestartButton
+
+                Layout.fillWidth: true
+                Layout.topMargin: 24
+                Layout.bottomMargin: 24
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
+
+                enabled: isPortEditable | isCipherEditable
+
+                text: qsTr("Save")
+
+                clickedFunc: function() {
+                    if (ConnectionController.isConnected && ServersModel.getDefaultServerData("defaultContainer") === ContainersModel.getProcessedContainerIndex()) {
+                        PageController.showNotificationMessage(qsTr("Unable change settings while there is an active connection"))
+                        return
+                    }
+
+                    PageController.goToPage(PageEnum.PageSetupWizardInstalling);
+                    InstallController.updateContainer(ShadowSocksConfigModel.getConfig())
+                }
+            }
         }
     }
 }

client/ui/qml/Pages2/PageProtocolWireGuardClientSettings.qml

@@ -16,160 +16,124 @@ import "../Components"
 PageType {
     id: root
 
-    Item {
-        id: focusItem
-        onFocusChanged: {
-            if (activeFocus) {
-                fl.ensureVisible(focusItem)
-            }
-        }
-        KeyNavigation.tab: backButton
-    }
-
-    ColumnLayout {
-        id: backButtonLayout
+    BackButtonType {
+        id: backButton
 
         anchors.top: parent.top
         anchors.left: parent.left
         anchors.right: parent.right
-
         anchors.topMargin: 20
 
-        BackButtonType {
-            id: backButton
-            KeyNavigation.tab: listview.currentItem.mtuTextField.textField
+        onFocusChanged: {
+            if (this.activeFocus) {
+                listView.positionViewAtBeginning()
+            }
         }
     }
 
-    FlickableType {
-        id: fl
-        anchors.top: backButtonLayout.bottom
+    ListViewType {
+        id: listView
+
+        anchors.top: backButton.bottom
         anchors.bottom: parent.bottom
-        contentHeight: content.implicitHeight + saveButton.implicitHeight + saveButton.anchors.bottomMargin + saveButton.anchors.topMargin
+        anchors.right: parent.right
+        anchors.left: parent.left
 
-        Column {
-            id: content
+        model: WireGuardConfigModel
 
-            anchors.top: parent.top
-            anchors.left: parent.left
-            anchors.right: parent.right
+        delegate: ColumnLayout {
+            width: listView.width
 
-            ListView {
-                id: listview
+            property alias mtuTextField: mtuTextField
+            property bool isSaveButtonEnabled: mtuTextField.errorText === ""
 
-                width: parent.width
-                height: listview.contentItem.height
+            spacing: 0
 
-                clip: true
-                interactive: false
+            BaseHeaderType {
+                Layout.fillWidth: true
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
 
-                model: WireGuardConfigModel
+                headerText: qsTr("WG settings")
+            }
 
-                delegate: Item {
-                    id: delegateItem
-                    implicitWidth: listview.width
-                    implicitHeight: col.implicitHeight
+            TextFieldWithHeaderType {
+                id: mtuTextField
+                Layout.fillWidth: true
+                Layout.topMargin: 40
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
 
-                    property alias mtuTextField: mtuTextField
-                    property bool isSaveButtonEnabled: mtuTextField.errorText === ""
+                headerText: qsTr("MTU")
+                textField.text: clientMtu
+                textField.validator: IntValidator { bottom: 576; top: 65535 }
 
-                    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("WG settings")
-                        }
-
-                        TextFieldWithHeaderType {
-                            id: mtuTextField
-                            Layout.fillWidth: true
-                            Layout.topMargin: 40
-
-                            headerText: qsTr("MTU")
-                            textField.text: clientMtu
-                            textField.validator: IntValidator { bottom: 576; top: 65535 }
-
-                            textField.onEditingFinished: {
-                                if (textField.text !== clientMtu) {
-                                    clientMtu = textField.text
-                                }
-                            }
-                            checkEmptyText: true
-                            KeyNavigation.tab: saveButton
-                        }
-
-                        Header2TextType {
-                            Layout.fillWidth: true
-                            Layout.topMargin: 16
-
-                            text: qsTr("Server settings")
-                        }
-
-                        TextFieldWithHeaderType {
-                            id: portTextField
-                            Layout.fillWidth: true
-                            Layout.topMargin: 8
-
-                            enabled: false
-
-                            headerText: qsTr("Port")
-                            textField.text: port
-                        }
+                textField.onEditingFinished: {
+                    if (textField.text !== clientMtu) {
+                        clientMtu = textField.text
                     } 
                 }
+                checkEmptyText: true
+            }
+
+            Header2TextType {
+                Layout.fillWidth: true
+                Layout.topMargin: 16
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
+
+                text: qsTr("Server settings")
+            }
+
+            TextFieldWithHeaderType {
+                id: portTextField
+                Layout.fillWidth: true
+                Layout.topMargin: 8
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
+
+                enabled: false
+
+                headerText: qsTr("Port")
+                textField.text: port
             }
         }
-    }
 
-    BasicButtonType {
-        id: saveButton
+        footer: ColumnLayout {
+            width: listView.width
 
-        anchors.right: root.right
-        anchors.left: root.left
-        anchors.bottom: root.bottom
+            BasicButtonType {
+                id: saveButton
 
-        anchors.topMargin: 24
-        anchors.bottomMargin: 24
-        anchors.rightMargin: 16
-        anchors.leftMargin: 16
+                Layout.fillWidth: true
+                Layout.topMargin: 24
+                Layout.bottomMargin: 24
+                Layout.rightMargin: 16
+                Layout.leftMargin: 16
 
-        enabled: listview.currentItem.isSaveButtonEnabled
+                enabled: listView.currentItem.isSaveButtonEnabled
 
-        text: qsTr("Save")
+                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")
-            var noButtonText = qsTr("Cancel")
+                clickedFunc: function() {
+                    var headerText = qsTr("Save settings?")
+                    var descriptionText = qsTr("Only the settings for this device will be changed")
+                    var yesButtonText = qsTr("Continue")
+                    var noButtonText = qsTr("Cancel")
 
-            var yesButtonFunction = function() {
-                if (ConnectionController.isConnected && ServersModel.getDefaultServerData("defaultContainer") === ContainersModel.getProcessedContainerIndex()) {
-                    PageController.showNotificationMessage(qsTr("Unable change settings while there is an active connection"))
-                    return
-                }
+                    var yesButtonFunction = function() {
+                        if (ConnectionController.isConnected && ServersModel.getDefaultServerData("defaultContainer") === ContainersModel.getProcessedContainerIndex()) {
+                            PageController.showNotificationMessage(qsTr("Unable change settings while there is an active connection"))
+                            return
+                        }
 
-                PageController.goToPage(PageEnum.PageSetupWizardInstalling);
-                InstallController.updateContainer(WireGuardConfigModel.getConfig())
-            }
-            var noButtonFunction = function() {
-                if (!GC.isMobile()) {
-                    saveButton.forceActiveFocus()
+                        PageController.goToPage(PageEnum.PageSetupWizardInstalling);
+                        InstallController.updateContainer(WireGuardConfigModel.getConfig())
+                    }
+                    var noButtonFunction = function() {}
+                    showQuestionDrawer(headerText, descriptionText, yesButtonText, noButtonText, yesButtonFunction, noButtonFunction)
                 }
             }
-            showQuestionDrawer(headerText, descriptionText, yesButtonText, noButtonText, yesButtonFunction, noButtonFunction)
         }
     }
 }

client/ui/qml/Pages2/PageProtocolWireGuardSettings.qml

@@ -16,153 +16,134 @@ import "../Components"
 PageType {
     id: root
 
-    ColumnLayout {
-        id: backButtonLayout
+    BackButtonType {
+        id: backButton
 
         anchors.top: parent.top
         anchors.left: parent.left
         anchors.right: parent.right
-
         anchors.topMargin: 20
 
-        BackButtonType {
-            id: backButton
+        onFocusChanged: {
+            if (this.activeFocus) {
+                listView.positionViewAtBeginning()
+            }
         }
     }
 
-    FlickableType {
-        id: fl
-        anchors.top: backButtonLayout.bottom
+    ListViewType {
+        id: listView
+
+        anchors.top: backButton.bottom
         anchors.bottom: parent.bottom
-        contentHeight: content.implicitHeight
+        anchors.right: parent.right
+        anchors.left: parent.left
 
-        Column {
-            id: content
+        enabled: ServersModel.isProcessedServerHasWriteAccess()
 
-            anchors.top: parent.top
-            anchors.left: parent.left
-            anchors.right: parent.right
+        model: WireGuardConfigModel
 
-            enabled: ServersModel.isProcessedServerHasWriteAccess()
+        delegate: ColumnLayout {
+            width: listView.width
 
-            ListView {
-                id: listview
+            property bool isEnabled: ServersModel.isProcessedServerHasWriteAccess()
 
-                width: parent.width
-                height: listview.contentItem.height
+            spacing: 0
 
-                clip: true
-                interactive: false
+            BaseHeaderType {
+                Layout.fillWidth: true
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
 
-                model: WireGuardConfigModel
+                headerText: qsTr("WG settings")
+            }
 
-                delegate: Item {
-                    id: delegateItem
+            TextFieldWithHeaderType {
+                id: vpnAddressSubnetTextField
 
-                    property alias focusItemId: vpnAddressSubnetTextField
-                    property bool isEnabled: ServersModel.isProcessedServerHasWriteAccess()
+                Layout.fillWidth: true
+                Layout.topMargin: 40
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
 
-                    implicitWidth: listview.width
-                    implicitHeight: col.implicitHeight
+                enabled: delegateItem.isEnabled
 
-                    ColumnLayout {
-                        id: col
+                headerText: qsTr("VPN address subnet")
+                textField.text: subnetAddress
 
-                        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("WG settings")
-                        }
-
-                        TextFieldWithHeaderType {
-                            id: vpnAddressSubnetTextField
-                            Layout.fillWidth: true
-                            Layout.topMargin: 40
-
-                            enabled: delegateItem.isEnabled
-
-                            headerText: qsTr("VPN address subnet")
-                            textField.text: subnetAddress
-
-                            textField.onEditingFinished: {
-                                if (textField.text !== subnetAddress) {
-                                    subnetAddress = textField.text
-                                }
-                            }
-
-                            checkEmptyText: true
-                        }
-
-                        TextFieldWithHeaderType {
-                            id: portTextField
-                            Layout.fillWidth: true
-                            Layout.topMargin: 16
-
-                            enabled: delegateItem.isEnabled
-
-                            headerText: qsTr("Port")
-                            textField.text: port
-                            textField.maximumLength: 5
-                            textField.validator: IntValidator { bottom: 1; top: 65535 }
-
-                            textField.onEditingFinished: {
-                                if (textField.text !== port) {
-                                    port = textField.text
-                                }
-                            }
-
-                            checkEmptyText: true
-                        }
-
-                        BasicButtonType {
-                            id: saveButton
-                            Layout.fillWidth: true
-                            Layout.topMargin: 24
-                            Layout.bottomMargin: 24
-
-                            enabled: portTextField.errorText === "" &&
-                                     vpnAddressSubnetTextField.errorText === ""
-
-                            text: qsTr("Save")
-
-                            onClicked: function() {
-                                forceActiveFocus()
-
-                                var headerText = qsTr("Save settings?")
-                                var descriptionText = qsTr("All users with whom you shared a connection with will no longer be able to connect to it.")
-                                var yesButtonText = qsTr("Continue")
-                                var noButtonText = qsTr("Cancel")
-
-                                var yesButtonFunction = function() {
-                                    if (ConnectionController.isConnected && ServersModel.getDefaultServerData("defaultContainer") === ContainersModel.getProcessedContainerIndex()) {
-                                        PageController.showNotificationMessage(qsTr("Unable change settings while there is an active connection"))
-                                        return
-                                    }
-
-                                    PageController.goToPage(PageEnum.PageSetupWizardInstalling);
-                                    InstallController.updateContainer(WireGuardConfigModel.getConfig())
-                                }
-                                var noButtonFunction = function() {
-                                    if (!GC.isMobile()) {
-                                        saveRestartButton.forceActiveFocus()
-                                    }
-                                }
-                                showQuestionDrawer(headerText, descriptionText, yesButtonText, noButtonText, yesButtonFunction, noButtonFunction)
-                            }
-
-                            Keys.onEnterPressed: saveButton.clicked()
-                            Keys.onReturnPressed: saveButton.clicked()
-                        }
+                textField.onEditingFinished: {
+                    if (textField.text !== subnetAddress) {
+                        subnetAddress = textField.text
                     }
                 }
+
+                checkEmptyText: true
+            }
+
+            TextFieldWithHeaderType {
+                id: portTextField
+                Layout.fillWidth: true
+                Layout.topMargin: 16
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
+
+                enabled: delegateItem.isEnabled
+
+                headerText: qsTr("Port")
+                textField.text: port
+                textField.maximumLength: 5
+                textField.validator: IntValidator { bottom: 1; top: 65535 }
+
+                textField.onEditingFinished: {
+                    if (textField.text !== port) {
+                        port = textField.text
+                    }
+                }
+
+                checkEmptyText: true
+            }
+
+            BasicButtonType {
+                id: saveButton
+                
+                Layout.fillWidth: true
+                Layout.topMargin: 24
+                Layout.bottomMargin: 24
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
+
+                enabled: portTextField.errorText === "" &&
+                         vpnAddressSubnetTextField.errorText === ""
+
+                text: qsTr("Save")
+
+                onClicked: function() {
+                    forceActiveFocus()
+
+                    var headerText = qsTr("Save settings?")
+                    var descriptionText = qsTr("All users with whom you shared a connection with will no longer be able to connect to it.")
+                    var yesButtonText = qsTr("Continue")
+                    var noButtonText = qsTr("Cancel")
+
+                    var yesButtonFunction = function() {
+                        if (ConnectionController.isConnected && ServersModel.getDefaultServerData("defaultContainer") === ContainersModel.getProcessedContainerIndex()) {
+                            PageController.showNotificationMessage(qsTr("Unable change settings while there is an active connection"))
+                            return
+                        }
+
+                        PageController.goToPage(PageEnum.PageSetupWizardInstalling);
+                        InstallController.updateContainer(WireGuardConfigModel.getConfig())
+                    }
+                    var noButtonFunction = function() {
+                        if (!GC.isMobile()) {
+                            saveRestartButton.forceActiveFocus()
+                        }
+                    }
+                    showQuestionDrawer(headerText, descriptionText, yesButtonText, noButtonText, yesButtonFunction, noButtonFunction)
+                }
+
+                Keys.onEnterPressed: saveButton.clicked()
+                Keys.onReturnPressed: saveButton.clicked()
             }
         }
     }

client/ui/qml/Pages2/PageProtocolXraySettings.qml

@@ -17,141 +17,114 @@ import "../Components"
 PageType {
     id: root
 
-    ColumnLayout {
-        id: backButtonLayout
+    BackButtonType {
+        id: backButton
 
         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
+    ListViewType {
+        id: listView
+
+        anchors.top: backButton.bottom
         anchors.bottom: parent.bottom
-        contentHeight: content.implicitHeight
+        anchors.left: parent.left
+        anchors.right: parent.right
 
-        Column {
-            id: content
+        enabled: ServersModel.isProcessedServerHasWriteAccess()
+        model: XrayConfigModel
 
-            anchors.top: parent.top
-            anchors.left: parent.left
-            anchors.right: parent.right
+        delegate: ColumnLayout {
 
-            enabled: ServersModel.isProcessedServerHasWriteAccess()
+            width: listView.width
 
-            ListView {
-                id: listview
+            property alias focusItemId: textFieldWithHeaderType.textField
 
-                width: parent.width
-                height: listview.contentItem.height
+            spacing: 0
 
-                clip: true
-                interactive: false
+            BaseHeaderType {
+                Layout.fillWidth: true
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
+                headerText: qsTr("XRay settings")
+            }
 
-                model: XrayConfigModel
+            TextFieldWithHeaderType {
+                id: textFieldWithHeaderType
 
-                delegate: Item {
-                    property alias focusItemId: textFieldWithHeaderType.textField
+                Layout.fillWidth: true
+                Layout.topMargin: 32
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
 
-                    implicitWidth: listview.width
-                    implicitHeight: col.implicitHeight
+                headerText: qsTr("Disguised as traffic from")
+                textField.text: site
 
-                    ColumnLayout {
-                        id: col
+                textField.onEditingFinished: {
+                    if (textField.text !== site) {
+                        var tmpText = textField.text
+                        tmpText = tmpText.toLocaleLowerCase()
 
-                        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("XRay settings")
-                        }
-
-                        TextFieldWithHeaderType {
-                            id: textFieldWithHeaderType
-                            Layout.fillWidth: true
-                            Layout.topMargin: 32
-
-                            headerText: qsTr("Disguised as traffic from")
-                            textField.text: site
-
-                            textField.onEditingFinished: {
-                                if (textField.text !== site) {
-                                    var tmpText = textField.text
-                                    tmpText = tmpText.toLocaleLowerCase()
-
-                                    if (tmpText.startsWith("https://")) {
-                                        tmpText = textField.text.substring(8)
-                                        site = tmpText
-                                    } else {
-                                        site = textField.text
-                                    }
-                                }
-                            }
-                        }
-
-                        TextFieldWithHeaderType {
-                            id: portTextField
-                            Layout.fillWidth: true
-                            Layout.topMargin: 16
-
-                            enabled: delegateItem.isEnabled
-
-                            headerText: qsTr("Port")
-                            textField.text: port
-                            textField.maximumLength: 5
-                            textField.validator: IntValidator { bottom: 1; top: 65535 }
-
-                            textField.onEditingFinished: {
-                                if (textField.text !== port) {
-                                    port = textField.text
-                                }
-                            }
-
-                            checkEmptyText: true
-                        }
-
-                        BasicButtonType {
-                            id: saveButton
-                            Layout.fillWidth: true
-                            Layout.topMargin: 24
-                            Layout.bottomMargin: 24
-
-                            text: qsTr("Save")
-
-                            onClicked: {
-                                forceActiveFocus()
-
-                                if (ConnectionController.isConnected && ServersModel.getDefaultServerData("defaultContainer") === ContainersModel.getProcessedContainerIndex()) {
-                                    PageController.showNotificationMessage(qsTr("Unable change settings while there is an active connection"))
-                                    return
-                                }
-
-                                PageController.goToPage(PageEnum.PageSetupWizardInstalling);
-                                InstallController.updateContainer(XrayConfigModel.getConfig())
-                                focusItem.forceActiveFocus()
-                            }
-
-                            Keys.onEnterPressed: basicButton.clicked()
-                            Keys.onReturnPressed: basicButton.clicked()
+                        if (tmpText.startsWith("https://")) {
+                            tmpText = textField.text.substring(8)
+                            site = tmpText
+                        } else {
+                            site = textField.text
                         }
                     }
                 }
             }
+
+            TextFieldWithHeaderType {
+                id: portTextField
+                Layout.fillWidth: true
+                Layout.topMargin: 16
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
+
+                enabled: delegateItem.isEnabled
+
+                headerText: qsTr("Port")
+                textField.text: port
+                textField.maximumLength: 5
+                textField.validator: IntValidator { bottom: 1; top: 65535 }
+
+                textField.onEditingFinished: {
+                    if (textField.text !== port) {
+                        port = textField.text
+                    }
+                }
+
+                checkEmptyText: true
+            }
+
+            BasicButtonType {
+                id: saveButton
+
+                Layout.fillWidth: true
+                Layout.topMargin: 24
+                Layout.bottomMargin: 24
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
+
+                text: qsTr("Save")
+
+                onClicked: {
+                    if (ConnectionController.isConnected && ServersModel.getDefaultServerData("defaultContainer") === ContainersModel.getProcessedContainerIndex()) {
+                        PageController.showNotificationMessage(qsTr("Unable change settings while there is an active connection"))
+                        return
+                    }
+
+                    PageController.goToPage(PageEnum.PageSetupWizardInstalling);
+                    InstallController.updateContainer(XrayConfigModel.getConfig())
+                }
+
+                Keys.onEnterPressed: saveButton.clicked()
+                Keys.onReturnPressed: saveButton.clicked()
+            }
         }
     }
-
 }

client/ui/qml/Pages2/PageServiceDnsSettings.qml

@@ -16,50 +16,47 @@ import "../Components"
 PageType {
     id: root
 
-    ColumnLayout {
-        id: backButtonLayout
+    BackButtonType {
+        id: backButton
 
         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
+    ListViewType {
+        id: listView
+
+        anchors.top: backButton.bottom
         anchors.bottom: parent.bottom
-        contentHeight: content.implicitHeight
+        anchors.right: parent.right
+        anchors.left: parent.left
 
-        ColumnLayout {
-            id: content
-
-            anchors.top: parent.top
-            anchors.left: parent.left
-            anchors.right: parent.right
+        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.topMargin: 24
-                width: parent.width
+                Layout.fillWidth: true
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
 
                 text: qsTr("Remove ") + ContainersModel.getProcessedContainerName()
                 textColor: AmneziaStyle.color.vibrantRed
@@ -71,19 +68,14 @@ PageType {
 
                     var yesButtonFunction = function() {
                         if (ServersModel.isDefaultServerCurrentlyProcessed() && ConnectionController.isConnected
-                        && SettingsController.isAmneziaDnsEnabled()) {
+                                && SettingsController.isAmneziaDnsEnabled()) {
                             PageController.showNotificationMessage(qsTr("Cannot remove AmneziaDNS from running server"))
-                        } else
-                        {
+                        } else {
                             PageController.goToPage(PageEnum.PageDeinstalling)
                             InstallController.removeProcessedContainer()
                         }
                     }
-                    var noButtonFunction = function() {
-                        if (!GC.isMobile()) {
-                            removeButton.rightButton.forceActiveFocus()
-                        }
-                    }
+                    var noButtonFunction = function() {}
 
                     showQuestionDrawer(headerText, "", yesButtonText, noButtonText, yesButtonFunction, noButtonFunction)
                 }

client/ui/qml/Pages2/PageServiceSftpSettings.qml

@@ -24,258 +24,215 @@ PageType {
         }
     }
 
-    ColumnLayout {
-        id: backButtonLayout
+    BackButtonType {
+        id: backButton
 
         anchors.top: parent.top
         anchors.left: parent.left
         anchors.right: parent.right
-
         anchors.topMargin: 20
 
-        BackButtonType {
-            id: backButton
+        onFocusChanged: {
+            if (this.activeFocus) {
+                listView.positionViewAtBeginning()
+            }
         }
     }
 
-    FlickableType {
-        id: fl
-        anchors.top: backButtonLayout.bottom
+    ListViewType {
+        id: listView
+
+        anchors.top: backButton.bottom
         anchors.bottom: parent.bottom
-        contentHeight: content.implicitHeight
+        anchors.right: parent.right
+        anchors.left: parent.left
 
-        Column {
-            id: content
+        enabled: ServersModel.isProcessedServerHasWriteAccess()
 
-            anchors.top: parent.top
-            anchors.left: parent.left
-            anchors.right: parent.right
+        model: SftpConfigModel
 
-            enabled: ServersModel.isProcessedServerHasWriteAccess()
+        delegate: ColumnLayout {
+            width: listView.width
 
-            ListView {
-                id: listview
+            spacing: 0
 
-                width: parent.width
-                height: listview.contentItem.height
+            BaseHeaderType {
+                Layout.fillWidth: true
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
 
-                clip: true
-                interactive: false
+                headerText: qsTr("SFTP settings")
+            }
 
-                model: SftpConfigModel
+            LabelWithButtonType {
+                id: hostLabel
 
-                onFocusChanged: {
-                    if (focus) {
-                        listview.currentItem.listViewFocusItem.forceActiveFocus()
-                    }
+                Layout.fillWidth: true
+                Layout.topMargin: 32
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
+
+                text: qsTr("Host")
+                descriptionText: ServersModel.getProcessedServerData("hostName")
+
+                descriptionOnTop: true
+
+                rightImageSource: "qrc:/images/controls/copy.svg"
+                rightImageColor: AmneziaStyle.color.paleGray
+
+                clickedFunction: function() {
+                    GC.copyToClipBoard(descriptionText)
+                    PageController.showNotificationMessage(qsTr("Copied"))
+                }
+            }
+
+            LabelWithButtonType {
+                id: portLabel
+
+                Layout.fillWidth: true
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
+
+                text: qsTr("Port")
+                descriptionText: port
+
+                descriptionOnTop: true
+
+                rightImageSource: "qrc:/images/controls/copy.svg"
+                rightImageColor: AmneziaStyle.color.paleGray
+
+                clickedFunction: function() {
+                    GC.copyToClipBoard(descriptionText)
+                    PageController.showNotificationMessage(qsTr("Copied"))
+                }
+            }
+
+            LabelWithButtonType {
+                id: usernameLabel
+
+                Layout.fillWidth: true
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
+
+                text: qsTr("User name")
+                descriptionText: username
+
+                descriptionOnTop: true
+
+                rightImageSource: "qrc:/images/controls/copy.svg"
+                rightImageColor: AmneziaStyle.color.paleGray
+
+                clickedFunction: function() {
+                    GC.copyToClipBoard(descriptionText)
+                    PageController.showNotificationMessage(qsTr("Copied"))
+                }
+            }
+
+            LabelWithButtonType {
+                id: passwordLabel
+
+                Layout.fillWidth: true
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
+
+                text: qsTr("Password")
+                descriptionText: password
+
+                descriptionOnTop: true
+
+                rightImageSource: "qrc:/images/controls/copy.svg"
+                rightImageColor: AmneziaStyle.color.paleGray
+
+                buttonImageSource: hideDescription ? "qrc:/images/controls/eye.svg" : "qrc:/images/controls/eye-off.svg"
+
+                clickedFunction: function() {
+                    GC.copyToClipBoard(descriptionText)
+                    PageController.showNotificationMessage(qsTr("Copied"))
+                }
+            }
+
+            BasicButtonType {
+                id: mountButton
+
+                visible: !GC.isMobile()
+
+                Layout.fillWidth: true
+                Layout.topMargin: 24
+                Layout.bottomMargin: 24
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
+
+                defaultColor: AmneziaStyle.color.transparent
+                hoveredColor: AmneziaStyle.color.translucentWhite
+                pressedColor: AmneziaStyle.color.sheerWhite
+                disabledColor: AmneziaStyle.color.mutedGray
+                textColor: AmneziaStyle.color.paleGray
+                borderWidth: 1
+
+                text: qsTr("Mount folder on device")
+
+                clickedFunc: function() {
+                    PageController.showBusyIndicator(true)
+                    InstallController.mountSftpDrive(port, password, username)
+                    PageController.showBusyIndicator(false)
+                }
+            }
+
+            ParagraphTextType {
+                Layout.fillWidth: true
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
+
+                readonly property string windowsFirstLink: "<a href=\"https://github.com/billziss-gh/winfsp/releases/latest\" style=\"color: #FBB26A;\">WinFsp</a>"
+                readonly property string windowsSecondLink: "<a href=\"https://github.com/billziss-gh/sshfs-win/releases\" style=\"color: #FBB26A;\">SSHFS-Win</a>"
+
+                readonly property string macosFirstLink: "<a href=\"https://osxfuse.github.io/\" style=\"color: #FBB26A;\">macFUSE</a>"
+                readonly property string macosSecondLink: "<a href=\"https://osxfuse.github.io/\" style=\"color: #FBB26A;\">SSHFS</a>"
+
+                onLinkActivated: function(link) {
+                    Qt.openUrlExternally(link)
+                }
+                textFormat: Text.RichText
+                text: {
+                    var str = qsTr("In order to mount remote SFTP folder as local drive, perform following steps: <br>")
+                    if (Qt.platform.os === "windows") {
+                        str += qsTr("<br>1. Install the latest version of ") + windowsFirstLink + "\n"
+                        str += qsTr("<br>2. Install the latest version of ") + windowsSecondLink + "\n"
+                    } else if (Qt.platform.os === "osx") {
+                        str += qsTr("<br>1. Install the latest version of ") + macosFirstLink + "\n"
+                        str += qsTr("<br>2. Install the latest version of ") + macosSecondLink + "\n"
+                    } else if (Qt.platform.os === "linux") {
+                        return ""
+                    } else return ""
+
+                    return str
                 }
 
-                delegate: Item {
-                    implicitWidth: listview.width
-                    implicitHeight: col.implicitHeight
+                MouseArea {
+                    anchors.fill: parent
+                    acceptedButtons: Qt.NoButton
+                    cursorShape: parent.hoveredLink ? Qt.PointingHandCursor : Qt.ArrowCursor
+                }
+            }
 
-                    property alias listViewFocusItem: hostLabel.rightButton
+            BasicButtonType {
+                id: detailedInstructionsButton
 
-                    ColumnLayout {
-                        id: col
+                Layout.topMargin: 16
+                Layout.bottomMargin: 16
+                Layout.leftMargin: 8
+                implicitHeight: 32
 
-                        anchors.top: parent.top
-                        anchors.left: parent.left
-                        anchors.right: parent.right
+                defaultColor: AmneziaStyle.color.transparent
+                hoveredColor: AmneziaStyle.color.translucentWhite
+                pressedColor: AmneziaStyle.color.sheerWhite
+                disabledColor: AmneziaStyle.color.mutedGray
+                textColor: AmneziaStyle.color.goldenApricot
 
-                        spacing: 0
+                text: qsTr("Detailed instructions")
 
-                        BaseHeaderType {
-                            Layout.fillWidth: true
-                            Layout.leftMargin: 16
-                            Layout.rightMargin: 16
-
-                            headerText: qsTr("SFTP settings")
-                        }
-
-                        LabelWithButtonType {
-                            id: hostLabel
-                            Layout.fillWidth: true
-                            Layout.topMargin: 32
-
-                            parentFlickable: fl
-
-                            text: qsTr("Host")
-                            descriptionText: ServersModel.getProcessedServerData("hostName")
-
-                            descriptionOnTop: true
-
-                            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: portLabel
-                            Layout.fillWidth: true
-
-                            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
-
-                            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
-
-                            text: qsTr("Password")
-                            descriptionText: password
-
-                            descriptionOnTop: true
-
-                            parentFlickable: fl
-
-                            rightImageSource: "qrc:/images/controls/copy.svg"
-                            rightImageColor: AmneziaStyle.color.paleGray
-
-                            buttonImageSource: hideDescription ? "qrc:/images/controls/eye.svg" : "qrc:/images/controls/eye-off.svg"
-
-                            clickedFunction: function() {
-                                GC.copyToClipBoard(descriptionText)
-                                PageController.showNotificationMessage(qsTr("Copied"))
-                                if (!GC.isMobile()) {
-                                    this.rightButton.forceActiveFocus()
-                                }
-                            }
-                        }
-
-                        BasicButtonType {
-                            id: mountButton
-                            visible: !GC.isMobile()
-
-                            Layout.fillWidth: true
-                            Layout.topMargin: 24
-                            Layout.bottomMargin: 24
-                            Layout.leftMargin: 16
-                            Layout.rightMargin: 16
-
-                            defaultColor: AmneziaStyle.color.transparent
-                            hoveredColor: AmneziaStyle.color.translucentWhite
-                            pressedColor: AmneziaStyle.color.sheerWhite
-                            disabledColor: AmneziaStyle.color.mutedGray
-                            textColor: AmneziaStyle.color.paleGray
-                            borderWidth: 1
-
-                            parentFlickable: fl
-
-                            text: qsTr("Mount folder on device")
-
-                            clickedFunc: function() {
-                                PageController.showBusyIndicator(true)
-                                InstallController.mountSftpDrive(port, password, username)
-                                PageController.showBusyIndicator(false)
-                            }
-                        }
-
-                        ParagraphTextType {
-                            Layout.fillWidth: true
-                            Layout.leftMargin: 16
-                            Layout.rightMargin: 16
-
-                            readonly property string windowsFirstLink: "<a href=\"https://github.com/billziss-gh/winfsp/releases/latest\" style=\"color: #FBB26A;\">WinFsp</a>"
-                            readonly property string windowsSecondLink: "<a href=\"https://github.com/billziss-gh/sshfs-win/releases\" style=\"color: #FBB26A;\">SSHFS-Win</a>"
-
-                            readonly property string macosFirstLink: "<a href=\"https://osxfuse.github.io/\" style=\"color: #FBB26A;\">macFUSE</a>"
-                            readonly property string macosSecondLink: "<a href=\"https://osxfuse.github.io/\" style=\"color: #FBB26A;\">SSHFS</a>"
-
-                            onLinkActivated: function(link) {
-                                Qt.openUrlExternally(link)
-                            }
-                            textFormat: Text.RichText
-                            text: {
-                                var str = qsTr("In order to mount remote SFTP folder as local drive, perform following steps: <br>")
-                                if (Qt.platform.os === "windows") {
-                                    str += qsTr("<br>1. Install the latest version of ") + windowsFirstLink + "\n"
-                                    str += qsTr("<br>2. Install the latest version of ") + windowsSecondLink + "\n"
-                                } else if (Qt.platform.os === "osx") {
-                                    str += qsTr("<br>1. Install the latest version of ") + macosFirstLink + "\n"
-                                    str += qsTr("<br>2. Install the latest version of ") + macosSecondLink + "\n"
-                                } else if (Qt.platform.os === "linux") {
-                                    return ""
-                                } else return ""
-
-                                return str
-                            }
-
-
-                            MouseArea {
-                                anchors.fill: parent
-                                acceptedButtons: Qt.NoButton
-                                cursorShape: parent.hoveredLink ? Qt.PointingHandCursor : Qt.ArrowCursor
-                            }
-                        }
-
-                        BasicButtonType {
-                            id: detailedInstructionsButton
-                            Layout.topMargin: 16
-                            Layout.bottomMargin: 16
-                            Layout.leftMargin: 8
-                            implicitHeight: 32
-
-                            defaultColor: AmneziaStyle.color.transparent
-                            hoveredColor: AmneziaStyle.color.translucentWhite
-                            pressedColor: AmneziaStyle.color.sheerWhite
-                            disabledColor: AmneziaStyle.color.mutedGray
-                            textColor: AmneziaStyle.color.goldenApricot
-
-                            text: qsTr("Detailed instructions")
-
-                            parentFlickable: fl
-
-                            clickedFunc: function() {
-//                                Qt.openUrlExternally("https://github.com/amnezia-vpn/desktop-client/releases/latest")
-                            }
-                        }
-                    }
+                clickedFunc: function() {
+                    // Qt.openUrlExternally("https://github.com/amnezia-vpn/desktop-client/releases/latest")
                 }
             }
         }

client/ui/qml/Pages2/PageServiceSocksProxySettings.qml

@@ -25,327 +25,290 @@ PageType {
         }
     }
 
-    ColumnLayout {
-        id: backButtonLayout
+    BackButtonType {
+        id: backButton
 
         anchors.top: parent.top
         anchors.left: parent.left
         anchors.right: parent.right
-
         anchors.topMargin: 20
 
-        BackButtonType {
-            id: backButton
+        onFocusChanged: {
+            if (this.activeFocus) {
+                listView.positionViewAtBeginning()
+            }
         }
     }
 
-    FlickableType {
-        id: fl
-        anchors.top: backButtonLayout.bottom
+    ListViewType {
+        id: listView
+
+        anchors.top: backButton.bottom
         anchors.bottom: parent.bottom
-        contentHeight: listview.implicitHeight
+        anchors.right: parent.right
+        anchors.left: parent.left
 
-        ListView {
-            id: listview
+        model: Socks5ProxyConfigModel
 
-            width: parent.width
-            height: listview.contentItem.height
+        delegate: ColumnLayout {
+            width: listView.width
 
-            clip: true
-            interactive: false
+            spacing: 0
 
-            model: Socks5ProxyConfigModel
+            BaseHeaderType {
+                Layout.fillWidth: true
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
 
-            onFocusChanged: {
-                if (focus) {
-                    listview.currentItem.focusItemId.forceActiveFocus()
+                headerText: qsTr("SOCKS5 settings")
+            }
+
+            LabelWithButtonType {
+                Layout.fillWidth: true
+                Layout.topMargin: 32
+                Layout.rightMargin: 16
+                Layout.bottomMargin: 16
+
+                text: qsTr("Host")
+                descriptionText: ServersModel.getProcessedServerData("hostName")
+
+                descriptionOnTop: true
+
+                rightImageSource: "qrc:/images/controls/copy.svg"
+                rightImageColor: AmneziaStyle.color.paleGray
+
+                clickedFunction: function() {
+                    GC.copyToClipBoard(descriptionText)
+                    PageController.showNotificationMessage(qsTr("Copied"))
                 }
             }
 
-            delegate: Item {
-                implicitWidth: listview.width
-                implicitHeight: content.implicitHeight
+            LabelWithButtonType {
+                Layout.fillWidth: true
+                Layout.rightMargin: 16
+                Layout.bottomMargin: 16
 
-                property alias focusItemId: hostLabel.rightButton
+                text: qsTr("Port")
+                descriptionText: port
 
-                ColumnLayout {
-                    id: content
+                descriptionOnTop: true
+
+                rightImageSource: "qrc:/images/controls/copy.svg"
+                rightImageColor: AmneziaStyle.color.paleGray
+
+                clickedFunction: function() {
+                    GC.copyToClipBoard(descriptionText)
+                    PageController.showNotificationMessage(qsTr("Copied"))
+                }
+            }
+
+            LabelWithButtonType {
+                Layout.fillWidth: true
+                Layout.rightMargin: 16
+                Layout.bottomMargin: 16
+
+                text: qsTr("User name")
+                descriptionText: username
+
+                descriptionOnTop: true
+
+                rightImageSource: "qrc:/images/controls/copy.svg"
+                rightImageColor: AmneziaStyle.color.paleGray
+
+                clickedFunction: function() {
+                    GC.copyToClipBoard(descriptionText)
+                    PageController.showNotificationMessage(qsTr("Copied"))
+                }
+            }
+
+            LabelWithButtonType {
+                Layout.fillWidth: true
+                Layout.rightMargin: 16
+                Layout.bottomMargin: 16
+
+                text: qsTr("Password")
+                descriptionText: password
+
+                descriptionOnTop: true
+
+                rightImageSource: "qrc:/images/controls/copy.svg"
+                rightImageColor: AmneziaStyle.color.paleGray
+
+                buttonImageSource: hideDescription ? "qrc:/images/controls/eye.svg" : "qrc:/images/controls/eye-off.svg"
+
+                clickedFunction: function() {
+                    GC.copyToClipBoard(descriptionText)
+                    PageController.showNotificationMessage(qsTr("Copied"))
+                }
+            }
+
+            DrawerType2 {
+                id: changeSettingsDrawer
+                parent: root
+
+                anchors.fill: parent
+                expandedHeight: root.height * 0.9
+
+                expandedStateContent: ColumnLayout {
+                    property string tempPort: port
+                    property string tempUsername: username
+                    property string tempPassword: password
 
                     anchors.top: parent.top
                     anchors.left: parent.left
                     anchors.right: parent.right
-
+                    anchors.topMargin: 32
+                    anchors.leftMargin: 16
+                    anchors.rightMargin: 16
                     spacing: 0
 
+                    Connections {
+                        target: changeSettingsDrawer
+                        function onOpened() {
+                            tempPort = port
+                            tempUsername = username
+                            tempPassword = password
+                        }
+                        function onClosed() {
+                            port = tempPort
+                            username = tempUsername
+                            password = tempPassword
+                            portTextField.textField.text = port
+                            usernameTextField.textField.text = username
+                            passwordTextField.textField.text = password
+                        }
+                    }
+
                     BaseHeaderType {
                         Layout.fillWidth: true
-                        Layout.leftMargin: 16
                         Layout.rightMargin: 16
+                        Layout.bottomMargin: 16
 
                         headerText: qsTr("SOCKS5 settings")
                     }
 
-                    LabelWithButtonType {
-                        id: hostLabel
+                    TextFieldWithHeaderType {
+                        id: portTextField
+
                         Layout.fillWidth: true
-                        Layout.topMargin: 32
+                        Layout.topMargin: 40
+                        Layout.rightMargin: 16
+                        Layout.bottomMargin: 16
 
-                        parentFlickable: fl
+                        headerText: qsTr("Port")
+                        textField.text: port
+                        textField.maximumLength: 5
+                        textField.validator: IntValidator { bottom: 1; top: 65535 }
 
-                        text: qsTr("Host")
-                        descriptionText: ServersModel.getProcessedServerData("hostName")
-
-                        descriptionOnTop: true
-
-                        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()
+                        textField.onEditingFinished: {
+                            textField.text = textField.text.replace(/^\s+|\s+$/g, '')
+                            if (textField.text !== port) {
+                                port = textField.text
                             }
                         }
                     }
 
-                    LabelWithButtonType {
-                        id: portLabel
+                    TextFieldWithHeaderType {
+                        id: usernameTextField
+
                         Layout.fillWidth: true
+                        Layout.topMargin: 16
+                        Layout.rightMargin: 16
+                        Layout.bottomMargin: 16
 
-                        text: qsTr("Port")
-                        descriptionText: port
+                        headerText: qsTr("Username")
+                        textField.placeholderText: "username"
+                        textField.text: username
+                        textField.maximumLength: 32
 
-                        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()
+                        textField.onEditingFinished: {
+                            textField.text = textField.text.replace(/^\s+|\s+$/g, '')
+                            if (textField.text !== username) {
+                                username = textField.text
                             }
                         }
                     }
 
-                    LabelWithButtonType {
-                        id: usernameLabel
+                    TextFieldWithHeaderType {
+                        id: passwordTextField
+
+                        property bool hidePassword: true
+
                         Layout.fillWidth: true
+                        Layout.topMargin: 16
+                        Layout.rightMargin: 16
+                        Layout.bottomMargin: 16
 
-                        text: qsTr("User name")
-                        descriptionText: username
+                        headerText: qsTr("Password")
+                        textField.placeholderText: "password"
+                        textField.text: password
+                        textField.maximumLength: 32
 
-                        descriptionOnTop: true
+                        textField.echoMode: hidePassword ? TextInput.Password : TextInput.Normal
+                        buttonImageSource: textField.text !== "" ? (hidePassword ? "qrc:/images/controls/eye.svg" : "qrc:/images/controls/eye-off.svg")
+                                                                 : ""
 
-                        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()
-                            }
+                        clickedFunc: function() {
+                            hidePassword = !hidePassword
                         }
-                    }
 
-                    LabelWithButtonType {
-                        id: passwordLabel
-                        Layout.fillWidth: true
-
-                        text: qsTr("Password")
-                        descriptionText: password
-
-                        descriptionOnTop: true
-
-                        parentFlickable: fl
-
-                        rightImageSource: "qrc:/images/controls/copy.svg"
-                        rightImageColor: AmneziaStyle.color.paleGray
-
-                        buttonImageSource: hideDescription ? "qrc:/images/controls/eye.svg" : "qrc:/images/controls/eye-off.svg"
-
-                        clickedFunction: function() {
-                            GC.copyToClipBoard(descriptionText)
-                            PageController.showNotificationMessage(qsTr("Copied"))
-                            if (!GC.isMobile()) {
-                                this.rightButton.forceActiveFocus()
-                            }
-                        }
-                    }
-
-                    DrawerType2 {
-                        id: changeSettingsDrawer
-                        parent: root
-
-                        anchors.fill: parent
-                        expandedHeight: root.height * 0.9
-
-                        expandedStateContent: ColumnLayout {
-                            property string tempPort: port
-                            property string tempUsername: username
-                            property string tempPassword: password
-
-                            anchors.top: parent.top
-                            anchors.left: parent.left
-                            anchors.right: parent.right
-                            anchors.topMargin: 32
-                            anchors.leftMargin: 16
-                            anchors.rightMargin: 16
-                            spacing: 0
-
-                            Connections {
-                                target: changeSettingsDrawer
-                                function onOpened() {
-                                    tempPort = port
-                                    tempUsername = username
-                                    tempPassword = password
-                                }
-                                function onClosed() {
-                                    port = tempPort
-                                    username = tempUsername
-                                    password = tempPassword
-                                    portTextField.textField.text = port
-                                    usernameTextField.textField.text = username
-                                    passwordTextField.textField.text = password
-                                }
-                            }
-
-                            BaseHeaderType {
-                                Layout.fillWidth: true
-
-                                headerText: qsTr("SOCKS5 settings")
-                            }
-
-                            TextFieldWithHeaderType {
-                                id: portTextField
-
-                                Layout.fillWidth: true
-                                Layout.topMargin: 40
-                                parentFlickable: fl
-
-                                headerText: qsTr("Port")
-                                textField.text: port
-                                textField.maximumLength: 5
-                                textField.validator: IntValidator { bottom: 1; top: 65535 }
-
-                                textField.onEditingFinished: {
-                                    textField.text = textField.text.replace(/^\s+|\s+$/g, '')
-                                    if (textField.text !== port) {
-                                        port = textField.text
-                                    }
-                                }
-                            }
-
-                            TextFieldWithHeaderType {
-                                id: usernameTextField
-
-                                Layout.fillWidth: true
-                                Layout.topMargin: 16
-                                parentFlickable: fl
-
-                                headerText: qsTr("Username")
-                                textField.placeholderText: "username"
-                                textField.text: username
-                                textField.maximumLength: 32
-
-                                textField.onEditingFinished: {
-                                    textField.text = textField.text.replace(/^\s+|\s+$/g, '')
-                                    if (textField.text !== username) {
-                                        username = textField.text
-                                    }
-                                }
-                            }
-
-                            TextFieldWithHeaderType {
-                                id: passwordTextField
-
-                                property bool hidePassword: true
-
-                                Layout.fillWidth: true
-                                Layout.topMargin: 16
-                                parentFlickable: fl
-
-                                headerText: qsTr("Password")
-                                textField.placeholderText: "password"
-                                textField.text: password
-                                textField.maximumLength: 32
-
-                                textField.echoMode: hidePassword ? TextInput.Password : TextInput.Normal
-                                buttonImageSource: textField.text !== "" ? (hidePassword ? "qrc:/images/controls/eye.svg" : "qrc:/images/controls/eye-off.svg")
-                                                                        : ""
-
-                                clickedFunc: function() {
-                                    hidePassword = !hidePassword
-                                }
-
-                                textField.onFocusChanged: {
-                                    textField.text = textField.text.replace(/^\s+|\s+$/g, '')
-                                    if (textField.text !== password) {
-                                        password = textField.text
-                                    }
-                                }
-                            }
-
-                            BasicButtonType {
-                                id: saveButton
-
-                                Layout.fillWidth: true
-                                Layout.topMargin: 24
-                                Layout.bottomMargin: 24
-
-                                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
-                                    }
-                                    if (usernameTextField.textField.text && passwordTextField.textField.text === "") {
-                                        passwordTextField.errorText = qsTr("Password cannot be empty")
-                                        return
-                                    } else if (usernameTextField.textField.text === "" && passwordTextField.textField.text) {
-                                        usernameTextField.errorText = qsTr("Username cannot be empty")
-                                        return
-                                    }
-
-                                    PageController.goToPage(PageEnum.PageSetupWizardInstalling)
-                                    InstallController.updateContainer(Socks5ProxyConfigModel.getConfig())
-                                    tempPort = portTextField.textField.text
-                                    tempUsername = usernameTextField.textField.text
-                                    tempPassword = passwordTextField.textField.text
-                                    changeSettingsDrawer.closeTriggered()
-                                }
+                        textField.onFocusChanged: {
+                            textField.text = textField.text.replace(/^\s+|\s+$/g, '')
+                            if (textField.text !== password) {
+                                password = textField.text
                             }
                         }
                     }
 
                     BasicButtonType {
-                        id: changeSettingsButton
+                        id: saveButton
 
                         Layout.fillWidth: true
                         Layout.topMargin: 24
                         Layout.bottomMargin: 24
-                        Layout.leftMargin: 16
                         Layout.rightMargin: 16
 
                         text: qsTr("Change connection settings")
 
                         clickedFunc: function() {
-                            forceActiveFocus()
-                            changeSettingsDrawer.openTriggered()
+                            if (!portTextField.textField.acceptableInput) {
+                                portTextField.errorText = qsTr("The port must be in the range of 1 to 65535")
+                                return
+                            }
+                            if (usernameTextField.textField.text && passwordTextField.textField.text === "") {
+                                passwordTextField.errorText = qsTr("Password cannot be empty")
+                                return
+                            } else if (usernameTextField.textField.text === "" && passwordTextField.textField.text) {
+                                usernameTextField.errorText = qsTr("Username cannot be empty")
+                                return
+                            }
+
+                            PageController.goToPage(PageEnum.PageSetupWizardInstalling)
+                            InstallController.updateContainer(Socks5ProxyConfigModel.getConfig())
+                            tempPort = portTextField.textField.text
+                            tempUsername = usernameTextField.textField.text
+                            tempPassword = passwordTextField.textField.text
+                            changeSettingsDrawer.closeTriggered()
                         }
                     }
                 }
             }
+
+            BasicButtonType {
+                id: changeSettingsButton
+
+                Layout.fillWidth: true
+                Layout.topMargin: 24
+                Layout.bottomMargin: 24
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
+
+                text: qsTr("Change connection settings")
+
+                clickedFunc: function() {
+                    changeSettingsDrawer.openTriggered()
+                }
+            }
         }
     }
 }

client/ui/qml/Pages2/PageServiceTorWebsiteSettings.qml

@@ -25,34 +25,25 @@ PageType {
         }
     }
 
-    ColumnLayout {
-        id: backButtonLayout
+    BackButtonType {
+        id: backButton
 
         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
+    ListViewType {
+        id: listView
+
+        anchors.top: backButton.bottom
         anchors.bottom: parent.bottom
-        contentHeight: content.implicitHeight
+        anchors.right: parent.right
+        anchors.left: parent.left
 
-        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
@@ -61,11 +52,19 @@ PageType {
 
                 headerText: qsTr("Tor website settings")
             }
+        }
+
+        model: 1 // fake model to force the ListView to be created without a model
+
+        delegate: ColumnLayout {
+            width: listView.width
 
             LabelWithButtonType {
                 id: websiteName
+
                 Layout.fillWidth: true
                 Layout.topMargin: 32
+                Layout.bottomMargin: 24
 
                 text: qsTr("Website address")
                 descriptionText: {
@@ -83,15 +82,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 {
-        id: fl
-        anchors.top: parent.top
-        anchors.bottom: parent.bottom
-        contentHeight: content.height
+    ListViewType {
+        id: listView
 
-        ColumnLayout {
-            id: content
+        anchors.fill: parent
 
-            anchors.top: parent.top
-            anchors.left: parent.left
-            anchors.right: parent.right
-
-            spacing: 0
+        header: ColumnLayout {
+            width: listView.width
 
             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() {
-                    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)
-                }
+                clickedFunction: clickedHandler
             }
 
             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 {
-        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 {
+    ListViewType {
         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,6 +87,8 @@ PageType {
             }
         }
 
+        model: contacts
+
         delegate: ColumnLayout {
             width: listView.width
 
@@ -257,4 +176,55 @@ PageType {
             }
         }
     }
+    
+    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())
+        }
+    }
+
+    property list<QtObject> contacts: [
+        telegramGroup,
+        mail,
+        github,
+        website
+    ]
 }

client/ui/qml/Pages2/PageSettingsApiNativeConfigs.qml

@@ -22,22 +22,28 @@ 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
+    }
+
     ListViewType {
         id: listView
 
-        anchors.fill: parent
-        anchors.topMargin: 20
-        anchors.bottomMargin: 24
+        anchors.top: backButton.bottom
+        anchors.bottom: parent.bottom
+        anchors.right: parent.right
+        anchors.left: parent.left
 
         model: ApiCountryModel
 
         header: ColumnLayout {
             width: listView.width
 
-            BackButtonType {
-                id: backButton
-            }
-
             BaseHeaderType {
                 id: header
 
@@ -104,20 +110,16 @@ PageType {
                 }
             }
 
-            FlickableType {
+            ListViewType {
+                id: drawerListView
+
                 anchors.top: moreOptionsDrawerBackButton.bottom
+                anchors.bottom: parent.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
@@ -125,9 +127,17 @@ PageType {
 
                         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")
@@ -138,9 +148,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() {
@@ -212,8 +229,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
         
@@ -146,77 +147,56 @@ PageType {
         }
     }
 
-    FlickableType {
+    ListViewType {
+        id: listView
+
         anchors.top: header.bottom
-        anchors.topMargin: 16
-        contentHeight: col.implicitHeight + addAppButton.implicitHeight + addAppButton.anchors.bottomMargin + addAppButton.anchors.topMargin
+        anchors.bottom: addAppButton.top
+        anchors.left: parent.left
+        anchors.right: parent.right
 
-        enabled: root.pageEnabled
+        model: SortFilterProxyModel {
+            id: proxyAppSplitTunnelingModel
+            sourceModel: AppSplitTunnelingModel
+            filters: RegExpFilter {
+                roleName: "appPath"
+                pattern: ".*" + searchField.textField.text + ".*"
+                caseSensitivity: Qt.CaseInsensitive
+            }
+            sorters: [
+                RoleSorter { roleName: "appPath"; sortOrder: Qt.AscendingOrder }
+            ]
+        }
 
-        Column {
-            id: col
-            anchors.top: parent.top
-            anchors.left: parent.left
-            anchors.right: parent.right
+        delegate: ColumnLayout {
+            width: listView.width
 
-            ListView {
-                id: apps
-                width: parent.width
-                height: apps.contentItem.height
+            LabelWithButtonType {
+                Layout.fillWidth: true
 
-                model: SortFilterProxyModel {
-                    id: proxyAppSplitTunnelingModel
-                    sourceModel: AppSplitTunnelingModel
-                    filters: RegExpFilter {
-                        roleName: "appPath"
-                        pattern: ".*" + searchField.textField.text + ".*"
-                        caseSensitivity: Qt.CaseInsensitive
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
+
+                text: appPath
+                rightImageSource: "qrc:/images/controls/trash.svg"
+                rightImageColor: AmneziaStyle.color.paleGray
+
+                clickedFunction: function() {
+                    var headerText = qsTr("Remove ") + appPath + "?"
+                    var yesButtonText = qsTr("Continue")
+                    var noButtonText = qsTr("Cancel")
+
+                    var yesButtonFunction = function() {
+                        AppSplitTunnelingController.removeApp(proxyAppSplitTunnelingModel.mapToSource(index))
                     }
-                    sorters: [
-                        RoleSorter { roleName: "appPath"; sortOrder: Qt.AscendingOrder }
-                    ]
-                }
-
-                clip: true
-                interactive: false
-
-                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
-
-                            text: appPath
-                            rightImageSource: "qrc:/images/controls/trash.svg"
-                            rightImageColor: AmneziaStyle.color.paleGray
-
-                            clickedFunction: function() {
-                                var headerText = qsTr("Remove ") + appPath + "?"
-                                var yesButtonText = qsTr("Continue")
-                                var noButtonText = qsTr("Cancel")
-
-                                var yesButtonFunction = function() {
-                                    AppSplitTunnelingController.removeApp(proxyAppSplitTunnelingModel.mapToSource(index))
-                                }
-                                var noButtonFunction = function() {
-                                }
-
-                                showQuestionDrawer(headerText, "", yesButtonText, noButtonText, yesButtonFunction, noButtonFunction)
-                            }
-                        }
-
-                        DividerType {}
+                    var noButtonFunction = function() {
                     }
+
+                    showQuestionDrawer(headerText, "", yesButtonText, noButtonText, yesButtonFunction, noButtonFunction)
                 }
             }
+
+            DividerType {}
         }
     }
 

client/ui/qml/Pages2/PageSettingsApplication.qml

@@ -23,20 +23,16 @@ PageType {
         anchors.topMargin: 20
     }
 
-    FlickableType {
-        id: fl
+    ListViewType {
+        id: listView
+
         anchors.top: backButton.bottom
         anchors.bottom: parent.bottom
-        contentHeight: content.height
+        anchors.left: parent.left
+        anchors.right: parent.right
 
-        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 +41,17 @@ PageType {
 
                 headerText: qsTr("Application")
             }
+        }
+
+        model: 1 // fake model to force the ListView to be created without a model
+
+        delegate: ColumnLayout {
+
+            width: listView.width
 
             SwitcherType {
-                id: switcher
+                id: switcherAllowScreenshots
+
                 visible: GC.isMobile()
 
                 Layout.fillWidth: true
@@ -61,10 +65,6 @@ PageType {
                         SettingsController.toggleScreenshotsEnabled(checked)
                     }
                 }
-
-                // KeyNavigation.tab: Qt.platform.os === "android" && !SettingsController.isNotificationPermissionGranted ?
-                //     labelWithButtonNotification.rightButton : labelWithButtonLanguage.rightButton
-                parentFlickable: fl
             }
 
             DividerType {
@@ -73,15 +73,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 +93,7 @@ PageType {
 
             SwitcherType {
                 id: switcherAutoStart
+
                 visible: !GC.isMobile()
 
                 Layout.fillWidth: true
@@ -101,8 +102,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 +116,7 @@ PageType {
 
             SwitcherType {
                 id: switcherAutoConnect
+
                 visible: !GC.isMobile()
 
                 Layout.fillWidth: true
@@ -125,8 +125,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 +139,7 @@ PageType {
 
             SwitcherType {
                 id: switcherStartMinimized
+
                 visible: !GC.isMobile()
 
                 Layout.fillWidth: true
@@ -149,8 +148,6 @@ PageType {
                 text: qsTr("Start minimized")
                 descriptionText: qsTr("Launch application minimized")
 
-                parentFlickable: fl
-
                 checked: SettingsController.isStartMinimizedEnabled()
                 onCheckedChanged: {
                     if (checked !== SettingsController.isStartMinimizedEnabled()) {
@@ -162,17 +159,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()
                 }
@@ -182,14 +183,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)
                 }
@@ -199,14 +199,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

@@ -43,49 +43,60 @@ PageType {
         anchors.topMargin: 20
     }
 
-    FlickableType {
-        id: fl
+    ListViewType {
+        id: listView
+
         anchors.top: backButton.bottom
         anchors.bottom: parent.bottom
-        contentHeight: content.height
+        anchors.left: parent.left
+        anchors.right: parent.right
 
-        ColumnLayout {
-            id: content
+        header: ColumnLayout {
 
-            anchors.top: parent.top
-            anchors.left: parent.left
-            anchors.right: parent.right
-            anchors.leftMargin: 16
-            anchors.rightMargin: 16
+            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 {
+
+            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.")
+                                 "to AmneziaVPN. Keep this information in a secure place.")
 
                 iconPath: "qrc:/images/controls/alert-circle.svg"
             }
 
             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 +119,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 +134,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

@@ -23,18 +23,17 @@ PageType {
         anchors.topMargin: 20
     }
 
-    FlickableType {
-        id: fl
+    ListViewType {
+        id: listView
+
         anchors.top: backButton.bottom
         anchors.bottom: parent.bottom
-        contentHeight: content.height
+        anchors.left: parent.left
+        anchors.right: parent.right
 
-        ColumnLayout {
-            id: content
+        header: ColumnLayout {
 
-            anchors.top: parent.top
-            anchors.left: parent.left
-            anchors.right: parent.right
+            width: listView.width
 
             BaseHeaderType {
                 Layout.fillWidth: true
@@ -43,9 +42,17 @@ PageType {
 
                 headerText: qsTr("Connection")
             }
+        }
+
+        model: 1 // fake model to force the ListView to be created without a model
+
+        delegate: ColumnLayout {
+
+            width: listView.width
 
             SwitcherType {
                 id: amneziaDnsSwitch
+
                 Layout.fillWidth: true
                 Layout.margins: 16
 
@@ -64,14 +71,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 +87,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 +101,15 @@ PageType {
 
             DividerType {}
 
+        }
+
+        footer: ColumnLayout {
+
+            width: listView.width
+
             LabelWithButtonType {
                 id: splitTunnelingButton2
+
                 visible: root.isAppSplitTinnelingEnabled
 
                 Layout.fillWidth: true
@@ -106,8 +118,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 +137,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 {
-        id: fl
+    ListViewType {
+        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 {
-            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("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

@@ -25,7 +25,7 @@ PageType {
         anchors.topMargin: 20
     }
 
-    ListView {
+    ListViewType {
         id: listView
 
         anchors.top: backButton.bottom
@@ -33,10 +33,6 @@ PageType {
         anchors.right: parent.right
         anchors.left: parent.left
 
-        property bool isFocusable: true
-
-        ScrollBar.vertical: ScrollBarType {}
-
         header: ColumnLayout {
             width: listView.width
 
@@ -101,8 +97,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,218 +59,194 @@ PageType {
         target: ServersModel
 
         function onProcessedServerIndexChanged() {
-            content.isServerWithWriteAccess = ServersModel.isProcessedServerHasWriteAccess()
+            listView.isServerWithWriteAccess = ServersModel.isProcessedServerHasWriteAccess()
         }
     }
 
-    FlickableType {
-        id: fl
-        anchors.top: parent.top
-        anchors.bottom: parent.bottom
-        contentHeight: content.height
+    ListViewType {
+        id: listView
 
-        ColumnLayout {
-            id: content
+        property bool isServerWithWriteAccess: ServersModel.isProcessedServerHasWriteAccess()
 
-            anchors.top: parent.top
-            anchors.left: parent.left
-            anchors.right: parent.right
+        anchors.fill: parent
 
-            property bool isServerWithWriteAccess: ServersModel.isProcessedServerHasWriteAccess()
+        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")
-                descriptionText: qsTr("Add them to the application if they were not displayed")
+                visible: isVisible
+
+                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)
+        }
+    }
+
+    QtObject {
+        id: reboot
+
+        property bool isVisible: true
+        readonly property string title: qsTr("Reboot server")
+        readonly property string description: ""
+        readonly property var tColor: AmneziaStyle.color.vibrantRed
+        readonly property var clickedHandler: 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")
+            var noButtonText = qsTr("Cancel")
+
+            var yesButtonFunction = function() {
+                if (ServersModel.isDefaultServerCurrentlyProcessed() && ConnectionController.isConnected) {
+                    PageController.showNotificationMessage(qsTr("Cannot reboot server during active connection"))
+                } else {
                     PageController.showBusyIndicator(true)
-                    InstallController.scanServerForInstalledContainers()
+                    InstallController.rebootProcessedServer()
                     PageController.showBusyIndicator(false)
                 }
             }
+            var noButtonFunction = function() {
 
-            DividerType {
-                visible: content.isServerWithWriteAccess
             }
 
-            LabelWithButtonType {
-                id: labelWithButton2
-                visible: content.isServerWithWriteAccess
-                Layout.fillWidth: true
+            showQuestionDrawer(headerText, descriptionText, yesButtonText, noButtonText, yesButtonFunction, noButtonFunction)
+        }
+    }
 
-                text: qsTr("Reboot server")
-                textColor: AmneziaStyle.color.vibrantRed
+    QtObject {
+        id: remove
 
-                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")
-                    var noButtonText = qsTr("Cancel")
+        property bool isVisible: true
+        readonly property string title: qsTr("Remove server from application")
+        readonly property string description: ""
+        readonly property var tColor: AmneziaStyle.color.vibrantRed
+        readonly property var clickedHandler: 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")
+            var noButtonText = qsTr("Cancel")
 
-                    var yesButtonFunction = function() {
-                        if (ServersModel.isDefaultServerCurrentlyProcessed() && ConnectionController.isConnected) {
-                            PageController.showNotificationMessage(qsTr("Cannot reboot server during active connection"))
-                        } else {
-                            PageController.showBusyIndicator(true)
-                            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)
+            var yesButtonFunction = function() {
+                if (ServersModel.isDefaultServerCurrentlyProcessed() && ConnectionController.isConnected) {
+                    PageController.showNotificationMessage(qsTr("Cannot remove server during active connection"))
+                } else {
+                    PageController.showBusyIndicator(true)
+                    InstallController.removeProcessedServer()
+                    PageController.showBusyIndicator(false)
                 }
             }
+            var noButtonFunction = function() {
 
-            DividerType {
-                visible: content.isServerWithWriteAccess
             }
 
-            LabelWithButtonType {
-                id: labelWithButton3
-                Layout.fillWidth: true
+            showQuestionDrawer(headerText, descriptionText, yesButtonText, noButtonText, yesButtonFunction, noButtonFunction)
+        }
+    }
 
-                text: qsTr("Remove server from application")
-                textColor: AmneziaStyle.color.vibrantRed
+    QtObject {
+        id: clear
 
-                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")
-                    var noButtonText = qsTr("Cancel")
+        property bool isVisible: true
+        readonly property string title: qsTr("Clear server from Amnezia software")
+        readonly property string description: ""
+        readonly property var tColor: AmneziaStyle.color.vibrantRed
+        readonly property var clickedHandler: 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")
+            var noButtonText = qsTr("Cancel")
 
-                    var yesButtonFunction = function() {
-                        if (ServersModel.isDefaultServerCurrentlyProcessed() && ConnectionController.isConnected) {
-                            PageController.showNotificationMessage(qsTr("Cannot remove server during active connection"))
-                        } else {
-                            PageController.showBusyIndicator(true)
-                            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)
+            var yesButtonFunction = function() {
+                if (ServersModel.isDefaultServerCurrentlyProcessed() && ConnectionController.isConnected) {
+                    PageController.showNotificationMessage(qsTr("Cannot clear server from Amnezia software during active connection"))
+                } else {
+                    PageController.goToPage(PageEnum.PageDeinstalling)
+                    InstallController.removeAllContainers()
                 }
             }
+            var noButtonFunction = function() {
 
-            DividerType {}
+            }
 
-            LabelWithButtonType {
-                id: labelWithButton4
-                visible: content.isServerWithWriteAccess
-                Layout.fillWidth: true
+            showQuestionDrawer(headerText, descriptionText, yesButtonText, noButtonText, yesButtonFunction, noButtonFunction)
+        }
+    }
 
-                text: qsTr("Clear server from Amnezia software")
-                textColor: AmneziaStyle.color.vibrantRed
+    QtObject {
+        id: reset
 
-                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")
-                    var noButtonText = qsTr("Cancel")
+        property bool isVisible: ServersModel.getProcessedServerData("isServerFromTelegramApi")
+        readonly property string title: qsTr("Reset API config")
+        readonly property string description: ""
+        readonly property var tColor: AmneziaStyle.color.vibrantRed
+        readonly property var clickedHandler: function() {
+            var headerText = qsTr("Do you want to reset API config?")
+            var descriptionText = ""
+            var yesButtonText = qsTr("Continue")
+            var noButtonText = qsTr("Cancel")
 
-                    var yesButtonFunction = function() {
-                        if (ServersModel.isDefaultServerCurrentlyProcessed() && ConnectionController.isConnected) {
-                            PageController.showNotificationMessage(qsTr("Cannot clear server from Amnezia software during active connection"))
-                        } else {
-                            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)
+            var yesButtonFunction = function() {
+                if (ServersModel.isDefaultServerCurrentlyProcessed() && ConnectionController.isConnected) {
+                    PageController.showNotificationMessage(qsTr("Cannot reset API config during active connection"))
+                } else {
+                    PageController.showBusyIndicator(true)
+                    InstallController.removeApiConfig(ServersModel.processedIndex)
+                    PageController.showBusyIndicator(false)
                 }
             }
+            var noButtonFunction = function() {
 
-            DividerType {
-                visible: content.isServerWithWriteAccess
             }
 
-            LabelWithButtonType {
-                id: labelWithButton5
-                visible: ServersModel.getProcessedServerData("isServerFromTelegramApi")
-                Layout.fillWidth: true
+            showQuestionDrawer(headerText, descriptionText, yesButtonText, noButtonText, yesButtonFunction, noButtonFunction)
+        }
+    }
 
-                text: qsTr("Reset API config")
-                textColor: AmneziaStyle.color.vibrantRed
+    QtObject {
+        id: switch_to_premium
 
-                clickedFunction: function() {
-                    var headerText = qsTr("Do you want to reset API config?")
-                    var descriptionText = ""
-                    var yesButtonText = qsTr("Continue")
-                    var noButtonText = qsTr("Cancel")
-
-                    var yesButtonFunction = function() {
-                        if (ServersModel.isDefaultServerCurrentlyProcessed() && ConnectionController.isConnected) {
-                            PageController.showNotificationMessage(qsTr("Cannot reset API config during active connection"))
-                        } else {
-                            PageController.showBusyIndicator(true)
-                            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 {
-                visible: ServersModel.getProcessedServerData("isServerFromTelegramApi")
-            }
-
-            LabelWithButtonType {
-                id: labelWithButton6
-                visible: ServersModel.getProcessedServerData("isServerFromTelegramApi")
-                Layout.fillWidth: true
-
-                text: qsTr("Switch to the new Amnezia Premium subscription")
-                textColor: AmneziaStyle.color.vibrantRed
-
-                clickedFunction: function() {
-                    PageController.goToPageHome()
-                    ApiPremV1MigrationController.showMigrationDrawer()
-                }
-            }
-
-            DividerType {
-                visible: ServersModel.getProcessedServerData("isServerFromTelegramApi")
-            }
+        property bool isVisible: ServersModel.getProcessedServerData("isServerFromTelegramApi")
+        readonly property string title: qsTr("Switch to the new Amnezia Premium subscription")
+        readonly property string description: ""
+        readonly property var tColor: AmneziaStyle.color.vibrantRed
+        readonly property var clickedHandler: function() {
+            PageController.goToPageHome()
+            ApiPremV1MigrationController.showMigrationDrawer()
         }
     }
 }

client/ui/qml/Pages2/PageSettingsServerProtocol.qml

@@ -21,249 +21,205 @@ PageType {
 
     property bool isClearCacheVisible: ServersModel.isProcessedServerHasWriteAccess() && !ContainersModel.isServiceContainer(ContainersModel.getProcessedContainerIndex())
 
-    ColumnLayout {
-        id: header
+    BackButtonType {
+        id: backButton
 
         anchors.top: parent.top
         anchors.left: parent.left
         anchors.right: parent.right
-
         anchors.topMargin: 20
+    }
 
-        BackButtonType {
-            id: backButton
-        }
+    ListViewType {
+        id: listView
 
-        BaseHeaderType {
-            Layout.fillWidth: true
-            Layout.leftMargin: 16
-            Layout.rightMargin: 16
-            Layout.bottomMargin: 32
+        anchors.top: backButton.bottom
+        anchors.bottom: parent.bottom
+        anchors.right: parent.right
+        anchors.left: parent.left
 
-            headerText: ContainersModel.getProcessedContainerName() + qsTr(" settings")
-        }
+        header: ColumnLayout {
+            width: listView.width
 
-        ListView {
-            id: protocols
-            Layout.fillWidth: true
-            height: protocols.contentItem.height
-            clip: true
-            interactive: true
+            BaseHeaderType {
+                Layout.fillWidth: true
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
+                Layout.bottomMargin: 32
 
-            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 {
-                implicitWidth: protocols.width
-                implicitHeight: delegateContent.implicitHeight
-
-                ColumnLayout {
-                    id: delegateContent
-
-                    anchors.fill: parent
-
-                    property bool isClientSettingsVisible: protocolIndex === ProtocolEnum.WireGuard || protocolIndex === ProtocolEnum.Awg
-                    property bool isServerSettingsVisible: ServersModel.isProcessedServerHasWriteAccess()
-
-                    LabelWithButtonType {
-                        id: clientSettings
-
-                        Layout.fillWidth: true
-
-                        text: protocolName + qsTr(" connection settings")
-                        rightImageSource: "qrc:/images/controls/chevron-right.svg"
-                        visible: delegateContent.isClientSettingsVisible
-
-                        clickedFunction: function() {
-                            if (isClientProtocolExists) {
-                                switch (protocolIndex) {
-                                case ProtocolEnum.WireGuard: WireGuardConfigModel.updateModel(ProtocolsModel.getConfig()); break;
-                                case ProtocolEnum.Awg: AwgConfigModel.updateModel(ProtocolsModel.getConfig()); break;
-                                }
-                                PageController.goToPage(clientProtocolPage);
-                            } else {
-                                PageController.showNotificationMessage(qsTr("Click the \"connect\" button to create a connection configuration"))
-                            }
-                        }
-
-                        MouseArea {
-                            anchors.fill: clientSettings
-                            cursorShape: Qt.PointingHandCursor
-                            enabled: false
-                        }
-                    }
-
-                    DividerType {
-                        visible: delegateContent.isClientSettingsVisible
-                    }
-
-                    LabelWithButtonType {
-                        id: serverSettings
-
-                        Layout.fillWidth: true
-
-                        text: protocolName + qsTr(" server settings")
-                        rightImageSource: "qrc:/images/controls/chevron-right.svg"
-                        visible: delegateContent.isServerSettingsVisible
-
-                        clickedFunction: function() {
-                            switch (protocolIndex) {
-                            case ProtocolEnum.OpenVpn: OpenVpnConfigModel.updateModel(ProtocolsModel.getConfig()); break;
-                            case ProtocolEnum.ShadowSocks: ShadowSocksConfigModel.updateModel(ProtocolsModel.getConfig()); break;
-                            case ProtocolEnum.Cloak: CloakConfigModel.updateModel(ProtocolsModel.getConfig()); break;
-                            case ProtocolEnum.WireGuard: WireGuardConfigModel.updateModel(ProtocolsModel.getConfig()); break;
-                            case ProtocolEnum.Awg: AwgConfigModel.updateModel(ProtocolsModel.getConfig()); break;
-                            case ProtocolEnum.Xray: XrayConfigModel.updateModel(ProtocolsModel.getConfig()); break;
-                            case ProtocolEnum.Sftp: SftpConfigModel.updateModel(ProtocolsModel.getConfig()); break;
-                            case ProtocolEnum.Ipsec: Ikev2ConfigModel.updateModel(ProtocolsModel.getConfig()); break;
-                            case ProtocolEnum.Socks5Proxy: Socks5ProxyConfigModel.updateModel(ProtocolsModel.getConfig()); break;
-                            }
-                            PageController.goToPage(serverProtocolPage);
-                        }
-
-                        MouseArea {
-                            anchors.fill: serverSettings
-                            cursorShape: Qt.PointingHandCursor
-                            enabled: false
-                        }
-                    }
-
-                    DividerType {
-                        visible: delegateContent.isServerSettingsVisible
-                    }
-                }
-            }
-
-            footer: ColumnLayout {
-                width: header.width
-
-                LabelWithButtonType {
-                    id: clearCacheButton
-
-                    Layout.fillWidth: true
-
-                    visible: root.isClearCacheVisible
-
-                    text: qsTr("Clear profile")
-
-                    clickedFunction: function() {
-                        var headerText = qsTr("Clear %1 profile?").arg(ContainersModel.getProcessedContainerName())
-                        var descriptionText = qsTr("The connection configuration will be deleted for this device only")
-                        var yesButtonText = qsTr("Continue")
-                        var noButtonText = qsTr("Cancel")
-
-                        var yesButtonFunction = function() {
-                            if (ConnectionController.isConnected && ServersModel.getDefaultServerData("defaultContainer") === ContainersModel.getProcessedContainerIndex()) {
-                                var message = qsTr("Unable to clear %1 profile while there is an active connection").arg(ContainersModel.getProcessedContainerName())
-                                PageController.showNotificationMessage(message)
-                                return
-                            }
-
-                            PageController.showBusyIndicator(true)
-                            InstallController.clearCachedProfile()
-                            PageController.showBusyIndicator(false)
-                        }
-                        var noButtonFunction = function() {
-                            // if (!GC.isMobile()) {
-                            //     focusItem.forceActiveFocus()
-                            // }
-                        }
-
-                        showQuestionDrawer(headerText, descriptionText, yesButtonText, noButtonText, yesButtonFunction, noButtonFunction)
-                    }
-
-                    MouseArea {
-                        anchors.fill: clearCacheButton
-                        cursorShape: Qt.PointingHandCursor
-                        enabled: false
-                    }
-                }
-
-                DividerType {
-                    Layout.fillWidth: true
-                    Layout.leftMargin: 16
-                    Layout.rightMargin: 16
-
-                    visible: root.isClearCacheVisible
-                }
-
-                LabelWithButtonType {
-                    id: removeButton
-
-                    Layout.fillWidth: true
-
-                    visible: ServersModel.isProcessedServerHasWriteAccess()
-
-                    text: qsTr("Remove ")
-                    textColor: AmneziaStyle.color.vibrantRed
-
-                    clickedFunction: function() {
-                        var headerText = qsTr("Remove %1 from server?").arg(ContainersModel.getProcessedContainerName())
-                        var descriptionText = qsTr("All users with whom you shared a connection will no longer be able to connect to it.")
-                        var yesButtonText = qsTr("Continue")
-                        var noButtonText = qsTr("Cancel")
-
-                        var yesButtonFunction = function() {
-                            if (ServersModel.isDefaultServerCurrentlyProcessed() && ConnectionController.isConnected
-                                    && ServersModel.getDefaultServerData("defaultContainer") === ContainersModel.getProcessedContainerIndex()) {
-                                PageController.showNotificationMessage(qsTr("Cannot remove active container"))
-                            } else
-                            {
-                                PageController.goToPage(PageEnum.PageDeinstalling)
-                                InstallController.removeProcessedContainer()
-                            }
-                        }
-                        var noButtonFunction = function() {
-                            if (!GC.isMobile()) {
-                                focusItem.forceActiveFocus()
-                            }
-                        }
-
-                        showQuestionDrawer(headerText, descriptionText, yesButtonText, noButtonText, yesButtonFunction, noButtonFunction)
-                    }
-
-                    MouseArea {
-                        anchors.fill: removeButton
-                        cursorShape: Qt.PointingHandCursor
-                        enabled: false
-                    }
-                }
-
-                DividerType {
-                    Layout.fillWidth: true
-                    Layout.leftMargin: 16
-                    Layout.rightMargin: 16
-
-                    visible: ServersModel.isProcessedServerHasWriteAccess()
-                }
+                headerText: ContainersModel.getProcessedContainerName() + qsTr(" settings")
             }
         }
 
+        model: ProtocolsModel
+
+        delegate: ColumnLayout {
+            id: delegateContent
+
+            width: listView.width
+
+            property bool isClientSettingsVisible: protocolIndex === ProtocolEnum.WireGuard || protocolIndex === ProtocolEnum.Awg
+            property bool isServerSettingsVisible: ServersModel.isProcessedServerHasWriteAccess()
+
+            LabelWithButtonType {
+                id: clientSettings
+
+                Layout.fillWidth: true
+
+                text: protocolName + qsTr(" connection settings")
+                rightImageSource: "qrc:/images/controls/chevron-right.svg"
+                visible: delegateContent.isClientSettingsVisible
+
+                clickedFunction: function() {
+                    if (isClientProtocolExists) {
+                        switch (protocolIndex) {
+                        case ProtocolEnum.WireGuard: WireGuardConfigModel.updateModel(ProtocolsModel.getConfig()); break;
+                        case ProtocolEnum.Awg: AwgConfigModel.updateModel(ProtocolsModel.getConfig()); break;
+                        }
+                        PageController.goToPage(clientProtocolPage);
+                    } else {
+                        PageController.showNotificationMessage(qsTr("Click the \"connect\" button to create a connection configuration"))
+                    }
+                }
+
+                MouseArea {
+                    anchors.fill: clientSettings
+                    cursorShape: Qt.PointingHandCursor
+                    enabled: false
+                }
+            }
+
+            DividerType {
+                visible: delegateContent.isClientSettingsVisible
+            }
+
+            LabelWithButtonType {
+                id: serverSettings
+
+                Layout.fillWidth: true
+
+                text: protocolName + qsTr(" server settings")
+                rightImageSource: "qrc:/images/controls/chevron-right.svg"
+                visible: delegateContent.isServerSettingsVisible
+
+                clickedFunction: function() {
+                    switch (protocolIndex) {
+                    case ProtocolEnum.OpenVpn: OpenVpnConfigModel.updateModel(ProtocolsModel.getConfig()); break;
+                    case ProtocolEnum.ShadowSocks: ShadowSocksConfigModel.updateModel(ProtocolsModel.getConfig()); break;
+                    case ProtocolEnum.Cloak: CloakConfigModel.updateModel(ProtocolsModel.getConfig()); break;
+                    case ProtocolEnum.WireGuard: WireGuardConfigModel.updateModel(ProtocolsModel.getConfig()); break;
+                    case ProtocolEnum.Awg: AwgConfigModel.updateModel(ProtocolsModel.getConfig()); break;
+                    case ProtocolEnum.Xray: XrayConfigModel.updateModel(ProtocolsModel.getConfig()); break;
+                    case ProtocolEnum.Sftp: SftpConfigModel.updateModel(ProtocolsModel.getConfig()); break;
+                    case ProtocolEnum.Ipsec: Ikev2ConfigModel.updateModel(ProtocolsModel.getConfig()); break;
+                    case ProtocolEnum.Socks5Proxy: Socks5ProxyConfigModel.updateModel(ProtocolsModel.getConfig()); break;
+                    }
+                    PageController.goToPage(serverProtocolPage);
+                }
+
+                MouseArea {
+                    anchors.fill: serverSettings
+                    cursorShape: Qt.PointingHandCursor
+                    enabled: false
+                }
+            }
+
+            DividerType {
+                visible: delegateContent.isServerSettingsVisible
+            }
+        }
+
+        footer: ColumnLayout {
+
+            width: listView.width
+
+            LabelWithButtonType {
+                id: clearCacheButton
+
+                Layout.fillWidth: true
+
+                visible: root.isClearCacheVisible
+
+                text: qsTr("Clear profile")
+
+                clickedFunction: function() {
+                    var headerText = qsTr("Clear %1 profile?").arg(ContainersModel.getProcessedContainerName())
+                    var descriptionText = qsTr("The connection configuration will be deleted for this device only")
+                    var yesButtonText = qsTr("Continue")
+                    var noButtonText = qsTr("Cancel")
+
+                    var yesButtonFunction = function() {
+                        if (ConnectionController.isConnected && ServersModel.getDefaultServerData("defaultContainer") === ContainersModel.getProcessedContainerIndex()) {
+                            var message = qsTr("Unable to clear %1 profile while there is an active connection").arg(ContainersModel.getProcessedContainerName())
+                            PageController.showNotificationMessage(message)
+                            return
+                        }
+
+                        PageController.showBusyIndicator(true)
+                        InstallController.clearCachedProfile()
+                        PageController.showBusyIndicator(false)
+                    }
+
+                    var noButtonFunction = function() {
+                    }
+
+                    showQuestionDrawer(headerText, descriptionText, yesButtonText, noButtonText, yesButtonFunction, noButtonFunction)
+                }
+
+                MouseArea {
+                    anchors.fill: clearCacheButton
+                    cursorShape: Qt.PointingHandCursor
+                    enabled: false
+                }
+            }
+
+            DividerType {
+                visible: root.isClearCacheVisible
+            }
+
+            LabelWithButtonType {
+                id: removeButton
+
+                Layout.fillWidth: true
+
+                visible: ServersModel.isProcessedServerHasWriteAccess()
+
+                text: qsTr("Remove ")
+                textColor: AmneziaStyle.color.vibrantRed
+
+                clickedFunction: function() {
+                    var headerText = qsTr("Remove %1 from server?").arg(ContainersModel.getProcessedContainerName())
+                    var descriptionText = qsTr("All users with whom you shared a connection will no longer be able to connect to it.")
+                    var yesButtonText = qsTr("Continue")
+                    var noButtonText = qsTr("Cancel")
+
+                    var yesButtonFunction = function() {
+                        if (ServersModel.isDefaultServerCurrentlyProcessed() && ConnectionController.isConnected
+                                && ServersModel.getDefaultServerData("defaultContainer") === ContainersModel.getProcessedContainerIndex()) {
+                            PageController.showNotificationMessage(qsTr("Cannot remove active container"))
+                        } else
+                        {
+                            PageController.goToPage(PageEnum.PageDeinstalling)
+                            InstallController.removeProcessedContainer()
+                        }
+                    }
+                    var noButtonFunction = function() {
+
+                    }
+
+                    showQuestionDrawer(headerText, descriptionText, yesButtonText, noButtonText, yesButtonFunction, noButtonFunction)
+                }
+
+                MouseArea {
+                    anchors.fill: removeButton
+                    cursorShape: Qt.PointingHandCursor
+                    enabled: false
+                }
+            }
+
+            DividerType {
+                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
@@ -376,20 +367,16 @@ PageType {
                 }
             }
 
-            FlickableType {
+            ListViewType {
+                id: importSitesDrawerListView
+
                 anchors.top: importSitesDrawerBackButton.bottom
                 anchors.left: parent.left
                 anchors.right: parent.right
                 anchors.bottom: parent.bottom
 
-                contentHeight: importSitesDrawerContent.height
-
-                ColumnLayout {
-                    id: importSitesDrawerContent
-
-                    anchors.top: parent.top
-                    anchors.left: parent.left
-                    anchors.right: parent.right
+                header: ColumnLayout {
+                    width: importSitesDrawerListView.width
 
                     Header2Type {
                         Layout.fillWidth: true
@@ -397,49 +384,67 @@ 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"),
-                                                                        qsTr("Sites files (*.json)"))
-                            if (fileName !== "") {
-                                importSitesDrawerContent.importSites(fileName, true)
-                            }
+                            clickedHandler()
                         }
                     }
 
                     DividerType {}
-
-                    LabelWithButtonType {
-                        id: importSitesButton3
-                        Layout.fillWidth: true
-                        text: qsTr("Add imported sites to existing ones")
-
-                        clickedFunction: function() {
-                            var fileName = SystemController.getFileName(qsTr("Open sites file"),
-                                                                        qsTr("Sites files (*.json)"))
-                            if (fileName !== "") {
-                                importSitesDrawerContent.importSites(fileName, false)
-                            }
-                        }
-                    }
-
-                    function importSites(fileName, replaceExistingSites) {
-                        PageController.showBusyIndicator(true)
-                        SitesController.importSites(fileName, replaceExistingSites)
-                        PageController.showBusyIndicator(false)
-                        importSitesDrawer.closeTriggered()
-                        moreActionsDrawer.closeTriggered()
-                    }
-
-                    DividerType {}
                 }
             }
         }
     }
+
+    property list<QtObject> importOptions: [
+        replaceOption,
+        addOption,
+    ]
+
+    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 !== "") {
+                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)
+            }
+        }
+    }
+
+    function importSites(fileName, replaceExistingSites) {
+        PageController.showBusyIndicator(true)
+        SitesController.importSites(fileName, replaceExistingSites)
+        PageController.showBusyIndicator(false)
+        importSitesDrawer.closeTriggered()
+        moreActionsDrawer.closeTriggered()
+    }
 }

client/ui/qml/Pages2/PageSetupWizardApiServiceInfo.qml

@@ -15,25 +15,31 @@ import "../Components"
 PageType {
     id: root
 
-    FlickableType {
-        id: fl
+    BackButtonType {
+        id: backButton
+
         anchors.top: parent.top
-        anchors.bottom: parent.bottom
-        contentHeight: content.height + continueButton.implicitHeight + continueButton.anchors.bottomMargin + continueButton.anchors.topMargin
+        anchors.left: parent.left
+        anchors.right: parent.right
+        anchors.topMargin: 20
 
-        ColumnLayout {
-            id: content
-
-            anchors.top: parent.top
-            anchors.left: parent.left
-            anchors.right: parent.right
-
-            spacing: 0
-
-            BackButtonType {
-                id: backButton
-                Layout.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 {
                 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"
-                leftText: qsTr("For the region")
-                rightText: ApiServicesModel.getSelectedServiceData("region")
+                imageSource: imagePath
+                leftText: lText
+                rightText: rText
             }
+        }
 
-            LabelWithImageType {
-                Layout.fillWidth: true
-                Layout.margins: 16
+        footer: ColumnLayout {
+            width: listView.width
 
-                imageSource: "qrc:/images/controls/tag.svg"
-                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: ""
-            }
+            spacing: 0
 
             ParagraphTextType {
                 Layout.fillWidth: true
@@ -113,34 +94,84 @@ PageType {
                     cursorShape: parent.hoveredLink ? Qt.PointingHandCursor : Qt.ArrowCursor
                 }
             }
-        }
-    }
 
-    BasicButtonType {
-        id: continueButton
+            BasicButtonType {
+                id: continueButton
 
-        anchors.right: parent.right
-        anchors.left: parent.left
-        anchors.bottom: parent.bottom
+                Layout.fillWidth: true
+                Layout.topMargin: 32
+                Layout.bottomMargin: 32
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
 
-        anchors.topMargin: 32
-        anchors.rightMargin: 16
-        anchors.leftMargin: 16
-        anchors.bottomMargin: 32
+                text: qsTr("Connect")
 
-        text: qsTr("Connect")
-
-        clickedFunc: function() {
-            var endpoint = ApiServicesModel.getStoreEndpoint()
-            if (endpoint !== undefined && endpoint !== "") {
-                Qt.openUrlExternally(endpoint)
-                PageController.closePage()
-                PageController.closePage()
-            } else {
-                PageController.showBusyIndicator(true)
-                ApiConfigsController.importServiceFromGateway()
-                PageController.showBusyIndicator(false)
+                clickedFunc: function() {
+                    var endpoint = ApiServicesModel.getStoreEndpoint()
+                    if (endpoint !== undefined && endpoint !== "") {
+                        Qt.openUrlExternally(endpoint)
+                        PageController.closePage()
+                        PageController.closePage()
+                    } else {
+                        PageController.showBusyIndicator(true)
+                        ApiConfigsController.importServiceFromGateway()
+                        PageController.showBusyIndicator(false)
+                    }
+                }
             }
         }
     }
+
+    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

@@ -40,7 +40,7 @@ PageType {
         }
     }
 
-    ListView {
+    ListViewType {
         id: servicesListView
 
         anchors.top: header.bottom
@@ -48,17 +48,11 @@ PageType {
         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: Item {
             implicitWidth: servicesListView.width
             implicitHeight: delegateContent.implicitHeight

client/ui/qml/Pages2/PageSetupWizardConfigSource.qml

@@ -27,21 +27,13 @@ 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
 

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 {
@@ -42,102 +43,95 @@ PageType {
         anchors.topMargin: 20
     }
 
-    FlickableType {
-        id: fl
+    ButtonGroup {
+        id: buttonGroup
+    }
+
+    ListViewType {
+        id: listView
+
+        property int dockerContainer
+        property int containerDefaultPort
+        property int containerDefaultTransportProto
+
         anchors.top: backButton.bottom
         anchors.bottom: parent.bottom
-        contentHeight: content.implicitHeight + setupLaterButton.anchors.bottomMargin
+        anchors.left: parent.left
+        anchors.right: parent.right
 
-        Column {
+        spacing: 16
+
+        header: ColumnLayout {
             id: content
 
-            anchors.top: parent.top
-            anchors.left: parent.left
-            anchors.right: parent.right
-            anchors.rightMargin: 16
-            anchors.leftMargin: 16
+            width: listView.width
 
             spacing: 16
 
             BaseHeaderType {
                 id: header
 
-                implicitWidth: parent.width
+                Layout.fillWidth: true
+                Layout.rightMargin: 16
+                Layout.leftMargin: 16
+                Layout.bottomMargin: 16
+
                 headerTextMaximumLineCount: 10
 
                 headerText: qsTr("Choose Installation Type")
             }
+        }
 
-            ButtonGroup {
-                id: buttonGroup
-            }
+        model: proxyContainersModel
+        currentIndex: 0
 
-            ListView {
-                id: containers
-                width: parent.width
-                height: containers.contentItem.height
-                spacing: 16
+        delegate: ColumnLayout {
 
-                currentIndex: 0
-                clip: true
-                interactive: false
-                model: proxyContainersModel
+            width: listView.width
 
-                property int dockerContainer
-                property int containerDefaultPort
-                property int containerDefaultTransportProto
+            CardType {
+                id: card
 
-                property bool isFocusable: true
+                Layout.fillWidth: true
+                Layout.rightMargin: 16
+                Layout.leftMargin: 16
+                Layout.bottomMargin: 16
 
-                delegate: Item {
-                    implicitWidth: containers.width
-                    implicitHeight: delegateContent.implicitHeight
+                headerText: easySetupHeader
+                bodyText: easySetupDescription
 
-                    ColumnLayout {
-                        id: delegateContent
+                ButtonGroup.group: buttonGroup
 
-                        anchors.top: parent.top
-                        anchors.left: parent.left
-                        anchors.right: parent.right
+                onClicked: function() {
+                    checked = true
+                    isEasySetup = true
+                    var defaultContainerProto =  ContainerProps.defaultProtocol(dockerContainer)
 
-                        CardType {
-                            id: card
-
-                            Layout.fillWidth: true
-
-                            headerText: easySetupHeader
-                            bodyText: easySetupDescription
-
-                            ButtonGroup.group: buttonGroup
-
-                            onClicked: function() {
-                                isEasySetup = true
-                                var defaultContainerProto =  ContainerProps.defaultProtocol(dockerContainer)
-
-                                containers.dockerContainer = dockerContainer
-                                containers.containerDefaultPort = ProtocolProps.getPortForInstall(defaultContainerProto)
-                                containers.containerDefaultTransportProto = ProtocolProps.defaultTransportProto(defaultContainerProto)
-                            }
-                        }
-                    }
+                    listView.dockerContainer = dockerContainer
+                    listView.containerDefaultPort = ProtocolProps.getPortForInstall(defaultContainerProto)
+                    listView.containerDefaultTransportProto = ProtocolProps.defaultTransportProto(defaultContainerProto)
                 }
 
-                Component.onCompleted: {
-                    var item = containers.itemAtIndex(containers.currentIndex)
-                    if (item !== null) {
-                        var button = item.children[0].children[0]
-                        button.checked = true
-                        button.clicked()
-                    }
-                }
+                Keys.onReturnPressed: this.clicked()
+                Keys.onEnterPressed: this.clicked()
             }
+        }
+
+        footer: ColumnLayout {
+
+            width: listView.width
+            spacing: 16
 
             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")
@@ -146,25 +140,29 @@ PageType {
 
                 onClicked: function() {
                     isEasySetup = false
+                    checked = true
                 }
+
+                Keys.onReturnPressed: this.clicked()
+                Keys.onEnterPressed: this.clicked()
             }
 
             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,
-                                                  containers.containerDefaultPort,
-                                                  containers.containerDefaultTransportProto)
+                        InstallController.install(listView.dockerContainer,
+                                                  listView.containerDefaultPort,
+                                                  listView.containerDefaultTransportProto)
                     } else {
                         PageController.goToPage(PageEnum.PageSetupWizardProtocols)
                     }
@@ -174,9 +172,11 @@ PageType {
             BasicButtonType {
                 id: setupLaterButton
 
-                implicitWidth: parent.width
-                anchors.topMargin: 8
-                anchors.bottomMargin: 24
+                Layout.fillWidth: true
+                Layout.topMargin: 8
+                Layout.bottomMargin: 24
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
 
                 defaultColor: AmneziaStyle.color.transparent
                 hoveredColor: AmneziaStyle.color.translucentWhite
@@ -185,9 +185,6 @@ PageType {
                 textColor: AmneziaStyle.color.paleGray
                 borderWidth: 1
 
-                Keys.onTabPressed: lastItemTabClicked(focusItem)
-                parentFlickable: fl
-
                 visible: {
                     if (PageController.isTriggeredByConnectButton()) {
                         PageController.setTriggeredByConnectButton(false)
@@ -205,5 +202,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,92 +85,76 @@ PageType {
         ]
     }
 
-    FlickableType {
+    ListViewType {
+        id: listView
+
         anchors.fill: parent
-        contentHeight: content.height
 
-        Column {
-            id: content
+        currentIndex: -1
 
-            anchors.top: parent.top
-            anchors.left: parent.left
-            anchors.right: parent.right
+        model: proxyContainersModel
 
-            spacing: 16
+        delegate: ColumnLayout {
+            width: listView.width
 
-            ListView {
-                id: container
-                width: parent.width
-                height: container.contentItem.height
-                currentIndex: -1
-                clip: true
-                interactive: false
-                model: proxyContainersModel
+            BaseHeaderType {
+                Layout.fillWidth: true
+                Layout.topMargin: 20
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
 
-                delegate: Item {
-                    implicitWidth: container.width
-                    implicitHeight: delegateContent.implicitHeight
+                headerText: qsTr("Installing")
+                descriptionText: name
+            }
 
-                    ColumnLayout {
-                        id: delegateContent
+            ProgressBarType {
+                id: progressBar
 
-                        anchors.fill: parent
-                        anchors.rightMargin: 16
-                        anchors.leftMargin: 16
+                Layout.fillWidth: true
+                Layout.topMargin: 32
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
 
-                        BaseHeaderType {
-                            Layout.fillWidth: true
-                            Layout.topMargin: 20
+                Timer {
+                    id: timer
 
-                            headerText: qsTr("Installing")
-                            descriptionText: name
-                        }
-
-                        ProgressBarType {
-                            id: progressBar
-
-                            Layout.fillWidth: true
-                            Layout.topMargin: 32
-
-                            Timer {
-                                id: timer
-
-                                interval: 300
-                                repeat: true
-                                running: root.isTimerRunning
-                                onTriggered: {
-                                    progressBar.value += 0.003
-                                }
-                            }
-                        }
-
-                        ParagraphTextType {
-                            id: progressText
-
-                            Layout.fillWidth: true
-                            Layout.topMargin: 8
-
-                            text: root.progressBarText
-                        }
-
-                        BasicButtonType {
-                            id: cancelIntallationButton
-
-                            Layout.fillWidth: true
-                            Layout.topMargin: 24
-
-                            visible: root.isCancelButtonVisible
-
-                            text: qsTr("Cancel installation")
-
-                            clickedFunc: function() {
-                                InstallController.cancelInstallation()
-                                PageController.showBusyIndicator(true)
-                            }
-                        }
+                    interval: 300
+                    repeat: true
+                    running: root.isTimerRunning
+                    onTriggered: {
+                        progressBar.value += 0.003
                     }
                 }
             }
+
+            ParagraphTextType {
+                id: progressText
+
+                Layout.fillWidth: true
+                Layout.topMargin: 8
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
+
+                text: root.progressBarText
+            }
+
+            BasicButtonType {
+                id: cancelIntallationButton
+
+                Layout.fillWidth: true
+                Layout.topMargin: 24
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
+
+                visible: root.isCancelButtonVisible
+
+                text: qsTr("Cancel installation")
+
+                clickedFunc: function() {
+                    InstallController.cancelInstallation()
+                    PageController.showBusyIndicator(true)
+                }
+            }
         }
     }
 }

client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml

@@ -29,256 +29,239 @@ PageType {
         ]
     }
 
-    FlickableType {
-        anchors.fill: parent
-        contentHeight: content.height
+    BackButtonType {
+        id: backButton
 
-        Column {
-            id: content
+        anchors.top: parent.top
+        anchors.left: parent.left
+        anchors.right: parent.right
+        anchors.topMargin: 20
 
-            anchors.top: parent.top
-            anchors.left: parent.left
-            anchors.right: parent.right
+        onFocusChanged: {
+            if (this.activeFocus) {
+                listView.positionViewAtBeginning()
+            }
+        }
+    }
 
-            ListView {
-                id: processedContainerListView
-                width: parent.width
-                height: contentItem.height
-                currentIndex: -1
-                clip: true
-                interactive: false
-                model: proxyContainersModel
+    ListViewType {
+        id: listView
 
-                property bool isFocusable: true
+        anchors.top: backButton.bottom
+        anchors.bottom: parent.bottom
+        anchors.right: parent.right
+        anchors.left: parent.left
 
-                Keys.onTabPressed: {
-                    FocusController.nextKeyTabItem()
+        currentIndex: -1
+
+        model: proxyContainersModel
+
+        delegate: ColumnLayout {
+            width: listView.width
+
+            BaseHeaderType {
+                id: header
+
+                Layout.fillWidth: true
+                Layout.rightMargin: 16
+                Layout.leftMargin: 16
+
+                headerText: qsTr("Installing %1").arg(name)
+                descriptionText: description
+            }
+
+            BasicButtonType {
+                id: showDetailsButton
+
+                Layout.topMargin: 16
+                Layout.rightMargin: 16
+                Layout.leftMargin: 16
+
+                implicitHeight: 32
+
+                defaultColor: AmneziaStyle.color.transparent
+                hoveredColor: AmneziaStyle.color.translucentWhite
+                pressedColor: AmneziaStyle.color.sheerWhite
+                disabledColor: AmneziaStyle.color.mutedGray
+                textColor: AmneziaStyle.color.goldenApricot
+
+                text: qsTr("More detailed")
+
+                clickedFunc: function() {
+                    showDetailsDrawer.openTriggered()
                 }
+            }
 
-                Keys.onBacktabPressed: {
-                    FocusController.previousKeyTabItem()
-                }
+            DrawerType2 {
+                id: showDetailsDrawer
+                parent: root
 
-                Keys.onUpPressed: {
-                    FocusController.nextKeyUpItem()
-                }
+                anchors.fill: parent
+                expandedHeight: parent.height * 0.9
+                expandedStateContent: Item {
+                    implicitHeight: showDetailsDrawer.expandedHeight
 
-                Keys.onDownPressed: {
-                    FocusController.nextKeyDownItem()
-                }
+                    BackButtonType {
+                        id: showDetailsBackButton
 
-                Keys.onLeftPressed: {
-                    FocusController.nextKeyLeftItem()
-                }
+                        anchors.top: parent.top
+                        anchors.left: parent.left
+                        anchors.right: parent.right
+                        anchors.topMargin: 16
 
-                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
+                        backButtonFunction: function() {
+                            showDetailsDrawer.closeTriggered()
                         }
+                    }
 
-                        BaseHeaderType {
-                            id: header
+                    ListViewType {
+                        id: showDetailsListView
 
-                            Layout.fillWidth: true
+                        anchors.top: showDetailsBackButton.bottom
+                        anchors.left: parent.left
+                        anchors.right: parent.right
+                        anchors.bottom: parent.bottom
 
-                            headerText: qsTr("Installing %1").arg(name)
-                            descriptionText: description
-                        }
+                        header: ColumnLayout {
+                            width: showDetailsListView.width
 
-                        BasicButtonType {
-                            id: showDetailsButton
+                            Header2Type {
+                                id: showDetailsDrawerHeader
 
-                            Layout.topMargin: 16
-                            Layout.leftMargin: -8
+                                Layout.fillWidth: true
+                                Layout.topMargin: 16
+                                Layout.rightMargin: 16
+                                Layout.leftMargin: 16
 
-                            implicitHeight: 32
-
-                            defaultColor: AmneziaStyle.color.transparent
-                            hoveredColor: AmneziaStyle.color.translucentWhite
-                            pressedColor: AmneziaStyle.color.sheerWhite
-                            disabledColor: AmneziaStyle.color.mutedGray
-                            textColor: AmneziaStyle.color.goldenApricot
-
-                            text: qsTr("More detailed")
-                            KeyNavigation.tab: transportProtoSelector
-
-                            clickedFunc: function() {
-                                showDetailsDrawer.openTriggered()
+                                headerText: name
                             }
                         }
 
-                        DrawerType2 {
-                            id: showDetailsDrawer
-                            parent: root
+                        model: 1 // fake model to force the ListView to be created without a model
 
-                            anchors.fill: parent
-                            expandedHeight: parent.height * 0.9
-                            expandedStateContent: Item {
-                                implicitHeight: showDetailsDrawer.expandedHeight
+                        delegate: ColumnLayout {
+                            width: showDetailsListView.width
 
-                                BackButtonType {
-                                    id: showDetailsBackButton
+                            ParagraphTextType {
+                                Layout.fillWidth: true
+                                Layout.topMargin: 16
+                                Layout.bottomMargin: 16
+                                Layout.leftMargin: 16
+                                Layout.rightMargin: 16
 
-                                    anchors.top: parent.top
-                                    anchors.left: parent.left
-                                    anchors.right: parent.right
-                                    anchors.topMargin: 16
+                                text: detailedDescription
+                                textFormat: Text.MarkdownText
+                            }
 
-                                    backButtonFunction: function() {
-                                        showDetailsDrawer.closeTriggered()
-                                    }
-                                }
+                            Rectangle {
+                                Layout.fillHeight: true
+                                Layout.leftMargin: 16
+                                Layout.rightMargin: 16
 
-                                FlickableType {
-                                    id: fl
-                                    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
-                                    }
+                                color: AmneziaStyle.color.transparent
+                            }
+                        }
 
-                                    ColumnLayout {
-                                        id: showDetailsDrawerContent
+                        footer: ColumnLayout {
+                            width: showDetailsListView.width
 
-                                        anchors.top: parent.top
-                                        anchors.left: parent.left
-                                        anchors.right: parent.right
-                                        anchors.rightMargin: 16
-                                        anchors.leftMargin: 16
+                            BasicButtonType {
+                                id: showDetailsCloseButton
+                                Layout.fillWidth: true
+                                Layout.bottomMargin: 32
+                                Layout.leftMargin: 16
+                                Layout.rightMargin: 16
 
-                                        Header2Type {
-                                            id: showDetailsDrawerHeader
-                                            Layout.fillWidth: true
-                                            Layout.topMargin: 16
+                                text: qsTr("Close")
 
-                                            headerText: name
-                                        }
-
-                                        ParagraphTextType {
-                                            Layout.fillWidth: true
-                                            Layout.topMargin: 16
-                                            Layout.bottomMargin: 16
-
-                                            text: detailedDescription
-                                            textFormat: Text.MarkdownText
-                                        }
-
-                                        Rectangle {
-                                            Layout.fillHeight: true
-                                            color: AmneziaStyle.color.transparent
-                                        }
-
-                                        BasicButtonType {
-                                            id: showDetailsCloseButton
-                                            Layout.fillWidth: true
-                                            Layout.bottomMargin: 32
-                                            parentFlickable: fl
-
-                                            text: qsTr("Close")
-
-											clickedFunc: function()  {
-                                                showDetailsDrawer.closeTriggered()
-                                            }
-                                        }
-                                    }
+                                clickedFunc: function()  {
+                                    showDetailsDrawer.closeTriggered()
                                 }
                             }
                         }
-
-                        ParagraphTextType {
-                            id: transportProtoHeader
-
-                            Layout.topMargin: 16
-
-                            text: qsTr("Network protocol")
-                        }
-
-                        TransportProtoSelector {
-                            id: transportProtoSelector
-
-                            Layout.fillWidth: true
-                            rootWidth: root.width
-                        }
-
-                        TextFieldWithHeaderType {
-                            id: port
-
-                            Layout.fillWidth: true
-                            Layout.topMargin: 16
-
-                            headerText: qsTr("Port")
-                            textField.maximumLength: 5
-                            textField.validator: IntValidator { bottom: 1; top: 65535 }
-                        }
-
-                        Rectangle {
-                            Layout.fillHeight: true
-                            color: AmneziaStyle.color.transparent
-                        }
-
-                        BasicButtonType {
-                            id: installButton
-
-                            Layout.fillWidth: true
-                            Layout.bottomMargin: 32
-
-                            text: qsTr("Install")
-
-                            clickedFunc: function() {
-                                if (!port.textField.acceptableInput &&
-                                        ContainerProps.containerTypeToString(dockerContainer) !== "torwebsite" &&
-                                        ContainerProps.containerTypeToString(dockerContainer) !== "ikev2") {
-                                    port.errorText = qsTr("The port must be in the range of 1 to 65535")
-                                    return
-                                }
-
-                                PageController.goToPage(PageEnum.PageSetupWizardInstalling);
-                                InstallController.install(dockerContainer, port.textField.text, transportProtoSelector.currentIndex)
-                            }
-                        }
-
-                        Component.onCompleted: {
-                            var defaultContainerProto =  ContainerProps.defaultProtocol(dockerContainer)
-
-                            if (ProtocolProps.defaultPort(defaultContainerProto) < 0) {
-                                port.visible = false
-                            } else {
-                                port.textField.text = ProtocolProps.getPortForInstall(defaultContainerProto)
-                            }
-                            transportProtoSelector.currentIndex = ProtocolProps.defaultTransportProto(defaultContainerProto)
-
-                            port.enabled = ProtocolProps.defaultPortChangeable(defaultContainerProto)
-                            var protocolSelectorVisible = ProtocolProps.defaultTransportProtoChangeable(defaultContainerProto)
-                            transportProtoSelector.visible = protocolSelectorVisible
-                            transportProtoHeader.visible = protocolSelectorVisible
-                        }
                     }
                 }
             }
+
+            ParagraphTextType {
+                id: transportProtoHeader
+
+                Layout.topMargin: 16
+                Layout.rightMargin: 16
+                Layout.leftMargin: 16
+
+                text: qsTr("Network protocol")
+            }
+
+            TransportProtoSelector {
+                id: transportProtoSelector
+
+                Layout.fillWidth: true
+                Layout.rightMargin: 16
+                Layout.leftMargin: 16
+
+                rootWidth: root.width
+            }
+
+            TextFieldWithHeaderType {
+                id: port
+
+                Layout.fillWidth: true
+                Layout.topMargin: 16
+                Layout.rightMargin: 16
+                Layout.leftMargin: 16
+
+                headerText: qsTr("Port")
+                textField.maximumLength: 5
+                textField.validator: IntValidator { bottom: 1; top: 65535 }
+            }
+
+            Rectangle {
+                Layout.fillHeight: true
+                Layout.rightMargin: 16
+                Layout.leftMargin: 16
+
+                color: AmneziaStyle.color.transparent
+            }
+
+            BasicButtonType {
+                id: installButton
+
+                Layout.fillWidth: true
+                Layout.bottomMargin: 32
+                Layout.rightMargin: 16
+                Layout.leftMargin: 16
+
+                text: qsTr("Install")
+
+                clickedFunc: function() {
+                    if (!port.textField.acceptableInput &&
+                            ContainerProps.containerTypeToString(dockerContainer) !== "torwebsite" &&
+                            ContainerProps.containerTypeToString(dockerContainer) !== "ikev2") {
+                        port.errorText = qsTr("The port must be in the range of 1 to 65535")
+                        return
+                    }
+
+                    PageController.goToPage(PageEnum.PageSetupWizardInstalling);
+                    InstallController.install(dockerContainer, port.textField.text, transportProtoSelector.currentIndex)
+                }
+            }
+
+            Component.onCompleted: {
+                var defaultContainerProto =  ContainerProps.defaultProtocol(dockerContainer)
+
+                if (ProtocolProps.defaultPort(defaultContainerProto) < 0) {
+                    port.visible = false
+                } else {
+                    port.textField.text = ProtocolProps.getPortForInstall(defaultContainerProto)
+                }
+                transportProtoSelector.currentIndex = ProtocolProps.defaultTransportProto(defaultContainerProto)
+
+                port.enabled = ProtocolProps.defaultPortChangeable(defaultContainerProto)
+                var protocolSelectorVisible = ProtocolProps.defaultTransportProtoChangeable(defaultContainerProto)
+                transportProtoSelector.visible = protocolSelectorVisible
+                transportProtoHeader.visible = protocolSelectorVisible
+            }
         }
     }
 }

client/ui/qml/Pages2/PageSetupWizardProtocols.qml

@@ -44,17 +44,13 @@ 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
 
@@ -72,9 +68,8 @@ PageType {
         }
 
         model: proxyContainersModel
-        clip: true
+
         spacing: 0
-        reuseItems: true
         snapMode: ListView.SnapToItem
 
         delegate: ColumnLayout {
@@ -87,9 +82,9 @@ PageType {
                 descriptionText: description
                 rightImageSource: "qrc:/images/controls/chevron-right.svg"
 
-                clickedFunction: function() {
-                    ContainersModel.setProcessedContainerIndex(proxyContainersModel.mapToSource(index))
-                    PageController.goToPage(PageEnum.PageSetupWizardProtocolSettings)
+                clickedFunction: function () {
+                    ContainersModel.setProcessedContainerIndex(proxyContainersModel.mapToSource(index));
+                    PageController.goToPage(PageEnum.PageSetupWizardProtocolSettings);
                 }
             }
 

client/ui/qml/Pages2/PageSetupWizardTextKey.qml

@@ -13,25 +13,31 @@ import "../Config"
 PageType {
     id: root
 
-    FlickableType {
-        id: fl
+    BackButtonType {
+        id: backButton
+
         anchors.top: parent.top
-        anchors.bottom: parent.bottom
-        contentHeight: content.height
+        anchors.left: parent.left
+        anchors.right: parent.right
+        anchors.topMargin: 20
 
-        ColumnLayout {
-            id: content
-
-            anchors.top: parent.top
-            anchors.left: parent.left
-            anchors.right: parent.right
-
-            spacing: 16
-
-            BackButtonType {
-                id: backButton
-                Layout.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 {
                 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,23 +73,26 @@ PageType {
                 }
             }
         }
-    }
 
-    BasicButtonType {
-        id: continueButton
+        footer: ColumnLayout {
+            width: listView.width
 
-        anchors.bottom: parent.bottom
-        anchors.left: parent.left
-        anchors.right: parent.right
-        anchors.rightMargin: 16
-        anchors.leftMargin: 16
-        anchors.bottomMargin: 32
+            BasicButtonType {
+                id: continueButton
 
-        text: qsTr("Continue")
+                Layout.fillWidth: true
+                Layout.rightMargin: 16
+                Layout.leftMargin: 16
+                Layout.topMargin: 16
+                Layout.bottomMargin: 32
 
-        clickedFunc: function() {
-            if (ImportController.extractConfigFromData(textKey.textField.text)) {
-                PageController.goToPage(PageEnum.PageSetupWizardViewConfig)
+                text: qsTr("Continue")
+
+                clickedFunc: function() {
+                    if (ImportController.extractConfigFromData(textKey.textField.text)) {
+                        PageController.goToPage(PageEnum.PageSetupWizardViewConfig)
+                    }
+                }
             }
         }
     }

client/ui/qml/Pages2/PageSetupWizardViewConfig.qml

@@ -46,27 +46,29 @@ PageType {
         }
     }
 
-    FlickableType {
-        id: fl
+    ListViewType {
+        id: listView
+
         anchors.top: backButton.bottom
         anchors.bottom: parent.bottom
-        contentHeight: content.implicitHeight + connectButton.implicitHeight
+        anchors.right: parent.right
+        anchors.left: parent.left
 
-        ColumnLayout {
-            id: content
-
-            anchors.top: parent.top
-            anchors.left: parent.left
-            anchors.right: parent.right
-            anchors.rightMargin: 16
-            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 +90,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 +103,6 @@ PageType {
 
                 text: showContent ? qsTr("Collapse content") : qsTr("Show content")
 
-                parentFlickable: fl
-
                 clickedFunc: function() {
                     showContent = !showContent
                 }
@@ -108,16 +110,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 {
+            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 +144,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 +156,10 @@ PageType {
 
             Rectangle {
                 Layout.fillWidth: true
+                Layout.topMargin: 16
                 Layout.bottomMargin: 48
+                Layout.rightMargin: 16
+                Layout.leftMargin: 16
 
                 implicitHeight: configContent.implicitHeight
 
@@ -161,34 +180,38 @@ PageType {
                 }
             }
         }
-    }
 
-    Rectangle {
-        anchors.fill: columnContent
-        anchors.bottomMargin: -24
-        color: AmneziaStyle.color.midnightBlack
-        opacity: 0.8
-    }
+        footer: ColumnLayout {
+            width: listView.width
 
-    ColumnLayout {
-        id: columnContent
-        anchors.bottom: parent.bottom
-        anchors.left: parent.left
-        anchors.right: parent.right
-        anchors.rightMargin: 16
-        anchors.leftMargin: 16
+            BasicButtonType {
+                id: connectButton
 
-        BasicButtonType {
-            id: connectButton
-            Layout.fillWidth: true
-            Layout.bottomMargin: 32
+                Layout.fillWidth: true
+                Layout.topMargin: 16
+                Layout.bottomMargin: 32
+                Layout.rightMargin: 16
+                Layout.leftMargin: 16
 
-            text: qsTr("Connect")
-            clickedFunc: function() {
-                if (cloakingCheckBox.checked) {
-                    ImportController.processNativeWireGuardConfig()
+                text: qsTr("Connect")
+                clickedFunc: function() {
+                    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()
                 }
-                ImportController.importConfig()
             }
         }
     }

client/ui/qml/Pages2/PageShare.qml

@@ -520,9 +520,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

@@ -25,27 +25,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
+        anchors.right: parent.right
+        anchors.left: parent.left
 
-        ColumnLayout {
-            id: content
-
-            anchors.top: parent.top
-            anchors.left: parent.left
-            anchors.right: parent.right
-
-            anchors.rightMargin: 16
-            anchors.leftMargin: 16
-
-            spacing: 0
+        header: ColumnLayout {
+            width: listView.width
 
             BaseHeaderType {
                 Layout.fillWidth: true
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
                 Layout.topMargin: 24
 
                 headerText: qsTr("Full access to the server and VPN")
@@ -53,6 +55,8 @@ PageType {
 
             ParagraphTextType {
                 Layout.fillWidth: true
+                Layout.leftMargin: 16
+                Layout.rightMargin: 16
                 Layout.topMargin: 24
                 Layout.bottomMargin: 24
 
@@ -63,11 +67,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
@@ -117,11 +124,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"
@@ -137,8 +153,22 @@ PageType {
                         ExportController.generateFullAccessConfig()
                     }
 
-                    shareConnectionDrawer.headerText = qsTr("Connection to ") + serverSelector.text
-                    shareConnectionDrawer.configContentHeaderText = qsTr("File with connection settings to ") + serverSelector.text
+                    const headerItem = listView.headerItem;
+                    if (!headerItem) {
+                        PageController.showBusyIndicator(false)
+                        console.error("Failed to share: header item not found in ListView")
+                        return
+                    }
+
+                    const serverSelectorItem = listView.findChildWithObjectName(headerItem.children, "serverSelector");
+                    if (!serverSelectorItem) {
+                        PageController.showBusyIndicator(false)
+                        console.error("Failed to share: serverSelector item not found in ListView")
+                        return
+                    }
+
+                    shareConnectionDrawer.headerText = qsTr("Connection to ") + serverSelectorItem.text
+                    shareConnectionDrawer.configContentHeaderText = qsTr("File with connection settings to ") + serverSelectorItem.text
 
                     shareConnectionDrawer.openTriggered()