Merge pull request #503 from YIO-Remote/feature/12-hour_clock

feat: 12-hour time format option

Author: zehnm

basic_ui/ChargingScreen.qml

@@ -143,7 +143,7 @@ Rectangle {
     Text {
         id: timeText
         color: Style.color.text
-        text: loader_main.item ? loader_main.item.statusBar.timeText.text : ""
+        text: loader_main.item ? loader_main.item.statusBar.timeText.text.replace(" ", "\n") : ""
         verticalAlignment: Text.AlignVCenter
         anchors { horizontalCenter: parent.horizontalCenter; bottom: parent.bottom; bottomMargin: -400 }
         font { family: "Open Sans Light"; weight: Font.Light; pixelSize: 150 }

basic_ui/StatusBar.qml

@@ -124,13 +124,12 @@ Item {
     //////////////////////////////////////////////////////////////////////////////////////////////////
     Timer { // timer that updates the time and date
         id: timer
-        interval: 100
+        interval: 2000
         repeat: true
         running: true
 
-        onTriggered:
-        {
-            timeText.text =  Qt.formatDateTime(new Date(),"hh:mm")
+        onTriggered: {
+            timeText.text = Qt.formatTime(new Date(), config.settings.clock12h ? "hh:mm AP" : "hh:mm")
         }
     }
 
@@ -139,7 +138,7 @@ Item {
     Text { // time in the middle
         id: timeText
         color: Style.color.text
-        text: "22:00"
+        text: ""
         verticalAlignment: Text.AlignVCenter
         height: parent.height
         anchors { horizontalCenter: parent.horizontalCenter; verticalCenter: parent.verticalCenter }

basic_ui/settings/System.qml

@@ -177,6 +177,38 @@ Rectangle {
             color: Style.color.background
         }
 
+        ButtonGroup { id: clockRadioGroup }
+
+        Item {
+            width: parent.width; height: childrenRect.height + 40
+
+            Text {
+                id: clockTypeText
+                color: Style.color.text
+                text: qsTr("24-hour clock") + translateHandler.emptyString
+                anchors { left: parent.left; leftMargin: 20; top: parent.top; topMargin: 20 }
+                font: Style.font.button
+            }
+
+            BasicUI.CustomSwitch {
+                id: clockTypeButton
+
+                anchors { right: parent.right; rightMargin: 20; verticalCenter: clockTypeText.verticalCenter }
+
+                checked: !config.settings.clock12h
+                mouseArea.onClicked: {
+                    var tmp = config.settings;
+                    tmp.clock12h = !tmp.clock12h;
+                    config.settings = tmp;
+                }
+            }
+        }
+
+        Rectangle {
+            width: parent.width; height: 2
+            color: Style.color.background
+        }
+
         Item {
             width: parent.width; height: childrenRect.height + 40
 

config-schema.json

@@ -799,6 +799,12 @@
           "title": "Enable Bluetooth area beacons",
           "default": false
         },
+        "clock12h": {
+          "$id": "#/properties/settings/properties/clock12h",
+          "type": "boolean",
+          "title": "Use 12-hour clock",
+          "default": false
+        },
         "language": {
           "$id": "#/properties/settings/properties/language",
           "type": "string",

config.json

@@ -4,6 +4,7 @@
     "settings": {
         "autobrightness": true,
         "bluetootharea": false,
+        "clock12h": false,
         "language": "en_US",
         "logging": {
             "console": true,

sources/hardware/mock/batteryfuelgauge_mock.h

@@ -34,7 +34,7 @@ class BatteryFuelGaugeMock : public BatteryFuelGauge {
 
     // BatteryFuelGauge interface
  public:
-    void    begin() override {}
+    void    begin() override { emit isChargingChanged(); }
     int     getVoltage() override { return 5000; }
     int     getFullChargeCapacity() override { return 2500; }
     int     getAverageCurrent() override { return -1600; }
@@ -48,6 +48,6 @@ class BatteryFuelGaugeMock : public BatteryFuelGauge {
     void    changeCapacity(int newCapacity) override { Q_UNUSED(newCapacity) }
     int     getLevel() override { return 100; }
     int     getHealth() override { return 100; }
-    bool    getIsCharging() override { return false; }
+    bool    getIsCharging() override { return false; }  // to test charging screen: return true
     float   remainingLife() override { return 2; }
 };

translations/en_US.ts

@@ -1192,32 +1192,37 @@ YIO remote %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../basic_ui/settings/System.qml" line="186"/>
+        <location filename="../basic_ui/settings/System.qml" line="188"/>
+        <source>24-hour clock</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../basic_ui/settings/System.qml" line="218"/>
         <source>Uptime</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../basic_ui/settings/System.qml" line="214"/>
+        <location filename="../basic_ui/settings/System.qml" line="246"/>
         <source>CPU temperature</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../basic_ui/settings/System.qml" line="241"/>
+        <location filename="../basic_ui/settings/System.qml" line="273"/>
         <source>CPU load</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../basic_ui/settings/System.qml" line="267"/>
+        <location filename="../basic_ui/settings/System.qml" line="299"/>
         <source>Used memory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../basic_ui/settings/System.qml" line="291"/>
+        <location filename="../basic_ui/settings/System.qml" line="323"/>
         <source>Reboot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../basic_ui/settings/System.qml" line="305"/>
+        <location filename="../basic_ui/settings/System.qml" line="337"/>
         <source>Shutdown</source>
         <translation type="unfinished"></translation>
     </message>