chore: update link to submodule

CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.25.0 FATAL_ERROR)
 
 set(PROJECT AmneziaVPN)
-set(AMNEZIAVPN_VERSION 4.8.9.2)
+set(AMNEZIAVPN_VERSION 4.8.9.0)
 
 project(${PROJECT} VERSION ${AMNEZIAVPN_VERSION}
         DESCRIPTION "AmneziaVPN"
@@ -12,7 +12,7 @@ string(TIMESTAMP CURRENT_DATE "%Y-%m-%d")
 set(RELEASE_DATE "${CURRENT_DATE}")
 
 set(APP_MAJOR_VERSION ${CMAKE_PROJECT_VERSION_MAJOR}.${CMAKE_PROJECT_VERSION_MINOR}.${CMAKE_PROJECT_VERSION_PATCH})
-set(APP_ANDROID_VERSION_CODE 2092)
+set(APP_ANDROID_VERSION_CODE 2090)
 
 if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
     set(MZ_PLATFORM_NAME "linux")

README.md

@@ -9,17 +9,17 @@
 ### [English]([https://github.com/amnezia-vpn/amnezia-client/blob/dev/README_RU.md](https://github.com/amnezia-vpn/amnezia-client/tree/dev?tab=readme-ov-file#)) | [Русский](https://github.com/amnezia-vpn/amnezia-client/blob/dev/README_RU.md)
 
 
-[Amnezia](https://amnezia.org?utm_source=github&utm_campaign=amnezia_website-readme-en) is an open-source VPN client, with a key feature that enables you to deploy your own VPN server on your server.
+[Amnezia](https://amnezia.org) is an open-source VPN client, with a key feature that enables you to deploy your own VPN server on your server.
 
 [![Image](https://github.com/amnezia-vpn/amnezia-client/blob/dev/metadata/img-readme/uipic4.png)](https://amnezia.org)
 
-### [Website](https://amnezia.org?utm_source=github&utm_campaign=amnezia_website-readme-en) | [Alt website link](https://storage.googleapis.com/amnezia/amnezia.org?utm_source=github&utm_campaign=amnezia_website-readme-en-mirror) | [Documentation](https://docs.amnezia.org) | [Troubleshooting](https://docs.amnezia.org/troubleshooting)
+### [Website](https://amnezia.org) | [Alt website link](https://storage.googleapis.com/amnezia/amnezia.org) | [Documentation](https://docs.amnezia.org) | [Troubleshooting](https://docs.amnezia.org/troubleshooting)
 
 > [!TIP]
-> If the [Amnezia website](https://amnezia.org?utm_source=github&utm_campaign=amnezia_website-readme-en) is blocked in your region, you can use an [Alternative website link](https://storage.googleapis.com/amnezia/amnezia.org?utm_source=github&utm_campaign=amnezia_website-readme-en-mirror).
+> If the [Amnezia website](https://amnezia.org) is blocked in your region, you can use an [Alternative website link](https://storage.googleapis.com/amnezia/amnezia.org ).
 
-<a href="https://amnezia.org/en/downloads?utm_source=github&utm_campaign=amnezia_button-readme-en"><img src="https://github.com/amnezia-vpn/amnezia-client/blob/dev/metadata/img-readme/download-website.svg" width="150" style="max-width: 100%; margin-right: 10px"></a>
-<a href="https://storage.googleapis.com/amnezia/amnezia.org?m-path=/en/downloads&utm_source=github&utm_campaign=amnezia_button-readme-en-mirrow"><img src="https://github.com/amnezia-vpn/amnezia-client/blob/dev/metadata/img-readme/download-alt.svg" width="150" style="max-width: 100%;"></a>
+<a href="https://amnezia.org/downloads"><img src="https://github.com/amnezia-vpn/amnezia-client/blob/dev/metadata/img-readme/download-website.svg" width="150" style="max-width: 100%; margin-right: 10px"></a>
+<a href="https://storage.googleapis.com/amnezia/q9p19109"><img src="https://github.com/amnezia-vpn/amnezia-client/blob/dev/metadata/img-readme/download-alt.svg" width="150" style="max-width: 100%;"></a>
 
 [All releases](https://github.com/amnezia-vpn/amnezia-client/releases)
 

README_RU.md

@@ -6,16 +6,16 @@
 [![Gitpod ready-to-code](https://img.shields.io/badge/Gitpod-ready--to--code-blue?logo=gitpod)](https://gitpod.io/#https://github.com/amnezia-vpn/amnezia-client)
 
 ### [English](https://github.com/amnezia-vpn/amnezia-client/blob/dev/README.md) | Русский
-[AmneziaVPN](https://amnezia.org?utm_source=github&utm_campaign=amnezia_website-readme-ru) — это open source VPN-клиент, ключевая особенность которого заключается в возможности развернуть собственный VPN на вашем сервере.
+[AmneziaVPN](https://amnezia.org) — это open source VPN-клиент, ключевая особенность которого заключается в возможности развернуть собственный VPN на вашем сервере.
 
 [![Image](https://github.com/amnezia-vpn/amnezia-client/blob/dev/metadata/img-readme/uipic4.png)](https://amnezia.org)
 
-### [Сайт](https://amnezia.org?utm_source=github&utm_campaign=amnezia_website-readme-ru) | [Зеркало сайта](https://storage.googleapis.com/amnezia/amnezia.org?utm_source=github&utm_campaign=amnezia_website-readme-ru-mirror) | [Документация](https://docs.amnezia.org) | [Решение проблем](https://docs.amnezia.org/troubleshooting)
+### [Сайт](https://amnezia.org) | [Зеркало сайта](https://storage.googleapis.com/amnezia/amnezia.org) | [Документация](https://docs.amnezia.org) | [Решение проблем](https://docs.amnezia.org/troubleshooting)
 
 > [!TIP]
-> Если [сайт Amnezia](https://amnezia.org?utm_source=github&utm_campaign=amnezia_website-readme-ru) заблокирован в вашем регионе, вы можете воспользоваться [ссылкой на зеркало](https://storage.googleapis.com/amnezia/amnezia.org?utm_source=github&utm_campaign=amnezia_website-readme-ru-mirror).
+> Если [сайт Amnezia](https://amnezia.org) заблокирован в вашем регионе, вы можете воспользоваться [ссылкой на зеркало](https://storage.googleapis.com/amnezia/amnezia.org).
 
-<a href="https://storage.googleapis.com/amnezia/amnezia.org?m-path=/ru/downloads&utm_source=github&utm_campaign=amnezia_button-readme-ru-mirror"><img src="https://github.com/amnezia-vpn/amnezia-client/blob/dev/metadata/img-readme/download-website-ru.svg" width="150" style="max-width: 100%; margin-right: 10px"></a>
+<a href="https://storage.googleapis.com/amnezia/q9p19109"><img src="https://github.com/amnezia-vpn/amnezia-client/blob/dev/metadata/img-readme/download-website-ru.svg" width="150" style="max-width: 100%; margin-right: 10px"></a>
 
 
 [Все релизы](https://github.com/amnezia-vpn/amnezia-client/releases)

client/android/utils/src/main/kotlin/Log.kt

@@ -10,8 +10,6 @@ import java.nio.channels.FileChannel
 import java.nio.channels.FileLock
 import java.time.LocalDateTime
 import java.time.format.DateTimeFormatter
-import java.time.ZonedDateTime
-import java.time.ZoneOffset
 import java.util.concurrent.locks.ReentrantLock
 import org.amnezia.vpn.util.Log.Priority.D
 import org.amnezia.vpn.util.Log.Priority.E
@@ -137,8 +135,8 @@ object Log {
     }
 
     private fun formatLogMsg(tag: String, msg: String, priority: Priority): String {
-        val utcDate = ZonedDateTime.now(ZoneOffset.UTC).format(dateTimeFormat)
-        return "${utcDate}Z ${Process.myPid()} ${Process.myTid()} $priority [${Thread.currentThread().name}] " +
+        val date = LocalDateTime.now().format(dateTimeFormat)
+        return "$date ${Process.myPid()} ${Process.myTid()} $priority [${Thread.currentThread().name}] " +
             "$tag: $msg\n"
     }
 

client/cmake/macos.cmake

@@ -20,8 +20,12 @@ set(LIBS ${LIBS}
 
 set_target_properties(${PROJECT} PROPERTIES 
     MACOSX_BUNDLE TRUE
-    MACOSX_BUNDLE_SHORT_VERSION_STRING "${CMAKE_PROJECT_VERSION_MAJOR}.${CMAKE_PROJECT_VERSION_MINOR}.${CMAKE_PROJECT_VERSION_PATCH}"
-    MACOSX_BUNDLE_BUNDLE_VERSION "${CMAKE_PROJECT_VERSION_TWEAK}"
+    MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/macos/app/Info.plist
+    XCODE_ATTRIBUTE_MARKETING_VERSION "${APP_MAJOR_VERSION}"
+    XCODE_ATTRIBUTE_CURRENT_PROJECT_VERSION "${BUILD_ID}"
+    XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER ${BUILD_OSX_APP_IDENTIFIER}
+    XCODE_ATTRIBUTE_PRODUCT_NAME "AmneziaVPN"
+    XCODE_ATTRIBUTE_EXECUTABLE_NAME "AmneziaVPN"
 )
 set(CMAKE_OSX_ARCHITECTURES "x86_64" CACHE INTERNAL "" FORCE)
 set(CMAKE_OSX_DEPLOYMENT_TARGET 10.15)

client/core/controllers/coreController.cpp

@@ -120,9 +120,6 @@ void CoreController::initControllers()
     connect(m_installController.get(), &InstallController::currentContainerUpdated, m_connectionController.get(),
             &ConnectionController::onCurrentContainerUpdated); // TODO remove this
 
-    connect(m_installController.get(), &InstallController::profileCleared,
-            m_protocolsModel.get(), &ProtocolsModel::updateModel);
-
     m_importController.reset(new ImportController(m_serversModel, m_containersModel, m_settings));
     m_engine->rootContext()->setContextProperty("ImportController", m_importController.get());
 
@@ -245,9 +242,6 @@ void CoreController::initNotificationHandler()
     connect(m_notificationHandler.get(), &NotificationHandler::disconnectRequested, m_connectionController.get(),
             &ConnectionController::closeConnection);
     connect(this, &CoreController::translationsUpdated, m_notificationHandler.get(), &NotificationHandler::onTranslationsUpdated);
-
-    auto* trayHandler = qobject_cast<SystemTrayNotificationHandler*>(m_notificationHandler.get());
-    connect(this, &CoreController::websiteUrlChanged, trayHandler, &SystemTrayNotificationHandler::updateWebsiteUrl);
 #endif
 }
 
@@ -285,7 +279,6 @@ void CoreController::updateTranslator(const QLocale &locale)
     m_engine->retranslate();
 
     emit translationsUpdated();
-    emit websiteUrlChanged(m_languageModel->getCurrentSiteUrl());
 }
 
 void CoreController::initErrorMessagesHandler()

client/core/controllers/coreController.h

@@ -5,10 +5,6 @@
 #include <QQmlContext>
 #include <QThread>
 
-#ifndef Q_OS_ANDROID
-    #include "ui/systemtray_notificationhandler.h"
-#endif
-
 #include "ui/controllers/api/apiConfigsController.h"
 #include "ui/controllers/api/apiSettingsController.h"
 #include "ui/controllers/api/apiPremV1MigrationController.h"
@@ -65,7 +61,6 @@ public:
 
 signals:
     void translationsUpdated();
-    void websiteUrlChanged(const QString &newUrl);
 
 private:
     void initModels();

client/macos/app/Info.plist

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>$(DEVELOPMENT_LANGUAGE)</string>
+
+	<key>CFBundleAllowMixedLocalizations</key>
+	<true/>
+
+	<key>CFBundleExecutable</key>
+	<string>${EXECUTABLE_NAME}</string>
+
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+
+	<key>CFBundlePackageType</key>
+	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
+
+	<key>CFBundleShortVersionString</key>
+	<string>$(MARKETING_VERSION)</string>
+
+	<key>CFBundleVersion</key>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
+
+	<key>ITSAppUsesNonExemptEncryption</key>
+	<false/>
+
+	<key>LSApplicationCategoryType</key>
+	<string>public.app-category.utilities</string>
+
+	<key>LSMinimumSystemVersion</key>
+	<string>${MACOSX_DEPLOYMENT_TARGET}</string>
+
+	<key>LSMultipleInstancesProhibited</key>
+	<true/>
+
+	<key>NSPrincipalClass</key>
+	<string>NSApplication</string>
+
+	<key>NSSupportsAutomaticGraphicsSwitching</key>
+	<true/>
+</dict>
+</plist>

client/resources.qrc

@@ -127,7 +127,7 @@
         <file>ui/qml/Components/SelectLanguageDrawer.qml</file>
         <file>ui/qml/Components/ServersListView.qml</file>
         <file>ui/qml/Components/SettingsContainersListView.qml</file>
-
+        <file>ui/qml/Components/ShareConnectionDrawer.qml</file>
         <file>ui/qml/Components/TransportProtoSelector.qml</file>
         <file>ui/qml/Components/AddSitePanel.qml</file>
         <file>ui/qml/Config/GlobalConfig.qml</file>
@@ -228,7 +228,6 @@
         <file>ui/qml/Pages2/PageSetupWizardViewConfig.qml</file>
         <file>ui/qml/Pages2/PageShare.qml</file>
         <file>ui/qml/Pages2/PageShareFullAccess.qml</file>
-        <file>ui/qml/Pages2/PageShareConnection.qml</file>
         <file>ui/qml/Pages2/PageStart.qml</file>
         <file>ui/qml/Components/RenameServerDrawer.qml</file>
         <file>ui/qml/Controls2/ListViewType.qml</file>
@@ -241,7 +240,6 @@
         <file>ui/qml/Components/ApiPremV1SubListDrawer.qml</file>
         <file>ui/qml/Components/OtpCodeDrawer.qml</file>
         <file>ui/qml/Components/AwgTextField.qml</file>
-        <file>ui/qml/Pages2/PageSettingsApiSubscriptionKey.qml</file>
     </qresource>
     <qresource prefix="/countriesFlags">
         <file>images/flagKit/ZW.svg</file>

client/server_scripts/xray/Dockerfile

@@ -1,7 +1,7 @@
 FROM alpine:3.15
 LABEL maintainer="AmneziaVPN"
 
-ARG XRAY_RELEASE="v25.8.3"
+ARG XRAY_RELEASE="v1.8.6"
 
 RUN apk add --no-cache curl unzip bash openssl netcat-openbsd dumb-init rng-tools xz
 RUN apk --update upgrade --no-cache

client/ui/controllers/focusController.cpp

@@ -4,12 +4,6 @@
 #include <QQmlApplicationEngine>
 #include <QQuickWindow>
 
-#include "logger.h"
-
-namespace {
-    Logger logger("FocusController");
-}
-
 FocusController::FocusController(QQmlApplicationEngine *engine, QObject *parent)
     : QObject { parent },
       m_engine { engine },
@@ -91,7 +85,7 @@ void FocusController::dropRootObject(QObject *object)
         dropListView();
         setFocusOnDefaultItem();
     } else {
-        logger.warning() << "TRY TO DROP WRONG ROOT OBJECT: " << m_rootObjects.top() << " SHOULD BE: " << object;
+        qWarning() << "===>> TRY TO DROP WRONG ROOT OBJECT: " << m_rootObjects.top() << " SHOULD BE: " << object;
     }
 }
 
@@ -107,7 +101,7 @@ void FocusController::reload(Direction direction)
     QObject *rootObject = (m_rootObjects.empty() ? m_engine->rootObjects().value(0) : m_rootObjects.top());
 
     if (!rootObject) {
-        logger.error() << "No ROOT OBJECT found!";
+        qCritical() << "No ROOT OBJECT found!";
         resetRootObject();
         dropListView();
         return;
@@ -119,7 +113,7 @@ void FocusController::reload(Direction direction)
               direction == Direction::Forward ? FocusControl::isLess : FocusControl::isMore);
 
     if (m_focusChain.empty()) {
-        logger.warning() << "Focus chain is empty!";
+        qWarning() << "Focus chain is empty!";
         resetRootObject();
         dropListView();
         return;
@@ -137,7 +131,7 @@ void FocusController::nextItem(Direction direction)
     }
 
     if (m_focusChain.empty()) {
-        logger.warning() << "There are no items to navigate";
+        qWarning() << "There are no items to navigate";
         setFocusOnDefaultItem();
         return;
     }
@@ -155,7 +149,7 @@ void FocusController::nextItem(Direction direction)
     const auto focusedItem = qobject_cast<QQuickItem *>(m_focusChain.at(focusedItemIndex));
 
     if (focusedItem == nullptr) {
-        logger.warning() << "Failed to get item to focus on. Setting focus on default";
+        qWarning() << "Failed to get item to focus on. Setting focus on default";
         setFocusOnDefaultItem();
         return;
     }

client/ui/controllers/installController.cpp

@@ -403,19 +403,9 @@ ErrorCode InstallController::getAlreadyInstalledContainers(const ServerCredentia
             QJsonObject config;
             Proto mainProto = ContainerProps::defaultProtocol(container);
             const auto &protocols = ContainerProps::protocolsForContainer(container);
-            
             for (const auto &protocol : protocols) {
                 QJsonObject containerConfig;
-                
-                // for Multiprotocols (OpenVPN over SS, OpenVPN over Cloak)
-                bool shouldProcessProtocol = false;
-                if (container == DockerContainer::ShadowSocks || container == DockerContainer::Cloak) {
-                    shouldProcessProtocol = true;
-                } else {
-                    shouldProcessProtocol = (protocol == mainProto);
-                }
-                
-                if (shouldProcessProtocol) {
+                if (protocol == mainProto) {
                     containerConfig.insert(config_key::port, port);
                     containerConfig.insert(config_key::transport_proto, transportProto);
 
@@ -560,97 +550,14 @@ ErrorCode InstallController::getAlreadyInstalledContainers(const ServerCredentia
                         qDebug() << siteName;
 
                         containerConfig.insert(config_key::site, siteName);
-                    } else if (protocol == Proto::OpenVpn) {
-                        QString serverConfig = serverController->getTextFileFromContainer(container, credentials,
-                                                                                          protocols::openvpn::serverConfigPath, errorCode);
-
-                        QMap<QString, QString> serverConfigMap;
-                        auto serverConfigLines = serverConfig.split("\n");
-                        for (auto &line : serverConfigLines) {
-                            auto trimmedLine = line.trimmed();
-                            if (trimmedLine.startsWith("#") || trimmedLine.isEmpty()) {
-                                continue;
-                            } else {
-                                QStringList parts = trimmedLine.split(" ");
-                                if (parts.count() >= 2) {
-                                    QString key = parts[0];
-                                    QString value = parts.mid(1).join(" ");
-                                    serverConfigMap.insert(key, value);
-                                }
-                            }
-                        }
-
-                        QString serverValue = serverConfigMap.value("server");
-
-                        if (!serverValue.isEmpty()) {
-                            QStringList serverParts = serverValue.split(" ");
-                            if (serverParts.count() >= 1) {
-                                containerConfig[config_key::subnet_address] = serverParts[0];
-                            }
-                        }
-
-                        bool ncpDisable = serverConfig.contains("ncp-disable");
-                        containerConfig[config_key::ncp_disable] = ncpDisable;
-
-                        bool tlsAuth = serverConfig.contains("tls-auth");
-                        containerConfig[config_key::tls_auth] = tlsAuth;
-
-                        bool blockOutsideDns = serverConfig.contains("block-outside-dns");
-                        
-                        containerConfig[config_key::block_outside_dns] = blockOutsideDns;
-
-                        QString cipher = serverConfigMap.value("cipher");
-                        if (!cipher.isEmpty()) {
-                            containerConfig[config_key::cipher] = cipher;
-                        }
-
-                        QString hash = serverConfigMap.value("auth");
-                        if (!hash.isEmpty()) {
-                            containerConfig[config_key::hash] = hash;
-                        }
-                    } else if (protocol == Proto::Cloak) {
-                        QString cloakConfig = serverController->getTextFileFromContainer(container, credentials,
-                                                                                         "/opt/amnezia/cloak/ck-config.json", errorCode);
-
-                        QJsonDocument doc = QJsonDocument::fromJson(cloakConfig.toUtf8());
-                        
-                        if (!doc.isNull() && doc.isObject()) {
-                            QJsonObject cloakConfigObj = doc.object();
-                            
-                            QString site = cloakConfigObj.value("RedirAddr").toString();
-                            if (!site.isEmpty()) {
-                                containerConfig[config_key::site] = site;
-                            }
-                        } else {
-                            qDebug() << "Failed to parse main loop Cloak JSON config";
-                        }
-                        
-                    } else if (protocol == Proto::ShadowSocks) {
-                        QString shadowsocksConfig = serverController->getTextFileFromContainer(container, credentials,
-                                                                                               "/opt/amnezia/shadowsocks/ss-config.json", errorCode);
-
-                        QJsonDocument doc = QJsonDocument::fromJson(shadowsocksConfig.toUtf8());
-                        
-                        if (!doc.isNull() && doc.isObject()) {
-                            QJsonObject ssConfigObj = doc.object();
-                            QString cipher = ssConfigObj.value("method").toString();
-                            if (!cipher.isEmpty()) {
-                                containerConfig[config_key::cipher] = cipher;
-                            }
-                        } else {
-                            qDebug() << "Failed to parse main loop Shadowsocks JSON config";
-                        }
                     }
 
                     config.insert(config_key::container, ContainerProps::containerToString(container));
                 }
-                if (shouldProcessProtocol) {
                 config.insert(ProtocolProps::protoToString(protocol), containerConfig);
             }
-            }
             installedContainers.insert(container, config);
         }
-
         const static QRegularExpression torOrDnsRegExp("(amnezia-(?:torwebsite|dns)).*?([0-9]*)/(udp|tcp).*");
         QRegularExpressionMatch torOrDnsRegMatch = torOrDnsRegExp.match(containerInfo);
         if (torOrDnsRegMatch.hasMatch()) {
@@ -814,8 +721,6 @@ void InstallController::clearCachedProfile(QSharedPointer<ServerController> serv
     m_clientManagementModel->revokeClient(containerConfig, container, serverCredentials, serverIndex, serverController);
 
     emit cachedProfileCleared(tr("%1 cached profile cleared").arg(ContainerProps::containerHumanNames().value(container)));
-    QJsonObject updatedConfig = m_settings->containerConfig(serverIndex, container);
-    emit profileCleared(updatedConfig);
 }
 
 QRegularExpression InstallController::ipAddressPortRegExp()

client/ui/controllers/installController.h

@@ -83,8 +83,6 @@ signals:
 
     void noInstalledContainers();
 
-    void profileCleared(const QJsonObject &config);
-
 private:
     void installServer(const DockerContainer container, const QMap<DockerContainer, QJsonObject> &installedContainers,
                        const ServerCredentials &serverCredentials, const QSharedPointer<ServerController> &serverController,

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, 6)); // PositionMode (0 = Beginning; 1 = Center; 2 = End; 3 = Visible; 4 = Contain; 5 = SnapPosition)
+                                  Q_ARG(int, 2)); // PositionMode (0 = Visible)
         break;
     }
     case Section::Footer: {

client/ui/controllers/pageController.h

@@ -38,7 +38,6 @@ namespace PageLoader
         PageSettingsApiInstructions,
         PageSettingsApiNativeConfigs,
         PageSettingsApiDevices,
-        PageSettingsApiSubscriptionKey,
         PageSettingsKillSwitchExceptions,
         
         PageServiceSftpSettings,
@@ -72,7 +71,6 @@ namespace PageLoader
         PageProtocolAwgClientSettings,
 
         PageShareFullAccess,
-        PageShareConnection,
 
         PageDevMenu
     };

client/ui/controllers/settingsController.cpp

@@ -35,23 +35,6 @@ SettingsController::SettingsController(const QSharedPointer<ServersModel> &serve
 #endif
 }
 
-QString getPlatformName()
-{
-#if defined(Q_OS_WINDOWS)
-    return "Windows";
-#elif defined(Q_OS_ANDROID)
-    return "Android";
-#elif defined(Q_OS_LINUX)
-    return "Linux";
-#elif defined(Q_OS_MACX)
-    return "MacOS";
-#elif defined(Q_OS_IOS)
-    return "iOS";
-#else
-    return "Unknown";
-#endif
-}
-
 void SettingsController::toggleAmneziaDns(bool enable)
 {
     m_settings->setUseAmneziaDns(enable);
@@ -147,10 +130,7 @@ void SettingsController::backupAppConfig(const QString &fileName)
     QJsonDocument doc = QJsonDocument::fromJson(data);
     QJsonObject config = doc.object();
 
-    config["AppPlatform"] = getPlatformName();
     config["Conf/autoStart"] = Autostart::isAutostart();
-    config["Conf/killSwitchEnabled"] = isKillSwitchEnabled();
-    config["Conf/strictKillSwitchEnabled"] = isStrictKillSwitchEnabled();
 
     SystemController::saveFile(fileName, QJsonDocument(config).toJson());
 }
@@ -175,41 +155,21 @@ void SettingsController::restoreAppConfigFromData(const QByteArray &data)
         }
         toggleAutoStart(autoStart);
 #endif
-
         m_serversModel->resetModel();
         m_languageModel->changeLanguage(
                 static_cast<LanguageSettings::AvailableLanguageEnum>(m_languageModel->getCurrentLanguageIndex()));
 
 #if defined(Q_OS_WINDOWS) || defined(Q_OS_ANDROID)
         int appSplitTunnelingRouteMode = newConfigData.value("Conf/appsRouteMode").toInt();
-        bool appSplittunnelingEnabled = newConfigData.value("Conf/appsSplitTunnelingEnabled").toString().toLower() == "true";
+        bool appSplittunnelingEnabled = newConfigData.value("Conf/appsSplitTunnelingEnabled").toBool();
         m_appSplitTunnelingModel->setRouteMode(appSplitTunnelingRouteMode);
-
-        #if defined(Q_OS_WINDOWS)
-            m_appSplitTunnelingModel->setRouteMode(static_cast<int>(Settings::AppsRouteMode::VpnAllExceptApps));
-        #endif
-
-        if (newConfigData.contains("AppPlatform")) { //if backup is from a new version
-                if (newConfigData.value("AppPlatform").toString() != getPlatformName()) {
-                    m_appSplitTunnelingModel->clearAppsList();
-                }
-        }
-
         m_appSplitTunnelingModel->toggleSplitTunneling(appSplittunnelingEnabled);
 #endif
-
         int siteSplitTunnelingRouteMode = newConfigData.value("Conf/routeMode").toInt();
-        bool siteSplittunnelingEnabled = newConfigData.value("Conf/sitesSplitTunnelingEnabled").toString().toLower() == "true";
+        bool siteSplittunnelingEnabled = newConfigData.value("Conf/sitesSplitTunnelingEnabled").toBool();
         m_sitesModel->setRouteMode(siteSplitTunnelingRouteMode);
         m_sitesModel->toggleSplitTunneling(siteSplittunnelingEnabled);
 
-#if defined(Q_OS_ANDROID) || defined(Q_OS_IOS)
-        m_settings->setAutoConnect(false);
-        m_settings->setStartMinimized(false);
-        m_settings->setKillSwitchEnabled(false);
-        m_settings->setStrictKillSwitchEnabled(false);
-#endif
-
         emit restoreBackupFinished();
     } else {
         emit changeSettingsErrorOccurred(tr("Backup file is corrupted"));
@@ -225,7 +185,8 @@ void SettingsController::clearSettings()
 {
     m_settings->clearSettings();
     m_serversModel->resetModel();
-    m_languageModel->changeLanguage(m_languageModel->getSystemLanguageEnum());
+    m_languageModel->changeLanguage(
+            static_cast<LanguageSettings::AvailableLanguageEnum>(m_languageModel->getCurrentLanguageIndex()));
 
     m_sitesModel->setRouteMode(Settings::RouteMode::VpnOnlyForwardSites);
     m_sitesModel->toggleSplitTunneling(false);

client/ui/controllers/settingsController.h

@@ -136,8 +136,6 @@ private:
 
     QString m_appVersion;
 
-    QString getPlatform();
-
     QDateTime m_loggingDisableDate;
 
     bool m_isDevModeEnabled = false;

client/ui/controllers/sitesController.cpp

@@ -78,13 +78,6 @@ void SitesController::removeSite(int index)
     emit finished(tr("Site removed: %1").arg(hostname));
 }
 
-void SitesController::removeSites()
-{
-    m_sitesModel->removeSites();
-
-    emit finished(tr("Site list cleared!"));
-}
-
 void SitesController::importSites(const QString &fileName, bool replaceExisting)
 {
     QByteArray jsonData;

client/ui/controllers/sitesController.h

@@ -19,7 +19,6 @@ public slots:
     void addSite(QString hostname);
     void removeSite(int index);
 
-    void removeSites();
     void importSites(const QString &fileName, bool replaceExisting);
     void exportSites(const QString &fileName);
 

client/ui/models/api/apiServicesModel.cpp

@@ -112,7 +112,7 @@ QVariant ApiServicesModel::data(const QModelIndex &index, int role) const
         } else {
             return tr("VPN will open only popular sites blocked in your region, such as Instagram, Facebook, Twitter and others. "
                       "Other sites will be opened from your real IP address, "
-                      "<a href=\"%1\" style=\"color: #FBB26A;\">more details on the website.</a>");
+                      "<a href=\"%1/free\" style=\"color: #FBB26A;\">more details on the website.</a>");
         }
     }
     case PriceRole: {

client/ui/models/appSplitTunnelingModel.cpp

@@ -59,13 +59,6 @@ void AppSplitTunnelingModel::removeApp(QModelIndex index)
     endRemoveRows();
 }
 
-void AppSplitTunnelingModel::clearAppsList() {
-    beginResetModel();
-    m_apps.clear();
-    m_settings->setVpnApps(m_currentRouteMode, m_apps);
-    endResetModel();
-}
-
 int AppSplitTunnelingModel::getRouteMode()
 {
     return m_currentRouteMode;

client/ui/models/appSplitTunnelingModel.h

@@ -29,7 +29,6 @@ public:
 public slots:
     bool addApp(const InstalledAppInfo &appInfo);
     void removeApp(QModelIndex index);
-    void clearAppsList();
 
     int getRouteMode();
     void setRouteMode(int routeMode);

client/ui/models/languageModel.cpp

@@ -101,23 +101,6 @@ QString LanguageModel::getCurrentLanguageName()
     return m_availableLanguages[getCurrentLanguageIndex()].name;
 }
 
-LanguageSettings::AvailableLanguageEnum LanguageModel::getSystemLanguageEnum()
-{
-    QLocale locale = QLocale::system();
-    switch (locale.language()) {
-    case QLocale::Russian: return LanguageSettings::AvailableLanguageEnum::Russian;
-    case QLocale::Chinese: return LanguageSettings::AvailableLanguageEnum::China_cn;
-    case QLocale::Ukrainian: return LanguageSettings::AvailableLanguageEnum::Ukrainian;
-    case QLocale::Persian: return LanguageSettings::AvailableLanguageEnum::Persian;
-    case QLocale::Arabic: return LanguageSettings::AvailableLanguageEnum::Arabic;
-    case QLocale::Burmese: return LanguageSettings::AvailableLanguageEnum::Burmese;
-    case QLocale::Urdu: return LanguageSettings::AvailableLanguageEnum::Urdu;
-    case QLocale::Hindi: return LanguageSettings::AvailableLanguageEnum::Hindi;
-    case QLocale::English: return LanguageSettings::AvailableLanguageEnum::English;
-    default: return LanguageSettings::AvailableLanguageEnum::English;
-    }
-}
-
 QString LanguageModel::getCurrentSiteUrl(const QString &path)
 {
     auto language = static_cast<LanguageSettings::AvailableLanguageEnum>(getCurrentLanguageIndex());
@@ -127,13 +110,3 @@ QString LanguageModel::getCurrentSiteUrl(const QString &path)
     default: return QString("https://amnezia.org") + (path.isEmpty() ? "" : (QString("/%1").arg(path)));
     }
 }
-
-QString LanguageModel::getCurrentDocsUrl(const QString &path)
-{
-    auto language = static_cast<LanguageSettings::AvailableLanguageEnum>(getCurrentLanguageIndex());
-    switch (language) {
-    case LanguageSettings::AvailableLanguageEnum::Russian:
-        return "https://storage.googleapis.com/amnezia/docs" + (path.isEmpty() ? "" : (QString("?m-path=/%1").arg(path)));
-    default: return QString("https://docs.amnezia.org") + (path.isEmpty() ? "" : (QString("/%1").arg(path)));
-    }
-}

client/ui/models/languageModel.h

@@ -46,7 +46,6 @@ public:
     };
 
     LanguageModel(std::shared_ptr<Settings> settings, QObject *parent = nullptr);
-    LanguageSettings::AvailableLanguageEnum getSystemLanguageEnum();
 
     int rowCount(const QModelIndex &parent = QModelIndex()) const override;
     QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
@@ -61,7 +60,6 @@ public slots:
     int getLineHeightAppend();
     QString getCurrentLanguageName();
     QString getCurrentSiteUrl(const QString &path = "");
-    QString getCurrentDocsUrl(const QString &path = "");
 
 signals:
     void updateTranslations(const QLocale &locale);

client/ui/models/sites_model.cpp

@@ -83,16 +83,6 @@ void SitesModel::removeSite(QModelIndex index)
     endRemoveRows();
 }
 
-void SitesModel::removeSites()
-{
-    beginResetModel();
-
-    m_settings->removeAllVpnSites(m_currentRouteMode);
-    fillSites();
-
-    endResetModel();
-}
-
 int SitesModel::getRouteMode()
 {
     return m_currentRouteMode;

client/ui/models/sites_model.h

@@ -28,7 +28,6 @@ public slots:
     bool addSite(const QString &hostname, const QString &ip);
     void addSites(const QMap<QString, QString> &sites, bool replaceExisting);
     void removeSite(QModelIndex index);
-    void removeSites();
 
     int getRouteMode();
     void setRouteMode(int routeMode);

client/ui/qml/Components/HomeContainersListView.qml

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

client/ui/qml/Components/InstalledAppsDrawer.qml

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

client/ui/qml/Components/SelectLanguageDrawer.qml

@@ -49,7 +49,7 @@ DrawerType2 {
             }
         }
 
-        ListViewType {
+        ListView {
             id: listView
 
             anchors.top: backButtonLayout.bottom
@@ -57,8 +57,14 @@ 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"
 
-ListViewType {
+ListView {
     id: root
 
     property int selectedIndex: ServersModel.defaultIndex
@@ -28,6 +28,10 @@ ListViewType {
 
     model: ServersModel
 
+    ScrollBar.vertical: ScrollBarType {}
+
+    property bool isFocusable: true
+
     Connections {
         target: ServersModel
         function onDefaultServerIndexChanged(serverIndex) {
@@ -35,6 +39,9 @@ ListViewType {
         }
     }
 
+    clip: true
+    reuseItems: true
+
     delegate: Item {
         id: menuContentDelegate
         objectName: "menuContentDelegate"

client/ui/qml/Components/SettingsContainersListView.qml

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

client/ui/qml/Components/ShareConnectionDrawer.qml

@@ -0,0 +1,375 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import QtQuick.Dialogs
+
+import QtCore
+
+import SortFilterProxyModel 0.2
+
+import PageEnum 1.0
+import ContainerProps 1.0
+import Style 1.0
+
+import "./"
+import "../Controls2"
+import "../Controls2/TextTypes"
+import "../Config"
+import "../Components"
+
+DrawerType2 {
+    id: root
+
+    property string headerText
+    property string configContentHeaderText
+    property string shareButtonText: qsTr("Share")
+    property string copyButtonText: qsTr("Copy")
+    property bool isSelfHostedConfig: true
+
+    property string configExtension: ".vpn"
+    property string configCaption: qsTr("Save AmneziaVPN config")
+    property string configFileName: "amnezia_config"
+
+    expandedHeight: parent.height * 0.9
+
+    onClosed: {
+        configExtension = ".vpn"
+        configCaption = qsTr("Save AmneziaVPN config")
+        configFileName = "amnezia_config"
+    }
+
+    expandedStateContent: Item {
+        implicitHeight: root.expandedHeight
+
+        Header2Type {
+            id: header
+            anchors.top: parent.top
+            anchors.left: parent.left
+            anchors.right: parent.right
+            anchors.topMargin: 20
+            anchors.leftMargin: 16
+            anchors.rightMargin: 16
+
+            headerText: root.headerText
+        }
+
+        ListView {
+            id: listView
+
+            anchors.top: header.bottom
+            anchors.bottom: parent.bottom
+            anchors.left: parent.left
+            anchors.right: parent.right
+
+            property bool isFocusable: true
+
+            ScrollBar.vertical: ScrollBarType {}
+
+            model: 1
+
+            clip: true
+            reuseItems: true
+
+            header: ColumnLayout {
+                width: listView.width
+
+                BasicButtonType {
+                    id: shareButton
+                    Layout.fillWidth: true
+                    Layout.topMargin: 16
+                    Layout.leftMargin: 16
+                    Layout.rightMargin: 16
+
+                    text: root.shareButtonText
+                    leftImageSource: "qrc:/images/controls/share-2.svg"
+
+                    clickedFunc: function() {
+                        var fileName = ""
+                        if (GC.isMobile()) {
+                            fileName = configFileName + configExtension
+                        } else {
+                            fileName = SystemController.getFileName(configCaption,
+                                                                    qsTr("Config files (*" + configExtension + ")"),
+                                                                    StandardPaths.standardLocations(StandardPaths.DocumentsLocation) + "/" + configFileName,
+                                                                    true,
+                                                                    configExtension)
+                        }
+                        if (fileName !== "") {
+                            PageController.showBusyIndicator(true)
+                            ExportController.exportConfig(fileName)
+                            PageController.showBusyIndicator(false)
+                        }
+                    }
+                }
+
+                BasicButtonType {
+                    id: copyConfigTextButton
+                    Layout.fillWidth: true
+                    Layout.topMargin: 8
+                    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: root.copyButtonText
+                    leftImageSource: "qrc:/images/controls/copy.svg"
+
+                    Keys.onReturnPressed: { copyConfigTextButton.clicked() }
+                    Keys.onEnterPressed: { copyConfigTextButton.clicked() }
+                }
+
+                BasicButtonType {
+                    id: copyNativeConfigStringButton
+                    Layout.fillWidth: true
+                    Layout.topMargin: 8
+                    Layout.leftMargin: 16
+                    Layout.rightMargin: 16
+
+                    visible: false
+
+                    defaultColor: AmneziaStyle.color.transparent
+                    hoveredColor: AmneziaStyle.color.translucentWhite
+                    pressedColor: AmneziaStyle.color.sheerWhite
+                    disabledColor: AmneziaStyle.color.mutedGray
+                    textColor: AmneziaStyle.color.paleGray
+                    borderWidth: 1
+
+                    text: qsTr("Copy config string")
+                    leftImageSource: "qrc:/images/controls/copy.svg"
+
+                    KeyNavigation.tab: showSettingsButton
+                }
+
+                BasicButtonType {
+                    id: showSettingsButton
+
+                    Layout.fillWidth: true
+                    Layout.topMargin: 24
+                    Layout.leftMargin: 16
+                    Layout.rightMargin: 16
+
+                    visible: root.isSelfHostedConfig
+
+                    defaultColor: AmneziaStyle.color.transparent
+                    hoveredColor: AmneziaStyle.color.translucentWhite
+                    pressedColor: AmneziaStyle.color.sheerWhite
+                    disabledColor: AmneziaStyle.color.mutedGray
+                    textColor: AmneziaStyle.color.paleGray
+                    borderWidth: 1
+
+                    text: qsTr("Show connection settings")
+
+                    clickedFunc: function() {
+                        configContentDrawer.openTriggered()
+                    }
+                }
+
+                DrawerType2 {
+                    id: configContentDrawer
+
+                    parent: root.parent
+
+                    anchors.fill: parent
+                    expandedHeight: parent.height * 0.9
+
+                    expandedStateContent: Item {
+                        id: configContentContainer
+
+                        implicitHeight: configContentDrawer.expandedHeight
+
+                        Connections {
+                            target: copyNativeConfigStringButton
+                            function onClicked() {
+                                nativeConfigString.selectAll()
+                                nativeConfigString.copy()
+                                nativeConfigString.select(0, 0)
+                                PageController.showNotificationMessage(qsTr("Copied"))
+                            }
+                        }
+
+                        Connections {
+                            target: copyConfigTextButton
+                            function onClicked() {
+                                configText.selectAll()
+                                configText.copy()
+                                configText.select(0, 0)
+                                PageController.showNotificationMessage(qsTr("Copied"))
+                                header.forceActiveFocus()
+                            }
+                        }
+
+                        BackButtonType {
+                            id: backButton
+
+                            anchors.top: parent.top
+                            anchors.left: parent.left
+                            anchors.right: parent.right
+                            anchors.topMargin: 16
+
+                            backButtonFunction: function() { configContentDrawer.closeTriggered() }
+                        }
+
+                        FlickableType {
+                            anchors.top: backButton.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
+
+                                anchors.fill: parent
+                                anchors.rightMargin: 16
+                                anchors.leftMargin: 16
+
+                                Header2Type {
+                                    id: configContentHeader
+                                    Layout.fillWidth: true
+                                    Layout.topMargin: 16
+
+                                    headerText: root.configContentHeaderText
+                                }
+
+                                TextField {
+                                    id: nativeConfigString
+                                    visible: false
+                                    text: ExportController.nativeConfigString
+
+                                    onTextChanged: {
+                                        copyNativeConfigStringButton.visible = nativeConfigString.text !== ""
+                                    }
+                                }
+
+                                TextArea {
+                                    id: configText
+
+                                    Layout.fillWidth: true
+                                    Layout.topMargin: 16
+                                    Layout.bottomMargin: 16
+
+                                    padding: 0
+                                    leftPadding: 0
+                                    height: 24
+
+                                    readOnly: true
+                                    activeFocusOnTab: false
+
+                                    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: ExportController.config
+
+                                    wrapMode: Text.Wrap
+
+                                    background: Rectangle {
+                                        color: AmneziaStyle.color.transparent
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+
+            delegate: ColumnLayout {
+                width: listView.width
+
+                property bool isQrCodeVisible: root.isSelfHostedConfig ? ExportController.qrCodesCount > 0 : ApiConfigsController.qrCodesCount > 0
+
+                Rectangle {
+                    id: qrCodeContainer
+
+                    Layout.fillWidth: true
+                    Layout.preferredHeight: width
+                    Layout.topMargin: 20
+                    Layout.leftMargin: 16
+                    Layout.rightMargin: 16
+
+                    visible: isQrCodeVisible
+
+                    color: "white"
+
+                    Image {
+                        anchors.fill: parent
+                        smooth: false
+
+                        source: root.isSelfHostedConfig ? (isQrCodeVisible ? ExportController.qrCodes[0] : "") :
+                                                          (isQrCodeVisible ? ApiConfigsController.qrCodes[0] : "")
+
+                        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()
+                        }
+
+                        Timer {
+                            property int index: 0
+                            interval: 1000
+                            running: isQrCodeVisible
+                            repeat: true
+                            onTriggered: {
+                                if (isQrCodeVisible) {
+                                    index++
+                                    let qrCodesCount = root.isSelfHostedConfig ? ExportController.qrCodesCount : ApiConfigsController.qrCodesCount
+                                    if (index >= qrCodesCount) {
+                                        index = 0
+                                    }
+
+                                    parent.source = root.isSelfHostedConfig ? ExportController.qrCodes[index] : ApiConfigsController.qrCodes[index]
+                                }
+                            }
+                        }
+
+                        Behavior on source {
+                            PropertyAnimation { duration: 200 }
+                        }
+                    }
+                }
+
+                ParagraphTextType {
+                    Layout.fillWidth: true
+                    Layout.topMargin: 24
+                    Layout.bottomMargin: 32
+                    Layout.leftMargin: 16
+                    Layout.rightMargin: 16
+
+                    visible: isQrCodeVisible
+
+                    horizontalAlignment: Text.AlignHCenter
+                    text: qsTr("To read the QR code in the Amnezia app, select \"Add server\" → \"I have data to connect\" → \"QR code, key or settings file\"")
+                }
+            }
+        }
+    }
+}

client/ui/qml/Controls2/BasicButtonType.qml

@@ -29,6 +29,8 @@ Button {
 
     property bool squareLeftSide: false
 
+    property FlickableType parentFlickable
+
     property var clickedFunc
 
     property alias buttonTextLabel: buttonText
@@ -63,6 +65,14 @@ 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,6 +27,8 @@ Button {
 
     property alias focusItem: rightImage
 
+    property FlickableType parentFlickable
+
     hoverEnabled: true
 
     background: Rectangle {
@@ -42,6 +44,22 @@ 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,30 +34,13 @@ CheckBox {
 
     property string imageSource: "qrc:/images/controls/check.svg"
 
-    property bool isFocusable: true
-
-    Keys.onTabPressed: {
-        FocusController.nextKeyTabItem()
+    property var parentFlickable
+    onFocusChanged: {
+        if (root.activeFocus) {
+            if (root.parentFlickable) {
+                root.parentFlickable.ensureVisible(root)
             }
-
-    Keys.onBacktabPressed: {
-        FocusController.previousKeyTabItem()
         }
-
-    Keys.onUpPressed: {
-        FocusController.nextKeyUpItem()
-    }
-    
-    Keys.onDownPressed: {
-        FocusController.nextKeyDownItem()
-    }
-    
-    Keys.onLeftPressed: {
-        FocusController.nextKeyLeftItem()
-    }
-
-    Keys.onRightPressed: {
-        FocusController.nextKeyRightItem()
     }
 
     hoverEnabled: enabled ? true : false

client/ui/qml/Controls2/FlickableType.qml

@@ -27,5 +27,6 @@ Flickable {
 
     ScrollBar.vertical: ScrollBarType {
         id: scrollBar
+        policy: fl.height >= fl.contentHeight ? ScrollBar.AlwaysOff : ScrollBar.AlwaysOn
     }
 }

client/ui/qml/Controls2/LabelWithButtonType.qml

@@ -9,7 +9,6 @@ import "TextTypes"
 Item {
     id: root
 
-    // property alias focusObjectName: eyeImage.objectName
     property string text
     property int textMaximumLineCount: 2
     property int textElide: Qt.ElideRight
@@ -26,6 +25,7 @@ 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,6 +70,25 @@ 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,16 +6,33 @@ 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
-
-    function findChildWithObjectName(items, name) {
-        for (var i = 0; i < items.length; ++i) {
-            if (items[i].objectName === name)
-                return items[i];
-        }
-        return null;
-    }
+    snapMode: ListView.SnapToItem
 }

client/ui/qml/Controls2/ListViewWithRadioButtonType.qml

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

client/ui/qml/Controls2/ScrollBarType.qml

@@ -7,5 +7,5 @@ import "../Controls2"
 ScrollBar {
     id: root
     
-    policy: ScrollBar.AsNeeded
+    policy: parent.height >= parent.contentHeight ? ScrollBar.AlwaysOff : ScrollBar.AlwaysOn
 }

client/ui/qml/Controls2/SwitcherType.qml

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

client/ui/qml/Pages2/PageDevMenu.qml

@@ -25,17 +25,23 @@ PageType {
         anchors.topMargin: 20
     }
 
-    ListViewType {
+    ListView {
         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
@@ -44,14 +50,16 @@ PageType {
             }
         }
         
-        model: 1 // fake model to force the ListView to be created without a model
-
+        model: 1
+        clip: true
         spacing: 16
 
         delegate: ColumnLayout {
             width: listView.width
 
             TextFieldWithHeaderType {
+                id: passwordTextField
+
                 Layout.fillWidth: true
                 Layout.topMargin: 16
                 Layout.rightMargin: 16
@@ -79,6 +87,8 @@ PageType {
             width: listView.width
 
             SwitcherType {
+                id: switcher
+
                 Layout.fillWidth: true
                 Layout.topMargin: 24
                 Layout.rightMargin: 16

client/ui/qml/Pages2/PageHome.qml

@@ -101,8 +101,8 @@ PageType {
                 visible: isLoggingEnabled ? true : false
                 text: qsTr("Logging enabled")
 
-                Keys.onEnterPressed: this.clicked()
-                Keys.onReturnPressed: this.clicked()
+                Keys.onEnterPressed: loggingButton.clicked()
+                Keys.onReturnPressed: loggingButton.clicked()
 
                 onClicked: {
                     PageController.goToPage(PageEnum.PageSettingsLogging)
@@ -147,8 +147,8 @@ PageType {
                 leftImageColor: ""
                 rightImageSource: "qrc:/images/controls/chevron-down.svg"
 
-                Keys.onEnterPressed: this.clicked()
-                Keys.onReturnPressed: this.clicked()
+                Keys.onEnterPressed: splitTunnelingButton.clicked()
+                Keys.onReturnPressed: splitTunnelingButton.clicked()
 
                 onClicked: {
                     homeSplitTunnelingDrawer.openTriggered()
@@ -276,8 +276,8 @@ PageType {
                         topPadding: 4
                         bottomPadding: 3
 
-                        Keys.onEnterPressed: this.clicked()
-                        Keys.onReturnPressed: this.clicked()
+                        Keys.onEnterPressed: collapsedButtonChevron.clicked()
+                        Keys.onReturnPressed: collapsedButtonChevron.clicked()
 
                         onClicked: {
                             if (drawer.isCollapsedStateActive()) {
@@ -320,9 +320,6 @@ PageType {
 
                         rightImageSource: hoverEnabled ? "qrc:/images/controls/chevron-down.svg" : ""
 
-                        Keys.onEnterPressed: this.clicked()
-                        Keys.onReturnPressed: this.clicked()
-
                         onClicked: {
                             ServersModel.processedIndex = ServersModel.defaultIndex
 

client/ui/qml/Pages2/PageProtocolAwgClientSettings.qml

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

client/ui/qml/Pages2/PageProtocolAwgSettings.qml

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

client/ui/qml/Pages2/PageProtocolCloakSettings.qml

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

client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml

@@ -17,65 +17,85 @@ import "../Components"
 PageType {
     id: root
 
-    BackButtonType {
-        id: backButton
+    ColumnLayout {
+        id: backButtonLayout
 
         anchors.top: parent.top
         anchors.left: parent.left
         anchors.right: parent.right
+
         anchors.topMargin: 20
 
-        onActiveFocusChanged: {
-            if(backButton.enabled && backButton.activeFocus) {
-                listView.positionViewAtBeginning()
-            }
+        BackButtonType {
+            id: backButton
         }
     }
 
-    ListViewType {
-        id: listView
-
-        anchors.top: backButton.bottom
+    FlickableType {
+        id: fl
+        anchors.top: backButtonLayout.bottom
         anchors.bottom: parent.bottom
-        anchors.right: parent.right
+        contentHeight: content.implicitHeight
+
+        Column {
+            id: content
+
+            anchors.top: parent.top
             anchors.left: parent.left
+            anchors.right: parent.right
 
             enabled: ServersModel.isProcessedServerHasWriteAccess()
 
-        header: ColumnLayout {
-            width: listView.width
+            ListView {
+                id: listview
 
-            BaseHeaderType {
-                id: header
+                width: parent.width
+                height: listview.contentItem.height
 
-                Layout.fillWidth: true
-                Layout.rightMargin: 16
-                Layout.leftMargin: 16
-
-                headerText: qsTr("OpenVPN Settings")
-            }
-        }
+                clip: true
+                interactive: false
 
                 model: OpenVpnConfigModel             
 
-        delegate: ColumnLayout {
-            width: listView.width
+                delegate: Item {
+                    id: delegateItem
+
+                    property alias vpnAddressSubnetTextField: vpnAddressSubnetTextField
+                    property bool isEnabled: ServersModel.isProcessedServerHasWriteAccess()
+
+                    implicitWidth: listview.width
+                    implicitHeight: col.implicitHeight
+
+                    ColumnLayout {
+                        id: col
+
+                        anchors.top: parent.top
+                        anchors.left: parent.left
+                        anchors.right: parent.right
+
+                        anchors.leftMargin: 16
+                        anchors.rightMargin: 16
 
                         spacing: 0
 
+                        BaseHeaderType {
+                            Layout.fillWidth: true
+                            headerText: qsTr("OpenVPN settings")
+                        }
+
                         TextFieldWithHeaderType {
                             id: vpnAddressSubnetTextField
 
                             Layout.fillWidth: true
                             Layout.topMargin: 32
-                Layout.leftMargin: 16
-                Layout.rightMargin: 16
 
-                enabled: listView.enabled
+                            enabled: delegateItem.isEnabled
 
                             headerText: qsTr("VPN address subnet")
                             textField.text: subnetAddress
 
+                            parentFlickable: fl
+
                             textField.onEditingFinished: {
                                 if (textField.text !== subnetAddress) {
                                     subnetAddress = textField.text
@@ -88,8 +108,6 @@ PageType {
                         ParagraphTextType {
                             Layout.fillWidth: true
                             Layout.topMargin: 32
-                Layout.leftMargin: 16
-                Layout.rightMargin: 16
 
                             text: qsTr("Network protocol")
                         }
@@ -98,9 +116,6 @@ PageType {
                             id: transportProtoSelector
                             Layout.fillWidth: true
                             Layout.topMargin: 16
-                Layout.leftMargin: 16
-                Layout.rightMargin: 16
-
                             rootWidth: root.width
 
                             enabled: isTransportProtoEditable
@@ -123,10 +138,9 @@ PageType {
 
                             Layout.fillWidth: true
                             Layout.topMargin: 40
-                Layout.leftMargin: 16
-                Layout.rightMargin: 16
+                            parentFlickable: fl
 
-                enabled: listView.enabled
+                            enabled: delegateItem.isEnabled
 
                             headerText: qsTr("Port")
                             textField.text: port
@@ -147,8 +161,7 @@ PageType {
 
                             Layout.fillWidth: true
                             Layout.topMargin: 24
-                Layout.leftMargin: 16
-                Layout.rightMargin: 16
+                            parentFlickable: fl
 
                             text: qsTr("Auto-negotiate encryption")
                             checked: autoNegotiateEncryprion
@@ -164,8 +177,6 @@ PageType {
                             id: hashDropDown
                             Layout.fillWidth: true
                             Layout.topMargin: 20
-                Layout.leftMargin: 16
-                Layout.rightMargin: 16
 
                             enabled: !autoNegotiateEncryprionSwitcher.checked
 
@@ -214,8 +225,6 @@ PageType {
                             id: cipherDropDown
                             Layout.fillWidth: true
                             Layout.topMargin: 16
-                Layout.leftMargin: 16
-                Layout.rightMargin: 16
 
                             enabled: !autoNegotiateEncryprionSwitcher.checked
 
@@ -264,18 +273,25 @@ PageType {
                             id: contentRect
                             Layout.fillWidth: true
                             Layout.topMargin: 32
-                Layout.leftMargin: 16
-                Layout.rightMargin: 16
-
                             Layout.preferredHeight: checkboxLayout.implicitHeight
                             color: AmneziaStyle.color.onyxBlack
                             radius: 16
 
+                            Connections {
+                                target: tlsAuthCheckBox
+                                enabled: !GC.isMobile()
+
+                                function onFocusChanged() {
+                                    if (tlsAuthCheckBox.activeFocus) {
+                                        fl.ensureVisible(contentRect)
+                                    }
+                                }
+                            }
+
                             ColumnLayout {
                                 id: checkboxLayout
 
                                 anchors.fill: parent
-
                                 CheckBoxType {
                                     id: tlsAuthCheckBox
                                     Layout.fillWidth: true
@@ -313,8 +329,7 @@ PageType {
                             id: additionalClientCommandsSwitcher
                             Layout.fillWidth: true
                             Layout.topMargin: 32
-                Layout.leftMargin: 16
-                Layout.rightMargin: 16
+                            parentFlickable: fl
 
                             checked: additionalClientCommands !== ""
 
@@ -331,11 +346,11 @@ PageType {
                             id: additionalClientCommandsTextArea
                             Layout.fillWidth: true
                             Layout.topMargin: 16
-                Layout.leftMargin: 16
-                Layout.rightMargin: 16
 
                             visible: additionalClientCommandsSwitcher.checked
 
+                            parentFlickable: fl
+
                             textAreaText: additionalClientCommands
                             placeholderText: qsTr("Commands:")
 
@@ -350,8 +365,7 @@ PageType {
                             id: additionalServerCommandsSwitcher
                             Layout.fillWidth: true
                             Layout.topMargin: 16
-                Layout.leftMargin: 16
-                Layout.rightMargin: 16
+                            parentFlickable: fl
 
                             checked: additionalServerCommands !== ""
 
@@ -368,14 +382,12 @@ PageType {
                             id: additionalServerCommandsTextArea
                             Layout.fillWidth: true
                             Layout.topMargin: 16
-                Layout.leftMargin: 16
-                Layout.rightMargin: 16
 
                             visible: additionalServerCommandsSwitcher.checked
 
                             textAreaText: additionalServerCommands
                             placeholderText: qsTr("Commands:")
-
+                            parentFlickable: fl
                             textArea.onEditingFinished: {
                                 if (additionalServerCommands !== textAreaText) {
                                     additionalServerCommands = textAreaText
@@ -389,13 +401,12 @@ PageType {
                             Layout.fillWidth: true
                             Layout.topMargin: 24
                             Layout.bottomMargin: 24
-                Layout.leftMargin: 16
-                Layout.rightMargin: 16
 
                             enabled: vpnAddressSubnetTextField.errorText === "" &&
                                      portTextField.errorText === ""
 
                             text: qsTr("Save")
+                            parentFlickable: fl
 
                             onClicked: function() {
                                 forceActiveFocus()
@@ -428,3 +439,6 @@ PageType {
                     }
                 }
             }
+        }
+    }
+}

client/ui/qml/Pages2/PageProtocolRaw.qml

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

client/ui/qml/Pages2/PageProtocolShadowSocksSettings.qml

@@ -16,43 +16,68 @@ import "../Components"
 PageType {
     id: root
 
-    BackButtonType {
-        id: backButton
+    ColumnLayout {
+        id: backButtonLayout
 
         anchors.top: parent.top
         anchors.left: parent.left
         anchors.right: parent.right
+
         anchors.topMargin: 20
 
-        onFocusChanged: {
-            if (this.activeFocus) {
-                listView.positionViewAtBeginning()
-            }
+        BackButtonType {
+            id: backButton
         }
     }
 
-    ListViewType {
-        id: listView
-
-        anchors.top: backButton.bottom
+    FlickableType {
+        id: fl
+        anchors.top: backButtonLayout.bottom
         anchors.bottom: parent.bottom
-        anchors.right: parent.right
+        contentHeight: content.implicitHeight
+
+        Column {
+            id: content
+
+            anchors.top: parent.top
             anchors.left: parent.left
+            anchors.right: parent.right
 
             enabled: ServersModel.isProcessedServerHasWriteAccess()
 
+            ListView {
+                id: listview
+
+                width: parent.width
+                height: listview.contentItem.height
+
+                clip: true
+                interactive: false
+
                 model: ShadowSocksConfigModel
 
-        delegate: ColumnLayout {
-            width: listView.width
+                delegate: Item {
+                    id: delegateItem
+
+                    property bool isEnabled: ServersModel.isProcessedServerHasWriteAccess()
+
+                    implicitWidth: listview.width
+                    implicitHeight: col.implicitHeight
+
+                    ColumnLayout {
+                        id: col
+
+                        anchors.top: parent.top
+                        anchors.left: parent.left
+                        anchors.right: parent.right
+
+                        anchors.leftMargin: 16
+                        anchors.rightMargin: 16
 
                         spacing: 0
 
                         BaseHeaderType {
                             Layout.fillWidth: true
-                Layout.leftMargin: 16
-                Layout.rightMargin: 16
-
                             headerText: qsTr("Shadowsocks settings")
                         }
 
@@ -61,10 +86,8 @@ PageType {
 
                             Layout.fillWidth: true
                             Layout.topMargin: 40
-                Layout.leftMargin: 16
-                Layout.rightMargin: 16
 
-                enabled: listView.enabled
+                            enabled: delegateItem.isEnabled
 
                             headerText: qsTr("Port")
                             textField.text: port
@@ -82,13 +105,10 @@ PageType {
 
                         DropDownType {
                             id: cipherDropDown
-
                             Layout.fillWidth: true
                             Layout.topMargin: 20
-                Layout.leftMargin: 16
-                Layout.rightMargin: 16
 
-                enabled: listView.enabled
+                            enabled: delegateItem.isEnabled
 
                             descriptionText: qsTr("Cipher")
                             headerText: qsTr("Cipher")
@@ -133,8 +153,6 @@ PageType {
                             Layout.fillWidth: true
                             Layout.topMargin: 24
                             Layout.bottomMargin: 24
-                Layout.leftMargin: 16
-                Layout.rightMargin: 16
 
                             enabled: portTextField.errorText === ""
 
@@ -171,3 +189,6 @@ PageType {
                     }
                 }
             }
+        }
+    }
+}

client/ui/qml/Pages2/PageProtocolWireGuardClientSettings.qml

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

client/ui/qml/Pages2/PageProtocolWireGuardSettings.qml

@@ -16,55 +16,78 @@ import "../Components"
 PageType {
     id: root
 
-    BackButtonType {
-        id: backButton
+    ColumnLayout {
+        id: backButtonLayout
 
         anchors.top: parent.top
         anchors.left: parent.left
         anchors.right: parent.right
+
         anchors.topMargin: 20
 
-        onFocusChanged: {
-            if (this.activeFocus) {
-                listView.positionViewAtBeginning()
-            }
+        BackButtonType {
+            id: backButton
         }
     }
 
-    ListViewType {
-        id: listView
-
-        anchors.top: backButton.bottom
+    FlickableType {
+        id: fl
+        anchors.top: backButtonLayout.bottom
         anchors.bottom: parent.bottom
-        anchors.right: parent.right
+        contentHeight: content.implicitHeight
+
+        Column {
+            id: content
+
+            anchors.top: parent.top
             anchors.left: parent.left
+            anchors.right: parent.right
 
             enabled: ServersModel.isProcessedServerHasWriteAccess()
 
+            ListView {
+                id: listview
+
+                width: parent.width
+                height: listview.contentItem.height
+
+                clip: true
+                interactive: false
+
                 model: WireGuardConfigModel
 
-        delegate: ColumnLayout {
-            width: listView.width
+                delegate: Item {
+                    id: delegateItem
 
+                    property alias focusItemId: vpnAddressSubnetTextField
                     property bool isEnabled: ServersModel.isProcessedServerHasWriteAccess()
 
+                    implicitWidth: listview.width
+                    implicitHeight: col.implicitHeight
+
+                    ColumnLayout {
+                        id: col
+
+                        anchors.top: parent.top
+                        anchors.left: parent.left
+                        anchors.right: parent.right
+
+                        anchors.leftMargin: 16
+                        anchors.rightMargin: 16
+
                         spacing: 0
 
                         BaseHeaderType {
                             Layout.fillWidth: true
-                Layout.leftMargin: 16
-                Layout.rightMargin: 16
-
                             headerText: qsTr("WG settings")
                         }
 
                         TextFieldWithHeaderType {
                             id: vpnAddressSubnetTextField
-
                             Layout.fillWidth: true
                             Layout.topMargin: 40
-                Layout.leftMargin: 16
-                Layout.rightMargin: 16
+
+                            enabled: delegateItem.isEnabled
 
                             headerText: qsTr("VPN address subnet")
                             textField.text: subnetAddress
@@ -82,8 +105,8 @@ PageType {
                             id: portTextField
                             Layout.fillWidth: true
                             Layout.topMargin: 16
-                Layout.leftMargin: 16
-                Layout.rightMargin: 16
+
+                            enabled: delegateItem.isEnabled
 
                             headerText: qsTr("Port")
                             textField.text: port
@@ -101,12 +124,9 @@ PageType {
 
                         BasicButtonType {
                             id: saveButton
-                
                             Layout.fillWidth: true
                             Layout.topMargin: 24
                             Layout.bottomMargin: 24
-                Layout.leftMargin: 16
-                Layout.rightMargin: 16
 
                             enabled: portTextField.errorText === "" &&
                                      vpnAddressSubnetTextField.errorText === ""
@@ -144,3 +164,6 @@ PageType {
                     }
                 }
             }
+        }
+    }
+}

client/ui/qml/Pages2/PageProtocolXraySettings.qml

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

client/ui/qml/Pages2/PageServiceDnsSettings.qml

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

client/ui/qml/Pages2/PageServiceSftpSettings.qml

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

client/ui/qml/Pages2/PageServiceSocksProxySettings.qml

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

client/ui/qml/Pages2/PageServiceTorWebsiteSettings.qml

@@ -25,31 +25,34 @@ PageType {
         }
     }
 
-    BackButtonType {
-        id: backButton
+    ColumnLayout {
+        id: backButtonLayout
 
         anchors.top: parent.top
         anchors.left: parent.left
         anchors.right: parent.right
+
         anchors.topMargin: 20
 
-        onFocusChanged: {
-            if (this.activeFocus) {
-                listView.positionViewAtBeginning()
-            }
+        BackButtonType {
+            id: backButton
         }
     }
 
-    ListViewType {
-        id: listView
-
-        anchors.top: backButton.bottom
+    FlickableType {
+        id: fl
+        anchors.top: backButtonLayout.bottom
         anchors.bottom: parent.bottom
-        anchors.right: parent.right
-        anchors.left: parent.left
+        contentHeight: content.implicitHeight
 
-        header: ColumnLayout {
-            width: listView.width
+        ColumnLayout {
+            id: content
+
+            anchors.top: parent.top
+            anchors.left: parent.left
+            anchors.right: parent.right
+
+            spacing: 0
 
             BaseHeaderType {
                 Layout.fillWidth: true
@@ -58,19 +61,11 @@ PageType {
 
                 headerText: qsTr("Tor website settings")
             }
-        }
-
-        model: 1 // fake model to force the ListView to be created without a model
-
-        delegate: ColumnLayout { // TODO(CyAn84): add DelegateChooser after migrate to 6.9
-            width: listView.width
 
             LabelWithButtonType {
                 id: websiteName
-
                 Layout.fillWidth: true
                 Layout.topMargin: 32
-                Layout.bottomMargin: 24
 
                 text: qsTr("Website address")
                 descriptionText: {
@@ -88,16 +83,15 @@ 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: 16
+                Layout.topMargin: 40
                 Layout.leftMargin: 16
                 Layout.rightMargin: 16
 

client/ui/qml/Pages2/PageSettings.qml

@@ -14,58 +14,130 @@ import "../Config"
 PageType {
     id: root
 
-    ListViewType {
-        id: listView
+    FlickableType {
+        id: fl
+        anchors.top: parent.top
+        anchors.bottom: parent.bottom
+        contentHeight: content.height
 
-        anchors.fill: parent
+        ColumnLayout {
+            id: content
 
-        header: ColumnLayout {
-            width: listView.width
+            anchors.top: parent.top
+            anchors.left: parent.left
+            anchors.right: parent.right
+
+            spacing: 0
 
             BaseHeaderType {
                 id: header
                 Layout.fillWidth: true
                 Layout.topMargin: 24
-                Layout.bottomMargin: 16
                 Layout.rightMargin: 16
                 Layout.leftMargin: 16
 
                 headerText: qsTr("Settings")
             }
-        }
-
-        model: settingsEntries
-
-        delegate: ColumnLayout {
-            width: listView.width
-
-            spacing: 0
 
             LabelWithButtonType {
+                id: account
+                Layout.fillWidth: true
+                Layout.topMargin: 16
+
+                text: qsTr("Servers")
+                rightImageSource: "qrc:/images/controls/chevron-right.svg"
+                leftImageSource: "qrc:/images/controls/server.svg"
+
+                clickedFunction: function() {
+                    PageController.goToPage(PageEnum.PageSettingsServersList)
+                }
+            }
+
+            DividerType {}
+
+            LabelWithButtonType {
+                id: connection
                 Layout.fillWidth: true
 
-                visible: isVisible
-
-                text: title
+                text: qsTr("Connection")
                 rightImageSource: "qrc:/images/controls/chevron-right.svg"
-                leftImageSource: leftImagePath
+                leftImageSource: "qrc:/images/controls/radio.svg"
 
-                clickedFunction: clickedHandler
+                clickedFunction: function() {
+                    PageController.goToPage(PageEnum.PageSettingsConnection)
+                }
+            }
+
+            DividerType {}
+
+            LabelWithButtonType {
+                id: application
+                Layout.fillWidth: true
+
+                text: qsTr("Application")
+                rightImageSource: "qrc:/images/controls/chevron-right.svg"
+                leftImageSource: "qrc:/images/controls/app.svg"
+
+                clickedFunction: function() {
+                    PageController.goToPage(PageEnum.PageSettingsApplication)
+                }
+            }
+
+            DividerType {}
+
+            LabelWithButtonType {
+                id: backup
+                Layout.fillWidth: true
+
+                text: qsTr("Backup")
+                rightImageSource: "qrc:/images/controls/chevron-right.svg"
+                leftImageSource: "qrc:/images/controls/save.svg"
+
+                clickedFunction: function() {
+                    PageController.goToPage(PageEnum.PageSettingsBackup)
+                }
+            }
+
+            DividerType {}
+
+            LabelWithButtonType {
+                id: about
+                Layout.fillWidth: true
+
+                text: qsTr("About AmneziaVPN")
+                rightImageSource: "qrc:/images/controls/chevron-right.svg"
+                leftImageSource: "qrc:/images/controls/amnezia.svg"
+
+                clickedFunction: function() {
+                    PageController.goToPage(PageEnum.PageSettingsAbout)
+                }
+            }
+
+            DividerType {}
+
+            LabelWithButtonType {
+                id: devConsole
+                visible: SettingsController.isDevModeEnabled
+                Layout.fillWidth: true
+
+                text: qsTr("Dev console")
+                rightImageSource: "qrc:/images/controls/chevron-right.svg"
+                leftImageSource: "qrc:/images/controls/bug.svg"
+
+                clickedFunction: function() {
+                    PageController.goToPage(PageEnum.PageDevMenu)
+                }
             }
 
             DividerType {
-                visible: isVisible
+                visible: SettingsController.isDevModeEnabled
             }
-        }
-
-        footer: ColumnLayout {
-            width: listView.width
 
             LabelWithButtonType {
                 id: close
-
                 visible: GC.isDesktop()
                 Layout.fillWidth: true
+                Layout.preferredHeight: about.height
 
                 text: qsTr("Close application")
                 leftImageSource: "qrc:/images/controls/x-circle.svg"
@@ -77,87 +149,8 @@ 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,7 +29,58 @@ PageType {
         }
     }
 
-    ListViewType {
+    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 {
         id: listView
 
         anchors.top: backButton.bottom
@@ -37,6 +88,38 @@ 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
 
@@ -87,12 +170,11 @@ PageType {
             }
         }
 
-        model: contacts
-
         delegate: ColumnLayout {
             width: listView.width
 
             LabelWithButtonType {
+                id: telegramButton
                 Layout.fillWidth: true
                 Layout.topMargin: 6
 
@@ -175,55 +257,4 @@ PageType {
             }
         }
     }
-    
-    property list<QtObject> contacts: [
-        telegramGroup,
-        mail,
-        github,
-        website
-    ]
-
-    QtObject {
-        id: telegramGroup
-
-        readonly property string title: qsTr("Telegram group")
-        readonly property string description: qsTr("To discuss features")
-        readonly property string imageSource: "qrc:/images/controls/telegram.svg"
-        readonly property var handler: function() {
-            Qt.openUrlExternally(qsTr("https://t.me/amnezia_vpn_en"))
-        }
-    }
-
-    QtObject {
-        id: mail
-
-        readonly property string title: qsTr("support@amnezia.org")
-        readonly property string description: qsTr("For reviews and bug reports")
-        readonly property string imageSource: "qrc:/images/controls/mail.svg"
-        readonly property var handler: function() {
-            Qt.openUrlExternally(qsTr("mailto:support@amnezia.org"))
-        }
-    }
-
-    QtObject {
-        id: github
-
-        readonly property string title: qsTr("GitHub")
-        readonly property string description: qsTr("Discover the source code")
-        readonly property string imageSource: "qrc:/images/controls/github.svg"
-        readonly property var handler: function() {
-            Qt.openUrlExternally(qsTr("https://github.com/amnezia-vpn/amnezia-client"))
-        }
-    }
-
-    QtObject {
-        id: website
-
-        readonly property string title: qsTr("Website")
-        readonly property string description: qsTr("Visit official website")
-        readonly property string imageSource: "qrc:/images/controls/amnezia.svg"
-        readonly property var handler: function() {
-            Qt.openUrlExternally(LanguageModel.getCurrentSiteUrl())
-        }
-    }
 }

client/ui/qml/Pages2/PageSettingsApiAvailableCountries.qml

@@ -119,10 +119,6 @@ PageType {
                     checkable: !ConnectionController.isConnected
 
                     onClicked: {
-                        if (ConnectionController.isConnectionInProgress) {
-                            PageController.showNotificationMessage(qsTr("Unable change server location while trying to make an active connection"))
-                            return
-                        }
                         if (ConnectionController.isConnected) {
                             PageController.showNotificationMessage(qsTr("Unable change server location while there is an active connection"))
                             return

client/ui/qml/Pages2/PageSettingsApiInstructions.qml

@@ -20,49 +20,49 @@ PageType {
         id: windows
 
         readonly property string title: qsTr("Windows")
-        readonly property string link: qsTr("documentation/instructions/connect-amnezia-premium#windows")
+        readonly property string link: qsTr("https://docs.amnezia.org/documentation/instructions/connect-amnezia-premium#windows")
     }
 
     QtObject {
         id: macos
 
         readonly property string title: qsTr("macOS")
-        readonly property string link: qsTr("documentation/instructions/connect-amnezia-premium#macos")
+        readonly property string link: qsTr("https://docs.amnezia.org/documentation/instructions/connect-amnezia-premium#macos")
     }
 
     QtObject {
         id: android
 
         readonly property string title: qsTr("Android")
-        readonly property string link: qsTr("documentation/instructions/connect-amnezia-premium#android")
+        readonly property string link: qsTr("https://docs.amnezia.org/documentation/instructions/connect-amnezia-premium#android")
     }
 
     QtObject {
         id: androidTv
 
         readonly property string title: qsTr("AndroidTV")
-        readonly property string link: qsTr("documentation/instructions/android_tv_connect/")
+        readonly property string link: qsTr("https://docs.amnezia.org/ru/documentation/instructions/android_tv_connect/")
     }
 
     QtObject {
         id: ios
 
         readonly property string title: qsTr("iOS")
-        readonly property string link: qsTr("documentation/instructions/connect-amnezia-premium#ios")
+        readonly property string link: qsTr("https://docs.amnezia.org/documentation/instructions/connect-amnezia-premium#ios")
     }
 
     QtObject {
         id: linux
 
         readonly property string title: qsTr("Linux")
-        readonly property string link: qsTr("documentation/instructions/connect-amnezia-premium#linux")
+        readonly property string link: qsTr("https://docs.amnezia.org/documentation/instructions/connect-amnezia-premium#linux")
     }
 
     QtObject {
         id: routers
 
         readonly property string title: qsTr("Routers")
-        readonly property string link: qsTr("documentation/instructions/connect-amnezia-premium#routers")
+        readonly property string link: qsTr("https://docs.amnezia.org/documentation/instructions/connect-amnezia-premium#routers")
     }
 
     property list<QtObject> instructionsModel: [
@@ -114,7 +114,7 @@ PageType {
                 rightImageSource: "qrc:/images/controls/external-link.svg"
 
                 clickedFunction: function() {
-                    Qt.openUrlExternally(LanguageModel.getCurrentDocsUrl(link))
+                    Qt.openUrlExternally(link)
                 }
             }
 

client/ui/qml/Pages2/PageSettingsApiNativeConfigs.qml

@@ -22,34 +22,22 @@ PageType {
     property string configExtension: ".conf"
     property string configCaption: qsTr("Save AmneziaVPN config")
 
-    BackButtonType {
-        id: backButton
-
-        anchors.top: parent.top
-        anchors.left: parent.left
-        anchors.right: parent.right
-        anchors.topMargin: 20
-        
-        onActiveFocusChanged: {
-            if(backButton.enabled && backButton.activeFocus) {
-                listView.positionViewAtBeginning()
-            }
-        }
-    }
-
     ListViewType {
         id: listView
 
-        anchors.top: backButton.bottom
-        anchors.bottom: parent.bottom
-        anchors.right: parent.right
-        anchors.left: parent.left
+        anchors.fill: parent
+        anchors.topMargin: 20
+        anchors.bottomMargin: 24
 
         model: ApiCountryModel
 
         header: ColumnLayout {
             width: listView.width
 
+            BackButtonType {
+                id: backButton
+            }
+
             BaseHeaderType {
                 id: header
 
@@ -71,7 +59,6 @@ PageType {
 
                 text: countryName
                 descriptionText: isWorkerExpired ? qsTr("The configuration needs to be reissued") : ""
-                hideDescription: isWorkerExpired ? true : false
                 descriptionColor: AmneziaStyle.color.vibrantRed
 
                 leftImageSource: "qrc:/countriesFlags/images/flagKit/" + countryImageCode + ".svg"
@@ -117,16 +104,20 @@ PageType {
                 }
             }
 
-            ListViewType {
-                id: drawerListView
-
+            FlickableType {
                 anchors.top: moreOptionsDrawerBackButton.bottom
-                anchors.bottom: parent.bottom
                 anchors.left: parent.left
                 anchors.right: parent.right
+                anchors.bottom: parent.bottom
 
-                header: ColumnLayout {
-                    width: drawerListView.width
+                contentHeight: moreOptionsDrawerContent.height
+
+                ColumnLayout {
+                    id: moreOptionsDrawerContent
+
+                    anchors.top: parent.top
+                    anchors.left: parent.left
+                    anchors.right: parent.right
 
                     Header2Type {
                         Layout.fillWidth: true
@@ -134,17 +125,9 @@ 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")
@@ -155,16 +138,9 @@ 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() {
@@ -236,7 +212,8 @@ PageType {
             }
             moreOptionsDrawer.closeTriggered()
         }
-        var noButtonFunction = function() {}
+        var noButtonFunction = function() {
+        }
 
         showQuestionDrawer(headerText, descriptionText, yesButtonText, noButtonText, yesButtonFunction, noButtonFunction)
     }

client/ui/qml/Pages2/PageSettingsApiServerInfo.qml

@@ -111,6 +111,17 @@ PageType {
                     serverNameEditDrawer.openTriggered()
                 }
             }
+
+            RenameServerDrawer {
+                id: serverNameEditDrawer
+
+                parent: root
+
+                anchors.fill: parent
+                expandedHeight: root.height * 0.35
+
+                serverNameText: root.processedServer.name
+            }
         }
 
         delegate: ColumnLayout {
@@ -187,13 +198,7 @@ PageType {
 
                 iconPath: "qrc:/images/controls/alert-circle.svg"
 
-                visible: {
-                    for (let i = 0; i < ApiCountryModel.count; ++i) {
-                        if (ApiCountryModel.get(i).isWorkerExpired)
-                            return true;
-                    }
-                    return false;
-                }
+                visible: ApiAccountInfoModel.data("hasExpiredWorker")
             }
 
             LabelWithButtonType {
@@ -202,30 +207,35 @@ PageType {
                 Layout.fillWidth: true
                 Layout.topMargin: warning.visible ? 16 : 32
 
-                visible: footer.isVisibleForAmneziaFree
+                visible: false //footer.isVisibleForAmneziaFree
 
                 text: qsTr("Subscription Key")
                 rightImageSource: "qrc:/images/controls/chevron-right.svg"
 
                 clickedFunction: function() {
-                    PageController.goToPage(PageEnum.PageSettingsApiSubscriptionKey)
+                    shareConnectionDrawer.headerText = qsTr("Amnezia Premium subscription key")
+
+                    shareConnectionDrawer.openTriggered()
+                    shareConnectionDrawer.isSelfHostedConfig = false;
+                    shareConnectionDrawer.shareButtonText = qsTr("Save VPN key as a file")
+                    shareConnectionDrawer.copyButtonText = qsTr("Copy VPN key")
+
+
                     PageController.showBusyIndicator(true)
 
                     ApiConfigsController.prepareVpnKeyExport()
 
                     PageController.showBusyIndicator(false)
-                    
-                    // Navigate to PageShareConnection page
-                    //PageController.goToPage(PageEnum.PageShareConnection)
                 }
             }
 
             DividerType {
-                visible: footer.isVisibleForAmneziaFree
+                visible: false //footer.isVisibleForAmneziaFree
             }
 
             LabelWithButtonType {
                 Layout.fillWidth: true
+                Layout.topMargin: warning.visible ? 16 : 32
 
                 visible: footer.isVisibleForAmneziaFree
 
@@ -410,12 +420,9 @@ PageType {
         }
     }
 
-    RenameServerDrawer {
-        id: serverNameEditDrawer
+    ShareConnectionDrawer {
+        id: shareConnectionDrawer
 
         anchors.fill: parent
-        expandedHeight: parent.height * 0.35
-
-        serverNameText: root.processedServer.name
     }
 }

client/ui/qml/Pages2/PageSettingsApiSubscriptionKey.qml

@@ -1,204 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import QtQuick.Layouts
-import QtQuick.Dialogs
-import Qt.labs.platform 1.1
-
-import QtCore
-
-import PageEnum 1.0
-import Style 1.0
-
-import "../Controls2"
-import "../Controls2/TextTypes"
-import "../Config"
-import "../Components"
-
-PageType {
-    id: root
-
-    Component.onCompleted: {
-        PageController.showBusyIndicator(true)
-        ApiConfigsController.prepareVpnKeyExport()
-        PageController.showBusyIndicator(false)
-    }
-
-    FlickableType {
-        anchors.fill: parent
-        contentHeight: layout.implicitHeight
-
-        ColumnLayout {
-            id: layout
-            width: root.width
-
-            BackButtonType {
-                Layout.topMargin: 20
-            }
-
-            Label {
-                Layout.fillWidth: true
-                Layout.leftMargin: 16
-                Layout.rightMargin: 16
-                Layout.topMargin: 16
-                text: qsTr("Amnezia Premium\nsubscription key")
-                font.pixelSize: 32
-                font.bold: true
-                color: AmneziaStyle.color.paleGray
-                wrapMode: Text.Wrap
-            }
-
-            BasicButtonType {
-                Layout.fillWidth: true
-                Layout.topMargin: 32
-                Layout.leftMargin: 16
-                Layout.rightMargin: 16
-
-                defaultColor: AmneziaStyle.color.paleGray
-                hoveredColor: AmneziaStyle.color.sheerWhite
-                pressedColor: AmneziaStyle.color.translucentWhite
-                disabledColor: AmneziaStyle.color.mutedGray
-                textColor: AmneziaStyle.color.black
-                leftImageColor: "black"
-                borderWidth: 1
-
-                text: qsTr("Copy key")
-                leftImageSource: "qrc:/images/controls/copy.svg"
-
-                onClicked: {
-                    ApiConfigsController.copyVpnKeyToClipboard()
-                    PageController.showNotificationMessage(qsTr("Copied"))
-                }
-            }
-
-            BasicButtonType {
-                Layout.fillWidth: true
-                Layout.topMargin: 4
-                Layout.leftMargin: 16
-                Layout.rightMargin: 16
-
-                defaultColor: "transparent"
-                hoveredColor: AmneziaStyle.color.translucentWhite
-                pressedColor: AmneziaStyle.color.sheerWhite
-                textColor: AmneziaStyle.color.paleGray
-                borderWidth: 1
-
-                text: qsTr("Save key as a file")
-                leftImageSource: "qrc:/images/controls/share-2.svg"
-
-                onClicked: {
-                    var fileName = GC.isMobile()
-                        ? "amnezia_vpn_key.vpn"
-                        : SystemController.getFileName(
-                            qsTr("Save AmneziaVPN config"),
-                            qsTr("Config files (*.vpn)"),
-                            StandardPaths.standardLocations(StandardPaths.DocumentsLocation) + "/amnezia_vpn_key",
-                            true,
-                            ".vpn"
-                        )
-
-                    if (fileName !== "") {
-                        PageController.showBusyIndicator(true)
-                        ExportController.exportConfig(fileName)
-                        PageController.showBusyIndicator(false)
-                    }
-                }
-            }
-
-            BasicButtonType {
-                Layout.fillWidth: true
-                Layout.topMargin: 24
-                Layout.leftMargin: 16
-                Layout.rightMargin: 16
-                defaultColor: "transparent"
-                hoveredColor: AmneziaStyle.color.translucentWhite
-                pressedColor: AmneziaStyle.color.sheerWhite
-                textColor: AmneziaStyle.color.paleGray
-                borderWidth: 1
-
-                text: qsTr("Show key text")
-                leftImageSource: "qrc:/images/controls/eye.svg"
-
-                onClicked: {
-                    PageController.showBusyIndicator(true)
-                    ApiConfigsController.prepareVpnKeyExport()
-                    PageController.showBusyIndicator(false)
-                    vpnKeyDrawer.openTriggered()
-                }
-            }
-
-            Rectangle {
-                Layout.fillWidth: true
-                Layout.preferredHeight: width
-                Layout.topMargin: 20
-                Layout.leftMargin: 16
-                Layout.rightMargin: 16
-
-                visible: ApiConfigsController.qrCodesCount > 0
-                color: "white"
-                radius: 12
-
-                Image {
-                    anchors.fill: parent
-                    smooth: false
-                    source: ApiConfigsController.qrCodesCount > 0 && ApiConfigsController.qrCodes[0] ? ApiConfigsController.qrCodes[0] : ""
-                }
-            }
-
-            ParagraphTextType {
-                Layout.fillWidth: true
-                Layout.topMargin: 24
-                Layout.bottomMargin: 16
-                Layout.leftMargin: 16
-                Layout.rightMargin: 16
-                visible: ApiConfigsController.qrCodesCount > 0
-                horizontalAlignment: Text.AlignHCenter
-                text: qsTr("To read the QR code in the Amnezia app, tap + in the main menu → 'QR code'")
-            }
-        }
-    }
-
-    DrawerType2 {
-        id: vpnKeyDrawer
-
-        anchors.fill: root
-        expandedHeight: root.height * 0.9
-
-        expandedStateContent: Item {
-            BackButtonType {
-                anchors.top: parent.top
-                anchors.left: parent.left
-                anchors.topMargin: 16
-                backButtonFunction: function() { vpnKeyDrawer.closeTriggered() }
-            }
-
-            ColumnLayout {
-                anchors.top: parent.top
-                anchors.left: parent.left
-                anchors.right: parent.right
-                anchors.topMargin: 56
-                anchors.leftMargin: 16
-                anchors.rightMargin: 16
-
-                Header2Type {
-                    Layout.fillWidth: true
-                    headerText: qsTr("Amnezia Premium Subscription key")
-                }
-
-                TextArea {
-                    Layout.fillWidth: true
-                    Layout.topMargin: 16
-                    readOnly: true
-                    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: ApiConfigsController.vpnKey //|| ""
-                    wrapMode: Text.Wrap
-                    background: Rectangle { color: AmneziaStyle.color.transparent }
-                }
-            }
-        }
-    }
-}

client/ui/qml/Pages2/PageSettingsAppSplitTunneling.qml

@@ -50,7 +50,6 @@ 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
         
@@ -112,7 +111,7 @@ PageType {
 
             headerText: qsTr("Mode")
 
-            enabled: (Qt.platform.os === "android") && root.pageEnabled
+            enabled: Qt.platform.os === "android" && root.pageEnabled
 
             listView: ListViewWithRadioButtonType {
                 rootWidth: root.width
@@ -147,14 +146,24 @@ PageType {
         }
     }
 
-    ListViewType {
-        id: listView
-
+    FlickableType {
         anchors.top: header.bottom
-        anchors.bottom: addAppButton.top
+        anchors.topMargin: 16
+        contentHeight: col.implicitHeight + addAppButton.implicitHeight + addAppButton.anchors.bottomMargin + addAppButton.anchors.topMargin
+
+        enabled: root.pageEnabled
+
+        Column {
+            id: col
+            anchors.top: parent.top
             anchors.left: parent.left
             anchors.right: parent.right
 
+            ListView {
+                id: apps
+                width: parent.width
+                height: apps.contentItem.height
+
                 model: SortFilterProxyModel {
                     id: proxyAppSplitTunnelingModel
                     sourceModel: AppSplitTunnelingModel
@@ -168,15 +177,23 @@ PageType {
                     ]
                 }
 
-        delegate: ColumnLayout {
-            width: listView.width
+                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
 
-                Layout.leftMargin: 16
-                Layout.rightMargin: 16
-
                             text: appPath
                             rightImageSource: "qrc:/images/controls/trash.svg"
                             rightImageColor: AmneziaStyle.color.paleGray
@@ -199,6 +216,9 @@ PageType {
                         DividerType {}
                     }
                 }
+            }
+        }
+    }
 
     Rectangle {
         anchors.fill: addAppButton

client/ui/qml/Pages2/PageSettingsApplication.qml

@@ -21,24 +21,22 @@ PageType {
         anchors.left: parent.left
         anchors.right: parent.right
         anchors.topMargin: 20
-
-        onActiveFocusChanged: {
-            if(backButton.enabled && backButton.activeFocus) {
-                listView.positionViewAtBeginning()
-            }
-        }
     }
 
-    ListViewType {
-        id: listView
-
+    FlickableType {
+        id: fl
         anchors.top: backButton.bottom
         anchors.bottom: parent.bottom
+        contentHeight: content.height
+
+        ColumnLayout {
+            id: content
+
+            anchors.top: parent.top
             anchors.left: parent.left
             anchors.right: parent.right
 
-        header: ColumnLayout {
-            width: listView.width
+            spacing: 0
 
             BaseHeaderType {
                 Layout.fillWidth: true
@@ -47,17 +45,9 @@ PageType {
 
                 headerText: qsTr("Application")
             }
-        }
-
-        model: 1 // fake model to force the ListView to be created without a model
-
-        delegate: ColumnLayout { // TODO(CyAn84): add DelegateChooser when have migrated to 6.9
-
-            width: listView.width
 
             SwitcherType {
-                id: switcherAllowScreenshots
-
+                id: switcher
                 visible: GC.isMobile()
 
                 Layout.fillWidth: true
@@ -71,6 +61,10 @@ PageType {
                         SettingsController.toggleScreenshotsEnabled(checked)
                     }
                 }
+
+                // KeyNavigation.tab: Qt.platform.os === "android" && !SettingsController.isNotificationPermissionGranted ?
+                //     labelWithButtonNotification.rightButton : labelWithButtonLanguage.rightButton
+                parentFlickable: fl
             }
 
             DividerType {
@@ -79,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()
                 }
@@ -99,7 +93,6 @@ PageType {
 
             SwitcherType {
                 id: switcherAutoStart
-
                 visible: !GC.isMobile()
 
                 Layout.fillWidth: true
@@ -108,6 +101,8 @@ 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()) {
@@ -122,7 +117,6 @@ PageType {
 
             SwitcherType {
                 id: switcherAutoConnect
-
                 visible: !GC.isMobile()
 
                 Layout.fillWidth: true
@@ -131,6 +125,8 @@ PageType {
                 text: qsTr("Auto connect")
                 descriptionText: qsTr("Connect to VPN on app start")
 
+                parentFlickable: fl
+
                 checked: SettingsController.isAutoConnectEnabled()
                 onCheckedChanged: {
                     if (checked !== SettingsController.isAutoConnectEnabled()) {
@@ -145,17 +141,15 @@ PageType {
 
             SwitcherType {
                 id: switcherStartMinimized
-
                 visible: !GC.isMobile()
 
                 Layout.fillWidth: true
                 Layout.margins: 16
 
                 text: qsTr("Start minimized")
-                descriptionText: qsTr("Launch application minimized (works with autostart option turned on)")
+                descriptionText: qsTr("Launch application minimized")
 
-                enabled: switcherAutoStart.checked
-                opacity: enabled ? 1.0 : 0.5
+                parentFlickable: fl
 
                 checked: SettingsController.isStartMinimizedEnabled()
                 onCheckedChanged: {
@@ -168,21 +162,17 @@ 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()
                 }
@@ -192,13 +182,14 @@ 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)
                 }
@@ -208,13 +199,14 @@ PageType {
 
             LabelWithButtonType {
                 id: labelWithButtonReset
-                
                 Layout.fillWidth: true
 
                 text: qsTr("Reset settings and remove all data from the application")
                 rightImageSource: "qrc:/images/controls/chevron-right.svg"
                 textColor: AmneziaStyle.color.vibrantRed
 
+                parentFlickable: fl
+
                 clickedFunction: function() {
                     var headerText = qsTr("Reset settings and remove all data from the application?")
                     var descriptionText = qsTr("All settings will be reset to default. All installed AmneziaVPN services will still remain on the server.")

client/ui/qml/Pages2/PageSettingsBackup.qml

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

client/ui/qml/Pages2/PageSettingsConnection.qml

@@ -21,26 +21,21 @@ PageType {
         anchors.left: parent.left
         anchors.right: parent.right
         anchors.topMargin: 20
-
-        onActiveFocusChanged: {
-            if(backButton.enabled && backButton.activeFocus) {
-                listView.positionViewAtBeginning()
-            }
-        }
     }
 
-    ListViewType {
-        id: listView
-
+    FlickableType {
+        id: fl
         anchors.top: backButton.bottom
         anchors.bottom: parent.bottom
+        contentHeight: content.height
+
+        ColumnLayout {
+            id: content
+
+            anchors.top: parent.top
             anchors.left: parent.left
             anchors.right: parent.right
 
-        header: ColumnLayout {
-
-            width: listView.width
-
             BaseHeaderType {
                 Layout.fillWidth: true
                 Layout.leftMargin: 16
@@ -48,17 +43,9 @@ PageType {
 
                 headerText: qsTr("Connection")
             }
-        }
-
-        model: 1 // fake model to force the ListView to be created without a model
-
-        delegate: ColumnLayout { // TODO(CyAn84): add DelegateChooser when have migrated to 6.9
-
-            width: listView.width
 
             SwitcherType {
                 id: amneziaDnsSwitch
-
                 Layout.fillWidth: true
                 Layout.margins: 16
 
@@ -77,13 +64,14 @@ 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)
                 }
@@ -93,13 +81,14 @@ 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)
                 }
@@ -107,15 +96,8 @@ PageType {
 
             DividerType {}
 
-        }
-
-        footer: ColumnLayout { // TODO(CyAn84): move to delegate,add DelegateChooser when have migrated to 6.9
-
-            width: listView.width
-
             LabelWithButtonType {
                 id: splitTunnelingButton2
-
                 visible: root.isAppSplitTinnelingEnabled
 
                 Layout.fillWidth: true
@@ -124,6 +106,8 @@ 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)
                 }
@@ -143,6 +127,8 @@ 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,21 +21,13 @@ PageType {
         anchors.left: parent.left
         anchors.right: parent.right
         anchors.topMargin: 20
-
-        onFocusChanged: {
-            if (this.activeFocus) {
-                listView.positionViewAtBeginning()
-            }
-        }
     }
 
-    ListViewType {
-        id: listView
-
+    FlickableType {
+        id: fl
         anchors.top: backButton.bottom
         anchors.bottom: parent.bottom
-        anchors.right: parent.right
-        anchors.left: parent.left
+        contentHeight: content.height
 
         property var isServerFromApi: ServersModel.isServerFromApi(ServersModel.defaultIndex)
 
@@ -47,40 +39,32 @@ PageType {
             }
         }
 
-        header: ColumnLayout {
-            width: listView.width
+        ColumnLayout {
+            id: content
+
+            anchors.top: parent.top
+            anchors.left: parent.left
+            anchors.right: parent.right
+            anchors.leftMargin: 16
+            anchors.rightMargin: 16
+
             spacing: 16
 
             BaseHeaderType {
                 Layout.fillWidth: true
-                Layout.leftMargin: 16
-                Layout.rightMargin: 16
 
                 headerText: qsTr("DNS servers")
             }
 
             ParagraphTextType {
                 Layout.fillWidth: true
-                Layout.leftMargin: 16
-                Layout.rightMargin: 16
-                
                 text: qsTr("If AmneziaDNS is not used or installed")
             }
-        }
-
-        model: 1 // fake model to force the ListView to be created without a model
-
-        delegate: ColumnLayout {
-            width: listView.width
-            spacing: 16
 
             TextFieldWithHeaderType {
                 id: primaryDns
 
                 Layout.fillWidth: true
-                Layout.leftMargin: 16
-                Layout.rightMargin: 16
-
                 headerText: qsTr("Primary DNS")
 
                 textField.text: SettingsController.primaryDns
@@ -93,9 +77,6 @@ PageType {
                 id: secondaryDns
 
                 Layout.fillWidth: true
-                Layout.leftMargin: 16
-                Layout.rightMargin: 16
-
                 headerText: qsTr("Secondary DNS")
 
                 textField.text: SettingsController.secondaryDns
@@ -106,11 +87,7 @@ PageType {
 
             BasicButtonType {
                 id: restoreDefaultButton
-
                 Layout.fillWidth: true
-                Layout.topMargin: 16
-                Layout.leftMargin: 16
-                Layout.rightMargin: 16
 
                 defaultColor: AmneziaStyle.color.transparent
                 hoveredColor: AmneziaStyle.color.translucentWhite
@@ -144,7 +121,6 @@ PageType {
                 id: saveButton
 
                 Layout.fillWidth: true
-                Layout.margins: 16
 
                 text: qsTr("Save")
 
@@ -160,4 +136,5 @@ PageType {
             }
         }
     }
+
 }

client/ui/qml/Pages2/PageSettingsKillSwitch.qml

@@ -71,9 +71,6 @@ PageType {
                 onClicked: function() {
                     SettingsController.strictKillSwitchEnabled = false
                 }
-
-                Keys.onEnterPressed: this.clicked()
-                Keys.onReturnPressed: this.clicked()
             }
 
             DividerType {}
@@ -106,9 +103,6 @@ PageType {
 
                     showQuestionDrawer(headerText, descriptionText, yesButtonText, noButtonText, yesButtonFunction, noButtonFunction)
                 }
-
-                Keys.onEnterPressed: this.clicked()
-                Keys.onReturnPressed: this.clicked()
             }
 
             DividerType {

client/ui/qml/Pages2/PageSettingsLogging.qml

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

client/ui/qml/Pages2/PageSettingsServerData.qml

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

client/ui/qml/Pages2/PageSettingsServerProtocol.qml

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

client/ui/qml/Pages2/PageSettingsServersList.qml

@@ -40,20 +40,25 @@ PageType {
         }
     }
 
-    ListViewType {
+    ListView {
         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 {
         }
     }
 
-    ListViewType {
+    ListView {
         id: listView
 
         anchors.top: header.bottom
@@ -172,6 +172,8 @@ PageType {
 
         enabled: root.pageEnabled
 
+        property bool isFocusable: true
+
         model: SortFilterProxyModel {
             id: proxySitesModel
             sourceModel: SitesModel
@@ -191,7 +193,13 @@ PageType {
             ]
         }
 
+        clip: true
+
+        reuseItems: true
+
         delegate: ColumnLayout {
+            id: delegateContent
+
             width: listView.width
 
             LabelWithButtonType {
@@ -228,6 +236,7 @@ PageType {
         }
     }
 
+
     Rectangle {
         anchors.fill: addSiteButton
         anchors.bottomMargin: -24
@@ -299,7 +308,7 @@ PageType {
                 Layout.fillWidth: true
                 Layout.margins: 16
 
-                headerText: qsTr("Additional options")
+                headerText: qsTr("Import / Export Sites")
             }
 
             LabelWithButtonType {
@@ -342,34 +351,6 @@ PageType {
             }
 
             DividerType {}
-            
-            LabelWithButtonType {
-                id: clearSitesButton
-                Layout.fillWidth: true
-
-                text: qsTr("Clear site list")
-                rightImageSource: "qrc:/images/controls/trash.svg"
-
-                clickedFunction: function() {
-                    var headerText = qsTr("Clear site list?")
-                    var descriptionText = qsTr("All sites will be removed from list.")
-                    var yesButtonText = qsTr("Continue")
-                    var noButtonText = qsTr("Cancel")
-
-                    var yesButtonFunction = function() {
-                        PageController.showBusyIndicator(true)
-                        SitesController.removeSites()
-                        PageController.showBusyIndicator(false)
-                    }
-                    var noButtonFunction = function() {
-                        
-                    }
-
-                    showQuestionDrawer(headerText, descriptionText, yesButtonText, noButtonText, yesButtonFunction, noButtonFunction)
-                }
-            }
-
-            DividerType {}
         }
     }
 
@@ -393,24 +374,22 @@ PageType {
                 backButtonFunction: function() {
                     importSitesDrawer.closeTriggered()
                 }
-                
-                onFocusChanged: {
-                    if (this.activeFocus) {
-                        importSitesDrawerListView.positionViewAtBeginning()
-                    }
-                }
             }
 
-            ListViewType {
-                id: importSitesDrawerListView
-
+            FlickableType {
                 anchors.top: importSitesDrawerBackButton.bottom
                 anchors.left: parent.left
                 anchors.right: parent.right
                 anchors.bottom: parent.bottom
 
-                header: ColumnLayout {
-                    width: importSitesDrawerListView.width
+                contentHeight: importSitesDrawerContent.height
+
+                ColumnLayout {
+                    id: importSitesDrawerContent
+
+                    anchors.top: parent.top
+                    anchors.left: parent.left
+                    anchors.right: parent.right
 
                     Header2Type {
                         Layout.fillWidth: true
@@ -418,58 +397,34 @@ 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: title
+                        text: qsTr("Replace site list")
 
                         clickedFunction: function() {
-                            clickedHandler()
+                            var fileName = SystemController.getFileName(qsTr("Open sites file"),
+                                                                        qsTr("Sites files (*.json)"))
+                            if (fileName !== "") {
+                                importSitesDrawerContent.importSites(fileName, true)
+                            }
                         }
                     }
 
                     DividerType {}
-                }
-            }
-        }
-    }
 
-    property list<QtObject> importOptions: [
-        replaceOption,
-        addOption,
-    ]
+                    LabelWithButtonType {
+                        id: importSitesButton3
+                        Layout.fillWidth: true
+                        text: qsTr("Add imported sites to existing ones")
 
-    QtObject {
-        id: replaceOption
-
-        readonly property string title: qsTr("Replace site list")
-        readonly property var clickedHandler: function() {
+                        clickedFunction: 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)
+                                importSitesDrawerContent.importSites(fileName, false)
                             }
                         }
                     }
@@ -481,4 +436,10 @@ PageType {
                         importSitesDrawer.closeTriggered()
                         moreActionsDrawer.closeTriggered()
                     }
+
+                    DividerType {}
+                }
+            }
+        }
+    }
 }

client/ui/qml/Pages2/PageSetupWizardApiServiceInfo.qml

@@ -15,31 +15,25 @@ import "../Components"
 PageType {
     id: root
 
-    BackButtonType {
-        id: backButton
+    FlickableType {
+        id: fl
+        anchors.top: parent.top
+        anchors.bottom: parent.bottom
+        contentHeight: content.height + continueButton.implicitHeight + continueButton.anchors.bottomMargin + continueButton.anchors.topMargin
+
+        ColumnLayout {
+            id: content
 
             anchors.top: parent.top
             anchors.left: parent.left
             anchors.right: parent.right
-        anchors.topMargin: 20
 
-        onFocusChanged: {
-            if (this.activeFocus) {
-                listView.positionViewAtBeginning()
+            spacing: 0
+
+            BackButtonType {
+                id: backButton
+                Layout.topMargin: 20
             }
-        }
-    }
-
-    ListViewType {
-        id: listView
-
-        anchors.top: backButton.bottom
-        anchors.bottom: parent.bottom
-        anchors.right: parent.right
-        anchors.left: parent.left
-
-        header: ColumnLayout {
-            width: listView.width
 
             BaseHeaderType {
                 Layout.fillWidth: true
@@ -51,28 +45,53 @@ 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: imagePath
-                leftText: lText
-                rightText: rText
-            }
+                imageSource: "qrc:/images/controls/map-pin.svg"
+                leftText: qsTr("For the region")
+                rightText: ApiServicesModel.getSelectedServiceData("region")
             }
 
-        footer: ColumnLayout {
-            width: listView.width
+            LabelWithImageType {
+                Layout.fillWidth: true
+                Layout.margins: 16
 
-            spacing: 0
+                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: ""
+            }
 
             ParagraphTextType {
                 Layout.fillWidth: true
@@ -85,7 +104,7 @@ PageType {
                 textFormat: Text.RichText
                 text: {
                     var text = ApiServicesModel.getSelectedServiceData("features")
-                    return text.replace("%1", LanguageModel.getCurrentSiteUrl("free"))
+                    return text.replace("%1", LanguageModel.getCurrentSiteUrl())
                 }
 
                 MouseArea {
@@ -94,15 +113,20 @@ PageType {
                     cursorShape: parent.hoveredLink ? Qt.PointingHandCursor : Qt.ArrowCursor
                 }
             }
+        }
+    }
 
     BasicButtonType {
         id: continueButton
 
-                Layout.fillWidth: true
-                Layout.topMargin: 32
-                Layout.bottomMargin: 32
-                Layout.leftMargin: 16
-                Layout.rightMargin: 16
+        anchors.right: parent.right
+        anchors.left: parent.left
+        anchors.bottom: parent.bottom
+
+        anchors.topMargin: 32
+        anchors.rightMargin: 16
+        anchors.leftMargin: 16
+        anchors.bottomMargin: 32
 
         text: qsTr("Connect")
 
@@ -120,58 +144,3 @@ PageType {
         }
     }
 }
-    }
-
-    property list<QtObject> inputFields: [
-        region,
-        price,
-        timeLimit,
-        speed,
-        features
-    ]
-
-    QtObject {
-        id: region
-
-        readonly property string imagePath: "qrc:/images/controls/map-pin.svg"
-        readonly property string lText: qsTr("For the region")
-        readonly property string rText: ApiServicesModel.getSelectedServiceData("region")
-        property bool isVisible: true
-    }
-
-    QtObject {
-        id: price
-
-        readonly property string imagePath: "qrc:/images/controls/tag.svg"
-        readonly property string lText: qsTr("Price")
-        readonly property string rText: ApiServicesModel.getSelectedServiceData("price")
-        property bool isVisible: true
-    }
-
-    QtObject {
-        id: timeLimit
-
-        readonly property string imagePath: "qrc:/images/controls/history.svg"
-        readonly property string lText: qsTr("Work period")
-        readonly property string rText: ApiServicesModel.getSelectedServiceData("timeLimit")
-        property bool isVisible: rText !== ""
-    }
-
-    QtObject {
-        id: speed
-
-        readonly property string imagePath: "qrc:/images/controls/gauge.svg"
-        readonly property string lText: qsTr("Speed")
-        readonly property string rText: ApiServicesModel.getSelectedServiceData("speed")
-        property bool isVisible: true
-    }
-
-    QtObject {
-        id: features
-
-        readonly property string imagePath: "qrc:/images/controls/info.svg"
-        readonly property string lText: qsTr("Features")
-        readonly property string rText: ""
-        property bool isVisible: true
-    }
-}

client/ui/qml/Pages2/PageSetupWizardApiServicesList.qml

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

client/ui/qml/Pages2/PageSetupWizardConfigSource.qml

@@ -27,11 +27,21 @@ PageType {
         }
     }
 
-    ListViewType {
+    ListView {
         id: listView
 
         anchors.fill: parent
 
+        property bool isFocusable: true
+
+        ScrollBar.vertical: ScrollBarType {}
+
+        model: variants
+
+        clip: true
+
+        reuseItems: true
+
         header: ColumnLayout {
             width: listView.width
 
@@ -206,8 +216,6 @@ PageType {
             }
         }
 
-        model: variants
-
         delegate: ColumnLayout {
             width: listView.width
 
@@ -226,9 +234,6 @@ PageType {
                 leftImageSource: imageSource
 
                 onClicked: { handler() }
-
-                Keys.onEnterPressed: this.clicked()
-                Keys.onReturnPressed: this.clicked()
             }
         }
 

client/ui/qml/Pages2/PageSetupWizardCredentials.qml

@@ -28,14 +28,41 @@ PageType {
         }
     }
 
-    ListViewType {
+    ListView {
         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
 
@@ -51,6 +78,8 @@ PageType {
 
         model: inputFields
         spacing: 16
+        clip: true
+        reuseItems: true
 
         delegate: ColumnLayout {
             width: listView.width
@@ -148,9 +177,6 @@ PageType {
                 onClicked: {
                     Qt.openUrlExternally(LanguageModel.getCurrentSiteUrl("starter-guide"))
                 }
-
-                Keys.onEnterPressed: this.clicked()
-                Keys.onReturnPressed: this.clicked()
             }
         }
     }

client/ui/qml/Pages2/PageSetupWizardEasy.qml

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

client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml

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

client/ui/qml/Pages2/PageSetupWizardProtocols.qml

@@ -42,21 +42,19 @@ PageType {
         anchors.right: parent.right
 
         anchors.topMargin: 20
-
-        onActiveFocusChanged: {
-            if(backButton.enabled && backButton.activeFocus) {
-                listView.positionViewAtBeginning()
-            }
-        }
     }
 
-    ListViewType {
+    ListView {
         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
 
@@ -74,8 +72,9 @@ PageType {
         }
 
         model: proxyContainersModel
-
+        clip: true
         spacing: 0
+        reuseItems: true
         snapMode: ListView.SnapToItem
 
         delegate: ColumnLayout {
@@ -89,8 +88,8 @@ PageType {
                 rightImageSource: "qrc:/images/controls/chevron-right.svg"
 
                 clickedFunction: function() {
-                    ContainersModel.setProcessedContainerIndex(proxyContainersModel.mapToSource(index));
-                    PageController.goToPage(PageEnum.PageSetupWizardProtocolSettings);
+                    ContainersModel.setProcessedContainerIndex(proxyContainersModel.mapToSource(index))
+                    PageController.goToPage(PageEnum.PageSetupWizardProtocolSettings)
                 }
             }
 

client/ui/qml/Pages2/PageSetupWizardTextKey.qml

@@ -13,31 +13,25 @@ import "../Config"
 PageType {
     id: root
 
-    BackButtonType {
-        id: backButton
+    FlickableType {
+        id: fl
+        anchors.top: parent.top
+        anchors.bottom: parent.bottom
+        contentHeight: content.height
+
+        ColumnLayout {
+            id: content
 
             anchors.top: parent.top
             anchors.left: parent.left
             anchors.right: parent.right
-        anchors.topMargin: 20
 
-        onFocusChanged: {
-            if (this.activeFocus) {
-                listView.positionViewAtBeginning()
+            spacing: 16
+
+            BackButtonType {
+                id: backButton
+                Layout.topMargin: 20
             }
-        }
-    }
-
-    ListViewType {
-        id: listView
-
-        anchors.top: backButton.bottom
-        anchors.bottom: parent.bottom
-        anchors.right: parent.right
-        anchors.left: parent.left
-
-        header: ColumnLayout {
-            width: listView.width
 
             BaseHeaderType {
                 Layout.fillWidth: true
@@ -47,13 +41,6 @@ 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
@@ -73,18 +60,17 @@ PageType {
                 }
             }
         }
-
-        footer: ColumnLayout {
-            width: listView.width
+    }
 
     BasicButtonType {
         id: continueButton
 
-                Layout.fillWidth: true
-                Layout.rightMargin: 16
-                Layout.leftMargin: 16
-                Layout.topMargin: 16
-                Layout.bottomMargin: 32
+        anchors.bottom: parent.bottom
+        anchors.left: parent.left
+        anchors.right: parent.right
+        anchors.rightMargin: 16
+        anchors.leftMargin: 16
+        anchors.bottomMargin: 32
 
         text: qsTr("Continue")
 
@@ -95,5 +81,3 @@ PageType {
         }
     }
 }
-    }
-}

client/ui/qml/Pages2/PageSetupWizardViewConfig.qml

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

client/ui/qml/Pages2/PageShare.qml

@@ -15,7 +15,6 @@ import "../Controls2/TextTypes"
 import "../Components"
 import "../Config"
 
-
 PageType {
     id: root
 
@@ -43,6 +42,10 @@ PageType {
         target: ExportController
 
         function onGenerateConfig(type) {
+            shareConnectionDrawer.headerText = qsTr("Connection to ") + serverSelector.text
+            shareConnectionDrawer.configContentHeaderText = qsTr("File with connection settings to ") + serverSelector.text
+
+            shareConnectionDrawer.openTriggered()
             PageController.showBusyIndicator(true)
 
             switch (type) {
@@ -52,36 +55,54 @@ PageType {
             }
             case PageShare.ConfigType.OpenVpn: {
                 ExportController.generateOpenVpnConfig(clientNameTextField.textField.text)
+                shareConnectionDrawer.configCaption = qsTr("Save OpenVPN config")
+                shareConnectionDrawer.configExtension = ".ovpn"
+                shareConnectionDrawer.configFileName = "amnezia_for_openvpn"
                 break
             }
             case PageShare.ConfigType.WireGuard: {
                 ExportController.generateWireGuardConfig(clientNameTextField.textField.text)
+                shareConnectionDrawer.configCaption = qsTr("Save WireGuard config")
+                shareConnectionDrawer.configExtension = ".conf"
+                shareConnectionDrawer.configFileName = "amnezia_for_wireguard"
                 break
             }
             case PageShare.ConfigType.Awg: {
                 ExportController.generateAwgConfig(clientNameTextField.textField.text)
+                shareConnectionDrawer.configCaption = qsTr("Save AmneziaWG config")
+                shareConnectionDrawer.configExtension = ".conf"
+                shareConnectionDrawer.configFileName = "amnezia_for_awg"
                 break
             }
             case PageShare.ConfigType.ShadowSocks: {
                 ExportController.generateShadowSocksConfig()
+                shareConnectionDrawer.configCaption = qsTr("Save Shadowsocks config")
+                shareConnectionDrawer.configExtension = ".json"
+                shareConnectionDrawer.configFileName = "amnezia_for_shadowsocks"
                 break
             }
             case PageShare.ConfigType.Cloak: {
                 ExportController.generateCloakConfig()
+                shareConnectionDrawer.configCaption = qsTr("Save Cloak config")
+                shareConnectionDrawer.configExtension = ".json"
+                shareConnectionDrawer.configFileName = "amnezia_for_cloak"
                 break
             }
             case PageShare.ConfigType.Xray: {
                 ExportController.generateXrayConfig(clientNameTextField.textField.text)
+                shareConnectionDrawer.configCaption = qsTr("Save XRay config")
+                shareConnectionDrawer.configExtension = ".json"
+                shareConnectionDrawer.configFileName = "amnezia_for_xray"
                 break
             }
             }
 
             PageController.showBusyIndicator(false)
-            
-            PageController.goToPage(PageEnum.PageShareConnection)
         }
 
         function onExportErrorOccurred(error) {
+            shareConnectionDrawer.closeTriggered()
+
             PageController.showErrorMessage(error)
         }
     }
@@ -235,9 +256,6 @@ PageType {
                         onClicked: {
                             accessTypeSelector.currentIndex = 0
                         }
-
-                        Keys.onEnterPressed: this.clicked()
-                        Keys.onReturnPressed: this.clicked()
                     }
 
                     HorizontalRadioButton {
@@ -254,9 +272,6 @@ PageType {
                                                                          ServersModel.getProcessedServerCredentials())
                             PageController.showBusyIndicator(false)
                         }
-
-                        Keys.onEnterPressed: this.clicked()
-                        Keys.onReturnPressed: this.clicked()
                     }
                 }
             }
@@ -510,6 +525,9 @@ 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)
@@ -808,6 +826,9 @@ PageType {
                                             root.revokeConfig(index)
                                         }
                                         var noButtonFunction = function() {
+                                            if (!GC.isMobile()) {
+                                                // focusItem1.forceActiveFocus()
+                                            }
                                         }
 
                                         showQuestionDrawer(headerText, descriptionText, yesButtonText, noButtonText, yesButtonFunction, noButtonFunction)
@@ -821,4 +842,9 @@ PageType {
         }
     }
 
+    ShareConnectionDrawer {
+        id: shareConnectionDrawer
+
+        anchors.fill: parent
+    }
 }

client/ui/qml/Pages2/PageShareConnection.qml

@@ -1,329 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import QtQuick.Layouts
-import QtQuick.Dialogs
-
-import QtCore
-
-import SortFilterProxyModel 0.2
-
-import PageEnum 1.0
-import ContainerProps 1.0
-import Style 1.0
-
-import "./"
-import "../Controls2"
-import "../Controls2/TextTypes"
-import "../Config"
-import "../Components"
-
-PageType {
-    id: pageShareConnection
-
-    property string headerText
-
-    Component.onCompleted: {
-        var serverName = ServersModel.getProcessedServerData("name") || ServersModel.getProcessedServerData("hostName") || "Server"
-        headerText = qsTr("Connection to ") + serverName
-        configContentHeaderText = qsTr("File with connection settings to ") + serverName
-    }
-    property string configContentHeaderText
-    property string shareButtonText: qsTr("Share")
-    property string copyButtonText: qsTr("Copy")
-    property bool isSelfHostedConfig: true
-
-    property string configExtension: ".vpn"
-    property string configCaption: qsTr("Save AmneziaVPN config")
-    property string configFileName: "amnezia_config"
-
-    onVisibleChanged: {
-        configExtension = ".vpn"
-        configCaption = qsTr("Save AmneziaVPN config")
-        configFileName = "amnezia_config"
-        
-        if (visible) {
-            var serverName = ServersModel.getProcessedServerData("name") || ServersModel.getProcessedServerData("hostName") || "Server"
-            headerText = qsTr("Connection to ") + serverName
-            configContentHeaderText = qsTr("File with connection settings to ") + serverName
-        }
-    }
-
-    BackButtonType {
-        id: backButton
-        anchors.top: parent.top
-        anchors.left: parent.left
-        anchors.right: parent.right
-        anchors.topMargin: 20
-    }
-
-    Text {
-        id: shareHeader
-        anchors.top: backButton.bottom
-        anchors.left: parent.left
-        anchors.right: parent.right
-        anchors.topMargin: 20
-        anchors.leftMargin: 16
-        anchors.rightMargin: 16
-
-        text: pageShareConnection.headerText
-        color: AmneziaStyle.color.paleGray
-        font.pixelSize: 32
-        font.weight: 700
-        font.family: "PT Root UI VF"
-        wrapMode: Text.WordWrap
-    }
-
-    ListView {
-        id: listView
-
-        anchors.top: shareHeader.bottom
-        anchors.topMargin: 16
-        anchors.bottom: parent.bottom
-        anchors.left: parent.left
-        anchors.right: parent.right
-
-        property bool isFocusable: true
-
-        ScrollBar.vertical: ScrollBarType {}
-        model: 1
-        clip: true
-        reuseItems: true
-
-        header: ColumnLayout {
-            width: listView.width
-
-            BasicButtonType {
-                id: shareButton
-                Layout.fillWidth: true
-                Layout.topMargin: 16
-                Layout.leftMargin: 16
-                Layout.rightMargin: 16
-                text: pageShareConnection.shareButtonText
-                leftImageSource: "qrc:/images/controls/share-2.svg"
-                clickedFunc: function() {
-                    var fileName = ""
-                    if (GC.isMobile()) {
-                        fileName = configFileName + configExtension
-                    } else {
-                        fileName = SystemController.getFileName(configCaption,
-                                                                qsTr("Config files (*" + configExtension + ")"),
-                                                                StandardPaths.standardLocations(StandardPaths.DocumentsLocation) + "/" + configFileName,
-                                                                true,
-                                                                configExtension)
-                    }
-                    if (fileName !== "") {
-                        PageController.showBusyIndicator(true)
-                        ExportController.exportConfig(fileName)
-                        PageController.showBusyIndicator(false)
-                    }
-                }
-            }
-
-            BasicButtonType {
-                id: copyConfigTextButton
-                Layout.fillWidth: true
-                Layout.topMargin: 8
-                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: pageShareConnection.copyButtonText
-                leftImageSource: "qrc:/images/controls/copy.svg"
-
-                Keys.onReturnPressed: copyConfigTextButton.clicked()
-                Keys.onEnterPressed: copyConfigTextButton.clicked()
-            }
-
-            BasicButtonType {
-                id: copyNativeConfigStringButton
-                Layout.fillWidth: true
-                Layout.topMargin: 8
-                Layout.leftMargin: 16
-                Layout.rightMargin: 16
-                visible: false
-                defaultColor: AmneziaStyle.color.transparent
-                hoveredColor: AmneziaStyle.color.translucentWhite
-                pressedColor: AmneziaStyle.color.sheerWhite
-                disabledColor: AmneziaStyle.color.mutedGray
-                textColor: AmneziaStyle.color.paleGray
-                borderWidth: 1
-                text: qsTr("Copy config string")
-                leftImageSource: "qrc:/images/controls/copy.svg"
-                KeyNavigation.tab: showSettingsButton
-            }
-
-            BasicButtonType {
-                id: showSettingsButton
-                Layout.fillWidth: true
-                Layout.topMargin: 24
-                Layout.leftMargin: 16
-                Layout.rightMargin: 16
-                visible: pageShareConnection.isSelfHostedConfig
-                defaultColor: AmneziaStyle.color.transparent
-                hoveredColor: AmneziaStyle.color.translucentWhite
-                pressedColor: AmneziaStyle.color.sheerWhite
-                disabledColor: AmneziaStyle.color.mutedGray
-                textColor: AmneziaStyle.color.paleGray
-                borderWidth: 1
-                text: qsTr("Show connection settings")
-                clickedFunc: function() {
-                    configContentDrawer.openTriggered()
-                }
-            }
-
-            DrawerType2 {
-                id: configContentDrawer
-                parent: pageShareConnection.parent
-                anchors.fill: parent
-                expandedHeight: parent.height * 0.9
-                expandedStateContent: Item {
-                    id: configContentContainer
-                    implicitHeight: configContentDrawer.expandedHeight
-
-                    Connections {
-                        target: copyNativeConfigStringButton
-                        function onClicked() {
-                            nativeConfigString.selectAll()
-                            nativeConfigString.copy()
-                            nativeConfigString.select(0, 0)
-                            PageController.showNotificationMessage(qsTr("Copied"))
-                        }
-                    }
-
-                    Connections {
-                        target: copyConfigTextButton
-                        function onClicked() {
-                            configText.selectAll()
-                            configText.copy()
-                            configText.select(0, 0)
-                            PageController.showNotificationMessage(qsTr("Copied"))
-                            header.forceActiveFocus()
-                        }
-                    }
-
-                    BackButtonType {
-                        id: configBackButton
-                        anchors.top: parent.top
-                        anchors.left: parent.left
-                        anchors.right: parent.right
-                        anchors.topMargin: 16
-                        backButtonFunction: function() { configContentDrawer.closeTriggered() }
-                    }
-
-                    FlickableType {
-                        anchors.top: configBackButton.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
-                            anchors.fill: parent
-                            anchors.rightMargin: 16
-                            anchors.leftMargin: 16
-
-                            Header2Type {
-                                id: configContentHeader
-                                Layout.fillWidth: true
-                                Layout.topMargin: 16
-                                headerText: pageShareConnection.configContentHeaderText
-                            }
-
-                            TextField {
-                                id: nativeConfigString
-                                visible: false
-                                text: ExportController.nativeConfigString
-                                onTextChanged: copyNativeConfigStringButton.visible = nativeConfigString.text !== ""
-                            }
-
-                            TextArea {
-                                id: configText
-                                Layout.fillWidth: true
-                                Layout.topMargin: 16
-                                Layout.bottomMargin: 16
-                                padding: 0
-                                leftPadding: 0
-                                height: 24
-                                readOnly: true
-                                activeFocusOnTab: false
-                                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: ExportController.config
-                                wrapMode: Text.Wrap
-                                background: Rectangle { color: AmneziaStyle.color.transparent }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        delegate: ColumnLayout {
-            width: listView.width
-            property bool isQrCodeVisible: pageShareConnection.isSelfHostedConfig ? ExportController.qrCodesCount > 0 : ApiConfigsController.qrCodesCount > 0
-
-            Rectangle {
-                id: qrCodeContainer
-                Layout.fillWidth: true
-                Layout.preferredHeight: width
-                Layout.topMargin: 20
-                Layout.leftMargin: 16
-                Layout.rightMargin: 16
-                visible: isQrCodeVisible
-                color: "white"
-
-                Image {
-                    anchors.fill: parent
-                    smooth: false
-                    source: pageShareConnection.isSelfHostedConfig ? (isQrCodeVisible ? ExportController.qrCodes[0] : "") : (isQrCodeVisible ? ApiConfigsController.qrCodes[0] : "")
-                    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()
-
-                    Timer {
-                        property int index: 0
-                        interval: 1000
-                        running: isQrCodeVisible
-                        repeat: true
-                        onTriggered: {
-                            if (isQrCodeVisible) {
-                                index++
-                                let qrCodesCount = pageShareConnection.isSelfHostedConfig ? ExportController.qrCodesCount : ApiConfigsController.qrCodesCount
-                                if (index >= qrCodesCount) index = 0
-                                parent.source = pageShareConnection.isSelfHostedConfig ? ExportController.qrCodes[index] : ApiConfigsController.qrCodes[index]
-                            }
-                        }
-                    }
-
-                    Behavior on source { PropertyAnimation { duration: 200 } }
-                }
-            }
-
-            ParagraphTextType {
-                Layout.fillWidth: true
-                Layout.topMargin: 24
-                Layout.bottomMargin: 32
-                Layout.leftMargin: 16
-                Layout.rightMargin: 16
-                visible: isQrCodeVisible
-                horizontalAlignment: Text.AlignHCenter
-                text: qsTr("To read the QR code in the Amnezia app, select \"Add server\" → \"I have data to connect\" → \"QR code, key or settings file\"")
-            }
-        }
-    }
-}

client/ui/qml/Pages2/PageShareFullAccess.qml

@@ -15,7 +15,6 @@ import "../Controls2/TextTypes"
 import "../Components"
 import "../Config"
 
-
 PageType {
     id: root
 
@@ -26,29 +25,27 @@ PageType {
         anchors.left: parent.left
         anchors.right: parent.right
         anchors.topMargin: 20
-
-        onFocusChanged: {
-            if (this.activeFocus) {
-                listView.positionViewAtBeginning()
-            }
-        }
     }
 
-    ListViewType {
-        id: listView
-
+    FlickableType {
         anchors.top: backButton.bottom
         anchors.bottom: parent.bottom
-        anchors.right: parent.right
-        anchors.left: parent.left
+        contentHeight: content.height
 
-        header: ColumnLayout {
-            width: listView.width
+        ColumnLayout {
+            id: content
+
+            anchors.top: parent.top
+            anchors.left: parent.left
+            anchors.right: parent.right
+
+            anchors.rightMargin: 16
+            anchors.leftMargin: 16
+
+            spacing: 0
 
             BaseHeaderType {
                 Layout.fillWidth: true
-                Layout.leftMargin: 16
-                Layout.rightMargin: 16
                 Layout.topMargin: 24
 
                 headerText: qsTr("Full access to the server and VPN")
@@ -56,8 +53,6 @@ PageType {
 
             ParagraphTextType {
                 Layout.fillWidth: true
-                Layout.leftMargin: 16
-                Layout.rightMargin: 16
                 Layout.topMargin: 24
                 Layout.bottomMargin: 24
 
@@ -68,14 +63,11 @@ 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
@@ -108,8 +100,8 @@ PageType {
                             serverSelector.currentIndex = serverSelectorListView.currentIndex
                         }
 
-                        shareConnectionPage.headerText = qsTr("Accessing ") + serverSelector.text
-                        shareConnectionPage.configContentHeaderText = qsTr("File with accessing settings to ") + serverSelector.text
+                        shareConnectionDrawer.headerText = qsTr("Accessing ") + serverSelector.text
+                        shareConnectionDrawer.configContentHeaderText = qsTr("File with accessing settings to ") + serverSelector.text
                         serverSelector.closeTriggered()
                     }
 
@@ -125,20 +117,11 @@ 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: 32
-                Layout.leftMargin: 16
-                Layout.rightMargin: 16
+                Layout.topMargin: 40
 
                 text: qsTr("Share")
                 leftImageSource: "qrc:/images/controls/share-2.svg"
@@ -154,11 +137,20 @@ PageType {
                         ExportController.generateFullAccessConfig()
                     }
 
-                    PageController.showBusyIndicator(false)
+                    shareConnectionDrawer.headerText = qsTr("Connection to ") + serverSelector.text
+                    shareConnectionDrawer.configContentHeaderText = qsTr("File with connection settings to ") + serverSelector.text
 
-                    PageController.goToPage(PageEnum.PageShareConnection)
+                    shareConnectionDrawer.openTriggered()
+
+                    PageController.showBusyIndicator(false)
                 }
             }
         }
     }
+
+    ShareConnectionDrawer {
+        id: shareConnectionDrawer
+
+        anchors.fill: parent
+    }
 }

client/ui/systemtray_notificationhandler.cpp

@@ -35,7 +35,7 @@ SystemTrayNotificationHandler::SystemTrayNotificationHandler(QObject* parent) :
     m_menu.addSeparator();
 
     m_trayActionVisitWebSite = m_menu.addAction(QIcon(":/images/tray/link.png"), tr("Visit Website"), [&](){
-        QDesktopServices::openUrl(QUrl(websiteUrl));
+        QDesktopServices::openUrl(QUrl("https://amnezia.org"));
     });
 
     m_trayActionQuit = m_menu.addAction(QIcon(":/images/tray/cancel.png"), tr("Quit") + " " + APPLICATION_NAME, this, [&](){
@@ -64,11 +64,6 @@ void SystemTrayNotificationHandler::onTranslationsUpdated()
     m_trayActionQuit->setText(tr("Quit")+ " " + APPLICATION_NAME);
 }
 
-void SystemTrayNotificationHandler::updateWebsiteUrl(const QString &newWebsiteUrl) {
-    qDebug() << "Updated website URL:" << newWebsiteUrl;
-    websiteUrl = newWebsiteUrl;
-}
-
 void SystemTrayNotificationHandler::setTrayIcon(const QString &iconPath)
 {
     QIcon trayIconMask(QPixmap(iconPath).scaled(128,128));

client/ui/systemtray_notificationhandler.h

@@ -21,9 +21,6 @@ public:
 
     void onTranslationsUpdated() override;
 
-public slots:
-    void updateWebsiteUrl(const QString &newWebsiteUrl);
-
 protected:
     virtual void notify(Message type, const QString& title,
                         const QString& message, int timerMsec) override;
@@ -51,7 +48,6 @@ private:
     const QString ConnectedTrayIconName = "active.png";
     const QString DisconnectedTrayIconName = "default.png";
     const QString ErrorTrayIconName = "error.png";
-    QString  websiteUrl = "https://amnezia.org";
 };
 
 #endif  // SYSTEMTRAY_NOTIFICATIONHANDLER_H

common/logger/logger.cpp

@@ -9,6 +9,8 @@
 #include <QStandardPaths>
 #include <QUrl>
 
+#include <iostream>
+
 #include "utilities.h"
 #include "version.h"
 
@@ -25,7 +27,7 @@ QTextStream Logger::m_textStream;
 QString Logger::m_logFileName = QString("%1.log").arg(APPLICATION_NAME);
 QString Logger::m_serviceLogFileName = QString("%1.log").arg(SERVICE_NAME);
 
-void messageHandler(QtMsgType type, const QMessageLogContext &context, const QString &msg)
+void debugMessageHandler(QtMsgType type, const QMessageLogContext &context, const QString &msg)
 {
     if (msg.simplified().isEmpty()) {
         return;
@@ -36,21 +38,14 @@ void messageHandler(QtMsgType type, const QMessageLogContext &context, const QSt
         return;
     }
 
-    if (msg.startsWith("Unknown property") || msg.startsWith("Could not create pixmap")
-        || msg.startsWith("Populating font") || msg.startsWith("stale focus object")) {
+    if (msg.startsWith("Unknown property") || msg.startsWith("Could not create pixmap") || msg.startsWith("Populating font")
+        || msg.startsWith("stale focus object")) {
         return;
     }
 
-    switch (type) {
-    case QtDebugMsg: Logger::Instance().debug() << msg; break;
-    case QtInfoMsg: Logger::Instance().info() << msg; break;
-    case QtWarningMsg: Logger::Instance().warning() << msg; break;
-    case QtCriticalMsg: Logger::Instance().error() << msg; break;
-    case QtFatalMsg: {
-        Logger::Instance().error() << msg;
-    } // Brackets are needed to ensure the destructor of LogStreamer is called before abort()
-        abort();
-    }
+    Logger::m_textStream << qFormatLogMessage(type, context, msg) << Qt::endl << Qt::flush;
+
+    std::cout << qFormatLogMessage(type, context, msg).toStdString() << std::endl << std::flush;
 }
 
 Logger &Logger::Instance()
@@ -76,14 +71,19 @@ bool Logger::init(bool isServiceLogger)
 
     m_file.setTextModeEnabled(true);
     m_textStream.setDevice(&m_file);
+    qSetMessagePattern("%{time yyyy-MM-dd hh:mm:ss} %{type} %{message}");
 
-    qInstallMessageHandler(messageHandler);
+#if !defined(QT_DEBUG) || defined(Q_OS_IOS)
+    qInstallMessageHandler(debugMessageHandler);
+#endif
 
     return true;
 }
 
 void Logger::deInit()
 {
+    qInstallMessageHandler(nullptr);
+    qSetMessagePattern("%{message}");
     m_textStream.setDevice(nullptr);
     m_file.close();
 }
@@ -234,101 +234,76 @@ void Logger::cleanUp()
     clearLogs(true);
 }
 
-Logger::LogStreamer::LogStreamer(Logger *logger, LogLevel logLevel)
-    : m_logger(logger), m_logLevel(logLevel), m_data(new Data())
+Logger::Log::Log(Logger *logger, LogLevel logLevel) : m_logger(logger), m_logLevel(logLevel), m_data(new Data())
 {
 }
 
-Logger::LogStreamer::~LogStreamer()
+Logger::Log::~Log()
 {
-    QString logLevelString;
-    switch (m_logLevel) {
-    case LogLevel::Trace: logLevelString = "[TRACE]"; break;
-    case LogLevel::Debug: logLevelString = "[DEBUG]"; break;
-    case LogLevel::Info: logLevelString = "[INFO]"; break;
-    case LogLevel::Warning: logLevelString = "[WARNING]"; break;
-    case LogLevel::Error: logLevelString = "[ERROR]"; break;
-    }
-
-    const QString message = QString("%1 %2 Amnezia %3 : %4")
-                                    .arg(QDateTime::currentDateTimeUtc().toString("[yyyy-MM-dd hh:mm:ss.zzzZ]"),
-                                         logLevelString, m_logger->className(), m_data->m_buffer.trimmed());
-
-    if (m_file.isOpen()) {
-        QTextStream logToFile(&m_file);
-        logToFile << message << Qt::endl << Qt::flush;
-    }
-
-    QTextStream logToOutput((m_logLevel == LogLevel::Error) ? stderr : stdout);
-    logToOutput << message << Qt::endl << Qt::flush;
-
+    qDebug() << "Amnezia" << m_logger->className() << m_data->m_buffer.trimmed();
     delete m_data;
 }
 
-Logger::LogStreamer Logger::error()
+Logger::Log Logger::error()
 {
-    return { this, LogLevel::Error };
+    return Log(this, LogLevel::Error);
 }
-
-Logger::LogStreamer Logger::warning()
+Logger::Log Logger::warning()
 {
-    return { this, LogLevel::Warning };
+    return Log(this, LogLevel::Warning);
 }
-
-Logger::LogStreamer Logger::info()
+Logger::Log Logger::info()
 {
-    return { this, LogLevel::Info };
+    return Log(this, LogLevel::Info);
 }
-
-Logger::LogStreamer Logger::debug()
+Logger::Log Logger::debug()
 {
-    return { this, LogLevel::Debug };
+    return Log(this, LogLevel::Debug);
 }
-
 QString Logger::sensitive(const QString &input)
 {
 #ifdef Q_DEBUG
     return input;
 #else
     Q_UNUSED(input);
-    return { 8, 'X' };
+    return QString(8, 'X');
 #endif
 }
 
-#define CREATE_LOGSTREAMER_OP_REF(x)                                                                                   \
-    Logger::LogStreamer &Logger::LogStreamer::operator<<(x t)                                                          \
+#define CREATE_LOG_OP_REF(x)                                                                                                               \
+    Logger::Log &Logger::Log::operator<<(x t)                                                                                              \
     {                                                                                                                                      \
         m_data->m_ts << t << ' ';                                                                                                          \
         return *this;                                                                                                                      \
     }
 
-CREATE_LOGSTREAMER_OP_REF(uint64_t);
-CREATE_LOGSTREAMER_OP_REF(const char *);
-CREATE_LOGSTREAMER_OP_REF(const QString &);
-CREATE_LOGSTREAMER_OP_REF(const QByteArray &);
-CREATE_LOGSTREAMER_OP_REF(const void *);
+CREATE_LOG_OP_REF(uint64_t);
+CREATE_LOG_OP_REF(const char *);
+CREATE_LOG_OP_REF(const QString &);
+CREATE_LOG_OP_REF(const QByteArray &);
+CREATE_LOG_OP_REF(const void *);
 
-#undef CREATE_LOGSTREAMER_OP_REF
+#undef CREATE_LOG_OP_REF
 
-Logger::LogStreamer &Logger::LogStreamer::operator<<(const QStringList &t)
+Logger::Log &Logger::Log::operator<<(const QStringList &t)
 {
     m_data->m_ts << '[' << t.join(",") << ']' << ' ';
     return *this;
 }
 
-Logger::LogStreamer &Logger::LogStreamer::operator<<(const QJsonObject &t)
+Logger::Log &Logger::Log::operator<<(const QJsonObject &t)
 {
     m_data->m_ts << QJsonDocument(t).toJson(QJsonDocument::Indented) << ' ';
     return *this;
 }
 
-Logger::LogStreamer &Logger::LogStreamer::operator<<(QTextStreamFunction t)
+Logger::Log &Logger::Log::operator<<(QTextStreamFunction t)
 {
     m_data->m_ts << t;
     return *this;
 }
 
-void Logger::LogStreamer::addMetaEnum(quint64 value, const QMetaObject *meta, const char *name)
+void Logger::Log::addMetaEnum(quint64 value, const QMetaObject *meta, const char *name)
 {
     QMetaEnum me = meta->enumerator(meta->indexOfEnumerator(name));
 

common/logger/logger.h

@@ -39,32 +39,28 @@ public:
     {
         m_className = className;
     }
-
-    Logger(Logger const &) = delete;
-    Logger &operator=(Logger const &) = delete;
-
     const QString &className() const
     {
         return m_className;
     }
 
-    class LogStreamer
+    class Log
     {
     public:
-        LogStreamer(Logger *logger, LogLevel level);
-        ~LogStreamer();
+        Log(Logger *logger, LogLevel level);
+        ~Log();
 
-        LogStreamer &operator<<(uint64_t t);
-        LogStreamer &operator<<(const char *t);
-        LogStreamer &operator<<(const QString &t);
-        LogStreamer &operator<<(const QStringList &t);
-        LogStreamer &operator<<(const QByteArray &t);
-        LogStreamer &operator<<(const QJsonObject &t);
-        LogStreamer &operator<<(QTextStreamFunction t);
-        LogStreamer &operator<<(const void *t);
+        Log &operator<<(uint64_t t);
+        Log &operator<<(const char *t);
+        Log &operator<<(const QString &t);
+        Log &operator<<(const QStringList &t);
+        Log &operator<<(const QByteArray &t);
+        Log &operator<<(const QJsonObject &t);
+        Log &operator<<(QTextStreamFunction t);
+        Log &operator<<(const void *t);
 
         // Q_ENUM
-        template<typename T> typename std::enable_if<QtPrivate::IsQEnumHelper<T>::Value, LogStreamer &>::type operator<<(T t)
+        template<typename T> typename std::enable_if<QtPrivate::IsQEnumHelper<T>::Value, Log &>::type operator<<(T t)
         {
             const QMetaObject *meta = qt_getEnumMetaObject(t);
             const char *name = qt_getEnumName(t);
@@ -91,14 +87,16 @@ public:
         Data *m_data;
     };
 
-    LogStreamer error();
-    LogStreamer warning();
-    LogStreamer info();
-    LogStreamer debug();
+    Log error();
+    Log warning();
+    Log info();
+    Log debug();
     QString sensitive(const QString &input);
 
 private:
-    Logger() = default;
+    Logger() {};
+    Logger(Logger const &) = delete;
+    Logger &operator=(Logger const &) = delete;
 
     static QString userLogsDir();
 
@@ -107,7 +105,7 @@ private:
     static QString m_logFileName;
     static QString m_serviceLogFileName;
 
-    friend void messageHandler(QtMsgType type, const QMessageLogContext &context, const QString &msg);
+    friend void debugMessageHandler(QtMsgType type, const QMessageLogContext &context, const QString &msg);
 
     // compat with Mozilla logger
     QString m_className;