Skip to content

Commit

Permalink
4.3.0 - Added optional sound notifications for devices that support i…
Browse files Browse the repository at this point in the history
…t (short sound for intervals and long sound for end of session).
  • Loading branch information
dliedke committed Dec 1, 2022
1 parent 444f070 commit cb3cb06
Show file tree
Hide file tree
Showing 14 changed files with 69 additions and 18 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="4.2.0">
<iq:application entry="MeditateApp" id="9abb375dcf7c4ace87ff66f4f774f6c8" launcherIcon="@Drawables.launcherIcon" minSdkVersion="3.0.0" name="@Strings.AppName" type="watch-app" version="4.3.0">
<iq:products>
<iq:product id="approachs62"/>
<iq:product id="d2air"/>
Expand Down
13 changes: 8 additions & 5 deletions Meditate/resources-por/strings/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -81,21 +81,22 @@
<string id="addEditIntervalAlertMenu_title">Alerta</string>
<string id="addEditIntervalAlertMenu_time">Tempo</string>
<string id="addEditIntervalAlertMenu_color">Cor</string>
<string id="addEditIntervalAlertMenu_vibePattern">Vibração</string>
<string id="addEditIntervalAlertMenu_vibeSound">Vibração / Som</string>
<string id="addEditIntervalAlertMenu_delete">Excluir</string>

<string id="addEditSessionMenu_title">Sessão</string>
<string id="addEditSessionMenu_time">Tempo</string>
<string id="addEditSessionMenu_color">Cor</string>
<string id="addEditSessionMenu_vibePattern">Vibração</string>
<string id="addEditSessionMenu_vibeSound">Vibração / Som</string>
<string id="addEditSessionMenu_intervalAlerts">Intervalo Alerta</string>
<string id="addEditSessionMenu_activityType">Tipo Atividade</string>
<string id="addEditSessionMenu_hrvTracking">Monit. VFC</string>

<string id="intervalAlertTransparentColorText">Transparente</string>

<string id="vibePatternMenu_title">Vibração</string>
<string id="vibePatternMenu_title">Vibração / Som</string>
<string id="vibePatternMenu_longPulsating">Longo pulsante</string>
<string id="vibePatternMenu_longSound">Som Longo</string>
<string id="vibePatternMenu_longContinuous">Longo contínuo</string>
<string id="vibePatternMenu_longAscending">Longo ascendente</string>
<string id="vibePatternMenu_mediumPulsating">Médio pulsante</string>
Expand All @@ -105,11 +106,13 @@
<string id="vibePatternMenu_shortContinuous">Curto contínuo</string>
<string id="vibePatternMenu_shortAscending">Curto ascendente</string>

<string id="intervalVibePatternMenu_title">Vibração</string>
<string id="intervalVibePatternMenu_title">Vibração / Som</string>
<string id="intervalVibePatternMenu_shorterContinuous">Curto contínuo</string>
<string id="intervalVibePatternMenu_shorterAscending">Curto ascendente</string>
<string id="intervalVibePatternMenu_blip">Bip</string>

<string id="intervalVibePatternMenu_shortSound">Som Curto</string>


<string id="intervalTypeMenu_title">Tipo Intervalo Alerta</string>
<string id="intervalTypeMenu_oneOff">Uma vez H:MM</string>
<string id="intervalTypeMenu_repeat">A cada MM:SS</string>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<menu id="addEditIntervalAlertMenu" title="@Strings.addEditIntervalAlertMenu_title">
<menu-item id="time" label="@Strings.addEditIntervalAlertMenu_time" />
<menu-item id="color" label="@Strings.addEditIntervalAlertMenu_color"></menu-item>
<menu-item id="vibePattern" label="@Strings.addEditIntervalAlertMenu_vibePattern"></menu-item>
<menu-item id="vibePattern" label="@Strings.addEditIntervalAlertMenu_vibeSound"></menu-item>
<menu-item id="delete" label="@Strings.addEditIntervalAlertMenu_delete"></menu-item>
</menu>
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<menu id="intervalVibePatternMenu" title="@Strings.intervalVibePatternMenu_title">
<menu-item id="blip" label="@Strings.intervalVibePatternMenu_blip" />
<menu-item id="shortSound" label="@Strings.intervalVibePatternMenu_shortSound" />
<menu-item id="shorterContinuous" label="@Strings.intervalVibePatternMenu_shorterContinuous" />
<menu-item id="shorterAscending" label="@Strings.intervalVibePatternMenu_shorterAscending" />
<menu-item id="shortAscending" label="@Strings.vibePatternMenu_shortAscending" />
Expand Down
2 changes: 1 addition & 1 deletion Meditate/resources/menus/session/addEditSessionMenu.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<menu id="addEditSessionMenu" title="@Strings.addEditSessionMenu_title">
<menu-item id="time" label="@Strings.addEditSessionMenu_time" />
<menu-item id="color" label="@Strings.addEditSessionMenu_color"></menu-item>
<menu-item id="vibePattern" label="@Strings.addEditSessionMenu_vibePattern"></menu-item>
<menu-item id="vibePattern" label="@Strings.addEditSessionMenu_vibeSound"></menu-item>
<menu-item id="intervalAlerts" label="@Strings.addEditSessionMenu_intervalAlerts"></menu-item>
<menu-item id="activityType" label="@Strings.addEditSessionMenu_activityType"></menu-item>
<menu-item id="hrvTracking" label="@Strings.addEditSessionMenu_hrvTracking"></menu-item>
Expand Down
1 change: 1 addition & 0 deletions Meditate/resources/menus/session/vibePatternMenu.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<menu id="vibePatternMenu" title="@Strings.vibePatternMenu_title">
<menu-item id="longContinuous" label="@Strings.vibePatternMenu_longContinuous" />
<menu-item id="longSound" label="@Strings.vibePatternMenu_longSound" />
<menu-item id="longPulsating" label="@Strings.vibePatternMenu_longPulsating" />
<menu-item id="longAscending" label="@Strings.vibePatternMenu_longAscending" />
<menu-item id="mediumContinuous" label="@Strings.vibePatternMenu_mediumContinuous" />
Expand Down
12 changes: 7 additions & 5 deletions Meditate/resources/strings/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -81,21 +81,22 @@
<string id="addEditIntervalAlertMenu_title">Alert</string>
<string id="addEditIntervalAlertMenu_time">Time</string>
<string id="addEditIntervalAlertMenu_color">Color</string>
<string id="addEditIntervalAlertMenu_vibePattern">Vibe</string>
<string id="addEditIntervalAlertMenu_vibeSound">Vibe / Sound</string>
<string id="addEditIntervalAlertMenu_delete">Delete</string>

<string id="addEditSessionMenu_title">Session</string>
<string id="addEditSessionMenu_time">Time</string>
<string id="addEditSessionMenu_color">Color</string>
<string id="addEditSessionMenu_vibePattern">Vibe Pattern</string>
<string id="addEditSessionMenu_vibeSound">Vibe / Sound</string>
<string id="addEditSessionMenu_intervalAlerts">Interval Alerts</string>
<string id="addEditSessionMenu_activityType">Activity Type</string>
<string id="addEditSessionMenu_hrvTracking">HRV Tracking</string>

<string id="intervalAlertTransparentColorText">Transparent</string>

<string id="vibePatternMenu_title">Vibe Pattern</string>
<string id="vibePatternMenu_title">Vibe / Sound</string>
<string id="vibePatternMenu_longPulsating">Long pulsating</string>
<string id="vibePatternMenu_longSound">Long Sound</string>
<string id="vibePatternMenu_longContinuous">Long continuous</string>
<string id="vibePatternMenu_longAscending">Long ascending</string>
<string id="vibePatternMenu_mediumPulsating">Medium pulsating</string>
Expand All @@ -105,11 +106,12 @@
<string id="vibePatternMenu_shortContinuous">Short continuous</string>
<string id="vibePatternMenu_shortAscending">Short ascending</string>

<string id="intervalVibePatternMenu_title">Vibe Pattern</string>
<string id="intervalVibePatternMenu_title">Vibe / Sound</string>
<string id="intervalVibePatternMenu_shorterContinuous">Shorter continuous</string>
<string id="intervalVibePatternMenu_shorterAscending">Shorter ascending</string>
<string id="intervalVibePatternMenu_blip">Blip</string>

<string id="intervalVibePatternMenu_shortSound">Short Sound</string>

<string id="intervalTypeMenu_title">Interval Alert Type</string>
<string id="intervalTypeMenu_oneOff">One-off H:MM</string>
<string id="intervalTypeMenu_repeat">Every MM:SS</string>
Expand Down
32 changes: 31 additions & 1 deletion Meditate/source/activity/Vibe.mc
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,41 @@ class Vibe {
case VibePattern.Blip:
vibeProfile = getBlip();
break;
case VibePattern.ShortSound:

// Play single fast note sound
if (Attention has :ToneProfile) {
var toneProfile =
[
new Attention.ToneProfile(650, 100)
];
Attention.playTone({:toneProfile=>toneProfile});
}

break;

case VibePattern.LongSound:

// Play three notes sound
if (Attention has :ToneProfile) {
var toneProfile =
[
new Attention.ToneProfile(523, 400),
new Attention.ToneProfile(698, 400),
new Attention.ToneProfile(932, 400),
];
Attention.playTone({:toneProfile=>toneProfile});
}
break;

default:
vibeProfile = getLongPulsating();
break;
}
Attention.vibrate(vibeProfile);

if (vibeProfile!=null) {
Attention.vibrate(vibeProfile);
}
}

static function getLongPulsating() {
Expand Down
4 changes: 3 additions & 1 deletion Meditate/source/sessionSettings/SessionModel.mc
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@ module VibePattern {
MediumAscending = 9,
ShorterAscending = 10,
ShorterContinuous = 11,
Blip = 12
Blip = 12,
ShortSound = 13,
LongSound = 14
}
}

Expand Down
2 changes: 2 additions & 0 deletions Meditate/source/sessionSettings/SessionPickerDelegate.mc
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,8 @@ class SessionPickerDelegate extends ScreenPicker.ScreenPickerDelegate {
switch (vibePattern) {
case VibePattern.LongPulsating:
return Ui.loadResource(Rez.Strings.vibePatternMenu_longPulsating);
case VibePattern.LongSound:
return Ui.loadResource(Rez.Strings.vibePatternMenu_longSound);
case VibePattern.LongAscending:
return Ui.loadResource(Rez.Strings.vibePatternMenu_longAscending);
case VibePattern.LongContinuous:
Expand Down
3 changes: 3 additions & 0 deletions Meditate/source/sessionSettings/VibePatternMenuDelegate.mc
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ class VibePatternMenuDelegate extends Ui.MenuInputDelegate {
if (item == :longContinuous) {
me.mOnVibePatternPicked.invoke(VibePattern.LongContinuous);
}
else if (item == :longSound) {
me.mOnVibePatternPicked.invoke(VibePattern.LongSound);
}
else if (item == :longPulsating) {
me.mOnVibePatternPicked.invoke(VibePattern.LongPulsating);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@ class IntervalVibePatternMenuDelegate extends Ui.MenuInputDelegate {
}
else if (item == :blip) {
me.mOnVibePatternPicked.invoke(VibePattern.Blip);
}
}
else if (item == :shortSound) {
me.mOnVibePatternPicked.invoke(VibePattern.ShortSound);
}
}
}
4 changes: 3 additions & 1 deletion MeditateStoreDescription-en.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
Totally free application developed by vtrifonov and compiled/enhanced for newer Garmin watch models by dliedke.

A meditation/yoga app that tracks as an activity the heart rate, stress, respiration rate, heart rate variability (HRV), provides vibration alerts and heart rate chart.
A meditation/yoga app that tracks as an activity the heart rate, stress, respiration rate, heart rate variability (HRV), provides vibration or sound alerts and heart rate chart.

Touch and hold the screen (Touch devices) or hold the left middle button to edit the meditation sessions, properties and global settings.

Touch screen or click Start button to start meditation session. Use lap/back button to pause/resume. Use start button to end the meditation session.

If your device supports it and using sound notifications, make sure to enable sound in System - Sound and Vibe - Alert Tones (On).

Set Activity Name as "Location & Device Activity Name" in Garmin Connect Settings (https://connect.garmin.com/modern/settings) for activity name generated to be saved correctly.

Set custom activity name using Garmin Connect or Garmin Express, refer to guide https://support.garmin.com/en-US/?faq=SPo0TFvhQO04O36Y5TYRh5 for help.
Expand Down
4 changes: 3 additions & 1 deletion MeditateStoreDescription-pt.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
Aplicativo totalmente gratuito desenvolvido por vtrifonov e compilado/aprimorado para modelos de relógios Garmin mais recentes por dliedke.

Um aplicativo de meditação/Yoga que rastreia atividade com frequência cardíaca, estresse, frequência respiratória, variabilidade da frequência cardíaca (VFC), fornece alertas de vibração e gráfico da frequência cardíaca.
Um aplicativo de meditação/Yoga que rastreia atividade com frequência cardíaca, estresse, frequência respiratória, variabilidade da frequência cardíaca (VFC), fornece alertas de vibração ou som e gráfico da frequência cardíaca.

Toque e segure a tela (dispositivos com touch screen) ou segure o botão do meio esquerdo para editar as sessões de meditação, propriedades e configurações globais.

Toque na tela ou clique no botão Iniciar para iniciar a sessão de meditação. Use o botão de lap/voltar para pausar/retomar. Use o botão Iniciar para encerrar a sessão de meditação.

Se o seu dispositivo for compatível e usar notificações sonoras, certifique-se de ativar o som em Sistema - Som e vibração - Toques de alerta (Ligado).

Defina o nome da atividade como "Local e nome da atividade do dispositivo" nas configurações do Garmin Connect (https://connect.garmin.com/modern/settings) para que o nome da atividade gerada seja salvo corretamente.

Defina o nome da atividade personalizada usando Garmin Connect ou Garmin Express, consulte o guia https://support.garmin.com/pt-BR/?faq=SPo0TFvhQO04O36Y5TYRh5 para obter ajuda.
Expand Down

0 comments on commit cb3cb06

Please sign in to comment.