Change Always-on-Display to configuration item

This changes the Always-on-Display setting to a stored setting instead of reading from the lowPowerModeEnabled value. This allows for independent settings of AoD in both main screen and Nightstand mode and helps address AsteroidOS/asteroid#131 Signed-off-by: Ed Beroset <[email protected]>
AsteroidOS · Sep 12, 2023 · 10daa47 · 10daa47
1 parent ed7401c
commit 10daa47
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 5 deletions.
diff --git a/src/qml/DisplayPage.qml b/src/qml/DisplayPage.qml
@@ -35,6 +35,12 @@ Item {
         defaultValue: DeviceInfo.needsBurnInProtection
     }
 
+    ConfigurationValue {
+        id: alwaysOnDisplay
+        key: "/org/asteroidos/settings/always-on-display"
+        defaultValue: true
+    }
+
     property string rowHeight: Dims.h(25)
 
     Flickable {
@@ -82,8 +88,11 @@ Item {
                 width: parent.width
                 //% "Always on Display"
                 text: qsTrId("id-always-on-display")
-                checked: displaySettings.lowPowerModeEnabled
-                onCheckedChanged: displaySettings.lowPowerModeEnabled = checked
+                checked: alwaysOnDisplay.value
+                onCheckedChanged: {
+                    displaySettings.lowPowerModeEnabled = checked
+                    alwaysOnDisplay.value = checked
+                }
             }
 
             LabeledSwitch {

diff --git a/src/qml/NightstandPage.qml b/src/qml/NightstandPage.qml
@@ -23,7 +23,7 @@ import QtQuick.Layouts 1.3
 import org.asteroid.controls 1.0
 import org.asteroid.utils 1.0
 import org.asteroid.settings 1.0
-import org.nemomobile.systemsettings 1.0
+import org.nemomobile.systemsettings 1.0 as NemoSystemSettings
 import Nemo.Configuration 1.0
 
 Item {
@@ -54,9 +54,14 @@ Item {
     ConfigurationValue {
         id: nightstandAlwaysOnDisplay
         key: "/desktop/asteroid/nightstand/always-on-display"
-        defaultValue: false
+        defaultValue: true
+    }
+
+    NemoSystemSettings.DisplaySettings { 
+        id: displaySettings
     }
 
+
     property string rowHeight: Dims.h(25)
 
     Flickable {
@@ -143,7 +148,10 @@ Item {
                     //% "Always on Display"
                     text: qsTrId("id-always-on-display")
                     checked: nightstandAlwaysOnDisplay.value
-                    onCheckedChanged: nightstandAlwaysOnDisplay.value = checked
+                    onCheckedChanged: {
+                        nightstandAlwaysOnDisplay.value = checked
+                        displaySettings.lowPowerModeEnabled = checked
+                    }
                 }
             }