From d7f672ab0a27fe0e7b1877358ffd835260ebc721 Mon Sep 17 00:00:00 2001 From: pokamest Date: Thu, 28 Oct 2021 00:04:54 +0300 Subject: [PATCH] ui fixes --- client/android/build.gradle | 2 + client/ui/qml/Pages/PageGeneralSettings.qml | 188 ++++++++++++-------- client/ui/qml/Pages/PageServerList.qml | 8 +- client/ui/qml/Pages/PageVPN.qml | 12 +- 4 files changed, 130 insertions(+), 80 deletions(-) diff --git a/client/android/build.gradle b/client/android/build.gradle index 6b1aa0da..92d34e56 100644 --- a/client/android/build.gradle +++ b/client/android/build.gradle @@ -106,6 +106,8 @@ android { resConfig "en" minSdkVersion = 24 targetSdkVersion = 30 + versionCode 2 // Change to a higher number + versionName "2.0.1" // Change to a higher number } buildTypes { diff --git a/client/ui/qml/Pages/PageGeneralSettings.qml b/client/ui/qml/Pages/PageGeneralSettings.qml index 4b54ba9c..0da29d00 100644 --- a/client/ui/qml/Pages/PageGeneralSettings.qml +++ b/client/ui/qml/Pages/PageGeneralSettings.qml @@ -13,82 +13,49 @@ PageBase { BackButton { id: back } + + // ---------- App settings ------------ Rectangle { - y: 40 + id: l1 + visible: !GC.isMobile() + anchors.top: back.bottom x: 20 width: parent.width - 40 - height: 1 - color: "#DDDDDD" - } - Rectangle { - y: 100 - x: 20 - width: parent.width - 40 - height: 1 - color: "#DDDDDD" - } - Rectangle { - y: 160 - x: 20 - width: parent.width - 40 - height: 1 - color: "#DDDDDD" - } - Rectangle { - y: 220 - x: 20 - width: parent.width - 40 - height: 1 - color: "#DDDDDD" - } - Rectangle { - y: 280 - x: 20 - width: parent.width - 40 - height: 1 - color: "#DDDDDD" - } - Rectangle { - y: 340 - x: 20 - width: parent.width - 40 - height: 1 - color: "#DDDDDD" - } - Rectangle { - y: 400 - x: 20 - width: parent.width - 40 - height: 1 + height: GC.isMobile() ? 0: 1 color: "#DDDDDD" } SettingButtonType { + id: b1 + visible: !GC.isMobile() + anchors.top: l1.bottom + anchors.topMargin: GC.isMobile() ? 0: 15 x: 30 - y: 355 - width: 330 - height: 30 - icon.source: "qrc:/images/plus.png" - text: qsTr("Add server") - onClicked: { - UiLogic.goToPage(PageEnum.Start) - } - } - SettingButtonType { - x: 30 - y: 55 - width: 330 - height: 30 + width: parent.width - 40 + height: GC.isMobile() ? 0: 30 icon.source: "qrc:/images/settings.png" text: qsTr("App settings") onClicked: { UiLogic.goToPage(PageEnum.AppSettings) } } + + // ---------- Network settings ------------ + Rectangle { + id: l2 + anchors.top: b1.bottom + anchors.topMargin: 15 + x: 20 + width: parent.width - 40 + height: 1 + color: "#DDDDDD" + } SettingButtonType { + id: b2 x: 30 - y: 115 - width: 330 + anchors.top: l2.bottom + anchors.topMargin: 15 + width: parent.width - 40 height: 30 icon.source: "qrc:/images/settings.png" text: qsTr("Network settings") @@ -96,31 +63,46 @@ PageBase { UiLogic.goToPage(PageEnum.NetworkSettings) } } + + // ---------- Server settings ------------ + Rectangle { + id: l3 + anchors.top: b2.bottom + anchors.topMargin: 15 + x: 20 + width: parent.width - 40 + height: 1 + color: "#DDDDDD" + } SettingButtonType { + id: b3 x: 30 - y: 175 + anchors.top: l3.bottom + anchors.topMargin: 15 width: 330 height: 30 icon.source: "qrc:/images/server_settings.png" - text: qsTr("Server management") + text: qsTr("Server Settings") onClicked: { GeneralSettingsLogic.onPushButtonGeneralSettingsServerSettingsClicked() } } - SettingButtonType { - x: 30 - y: 295 - width: 330 - height: 30 - icon.source: "qrc:/images/server_settings.png" - text: qsTr("Servers") - onClicked: { - UiLogic.goToPage(PageEnum.ServersList) - } + + // ---------- Share connection ------------ + Rectangle { + id: l4 + anchors.top: b3.bottom + anchors.topMargin: 15 + x: 20 + width: parent.width - 40 + height: 1 + color: "#DDDDDD" } SettingButtonType { + id: b4 x: 30 - y: 235 + anchors.top: l4.bottom + anchors.topMargin: 15 width: 330 height: 30 icon.source: "qrc:/images/share.png" @@ -130,6 +112,66 @@ PageBase { GeneralSettingsLogic.onPushButtonGeneralSettingsShareConnectionClicked() } } + + // ---------- Servers ------------ + Rectangle { + id: l5 + anchors.top: b4.bottom + anchors.topMargin: 15 + x: 20 + width: parent.width - 40 + height: 1 + color: "#DDDDDD" + } + SettingButtonType { + id: b5 + x: 30 + anchors.top: l5.bottom + anchors.topMargin: 15 + width: 330 + height: 30 + icon.source: "qrc:/images/server_settings.png" + text: qsTr("Servers") + onClicked: { + UiLogic.goToPage(PageEnum.ServersList) + } + } + + // ---------- Add server ------------ + Rectangle { + id: l6 + anchors.top: b5.bottom + anchors.topMargin: 15 + x: 20 + width: parent.width - 40 + height: 1 + color: "#DDDDDD" + } + SettingButtonType { + id: b6 + x: 30 + anchors.top: l6.bottom + anchors.topMargin: 15 + width: 330 + height: 30 + icon.source: "qrc:/images/plus.png" + text: qsTr("Add server") + onClicked: { + UiLogic.goToPage(PageEnum.Start) + } + } + + Rectangle { + id: l7 + anchors.top: b6.bottom + anchors.topMargin: 15 + x: 20 + width: parent.width - 40 + height: 1 + color: "#DDDDDD" + } + + SettingButtonType { x: 30 anchors.bottom: parent.bottom diff --git a/client/ui/qml/Pages/PageServerList.qml b/client/ui/qml/Pages/PageServerList.qml index f4ba9bd2..4f5aaff0 100644 --- a/client/ui/qml/Pages/PageServerList.qml +++ b/client/ui/qml/Pages/PageServerList.qml @@ -49,7 +49,13 @@ PageBase { anchors.fill: parent hoverEnabled: true onClicked: { - listWidget_servers.currentIndex = index + if (GC.isMobile()) { + ServerListLogic.onServerListPushbuttonSettingsClicked(index) + } + else { + listWidget_servers.currentIndex = index + } + mouse.accepted = false } onEntered: { diff --git a/client/ui/qml/Pages/PageVPN.qml b/client/ui/qml/Pages/PageVPN.qml index 7e20824a..179b5744 100644 --- a/client/ui/qml/Pages/PageVPN.qml +++ b/client/ui/qml/Pages/PageVPN.qml @@ -82,7 +82,7 @@ PageBase { Item { x: 0 anchors.bottom: line.top - anchors.bottomMargin: 10 + anchors.bottomMargin: GC.isMobile() ? 0 :10 width: parent.width height: 51 Image { @@ -136,8 +136,8 @@ PageBase { x: 20 width: parent.width - 40 height: 1 - anchors.bottom: conn_type_label.top - anchors.bottomMargin: 10 + anchors.bottom: GC.isMobile() ? root.bottom : conn_type_label.top + anchors.bottomMargin: s10 color: "#DDDDDD" } @@ -146,7 +146,7 @@ PageBase { visible: !GC.isMobile() x: 20 anchors.bottom: conn_type_group.top - anchors.bottomMargin: 10 + anchors.bottomMargin: GC.isMobile() ? 0 :10 width: 281 height: GC.isMobile() ? 0: 21 font.family: "Lato" @@ -208,11 +208,11 @@ PageBase { BasicButtonType { id: button_add_site + visible: !GC.isMobile() anchors.horizontalCenter: parent.horizontalCenter y: parent.height - 60 - //anchors.bottom: parent.bottom width: parent.width - 40 - height: 40 + height: GC.isMobile() ? 0: 40 text: qsTr("+ Add site") enabled: VpnLogic.pushButtonVpnAddSiteEnabled background: Rectangle {