From 988be50eeb82c83b3ef4ca1728d9f8b8a81aed68 Mon Sep 17 00:00:00 2001 From: Darren Croton Date: Sun, 30 Apr 2017 10:31:00 +1000 Subject: [PATCH] Added settings to turn on and off steps/goal and sunrise/sunset for PRO users --- bin/SnapshotWatch-settings.json | 2 +- bin/SnapshotWatch.prg | Bin 60477 -> 61084 bytes bin/SnapshotWatch.prg.debug.xml | 803 ++++++++++++++++---------------- resources/resources.xml | 10 + source/SnapshotWatchView.mc | 13 +- 5 files changed, 428 insertions(+), 400 deletions(-) diff --git a/bin/SnapshotWatch-settings.json b/bin/SnapshotWatch-settings.json index 66aa984..f755a15 100644 --- a/bin/SnapshotWatch-settings.json +++ b/bin/SnapshotWatch-settings.json @@ -1 +1 @@ -{"settings":[{"key":"code","valueType":"string","defaultValue":"get code at app store page","configTitle":"CodeLabel","configPrompt":null,"configHelpUrl":null,"configError":null,"configType":"alphaNumeric","configReadonly":false,"configRequired":false,"configOptions":null,"configMin":null,"configMax":null,"configMaxLength":null},{"key":"showHeartRate","valueType":"boolean","defaultValue":true,"configTitle":"ShowHeartRateLabel","configPrompt":null,"configHelpUrl":null,"configError":null,"configType":"boolean","configReadonly":false,"configRequired":false,"configOptions":null,"configMin":null,"configMax":null,"configMaxLength":null},{"key":"graphColour","valueType":"number","defaultValue":0,"configTitle":"GraphColourLabel","configPrompt":null,"configHelpUrl":null,"configError":null,"configType":"list","configReadonly":false,"configRequired":true,"configOptions":[{"display":"DK_GRAY","value":0},{"display":"RED","value":1},{"display":"DK_RED","value":2},{"display":"ORANGE","value":3},{"display":"YELLOW","value":4},{"display":"GREEN","value":5},{"display":"DK_GREEN","value":6},{"display":"BLUE","value":7},{"display":"DK_BLUE","value":8},{"display":"PURPLE","value":9},{"display":"PINK","value":10}],"configMin":null,"configMax":null,"configMaxLength":null},{"key":"useZonesColour","valueType":"boolean","defaultValue":true,"configTitle":"UseZonesColourLabel","configPrompt":null,"configHelpUrl":null,"configError":null,"configType":"boolean","configReadonly":false,"configRequired":false,"configOptions":null,"configMin":null,"configMax":null,"configMaxLength":null},{"key":"showSecondTime","valueType":"boolean","defaultValue":false,"configTitle":"ShowSecondTimeLabel","configPrompt":null,"configHelpUrl":null,"configError":null,"configType":"boolean","configReadonly":false,"configRequired":false,"configOptions":null,"configMin":null,"configMax":null,"configMaxLength":null},{"key":"secondTimeOffset","valueType":"number","defaultValue":0,"configTitle":"SecondTimeOffsetLabel","configPrompt":null,"configHelpUrl":null,"configError":null,"configType":"numeric","configReadonly":false,"configRequired":false,"configOptions":null,"configMin":null,"configMax":null,"configMaxLength":null}],"languages":{"valyrian":{"UseZonesColourLabel":"Additionally colour code graph by profile heart rate zones?","DK_GRAY":"Dark Gray","DK_GREEN":"Dark Green","BLUE":"Blue","SecondTimeOffsetLabel":"[PRO] Second (digital) time hour offset (integer, +-24)","PURPLE":"Purple","GREEN":"Green","DK_RED":"Dark Red","DK_BLUE":"Dark Blue","AppName":"SnapshotWatch","RED":"Red","PINK":"Pink","CodeLabel":"Activation code for PRO features","ShowHeartRateLabel":"Show heart rate graph and min/max values","GraphColourLabel":"Heart rate graph colour","ShowSecondTimeLabel":"[PRO] Show second (digital) time","YELLOW":"Yellow","ORANGE":"Orange"}}} \ No newline at end of file +{"settings":[{"key":"code","valueType":"string","defaultValue":"get code at app store page","configTitle":"CodeLabel","configPrompt":null,"configHelpUrl":null,"configError":null,"configType":"alphaNumeric","configReadonly":false,"configRequired":false,"configOptions":null,"configMin":null,"configMax":null,"configMaxLength":null},{"key":"showHeartRate","valueType":"boolean","defaultValue":true,"configTitle":"ShowHeartRateLabel","configPrompt":null,"configHelpUrl":null,"configError":null,"configType":"boolean","configReadonly":false,"configRequired":false,"configOptions":null,"configMin":null,"configMax":null,"configMaxLength":null},{"key":"graphColour","valueType":"number","defaultValue":0,"configTitle":"GraphColourLabel","configPrompt":null,"configHelpUrl":null,"configError":null,"configType":"list","configReadonly":false,"configRequired":true,"configOptions":[{"display":"DK_GRAY","value":0},{"display":"RED","value":1},{"display":"DK_RED","value":2},{"display":"ORANGE","value":3},{"display":"YELLOW","value":4},{"display":"GREEN","value":5},{"display":"DK_GREEN","value":6},{"display":"BLUE","value":7},{"display":"DK_BLUE","value":8},{"display":"PURPLE","value":9},{"display":"PINK","value":10}],"configMin":null,"configMax":null,"configMaxLength":null},{"key":"useZonesColour","valueType":"boolean","defaultValue":true,"configTitle":"UseZonesColourLabel","configPrompt":null,"configHelpUrl":null,"configError":null,"configType":"boolean","configReadonly":false,"configRequired":false,"configOptions":null,"configMin":null,"configMax":null,"configMaxLength":null},{"key":"showSteps","valueType":"boolean","defaultValue":false,"configTitle":"ShowStepsLabel","configPrompt":null,"configHelpUrl":null,"configError":null,"configType":"boolean","configReadonly":false,"configRequired":false,"configOptions":null,"configMin":null,"configMax":null,"configMaxLength":null},{"key":"showRiseSet","valueType":"boolean","defaultValue":false,"configTitle":"ShowRiseSetLabel","configPrompt":null,"configHelpUrl":null,"configError":null,"configType":"boolean","configReadonly":false,"configRequired":false,"configOptions":null,"configMin":null,"configMax":null,"configMaxLength":null},{"key":"showSecondTime","valueType":"boolean","defaultValue":false,"configTitle":"ShowSecondTimeLabel","configPrompt":null,"configHelpUrl":null,"configError":null,"configType":"boolean","configReadonly":false,"configRequired":false,"configOptions":null,"configMin":null,"configMax":null,"configMaxLength":null},{"key":"secondTimeOffset","valueType":"number","defaultValue":0,"configTitle":"SecondTimeOffsetLabel","configPrompt":null,"configHelpUrl":null,"configError":null,"configType":"numeric","configReadonly":false,"configRequired":false,"configOptions":null,"configMin":null,"configMax":null,"configMaxLength":null}],"languages":{"valyrian":{"UseZonesColourLabel":"Additionally colour code graph by profile heart rate zones?","ShowRiseSetLabel":"[PRO] Show sunrise/sunset","DK_GRAY":"Dark Gray","DK_GREEN":"Dark Green","BLUE":"Blue","SecondTimeOffsetLabel":"[PRO] Second (digital) time hour offset (integer, +-24)","PURPLE":"Purple","GREEN":"Green","DK_RED":"Dark Red","DK_BLUE":"Dark Blue","AppName":"SnapshotWatch","RED":"Red","PINK":"Pink","CodeLabel":"Activation code for PRO features","ShowHeartRateLabel":"Show heart rate graph and min/max values","GraphColourLabel":"Heart rate graph colour","ShowSecondTimeLabel":"[PRO] Show second (digital) time","YELLOW":"Yellow","ORANGE":"Orange","ShowStepsLabel":"[PRO] Show steps/step goal"}}} \ No newline at end of file diff --git a/bin/SnapshotWatch.prg b/bin/SnapshotWatch.prg index 42b34e226f1af4f9a1c20a46f4723f52b0c0bb34..1259d73748dc4a8d6758fe9bcbdb0535d128e8d6 100644 GIT binary patch delta 22647 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 diff --git a/bin/SnapshotWatch.prg.debug.xml b/bin/SnapshotWatch.prg.debug.xml index a994d95..639291f 100644 --- a/bin/SnapshotWatch.prg.debug.xml +++ b/bin/SnapshotWatch.prg.debug.xml @@ -35,393 +35,402 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - + + - + - + - - + + - + - + - - - + + + - + - + - + - + - - + + - + - - - - - - - + + + + + + + - - - + + + - + - - + + - - - + + + - - + + - + - - - - - - + + + + + + - - - + + + - + - - + + + + + - + - + - - - - - + + + + + - + - + - + - - - - - + + + + + @@ -430,70 +439,70 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/resources.xml b/resources/resources.xml index e9c0193..8b4318c 100644 --- a/resources/resources.xml +++ b/resources/resources.xml @@ -5,6 +5,8 @@ true 0 true + false + false false 0 @@ -25,6 +27,8 @@ Purple Pink Additionally colour code graph by profile heart rate zones? + [PRO] Show steps/step goal + [PRO] Show sunrise/sunset [PRO] Show second (digital) time [PRO] Second (digital) time hour offset (integer, +-24) @@ -54,6 +58,12 @@ + + + + + + diff --git a/source/SnapshotWatchView.mc b/source/SnapshotWatchView.mc index a9351e8..f7f2e5b 100644 --- a/source/SnapshotWatchView.mc +++ b/source/SnapshotWatchView.mc @@ -22,6 +22,8 @@ class SnapshotWatchView extends Ui.WatchFace { var usePreferences = true; var showHeartRate = true; + var showSteps = false; + var showRiseSet = false; var showSecondTime = false; var secondTimeOffset = 0; @@ -87,6 +89,8 @@ class SnapshotWatchView extends Ui.WatchFace { showHeartRate = Application.getApp().getProperty("showHeartRate"); graphColour = Application.getApp().getProperty("graphColour"); useZonesColour = Application.getApp().getProperty("useZonesColour"); + showSteps = Application.getApp().getProperty("showSteps"); + showRiseSet = Application.getApp().getProperty("showRiseSet"); showSecondTime = Application.getApp().getProperty("showSecondTime"); secondTimeOffset = Application.getApp().getProperty("secondTimeOffset"); } @@ -95,6 +99,8 @@ class SnapshotWatchView extends Ui.WatchFace { if (!proFeatures) { + showSteps = false; + showRiseSet = false; showSecondTime = false; } @@ -183,12 +189,15 @@ class SnapshotWatchView extends Ui.WatchFace { { offset = 6; } dc.drawText(width_screen/2-33-offset, 7, Gfx.FONT_SMALL, Lang.format("$1$%", [battery.format("%2d")]), Graphics.TEXT_JUSTIFY_LEFT|Graphics.TEXT_JUSTIFY_VCENTER); - if (proFeatures) + if (showSteps) { // Show steps dc.drawText(width_screen-4, height_screen/2 - 14, Gfx.FONT_SMALL, ActMon.getInfo().steps, Graphics.TEXT_JUSTIFY_RIGHT|Graphics.TEXT_JUSTIFY_VCENTER); dc.drawText(width_screen-4, height_screen/2 + 11, Gfx.FONT_SMALL, ActMon.getInfo().stepGoal, Graphics.TEXT_JUSTIFY_RIGHT|Graphics.TEXT_JUSTIFY_VCENTER); - + } + + if (showRiseSet) + { // Show sunrise and sunset drawSunriseSunset(dc); }