wip

amnezia-vpn · Dec 25, 2024 · f41c23f · f41c23f
1 parent f8f4d75
commit f41c23f
Show file tree

Hide file tree

Showing 22 changed files with 610 additions and 659 deletions.
diff --git a/client/ui/qml/Components/HomeContainersListView.qml b/client/ui/qml/Components/HomeContainersListView.qml
@@ -18,7 +18,7 @@ ListView {
     property var selectedText
 
     width: rootWidth
-    height: contentItem.height // TODO: It should be fixed size, not content item height
+    height: contentItem.height
 
     clip: true
     // interactive: false
@@ -34,30 +34,6 @@ 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()
-    }
-
     // activeFocusOnTab: true
     // onActiveFocusChanged: {
         // console.log("===========================")

diff --git a/client/ui/qml/Components/SettingsContainersListView.qml b/client/ui/qml/Components/SettingsContainersListView.qml
@@ -20,16 +20,10 @@ ListView {
     height: root.contentItem.height
 
     clip: true
-    interactive: false
+    reuseItems: true
 
     property bool isFocusable: false
 
-    onVisibleChanged: {
-        if (visible) {
-            this.currentIndex = 0
-        }
-    }
-
     delegate: Item {
         implicitWidth: root.width
         implicitHeight: delegateContent.implicitHeight

diff --git a/client/ui/qml/Components/ShareConnectionDrawer.qml b/client/ui/qml/Components/ShareConnectionDrawer.qml
@@ -61,30 +61,6 @@ DrawerType2 {
 
             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: 1

diff --git a/client/ui/qml/Controls2/BackButtonType.qml b/client/ui/qml/Controls2/BackButtonType.qml
@@ -9,6 +9,7 @@ FocusScope {
 
     property string backButtonImage: "qrc:/images/controls/arrow-left.svg"
     property var backButtonFunction
+    property alias backBtn: backButton
 
     implicitWidth: content.implicitWidth
     implicitHeight: content.implicitHeight

diff --git a/client/ui/qml/Controls2/BasicButtonType.qml b/client/ui/qml/Controls2/BasicButtonType.qml
@@ -64,7 +64,6 @@ Button {
     implicitHeight: 56
 
     hoverEnabled: true
-    focusPolicy: Qt.TabFocus
 
     onFocusChanged: {
         if (root.activeFocus) {

diff --git a/client/ui/qml/Controls2/ListViewWithLabelsType.qml b/client/ui/qml/Controls2/ListViewWithLabelsType.qml
@@ -17,7 +17,7 @@ ListView {
 
     property bool dividerVisible: false
 
-    currentIndex: 0
+    property int selectedIndex: 0
 
     width: rootWidth
     height: menuContent.contentItem.height
@@ -45,7 +45,7 @@ ListView {
                 rightImageSource: imageSource
 
                 clickedFunction: function() {
-                    menuContent.currentIndex = index
+                    menuContent.selectedIndex = index
                     menuContent.selectedText = name
                     if (menuContent.clickedFunction && typeof menuContent.clickedFunction === "function") {
                         menuContent.clickedFunction()
@@ -62,7 +62,7 @@ ListView {
         }
 
         Component.onCompleted: {
-            if (menuContent.currentIndex === index) {
+            if (menuContent.selectedIndex === index) {
                 menuContent.selectedText = name
             }
         }

diff --git a/client/ui/qml/Controls2/ListViewWithRadioButtonType.qml b/client/ui/qml/Controls2/ListViewWithRadioButtonType.qml
@@ -26,6 +26,7 @@ ListView {
     height: root.contentItem.height
 
     clip: true
+    reuseItems: true
 
     property bool isFocusable: true
 

diff --git a/client/ui/qml/Controls2/TextFieldWithHeaderType.qml b/client/ui/qml/Controls2/TextFieldWithHeaderType.qml
@@ -133,6 +133,9 @@ Item {
                                 errorText = qsTr("The field can't be empty")
                             }
                         }
+
+                        focusReason: Qt.PopupFocusReason
+                        activeFocusOnPress: true
 
                         MouseArea {
                             anchors.fill: parent
@@ -216,7 +219,12 @@ Item {
 
     Keys.onEnterPressed: {
         if (root.rightButtonClickedOnEnter && root.clickedFunc && typeof root.clickedFunc === "function") {
-            clickedFunc()
+            console.debug(">>> TextFieldWithHeaderType onEnterPressed triggered!!!")
+            if(SettingsController.isOnTv()) {
+                console.debug(">>> *** TVTVTVTVTVTVTVTVTVTVTV ***")
+                SystemController.sendTouch(this.x, this.y)
+            }
+            root.clickedFunc()
         }
 
         // if (KeyNavigation.tab) {
@@ -225,8 +233,13 @@ Item {
     }
 
     Keys.onReturnPressed: {
-        if (root.rightButtonClickedOnEnter &&root.clickedFunc && typeof root.clickedFunc === "function") {
-            clickedFunc()
+        if (root.rightButtonClickedOnEnter && root.clickedFunc && typeof root.clickedFunc === "function") {
+            console.debug(">>> TextFieldWithHeaderType onReturnPressed triggered!!!")
+            if(SettingsController.isOnTv()) {
+                console.debug(">>> *** TVTVTVTVTVTVTVTVTVTVTV ***")
+                SystemController.sendTouch(this.x, this.y)
+            }
+            root.clickedFunc()
         }
 
         // if (KeyNavigation.tab) {

diff --git a/client/ui/qml/Controls2/TopCloseButtonType.qml b/client/ui/qml/Controls2/TopCloseButtonType.qml
@@ -21,6 +21,14 @@ Popup {
         color: AmneziaStyle.color.transparent
     }
 
+    onOpened: { // TODO: check
+        FocusController.pushRootObject(root)
+    }
+
+    onClosed: {
+        FocusController.dropRootObject(root)
+    }
+
     ImageButtonType {
         id: button
 

diff --git a/client/ui/qml/Pages2/PageDevMenu.qml b/client/ui/qml/Pages2/PageDevMenu.qml
@@ -16,42 +16,49 @@ import "../Components"
 PageType {
     id: root
 
-    ColumnLayout {
-        id: backButtonLayout
+    BackButtonType {
+        id: backButton
 
         anchors.top: parent.top
         anchors.left: parent.left
         anchors.right: parent.right
-
         anchors.topMargin: 20
-
-        BackButtonType {
-            id: backButton
-        }
     }
 
-    FlickableType {
-        id: fl
-        anchors.top: backButtonLayout.bottom
+    ListView {
+        id: listView
+        anchors.top: backButton.bottom
         anchors.bottom: parent.bottom
-        contentHeight: content.implicitHeight
+        anchors.right: parent.right
+        anchors.left: parent.left
+
+        property bool isFocusable: true
 
-        ColumnLayout {
-            id: content
+        ScrollBar.vertical: ScrollBarType {}
 
-            anchors.top: parent.top
-            anchors.left: parent.left
-            anchors.right: parent.right
+        header: ColumnLayout {
+            width: listView.width
 
             HeaderType {
                 id: header
 
                 Layout.fillWidth: true
+                Layout.topMargin: 16
                 Layout.rightMargin: 16
                 Layout.leftMargin: 16
 
                 headerText: "Dev menu"
             }
+        }
+
+        model: 1
+
+        clip: true
+
+        spacing: 16
+
+        delegate: ColumnLayout {
+            width: listView.width
 
             TextFieldWithHeaderType {
                 id: passwordTextField
@@ -60,7 +67,6 @@ PageType {
                 Layout.topMargin: 16
                 Layout.rightMargin: 16
                 Layout.leftMargin: 16
-                parentFlickable: fl
 
                 headerText: qsTr("Gateway endpoint")
                 textFieldText: SettingsController.gatewayEndpoint
@@ -78,14 +84,18 @@ PageType {
                     }
                 }
             }
+        }
+
+        footer: ColumnLayout {
+            width: listView.width
 
             SwitcherType {
                 id: switcher
 
                 Layout.fillWidth: true
+                Layout.topMargin: 24 // 16
                 Layout.rightMargin: 16
                 Layout.leftMargin: 16
-                Layout.topMargin: 16
 
                 text: qsTr("Dev gateway environment")
                 checked: SettingsController.isDevGatewayEnv

diff --git a/client/ui/qml/Pages2/PageHome.qml b/client/ui/qml/Pages2/PageHome.qml
@@ -310,6 +310,8 @@ PageType {
                         id: containersDropDown
                         objectName: "containersDropDown"
 
+                        drawerHeight: 0.9
+
                         rootButtonImageColor: AmneziaStyle.color.midnightBlack
                         rootButtonBackgroundColor: AmneziaStyle.color.paleGray
                         rootButtonBackgroundHoveredColor: AmneziaStyle.color.mistyGray

diff --git a/client/ui/qml/Pages2/PageProtocolAwgClientSettings.qml b/client/ui/qml/Pages2/PageProtocolAwgClientSettings.qml
@@ -16,24 +16,19 @@ import "../Components"
 PageType {
     id: root
 
-    ColumnLayout {
-        id: backButtonLayout
+    BackButtonType {
+        id: backButton
 
         anchors.top: parent.top
         anchors.left: parent.left
         anchors.right: parent.right
-
         anchors.topMargin: 20
-
-        BackButtonType {
-            id: backButton
-        }
     }
 
     ListView {
         id: listview
 
-        anchors.top: backButtonLayout.bottom
+        anchors.top: backButton.bottom
         anchors.bottom: saveButton.top
 
         width: parent.width
@@ -42,30 +37,6 @@ PageType {
 
         property bool isFocusable: true
 
-        Keys.onTabPressed: {
-            FocusController.nextKeyTabItem()
-        }
-
-        Keys.onBacktabPressed: {
-            FocusController.previousKeyTabItem()
-        }
-
-        Keys.onUpPressed: {
-            FocusController.nextKeyUpItem()
-        }
-
-        Keys.onDownPressed: {
-            FocusController.nextKeyDownItem()
-        }
-
-        Keys.onLeftPressed: {
-            FocusController.nextKeyLeftItem()
-        }
-
-        Keys.onRightPressed: {
-            FocusController.nextKeyRightItem()
-        }
-
         model: AwgConfigModel
 
         delegate: Item {