Add AM/PM indicator

RyanDam · May 1, 2020 · 1cf56c4 · 1cf56c4
1 parent 3f1e768
commit 1cf56c4
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 1 deletion.
diff --git a/resources/settings/settings.xml b/resources/settings/settings.xml
@@ -109,6 +109,7 @@
             <listEntry value="18">@Strings.barometer</listEntry>
             <listEntry value="21">@Strings.countdown</listEntry>
             <listEntry value="25">@Strings.weather</listEntry>
+            <listEntry value="26">@Strings.ampm</listEntry>
         </settingConfig>
     </setting>
     <setting propertyKey="@Properties.comp2h" title="@Strings.comp2h">
@@ -139,6 +140,7 @@
             <listEntry value="18">@Strings.barometer</listEntry>
             <listEntry value="21">@Strings.countdown</listEntry>
             <listEntry value="25">@Strings.weather</listEntry>
+            <listEntry value="26">@Strings.ampm</listEntry>
         </settingConfig>
     </setting>
     <setting propertyKey="@Properties.comp4h" title="@Strings.comp4h">
@@ -169,6 +171,7 @@
             <listEntry value="18">@Strings.barometer</listEntry>
             <listEntry value="21">@Strings.countdown</listEntry>
             <listEntry value="25">@Strings.weather</listEntry>
+            <listEntry value="26">@Strings.ampm</listEntry>
         </settingConfig>
     </setting>
     <setting propertyKey="@Properties.comp6h" title="@Strings.comp6h">
@@ -199,6 +202,7 @@
             <listEntry value="18">@Strings.barometer</listEntry>
             <listEntry value="21">@Strings.countdown</listEntry>
             <listEntry value="25">@Strings.weather</listEntry>
+            <listEntry value="26">@Strings.ampm</listEntry>
         </settingConfig>
     </setting>
     <setting propertyKey="@Properties.comp8h" title="@Strings.comp8h">
@@ -229,6 +233,7 @@
             <listEntry value="18">@Strings.barometer</listEntry>
             <listEntry value="21">@Strings.countdown</listEntry>
             <listEntry value="25">@Strings.weather</listEntry>
+            <listEntry value="26">@Strings.ampm</listEntry>
         </settingConfig>
     </setting>
     <setting propertyKey="@Properties.comp10h" title="@Strings.comp10h">
@@ -259,6 +264,7 @@
             <listEntry value="18">@Strings.barometer</listEntry>
             <listEntry value="21">@Strings.countdown</listEntry>
             <listEntry value="25">@Strings.weather</listEntry>
+            <listEntry value="26">@Strings.ampm</listEntry>
         </settingConfig>
     </setting>
     <setting propertyKey="@Properties.compbart" title="@Strings.compbart">
@@ -289,6 +295,7 @@
             <listEntry value="18">@Strings.barometer</listEntry>
             <listEntry value="21">@Strings.countdown</listEntry>
             <listEntry value="25">@Strings.weather</listEntry>
+            <listEntry value="26">@Strings.ampm</listEntry>
         </settingConfig>
     </setting>
     <setting propertyKey="@Properties.compbarb" title="@Strings.compbarb">
@@ -319,6 +326,7 @@
             <listEntry value="18">@Strings.barometer</listEntry>
             <listEntry value="21">@Strings.countdown</listEntry>
             <listEntry value="25">@Strings.weather</listEntry>
+            <listEntry value="26">@Strings.ampm</listEntry>
         </settingConfig>
     </setting>
 

diff --git a/resources/strings/strings.xml b/resources/strings/strings.xml
@@ -76,6 +76,7 @@
     <string id="barometer">Barometer</string>
     <string id="weeknum">Week of year</string>
     <string id="weather">Weather</string>
+    <string id="ampm">AM/PM indicator</string>
 
     <string id="date_format">Date format</string>
     <string id="datef1">ddd d (TUE 2)</string>

diff --git a/source/datafield/DataFactory.mc b/source/datafield/DataFactory.mc
@@ -39,7 +39,9 @@ enum /* FIELD_TYPES */ {
 
 	FIELD_TYPE_TEMPERATURE_OUT = 23,
 	FIELD_TYPE_TEMPERATURE_HL,
-	FIELD_TYPE_WEATHER
+	FIELD_TYPE_WEATHER,
+
+	FIELD_TYPE_AMPM_INDICATOR = 26
 }
 
 function buildFieldObject(type) {
@@ -95,6 +97,8 @@ function buildFieldObject(type) {
 		return new TemparatureHLField(FIELD_TYPE_TEMPERATURE_HL);
 	} else if (type==FIELD_TYPE_WEATHER) {
 		return new WeatherField(FIELD_TYPE_WEATHER);
+	} else if (type==FIELD_TYPE_AMPM_INDICATOR) {
+		return new AMPMField(FIELD_TYPE_AMPM_INDICATOR);
 	}
 
 	return new EmptyDataField(FIELD_TYPE_EMPTY);
@@ -231,6 +235,27 @@ class WeatherField extends BaseDataField {
 	}
 }
 
+/////////////////
+// AM/PM stage //
+/////////////////
+
+class AMPMField extends BaseDataField {
+
+	function initialize(id) {
+		BaseDataField.initialize(id);
+	}
+
+	function cur_label(value) {
+    	var clockTime = Sys.getClockTime();        		
+    	var hour = clockTime.hour;
+		if (hour>=12) {
+			return "pm";
+		} else {
+			return "am";
+		}
+	}
+}
+
 ///////////////////////////
 // temparature hl stage //
 ///////////////////////////