Merge pull request #5571 from opengisch/hard-exit-reboot

Hard exit reboot
opengisch · Aug 16, 2024 · ec78ee4 · ec78ee4 · qfield-fairy · Aug 16, 2024
2 parents 6f12de7 + 3a57a4b
commit ec78ee4
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 4 deletions.
diff --git a/images/images.qrc b/images/images.qrc
@@ -541,5 +541,6 @@
         <file>themes/qfield/nodpi/ic_password_48dp.svg</file>
         <file>themes/qfield/nodpi/ic_arrow_drop_down_48dp.svg</file>
         <file>themes/qfield/nodpi/ic_arrow_drop_up_48dp.svg</file>
+        <file>themes/qfield/nodpi/ic_shutdown_24dp.svg</file>
     </qresource>
 </RCC>
diff --git a/images/themes/qfield/nodpi/ic_shutdown_24dp.svg b/images/themes/qfield/nodpi/ic_shutdown_24dp.svg
diff --git a/src/qml/WelcomeScreen.qml b/src/qml/WelcomeScreen.qml
@@ -781,6 +781,23 @@ Page {
     }
   }
 
+  QfToolButton {
+    id: exitButton
+    visible: false
+    anchors {
+      top: parent.top
+      right: parent.right
+      topMargin: mainWindow.sceneTopMargin
+    }
+    iconSource: Theme.getThemeVectorIcon('ic_shutdown_24dp')
+    iconColor: Theme.mainTextColor
+
+    onClicked: {
+      mainWindow.closeAlreadyRequested = true;
+      mainWindow.close();
+    }
+  }
+
   // Sparkles & unicorns
   Rectangle {
     anchors.fill: parent
@@ -887,6 +904,7 @@ Page {
     if (visible) {
       const currentProjectButtonVisible = !!qgisProject.fileName;
       currentProjectButton.visible = currentProjectButtonVisible;
+      exitButton.visible = currentProjectButtonVisible && (Qt.platform.os === "ios" || Qt.platform.os === "android");
       if (firstShown) {
         welcomeText.text = " ";
       } else {

diff --git a/src/qml/qgismobileapp.qml b/src/qml/qgismobileapp.qml
@@ -3847,17 +3847,17 @@ ApplicationWindow {
     state: iface.hasProjectOnLaunch() ? "visible" : "hidden"
   }
 
-  property bool alreadyCloseRequested: false
+  property bool closeAlreadyRequested: false
 
   onClosing: close => {
     if (screenLocker.enabled) {
       close.accepted = false;
       displayToast(qsTr("Unlock the screen to to close project and app"));
       return;
     }
-    if (!alreadyCloseRequested) {
+    if (!closeAlreadyRequested) {
       close.accepted = false;
-      alreadyCloseRequested = true;
+      closeAlreadyRequested = true;
       displayToast(qsTr("Press back again to close project and app"));
       closingTimer.start();
     } else {
@@ -3869,7 +3869,7 @@ ApplicationWindow {
     id: closingTimer
     interval: 2000
     onTriggered: {
-      alreadyCloseRequested = false;
+      closeAlreadyRequested = false;
     }
   }