From df265c4c55ae650ecf0cae1dc7858cad538e09e1 Mon Sep 17 00:00:00 2001 From: Vince Wong Date: Sun, 17 Jun 2018 22:34:11 +0100 Subject: [PATCH 1/3] --- resources-ces/strings/strings.xml | 1 + resources-dan/strings/strings.xml | 1 + resources-deu/strings/strings.xml | 1 + resources-dut/strings/strings.xml | 1 + resources-fin/strings/strings.xml | 1 + resources-fre/strings/strings.xml | 1 + resources-hun/strings/strings.xml | 1 + resources-ita/strings/strings.xml | 1 + resources-nob/strings/strings.xml | 1 + resources-pol/strings/strings.xml | 1 + resources-por/strings/strings.xml | 1 + resources-slo/strings/strings.xml | 1 + resources-slv/strings/strings.xml | 1 + resources-spa/strings/strings.xml | 1 + resources-swe/strings/strings.xml | 1 + resources-zhs/strings/strings.xml | 1 + resources-zht/strings/strings.xml | 1 + resources/strings/strings.xml | 1 + 18 files changed, 18 insertions(+) diff --git a/resources-ces/strings/strings.xml b/resources-ces/strings/strings.xml index 6faf72e4..dc840ab0 100644 --- a/resources-ces/strings/strings.xml +++ b/resources-ces/strings/strings.xml @@ -52,6 +52,7 @@ Heart Rate Battery + Battery (Hide Percentage) Notifications Calories Distance diff --git a/resources-dan/strings/strings.xml b/resources-dan/strings/strings.xml index dc96a109..3c8bff29 100644 --- a/resources-dan/strings/strings.xml +++ b/resources-dan/strings/strings.xml @@ -52,6 +52,7 @@ Heart Rate Battery + Battery (Hide Percentage) Notifications Calories Distance diff --git a/resources-deu/strings/strings.xml b/resources-deu/strings/strings.xml index ec0d0843..2de5a651 100644 --- a/resources-deu/strings/strings.xml +++ b/resources-deu/strings/strings.xml @@ -52,6 +52,7 @@ Heart Rate Battery + Battery (Hide Percentage) Notifications Calories Distance diff --git a/resources-dut/strings/strings.xml b/resources-dut/strings/strings.xml index 951a93b1..0c26af5e 100644 --- a/resources-dut/strings/strings.xml +++ b/resources-dut/strings/strings.xml @@ -52,6 +52,7 @@ Heart Rate Battery + Battery (Hide Percentage) Notifications Calories Distance diff --git a/resources-fin/strings/strings.xml b/resources-fin/strings/strings.xml index 9ae932f5..8f4401c6 100644 --- a/resources-fin/strings/strings.xml +++ b/resources-fin/strings/strings.xml @@ -52,6 +52,7 @@ Heart Rate Battery + Battery (Hide Percentage) Notifications Calories Distance diff --git a/resources-fre/strings/strings.xml b/resources-fre/strings/strings.xml index 5b1e36a8..1f261fb9 100644 --- a/resources-fre/strings/strings.xml +++ b/resources-fre/strings/strings.xml @@ -52,6 +52,7 @@ Heart Rate Battery + Battery (Hide Percentage) Notifications Calories Distance diff --git a/resources-hun/strings/strings.xml b/resources-hun/strings/strings.xml index 93ac32e8..e62788fd 100644 --- a/resources-hun/strings/strings.xml +++ b/resources-hun/strings/strings.xml @@ -52,6 +52,7 @@ Heart Rate Battery + Battery (Hide Percentage) Notifications Calories Distance diff --git a/resources-ita/strings/strings.xml b/resources-ita/strings/strings.xml index 090495ea..b35e3279 100644 --- a/resources-ita/strings/strings.xml +++ b/resources-ita/strings/strings.xml @@ -52,6 +52,7 @@ Heart Rate Battery + Battery (Hide Percentage) Notifications Calories Distance diff --git a/resources-nob/strings/strings.xml b/resources-nob/strings/strings.xml index dd18db26..89c078da 100644 --- a/resources-nob/strings/strings.xml +++ b/resources-nob/strings/strings.xml @@ -52,6 +52,7 @@ Heart Rate Battery + Battery (Hide Percentage) Notifications Calories Distance diff --git a/resources-pol/strings/strings.xml b/resources-pol/strings/strings.xml index 4d8f690e..af7d7349 100644 --- a/resources-pol/strings/strings.xml +++ b/resources-pol/strings/strings.xml @@ -52,6 +52,7 @@ Heart Rate Battery + Battery (Hide Percentage) Notifications Calories Distance diff --git a/resources-por/strings/strings.xml b/resources-por/strings/strings.xml index 25fa4bae..f26b24d6 100644 --- a/resources-por/strings/strings.xml +++ b/resources-por/strings/strings.xml @@ -52,6 +52,7 @@ Heart Rate Battery + Battery (Hide Percentage) Notifications Calories Distance diff --git a/resources-slo/strings/strings.xml b/resources-slo/strings/strings.xml index 69a8034f..72d2d355 100644 --- a/resources-slo/strings/strings.xml +++ b/resources-slo/strings/strings.xml @@ -52,6 +52,7 @@ Heart Rate Battery + Battery (Hide Percentage) Notifications Calories Distance diff --git a/resources-slv/strings/strings.xml b/resources-slv/strings/strings.xml index e6574078..ce89f7a9 100644 --- a/resources-slv/strings/strings.xml +++ b/resources-slv/strings/strings.xml @@ -52,6 +52,7 @@ Heart Rate Battery + Battery (Hide Percentage) Notifications Calories Distance diff --git a/resources-spa/strings/strings.xml b/resources-spa/strings/strings.xml index 9c9166e1..7f8da9d5 100644 --- a/resources-spa/strings/strings.xml +++ b/resources-spa/strings/strings.xml @@ -52,6 +52,7 @@ Heart Rate Battery + Battery (Hide Percentage) Notifications Calories Distance diff --git a/resources-swe/strings/strings.xml b/resources-swe/strings/strings.xml index 59ff0e71..0738df27 100644 --- a/resources-swe/strings/strings.xml +++ b/resources-swe/strings/strings.xml @@ -52,6 +52,7 @@ Heart Rate Battery + Battery (Hide Percentage) Notifications Calories Distance diff --git a/resources-zhs/strings/strings.xml b/resources-zhs/strings/strings.xml index 168669fc..ae71e975 100644 --- a/resources-zhs/strings/strings.xml +++ b/resources-zhs/strings/strings.xml @@ -52,6 +52,7 @@ Heart Rate Battery + Battery (Hide Percentage) Notifications Calories Distance diff --git a/resources-zht/strings/strings.xml b/resources-zht/strings/strings.xml index cb791a06..8e9e9fd1 100644 --- a/resources-zht/strings/strings.xml +++ b/resources-zht/strings/strings.xml @@ -52,6 +52,7 @@ Heart Rate Battery + Battery (Hide Percentage) Notifications Calories Distance diff --git a/resources/strings/strings.xml b/resources/strings/strings.xml index ec770a1f..89437c61 100644 --- a/resources/strings/strings.xml +++ b/resources/strings/strings.xml @@ -52,6 +52,7 @@ Heart Rate Battery + Battery (Hide Percentage) Notifications Calories Distance From 23fe856478fc986e9683c10181ba9d4cea2b963e Mon Sep 17 00:00:00 2001 From: Vince Wong Date: Sun, 17 Jun 2018 22:36:31 +0100 Subject: [PATCH 2/3] #37 Add settings --- resources-approachs60/settings/settings.xml | 3 +++ resources-ciq_1.x-no_hr/settings/settings.xml | 3 +++ resources-ciq_1.x/settings/settings.xml | 3 +++ resources-fr735xt/settings/settings.xml | 3 +++ resources-vivoactive/settings/settings.xml | 3 +++ resources/settings/settings.xml | 3 +++ 6 files changed, 18 insertions(+) diff --git a/resources-approachs60/settings/settings.xml b/resources-approachs60/settings/settings.xml index f2e67637..db8ade49 100644 --- a/resources-approachs60/settings/settings.xml +++ b/resources-approachs60/settings/settings.xml @@ -24,6 +24,7 @@ @Strings.Battery + @Strings.BatteryHidePercentage @Strings.Notifications @Strings.Calories @Strings.Distance @@ -37,6 +38,7 @@ @Strings.Battery + @Strings.BatteryHidePercentage @Strings.Notifications @Strings.Calories @Strings.Distance @@ -50,6 +52,7 @@ @Strings.Battery + @Strings.BatteryHidePercentage @Strings.Notifications @Strings.Calories @Strings.Distance diff --git a/resources-ciq_1.x-no_hr/settings/settings.xml b/resources-ciq_1.x-no_hr/settings/settings.xml index 0e4b1ed9..f2ce50bd 100644 --- a/resources-ciq_1.x-no_hr/settings/settings.xml +++ b/resources-ciq_1.x-no_hr/settings/settings.xml @@ -41,6 +41,7 @@ @Strings.Battery + @Strings.BatteryHidePercentage @Strings.Notifications @Strings.Calories @Strings.Distance @@ -54,6 +55,7 @@ @Strings.Battery + @Strings.BatteryHidePercentage @Strings.Notifications @Strings.Calories @Strings.Distance @@ -67,6 +69,7 @@ @Strings.Battery + @Strings.BatteryHidePercentage @Strings.Notifications @Strings.Calories @Strings.Distance diff --git a/resources-ciq_1.x/settings/settings.xml b/resources-ciq_1.x/settings/settings.xml index f434986d..07a15621 100644 --- a/resources-ciq_1.x/settings/settings.xml +++ b/resources-ciq_1.x/settings/settings.xml @@ -41,6 +41,7 @@ @Strings.HeartRate @Strings.Battery + @Strings.BatteryHidePercentage @Strings.Notifications @Strings.Calories @Strings.Distance @@ -54,6 +55,7 @@ @Strings.HeartRate @Strings.Battery + @Strings.BatteryHidePercentage @Strings.Notifications @Strings.Calories @Strings.Distance @@ -67,6 +69,7 @@ @Strings.HeartRate @Strings.Battery + @Strings.BatteryHidePercentage @Strings.Notifications @Strings.Calories @Strings.Distance diff --git a/resources-fr735xt/settings/settings.xml b/resources-fr735xt/settings/settings.xml index 00f905a9..bd5cc8c3 100644 --- a/resources-fr735xt/settings/settings.xml +++ b/resources-fr735xt/settings/settings.xml @@ -41,6 +41,7 @@ @Strings.HeartRate @Strings.Battery + @Strings.BatteryHidePercentage @Strings.Notifications @Strings.Calories @Strings.Distance @@ -54,6 +55,7 @@ @Strings.HeartRate @Strings.Battery + @Strings.BatteryHidePercentage @Strings.Notifications @Strings.Calories @Strings.Distance @@ -67,6 +69,7 @@ @Strings.HeartRate @Strings.Battery + @Strings.BatteryHidePercentage @Strings.Notifications @Strings.Calories @Strings.Distance diff --git a/resources-vivoactive/settings/settings.xml b/resources-vivoactive/settings/settings.xml index 62b775bf..f5b1ca10 100644 --- a/resources-vivoactive/settings/settings.xml +++ b/resources-vivoactive/settings/settings.xml @@ -44,6 +44,7 @@ @Strings.Battery + @Strings.BatteryHidePercentage @Strings.Notifications @Strings.Calories @Strings.Distance @@ -57,6 +58,7 @@ @Strings.Battery + @Strings.BatteryHidePercentage @Strings.Notifications @Strings.Calories @Strings.Distance @@ -70,6 +72,7 @@ @Strings.Battery + @Strings.BatteryHidePercentage @Strings.Notifications @Strings.Calories @Strings.Distance diff --git a/resources/settings/settings.xml b/resources/settings/settings.xml index 2cad1a4f..e06aec3f 100644 --- a/resources/settings/settings.xml +++ b/resources/settings/settings.xml @@ -58,6 +58,7 @@ @Strings.HeartRate @Strings.Battery + @Strings.BatteryHidePercentage @Strings.Notifications @Strings.Calories @Strings.Distance @@ -71,6 +72,7 @@ @Strings.HeartRate @Strings.Battery + @Strings.BatteryHidePercentage @Strings.Notifications @Strings.Calories @Strings.Distance @@ -84,6 +86,7 @@ @Strings.HeartRate @Strings.Battery + @Strings.BatteryHidePercentage @Strings.Notifications @Strings.Calories @Strings.Distance From b07a0619f41f26205bac33d6e4cb653e2a8ddff7 Mon Sep 17 00:00:00 2001 From: Vince Wong Date: Sun, 17 Jun 2018 22:50:13 +0100 Subject: [PATCH 3/3] #37 Implement Battery (Hide Percentage) setting --- source/CrystalView.mc | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/source/CrystalView.mc b/source/CrystalView.mc index f15a5ff1..25dbc134 100644 --- 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"); }