5.4.0 - Support for new watches: Forerunner® 255S, Forerunner® 255S M…

…usic, Forerunner® 265, Forerunner® 265S, Forerunner® 965 Better screen layout for all watches.
dliedke · Mar 10, 2023 · 98fdcec · 98fdcec
1 parent 57a4bd6
commit 98fdcec
Show file tree

Hide file tree

Showing 21 changed files with 101 additions and 42 deletions.
diff --git a/HrvAlgorithms/manifest.xml b/HrvAlgorithms/manifest.xml
@@ -36,6 +36,8 @@
             <iq:product id="fr255m"/>
             <iq:product id="fr255s"/>
             <iq:product id="fr255sm"/>
+            <iq:product id="fr265"/>
+            <iq:product id="fr265s"/>
             <iq:product id="fr55"/>
             <iq:product id="fr645"/>
             <iq:product id="fr645m"/>
@@ -44,6 +46,7 @@
             <iq:product id="fr945"/>
             <iq:product id="fr945lte"/>
             <iq:product id="fr955"/>
+            <iq:product id="fr965"/>
             <iq:product id="legacyherocaptainmarvel"/>
             <iq:product id="legacyherofirstavenger"/>
             <iq:product id="legacysagadarthvader"/>
@@ -56,7 +59,6 @@
             <iq:product id="marqcaptain"/>
             <iq:product id="marqcommander"/>
             <iq:product id="marqdriver"/>
-            <iq:product id="marqexpedition"/>
             <iq:product id="marqgolfer"/>
             <iq:product id="venu"/>
             <iq:product id="venu2"/>

diff --git a/Meditate/manifest.xml b/Meditate/manifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!-- This is a generated file. It is highly recommended that you DO NOT edit this file. -->
 <iq:manifest xmlns:iq="http://www.garmin.com/xml/connectiq" version="3">
-    <iq:application entry="MeditateApp" id="9abb375dcf7c4ace87ff66f4f774f6c8" launcherIcon="@Drawables.launcherIcon" minSdkVersion="3.0.0" name="@Strings.AppName" type="watch-app" version="5.3.0">
+    <iq:application entry="MeditateApp" id="9abb375dcf7c4ace87ff66f4f774f6c8" launcherIcon="@Drawables.launcherIcon" minSdkVersion="3.0.0" name="@Strings.AppName" type="watch-app" version="5.4.0">
         <iq:products>
             <iq:product id="approachs62"/>
             <iq:product id="d2air"/>
@@ -29,11 +29,13 @@
             <iq:product id="fr255m"/>
             <iq:product id="fr255s"/>
             <iq:product id="fr255sm"/>
+            <iq:product id="fr265"/>
+            <iq:product id="fr265s"/>
             <iq:product id="fr645m"/>
             <iq:product id="fr745"/>
             <iq:product id="fr945"/>
             <iq:product id="fr945lte"/>
-            <iq:product id="fr955"/>
+            <iq:product id="fr965"/>
             <iq:product id="legacyherocaptainmarvel"/>
             <iq:product id="legacyherofirstavenger"/>
             <iq:product id="legacysagadarthvader"/>
@@ -46,7 +48,6 @@
             <iq:product id="marqcaptain"/>
             <iq:product id="marqcommander"/>
             <iq:product id="marqdriver"/>
-            <iq:product id="marqexpedition"/>
             <iq:product id="marqgolfer"/>
             <iq:product id="venu"/>
             <iq:product id="venu2"/>

diff --git a/Meditate/resources-por/strings/strings.xml b/Meditate/resources-por/strings/strings.xml
@@ -5,17 +5,17 @@
     <string id="confirmDeleteAllIntervalAlertsHeader">Deletar todos alertas?</string>
 
     <string id="SummaryTitle">Sumário</string>
-    <string id="SummaryHR">Sumário FC</string>
-    <string id="SummaryStress">Sumário\n Stress</string>
+    <string id="SummaryHR">Freq. Card.</string>
+    <string id="SummaryStress">Stress</string>
     <string id="SummaryStressStart">Stress no Início: $1$</string>
     <string id="SummaryStressEnd">Stress no Fim: $1$</string>
     <string id="SummaryRespiration">Respiração</string>
     <string id="SummaryRespirationMin">Min: </string>
     <string id="SummaryRespirationAvg">Med: </string>
     <string id="SummaryRespirationMax">Max: </string>
-    <string id="SummaryHRVRMSSD">Sumário\n VFC RMSSD</string>
-    <string id="SummaryHRVpNNx">Sumário\n VFC pNNx</string>
-    <string id="SummaryHRVSDRR">Sumário\n VFC SDRR</string>
+    <string id="SummaryHRVRMSSD">VFC RMSSD</string>
+    <string id="SummaryHRVpNNx">VFC pNNx</string>
+    <string id="SummaryHRVSDRR">VFC SDRR</string>
     <string id="SummaryHRVRMSSDFirst5min">Primeiros 5 min</string>
     <string id="SummaryHRVRMSSDLast5min">Últimos 5 min</string>
 
@@ -140,7 +140,7 @@
     <string id="HRVready">VFC Pronto</string>
     <string id="HRVoff">VFC Deslig.</string>
 
-    <string id="about_AppVersion">Meditate 5.3.0</string>
+    <string id="about_AppVersion">Meditate 5.4.0</string>
     <string id="about_vtrifonov">   vtrifonov</string>
     <string id="about_dliedke">     dliedke</string>
 

diff --git a/Meditate/resources-rectangle-320x360/constants.xml b/Meditate/resources-rectangle-320x360/constants.xml
@@ -8,6 +8,8 @@
 	<property id="sessionDetailsYOffset" type="number">10</property>
 	<property id="sessionDetailsAlertsLineYOffset" type="number">12</property>
 	<property id="meditateActivityIconsXPos" type="number">90</property>
+	<property id="meditateActivityIconsYOffset" type="number">20</property>
+	<property id="meditateActivityXHrTextOffset" type="number">-20</property>
 	<property id="meditateActivityDurationArcWidth" type="number">45</property>
 	<property id="summaryHrIconsXPos" type="number">80</property>
 	<property id="summaryHrValueXPos" type="number">110</property>

diff --git a/Meditate/resources-round-208x208/constants.xml b/Meditate/resources-round-208x208/constants.xml
diff --git a/Meditate/resources-round-218x218/constants.xml b/Meditate/resources-round-218x218/constants.xml
@@ -6,6 +6,10 @@
 	<property id="sessionDetailsIconsXPos" type="number">30</property>
 	<property id="sessionDetailsValueXPos" type="number">55</property>
 	<property id="meditateActivityIconsXPos" type="number">60</property>
+	<property id="meditateActivityIconsYOffset" type="number">0</property>
+	<property id="meditateActivityXHrTextOffset" type="number">-10</property>
+	<property id="meditateActivityXHrvTextOffset" type="number">22</property>
+	<property id="meditateActivityXBreathTextOffset" type="number">32</property>
 	<property id="summaryLinesYOffset" type="number">-7</property>	
 	<property id="heartRateChartWidth" type="number">180</property>
 	<property id="heartRateChartLineExtra" type="number">0</property>

diff --git a/Meditate/resources-round-240x240/constants.xml b/Meditate/resources-round-240x240/constants.xml
@@ -2,10 +2,16 @@
 	<property id="progressBarWidth" type="number">150</property>
 	<property id="globalSettingsIconsXPos" type="number">50</property>
 	<property id="globalSettingsValueXPos" type="number">70</property>
-	<property id="globalSettingsLinesYOffset" type="number">-10</property>
+	<property id="globalSettingsLinesYOffset" type="number">10</property>
+	<property id="titlePosY" type="number">30</property>
 	<property id="sessionDetailsIconsXPos" type="number">35</property>
 	<property id="sessionDetailsValueXPos" type="number">60</property>
+	<property id="sessionDetailsYOffset" type="number">25</property>
 	<property id="meditateActivityIconsXPos" type="number">90</property>
+	<property id="meditateActivityIconsYOffset" type="number">12</property>
+	<property id="meditateActivityXHrTextOffset" type="number">-10</property>
+	<property id="meditateActivityXHrvTextOffset" type="number">22</property>
+	<property id="meditateActivityXBreathTextOffset" type="number">32</property>
 	<property id="summaryLinesYOffset" type="number">10</property>	
 	<property id="heartRateChartWidth" type="number">180</property>
 	<property id="heartRateChartLineExtra" type="number">0</property>

diff --git a/Meditate/resources-round-260x260/constants.xml b/Meditate/resources-round-260x260/constants.xml
@@ -3,8 +3,10 @@
 	<property id="globalSettingsIconsXPos" type="number">50</property>
 	<property id="globalSettingsValueXPos" type="number">70</property>
 	<property id="globalSettingsLinesYOffset" type="number">10</property>
+	<property id="titlePosY" type="number">30</property>
 	<property id="sessionDetailsIconsXPos" type="number">35</property>
 	<property id="sessionDetailsValueXPos" type="number">60</property>
+	<property id="sessionDetailsYOffset" type="number">25</property>
 	<property id="meditateActivityIconsXPos" type="number">90</property>
 	<property id="summaryLinesYOffset" type="number">10</property>	
 	<property id="heartRateChartWidth" type="number">180</property>

diff --git a/Meditate/resources-round-280x280/constants.xml b/Meditate/resources-round-280x280/constants.xml
@@ -3,8 +3,10 @@
 	<property id="globalSettingsIconsXPos" type="number">54</property>
 	<property id="globalSettingsValueXPos" type="number">74</property>
 	<property id="globalSettingsLinesYOffset" type="number">10</property>
+	<property id="titlePosY" type="number">35</property>
 	<property id="sessionDetailsIconsXPos" type="number">40</property>
 	<property id="sessionDetailsValueXPos" type="number">65</property>
+	<property id="sessionDetailsYOffset" type="number">30</property>
 	<property id="meditateActivityIconsXPos" type="number">90</property>
 	<property id="summaryLinesYOffset" type="number">15</property>
 	<property id="heartRateChartWidth" type="number">240</property>

diff --git a/Meditate/resources-round-360x360/constants.xml b/Meditate/resources-round-360x360/constants.xml
@@ -3,6 +3,7 @@
 	<property id="globalSettingsIconsXPos" type="number">70</property>
 	<property id="globalSettingsValueXPos" type="number">100</property>
 	<property id="globalSettingsLinesYOffset" type="number">20</property>
+	<property id="titlePosY" type="number">35</property>
 	<property id="sessionDetailsIconsXPos" type="number">60</property>
 	<property id="sessionDetailsValueXPos" type="number">90</property>
 	<property id="sessionDetailsYOffset" type="number">20</property>
@@ -22,6 +23,7 @@
 	<property id="detailsModelIconHeight" type="number">52</property>
 	<property id="hmmTimePickerOutputXOffset" type="number">140</property>
 	<property id="mmssTimePickerOutputXOffset" type="number">130</property>	
+	<property id="heartRateChartTitleY" type="number">30</property>
 	<property id="heartRateChartWidth" type="number">320</property>
 	<property id="heartRateChartLineExtra" type="number">-15</property>
 	<property id="heartRateChartYPos" type="number">22</property>

diff --git a/Meditate/resources-round-390x390/constants.xml b/Meditate/resources-round-390x390/constants.xml
@@ -3,6 +3,7 @@
 	<property id="globalSettingsIconsXPos" type="number">85</property>
 	<property id="globalSettingsValueXPos" type="number">115</property>
 	<property id="globalSettingsLinesYOffset" type="number">20</property>
+	<property id="titlePosY" type="number">40</property>
 	<property id="sessionDetailsIconsXPos" type="number">60</property>
 	<property id="sessionDetailsValueXPos" type="number">90</property>
 	<property id="sessionDetailsYOffset" type="number">20</property>
@@ -22,6 +23,7 @@
 	<property id="detailsModelIconHeight" type="number">52</property>
 	<property id="hmmTimePickerOutputXOffset" type="number">140</property>
 	<property id="mmssTimePickerOutputXOffset" type="number">130</property>
+	<property id="heartRateChartTitleY" type="number">40</property>
 	<property id="heartRateChartWidth" type="number">320</property>
 	<property id="heartRateChartYPos" type="number">24</property>
 	<property id="heartRateChartXPos" type="number">15</property>

diff --git a/Meditate/resources-round-416x416/constants.xml b/Meditate/resources-round-416x416/constants.xml
@@ -3,12 +3,14 @@
 	<property id="globalSettingsIconsXPos" type="number">85</property>
 	<property id="globalSettingsValueXPos" type="number">115</property>
 	<property id="globalSettingsLinesYOffset" type="number">20</property>
+	<property id="titlePosY" type="number">45</property>
 	<property id="sessionDetailsIconsXPos" type="number">60</property>
 	<property id="sessionDetailsValueXPos" type="number">90</property>
-	<property id="sessionDetailsYOffset" type="number">20</property>
+	<property id="sessionDetailsYOffset" type="number">40</property>
 	<property id="sessionDetailsAlertsLineYOffset" type="number">12</property>
 	<property id="meditateActivityIconsXPos" type="number">130</property>
 	<property id="meditateActivityIconsYOffset" type="number">12</property>
+	<property id="meditateActivityXHrTextOffset" type="number">-15</property>
 	<property id="meditateActivityXHrvTextOffset" type="number">22</property>
 	<property id="meditateActivityXBreathTextOffset" type="number">42</property>
 	<property id="summaryHrIconsXPos" type="number">80</property>
@@ -22,6 +24,7 @@
 	<property id="detailsModelIconHeight" type="number">52</property>
 	<property id="hmmTimePickerOutputXOffset" type="number">140</property>
 	<property id="mmssTimePickerOutputXOffset" type="number">130</property>
+	<property id="heartRateChartTitleY" type="number">40</property>
 	<property id="heartRateChartWidth" type="number">320</property>
 	<property id="heartRateChartLineExtra" type="number">-15</property>
 	<property id="heartRateChartYPos" type="number">20</property>

diff --git a/Meditate/resources-round-454x454/constants.xml b/Meditate/resources-round-454x454/constants.xml
@@ -0,0 +1,33 @@
+<properties>
+	<property id="progressBarWidth" type="number">260</property>
+	<property id="globalSettingsIconsXPos" type="number">85</property>
+	<property id="globalSettingsValueXPos" type="number">115</property>
+	<property id="globalSettingsLinesYOffset" type="number">20</property>
+	<property id="titlePosY" type="number">45</property>
+	<property id="sessionDetailsIconsXPos" type="number">60</property>
+	<property id="sessionDetailsValueXPos" type="number">90</property>
+	<property id="sessionDetailsYOffset" type="number">40</property>
+	<property id="sessionDetailsAlertsLineYOffset" type="number">12</property>
+	<property id="meditateActivityIconsXPos" type="number">130</property>
+	<property id="meditateActivityIconsYOffset" type="number">12</property>
+	<property id="meditateActivityXHrTextOffset" type="number">-20</property>
+	<property id="meditateActivityXHrvTextOffset" type="number">22</property>
+	<property id="meditateActivityXBreathTextOffset" type="number">42</property>
+	<property id="summaryHrIconsXPos" type="number">80</property>
+	<property id="summaryHrValueXPos" type="number">110</property>
+	<property id="summaryStressIconsXPos" type="number">80</property>
+	<property id="summaryStressValueXPos" type="number">110</property>
+	<property id="summaryHrvIconsXPos" type="number">80</property>
+	<property id="summaryHrvValueXPos" type="number">110</property>
+	<property id="summaryLinesYOffset" type="number">40</property>
+	<property id="detailsModelLineHeight" type="number">50</property>
+	<property id="detailsModelIconHeight" type="number">52</property>
+	<property id="hmmTimePickerOutputXOffset" type="number">140</property>
+	<property id="mmssTimePickerOutputXOffset" type="number">130</property>
+	<property id="heartRateChartTitleY" type="number">50</property>
+	<property id="heartRateChartWidth" type="number">320</property>
+	<property id="heartRateChartLineExtra" type="number">-15</property>
+	<property id="heartRateChartYPos" type="number">20</property>
+	<property id="heartRateChartXPos" type="number">10</property>
+	<property id="heartRateChartXPosLabel" type="number">-15</property>
+</properties>
diff --git a/Meditate/resources/constants.xml b/Meditate/resources/constants.xml
@@ -3,6 +3,7 @@
 	<property id="globalSettingsIconsXPos" type="number">50</property>
 	<property id="globalSettingsValueXPos" type="number">71</property>
 	<property id="globalSettingsLinesYOffset" type="number">0</property>
+	<property id="titlePosY" type="number">15</property>
 	<property id="sessionDetailsIconsXPos" type="number">30</property>
 	<property id="sessionDetailsValueXPos" type="number">54</property>
 	<property id="sessionDetailsAlertsLineYOffset" type="number">6</property>
@@ -16,12 +17,14 @@
 	<property id="summaryLinesYOffset" type="number">0</property>
 	<property id="meditateActivityIconsXPos" type="number">70</property>
 	<property id="meditateActivityIconsYOffset" type="number">5</property>
+	<property id="meditateActivityXHrTextOffset" type="number">0</property>
 	<property id="meditateActivityXHrvTextOffset" type="number">20</property>
 	<property id="meditateActivityXBreathTextOffset" type="number">28</property>
 	<property id="detailsModelLineHeight" type="number">32</property>
 	<property id="detailsModelIconHeight" type="number">32</property>
 	<property id="hmmTimePickerOutputXOffset" type="number">85</property>
 	<property id="mmssTimePickerOutputXOffset" type="number">75</property>
+	<property id="heartRateChartTitleY" type="number">25</property>
 	<property id="heartRateChartWidth" type="number">180</property>
 	<property id="heartRateChartLineExtra" type="number">0</property>
 	<property id="heartRateChartYPos" type="number">10</property>

diff --git a/Meditate/resources/strings/strings.xml b/Meditate/resources/strings/strings.xml
@@ -5,17 +5,17 @@
     <string id="confirmDeleteAllIntervalAlertsHeader">Delete All Alerts?</string>
 
     <string id="SummaryTitle">Summary</string>
-    <string id="SummaryHR">Summary HR</string>
-    <string id="SummaryStress">Summary\n Stress</string>
+    <string id="SummaryHR">Heart Rate</string>
+    <string id="SummaryStress">Stress</string>
     <string id="SummaryStressStart">Stress Start: $1$</string>
     <string id="SummaryStressEnd">Stress End: $1$</string>
     <string id="SummaryRespiration">Respiration</string>
     <string id="SummaryRespirationMin">Min:</string>
     <string id="SummaryRespirationAvg">Avg:</string>
     <string id="SummaryRespirationMax">Max:</string>
-    <string id="SummaryHRVRMSSD">Summary\n HRV RMSSD</string>
-    <string id="SummaryHRVpNNx">Summary\n HRV pNNx</string>
-    <string id="SummaryHRVSDRR">Summary\n HRV SDRR</string>
+    <string id="SummaryHRVRMSSD">HRV RMSSD</string>
+    <string id="SummaryHRVpNNx">HRV pNNx</string>
+    <string id="SummaryHRVSDRR">HRV SDRR</string>
     <string id="SummaryHRVRMSSDFirst5min">First 5 min</string>
     <string id="SummaryHRVRMSSDLast5min">Last 5 min</string>
 
@@ -139,7 +139,7 @@
     <string id="HRVready">HRV Ready</string>
     <string id="HRVoff">HRV off</string>
 
-    <string id="about_AppVersion">Meditate 5.3.0</string>
+    <string id="about_AppVersion">Meditate 5.4.0</string>
     <string id="about_vtrifonov">   vtrifonov</string>
     <string id="about_dliedke">     dliedke</string>
 

diff --git a/Meditate/source/activity/MeditateView.mc b/Meditate/source/activity/MeditateView.mc
@@ -48,14 +48,15 @@ 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);        
         dc.clear();        
     }
 
     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
@@ -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
@@ -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
@@ -36,6 +36,8 @@
             <iq:product id="fr255m"/>
             <iq:product id="fr255s"/>
             <iq:product id="fr255sm"/>
+            <iq:product id="fr265"/>
+            <iq:product id="fr265s"/>
             <iq:product id="fr55"/>
             <iq:product id="fr645"/>
             <iq:product id="fr645m"/>
@@ -44,6 +46,7 @@
             <iq:product id="fr945"/>
             <iq:product id="fr945lte"/>
             <iq:product id="fr955"/>
+            <iq:product id="fr965"/>
             <iq:product id="legacyherocaptainmarvel"/>
             <iq:product id="legacyherofirstavenger"/>
             <iq:product id="legacysagadarthvader"/>
@@ -56,7 +59,6 @@
             <iq:product id="marqcaptain"/>
             <iq:product id="marqcommander"/>
             <iq:product id="marqdriver"/>
-            <iq:product id="marqexpedition"/>
             <iq:product id="marqgolfer"/>
             <iq:product id="venu"/>
             <iq:product id="venu2"/>