Skip to content

Commit

Permalink
5.2.0 - New about menu and screen with app version, icon and develope…
Browse files Browse the repository at this point in the history
…rs. Also continue firing alert for repeated invervals even after regular session time is over
  • Loading branch information
dliedke committed Feb 4, 2023
1 parent c3f959e commit ae6237d
Show file tree
Hide file tree
Showing 10 changed files with 90 additions and 8 deletions.
2 changes: 1 addition & 1 deletion Meditate/manifest.xml
Original file line number Diff line number Diff line change
@@ -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.1.0">
<iq:application entry="MeditateApp" id="9abb375dcf7c4ace87ff66f4f774f6c8" launcherIcon="@Drawables.launcherIcon" minSdkVersion="3.0.0" name="@Strings.AppName" type="watch-app" version="5.2.0">
<iq:products>
<iq:product id="approachs62"/>
<iq:product id="d2air"/>
Expand Down
7 changes: 6 additions & 1 deletion Meditate/resources-por/strings/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@
<string id="menuSessionSettings_edit">Editar</string>
<string id="menuSessionSettings_delete">Deletar</string>
<string id="menuSessionSettings_globalSettings">Conf.Globais</string>

<string id="menuSessionSettings_about">Sobre</string>

<string id="menuGlobalSettings_title">Globais</string>
<string id="menuGlobalSettings_newHrvTracking">Monit. VFC</string>
<string id="menuGlobalSettings_newActivityType">Atividade</string>
Expand Down Expand Up @@ -139,4 +140,8 @@
<string id="HRVready">VFC Pronto</string>
<string id="HRVoff">VFC Deslig.</string>

<string id="about_AppVersion">Meditate 5.2.0</string>
<string id="about_vtrifonov"> vtrifonov</string>
<string id="about_dliedke"> dliedke</string>

</strings>
4 changes: 2 additions & 2 deletions Meditate/resources-round-360x360/constants.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<properties>
<property id="progressBarWidth" type="number">210</property>
<property id="globalSettingsIconsXPos" type="number">60</property>
<property id="globalSettingsValueXPos" type="number">90</property>
<property id="globalSettingsIconsXPos" type="number">70</property>
<property id="globalSettingsValueXPos" type="number">100</property>
<property id="globalSettingsLinesYOffset" type="number">20</property>
<property id="sessionDetailsIconsXPos" type="number">60</property>
<property id="sessionDetailsValueXPos" type="number">90</property>
Expand Down
4 changes: 2 additions & 2 deletions Meditate/resources-round-390x390/constants.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<properties>
<property id="progressBarWidth" type="number">260</property>
<property id="globalSettingsIconsXPos" type="number">60</property>
<property id="globalSettingsValueXPos" type="number">90</property>
<property id="globalSettingsIconsXPos" type="number">85</property>
<property id="globalSettingsValueXPos" type="number">115</property>
<property id="globalSettingsLinesYOffset" type="number">20</property>
<property id="sessionDetailsIconsXPos" type="number">60</property>
<property id="sessionDetailsValueXPos" type="number">90</property>
Expand Down
4 changes: 2 additions & 2 deletions Meditate/resources-round-416x416/constants.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<properties>
<property id="progressBarWidth" type="number">260</property>
<property id="globalSettingsIconsXPos" type="number">60</property>
<property id="globalSettingsValueXPos" type="number">90</property>
<property id="globalSettingsIconsXPos" type="number">85</property>
<property id="globalSettingsValueXPos" type="number">115</property>
<property id="globalSettingsLinesYOffset" type="number">20</property>
<property id="sessionDetailsIconsXPos" type="number">60</property>
<property id="sessionDetailsValueXPos" type="number">90</property>
Expand Down
1 change: 1 addition & 0 deletions Meditate/resources/menus/session/sessionSettingsMenu.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@
<menu-item id="edit" label="@Strings.menuSessionSettings_edit" />
<menu-item id="delete" label="@Strings.menuSessionSettings_delete" />
<menu-item id="globalSettings" label="@Strings.menuSessionSettings_globalSettings" />
<menu-item id="about" label="@Strings.menuSessionSettings_about" />
</menu>
5 changes: 5 additions & 0 deletions Meditate/resources/strings/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
<string id="menuSessionSettings_edit">Edit</string>
<string id="menuSessionSettings_delete">Delete</string>
<string id="menuSessionSettings_globalSettings">Global Settings</string>
<string id="menuSessionSettings_about">About</string>

<string id="menuGlobalSettings_title">Settings</string>
<string id="menuGlobalSettings_newHrvTracking">HRV Tracking</string>
Expand Down Expand Up @@ -138,4 +139,8 @@
<string id="HRVready">HRV Ready</string>
<string id="HRVoff">HRV off</string>

<string id="about_AppVersion">Meditate 5.2.0</string>
<string id="about_vtrifonov"> vtrifonov</string>
<string id="about_dliedke"> dliedke</string>

</strings>
61 changes: 61 additions & 0 deletions Meditate/source/about/AboutDelegate.mc
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
using Toybox.WatchUi as Ui;
using Toybox.Application as App;
using Toybox.Graphics as Gfx;
using HrvAlgorithms.HrvTracking;

class AboutDelegate extends ScreenPicker.ScreenPickerDelegate {

private var mSessionPickerDelegate;

function initialize(sessionPickerDelegate) {
ScreenPickerDelegate.initialize(0, 1);

me.mGlobalSettingsIconsXPos = App.getApp().getProperty("globalSettingsIconsXPos");
me.mGlobalSettingsValueXPos = App.getApp().getProperty("globalSettingsValueXPos");
me.mGlobalSettingsLinesYOffset = App.getApp().getProperty("globalSettingsLinesYOffset");
me.mGlobalSettingsTitle = Ui.loadResource(Rez.Strings.menuSessionSettings_about);
me.mGlobalSettingsDetailsModel = new ScreenPicker.DetailsModel();
me.mSessionPickerDelegate = sessionPickerDelegate;
updateAboutDetails();
}

private var mGlobalSettingsTitle;
private var mGlobalSettingsIconsXPos;
private var mGlobalSettingsValueXPos;
private var mGlobalSettingsDetailsModel;
private var mGlobalSettingsLinesYOffset;

function createScreenPickerView() {
return new ScreenPicker.ScreenPickerDetailsSinglePageView(me.mGlobalSettingsDetailsModel);
}

private function updateAboutDetails() {
var details = me.mGlobalSettingsDetailsModel;
details.title = me.mGlobalSettingsTitle;
details.titleFont = Gfx.FONT_SMALL;
details.titleColor = Gfx.COLOR_WHITE;
details.color = Gfx.COLOR_WHITE;
details.backgroundColor = Gfx.COLOR_BLACK;

// Meditate text with green icon
details.detailLines[2].icon = new ScreenPicker.Icon({
:font => StatusIconFonts.fontMeditateIcons,
:symbol => StatusIconFonts.Rez.Strings.meditateFontYoga,
:color => Gfx.COLOR_GREEN
});

// Application version and developers
details.detailLines[2].value.text = Ui.loadResource(Rez.Strings.about_AppVersion);
details.detailLines[4].value.text = Ui.loadResource(Rez.Strings.about_vtrifonov);
details.detailLines[5].value.text = Ui.loadResource(Rez.Strings.about_dliedke);

details.setAllLinesYOffset(me.mGlobalSettingsLinesYOffset);
details.setAllIconsXPos(me.mGlobalSettingsIconsXPos);
details.setAllValuesXPos(me.mGlobalSettingsValueXPos);
}

function onBack() {
Ui.switchToView(me.mSessionPickerDelegate.createScreenPickerView(), me.mSessionPickerDelegate, Ui.SLIDE_RIGHT);
return true;
}
}
5 changes: 5 additions & 0 deletions Meditate/source/activity/VibeAlertsExecutor.mc
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,11 @@ class VibeAlertsExecutor {
me.fireIfRequiredOneOffIntervalAlerts();
me.fireIfRequiredFinalAlert();
}

// Continue firing alert for repeated invervals even after regular session time is over
if (me.mMeditateModel.elapsedTime >= me.mMeditateModel.getSessionTime()+10) {
me.fireIfRequiredRepeatIntervalAlerts();
}
}

private function fireIfRequiredFinalAlert() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,11 @@ class SessionSettingsMenuDelegate extends Ui.MenuInputDelegate {
Ui.popView(Ui.SLIDE_IMMEDIATE);
var globalSettingsDelegate = new GlobalSettingsDelegate(me.mSessionPickerDelegate);
Ui.switchToView(globalSettingsDelegate.createScreenPickerView(), globalSettingsDelegate, Ui.SLIDE_LEFT);
}
else if (item == :about) {
Ui.popView(Ui.SLIDE_IMMEDIATE);
var aboutDelegate = new AboutDelegate(me.mSessionPickerDelegate);
Ui.switchToView(aboutDelegate.createScreenPickerView(), aboutDelegate, Ui.SLIDE_LEFT);
}
}

Expand Down

0 comments on commit ae6237d

Please sign in to comment.