From 98fdcec6f729f12a4aa62403b6d03981719b9d17 Mon Sep 17 00:00:00 2001 From: dliedke Date: Fri, 10 Mar 2023 17:45:49 -0300 Subject: [PATCH] =?UTF-8?q?5.4.0=20-=20Support=20for=20new=20watches:=20Fo?= =?UTF-8?q?rerunner=C2=AE=20255S,=20Forerunner=C2=AE=20255S=20Music,=20For?= =?UTF-8?q?erunner=C2=AE=20265,=20Forerunner=C2=AE=20265S,=20Forerunner?= =?UTF-8?q?=C2=AE=20965=20Better=20screen=20layout=20for=20all=20watches.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- HrvAlgorithms/manifest.xml | 4 ++- Meditate/manifest.xml | 7 ++-- Meditate/resources-por/strings/strings.xml | 12 +++---- .../resources-rectangle-320x360/constants.xml | 2 ++ .../resources-round-208x208/constants.xml | 16 --------- .../resources-round-218x218/constants.xml | 4 +++ .../resources-round-240x240/constants.xml | 8 ++++- .../resources-round-260x260/constants.xml | 2 ++ .../resources-round-280x280/constants.xml | 2 ++ .../resources-round-360x360/constants.xml | 2 ++ .../resources-round-390x390/constants.xml | 2 ++ .../resources-round-416x416/constants.xml | 5 ++- .../resources-round-454x454/constants.xml | 33 +++++++++++++++++++ Meditate/resources/constants.xml | 3 ++ Meditate/resources/strings/strings.xml | 12 +++---- Meditate/source/activity/MeditateView.mc | 3 +- .../source/globalSettings/GlobalSettings.mc | 2 ++ .../summaryScreen/HeartRateGraphView.mc | 2 +- ScreenPicker/manifest.xml | 4 ++- ScreenPicker/sources/DetailsViewRenderer.mc | 14 +++++--- StatusIconFonts/manifest.xml | 4 ++- 21 files changed, 101 insertions(+), 42 deletions(-) delete mode 100644 Meditate/resources-round-208x208/constants.xml create mode 100644 Meditate/resources-round-454x454/constants.xml diff --git a/HrvAlgorithms/manifest.xml b/HrvAlgorithms/manifest.xml index 5991433..180150f 100644 --- a/HrvAlgorithms/manifest.xml +++ b/HrvAlgorithms/manifest.xml @@ -36,6 +36,8 @@ + + @@ -44,6 +46,7 @@ + @@ -56,7 +59,6 @@ - diff --git a/Meditate/manifest.xml b/Meditate/manifest.xml index 33c1a74..058a14b 100644 --- a/Meditate/manifest.xml +++ b/Meditate/manifest.xml @@ -1,7 +1,7 @@ - + @@ -29,11 +29,13 @@ + + - + @@ -46,7 +48,6 @@ - diff --git a/Meditate/resources-por/strings/strings.xml b/Meditate/resources-por/strings/strings.xml index 5418810..da8d770 100644 --- a/Meditate/resources-por/strings/strings.xml +++ b/Meditate/resources-por/strings/strings.xml @@ -5,17 +5,17 @@ Deletar todos alertas? Sumário - Sumário FC - Sumário\n Stress + Freq. Card. + Stress Stress no Início: $1$ Stress no Fim: $1$ Respiração Min: Med: Max: - Sumário\n VFC RMSSD - Sumário\n VFC pNNx - Sumário\n VFC SDRR + VFC RMSSD + VFC pNNx + VFC SDRR Primeiros 5 min Últimos 5 min @@ -140,7 +140,7 @@ VFC Pronto VFC Deslig. - Meditate 5.3.0 + Meditate 5.4.0 vtrifonov dliedke diff --git a/Meditate/resources-rectangle-320x360/constants.xml b/Meditate/resources-rectangle-320x360/constants.xml index dc620e7..f813480 100644 --- a/Meditate/resources-rectangle-320x360/constants.xml +++ b/Meditate/resources-rectangle-320x360/constants.xml @@ -8,6 +8,8 @@ 10 12 90 + 20 + -20 45 80 110 diff --git a/Meditate/resources-round-208x208/constants.xml b/Meditate/resources-round-208x208/constants.xml deleted file mode 100644 index 11f501a..0000000 --- a/Meditate/resources-round-208x208/constants.xml +++ /dev/null @@ -1,16 +0,0 @@ - - 130 - 26 - 46 - -10 - 30 - 55 - 70 - -13 - 180 - 0 - 10 - 10 - -8 - 2 - \ No newline at end of file diff --git a/Meditate/resources-round-218x218/constants.xml b/Meditate/resources-round-218x218/constants.xml index c56f252..33e162e 100644 --- a/Meditate/resources-round-218x218/constants.xml +++ b/Meditate/resources-round-218x218/constants.xml @@ -6,6 +6,10 @@ 30 55 60 + 0 + -10 + 22 + 32 -7 180 0 diff --git a/Meditate/resources-round-240x240/constants.xml b/Meditate/resources-round-240x240/constants.xml index 38dae61..98d0b9f 100644 --- a/Meditate/resources-round-240x240/constants.xml +++ b/Meditate/resources-round-240x240/constants.xml @@ -2,10 +2,16 @@ 150 50 70 - -10 + 10 + 30 35 60 + 25 90 + 12 + -10 + 22 + 32 10 180 0 diff --git a/Meditate/resources-round-260x260/constants.xml b/Meditate/resources-round-260x260/constants.xml index d14abce..2b9ac7c 100644 --- a/Meditate/resources-round-260x260/constants.xml +++ b/Meditate/resources-round-260x260/constants.xml @@ -3,8 +3,10 @@ 50 70 10 + 30 35 60 + 25 90 10 180 diff --git a/Meditate/resources-round-280x280/constants.xml b/Meditate/resources-round-280x280/constants.xml index 888e5bd..5eabc72 100644 --- a/Meditate/resources-round-280x280/constants.xml +++ b/Meditate/resources-round-280x280/constants.xml @@ -3,8 +3,10 @@ 54 74 10 + 35 40 65 + 30 90 15 240 diff --git a/Meditate/resources-round-360x360/constants.xml b/Meditate/resources-round-360x360/constants.xml index a52947a..9036da4 100644 --- a/Meditate/resources-round-360x360/constants.xml +++ b/Meditate/resources-round-360x360/constants.xml @@ -3,6 +3,7 @@ 70 100 20 + 35 60 90 20 @@ -22,6 +23,7 @@ 52 140 130 + 30 320 -15 22 diff --git a/Meditate/resources-round-390x390/constants.xml b/Meditate/resources-round-390x390/constants.xml index 8df51d6..f82464c 100644 --- a/Meditate/resources-round-390x390/constants.xml +++ b/Meditate/resources-round-390x390/constants.xml @@ -3,6 +3,7 @@ 85 115 20 + 40 60 90 20 @@ -22,6 +23,7 @@ 52 140 130 + 40 320 24 15 diff --git a/Meditate/resources-round-416x416/constants.xml b/Meditate/resources-round-416x416/constants.xml index 6709448..1d54def 100644 --- a/Meditate/resources-round-416x416/constants.xml +++ b/Meditate/resources-round-416x416/constants.xml @@ -3,12 +3,14 @@ 85 115 20 + 45 60 90 - 20 + 40 12 130 12 + -15 22 42 80 @@ -22,6 +24,7 @@ 52 140 130 + 40 320 -15 20 diff --git a/Meditate/resources-round-454x454/constants.xml b/Meditate/resources-round-454x454/constants.xml new file mode 100644 index 0000000..d39b0a1 --- /dev/null +++ b/Meditate/resources-round-454x454/constants.xml @@ -0,0 +1,33 @@ + + 260 + 85 + 115 + 20 + 45 + 60 + 90 + 40 + 12 + 130 + 12 + -20 + 22 + 42 + 80 + 110 + 80 + 110 + 80 + 110 + 40 + 50 + 52 + 140 + 130 + 50 + 320 + -15 + 20 + 10 + -15 + \ No newline at end of file diff --git a/Meditate/resources/constants.xml b/Meditate/resources/constants.xml index 784900d..ce68845 100644 --- a/Meditate/resources/constants.xml +++ b/Meditate/resources/constants.xml @@ -3,6 +3,7 @@ 50 71 0 + 15 30 54 6 @@ -16,12 +17,14 @@ 0 70 5 + 0 20 28 32 32 85 75 + 25 180 0 10 diff --git a/Meditate/resources/strings/strings.xml b/Meditate/resources/strings/strings.xml index 1f074ef..9976cb6 100644 --- a/Meditate/resources/strings/strings.xml +++ b/Meditate/resources/strings/strings.xml @@ -5,17 +5,17 @@ Delete All Alerts? Summary - Summary HR - Summary\n Stress + Heart Rate + Stress Stress Start: $1$ Stress End: $1$ Respiration Min: Avg: Max: - Summary\n HRV RMSSD - Summary\n HRV pNNx - Summary\n HRV SDRR + HRV RMSSD + HRV pNNx + HRV SDRR First 5 min Last 5 min @@ -139,7 +139,7 @@ HRV Ready HRV off - Meditate 5.3.0 + Meditate 5.4.0 vtrifonov dliedke diff --git a/Meditate/source/activity/MeditateView.mc b/Meditate/source/activity/MeditateView.mc index 3dd3c3d..920ee02 100644 --- a/Meditate/source/activity/MeditateView.mc +++ b/Meditate/source/activity/MeditateView.mc @@ -48,6 +48,7 @@ class MeditateView extends Ui.View { } private static const TextFont = App.getApp().getProperty("largeFont"); + private static const meditateActivityXHrTextOffset = App.getApp().getProperty("meditateActivityXHrTextOffset"); private function renderBackground(dc) { dc.setColor(Gfx.COLOR_TRANSPARENT, Gfx.COLOR_BLACK); @@ -55,7 +56,7 @@ class MeditateView extends Ui.View { } private function renderHrStatusLayout(dc) { - var xPosText = dc.getWidth() / 2; + var xPosText = (dc.getWidth() / 2) + meditateActivityXHrTextOffset; var yPosText = getYPosOffsetFromCenter(dc, 0 + mRespirationRateYPosOffset); me.mHrStatusText = createMeditateText(Gfx.COLOR_WHITE, TextFont, xPosText, yPosText, Gfx.TEXT_JUSTIFY_CENTER); diff --git a/Meditate/source/globalSettings/GlobalSettings.mc b/Meditate/source/globalSettings/GlobalSettings.mc index be253ec..9d8bf9c 100644 --- a/Meditate/source/globalSettings/GlobalSettings.mc +++ b/Meditate/source/globalSettings/GlobalSettings.mc @@ -85,6 +85,8 @@ class GlobalSettings { static function loadPrepareTime() { var prepareTime = App.Storage.getValue(PrepareTimeKey); if (prepareTime == null) { + //DEBUG - no prepare time for debugging faster + //return 0; return 15; } else { diff --git a/Meditate/source/summaryScreen/HeartRateGraphView.mc b/Meditate/source/summaryScreen/HeartRateGraphView.mc index 5c9c18c..5094060 100644 --- a/Meditate/source/summaryScreen/HeartRateGraphView.mc +++ b/Meditate/source/summaryScreen/HeartRateGraphView.mc @@ -55,7 +55,7 @@ class HeartRateGraphView extends ScreenPicker.ScreenPickerView { // Draw title text dc.drawText(centerX, - 25, + App.getApp().getProperty("heartRateChartTitleY"), App.getApp().getProperty("largeFont"), Ui.loadResource(Rez.Strings.SummaryHR), Graphics.TEXT_JUSTIFY_CENTER); diff --git a/ScreenPicker/manifest.xml b/ScreenPicker/manifest.xml index 94f40f9..970eb0b 100644 --- a/ScreenPicker/manifest.xml +++ b/ScreenPicker/manifest.xml @@ -36,6 +36,8 @@ + + @@ -44,6 +46,7 @@ + @@ -56,7 +59,6 @@ - diff --git a/ScreenPicker/sources/DetailsViewRenderer.mc b/ScreenPicker/sources/DetailsViewRenderer.mc index 2180b63..def1991 100644 --- a/ScreenPicker/sources/DetailsViewRenderer.mc +++ b/ScreenPicker/sources/DetailsViewRenderer.mc @@ -5,13 +5,13 @@ using Toybox.Application as App; module ScreenPicker { class DetailsViewRenderer { - private const TitlePosY = 15; - + private var mTitlePosY = 15; private var mDetailsModel; - + function initialize(detailsModel) { me.mDetailsModel = detailsModel; me.progressBarWidth = App.getApp().getProperty("progressBarWidth"); + me.mTitlePosY = App.getApp().getProperty("titlePosY"); } function renderBackgroundColor(dc) { @@ -57,7 +57,13 @@ module ScreenPicker { private function displayTitle(dc, title, titleFont) { var textX = dc.getWidth() / 2; - dc.drawText(textX, TitlePosY, titleFont, title, Gfx.TEXT_JUSTIFY_CENTER); + + // Could not access the Meditate project strings from this barrel + if (title.equals("Settings") || title.equals("Globais")) { + dc.drawText(textX, mTitlePosY - 10, titleFont, title, Gfx.TEXT_JUSTIFY_CENTER); + } else { + dc.drawText(textX, mTitlePosY, titleFont, title, Gfx.TEXT_JUSTIFY_CENTER); + } } private function displayFontIcon(dc, icon, yPos) { diff --git a/StatusIconFonts/manifest.xml b/StatusIconFonts/manifest.xml index 490a9ed..b30aaff 100644 --- a/StatusIconFonts/manifest.xml +++ b/StatusIconFonts/manifest.xml @@ -36,6 +36,8 @@ + + @@ -44,6 +46,7 @@ + @@ -56,7 +59,6 @@ -