Merge pull request #346 from jmlich/pop-after-timer

Pop after timer refresh daemon
piggz · Mar 1, 2024 · 8786803 · 8786803
2 parents 62b885a + 525e3de
commit 8786803
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/ui/qml/pages/Settings-alarms.qml b/ui/qml/pages/Settings-alarms.qml
@@ -57,7 +57,6 @@ PagePL {
             text: qsTr("Save Settings")
             onClicked: {
                 saveSettings();
-                app.pages.pop();
             }
         }
 
@@ -69,6 +68,7 @@ PagePL {
             running: false
             onTriggered: {
                 DaemonInterfaceInstance.applyDeviceSetting(Amazfish.SETTING_ALARMS);
+                app.pages.pop();
             }
         }
     }

diff --git a/ui/qml/pages/Settings-device.qml b/ui/qml/pages/Settings-device.qml
@@ -106,7 +106,6 @@ PagePL {
                 text: qsTr("Save Settings")
                 onClicked: {
                     saveSettings();
-                    app.pages.pop();
                 }
             }
         }
@@ -122,6 +121,7 @@ PagePL {
                 DaemonInterfaceInstance.applyDeviceSetting(Amazfish.SETTING_DEVICE_TIME);
                 DaemonInterfaceInstance.applyDeviceSetting(Amazfish.SETTING_DEVICE_UNIT);
                 DaemonInterfaceInstance.applyDeviceSetting(Amazfish.SETTING_DISCONNECT_NOTIFICATION);
+                app.pages.pop();
             }
         }
     }

diff --git a/ui/qml/pages/Settings-huami-shortcuts.qml b/ui/qml/pages/Settings-huami-shortcuts.qml
@@ -58,7 +58,6 @@ PagePL {
             onClicked: {
                 saveDisplayItems();
                 saveSettings();
-                app.pages.pop();
             }
         }
 
@@ -70,6 +69,7 @@ PagePL {
             running: false
             onTriggered: {
                 DaemonInterfaceInstance.applyDeviceSetting(Amazfish.SETTING_DEVICE_DISPLAY_ITEMS);
+                app.pages.pop();
             }
         }
     }

diff --git a/ui/qml/pages/Settings-profile.qml b/ui/qml/pages/Settings-profile.qml
@@ -209,7 +209,6 @@ PagePL {
             text: qsTr("Save Profile")
             onClicked: {
                 saveProfile();
-                app.pages.pop();
             }
         }
         Timer {
@@ -225,6 +224,7 @@ PagePL {
                 DaemonInterfaceInstance.applyDeviceSetting(Amazfish.SETTING_USER_DISPLAY_ON_LIFT);
                 DaemonInterfaceInstance.applyDeviceSetting(Amazfish.SETTING_USER_ALL_DAY_HRM);
                 DaemonInterfaceInstance.applyDeviceSetting(Amazfish.SETTING_USER_HRM_SLEEP_DETECTION)
+                app.pages.pop();
             }
         }
     }