Merge branch 'improve_navigation_cpp' into feature/android-tv

# Conflicts: # client/ui/qml/Components/ShareConnectionDrawer.qml # client/ui/qml/Controls2/DrawerType2.qml # client/ui/qml/Pages2/PageHome.qml # client/ui/qml/Pages2/PageShareFullAccess.qml
amnezia-vpn · Nov 24, 2024 · 2752c05 · 2752c05
2 parents 6ac7414 + 0620b45
commit 2752c05
Show file tree

Hide file tree

Showing 8 changed files with 65 additions and 26 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -256,7 +256,7 @@ jobs:
     - name: 'Setup xcode'
       uses: maxim-lobanov/setup-xcode@v1
       with:
-        xcode-version: '14.3.1'
+        xcode-version: '15.4.0'
 
     - name: 'Install Qt'
       uses: jurplel/install-qt-action@v3

diff --git a/client/ui/qml/Components/ShareConnectionDrawer.qml b/client/ui/qml/Components/ShareConnectionDrawer.qml
@@ -106,7 +106,7 @@ DrawerType2 {
                     Layout.rightMargin: 16
 
                     text: qsTr("Share")
-                    imageSource: "qrc:/images/controls/share-2.svg"
+                    leftImageSource: "qrc:/images/controls/share-2.svg"
 
                     clickedFunc: function() {
                         var fileName = ""
@@ -142,7 +142,7 @@ DrawerType2 {
                     borderWidth: 1
 
                     text: qsTr("Copy")
-                    imageSource: "qrc:/images/controls/copy.svg"
+                    leftImageSource: "qrc:/images/controls/copy.svg"
 
                     Keys.onReturnPressed: { copyConfigTextButton.clicked() }
                     Keys.onEnterPressed: { copyConfigTextButton.clicked() }
@@ -165,7 +165,9 @@ DrawerType2 {
                     borderWidth: 1
 
                     text: qsTr("Copy config string")
-                    imageSource: "qrc:/images/controls/copy.svg"
+                    leftImageSource: "qrc:/images/controls/copy.svg"
+
+                    KeyNavigation.tab: showSettingsButton
                 }
 
                 BasicButtonType {

diff --git a/client/ui/qml/Controls2/BasicButtonType.qml b/client/ui/qml/Controls2/BasicButtonType.qml
@@ -22,9 +22,10 @@ Button {
     property int borderWidth: 0
     property int borderFocusedWidth: 1
 
-    property string imageSource
+    property string leftImageSource
     property string rightImageSource
-    property string leftImageColor: textColor
+    property string leftImageColor
+    property bool changeLeftImageSize: true
 
     property bool squareLeftSide: false
 
@@ -153,18 +154,23 @@ Button {
             anchors.centerIn: parent
 
             Image {
-                Layout.preferredHeight: 20
-                Layout.preferredWidth: 20
-
-                source: root.imageSource
-                visible: root.imageSource === "" ? false : true
+                id: leftImage
+                source: root.leftImageSource
+                visible: root.leftImageSource === "" ? false : true
 
                 layer {
-                    enabled: true
+                    enabled: leftImageColor !== "" ? true : false
                     effect: ColorOverlay {
                         color: leftImageColor
                     }
                 }
+
+                Component.onCompleted: {
+                    if (root.changeLeftImageSize) {
+                        leftImage.Layout.preferredHeight = 20
+                        leftImage.Layout.preferredWidth = 20
+                    }
+                }
             }
 
             ButtonTextType {

diff --git a/client/ui/qml/Controls2/DrawerType2.qml b/client/ui/qml/Controls2/DrawerType2.qml
@@ -85,7 +85,7 @@ Item {
 
         function onClosed() {
             drawerContent.state = root.drawerCollapsedStateName
-
+            
             if (root.isCollapsedStateActive()) {
                 var initialPageNavigationBarColor = PageController.getInitialPageNavigationBarColor()
                 if (initialPageNavigationBarColor !== 0xFF1C1D21) {

diff --git a/client/ui/qml/Controls2/TextFieldWithHeaderType.qml b/client/ui/qml/Controls2/TextFieldWithHeaderType.qml
@@ -193,7 +193,7 @@ Item {
 
         focusPolicy: Qt.NoFocus
         text: root.buttonText
-        imageSource: root.buttonImageSource
+        leftImageSource: root.buttonImageSource
 
         anchors.top: content.top
         anchors.bottom: content.bottom

diff --git a/client/ui/qml/Pages2/PageHome.qml b/client/ui/qml/Pages2/PageHome.qml
@@ -97,7 +97,6 @@ PageType {
                 pressedColor: AmneziaStyle.color.sheerWhite
                 disabledColor: AmneziaStyle.color.mutedGray
                 textColor: AmneziaStyle.color.mutedGray
-                leftImageColor: AmneziaStyle.color.transparent
                 borderWidth: 0
 
                 buttonTextLabel.lineHeight: 20
@@ -109,7 +108,7 @@ PageType {
 
                 text: isSplitTunnelingEnabled ? qsTr("Split tunneling enabled") : qsTr("Split tunneling disabled")
 
-                imageSource: isSplitTunnelingEnabled ? "qrc:/images/controls/split-tunneling.svg" : ""
+                leftImageSource: isSplitTunnelingEnabled ? "qrc:/images/controls/split-tunneling.svg" : ""
                 rightImageSource: "qrc:/images/controls/chevron-down.svg"
 
                 Keys.onEnterPressed: splitTunnelingButton.clicked()
@@ -156,6 +155,7 @@ PageType {
 
                 anchors.left: parent.left
                 anchors.right: parent.right
+                spacing: 0
 
                 Component.onCompleted: {
                     drawer.collapsedHeight = collapsed.implicitHeight
@@ -261,18 +261,49 @@ PageType {
                 RowLayout {
                     objectName: "rowLayoutLabel"
                     Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
-                    Layout.bottomMargin: drawer.isCollapsedStateActive ? 44 : ServersModel.isDefaultServerFromApi ? 89 : 44
+                    Layout.topMargin: 8
+                    Layout.bottomMargin: drawer.isCollapsed ? 44 : ServersModel.isDefaultServerFromApi ? 61 : 16
                     spacing: 0
 
-                    Image {
-                        Layout.rightMargin: 8
-                        visible: source !== ""
-                        source: ServersModel.defaultServerImagePathCollapsed
+                    BasicButtonType {
+                        enabled: (ServersModel.defaultServerImagePathCollapsed !== "") && drawer.isCollapsed
+                        hoverEnabled: enabled
+
+                        implicitHeight: 36
+
+                        leftPadding: 16
+                        rightPadding: 16
+
+                        defaultColor: AmneziaStyle.color.transparent
+                        hoveredColor: AmneziaStyle.color.translucentWhite
+                        pressedColor: AmneziaStyle.color.sheerWhite
+                        disabledColor: AmneziaStyle.color.transparent
+                        textColor: AmneziaStyle.color.mutedGray
+
+                        buttonTextLabel.lineHeight: 16
+                        buttonTextLabel.font.pixelSize: 13
+                        buttonTextLabel.font.weight: 400
+
+                        text: drawer.isCollapsed ? ServersModel.defaultServerDescriptionCollapsed : ServersModel.defaultServerDescriptionExpanded
+                        leftImageSource: ServersModel.defaultServerImagePathCollapsed
+                        changeLeftImageSize: false
+
+                        rightImageSource: hoverEnabled ? "qrc:/images/controls/chevron-down.svg" : ""
+
+                        onClicked: {
+                            ServersModel.processedIndex = ServersModel.defaultIndex
+                            PageController.goToPage(PageEnum.PageSettingsServerInfo)
+                        }
                     }
+                }
+            }
 
-                    LabelTextType {
-                        id: collapsedServerMenuDescription
-                        text: drawer.isCollapsedStateActive ? ServersModel.defaultServerDescriptionCollapsed : ServersModel.defaultServerDescriptionExpanded
+            Connections {
+                target: drawer
+                enabled: !GC.isMobile()
+                function onIsCollapsedChanged() {
+                    if (!drawer.isCollapsed) {
+                        focusItem1.forceActiveFocus()
                     }
                 }
             }

diff --git a/client/ui/qml/Pages2/PageShare.qml b/client/ui/qml/Pages2/PageShare.qml
@@ -529,7 +529,7 @@ PageType {
                 visible: accessTypeSelector.currentIndex === 0
 
                 text: qsTr("Share")
-                imageSource: "qrc:/images/controls/share-2.svg"                
+                leftImageSource: "qrc:/images/controls/share-2.svg"
 
 
                 parentFlickable: a

diff --git a/client/ui/qml/Pages2/PageShareFullAccess.qml b/client/ui/qml/Pages2/PageShareFullAccess.qml
@@ -126,7 +126,7 @@ PageType {
                 Layout.topMargin: 40
 
                 text: qsTr("Share")
-                imageSource: "qrc:/images/controls/share-2.svg"
+                leftImageSource: "qrc:/images/controls/share-2.svg"
 
                 clickedFunc: function() {
                     PageController.showBusyIndicator(true)