Merge branch 'feature/#37-hide-battery-percent'

warmsound · Jun 17, 2018 · 1416e05 · 1416e05
2 parents 04bcb2d + b07a061
commit 1416e05
Show file tree

Hide file tree

Showing 25 changed files with 51 additions and 5 deletions.
diff --git a/resources-approachs60/settings/settings.xml b/resources-approachs60/settings/settings.xml
@@ -24,6 +24,7 @@
 		<settingConfig type="list">
 			<!--listEntry value="0">@Strings.HeartRate</listEntry-->
 			<listEntry value="1">@Strings.Battery</listEntry>
+			<listEntry value="8">@Strings.BatteryHidePercentage</listEntry>
 			<listEntry value="2">@Strings.Notifications</listEntry>
 			<listEntry value="3">@Strings.Calories</listEntry>
 			<listEntry value="4">@Strings.Distance</listEntry>
@@ -37,6 +38,7 @@
 		<settingConfig type="list">
 			<!--listEntry value="0">@Strings.HeartRate</listEntry-->
 			<listEntry value="1">@Strings.Battery</listEntry>
+			<listEntry value="8">@Strings.BatteryHidePercentage</listEntry>
 			<listEntry value="2">@Strings.Notifications</listEntry>
 			<listEntry value="3">@Strings.Calories</listEntry>
 			<listEntry value="4">@Strings.Distance</listEntry>
@@ -50,6 +52,7 @@
 		<settingConfig type="list">
 			<!--listEntry value="0">@Strings.HeartRate</listEntry-->
 			<listEntry value="1">@Strings.Battery</listEntry>
+			<listEntry value="8">@Strings.BatteryHidePercentage</listEntry>
 			<listEntry value="2">@Strings.Notifications</listEntry>
 			<listEntry value="3">@Strings.Calories</listEntry>
 			<listEntry value="4">@Strings.Distance</listEntry>

diff --git a/resources-ces/strings/strings.xml b/resources-ces/strings/strings.xml
@@ -52,6 +52,7 @@
 
 	<string id="HeartRate">Heart Rate</string>
 	<string id="Battery">Battery</string>
+	<string id="BatteryHidePercentage">Battery (Hide Percentage)</string>
 	<string id="Notifications">Notifications</string>
 	<string id="Calories">Calories</string>
 	<string id="Distance">Distance</string>

diff --git a/resources-ciq_1.x-no_hr/settings/settings.xml b/resources-ciq_1.x-no_hr/settings/settings.xml
@@ -41,6 +41,7 @@
 		<settingConfig type="list">
 			<!--listEntry value="0">@Strings.HeartRate</listEntry-->
 			<listEntry value="1">@Strings.Battery</listEntry>
+			<listEntry value="8">@Strings.BatteryHidePercentage</listEntry>
 			<listEntry value="2">@Strings.Notifications</listEntry>
 			<listEntry value="3">@Strings.Calories</listEntry>
 			<listEntry value="4">@Strings.Distance</listEntry>
@@ -54,6 +55,7 @@
 		<settingConfig type="list">
 			<!--listEntry value="0">@Strings.HeartRate</listEntry-->
 			<listEntry value="1">@Strings.Battery</listEntry>
+			<listEntry value="8">@Strings.BatteryHidePercentage</listEntry>
 			<listEntry value="2">@Strings.Notifications</listEntry>
 			<listEntry value="3">@Strings.Calories</listEntry>
 			<listEntry value="4">@Strings.Distance</listEntry>
@@ -67,6 +69,7 @@
 		<settingConfig type="list">
 			<!--listEntry value="0">@Strings.HeartRate</listEntry-->
 			<listEntry value="1">@Strings.Battery</listEntry>
+			<listEntry value="8">@Strings.BatteryHidePercentage</listEntry>
 			<listEntry value="2">@Strings.Notifications</listEntry>
 			<listEntry value="3">@Strings.Calories</listEntry>
 			<listEntry value="4">@Strings.Distance</listEntry>

diff --git a/resources-ciq_1.x/settings/settings.xml b/resources-ciq_1.x/settings/settings.xml
@@ -41,6 +41,7 @@
 		<settingConfig type="list">
 			<listEntry value="0">@Strings.HeartRate</listEntry>
 			<listEntry value="1">@Strings.Battery</listEntry>
+			<listEntry value="8">@Strings.BatteryHidePercentage</listEntry>
 			<listEntry value="2">@Strings.Notifications</listEntry>
 			<listEntry value="3">@Strings.Calories</listEntry>
 			<listEntry value="4">@Strings.Distance</listEntry>
@@ -54,6 +55,7 @@
 		<settingConfig type="list">
 			<listEntry value="0">@Strings.HeartRate</listEntry>
 			<listEntry value="1">@Strings.Battery</listEntry>
+			<listEntry value="8">@Strings.BatteryHidePercentage</listEntry>
 			<listEntry value="2">@Strings.Notifications</listEntry>
 			<listEntry value="3">@Strings.Calories</listEntry>
 			<listEntry value="4">@Strings.Distance</listEntry>
@@ -67,6 +69,7 @@
 		<settingConfig type="list">
 			<listEntry value="0">@Strings.HeartRate</listEntry>
 			<listEntry value="1">@Strings.Battery</listEntry>
+			<listEntry value="8">@Strings.BatteryHidePercentage</listEntry>
 			<listEntry value="2">@Strings.Notifications</listEntry>
 			<listEntry value="3">@Strings.Calories</listEntry>
 			<listEntry value="4">@Strings.Distance</listEntry>

diff --git a/resources-dan/strings/strings.xml b/resources-dan/strings/strings.xml
@@ -52,6 +52,7 @@
 
 	<string id="HeartRate">Heart Rate</string>
 	<string id="Battery">Battery</string>
+	<string id="BatteryHidePercentage">Battery (Hide Percentage)</string>
 	<string id="Notifications">Notifications</string>
 	<string id="Calories">Calories</string>
 	<string id="Distance">Distance</string>

diff --git a/resources-deu/strings/strings.xml b/resources-deu/strings/strings.xml
@@ -52,6 +52,7 @@
 
 	<string id="HeartRate">Heart Rate</string>
 	<string id="Battery">Battery</string>
+	<string id="BatteryHidePercentage">Battery (Hide Percentage)</string>
 	<string id="Notifications">Notifications</string>
 	<string id="Calories">Calories</string>
 	<string id="Distance">Distance</string>

diff --git a/resources-dut/strings/strings.xml b/resources-dut/strings/strings.xml
@@ -52,6 +52,7 @@
 
 	<string id="HeartRate">Heart Rate</string>
 	<string id="Battery">Battery</string>
+	<string id="BatteryHidePercentage">Battery (Hide Percentage)</string>
 	<string id="Notifications">Notifications</string>
 	<string id="Calories">Calories</string>
 	<string id="Distance">Distance</string>

diff --git a/resources-fin/strings/strings.xml b/resources-fin/strings/strings.xml
@@ -52,6 +52,7 @@
 
 	<string id="HeartRate">Heart Rate</string>
 	<string id="Battery">Battery</string>
+	<string id="BatteryHidePercentage">Battery (Hide Percentage)</string>
 	<string id="Notifications">Notifications</string>
 	<string id="Calories">Calories</string>
 	<string id="Distance">Distance</string>

diff --git a/resources-fr735xt/settings/settings.xml b/resources-fr735xt/settings/settings.xml
@@ -41,6 +41,7 @@
 		<settingConfig type="list">
 			<listEntry value="0">@Strings.HeartRate</listEntry>
 			<listEntry value="1">@Strings.Battery</listEntry>
+			<listEntry value="8">@Strings.BatteryHidePercentage</listEntry>
 			<listEntry value="2">@Strings.Notifications</listEntry>
 			<listEntry value="3">@Strings.Calories</listEntry>
 			<listEntry value="4">@Strings.Distance</listEntry>
@@ -54,6 +55,7 @@
 		<settingConfig type="list">
 			<listEntry value="0">@Strings.HeartRate</listEntry>
 			<listEntry value="1">@Strings.Battery</listEntry>
+			<listEntry value="8">@Strings.BatteryHidePercentage</listEntry>
 			<listEntry value="2">@Strings.Notifications</listEntry>
 			<listEntry value="3">@Strings.Calories</listEntry>
 			<listEntry value="4">@Strings.Distance</listEntry>
@@ -67,6 +69,7 @@
 		<settingConfig type="list">
 			<listEntry value="0">@Strings.HeartRate</listEntry>
 			<listEntry value="1">@Strings.Battery</listEntry>
+			<listEntry value="8">@Strings.BatteryHidePercentage</listEntry>
 			<listEntry value="2">@Strings.Notifications</listEntry>
 			<listEntry value="3">@Strings.Calories</listEntry>
 			<listEntry value="4">@Strings.Distance</listEntry>

diff --git a/resources-fre/strings/strings.xml b/resources-fre/strings/strings.xml
@@ -52,6 +52,7 @@
 
 	<string id="HeartRate">Heart Rate</string>
 	<string id="Battery">Battery</string>
+	<string id="BatteryHidePercentage">Battery (Hide Percentage)</string>
 	<string id="Notifications">Notifications</string>
 	<string id="Calories">Calories</string>
 	<string id="Distance">Distance</string>

diff --git a/resources-hun/strings/strings.xml b/resources-hun/strings/strings.xml
@@ -52,6 +52,7 @@
 
 	<string id="HeartRate">Heart Rate</string>
 	<string id="Battery">Battery</string>
+	<string id="BatteryHidePercentage">Battery (Hide Percentage)</string>
 	<string id="Notifications">Notifications</string>
 	<string id="Calories">Calories</string>
 	<string id="Distance">Distance</string>

diff --git a/resources-ita/strings/strings.xml b/resources-ita/strings/strings.xml
@@ -52,6 +52,7 @@
 
 	<string id="HeartRate">Heart Rate</string>
 	<string id="Battery">Battery</string>
+	<string id="BatteryHidePercentage">Battery (Hide Percentage)</string>
 	<string id="Notifications">Notifications</string>
 	<string id="Calories">Calories</string>
 	<string id="Distance">Distance</string>

diff --git a/resources-nob/strings/strings.xml b/resources-nob/strings/strings.xml
@@ -52,6 +52,7 @@
 
 	<string id="HeartRate">Heart Rate</string>
 	<string id="Battery">Battery</string>
+	<string id="BatteryHidePercentage">Battery (Hide Percentage)</string>
 	<string id="Notifications">Notifications</string>
 	<string id="Calories">Calories</string>
 	<string id="Distance">Distance</string>

diff --git a/resources-pol/strings/strings.xml b/resources-pol/strings/strings.xml
@@ -52,6 +52,7 @@
 
 	<string id="HeartRate">Heart Rate</string>
 	<string id="Battery">Battery</string>
+	<string id="BatteryHidePercentage">Battery (Hide Percentage)</string>
 	<string id="Notifications">Notifications</string>
 	<string id="Calories">Calories</string>
 	<string id="Distance">Distance</string>

diff --git a/resources-por/strings/strings.xml b/resources-por/strings/strings.xml
@@ -52,6 +52,7 @@
 
 	<string id="HeartRate">Heart Rate</string>
 	<string id="Battery">Battery</string>
+	<string id="BatteryHidePercentage">Battery (Hide Percentage)</string>
 	<string id="Notifications">Notifications</string>
 	<string id="Calories">Calories</string>
 	<string id="Distance">Distance</string>

diff --git a/resources-slo/strings/strings.xml b/resources-slo/strings/strings.xml
@@ -52,6 +52,7 @@
 
 	<string id="HeartRate">Heart Rate</string>
 	<string id="Battery">Battery</string>
+	<string id="BatteryHidePercentage">Battery (Hide Percentage)</string>
 	<string id="Notifications">Notifications</string>
 	<string id="Calories">Calories</string>
 	<string id="Distance">Distance</string>

diff --git a/resources-slv/strings/strings.xml b/resources-slv/strings/strings.xml
@@ -52,6 +52,7 @@
 
 	<string id="HeartRate">Heart Rate</string>
 	<string id="Battery">Battery</string>
+	<string id="BatteryHidePercentage">Battery (Hide Percentage)</string>
 	<string id="Notifications">Notifications</string>
 	<string id="Calories">Calories</string>
 	<string id="Distance">Distance</string>

diff --git a/resources-spa/strings/strings.xml b/resources-spa/strings/strings.xml
@@ -52,6 +52,7 @@
 
 	<string id="HeartRate">Heart Rate</string>
 	<string id="Battery">Battery</string>
+	<string id="BatteryHidePercentage">Battery (Hide Percentage)</string>
 	<string id="Notifications">Notifications</string>
 	<string id="Calories">Calories</string>
 	<string id="Distance">Distance</string>

diff --git a/resources-swe/strings/strings.xml b/resources-swe/strings/strings.xml
@@ -52,6 +52,7 @@
 
 	<string id="HeartRate">Heart Rate</string>
 	<string id="Battery">Battery</string>
+	<string id="BatteryHidePercentage">Battery (Hide Percentage)</string>
 	<string id="Notifications">Notifications</string>
 	<string id="Calories">Calories</string>
 	<string id="Distance">Distance</string>

diff --git a/resources-vivoactive/settings/settings.xml b/resources-vivoactive/settings/settings.xml
@@ -44,6 +44,7 @@
 		<settingConfig type="list">
 			<!--listEntry value="0">@Strings.HeartRate</listEntry-->
 			<listEntry value="1">@Strings.Battery</listEntry>
+			<listEntry value="8">@Strings.BatteryHidePercentage</listEntry>
 			<listEntry value="2">@Strings.Notifications</listEntry>
 			<listEntry value="3">@Strings.Calories</listEntry>
 			<listEntry value="4">@Strings.Distance</listEntry>
@@ -57,6 +58,7 @@
 		<settingConfig type="list">
 			<!--listEntry value="0">@Strings.HeartRate</listEntry-->
 			<listEntry value="1">@Strings.Battery</listEntry>
+			<listEntry value="8">@Strings.BatteryHidePercentage</listEntry>
 			<listEntry value="2">@Strings.Notifications</listEntry>
 			<listEntry value="3">@Strings.Calories</listEntry>
 			<listEntry value="4">@Strings.Distance</listEntry>
@@ -70,6 +72,7 @@
 		<settingConfig type="list">
 			<!--listEntry value="0">@Strings.HeartRate</listEntry-->
 			<listEntry value="1">@Strings.Battery</listEntry>
+			<listEntry value="8">@Strings.BatteryHidePercentage</listEntry>
 			<listEntry value="2">@Strings.Notifications</listEntry>
 			<listEntry value="3">@Strings.Calories</listEntry>
 			<listEntry value="4">@Strings.Distance</listEntry>

diff --git a/resources-zhs/strings/strings.xml b/resources-zhs/strings/strings.xml
@@ -52,6 +52,7 @@
 
 	<string id="HeartRate">Heart Rate</string>
 	<string id="Battery">Battery</string>
+	<string id="BatteryHidePercentage">Battery (Hide Percentage)</string>
 	<string id="Notifications">Notifications</string>
 	<string id="Calories">Calories</string>
 	<string id="Distance">Distance</string>

diff --git a/resources-zht/strings/strings.xml b/resources-zht/strings/strings.xml
@@ -52,6 +52,7 @@
 
 	<string id="HeartRate">Heart Rate</string>
 	<string id="Battery">Battery</string>
+	<string id="BatteryHidePercentage">Battery (Hide Percentage)</string>
 	<string id="Notifications">Notifications</string>
 	<string id="Calories">Calories</string>
 	<string id="Distance">Distance</string>

diff --git a/resources/settings/settings.xml b/resources/settings/settings.xml
@@ -58,6 +58,7 @@
 		<settingConfig type="list">
 			<listEntry value="0">@Strings.HeartRate</listEntry>
 			<listEntry value="1">@Strings.Battery</listEntry>
+			<listEntry value="8">@Strings.BatteryHidePercentage</listEntry>
 			<listEntry value="2">@Strings.Notifications</listEntry>
 			<listEntry value="3">@Strings.Calories</listEntry>
 			<listEntry value="4">@Strings.Distance</listEntry>
@@ -71,6 +72,7 @@
 		<settingConfig type="list">
 			<listEntry value="0">@Strings.HeartRate</listEntry>
 			<listEntry value="1">@Strings.Battery</listEntry>
+			<listEntry value="8">@Strings.BatteryHidePercentage</listEntry>
 			<listEntry value="2">@Strings.Notifications</listEntry>
 			<listEntry value="3">@Strings.Calories</listEntry>
 			<listEntry value="4">@Strings.Distance</listEntry>
@@ -84,6 +86,7 @@
 		<settingConfig type="list">
 			<listEntry value="0">@Strings.HeartRate</listEntry>
 			<listEntry value="1">@Strings.Battery</listEntry>
+			<listEntry value="8">@Strings.BatteryHidePercentage</listEntry>
 			<listEntry value="2">@Strings.Notifications</listEntry>
 			<listEntry value="3">@Strings.Calories</listEntry>
 			<listEntry value="4">@Strings.Distance</listEntry>

diff --git a/resources/strings/strings.xml b/resources/strings/strings.xml
@@ -52,6 +52,7 @@
 
 	<string id="HeartRate">Heart Rate</string>
 	<string id="Battery">Battery</string>
+	<string id="BatteryHidePercentage">Battery (Hide Percentage)</string>
 	<string id="Notifications">Notifications</string>
 	<string id="Calories">Calories</string>
 	<string id="Distance">Distance</string>

diff --git a/source/CrystalView.mc b/source/CrystalView.mc
@@ -34,6 +34,7 @@ class CrystalView extends Ui.WatchFace {
 		5 => :FIELD_TYPE_ALARMS,
 		6 => :FIELD_TYPE_ALTITUDE,
 		7 => :FIELD_TYPE_TEMPERATURE,
+		8 => :FIELD_TYPE_BATTERY_HIDE_PERCENT,
 	};
 
 	private var ICON_FONT_CHARS = {
@@ -42,6 +43,7 @@ class CrystalView extends Ui.WatchFace {
 		:GOAL_TYPE_ACTIVE_MINUTES => "2",
 		:FIELD_TYPE_HEART_RATE => "3",
 		:FIELD_TYPE_BATTERY => "4",
+		:FIELD_TYPE_BATTERY_HIDE_PERCENT => "4",
 		:FIELD_TYPE_NOTIFICATIONS => "5",
 		:FIELD_TYPE_CALORIES => "6",
 		:GOAL_TYPE_CALORIES => "6", // Use calories icon for both field and goal.
@@ -183,15 +185,18 @@ class CrystalView extends Ui.WatchFace {
 	function onPostUpdate(dc) {
 
 		// Find any battery meter icons, and draw fill on top. 
-		if (FIELD_TYPES[App.getApp().getProperty("LeftFieldType")] == :FIELD_TYPE_BATTERY) {
+		if ((FIELD_TYPES[App.getApp().getProperty("LeftFieldType")] == :FIELD_TYPE_BATTERY) ||
+			(FIELD_TYPES[App.getApp().getProperty("LeftFieldType")] == :FIELD_TYPE_BATTERY_HIDE_PERCENT)) {
 			fillBatteryMeter(dc, mDrawables[:LeftFieldIcon]);
 		}
 
-		if (FIELD_TYPES[App.getApp().getProperty("CenterFieldType")] == :FIELD_TYPE_BATTERY) {
+		if ((FIELD_TYPES[App.getApp().getProperty("CenterFieldType")] == :FIELD_TYPE_BATTERY) ||
+			(FIELD_TYPES[App.getApp().getProperty("CenterFieldType")] == :FIELD_TYPE_BATTERY_HIDE_PERCENT)) {
 			fillBatteryMeter(dc, mDrawables[:CenterFieldIcon]);
 		}
 
-		if (FIELD_TYPES[App.getApp().getProperty("RightFieldType")] == :FIELD_TYPE_BATTERY) {
+		if ((FIELD_TYPES[App.getApp().getProperty("RightFieldType")] == :FIELD_TYPE_BATTERY) ||
+			(FIELD_TYPES[App.getApp().getProperty("RightFieldType")] == :FIELD_TYPE_BATTERY_HIDE_PERCENT)) {
 			fillBatteryMeter(dc, mDrawables[:RightFieldIcon]);
 		}
 	}
@@ -253,7 +258,8 @@ class CrystalView extends Ui.WatchFace {
 		var colour;
 
 		// Grey out icon if no value was retrieved.
-		if (value.length() == 0) {
+		// #37 Do not grey out battery icon (getValueForFieldType() returns empty string).
+		if ((value.length() == 0) && (FIELD_TYPES[fieldType] != :FIELD_TYPE_BATTERY_HIDE_PERCENT)) {
 			colour = App.getApp().getProperty("MeterBackgroundColour");
 		} else {
 			colour = App.getApp().getProperty("ThemeColour");
@@ -299,8 +305,12 @@ class CrystalView extends Ui.WatchFace {
 				value = battery.format("%d") + "%";
 				break;
 
+			case :FIELD_TYPE_BATTERY_HIDE_PERCENT:
+				// #37 Return empty string. updateDataField() has special case so that battery icon is not greyed out.
+				break;
+
 			case :FIELD_TYPE_NOTIFICATIONS:
-				settings = Sys.getDeviceSettings();				
+				settings = Sys.getDeviceSettings();
 				if (settings.notificationCount > 0) {
 					value = settings.notificationCount.format("%d");
 				}