Offline gym log for Android. No account, no ads, no internet.
Dart androidbodybuildingdartexercisesf-droidfitnessfluttergymgym-apphealthprivacyself-hostedworkoutworkout-appworkout-tracker
Next-step card, weekly activity map, notice sound and fixes
InlitXcf24c48be03e
diff --git a/lib/app/app_shell.dart b/lib/app/app_shell.dartindex b0c5885..64b3dc6 100644--- a/lib/app/app_shell.dart+++ b/lib/app/app_shell.dart@@ -125,6 +125,7 @@ class _AppShellState extends State<AppShell> with WidgetsBindingObserver {subtitle: '${t.catalogName(ex.id, ex.name)} · $next',icon: PhosphorIconsFill.timer,accent: context.gc.sage,+ sound: false,);}@@ -225,7 +226,8 @@ class _AppShellState extends State<AppShell> with WidgetsBindingObserver {backgroundColor: Colors.transparent,body: Padding(padding: EdgeInsets.only(- bottom: MediaQuery.viewPaddingOf(context).bottom + (parked ? _pillSpace : 0)),+ bottom: (MediaQuery.viewInsetsOf(context).bottom > 0 ? 0 : MediaQuery.viewPaddingOf(context).bottom) ++ (parked ? _pillSpace : 0)),child: NotificationListener<ScrollNotification>(onNotification: _onScroll,child: _animatedScreen(),diff --git a/lib/l10n/app_ar.arb b/lib/l10n/app_ar.arbindex 042d05d..bedc33e 100644--- a/lib/l10n/app_ar.arb+++ b/lib/l10n/app_ar.arb@@ -1219,5 +1219,15 @@"groupDeleteAll": "حذف المجموعة وروتيناتها","groupDeleteTitle": "حذف «{name}»؟","groupDeleteBody": "سيتم حذف {count}. يبقى سجل تمارينك كما هو.",- "tplRr": "الروتين الكلاسيكي من r/bodyweightfitness: الجسم كله ثلاثة أيام في الأسبوع. انتقل إلى المستوى التالي حين يصبح سهلًا."+ "tplRr": "الروتين الكلاسيكي من r/bodyweightfitness: الجسم كله ثلاثة أيام في الأسبوع. انتقل إلى المستوى التالي حين يصبح سهلًا.",+ "levelUpKicker": "الخطوة التالية",+ "levelUpBody": "3×{reps} في {name} في تمرينين متتاليين. هل أنت مستعد للخطوة التالية؟",+ "levelUpSwap": "استبدله في {routine}",+ "levelUpSee": "شاهد طريقة الأداء",+ "levelUpLater": "ليس الآن",+ "levelUpStay": "سأبقى على هذا",+ "levelUpSwapped": "أصبح {name} في {routine}",+ "levelUpStayed": "لن نقترح الترقي في هذا التمرين",+ "levelHintsSetting": "اقتراح الخطوة التالية",+ "heatmapLabelsSetting": "الأيام والأشهر على خريطة النشاط"}diff --git a/lib/l10n/app_de.arb b/lib/l10n/app_de.arbindex 1fd534d..c7b2e25 100644--- a/lib/l10n/app_de.arb+++ b/lib/l10n/app_de.arb@@ -1086,5 +1086,15 @@"groupDeleteAll": "Gruppe und Routinen löschen","groupDeleteTitle": "„{name}“ löschen?","groupDeleteBody": "{count} werden gelöscht. Dein Trainingsverlauf bleibt erhalten.",- "tplRr": "Der Klassiker von r/bodyweightfitness: Ganzkörper an drei Tagen pro Woche. Geh eine Stufe höher, wenn es leicht wird."+ "tplRr": "Der Klassiker von r/bodyweightfitness: Ganzkörper an drei Tagen pro Woche. Geh eine Stufe höher, wenn es leicht wird.",+ "levelUpKicker": "NÄCHSTE STUFE",+ "levelUpBody": "3×{reps} bei {name} in zwei Trainings hintereinander. Bereit für die nächste Stufe?",+ "levelUpSwap": "In {routine} tauschen",+ "levelUpSee": "So geht's",+ "levelUpLater": "Jetzt nicht",+ "levelUpStay": "Bei dieser bleiben",+ "levelUpSwapped": "{name} ist jetzt in {routine}",+ "levelUpStayed": "Keine Stufen-Tipps mehr für diese Übung",+ "levelHintsSetting": "Nächste Stufe vorschlagen",+ "heatmapLabelsSetting": "Tage und Monate in der Aktivitätskarte"}diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arbindex 5dc9d4d..ab044b3 100644--- a/lib/l10n/app_en.arb+++ b/lib/l10n/app_en.arb@@ -1109,5 +1109,18 @@"@groupDeleteTitle": {"placeholders": {"name": {"type": "String"}}},"groupDeleteBody": "{count} will be deleted. Your workout history is kept.","@groupDeleteBody": {"placeholders": {"count": {"type": "String"}}},- "tplRr": "The r/bodyweightfitness classic: full body three days a week. Move up a step when it gets easy."+ "tplRr": "The r/bodyweightfitness classic: full body three days a week. Move up a step when it gets easy.",+ "levelUpKicker": "NEXT STEP",+ "levelUpBody": "3×{reps} on {name} two workouts in a row. Ready for the next step?",+ "@levelUpBody": {"placeholders": {"reps": {"type": "int"}, "name": {"type": "String"}}},+ "levelUpSwap": "Swap it in {routine}",+ "@levelUpSwap": {"placeholders": {"routine": {"type": "String"}}},+ "levelUpSee": "See how it's done",+ "levelUpLater": "Not now",+ "levelUpStay": "Keep this one",+ "levelUpSwapped": "{name} is now in {routine}",+ "@levelUpSwapped": {"placeholders": {"name": {"type": "String"}, "routine": {"type": "String"}}},+ "levelUpStayed": "No more step-up tips for this one",+ "levelHintsSetting": "Suggest the next step",+ "heatmapLabelsSetting": "Days and months on the activity map"}diff --git a/lib/l10n/app_es.arb b/lib/l10n/app_es.arbindex a2c5fdf..bfa6876 100644--- a/lib/l10n/app_es.arb+++ b/lib/l10n/app_es.arb@@ -1026,5 +1026,15 @@"groupDeleteAll": "Borrar grupo y rutinas","groupDeleteTitle": "¿Borrar «{name}»?","groupDeleteBody": "Se borrarán {count}. Tu historial de entrenos se mantiene.",- "tplRr": "El clásico de r/bodyweightfitness: cuerpo entero tres días a la semana. Sube un paso cuando te resulte fácil."+ "tplRr": "El clásico de r/bodyweightfitness: cuerpo entero tres días a la semana. Sube un paso cuando te resulte fácil.",+ "levelUpKicker": "SIGUIENTE PASO",+ "levelUpBody": "3×{reps} en {name} dos entrenos seguidos. ¿Listo para el siguiente paso?",+ "levelUpSwap": "Cambiarlo en {routine}",+ "levelUpSee": "Ver cómo se hace",+ "levelUpLater": "Ahora no",+ "levelUpStay": "Me quedo con este",+ "levelUpSwapped": "{name} ya está en {routine}",+ "levelUpStayed": "No te sugeriremos subir en este",+ "levelHintsSetting": "Sugerir el siguiente paso",+ "heatmapLabelsSetting": "Días y meses en el mapa de actividad"}diff --git a/lib/l10n/app_fa.arb b/lib/l10n/app_fa.arbindex 7b742bd..4e351b0 100644--- a/lib/l10n/app_fa.arb+++ b/lib/l10n/app_fa.arb@@ -1632,5 +1632,15 @@"groupDeleteAll": "حذف گروه و روتینها","groupDeleteTitle": "«{name}» حذف شود؟","groupDeleteBody": "{count} حذف میشود. سابقهٔ تمرینهایت باقی میماند.",- "tplRr": "روتین کلاسیک r/bodyweightfitness: کل بدن، سه روز در هفته. وقتی آسان شد یک پله بالاتر برو."+ "tplRr": "روتین کلاسیک r/bodyweightfitness: کل بدن، سه روز در هفته. وقتی آسان شد یک پله بالاتر برو.",+ "levelUpKicker": "قدم بعدی",+ "levelUpBody": "دو تمرین پشت سر هم ۳×{reps} در {name}. آمادهی قدم بعدی هستی؟",+ "levelUpSwap": "جایگزین کن در {routine}",+ "levelUpSee": "ببین چطور انجام میشود",+ "levelUpLater": "الان نه",+ "levelUpStay": "همین را نگه میدارم",+ "levelUpSwapped": "{name} حالا در {routine} است",+ "levelUpStayed": "دیگر برای این حرکت پیشنهاد پیشرفت نمیدهیم",+ "levelHintsSetting": "پیشنهاد قدم بعدی",+ "heatmapLabelsSetting": "روزها و ماهها روی نقشهٔ فعالیت"}diff --git a/lib/l10n/app_fr.arb b/lib/l10n/app_fr.arbindex dee6ade..f7eef13 100644--- a/lib/l10n/app_fr.arb+++ b/lib/l10n/app_fr.arb@@ -1219,5 +1219,15 @@"groupDeleteAll": "Supprimer le groupe et ses routines","groupDeleteTitle": "Supprimer « {name} » ?","groupDeleteBody": "{count} seront supprimées. Ton historique d’entraînement est conservé.",- "tplRr": "Le classique de r/bodyweightfitness : tout le corps trois jours par semaine. Passe à l’étape suivante quand ça devient facile."+ "tplRr": "Le classique de r/bodyweightfitness : tout le corps trois jours par semaine. Passe à l’étape suivante quand ça devient facile.",+ "levelUpKicker": "ÉTAPE SUIVANTE",+ "levelUpBody": "3×{reps} sur {name} deux séances d’affilée. Prêt pour l’étape suivante ?",+ "levelUpSwap": "Le remplacer dans {routine}",+ "levelUpSee": "Voir comment faire",+ "levelUpLater": "Pas maintenant",+ "levelUpStay": "Je garde celui-ci",+ "levelUpSwapped": "{name} est maintenant dans {routine}",+ "levelUpStayed": "Plus de suggestion de progression pour celui-ci",+ "levelHintsSetting": "Suggérer l’étape suivante",+ "heatmapLabelsSetting": "Jours et mois sur la carte d'activité"}diff --git a/lib/l10n/app_it.arb b/lib/l10n/app_it.arbindex 5bd54de..6c9193a 100644--- a/lib/l10n/app_it.arb+++ b/lib/l10n/app_it.arb@@ -1066,5 +1066,15 @@"groupDeleteAll": "Elimina gruppo e routine","groupDeleteTitle": "Eliminare «{name}»?","groupDeleteBody": "Verranno eliminate {count}. Lo storico degli allenamenti resta.",- "tplRr": "Il classico di r/bodyweightfitness: tutto il corpo tre giorni a settimana. Passa al livello successivo quando diventa facile."+ "tplRr": "Il classico di r/bodyweightfitness: tutto il corpo tre giorni a settimana. Passa al livello successivo quando diventa facile.",+ "levelUpKicker": "PROSSIMO PASSO",+ "levelUpBody": "3×{reps} su {name} per due allenamenti di fila. Pronto per il passo successivo?",+ "levelUpSwap": "Sostituiscilo in {routine}",+ "levelUpSee": "Guarda come si fa",+ "levelUpLater": "Non ora",+ "levelUpStay": "Resto su questo",+ "levelUpSwapped": "{name} ora è in {routine}",+ "levelUpStayed": "Niente più suggerimenti di progressione per questo",+ "levelHintsSetting": "Suggerisci il passo successivo",+ "heatmapLabelsSetting": "Giorni e mesi sulla mappa attività"}diff --git a/lib/l10n/app_ja.arb b/lib/l10n/app_ja.arbindex b379fe7..458c85d 100644--- a/lib/l10n/app_ja.arb+++ b/lib/l10n/app_ja.arb@@ -1219,5 +1219,15 @@"groupDeleteAll": "グループとルーティンを削除","groupDeleteTitle": "「{name}」を削除しますか?","groupDeleteBody": "{count}が削除されます。トレーニング履歴は残ります。",- "tplRr": "r/bodyweightfitness の定番:週3日の全身トレーニング。楽になったら次の段階へ。"+ "tplRr": "r/bodyweightfitness の定番:週3日の全身トレーニング。楽になったら次の段階へ。",+ "levelUpKicker": "次のステップ",+ "levelUpBody": "{name}で3×{reps}を2回連続で達成。次のステップに進みますか?",+ "levelUpSwap": "{routine}で入れ替える",+ "levelUpSee": "やり方を見る",+ "levelUpLater": "今はしない",+ "levelUpStay": "このまま続ける",+ "levelUpSwapped": "{name}が{routine}に入りました",+ "levelUpStayed": "この種目ではステップアップを提案しません",+ "levelHintsSetting": "次のステップを提案",+ "heatmapLabelsSetting": "アクティビティマップに曜日と月を表示"}diff --git a/lib/l10n/app_ko.arb b/lib/l10n/app_ko.arbindex 0087e31..bbc0398 100644--- a/lib/l10n/app_ko.arb+++ b/lib/l10n/app_ko.arb@@ -1219,5 +1219,15 @@"groupDeleteAll": "그룹과 루틴 삭제","groupDeleteTitle": "「{name}」을(를) 삭제할까요?","groupDeleteBody": "{count}이(가) 삭제됩니다. 운동 기록은 유지됩니다.",- "tplRr": "r/bodyweightfitness의 대표 루틴: 주 3일 전신 운동. 쉬워지면 다음 단계로 넘어가세요."+ "tplRr": "r/bodyweightfitness의 대표 루틴: 주 3일 전신 운동. 쉬워지면 다음 단계로 넘어가세요.",+ "levelUpKicker": "다음 단계",+ "levelUpBody": "{name} 3×{reps}을(를) 두 번 연속 달성했어요. 다음 단계로 갈까요?",+ "levelUpSwap": "{routine}에서 교체",+ "levelUpSee": "방법 보기",+ "levelUpLater": "나중에",+ "levelUpStay": "이대로 할게요",+ "levelUpSwapped": "{name}이(가) 이제 {routine}에 있어요",+ "levelUpStayed": "이 운동은 더 이상 단계 상승을 제안하지 않아요",+ "levelHintsSetting": "다음 단계 제안",+ "heatmapLabelsSetting": "활동 지도에 요일과 월 표시"}diff --git a/lib/l10n/app_localizations.dart b/lib/l10n/app_localizations.dartindex 7c1da8f..335b1bd 100644--- a/lib/l10n/app_localizations.dart+++ b/lib/l10n/app_localizations.dart@@ -5715,6 +5715,66 @@ abstract class AppLocalizations {/// In en, this message translates to:/// **'The r/bodyweightfitness classic: full body three days a week. Move up a step when it gets easy.'**String get tplRr;++ /// No description provided for @levelUpKicker.+ ///+ /// In en, this message translates to:+ /// **'NEXT STEP'**+ String get levelUpKicker;++ /// No description provided for @levelUpBody.+ ///+ /// In en, this message translates to:+ /// **'3×{reps} on {name} two workouts in a row. Ready for the next step?'**+ String levelUpBody(int reps, String name);++ /// No description provided for @levelUpSwap.+ ///+ /// In en, this message translates to:+ /// **'Swap it in {routine}'**+ String levelUpSwap(String routine);++ /// No description provided for @levelUpSee.+ ///+ /// In en, this message translates to:+ /// **'See how it\'s done'**+ String get levelUpSee;++ /// No description provided for @levelUpLater.+ ///+ /// In en, this message translates to:+ /// **'Not now'**+ String get levelUpLater;++ /// No description provided for @levelUpStay.+ ///+ /// In en, this message translates to:+ /// **'Keep this one'**+ String get levelUpStay;++ /// No description provided for @levelUpSwapped.+ ///+ /// In en, this message translates to:+ /// **'{name} is now in {routine}'**+ String levelUpSwapped(String name, String routine);++ /// No description provided for @levelUpStayed.+ ///+ /// In en, this message translates to:+ /// **'No more step-up tips for this one'**+ String get levelUpStayed;++ /// No description provided for @levelHintsSetting.+ ///+ /// In en, this message translates to:+ /// **'Suggest the next step'**+ String get levelHintsSetting;++ /// No description provided for @heatmapLabelsSetting.+ ///+ /// In en, this message translates to:+ /// **'Days and months on the activity map'**+ String get heatmapLabelsSetting;}class _AppLocalizationsDelegate extends LocalizationsDelegate<AppLocalizations> {diff --git a/lib/l10n/app_localizations_ar.dart b/lib/l10n/app_localizations_ar.dartindex 9c6cb31..61978de 100644--- a/lib/l10n/app_localizations_ar.dart+++ b/lib/l10n/app_localizations_ar.dart@@ -3197,4 +3197,40 @@ class AppLocalizationsAr extends AppLocalizations {@overrideString get tplRr =>'الروتين الكلاسيكي من r/bodyweightfitness: الجسم كله ثلاثة أيام في الأسبوع. انتقل إلى المستوى التالي حين يصبح سهلًا.';++ @override+ String get levelUpKicker => 'الخطوة التالية';++ @override+ String levelUpBody(int reps, String name) {+ return '3×$reps في $name في تمرينين متتاليين. هل أنت مستعد للخطوة التالية؟';+ }++ @override+ String levelUpSwap(String routine) {+ return 'استبدله في $routine';+ }++ @override+ String get levelUpSee => 'شاهد طريقة الأداء';++ @override+ String get levelUpLater => 'ليس الآن';++ @override+ String get levelUpStay => 'سأبقى على هذا';++ @override+ String levelUpSwapped(String name, String routine) {+ return 'أصبح $name في $routine';+ }++ @override+ String get levelUpStayed => 'لن نقترح الترقي في هذا التمرين';++ @override+ String get levelHintsSetting => 'اقتراح الخطوة التالية';++ @override+ String get heatmapLabelsSetting => 'الأيام والأشهر على خريطة النشاط';}diff --git a/lib/l10n/app_localizations_de.dart b/lib/l10n/app_localizations_de.dartindex 3be623f..1ce4420 100644--- a/lib/l10n/app_localizations_de.dart+++ b/lib/l10n/app_localizations_de.dart@@ -3215,4 +3215,40 @@ class AppLocalizationsDe extends AppLocalizations {@overrideString get tplRr =>'Der Klassiker von r/bodyweightfitness: Ganzkörper an drei Tagen pro Woche. Geh eine Stufe höher, wenn es leicht wird.';++ @override+ String get levelUpKicker => 'NÄCHSTE STUFE';++ @override+ String levelUpBody(int reps, String name) {+ return '3×$reps bei $name in zwei Trainings hintereinander. Bereit für die nächste Stufe?';+ }++ @override+ String levelUpSwap(String routine) {+ return 'In $routine tauschen';+ }++ @override+ String get levelUpSee => 'So geht\'s';++ @override+ String get levelUpLater => 'Jetzt nicht';++ @override+ String get levelUpStay => 'Bei dieser bleiben';++ @override+ String levelUpSwapped(String name, String routine) {+ return '$name ist jetzt in $routine';+ }++ @override+ String get levelUpStayed => 'Keine Stufen-Tipps mehr für diese Übung';++ @override+ String get levelHintsSetting => 'Nächste Stufe vorschlagen';++ @override+ String get heatmapLabelsSetting => 'Tage und Monate in der Aktivitätskarte';}diff --git a/lib/l10n/app_localizations_en.dart b/lib/l10n/app_localizations_en.dartindex a5440fe..332e6b0 100644--- a/lib/l10n/app_localizations_en.dart+++ b/lib/l10n/app_localizations_en.dart@@ -3195,4 +3195,40 @@ class AppLocalizationsEn extends AppLocalizations {@overrideString get tplRr =>'The r/bodyweightfitness classic: full body three days a week. Move up a step when it gets easy.';++ @override+ String get levelUpKicker => 'NEXT STEP';++ @override+ String levelUpBody(int reps, String name) {+ return '3×$reps on $name two workouts in a row. Ready for the next step?';+ }++ @override+ String levelUpSwap(String routine) {+ return 'Swap it in $routine';+ }++ @override+ String get levelUpSee => 'See how it\'s done';++ @override+ String get levelUpLater => 'Not now';++ @override+ String get levelUpStay => 'Keep this one';++ @override+ String levelUpSwapped(String name, String routine) {+ return '$name is now in $routine';+ }++ @override+ String get levelUpStayed => 'No more step-up tips for this one';++ @override+ String get levelHintsSetting => 'Suggest the next step';++ @override+ String get heatmapLabelsSetting => 'Days and months on the activity map';}diff --git a/lib/l10n/app_localizations_es.dart b/lib/l10n/app_localizations_es.dartindex 5b5fd44..c88c304 100644--- a/lib/l10n/app_localizations_es.dart+++ b/lib/l10n/app_localizations_es.dart@@ -3197,4 +3197,40 @@ class AppLocalizationsEs extends AppLocalizations {@overrideString get tplRr =>'El clásico de r/bodyweightfitness: cuerpo entero tres días a la semana. Sube un paso cuando te resulte fácil.';++ @override+ String get levelUpKicker => 'SIGUIENTE PASO';++ @override+ String levelUpBody(int reps, String name) {+ return '3×$reps en $name dos entrenos seguidos. ¿Listo para el siguiente paso?';+ }++ @override+ String levelUpSwap(String routine) {+ return 'Cambiarlo en $routine';+ }++ @override+ String get levelUpSee => 'Ver cómo se hace';++ @override+ String get levelUpLater => 'Ahora no';++ @override+ String get levelUpStay => 'Me quedo con este';++ @override+ String levelUpSwapped(String name, String routine) {+ return '$name ya está en $routine';+ }++ @override+ String get levelUpStayed => 'No te sugeriremos subir en este';++ @override+ String get levelHintsSetting => 'Sugerir el siguiente paso';++ @override+ String get heatmapLabelsSetting => 'Días y meses en el mapa de actividad';}diff --git a/lib/l10n/app_localizations_fa.dart b/lib/l10n/app_localizations_fa.dartindex 5e1418f..2fb1988 100644--- a/lib/l10n/app_localizations_fa.dart+++ b/lib/l10n/app_localizations_fa.dart@@ -3185,4 +3185,40 @@ class AppLocalizationsFa extends AppLocalizations {@overrideString get tplRr =>'روتین کلاسیک r/bodyweightfitness: کل بدن، سه روز در هفته. وقتی آسان شد یک پله بالاتر برو.';++ @override+ String get levelUpKicker => 'قدم بعدی';++ @override+ String levelUpBody(int reps, String name) {+ return 'دو تمرین پشت سر هم ۳×$reps در $name. آمادهی قدم بعدی هستی؟';+ }++ @override+ String levelUpSwap(String routine) {+ return 'جایگزین کن در $routine';+ }++ @override+ String get levelUpSee => 'ببین چطور انجام میشود';++ @override+ String get levelUpLater => 'الان نه';++ @override+ String get levelUpStay => 'همین را نگه میدارم';++ @override+ String levelUpSwapped(String name, String routine) {+ return '$name حالا در $routine است';+ }++ @override+ String get levelUpStayed => 'دیگر برای این حرکت پیشنهاد پیشرفت نمیدهیم';++ @override+ String get levelHintsSetting => 'پیشنهاد قدم بعدی';++ @override+ String get heatmapLabelsSetting => 'روزها و ماهها روی نقشهٔ فعالیت';}diff --git a/lib/l10n/app_localizations_fr.dart b/lib/l10n/app_localizations_fr.dartindex 5be1d51..f5ae289 100644--- a/lib/l10n/app_localizations_fr.dart+++ b/lib/l10n/app_localizations_fr.dart@@ -3214,4 +3214,40 @@ class AppLocalizationsFr extends AppLocalizations {@overrideString get tplRr =>'Le classique de r/bodyweightfitness : tout le corps trois jours par semaine. Passe à l’étape suivante quand ça devient facile.';++ @override+ String get levelUpKicker => 'ÉTAPE SUIVANTE';++ @override+ String levelUpBody(int reps, String name) {+ return '3×$reps sur $name deux séances d’affilée. Prêt pour l’étape suivante ?';+ }++ @override+ String levelUpSwap(String routine) {+ return 'Le remplacer dans $routine';+ }++ @override+ String get levelUpSee => 'Voir comment faire';++ @override+ String get levelUpLater => 'Pas maintenant';++ @override+ String get levelUpStay => 'Je garde celui-ci';++ @override+ String levelUpSwapped(String name, String routine) {+ return '$name est maintenant dans $routine';+ }++ @override+ String get levelUpStayed => 'Plus de suggestion de progression pour celui-ci';++ @override+ String get levelHintsSetting => 'Suggérer l’étape suivante';++ @override+ String get heatmapLabelsSetting => 'Jours et mois sur la carte d\'activité';}diff --git a/lib/l10n/app_localizations_it.dart b/lib/l10n/app_localizations_it.dartindex cd1e559..0a57e47 100644--- a/lib/l10n/app_localizations_it.dart+++ b/lib/l10n/app_localizations_it.dart@@ -3203,4 +3203,40 @@ class AppLocalizationsIt extends AppLocalizations {@overrideString get tplRr =>'Il classico di r/bodyweightfitness: tutto il corpo tre giorni a settimana. Passa al livello successivo quando diventa facile.';++ @override+ String get levelUpKicker => 'PROSSIMO PASSO';++ @override+ String levelUpBody(int reps, String name) {+ return '3×$reps su $name per due allenamenti di fila. Pronto per il passo successivo?';+ }++ @override+ String levelUpSwap(String routine) {+ return 'Sostituiscilo in $routine';+ }++ @override+ String get levelUpSee => 'Guarda come si fa';++ @override+ String get levelUpLater => 'Non ora';++ @override+ String get levelUpStay => 'Resto su questo';++ @override+ String levelUpSwapped(String name, String routine) {+ return '$name ora è in $routine';+ }++ @override+ String get levelUpStayed => 'Niente più suggerimenti di progressione per questo';++ @override+ String get levelHintsSetting => 'Suggerisci il passo successivo';++ @override+ String get heatmapLabelsSetting => 'Giorni e mesi sulla mappa attività';}diff --git a/lib/l10n/app_localizations_ja.dart b/lib/l10n/app_localizations_ja.dartindex 76a5505..429ae21 100644--- a/lib/l10n/app_localizations_ja.dart+++ b/lib/l10n/app_localizations_ja.dart@@ -3105,4 +3105,40 @@ class AppLocalizationsJa extends AppLocalizations {@overrideString get tplRr => 'r/bodyweightfitness の定番:週3日の全身トレーニング。楽になったら次の段階へ。';++ @override+ String get levelUpKicker => '次のステップ';++ @override+ String levelUpBody(int reps, String name) {+ return '$nameで3×$repsを2回連続で達成。次のステップに進みますか?';+ }++ @override+ String levelUpSwap(String routine) {+ return '$routineで入れ替える';+ }++ @override+ String get levelUpSee => 'やり方を見る';++ @override+ String get levelUpLater => '今はしない';++ @override+ String get levelUpStay => 'このまま続ける';++ @override+ String levelUpSwapped(String name, String routine) {+ return '$nameが$routineに入りました';+ }++ @override+ String get levelUpStayed => 'この種目ではステップアップを提案しません';++ @override+ String get levelHintsSetting => '次のステップを提案';++ @override+ String get heatmapLabelsSetting => 'アクティビティマップに曜日と月を表示';}diff --git a/lib/l10n/app_localizations_ko.dart b/lib/l10n/app_localizations_ko.dartindex a0432f2..0e6f4b0 100644--- a/lib/l10n/app_localizations_ko.dart+++ b/lib/l10n/app_localizations_ko.dart@@ -3121,4 +3121,40 @@ class AppLocalizationsKo extends AppLocalizations {@overrideString get tplRr => 'r/bodyweightfitness의 대표 루틴: 주 3일 전신 운동. 쉬워지면 다음 단계로 넘어가세요.';++ @override+ String get levelUpKicker => '다음 단계';++ @override+ String levelUpBody(int reps, String name) {+ return '$name 3×$reps을(를) 두 번 연속 달성했어요. 다음 단계로 갈까요?';+ }++ @override+ String levelUpSwap(String routine) {+ return '$routine에서 교체';+ }++ @override+ String get levelUpSee => '방법 보기';++ @override+ String get levelUpLater => '나중에';++ @override+ String get levelUpStay => '이대로 할게요';++ @override+ String levelUpSwapped(String name, String routine) {+ return '$name이(가) 이제 $routine에 있어요';+ }++ @override+ String get levelUpStayed => '이 운동은 더 이상 단계 상승을 제안하지 않아요';++ @override+ String get levelHintsSetting => '다음 단계 제안';++ @override+ String get heatmapLabelsSetting => '활동 지도에 요일과 월 표시';}diff --git a/lib/l10n/app_localizations_nl.dart b/lib/l10n/app_localizations_nl.dartindex b573a3f..370bc5c 100644--- a/lib/l10n/app_localizations_nl.dart+++ b/lib/l10n/app_localizations_nl.dart@@ -3208,4 +3208,40 @@ class AppLocalizationsNl extends AppLocalizations {@overrideString get tplRr =>'De klassieker van r/bodyweightfitness: drie dagen per week het hele lichaam. Ga een stap verder als het makkelijk wordt.';++ @override+ String get levelUpKicker => 'VOLGENDE STAP';++ @override+ String levelUpBody(int reps, String name) {+ return 'Twee trainingen op rij 3×$reps bij $name. Klaar voor de volgende stap?';+ }++ @override+ String levelUpSwap(String routine) {+ return 'Vervangen in $routine';+ }++ @override+ String get levelUpSee => 'Bekijk hoe het moet';++ @override+ String get levelUpLater => 'Nu niet';++ @override+ String get levelUpStay => 'Deze houden';++ @override+ String levelUpSwapped(String name, String routine) {+ return '$name staat nu in $routine';+ }++ @override+ String get levelUpStayed => 'Geen stap-tips meer voor deze';++ @override+ String get levelHintsSetting => 'Volgende stap voorstellen';++ @override+ String get heatmapLabelsSetting => 'Dagen en maanden op de activiteitenkaart';}diff --git a/lib/l10n/app_localizations_pl.dart b/lib/l10n/app_localizations_pl.dartindex b60dbc9..48ff92c 100644--- a/lib/l10n/app_localizations_pl.dart+++ b/lib/l10n/app_localizations_pl.dart@@ -3206,4 +3206,40 @@ class AppLocalizationsPl extends AppLocalizations {@overrideString get tplRr =>'Klasyk z r/bodyweightfitness: całe ciało trzy dni w tygodniu. Przejdź o krok wyżej, gdy zrobi się łatwo.';++ @override+ String get levelUpKicker => 'NASTĘPNY KROK';++ @override+ String levelUpBody(int reps, String name) {+ return '3×$reps w $name dwa treningi z rzędu. Gotowy na następny krok?';+ }++ @override+ String levelUpSwap(String routine) {+ return 'Zamień w $routine';+ }++ @override+ String get levelUpSee => 'Zobacz, jak to zrobić';++ @override+ String get levelUpLater => 'Nie teraz';++ @override+ String get levelUpStay => 'Zostaję przy tym';++ @override+ String levelUpSwapped(String name, String routine) {+ return '$name jest teraz w $routine';+ }++ @override+ String get levelUpStayed => 'Koniec podpowiedzi o progresji dla tego ćwiczenia';++ @override+ String get levelHintsSetting => 'Podpowiadaj następny krok';++ @override+ String get heatmapLabelsSetting => 'Dni i miesiące na mapie aktywności';}diff --git a/lib/l10n/app_localizations_pt.dart b/lib/l10n/app_localizations_pt.dartindex 3efa930..50fa62d 100644--- a/lib/l10n/app_localizations_pt.dart+++ b/lib/l10n/app_localizations_pt.dart@@ -3200,4 +3200,40 @@ class AppLocalizationsPt extends AppLocalizations {@overrideString get tplRr =>'O clássico do r/bodyweightfitness: corpo inteiro três dias por semana. Suba um nível quando ficar fácil.';++ @override+ String get levelUpKicker => 'PRÓXIMO PASSO';++ @override+ String levelUpBody(int reps, String name) {+ return '3×$reps em $name dois treinos seguidos. Pronto para o próximo passo?';+ }++ @override+ String levelUpSwap(String routine) {+ return 'Trocar em $routine';+ }++ @override+ String get levelUpSee => 'Ver como se faz';++ @override+ String get levelUpLater => 'Agora não';++ @override+ String get levelUpStay => 'Fico com este';++ @override+ String levelUpSwapped(String name, String routine) {+ return '$name agora está em $routine';+ }++ @override+ String get levelUpStayed => 'Sem mais sugestões de progressão para este';++ @override+ String get levelHintsSetting => 'Sugerir o próximo passo';++ @override+ String get heatmapLabelsSetting => 'Dias e meses no mapa de atividade';}diff --git a/lib/l10n/app_localizations_ru.dart b/lib/l10n/app_localizations_ru.dartindex 71175d6..76cc64e 100644--- a/lib/l10n/app_localizations_ru.dart+++ b/lib/l10n/app_localizations_ru.dart@@ -3295,4 +3295,40 @@ class AppLocalizationsRu extends AppLocalizations {@overrideString get tplRr =>'Классика r/bodyweightfitness: всё тело три дня в неделю. Переходи на следующую ступень, когда станет легко.';++ @override+ String get levelUpKicker => 'СЛЕДУЮЩИЙ ШАГ';++ @override+ String levelUpBody(int reps, String name) {+ return '3×$reps в «$name» две тренировки подряд. Готов к следующему шагу?';+ }++ @override+ String levelUpSwap(String routine) {+ return 'Заменить в «$routine»';+ }++ @override+ String get levelUpSee => 'Как выполнять';++ @override+ String get levelUpLater => 'Не сейчас';++ @override+ String get levelUpStay => 'Оставить это';++ @override+ String levelUpSwapped(String name, String routine) {+ return '«$name» теперь в «$routine»';+ }++ @override+ String get levelUpStayed => 'Больше не предлагать усложнение для этого';++ @override+ String get levelHintsSetting => 'Предлагать следующий шаг';++ @override+ String get heatmapLabelsSetting => 'Дни и месяцы на карте активности';}diff --git a/lib/l10n/app_localizations_tr.dart b/lib/l10n/app_localizations_tr.dartindex 6440a38..732f637 100644--- a/lib/l10n/app_localizations_tr.dart+++ b/lib/l10n/app_localizations_tr.dart@@ -3205,4 +3205,40 @@ class AppLocalizationsTr extends AppLocalizations {@overrideString get tplRr =>'r/bodyweightfitness klasiği: haftada üç gün tüm vücut. Kolaylaşınca bir sonraki aşamaya geç.';++ @override+ String get levelUpKicker => 'SONRAKİ ADIM';++ @override+ String levelUpBody(int reps, String name) {+ return '$name hareketinde üst üste iki antrenmanda 3×$reps. Sonraki adıma hazır mısın?';+ }++ @override+ String levelUpSwap(String routine) {+ return '$routine içinde değiştir';+ }++ @override+ String get levelUpSee => 'Nasıl yapıldığını gör';++ @override+ String get levelUpLater => 'Şimdi değil';++ @override+ String get levelUpStay => 'Bununla devam';++ @override+ String levelUpSwapped(String name, String routine) {+ return '$name artık $routine içinde';+ }++ @override+ String get levelUpStayed => 'Bu hareket için artık seviye önerisi yok';++ @override+ String get levelHintsSetting => 'Sonraki adımı öner';++ @override+ String get heatmapLabelsSetting => 'Aktivite haritasında gün ve aylar';}diff --git a/lib/l10n/app_localizations_uk.dart b/lib/l10n/app_localizations_uk.dartindex a5a0bb4..80a77ad 100644--- a/lib/l10n/app_localizations_uk.dart+++ b/lib/l10n/app_localizations_uk.dart@@ -3212,4 +3212,40 @@ class AppLocalizationsUk extends AppLocalizations {@overrideString get tplRr =>'Класика r/bodyweightfitness: усе тіло три дні на тиждень. Переходь на наступний щабель, коли стане легко.';++ @override+ String get levelUpKicker => 'НАСТУПНИЙ КРОК';++ @override+ String levelUpBody(int reps, String name) {+ return '3×$reps у «$name» два тренування поспіль. Готовий до наступного кроку?';+ }++ @override+ String levelUpSwap(String routine) {+ return 'Замінити в «$routine»';+ }++ @override+ String get levelUpSee => 'Як виконувати';++ @override+ String get levelUpLater => 'Не зараз';++ @override+ String get levelUpStay => 'Залишити цю';++ @override+ String levelUpSwapped(String name, String routine) {+ return '«$name» тепер у «$routine»';+ }++ @override+ String get levelUpStayed => 'Більше не пропонувати ускладнення для цієї';++ @override+ String get levelHintsSetting => 'Пропонувати наступний крок';++ @override+ String get heatmapLabelsSetting => 'Дні й місяці на карті активності';}diff --git a/lib/l10n/app_localizations_zh.dart b/lib/l10n/app_localizations_zh.dartindex f3f2760..633e4c7 100644--- a/lib/l10n/app_localizations_zh.dart+++ b/lib/l10n/app_localizations_zh.dart@@ -3065,6 +3065,42 @@ class AppLocalizationsZh extends AppLocalizations {@overrideString get tplRr => 'r/bodyweightfitness 的经典计划:每周三天全身训练。变轻松了就进阶到下一级。';++ @override+ String get levelUpKicker => '下一步';++ @override+ String levelUpBody(int reps, String name) {+ return '$name 连续两次训练完成 3×$reps。准备好进阶了吗?';+ }++ @override+ String levelUpSwap(String routine) {+ return '在$routine中替换';+ }++ @override+ String get levelUpSee => '看看怎么做';++ @override+ String get levelUpLater => '以后再说';++ @override+ String get levelUpStay => '继续做这个';++ @override+ String levelUpSwapped(String name, String routine) {+ return '$name 已加入$routine';+ }++ @override+ String get levelUpStayed => '不再为这个动作提示进阶';++ @override+ String get levelHintsSetting => '提示下一步进阶';++ @override+ String get heatmapLabelsSetting => '在活动图上显示星期和月份';}/// The translations for Chinese, using the Han script (`zh_Hant`).@@ -6151,4 +6187,40 @@ class AppLocalizationsZhHant extends AppLocalizationsZh {@overrideString get tplRr => 'r/bodyweightfitness 的經典計畫:每週三天全身訓練。變輕鬆了就進階到下一級。';++ @override+ String get levelUpKicker => '下一步';++ @override+ String levelUpBody(int reps, String name) {+ return '$name 連續兩次訓練完成 3×$reps。準備好進階了嗎?';+ }++ @override+ String levelUpSwap(String routine) {+ return '在$routine中替換';+ }++ @override+ String get levelUpSee => '看看怎麼做';++ @override+ String get levelUpLater => '以後再說';++ @override+ String get levelUpStay => '繼續做這個';++ @override+ String levelUpSwapped(String name, String routine) {+ return '$name 已加入$routine';+ }++ @override+ String get levelUpStayed => '不再為這個動作提示進階';++ @override+ String get levelHintsSetting => '提示下一步進階';++ @override+ String get heatmapLabelsSetting => '在活動圖上顯示星期和月份';}diff --git a/lib/l10n/app_nl.arb b/lib/l10n/app_nl.arbindex 1ffc064..e77f0d4 100644--- a/lib/l10n/app_nl.arb+++ b/lib/l10n/app_nl.arb@@ -1219,5 +1219,15 @@"groupDeleteAll": "Groep en routines verwijderen","groupDeleteTitle": "“{name}” verwijderen?","groupDeleteBody": "{count} worden verwijderd. Je trainingsgeschiedenis blijft bewaard.",- "tplRr": "De klassieker van r/bodyweightfitness: drie dagen per week het hele lichaam. Ga een stap verder als het makkelijk wordt."+ "tplRr": "De klassieker van r/bodyweightfitness: drie dagen per week het hele lichaam. Ga een stap verder als het makkelijk wordt.",+ "levelUpKicker": "VOLGENDE STAP",+ "levelUpBody": "Twee trainingen op rij 3×{reps} bij {name}. Klaar voor de volgende stap?",+ "levelUpSwap": "Vervangen in {routine}",+ "levelUpSee": "Bekijk hoe het moet",+ "levelUpLater": "Nu niet",+ "levelUpStay": "Deze houden",+ "levelUpSwapped": "{name} staat nu in {routine}",+ "levelUpStayed": "Geen stap-tips meer voor deze",+ "levelHintsSetting": "Volgende stap voorstellen",+ "heatmapLabelsSetting": "Dagen en maanden op de activiteitenkaart"}diff --git a/lib/l10n/app_pl.arb b/lib/l10n/app_pl.arbindex 070e45f..5315e45 100644--- a/lib/l10n/app_pl.arb+++ b/lib/l10n/app_pl.arb@@ -1219,5 +1219,15 @@"groupDeleteAll": "Usuń grupę i rutyny","groupDeleteTitle": "Usunąć „{name}”?","groupDeleteBody": "Zostaną usunięte: {count}. Historia treningów zostaje.",- "tplRr": "Klasyk z r/bodyweightfitness: całe ciało trzy dni w tygodniu. Przejdź o krok wyżej, gdy zrobi się łatwo."+ "tplRr": "Klasyk z r/bodyweightfitness: całe ciało trzy dni w tygodniu. Przejdź o krok wyżej, gdy zrobi się łatwo.",+ "levelUpKicker": "NASTĘPNY KROK",+ "levelUpBody": "3×{reps} w {name} dwa treningi z rzędu. Gotowy na następny krok?",+ "levelUpSwap": "Zamień w {routine}",+ "levelUpSee": "Zobacz, jak to zrobić",+ "levelUpLater": "Nie teraz",+ "levelUpStay": "Zostaję przy tym",+ "levelUpSwapped": "{name} jest teraz w {routine}",+ "levelUpStayed": "Koniec podpowiedzi o progresji dla tego ćwiczenia",+ "levelHintsSetting": "Podpowiadaj następny krok",+ "heatmapLabelsSetting": "Dni i miesiące na mapie aktywności"}diff --git a/lib/l10n/app_pt.arb b/lib/l10n/app_pt.arbindex bf59f12..dd2b4a3 100644--- a/lib/l10n/app_pt.arb+++ b/lib/l10n/app_pt.arb@@ -979,5 +979,15 @@"groupDeleteAll": "Excluir grupo e rotinas","groupDeleteTitle": "Excluir “{name}”?","groupDeleteBody": "{count} serão excluídas. Seu histórico de treinos é mantido.",- "tplRr": "O clássico do r/bodyweightfitness: corpo inteiro três dias por semana. Suba um nível quando ficar fácil."+ "tplRr": "O clássico do r/bodyweightfitness: corpo inteiro três dias por semana. Suba um nível quando ficar fácil.",+ "levelUpKicker": "PRÓXIMO PASSO",+ "levelUpBody": "3×{reps} em {name} dois treinos seguidos. Pronto para o próximo passo?",+ "levelUpSwap": "Trocar em {routine}",+ "levelUpSee": "Ver como se faz",+ "levelUpLater": "Agora não",+ "levelUpStay": "Fico com este",+ "levelUpSwapped": "{name} agora está em {routine}",+ "levelUpStayed": "Sem mais sugestões de progressão para este",+ "levelHintsSetting": "Sugerir o próximo passo",+ "heatmapLabelsSetting": "Dias e meses no mapa de atividade"}diff --git a/lib/l10n/app_ru.arb b/lib/l10n/app_ru.arbindex f5bb4d0..a173ebf 100644--- a/lib/l10n/app_ru.arb+++ b/lib/l10n/app_ru.arb@@ -1007,5 +1007,15 @@"groupDeleteAll": "Удалить группу и программы","groupDeleteTitle": "Удалить «{name}»?","groupDeleteBody": "Будут удалены: {count}. История тренировок сохранится.",- "tplRr": "Классика r/bodyweightfitness: всё тело три дня в неделю. Переходи на следующую ступень, когда станет легко."+ "tplRr": "Классика r/bodyweightfitness: всё тело три дня в неделю. Переходи на следующую ступень, когда станет легко.",+ "levelUpKicker": "СЛЕДУЮЩИЙ ШАГ",+ "levelUpBody": "3×{reps} в «{name}» две тренировки подряд. Готов к следующему шагу?",+ "levelUpSwap": "Заменить в «{routine}»",+ "levelUpSee": "Как выполнять",+ "levelUpLater": "Не сейчас",+ "levelUpStay": "Оставить это",+ "levelUpSwapped": "«{name}» теперь в «{routine}»",+ "levelUpStayed": "Больше не предлагать усложнение для этого",+ "levelHintsSetting": "Предлагать следующий шаг",+ "heatmapLabelsSetting": "Дни и месяцы на карте активности"}diff --git a/lib/l10n/app_tr.arb b/lib/l10n/app_tr.arbindex 0dfa5a1..277159c 100644--- a/lib/l10n/app_tr.arb+++ b/lib/l10n/app_tr.arb@@ -1219,5 +1219,15 @@"groupDeleteAll": "Grubu ve rutinleri sil","groupDeleteTitle": "“{name}” silinsin mi?","groupDeleteBody": "{count} silinecek. Antrenman geçmişin korunur.",- "tplRr": "r/bodyweightfitness klasiği: haftada üç gün tüm vücut. Kolaylaşınca bir sonraki aşamaya geç."+ "tplRr": "r/bodyweightfitness klasiği: haftada üç gün tüm vücut. Kolaylaşınca bir sonraki aşamaya geç.",+ "levelUpKicker": "SONRAKİ ADIM",+ "levelUpBody": "{name} hareketinde üst üste iki antrenmanda 3×{reps}. Sonraki adıma hazır mısın?",+ "levelUpSwap": "{routine} içinde değiştir",+ "levelUpSee": "Nasıl yapıldığını gör",+ "levelUpLater": "Şimdi değil",+ "levelUpStay": "Bununla devam",+ "levelUpSwapped": "{name} artık {routine} içinde",+ "levelUpStayed": "Bu hareket için artık seviye önerisi yok",+ "levelHintsSetting": "Sonraki adımı öner",+ "heatmapLabelsSetting": "Aktivite haritasında gün ve aylar"}diff --git a/lib/l10n/app_uk.arb b/lib/l10n/app_uk.arbindex b70202c..6b2e7f9 100644--- a/lib/l10n/app_uk.arb+++ b/lib/l10n/app_uk.arb@@ -1219,5 +1219,15 @@"groupDeleteAll": "Видалити групу й програми","groupDeleteTitle": "Видалити «{name}»?","groupDeleteBody": "Буде видалено: {count}. Історія тренувань збережеться.",- "tplRr": "Класика r/bodyweightfitness: усе тіло три дні на тиждень. Переходь на наступний щабель, коли стане легко."+ "tplRr": "Класика r/bodyweightfitness: усе тіло три дні на тиждень. Переходь на наступний щабель, коли стане легко.",+ "levelUpKicker": "НАСТУПНИЙ КРОК",+ "levelUpBody": "3×{reps} у «{name}» два тренування поспіль. Готовий до наступного кроку?",+ "levelUpSwap": "Замінити в «{routine}»",+ "levelUpSee": "Як виконувати",+ "levelUpLater": "Не зараз",+ "levelUpStay": "Залишити цю",+ "levelUpSwapped": "«{name}» тепер у «{routine}»",+ "levelUpStayed": "Більше не пропонувати ускладнення для цієї",+ "levelHintsSetting": "Пропонувати наступний крок",+ "heatmapLabelsSetting": "Дні й місяці на карті активності"}diff --git a/lib/l10n/app_zh.arb b/lib/l10n/app_zh.arbindex a5cb86c..a64aa6e 100644--- a/lib/l10n/app_zh.arb+++ b/lib/l10n/app_zh.arb@@ -979,5 +979,15 @@"groupDeleteAll": "删除分组及其计划","groupDeleteTitle": "删除“{name}”?","groupDeleteBody": "将删除{count}。训练记录会保留。",- "tplRr": "r/bodyweightfitness 的经典计划:每周三天全身训练。变轻松了就进阶到下一级。"+ "tplRr": "r/bodyweightfitness 的经典计划:每周三天全身训练。变轻松了就进阶到下一级。",+ "levelUpKicker": "下一步",+ "levelUpBody": "{name} 连续两次训练完成 3×{reps}。准备好进阶了吗?",+ "levelUpSwap": "在{routine}中替换",+ "levelUpSee": "看看怎么做",+ "levelUpLater": "以后再说",+ "levelUpStay": "继续做这个",+ "levelUpSwapped": "{name} 已加入{routine}",+ "levelUpStayed": "不再为这个动作提示进阶",+ "levelHintsSetting": "提示下一步进阶",+ "heatmapLabelsSetting": "在活动图上显示星期和月份"}diff --git a/lib/l10n/app_zh_Hant.arb b/lib/l10n/app_zh_Hant.arbindex a2edf22..c22d07d 100644--- a/lib/l10n/app_zh_Hant.arb+++ b/lib/l10n/app_zh_Hant.arb@@ -1219,5 +1219,15 @@"groupDeleteAll": "刪除群組及其課表","groupDeleteTitle": "刪除「{name}」?","groupDeleteBody": "將刪除{count}。訓練紀錄會保留。",- "tplRr": "r/bodyweightfitness 的經典計畫:每週三天全身訓練。變輕鬆了就進階到下一級。"+ "tplRr": "r/bodyweightfitness 的經典計畫:每週三天全身訓練。變輕鬆了就進階到下一級。",+ "levelUpKicker": "下一步",+ "levelUpBody": "{name} 連續兩次訓練完成 3×{reps}。準備好進階了嗎?",+ "levelUpSwap": "在{routine}中替換",+ "levelUpSee": "看看怎麼做",+ "levelUpLater": "以後再說",+ "levelUpStay": "繼續做這個",+ "levelUpSwapped": "{name} 已加入{routine}",+ "levelUpStayed": "不再為這個動作提示進階",+ "levelHintsSetting": "提示下一步進階",+ "heatmapLabelsSetting": "在活動圖上顯示星期和月份"}diff --git a/lib/l10n/l10n.dart b/lib/l10n/l10n.dartindex 4d4b884..43553c0 100644--- a/lib/l10n/l10n.dart+++ b/lib/l10n/l10n.dart@@ -219,6 +219,9 @@ extension GymL10n on AppLocalizations {String monthInitial(int m) =>_dates((l) => DateFormat('', l)).dateSymbols.NARROWMONTHS[m - 1];+ String monthShort(int m) =>+ _capitalize(_dates(DateFormat.MMM).format(DateTime(2024, m)).replaceAll('.', ''));+String monthName(int m) =>_capitalize(_dates(DateFormat.MMMM).format(DateTime(2024, m)));diff --git a/lib/screens/home_screen.dart b/lib/screens/home_screen.dartindex cabbd11..88fbe3b 100644--- a/lib/screens/home_screen.dart+++ b/lib/screens/home_screen.dart@@ -56,8 +56,10 @@ class HomeScreen extends StatelessWidget {radius: 22,padding: const EdgeInsets.fromLTRB(18, 18, 18, 16),child: Heatmap(- levels: fit.heatmapLevels,- onTapDay: (i) => showDaySheet(context, fit.heatmapDate(i)),+ levels: fit.heatmapWeeks,+ firstDay: fit.heatmapWeekDate(0),+ labels: fit.heatmapLabels,+ onTapDay: (i) => showDaySheet(context, fit.heatmapWeekDate(i)),),),if (fit.showRecommended && recommended.isNotEmpty) ...[diff --git a/lib/screens/progress_screen.dart b/lib/screens/progress_screen.dartindex 8f33ec4..0f09384 100644--- a/lib/screens/progress_screen.dart+++ b/lib/screens/progress_screen.dart@@ -72,10 +72,8 @@ class ProgressScreen extends StatelessWidget {const SizedBox(height: 12),],_heroRow(context, gc, change, bw),- if (fit.sessions.isNotEmpty) ...[- const SizedBox(height: 12),- _consistency(context, gc),- ],+ const SizedBox(height: 12),+ _consistency(context, gc),const SizedBox(height: 12),_totals(gc),const SizedBox(height: 12),@@ -258,7 +256,12 @@ class ProgressScreen extends StatelessWidget {],),const SizedBox(height: 14),- Heatmap(levels: fit.heatmapLevels, onTapDay: (i) => _showDay(context, i)),+ Heatmap(+ levels: fit.heatmapWeeks,+ firstDay: fit.heatmapWeekDate(0),+ labels: fit.heatmapLabels,+ onTapDay: (i) => _showDay(context, i),+ ),const SizedBox(height: 14),Row(children: [Icon(PhosphorIconsFill.fire, size: 14, color: gc.accent),@@ -703,7 +706,7 @@ class ProgressScreen extends StatelessWidget {);}- void _showDay(BuildContext context, int index) => showDaySheet(context, fit.heatmapDate(index));+ void _showDay(BuildContext context, int index) => showDaySheet(context, fit.heatmapWeekDate(index));void _logBodyweight(BuildContext context) {final start = fit.latestBodyweight?.kg ?? fit.profile.weightKg;@@ -1450,6 +1453,7 @@ class _DaySheet extends StatelessWidget {),),),+ if (s.exercises.length > 1)Semantics(button: true,label: '${t.deleteCaps} ${t.catalogName(e.id, e.name)}',diff --git a/lib/screens/session_screen.dart b/lib/screens/session_screen.dartindex ebc5761..d10cf48 100644--- a/lib/screens/session_screen.dart+++ b/lib/screens/session_screen.dart@@ -1246,10 +1246,23 @@ class SessionScreen extends StatelessWidget {Expanded(child: _countUp(vol, (v) => _sumCard(gc, t.volume, fit.volumeLabel(v)))),]),),- const SizedBox(height: 10),- Rise(- index: 2,- child: vsLast != null && vsLast > 0 ? _vsLastCard(gc, vol, vsLast) : _firstTimeCard(gc),+ if (vsLast == null || vsLast > 0) ...[+ const SizedBox(height: 10),+ Rise(+ index: 2,+ child: vsLast != null ? _vsLastCard(gc, vol, vsLast) : _firstTimeCard(gc),+ ),+ ],+ AnimatedSize(+ duration: const Duration(milliseconds: 280),+ curve: Curves.easeOutCubic,+ alignment: Alignment.topCenter,+ child: fit.summaryLevelUp == null+ ? const SizedBox(width: double.infinity)+ : Padding(+ padding: const EdgeInsets.only(top: 10),+ child: Rise(index: 3, child: _levelUpCard(context, gc, fit.summaryLevelUp!)),+ ),),const SizedBox(height: 18),Rise(@@ -1472,6 +1485,95 @@ class SessionScreen extends StatelessWidget {);}+ Widget _levelUpCard(BuildContext context, GymColors gc, ({Exercise from, Exercise to, int reps}) level) {+ final inRoutine = fit.levelUpInRoutine;+ Widget link(String label, VoidCallback onTap) => GestureDetector(+ behavior: HitTestBehavior.opaque,+ onTap: onTap,+ child: Padding(+ padding: const EdgeInsets.symmetric(horizontal: 6, vertical: 8),+ child: Text(label, style: AppTheme.f(13, weight: FontWeight.w600, color: gc.textSecondary)),+ ),+ );+ return SoftCard(+ radius: 20,+ padding: const EdgeInsets.fromLTRB(14, 14, 14, 8),+ child: Column(+ crossAxisAlignment: CrossAxisAlignment.stretch,+ children: [+ Row(children: [+ Semantics(+ button: true,+ label: t.levelUpSee,+ child: GestureDetector(+ onTap: () => showExercisePreview(context, level.to),+ child: SizedBox(width: 64, child: ExerciseMedia(ex: level.to, height: 64, radius: 14)),+ ),+ ),+ const SizedBox(width: 14),+ Expanded(+ child: Column(crossAxisAlignment: CrossAxisAlignment.start, children: [+ Row(children: [+ Icon(PhosphorIconsBold.trendUp, size: 13, color: gc.sage),+ const SizedBox(width: 6),+ Text(t.levelUpKicker,+ style: AppTheme.f(10.5, weight: FontWeight.w800, color: gc.sage, letterSpacing: 1.3)),+ ]),+ const SizedBox(height: 4),+ Text(exerciseName(level.to),+ maxLines: 2,+ overflow: TextOverflow.ellipsis,+ style: AppTheme.f(17, weight: FontWeight.w800, color: gc.text)),+ const SizedBox(height: 3),+ Text(t.levelUpBody(level.reps, exerciseName(level.from)),+ style: AppTheme.f(12.5, weight: FontWeight.w500, color: gc.textSecondary, height: 1.35)),+ ]),+ ),+ ]),+ const SizedBox(height: 12),+ Pressable(+ onTap: () {+ if (!inRoutine) {+ showExercisePreview(context, level.to);+ return;+ }+ final name = exerciseName(level.to);+ final routine = fit.levelUpSwap();+ if (routine == null) return;+ HapticFeedback.lightImpact();+ showNotchToast(context, t.levelUpSwapped(name, routine),+ icon: PhosphorIconsFill.checkCircle, accent: gc.sage);+ },+ child: Container(+ height: 46,+ alignment: Alignment.center,+ decoration: BoxDecoration(color: gc.sageSoft, borderRadius: BorderRadius.circular(100)),+ child: Text(inRoutine ? t.levelUpSwap(fit.routineTitle(fit.sessionRoutine!)) : t.levelUpSee,+ maxLines: 1,+ overflow: TextOverflow.ellipsis,+ style: AppTheme.f(14, weight: FontWeight.w700, color: gc.sage)),+ ),+ ),+ const SizedBox(height: 2),+ Row(mainAxisAlignment: MainAxisAlignment.center, children: [+ link(t.levelUpLater, fit.levelUpLater),+ Text('·', style: AppTheme.f(13, color: gc.textTertiary)),+ link(t.levelUpStay, () {+ final undo = fit.levelUpStay();+ if (undo == null) return;+ showNotchToast(context, t.levelUpStayed,+ icon: PhosphorIconsRegular.bellSlash,+ accent: gc.accent,+ action: t.undo,+ onTap: undo,+ duration: const Duration(milliseconds: 3600));+ }),+ ]),+ ],+ ),+ );+ }+Widget _firstTimeCard(GymColors gc) {return SoftCard(radius: 16,@@ -1662,7 +1764,8 @@ class _ExerciseStageState extends State<_ExerciseStage> {subtitle: where,icon: fit.inSuperset ? PhosphorIconsBold.link : PhosphorIconsBold.arrowRight,accent: fit.inSuperset ? gc.brass : gc.ember,- duration: const Duration(milliseconds: 1900));+ duration: const Duration(milliseconds: 1900),+ sound: false);}@override@@ -1909,6 +2012,7 @@ void _showLockHint(BuildContext context) {subtitle: t.lockedHint,icon: PhosphorIconsFill.fingerprint,accent: context.gc.accent,+ sound: false,);}diff --git a/lib/screens/settings_screen.dart b/lib/screens/settings_screen.dartindex 6027ae4..16435cd 100644--- a/lib/screens/settings_screen.dart+++ b/lib/screens/settings_screen.dart@@ -105,6 +105,12 @@ class SettingsScreen extends StatelessWidget {() => '${fit.weekStartDay}',(v) => fit.setWeekStart(int.parse(v)),),+ GestureDetector(+ behavior: HitTestBehavior.opaque,+ onTap: fit.toggleHeatmapLabels,+ child: _prefRow(gc, PhosphorIconsRegular.gridNine, t.heatmapLabelsSetting,+ TinySwitch(on: fit.heatmapLabels)),+ ),GestureDetector(behavior: HitTestBehavior.opaque,onTap: () => _editBackground(context),@@ -187,6 +193,12 @@ class SettingsScreen extends StatelessWidget {child: _prefRow(gc, PhosphorIconsRegular.stack, t.multiPlanSetting,TinySwitch(on: fit.multiPlan)),),+ GestureDetector(+ behavior: HitTestBehavior.opaque,+ onTap: fit.toggleLevelHints,+ child: _prefRow(gc, PhosphorIconsRegular.stairs, t.levelHintsSetting,+ TinySwitch(on: fit.levelHints)),+ ),_choiceRow(context,gc,diff --git a/lib/services/beeper.dart b/lib/services/beeper.dartindex 424ddb6..16e823f 100644--- a/lib/services/beeper.dart+++ b/lib/services/beeper.dart@@ -68,6 +68,85 @@ class Beeper {} catch (_) {}}+ AudioPlayer? _soft;+ String? _chime;+ DateTime _lastChime = DateTime(2000);++ Future<void> chime() async {+ if (kIsWeb || _failed) return;+ final now = DateTime.now();+ if (now.difference(_lastChime) < const Duration(milliseconds: 700)) return;+ _lastChime = now;+ try {+ if (_soft == null) {+ final dir = await getTemporaryDirectory();+ _chime = await _write(dir, 'gm_chime1.wav', chimeWav());+ final p = AudioPlayer();+ await p.setReleaseMode(ReleaseMode.stop);+ await p.setAudioContext(AudioContext(+ android: const AudioContextAndroid(+ contentType: AndroidContentType.sonification,+ usageType: AndroidUsageType.notification,+ audioFocus: AndroidAudioFocus.none,+ ),+ iOS: AudioContextIOS(category: AVAudioSessionCategory.ambient, options: const {}),+ ));+ _soft = p;+ }+ await _soft!.stop();+ await _soft!.play(DeviceFileSource(_chime!), volume: 0.55);+ } catch (_) {}+ }++ static Uint8List chimeWav() {+ const rate = 44100;+ const secs = 0.95;+ final n = (rate * secs).round();+ final samples = List<double>.filled(n, 0);+ void note(double hz, double at, double gain, double decay) {+ final start = (at * rate).round();+ for (var i = start; i < n; i++) {+ final t = (i - start) / rate;+ final a = math.min(1.0, t / 0.012);+ final attack = a * a * (3 - 2 * a);+ final body = math.exp(-t * decay);+ final shine = math.exp(-t * decay * 2.6);+ final wave = math.sin(2 * math.pi * hz * t) ++ math.sin(2 * math.pi * hz * 2 * t) * 0.18 * shine ++ math.sin(2 * math.pi * hz * 3 * t) * 0.05 * shine;+ samples[i] += wave * gain * attack * body;+ }+ }++ note(1046.5, 0, 0.42, 5.2);+ note(1568.0, 0.085, 0.34, 4.4);+ final data = ByteData(44 + n * 2);+ void text(int at, String s) {+ for (var i = 0; i < s.length; i++) {+ data.setUint8(at + i, s.codeUnitAt(i));+ }+ }++ text(0, 'RIFF');+ data.setUint32(4, 36 + n * 2, Endian.little);+ text(8, 'WAVE');+ text(12, 'fmt ');+ data.setUint32(16, 16, Endian.little);+ data.setUint16(20, 1, Endian.little);+ data.setUint16(22, 1, Endian.little);+ data.setUint32(24, rate, Endian.little);+ data.setUint32(28, rate * 2, Endian.little);+ data.setUint16(32, 2, Endian.little);+ data.setUint16(34, 16, Endian.little);+ text(36, 'data');+ data.setUint32(40, n * 2, Endian.little);+ for (var i = 0; i < n; i++) {+ final fade = i > n - 2205 ? (n - i) / 2205 : 1.0;+ data.setInt16(44 + i * 2, (samples[i].clamp(-1.0, 1.0) * fade * 32767).round(), Endian.little);+ }+ return data.buffer.asUint8List();+ }+static Future<String> _write(Directory dir, String name, Uint8List bytes) async {final file = File('${dir.path}/$name');if (!await file.exists() || await file.length() != bytes.length) {diff --git a/lib/services/home_widget_bridge.dart b/lib/services/home_widget_bridge.dartindex 255072c..364e636 100644--- a/lib/services/home_widget_bridge.dart+++ b/lib/services/home_widget_bridge.dart@@ -88,7 +88,7 @@ class HomeWidgetBridge {final todaySize = _ios ? const Size(155, 155) : const Size(120, 120);const weekSize = Size(320, 150);final week = [for (var i = 0; i < 7; i++) fit.isDayDone(i)];- final levels = fit.heatmapLevelsFor(182);+ final levels = fit.heatmapWeeksFor(26);final heat = fit.muscleHeatOver(bodyDays);final plannedToday = fit.todayRoutine != null;final hasPlan = fit.weeklyPlan.isNotEmpty;diff --git a/lib/state/fit_core.dart b/lib/state/fit_core.dartindex 89114fa..9e33bd7 100644--- a/lib/state/fit_core.dart+++ b/lib/state/fit_core.dart@@ -67,6 +67,12 @@ abstract class FitCore extends ChangeNotifier {final Set<String> archived = {};+ final Set<String> levelStay = {};++ final Map<String, int> levelSeen = {};++ final Map<String, List<int>> levelShown = {};+final Map<String, Map<int, int>> videoMarks = {};final Map<String, double> exerciseBar = {};diff --git a/lib/state/fit_state.dart b/lib/state/fit_state.dartindex 4788266..ee5a831 100644--- a/lib/state/fit_state.dart+++ b/lib/state/fit_state.dart@@ -23,6 +23,7 @@ import '../services/beeper.dart';import '../services/exercise_match.dart';import '../services/local_store.dart';import '../services/media_store.dart';+import '../services/merged_ids.dart';import '../services/progress_reminder.dart';import '../services/plan_share.dart';import '../services/rest_alarm.dart';@@ -46,7 +47,7 @@ part 'workout_state.dart';class FitState extends FitCorewith ToolsState, LibraryState, SettingsState, NotesState, PlacesState, MeasuresState, MomentsState, TimelineState, StatsState, AwardsState, RoutinesState, WorkoutState {void loadFromStore() {- final data = Store.instance.load();+ final data = withMergedExercises(Store.instance.load());_loading = true;if (data['language'] == null) _adoptDeviceLanguage();if (data.isNotEmpty) {@@ -159,6 +160,16 @@ class FitState extends FitCorearchived..clear()..addAll(((data['archived'] as List?) ?? const []).cast<String>());+ levelStay+ ..clear()+ ..addAll(((data['levelStay'] as List?) ?? const []).cast<String>());+ levelSeen+ ..clear()+ ..addAll(((data['levelSeen'] as Map?) ?? const {}).map((k, v) => MapEntry(k as String, (v as num).toInt())));+ levelShown+ ..clear()+ ..addAll(((data['levelShown'] as Map?) ?? const {})+ .map((k, v) => MapEntry(k as String, (v as List).map((x) => (x as num).toInt()).toList())));exerciseBar..clear()..addAll(((data['barKg'] as Map?) ?? const {})@@ -176,6 +187,8 @@ class FitState extends FitCorebgDim = (data['bgDim'] as num?)?.toDouble() ?? 0.55;showFocus = data['showFocus'] as bool? ?? true;showRecommended = data['showRecs'] as bool? ?? true;+ levelHints = data['levelHints'] as bool? ?? true;+ heatmapLabels = data['heatLabels'] as bool? ?? true;multiPlan = data['multiPlan'] as bool? ?? false;final weekStart = data['weekStart'];weekStartDay = SettingsState.weekStarts.contains(weekStart) ? weekStart as int : DateTime.monday;@@ -345,6 +358,8 @@ class FitState extends FitCore'bgDim': bgDim,'showFocus': showFocus,'showRecs': showRecommended,+ 'levelHints': levelHints,+ 'heatLabels': heatmapLabels,'weekStart': weekStartDay,'autoAdvance': autoAdvance,'keepAwake': keepScreenOn,@@ -356,6 +371,9 @@ class FitState extends FitCore'alarmStyle': alarmStyle,'noSuggest': noSuggest.toList(),'archived': archived.toList(),+ 'levelStay': levelStay.toList(),+ 'levelSeen': Map.of(levelSeen),+ 'levelShown': Map.of(levelShown),'barKg': exerciseBar,'marks': videoMarks.map((k, v) => MapEntry(k, v.map((i, ms) => MapEntry('$i', ms)))),'exMode': modeOverride,@@ -433,6 +451,9 @@ class FitState extends FitCoreautoWarmup.clear();noSuggest.clear();archived.clear();+ levelStay.clear();+ levelSeen.clear();+ levelShown.clear();videoMarks.clear();exerciseBar.clear();modeOverride.clear();@@ -444,6 +465,8 @@ class FitState extends FitCoreprofile = Profile();showFocus = true;showRecommended = true;+ levelHints = true;+ heatmapLabels = true;weekStartDay = DateTime.monday;autoAdvance = true;startCountdown = true;@@ -478,11 +501,13 @@ class FitState extends FitCorereturn true;}- void applyBackup(Map<String, dynamic> map,+ void applyBackup(Map<String, dynamic> backup,{Map<String, String>? restoredMedia,Map<String, String>? restoredNoteMedia,Map<String, String>? restoredShots,Map<String, String>? restoredMoments}) {+ final map = withMergedExercises(backup);+ if (restoredMedia != null) restoredMedia = withMergedExercises(restoredMedia).cast<String, String>();_loading = true;profile = Profile.fromJson((map['profile'] as Map?)?.cast<String, dynamic>() ?? {});themePref = _themeFrom(map, fallback: themePref);diff --git a/lib/state/routines_state.dart b/lib/state/routines_state.dartindex 2b461a9..9f83450 100644--- a/lib/state/routines_state.dart+++ b/lib/state/routines_state.dart@@ -195,6 +195,21 @@ mixin RoutinesState on FitCore, LibraryState {notifyListeners();}+ void replaceRoutineExercise(String routineId, String from, String to) {+ final r = _routine(routineId);+ if (r == null) return;+ final at = r.exerciseIds.indexOf(from);+ if (at < 0 || r.exerciseIds.contains(to)) return;+ r.exerciseIds[at] = to;+ final sets = r.sets.remove(from);+ if (sets != null) r.sets[to] = sets;+ final plan = r.plan.remove(from);+ if (plan != null) r.plan[to] = [for (final p in plan) PlannedSet(kind: p.kind)];+ if (r.chained.remove(from)) r.chained.add(to);+ _persist();+ notifyListeners();+ }+VoidCallback? removeRoutineExercise(String routineId, String exId) {final r = _routine(routineId);if (r == null) return null;diff --git a/lib/state/settings_state.dart b/lib/state/settings_state.dartindex 9a177fc..49d236b 100644--- a/lib/state/settings_state.dart+++ b/lib/state/settings_state.dart@@ -29,6 +29,8 @@ mixin SettingsState on FitCore, ToolsState, LibraryState {double bgDim = 0.55;bool showFocus = true;bool showRecommended = true;+ bool levelHints = true;+ bool heatmapLabels = true;bool autoAdvance = true;bool keepScreenOn = true;bool startCountdown = true;@@ -346,6 +348,18 @@ mixin SettingsState on FitCore, ToolsState, LibraryState {notifyListeners();}+ void toggleHeatmapLabels() {+ heatmapLabels = !heatmapLabels;+ _persist();+ notifyListeners();+ }++ void toggleLevelHints() {+ levelHints = !levelHints;+ _persist();+ notifyListeners();+ }+static const weekStarts = [DateTime.monday, DateTime.saturday, DateTime.sunday];void setWeekStart(int weekday) {diff --git a/lib/state/stats_state.dart b/lib/state/stats_state.dartindex 4328833..665a644 100644--- a/lib/state/stats_state.dart+++ b/lib/state/stats_state.dart@@ -193,8 +193,23 @@ mixin StatsState on FitCore, ToolsState, LibraryState, TimelineState {..sort((a, b) => b.date.compareTo(a.date));}+ void _releaseLevel(LoggedSession s, Iterable<String> ids) {+ final ms = s.date.millisecondsSinceEpoch;+ for (final id in ids) {+ final shown = levelShown[id];+ if (shown == null || shown.first != ms) continue;+ if (shown.last == 0) {+ levelSeen.remove(id);+ } else {+ levelSeen[id] = shown.last;+ }+ levelShown.remove(id);+ }+ }+void deleteSession(LoggedSession s) {sessions.remove(s);+ _releaseLevel(s, s.exercises.map((e) => e.id));persistNow();_refreshWidgets();notifyListeners();@@ -203,6 +218,7 @@ mixin StatsState on FitCore, ToolsState, LibraryState, TimelineState {void deleteLoggedExercise(LoggedSession s, LoggedExercise e) {s.exercises.remove(e);if (s.exercises.isEmpty) sessions.remove(s);+ _releaseLevel(s, [e.id]);persistNow();notifyListeners();}@@ -700,6 +716,16 @@ mixin StatsState on FitCore, ToolsState, LibraryState, TimelineState {return h.map((r) => _round1(r.ex.bestOneRm)).toList();}+ List<int> heatmapWeeksFor(int weeks) {+ final tail = 6 - todayIndex;+ return [...heatmapLevelsFor(weeks * 7 - tail), for (var i = 0; i < tail; i++) -1];+ }++ List<int> get heatmapWeeks => heatmapWeeksFor(kHeatmapDays ~/ 7);++ DateTime heatmapWeekDate(int i, {int weeks = kHeatmapDays ~/ 7}) =>+ shiftDays(_weekStart, i - (weeks - 1) * 7);+static const _habitWindowDays = 120;Iterable<LoggedSession> get _recentSessions {diff --git a/lib/state/workout_state.dart b/lib/state/workout_state.dartindex 44b2a97..50a9c08 100644--- a/lib/state/workout_state.dart+++ b/lib/state/workout_state.dart@@ -1117,10 +1117,12 @@ mixin WorkoutState on FitCore, SettingsState, LibraryState, PlacesState, StatsStsessions.sort((a, b) => a.date.compareTo(b.date));_filed = entry;_computeSummaryHighlights(entry);+ _offerLevelUp(entry);} else {_filed = null;summaryPrs = 0;summaryVsLast = null;+ summaryLevelUp = null;}persistNow();_refreshWidgets();@@ -1234,11 +1236,111 @@ mixin WorkoutState on FitCore, SettingsState, LibraryState, PlacesState, StatsStsummaryVsLast = previous?.volume;}+ ({Exercise from, Exercise to, int reps})? summaryLevelUp;+ int? _levelQuietBefore;++ static const _levelQuiet = Duration(days: 7);+ static const _levelLater = Duration(days: 21);++ bool _clearsLevel(List<LoggedSet> sets, int reps) => sets.where((s) => s.counts && s.reps >= reps).length >= 3;++ void _offerLevelUp(LoggedSession entry) {+ summaryLevelUp = null;+ _levelQuietBefore = null;+ if (!levelHints) return;+ final now = DateTime.now().millisecondsSinceEpoch;+ final done = {for (final e in entry.exercises) e.id};+ ({Exercise from, Exercise to, int reps})? best;+ var bestStep = -1;+ for (final e in entry.exercises) {+ final next = nextStepOf(e.id);+ if (next == null || done.contains(next) || levelStay.contains(e.id) || isArchived(next)) continue;+ if ((levelSeen[e.id] ?? 0) > now || modeOf(e.id).isNotEmpty) continue;+ final from = exerciseById(e.id);+ final to = exerciseById(next);+ if (from == null || to == null) continue;+ final reps = kSlowReps.contains(e.id) ? 5 : 8;+ if (!_clearsLevel(e.sets, reps)) continue;+ LoggedExercise? before;+ for (final s in sessions.reversed) {+ if (identical(s, entry)) continue;+ for (final x in s.exercises) {+ if (x.id == e.id) before = x;+ }+ if (before != null) break;+ }+ if (before == null || !_clearsLevel(before.sets, reps)) continue;+ final step = kProgressions.firstWhere((c) => c.contains(e.id)).indexOf(e.id);+ if (step > bestStep) {+ bestStep = step;+ best = (from: from, to: to, reps: reps);+ }+ }+ if (best == null) return;+ summaryLevelUp = best;+ _levelQuietBefore = levelSeen[best.from.id];+ levelSeen[best.from.id] = now + _levelQuiet.inMilliseconds;+ levelShown[best.from.id] = [entry.date.millisecondsSinceEpoch, _levelQuietBefore ?? 0];+ }++ bool get levelUpInRoutine {+ final l = summaryLevelUp;+ final r = sessionRoutine;+ return l != null && r != null && r.exerciseIds.contains(l.from.id) && !r.exerciseIds.contains(l.to.id);+ }++ String? levelUpSwap() {+ final l = summaryLevelUp;+ final r = sessionRoutine;+ if (l == null || r == null || !levelUpInRoutine) return null;+ replaceRoutineExercise(r.id, l.from.id, l.to.id);+ summaryLevelUp = null;+ persistNow();+ notifyListeners();+ return routineTitle(r);+ }++ void levelUpLater() {+ final l = summaryLevelUp;+ if (l == null) return;+ levelSeen[l.from.id] = DateTime.now().add(_levelLater).millisecondsSinceEpoch;+ levelShown.remove(l.from.id);+ summaryLevelUp = null;+ persistNow();+ notifyListeners();+ }++ VoidCallback? levelUpStay() {+ final l = summaryLevelUp;+ if (l == null) return null;+ levelStay.add(l.from.id);+ summaryLevelUp = null;+ persistNow();+ notifyListeners();+ return () {+ levelStay.remove(l.from.id);+ summaryLevelUp = l;+ persistNow();+ notifyListeners();+ };+ }+LoggedSession? _filed;void continueSession() {final s = session;if (s == null || !s.complete) return;+ final level = summaryLevelUp;+ if (level != null) {+ final before = _levelQuietBefore;+ if (before == null) {+ levelSeen.remove(level.from.id);+ } else {+ levelSeen[level.from.id] = before;+ }+ levelShown.remove(level.from.id);+ summaryLevelUp = null;+ }final filed = _filed;if (filed != null) sessions.remove(filed);_filed = null;diff --git a/lib/widgets/charts.dart b/lib/widgets/charts.dartindex 6de98ad..1b6ce29 100644--- a/lib/widgets/charts.dart+++ b/lib/widgets/charts.dart@@ -2,6 +2,8 @@ import 'dart:math' as math;import 'package:flutter/material.dart';+import '../l10n/l10n.dart';+import '../state/fit_state.dart' show shiftDays;import '../theme/app_colors.dart';import '../theme/app_theme.dart';import 'body_map.dart';@@ -434,34 +436,92 @@ class _TrendPainter extends CustomPainter {}class Heatmap extends StatelessWidget {- const Heatmap({super.key, required this.levels, this.onTapDay});+ const Heatmap({super.key, required this.levels, this.onTapDay, this.firstDay, this.labels = false});final List<int> levels;final void Function(int index)? onTapDay;+ final DateTime? firstDay;+ final bool labels;Color _color(int level, GymColors gc) => level <= 0 ? gc.heatEmpty : heatLevelColor(gc, level);@overrideWidget build(BuildContext context) {final gc = context.gc;- const cols = 12, gap = 4.0;+ const rows = 7, gap = 4.0;+ final cols = (levels.length / rows).ceil();+ final start = firstDay;+ final named = labels && start != null;+ final side = named ? 16.0 : 0.0;+ final top = named ? 16.0 : 0.0;+ final labelStyle = AppTheme.f(9, weight: FontWeight.w600, color: gc.textTertiary);return LayoutBuilder(builder: (context, c) {- final cell = (c.maxWidth - gap * (cols - 1)) / cols;- return Wrap(- spacing: gap,- runSpacing: gap,- children: [- for (int i = 0; i < levels.length; i++)- GestureDetector(- behavior: HitTestBehavior.opaque,- onTap: onTapDay == null ? null : () => onTapDay!(i),- child: Container(- width: cell,- height: cell,- decoration:- BoxDecoration(color: _color(levels[i], gc), borderRadius: BorderRadius.circular(3)),- ),- ),- ],+ var cell = (c.maxWidth - side - gap * (cols - 1)) / cols;+ if (c.hasBoundedHeight) cell = math.min(cell, (c.maxHeight - top - gap * (rows - 1)) / rows);+ Widget box(int i) {+ final level = i < levels.length ? levels[i] : -1;+ if (level < 0) return SizedBox(width: cell, height: cell);+ return GestureDetector(+ behavior: HitTestBehavior.opaque,+ onTap: onTapDay == null ? null : () => onTapDay!(i),+ child: Container(+ width: cell,+ height: cell,+ decoration: BoxDecoration(color: _color(level, gc), borderRadius: BorderRadius.circular(3)),+ ),+ );+ }++ Widget spaced(Axis axis, List<Widget> items) {+ final out = <Widget>[];+ for (var i = 0; i < items.length; i++) {+ if (i > 0) out.add(SizedBox(width: axis == Axis.horizontal ? gap : 0, height: axis == Axis.vertical ? gap : 0));+ out.add(items[i]);+ }+ return axis == Axis.horizontal+ ? Row(mainAxisSize: MainAxisSize.min, crossAxisAlignment: CrossAxisAlignment.start, children: out)+ : Column(mainAxisSize: MainAxisSize.min, children: out);+ }++ final grid = spaced(Axis.horizontal, [+ for (var col = 0; col < cols; col++) spaced(Axis.vertical, [for (var r = 0; r < rows; r++) box(col * rows + r)]),+ ]);+ if (!named) return grid;++ final months = <Widget>[];+ int? lastMonth;+ for (var col = 0; col < cols; col++) {+ final month = shiftDays(start, col * rows).month;+ if (month != lastMonth && (col > 0 || shiftDays(start, 0).day <= 7)) {+ months.add(Positioned(+ left: side + col * (cell + gap),+ top: 0,+ child: Text(t.monthShort(month), style: labelStyle),+ ));+ }+ lastMonth = month;+ }+ return SizedBox(+ width: side + cols * cell + (cols - 1) * gap,+ height: top + rows * cell + (rows - 1) * gap,+ child: Stack(clipBehavior: Clip.none, children: [+ ...months,+ Positioned(+ left: 0,+ top: top,+ child: spaced(Axis.vertical, [+ for (var r = 0; r < rows; r++)+ SizedBox(+ width: side,+ height: cell,+ child: Align(+ alignment: Alignment.centerLeft,+ child: Text(t.weekdayInitial(shiftDays(start, r).weekday), style: labelStyle),+ ),+ ),+ ]),+ ),+ Positioned(left: side, top: top, child: grid),+ ]),);});}diff --git a/lib/widgets/home_widget_views.dart b/lib/widgets/home_widget_views.dartindex b4df37b..e67289d 100644--- a/lib/widgets/home_widget_views.dart+++ b/lib/widgets/home_widget_views.dart@@ -12,8 +12,11 @@ const _kDisplay = 'Nunito';const _kBody = 'Nunito';const _kBorder = 1.0;-Color _heat(int level, GymColors gc) =>- level <= 0 ? gc.heatEmpty : heatLevelColor(gc, level);+Color _heat(int level, GymColors gc) => level < 0+ ? Colors.transparent+ : level == 0+ ? gc.heatEmpty+ : heatLevelColor(gc, level);BoxDecoration _card(GymColors gc, bool framed, double radius) => BoxDecoration(color: gc.bgRaised,diff --git a/lib/widgets/liquid_notch.dart b/lib/widgets/liquid_notch.dartindex 83e304d..8208c60 100644--- a/lib/widgets/liquid_notch.dart+++ b/lib/widgets/liquid_notch.dart@@ -4,6 +4,7 @@ import 'dart:ui' as ui;import 'package:flutter/material.dart';+import '../services/beeper.dart';import '../theme/app_theme.dart';@immutable@@ -304,6 +305,7 @@ Future<void> showNotchToast(String? action,VoidCallback? onTap,Duration? duration,+ bool sound = true,}) {final overlay = Overlay.maybeOf(context, rootOverlay: true);final words = '$title ${subtitle ?? ''}'.trim().split(RegExp(r'\s+')).length;@@ -321,6 +323,7 @@ Future<void> showNotchToast();final session = _sessions[overlay] ??= _ToastSession(overlay);session.show(request);+ if (sound) Beeper.instance.chime();return request.done.future;}diff --git a/lib/widgets/share_cards.dart b/lib/widgets/share_cards.dartindex 218876f..9d800b0 100644--- a/lib/widgets/share_cards.dart+++ b/lib/widgets/share_cards.dart@@ -133,7 +133,7 @@ class ShareCard extends StatelessWidget {Text(t.sessionsLogged(fit.sessionsThisWeek),style: AppTheme.f(12, weight: FontWeight.w500, color: gc.textSecondary)),const SizedBox(height: 18),- SizedBox(height: 118, child: Heatmap(levels: fit.heatmapLevelsFor(60))),+ SizedBox(height: 118, child: Heatmap(levels: fit.heatmapWeeksFor(16))),const Spacer(),Row(children: [diff --git a/test/level_up_test.dart b/test/level_up_test.dartnew file mode 100644index 0000000..7fb30e6--- /dev/null+++ b/test/level_up_test.dart@@ -0,0 +1,176 @@+import 'package:flutter_test/flutter_test.dart';+import 'package:gymmane/catalog/exercise_catalog.dart';+import 'package:gymmane/models/workout.dart';+import 'package:gymmane/services/local_store.dart';+import 'package:gymmane/state/fit_state.dart';+import 'package:shared_preferences/shared_preferences.dart';++void main() {+ TestWidgetsFlutterBinding.ensureInitialized();++ const pushUp = 'I4hDWkc';+ const diamond = 'x6KpKpq';++ setUp(() async {+ SharedPreferences.setMockInitialValues({});+ await Store.instance.init();+ fit.resetAllData();+ fit.setUnits('kg');+ fit.autoAdvance = false;+ });++ tearDown(() {+ if (fit.session != null) fit.saveAndExit();+ });++ Routine routineWith(List<String> ids) {+ final id = fit.createRoutine('Calistenia');+ for (final ex in ids) {+ fit.toggleRoutineExercise(id, ex);+ }+ return fit.routines.firstWhere((r) => r.id == id);+ }++ void workout(Routine r, int reps, {int sets = 3}) {+ fit.startRoutine(r);+ fit.endCountdown();+ final ex = fit.session!.exercises.first;+ expect(ex.sets.length, greaterThanOrEqualTo(sets));+ for (var i = 0; i < sets; i++) {+ fit.setSessionReps(0, i, reps);+ fit.toggleSet(0, i);+ }+ fit.finishSession();+ }++ test('las cadenas no repiten ejercicios y todos existen', () {+ final all = [for (final c in kProgressions) ...c];+ expect(all.toSet().length, all.length);+ for (final id in all) {+ expect(fit.exerciseById(id), isNotNull, reason: id);+ }+ expect(nextStepOf(pushUp), diamond);+ expect(nextStepOf('pseudo-planche-push-up'), isNull);+ });++ test('un solo buen día no basta: hacen falta dos entrenos seguidos', () {+ final r = routineWith([pushUp]);+ workout(r, 8);+ expect(fit.summaryLevelUp, isNull);+ fit.saveAndExit();+ workout(r, 9);+ expect(fit.summaryLevelUp?.to.id, diamond);+ });++ test('si una de las veces no llega a 3×8 no se sugiere', () {+ final r = routineWith([pushUp]);+ workout(r, 8);+ fit.saveAndExit();+ workout(r, 7);+ expect(fit.summaryLevelUp, isNull);+ });++ test('las negativas suben con 3×5', () {+ final r = routineWith(['negative-pull-up']);+ workout(r, 5);+ fit.saveAndExit();+ workout(r, 5);+ expect(fit.summaryLevelUp?.to.id, 'lBDjFxJ');+ });++ test('cambiarlo en la rutina lo pone en el mismo sitio con sus series', () {+ final r = routineWith([pushUp, '6YUfHPL']);+ fit.bumpRoutineSets(r.id, pushUp, 1);+ final sets = fit.routineSets(r, pushUp);+ workout(r, 8);+ fit.saveAndExit();+ workout(r, 8);+ expect(fit.levelUpInRoutine, isTrue);+ expect(fit.levelUpSwap(), 'Calistenia');+ expect(r.exerciseIds, [diamond, '6YUfHPL']);+ expect(fit.routineSets(r, diamond), sets);+ expect(fit.summaryLevelUp, isNull);+ });++ test('después de verlo no vuelve a salir en una semana', () {+ final r = routineWith([pushUp]);+ workout(r, 8);+ fit.saveAndExit();+ workout(r, 8);+ expect(fit.summaryLevelUp, isNotNull);+ fit.saveAndExit();+ workout(r, 8);+ expect(fit.summaryLevelUp, isNull);+ });++ test('borrar el entreno que la sacó la deja volver a salir', () {+ final r = routineWith([pushUp]);+ workout(r, 8);+ fit.saveAndExit();+ workout(r, 8);+ expect(fit.summaryLevelUp, isNotNull);+ fit.saveAndExit();+ fit.deleteSession(fit.sessions.last);+ workout(r, 8);+ expect(fit.summaryLevelUp?.to.id, diamond);+ });++ test('borrar otro entreno no la vuelve a sacar', () {+ final r = routineWith([pushUp]);+ workout(r, 8);+ fit.saveAndExit();+ workout(r, 8);+ expect(fit.summaryLevelUp, isNotNull);+ fit.saveAndExit();+ fit.deleteSession(fit.sessions.first);+ workout(r, 8);+ fit.saveAndExit();+ workout(r, 8);+ expect(fit.summaryLevelUp, isNull);+ });++ test('«Me quedo con este» lo silencia para siempre y se puede deshacer', () {+ final r = routineWith([pushUp]);+ workout(r, 8);+ fit.saveAndExit();+ workout(r, 8);+ final undo = fit.levelUpStay()!;+ expect(fit.levelStay, contains(pushUp));+ undo();+ expect(fit.levelStay, isNot(contains(pushUp)));+ expect(fit.summaryLevelUp?.to.id, diamond);+ });++ test('seguir entrenando no gasta la sugerencia', () {+ final r = routineWith([pushUp]);+ workout(r, 8);+ fit.saveAndExit();+ workout(r, 8);+ expect(fit.summaryLevelUp, isNotNull);+ fit.continueSession();+ expect(fit.summaryLevelUp, isNull);+ fit.finishSession();+ expect(fit.summaryLevelUp?.to.id, diamond);+ });++ test('con el ajuste apagado nunca sale', () {+ fit.toggleLevelHints();+ final r = routineWith([pushUp]);+ workout(r, 8);+ fit.saveAndExit();+ workout(r, 8);+ expect(fit.summaryLevelUp, isNull);+ });++ test('se guarda y vuelve con la copia', () {+ fit.levelStay.add(pushUp);+ fit.levelSeen['negative-dip'] = 123;+ fit.toggleLevelHints();+ final saved = fit.toJson();+ fit.resetAllData();+ fit.applyBackup(saved);+ expect(fit.levelStay, {pushUp});+ expect(fit.levelSeen['negative-dip'], 123);+ expect(fit.levelHints, isFalse);+ });+}diff --git a/test/progress_order_test.dart b/test/progress_order_test.dartindex 642c778..6939937 100644--- a/test/progress_order_test.dart+++ b/test/progress_order_test.dart@@ -80,7 +80,7 @@ void main() {reason: 'lo ya hecho se queda listado, pero con su tic');});- testWidgets('a fresh install leads with what to fill in, not with empty cards', (tester) async {+ testWidgets('a fresh install leads with what to fill in and still shows the empty grid', (tester) async {fit.route = 'progress';await tester.pumpWidget(const GymManeApp());await tester.pumpAndSettle();@@ -89,7 +89,7 @@ void main() {final volume = await yOf(tester, t.tileVolume30.toUpperCase());expect(setup, lessThan(volume));- expect(find.text(t.consistency.toUpperCase()), findsNothing,- reason: 'una rejilla vacía no dice nada a quien acaba de instalar');+ expect(find.text(t.consistency.toUpperCase()), findsOneWidget,+ reason: 'la rejilla vacía invita a rellenarla');});}diff --git a/test/requests_29sep_test.dart b/test/requests_29sep_test.dartnew file mode 100644index 0000000..1d15edf--- /dev/null+++ b/test/requests_29sep_test.dart@@ -0,0 +1,51 @@+import 'package:flutter_test/flutter_test.dart';+import 'package:gymmane/models/workout.dart';+import 'package:gymmane/services/local_store.dart';+import 'package:gymmane/state/fit_state.dart';+import 'package:shared_preferences/shared_preferences.dart';++void main() {+ TestWidgetsFlutterBinding.ensureInitialized();++ setUp(() async {+ SharedPreferences.setMockInitialValues({});+ await Store.instance.init();+ fit.resetAllData();+ fit.setUnits('kg');+ });++ const bench = 'EIeI8Vf';++ LoggedSession logged(DateTime at, List<LoggedSet> sets, {String id = bench}) =>+ LoggedSession(at, 1800, [LoggedExercise(id, 'Barbell Bench Press', 'chest', sets)]);++ group('#138 una semana por columna', () {+ test('cada columna empieza el primer día de la semana y hoy cae en su fila', () {+ for (final start in [DateTime.monday, DateTime.sunday]) {+ fit.setWeekStart(start);+ final cells = fit.heatmapWeeks;+ expect(cells.length % 7, 0);+ expect(fit.heatmapWeekDate(0).weekday, start);+ final today = DateTime.now();+ final i = cells.length - 7 + fit.todayIndex;+ final d = fit.heatmapWeekDate(i);+ expect((d.year, d.month, d.day), (today.year, today.month, today.day));+ expect(cells.skip(i + 1).every((l) => l == -1), isTrue);+ }+ });++ test('un entreno de hoy se pinta en la casilla de hoy', () {+ fit.sessions.add(logged(DateTime.now(), [LoggedSet(8, 60)]));+ final cells = fit.heatmapWeeks;+ expect(cells[cells.length - 7 + fit.todayIndex], greaterThan(0));+ });++ test('los días y meses vienen encendidos y apagarlos se guarda', () {+ expect(fit.heatmapLabels, isTrue);+ fit.toggleHeatmapLabels();+ fit.persistNow();+ fit.loadFromStore();+ expect(fit.heatmapLabels, isFalse);+ });+ });+}