Skip to content

Commit 91b3545

Browse files
committed
Fix UI issues
1 parent 2ee61a0 commit 91b3545

File tree

8 files changed

+51
-7
lines changed

8 files changed

+51
-7
lines changed

.github/workflows/deploy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -470,7 +470,7 @@ jobs:
470470

471471
env:
472472
ANDROID_BUILD_PLATFORM: android-36
473-
QT_VERSION: 6.9.3
473+
QT_VERSION: 6.8.3
474474
QT_MODULES: 'qtremoteobjects qt5compat qtimageformats qtshadertools'
475475
PROD_AGW_PUBLIC_KEY: ${{ secrets.PROD_AGW_PUBLIC_KEY }}
476476
PROD_S3_ENDPOINT: ${{ secrets.PROD_S3_ENDPOINT }}

client/android/AndroidManifest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
android:configChanges="uiMode|screenSize|smallestScreenSize|screenLayout|orientation|density
4646
|fontScale|layoutDirection|locale|keyboard|keyboardHidden|navigation|mcc|mnc"
4747
android:launchMode="singleInstance"
48-
android:windowSoftInputMode="stateUnchanged|adjustResize"
48+
android:windowSoftInputMode="adjustResize|stateUnchanged"
4949
android:enableOnBackInvokedCallback="false"
5050
android:exported="true">
5151

@@ -215,4 +215,4 @@
215215
<meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/qtprovider_paths" />
216216
</provider>
217217
</application>
218-
</manifest>
218+
</manifest>

client/ui/qml/Controls2/DrawerType2.qml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,22 @@ Item {
4949
return drawerContent.state === stateName
5050
}
5151

52+
Connections {
53+
target: Qt.application
54+
55+
function onStateChanged() {
56+
if (Qt.application.state !== Qt.ApplicationActive) {
57+
if (dragArea.drag.active) {
58+
dragArea.drag.target = null
59+
dragArea.drag.target = drawerContent
60+
}
61+
if (isOpened && !isCollapsedStateActive()) {
62+
root.closeTriggered()
63+
}
64+
}
65+
}
66+
}
67+
5268
Connections {
5369
target: PageController
5470

client/ui/qml/Controls2/DropDownType.qml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,18 @@ Item {
7474
FocusController.nextKeyRightItem()
7575
}
7676

77+
Connections {
78+
target: Qt.application
79+
80+
function onStateChanged() {
81+
if (Qt.application.state !== Qt.ApplicationActive) {
82+
if (!menu.isClosed) {
83+
menu.closeTriggered()
84+
}
85+
}
86+
}
87+
}
88+
7789
implicitWidth: rootButtonContent.implicitWidth
7890
implicitHeight: rootButtonContent.implicitHeight
7991

client/ui/qml/Controls2/TextFieldWithHeaderType.qml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ Item {
6767
border.width: 1
6868

6969
Behavior on border.color {
70-
PropertyAnimation { duration: 200 }
70+
PropertyAnimation { duration: 100 }
7171
}
7272

7373
RowLayout {

client/ui/qml/Pages2/PageHome.qml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,21 @@ import "../Components"
2020
PageType {
2121
id: root
2222

23+
Connections {
24+
target: Qt.application
25+
26+
function onStateChanged() {
27+
if (Qt.application.state !== Qt.ApplicationActive) {
28+
if (drawer.isOpened) {
29+
drawer.closeTriggered()
30+
}
31+
if (homeSplitTunnelingDrawer.isOpened) {
32+
homeSplitTunnelingDrawer.closeTriggered()
33+
}
34+
}
35+
}
36+
}
37+
2338
Connections {
2439
objectName: "pageControllerConnections"
2540

client/ui/qml/Pages2/PageSetupWizardInstalling.qml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ PageType {
103103

104104
BaseHeaderType {
105105
Layout.fillWidth: true
106-
Layout.topMargin: 20
106+
Layout.topMargin: 20 + SettingsController.safeAreaTopMargin
107107
Layout.leftMargin: 16
108108
Layout.rightMargin: 16
109109

@@ -147,6 +147,7 @@ PageType {
147147

148148
Layout.fillWidth: true
149149
Layout.topMargin: 24
150+
Layout.bottomMargin: 24 + SettingsController.safeAreaBottomMargin
150151
Layout.leftMargin: 16
151152
Layout.rightMargin: 16
152153

client/ui/qml/Pages2/PageSetupWizardStart.qml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,15 @@ PageType {
2525
source: "qrc:/images/amneziaBigLogo.png"
2626

2727
Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
28-
Layout.topMargin: 32
28+
Layout.topMargin: 32 + SettingsController.safeAreaTopMargin
2929
Layout.preferredWidth: 360
3030
Layout.preferredHeight: 287
3131
}
3232

3333
BasicButtonType {
3434
id: startButton
3535
Layout.fillWidth: true
36-
Layout.bottomMargin: 48
36+
Layout.bottomMargin: 48 + SettingsController.safeAreaBottomMargin
3737
Layout.leftMargin: 16
3838
Layout.rightMargin: 16
3939
Layout.alignment: Qt.AlignBottom

0 commit comments

Comments
 (0)