Skip to content

Offline gym log for Android. No account, no ads, no internet.

Hide the routine editor buttons while typing and give Save more contrast

InlitX5539cc83441a
diff --git a/lib/l10n/app_ar.arb b/lib/l10n/app_ar.arb
index 2789d42..0fe45ce 100644
--- a/lib/l10n/app_ar.arb
+++ b/lib/l10n/app_ar.arb
@@ -1095,7 +1095,7 @@
"saveToRoutine": "حفظ التغييرات في الروتين",
"routineUpdated": "تم تحديث الروتين",
"saveChangesTitle": "حفظ التغييرات في {name}؟",
- "saveChangesBody": "في المرة القادمة سيبدأ هذا الروتين هكذا.",
+ "saveChangesBody": "في المرة القادمة التي تبدأه فيها، سيتضمن الروتين هذه التغييرات.",
"routineOrderChanged": "ترتيب جديد للتمارين",
"mineOnly": "من إنشائك",
"createNamed": "غير موجود؟ أنشئ «{name}»",
@@ -1122,6 +1122,7 @@
"multiPlanSetting": "أكثر من روتين في اليوم",
"multiPlanHint": "اضغط كل روتين لهذا اليوم. تأتي بالترتيب الذي تضيفها به.",
"routineOfDay": "{n} من {total} اليوم",
+ "nextToday": "التالي اليوم",
"planAboutMe": "عني:",
"planBody": "{sex}، {age} سنة، الطول {height}، الوزن {weight}.",
"planDays": "أريد التمرين {n} أيام في الأسبوع.",
diff --git a/lib/l10n/app_de.arb b/lib/l10n/app_de.arb
index 499729a..518a9c3 100644
--- a/lib/l10n/app_de.arb
+++ b/lib/l10n/app_de.arb
@@ -976,7 +976,7 @@
"saveToRoutine": "ÄNDERUNGEN IM TRAININGSPLAN SPEICHERN",
"routineUpdated": "Trainingsplan aktualisiert",
"saveChangesTitle": "Änderungen in {name} speichern?",
- "saveChangesBody": "Beim nächsten Mal startet der Trainingsplan so.",
+ "saveChangesBody": "Wenn du ihn das nächste Mal startest, hat der Trainingsplan diese Änderungen.",
"routineOrderChanged": "Neue Reihenfolge der Übungen",
"mineOnly": "Von dir erstellt",
"createNamed": "Nicht dabei? „{name}“ erstellen",
@@ -1003,6 +1003,7 @@
"multiPlanSetting": "Mehrere Pläne pro Tag",
"multiPlanHint": "Tippe jeden Plan für diesen Tag an. Sie laufen in der Reihenfolge, in der du sie hinzufügst.",
"routineOfDay": "{n} von {total} heute",
+ "nextToday": "Als Nächstes heute",
"planAboutMe": "Über mich:",
"planBody": "{sex}, {age} Jahre, {height} groß, {weight}.",
"planDays": "Ich möchte {n} Tage pro Woche trainieren.",
diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb
index 9d7a4a7..f2e88df 100644
--- a/lib/l10n/app_en.arb
+++ b/lib/l10n/app_en.arb
@@ -993,7 +993,7 @@
"routineUpdated": "Routine updated",
"saveChangesTitle": "Save changes to {name}?",
"@saveChangesTitle": {"placeholders": {"name": {"type": "String"}}},
- "saveChangesBody": "Next time this routine starts like this.",
+ "saveChangesBody": "Next time you start it, the routine will have these changes.",
"routineOrderChanged": "New exercise order",
"mineOnly": "Created by you",
"createNamed": "Not here? Create “{name}”",
@@ -1022,6 +1022,7 @@
"multiPlanHint": "Tap every routine for this day. They go in the order you add them.",
"routineOfDay": "{n} of {total} today",
"@routineOfDay": {"placeholders": {"n": {"type": "int"}, "total": {"type": "int"}}},
+ "nextToday": "Next today",
"planAboutMe": "About me:",
"planBody": "{sex}, {age} years old, {height} tall, {weight}.",
"planDays": "I want to train {n} days a week.",
diff --git a/lib/l10n/app_es.arb b/lib/l10n/app_es.arb
index 1ae48ea..7d711b5 100644
--- a/lib/l10n/app_es.arb
+++ b/lib/l10n/app_es.arb
@@ -920,7 +920,7 @@
"saveToRoutine": "GUARDAR CAMBIOS EN LA RUTINA",
"routineUpdated": "Rutina actualizada",
"saveChangesTitle": "¿Guardar cambios en {name}?",
- "saveChangesBody": "La próxima vez esta rutina empezará así.",
+ "saveChangesBody": "La próxima vez que la empieces, la rutina tendrá estos cambios.",
"routineOrderChanged": "Nuevo orden de ejercicios",
"mineOnly": "Creados por ti",
"createNamed": "¿No está? Crear «{name}»",
@@ -947,6 +947,7 @@
"multiPlanSetting": "Varias rutinas al día",
"multiPlanHint": "Toca cada rutina de este día. Van en el orden en que las añadas.",
"routineOfDay": "{n} de {total} hoy",
+ "nextToday": "Siguiente hoy",
"planAboutMe": "Sobre mí:",
"planBody": "{sex}, {age} años, {height} de altura, {weight}.",
"planDays": "Quiero entrenar {n} días a la semana.",
diff --git a/lib/l10n/app_fa.arb b/lib/l10n/app_fa.arb
index 4520278..5302f37 100644
--- a/lib/l10n/app_fa.arb
+++ b/lib/l10n/app_fa.arb
@@ -1451,7 +1451,7 @@
"routineUpdated": "روتین به‌روز شد",
"saveChangesTitle": "تغییرات «{name}» ذخیره شود؟",
"@saveChangesTitle": {"placeholders": {"name": {"type": "String"}}},
- "saveChangesBody": "دفعه بعد این روتین همین‌طور شروع می‌شود.",
+ "saveChangesBody": "دفعه بعد که شروعش کنی، روتین این تغییرات را خواهد داشت.",
"routineOrderChanged": "ترتیب جدید حرکات",
"mineOnly": "ساخته خودت",
"createNamed": "اینجا نیست؟ «{name}» را بساز",
@@ -1480,6 +1480,7 @@
"multiPlanHint": "هر روتین این روز را لمس کن. به ترتیبی که اضافه می‌کنی می‌آیند.",
"routineOfDay": "{n} از {total} امروز",
"@routineOfDay": {"placeholders": {"n": {"type": "int"}, "total": {"type": "int"}}},
+ "nextToday": "بعدی امروز",
"planAboutMe": "درباره من:",
"planBody": "{sex}، {age} ساله، قد {height}، وزن {weight}.",
"@planBody": {"placeholders": {"sex": {"type": "String"}, "age": {"type": "int"}, "height": {"type": "String"}, "weight": {"type": "String"}}},
diff --git a/lib/l10n/app_fr.arb b/lib/l10n/app_fr.arb
index 170366e..54c39c1 100644
--- a/lib/l10n/app_fr.arb
+++ b/lib/l10n/app_fr.arb
@@ -1095,7 +1095,7 @@
"saveToRoutine": "ENREGISTRER DANS LE PROGRAMME",
"routineUpdated": "Programme mis à jour",
"saveChangesTitle": "Enregistrer les modifications dans {name} ?",
- "saveChangesBody": "La prochaine fois, ce programme commencera ainsi.",
+ "saveChangesBody": "La prochaine fois que tu le lanceras, le programme aura ces modifications.",
"routineOrderChanged": "Nouvel ordre des exercices",
"mineOnly": "Créés par toi",
"createNamed": "Introuvable ? Créer « {name} »",
@@ -1122,6 +1122,7 @@
"multiPlanSetting": "Plusieurs programmes par jour",
"multiPlanHint": "Touche chaque programme de ce jour. Ils suivent l’ordre dans lequel tu les ajoutes.",
"routineOfDay": "{n} sur {total} aujourd’hui",
+ "nextToday": "Ensuite aujourd’hui",
"planAboutMe": "À propos de moi :",
"planBody": "{sex}, {age} ans, {height}, {weight}.",
"planDays": "Je veux m’entraîner {n} jours par semaine.",
diff --git a/lib/l10n/app_it.arb b/lib/l10n/app_it.arb
index 6a90d5d..3416c82 100644
--- a/lib/l10n/app_it.arb
+++ b/lib/l10n/app_it.arb
@@ -956,7 +956,7 @@
"saveToRoutine": "SALVA LE MODIFICHE NELLA SCHEDA",
"routineUpdated": "Scheda aggiornata",
"saveChangesTitle": "Salvare le modifiche in {name}?",
- "saveChangesBody": "La prossima volta la scheda partirà così.",
+ "saveChangesBody": "La prossima volta che la avvii, la scheda avrà queste modifiche.",
"routineOrderChanged": "Nuovo ordine degli esercizi",
"mineOnly": "Creati da te",
"createNamed": "Non c’è? Crea «{name}»",
@@ -983,6 +983,7 @@
"multiPlanSetting": "Più schede al giorno",
"multiPlanHint": "Tocca ogni scheda di questo giorno. Seguono l’ordine in cui le aggiungi.",
"routineOfDay": "{n} di {total} oggi",
+ "nextToday": "Prossima oggi",
"planAboutMe": "Su di me:",
"planBody": "{sex}, {age} anni, {height} di altezza, {weight}.",
"planDays": "Voglio allenarmi {n} giorni a settimana.",
diff --git a/lib/l10n/app_ja.arb b/lib/l10n/app_ja.arb
index d7d9a7d..b519e2d 100644
--- a/lib/l10n/app_ja.arb
+++ b/lib/l10n/app_ja.arb
@@ -1095,7 +1095,7 @@
"saveToRoutine": "ルーティンに変更を保存",
"routineUpdated": "ルーティンを更新しました",
"saveChangesTitle": "{name}に変更を保存しますか?",
- "saveChangesBody": "次回からこのルーティンはこの内容で始まります。",
+ "saveChangesBody": "次に始めるとき、ルーティンにはこれらの変更が反映されます。",
"routineOrderChanged": "新しい種目の順番",
"mineOnly": "自分で作成",
"createNamed": "見つからない?「{name}」を作成",
@@ -1122,6 +1122,7 @@
"multiPlanSetting": "1日に複数のルーティン",
"multiPlanHint": "この日のルーティンをすべてタップ。追加した順に進みます。",
"routineOfDay": "今日 {n}/{total}",
+ "nextToday": "今日の次のルーティン",
"planAboutMe": "私について:",
"planBody": "{sex}、{age}歳、身長{height}、体重{weight}。",
"planDays": "週{n}日トレーニングしたい。",
diff --git a/lib/l10n/app_ko.arb b/lib/l10n/app_ko.arb
index 502daf6..251bc19 100644
--- a/lib/l10n/app_ko.arb
+++ b/lib/l10n/app_ko.arb
@@ -1095,7 +1095,7 @@
"saveToRoutine": "루틴에 변경 사항 저장",
"routineUpdated": "루틴을 업데이트했어요",
"saveChangesTitle": "{name}에 변경 사항을 저장할까요?",
- "saveChangesBody": "다음부터 이 루틴은 이렇게 시작돼요.",
+ "saveChangesBody": "다음에 시작하면 루틴에 이 변경 사항이 반영돼요.",
"routineOrderChanged": "새 운동 순서",
"mineOnly": "내가 만든 운동",
"createNamed": "없나요? “{name}” 만들기",
@@ -1122,6 +1122,7 @@
"multiPlanSetting": "하루에 여러 루틴",
"multiPlanHint": "이날 할 루틴을 모두 누르세요. 추가한 순서대로 진행돼요.",
"routineOfDay": "오늘 {n}/{total}",
+ "nextToday": "오늘 다음 루틴",
"planAboutMe": "나에 대해:",
"planBody": "{sex}, {age}세, 키 {height}, 몸무게 {weight}.",
"planDays": "주 {n}일 운동하고 싶어요.",
diff --git a/lib/l10n/app_localizations.dart b/lib/l10n/app_localizations.dart
index 06f4946..179a8c8 100644
--- a/lib/l10n/app_localizations.dart
+++ b/lib/l10n/app_localizations.dart
@@ -5113,7 +5113,7 @@ abstract class AppLocalizations {
/// No description provided for @saveChangesBody.
///
/// In en, this message translates to:
- /// **'Next time this routine starts like this.'**
+ /// **'Next time you start it, the routine will have these changes.'**
String get saveChangesBody;
/// No description provided for @routineOrderChanged.
@@ -5272,6 +5272,12 @@ abstract class AppLocalizations {
/// **'{n} of {total} today'**
String routineOfDay(int n, int total);
+ /// No description provided for @nextToday.
+ ///
+ /// In en, this message translates to:
+ /// **'Next today'**
+ String get nextToday;
+
/// No description provided for @planAboutMe.
///
/// In en, this message translates to:
diff --git a/lib/l10n/app_localizations_ar.dart b/lib/l10n/app_localizations_ar.dart
index 2e56a25..2026fdf 100644
--- a/lib/l10n/app_localizations_ar.dart
+++ b/lib/l10n/app_localizations_ar.dart
@@ -2841,7 +2841,7 @@ class AppLocalizationsAr extends AppLocalizations {
}
@override
- String get saveChangesBody => 'في المرة القادمة سيبدأ هذا الروتين هكذا.';
+ String get saveChangesBody => 'في المرة القادمة التي تبدأه فيها، سيتضمن الروتين هذه التغييرات.';
@override
String get routineOrderChanged => 'ترتيب جديد للتمارين';
@@ -2925,6 +2925,9 @@ class AppLocalizationsAr extends AppLocalizations {
return '$n من $total اليوم';
}
+ @override
+ String get nextToday => 'التالي اليوم';
+
@override
String get planAboutMe => 'عني:';
diff --git a/lib/l10n/app_localizations_de.dart b/lib/l10n/app_localizations_de.dart
index 4c97315..2727577 100644
--- a/lib/l10n/app_localizations_de.dart
+++ b/lib/l10n/app_localizations_de.dart
@@ -2855,7 +2855,8 @@ class AppLocalizationsDe extends AppLocalizations {
}
@override
- String get saveChangesBody => 'Beim nächsten Mal startet der Trainingsplan so.';
+ String get saveChangesBody =>
+ 'Wenn du ihn das nächste Mal startest, hat der Trainingsplan diese Änderungen.';
@override
String get routineOrderChanged => 'Neue Reihenfolge der Übungen';
@@ -2942,6 +2943,9 @@ class AppLocalizationsDe extends AppLocalizations {
return '$n von $total heute';
}
+ @override
+ String get nextToday => 'Als Nächstes heute';
+
@override
String get planAboutMe => 'Über mich:';
diff --git a/lib/l10n/app_localizations_en.dart b/lib/l10n/app_localizations_en.dart
index bfb495f..82f2cb8 100644
--- a/lib/l10n/app_localizations_en.dart
+++ b/lib/l10n/app_localizations_en.dart
@@ -2837,7 +2837,7 @@ class AppLocalizationsEn extends AppLocalizations {
}
@override
- String get saveChangesBody => 'Next time this routine starts like this.';
+ String get saveChangesBody => 'Next time you start it, the routine will have these changes.';
@override
String get routineOrderChanged => 'New exercise order';
@@ -2921,6 +2921,9 @@ class AppLocalizationsEn extends AppLocalizations {
return '$n of $total today';
}
+ @override
+ String get nextToday => 'Next today';
+
@override
String get planAboutMe => 'About me:';
diff --git a/lib/l10n/app_localizations_es.dart b/lib/l10n/app_localizations_es.dart
index 0aae77d..945a689 100644
--- a/lib/l10n/app_localizations_es.dart
+++ b/lib/l10n/app_localizations_es.dart
@@ -2842,7 +2842,7 @@ class AppLocalizationsEs extends AppLocalizations {
}
@override
- String get saveChangesBody => 'La próxima vez esta rutina empezará así.';
+ String get saveChangesBody => 'La próxima vez que la empieces, la rutina tendrá estos cambios.';
@override
String get routineOrderChanged => 'Nuevo orden de ejercicios';
@@ -2926,6 +2926,9 @@ class AppLocalizationsEs extends AppLocalizations {
return '$n de $total hoy';
}
+ @override
+ String get nextToday => 'Siguiente hoy';
+
@override
String get planAboutMe => 'Sobre mí:';
diff --git a/lib/l10n/app_localizations_fa.dart b/lib/l10n/app_localizations_fa.dart
index 88aac70..72ea83f 100644
--- a/lib/l10n/app_localizations_fa.dart
+++ b/lib/l10n/app_localizations_fa.dart
@@ -2828,7 +2828,7 @@ class AppLocalizationsFa extends AppLocalizations {
}
@override
- String get saveChangesBody => 'دفعه بعد این روتین همین‌طور شروع می‌شود.';
+ String get saveChangesBody => 'دفعه بعد که شروعش کنی، روتین این تغییرات را خواهد داشت.';
@override
String get routineOrderChanged => 'ترتیب جدید حرکات';
@@ -2912,6 +2912,9 @@ class AppLocalizationsFa extends AppLocalizations {
return '$n از $total امروز';
}
+ @override
+ String get nextToday => 'بعدی امروز';
+
@override
String get planAboutMe => 'درباره من:';
diff --git a/lib/l10n/app_localizations_fr.dart b/lib/l10n/app_localizations_fr.dart
index e505832..ab49828 100644
--- a/lib/l10n/app_localizations_fr.dart
+++ b/lib/l10n/app_localizations_fr.dart
@@ -2855,7 +2855,7 @@ class AppLocalizationsFr extends AppLocalizations {
}
@override
- String get saveChangesBody => 'La prochaine fois, ce programme commencera ainsi.';
+ String get saveChangesBody => 'La prochaine fois que tu le lanceras, le programme aura ces modifications.';
@override
String get routineOrderChanged => 'Nouvel ordre des exercices';
@@ -2942,6 +2942,9 @@ class AppLocalizationsFr extends AppLocalizations {
return '$n sur $total aujourd’hui';
}
+ @override
+ String get nextToday => 'Ensuite aujourd’hui';
+
@override
String get planAboutMe => 'À propos de moi :';
diff --git a/lib/l10n/app_localizations_it.dart b/lib/l10n/app_localizations_it.dart
index c8437db..bb8bde7 100644
--- a/lib/l10n/app_localizations_it.dart
+++ b/lib/l10n/app_localizations_it.dart
@@ -2845,7 +2845,7 @@ class AppLocalizationsIt extends AppLocalizations {
}
@override
- String get saveChangesBody => 'La prossima volta la scheda partirà così.';
+ String get saveChangesBody => 'La prossima volta che la avvii, la scheda avrà queste modifiche.';
@override
String get routineOrderChanged => 'Nuovo ordine degli esercizi';
@@ -2930,6 +2930,9 @@ class AppLocalizationsIt extends AppLocalizations {
return '$n di $total oggi';
}
+ @override
+ String get nextToday => 'Prossima oggi';
+
@override
String get planAboutMe => 'Su di me:';
diff --git a/lib/l10n/app_localizations_ja.dart b/lib/l10n/app_localizations_ja.dart
index 8a3f68e..9ae41bb 100644
--- a/lib/l10n/app_localizations_ja.dart
+++ b/lib/l10n/app_localizations_ja.dart
@@ -2757,7 +2757,7 @@ class AppLocalizationsJa extends AppLocalizations {
}
@override
- String get saveChangesBody => '次回からこのルーティンはこの内容で始まります。';
+ String get saveChangesBody => '次に始めるとき、ルーティンにはこれらの変更が反映されます。';
@override
String get routineOrderChanged => '新しい種目の順番';
@@ -2841,6 +2841,9 @@ class AppLocalizationsJa extends AppLocalizations {
return '今日 $n/$total';
}
+ @override
+ String get nextToday => '今日の次のルーティン';
+
@override
String get planAboutMe => '私について:';
diff --git a/lib/l10n/app_localizations_ko.dart b/lib/l10n/app_localizations_ko.dart
index e655e2f..f06a557 100644
--- a/lib/l10n/app_localizations_ko.dart
+++ b/lib/l10n/app_localizations_ko.dart
@@ -2767,7 +2767,7 @@ class AppLocalizationsKo extends AppLocalizations {
}
@override
- String get saveChangesBody => '다음부터 이 루틴은 이렇게 시작돼요.';
+ String get saveChangesBody => '다음에 시작하면 루틴에 이 변경 사항이 반영돼요.';
@override
String get routineOrderChanged => '새 운동 순서';
@@ -2851,6 +2851,9 @@ class AppLocalizationsKo extends AppLocalizations {
return '오늘 $n/$total';
}
+ @override
+ String get nextToday => '오늘 다음 루틴';
+
@override
String get planAboutMe => '나에 대해:';
diff --git a/lib/l10n/app_localizations_nl.dart b/lib/l10n/app_localizations_nl.dart
index 32d21f5..50d0fb7 100644
--- a/lib/l10n/app_localizations_nl.dart
+++ b/lib/l10n/app_localizations_nl.dart
@@ -2848,7 +2848,7 @@ class AppLocalizationsNl extends AppLocalizations {
}
@override
- String get saveChangesBody => 'De volgende keer start deze routine zo.';
+ String get saveChangesBody => 'De volgende keer dat je hem start, heeft de routine deze wijzigingen.';
@override
String get routineOrderChanged => 'Nieuwe volgorde van oefeningen';
@@ -2935,6 +2935,9 @@ class AppLocalizationsNl extends AppLocalizations {
return '$n van $total vandaag';
}
+ @override
+ String get nextToday => 'Hierna vandaag';
+
@override
String get planAboutMe => 'Over mij:';
diff --git a/lib/l10n/app_localizations_pl.dart b/lib/l10n/app_localizations_pl.dart
index 4f99669..abdb620 100644
--- a/lib/l10n/app_localizations_pl.dart
+++ b/lib/l10n/app_localizations_pl.dart
@@ -2849,7 +2849,7 @@ class AppLocalizationsPl extends AppLocalizations {
}
@override
- String get saveChangesBody => 'Następnym razem ten plan zacznie się tak.';
+ String get saveChangesBody => 'Gdy następnym razem go zaczniesz, plan będzie miał te zmiany.';
@override
String get routineOrderChanged => 'Nowa kolejność ćwiczeń';
@@ -2934,6 +2934,9 @@ class AppLocalizationsPl extends AppLocalizations {
return '$n z $total dziś';
}
+ @override
+ String get nextToday => 'Następna dzisiaj';
+
@override
String get planAboutMe => 'O mnie:';
diff --git a/lib/l10n/app_localizations_pt.dart b/lib/l10n/app_localizations_pt.dart
index 0b8a50a..204a736 100644
--- a/lib/l10n/app_localizations_pt.dart
+++ b/lib/l10n/app_localizations_pt.dart
@@ -2843,7 +2843,7 @@ class AppLocalizationsPt extends AppLocalizations {
}
@override
- String get saveChangesBody => 'Da próxima vez esta rotina começa assim.';
+ String get saveChangesBody => 'Da próxima vez que você começar, a rotina terá essas alterações.';
@override
String get routineOrderChanged => 'Nova ordem dos exercícios';
@@ -2927,6 +2927,9 @@ class AppLocalizationsPt extends AppLocalizations {
return '$n de $total hoje';
}
+ @override
+ String get nextToday => 'Próxima hoje';
+
@override
String get planAboutMe => 'Sobre mim:';
diff --git a/lib/l10n/app_localizations_ru.dart b/lib/l10n/app_localizations_ru.dart
index 43d7786..4aca881 100644
--- a/lib/l10n/app_localizations_ru.dart
+++ b/lib/l10n/app_localizations_ru.dart
@@ -2932,7 +2932,7 @@ class AppLocalizationsRu extends AppLocalizations {
}
@override
- String get saveChangesBody => 'В следующий раз программа начнётся так.';
+ String get saveChangesBody => 'В следующий раз, когда ты её начнёшь, в программе будут эти изменения.';
@override
String get routineOrderChanged => 'Новый порядок упражнений';
@@ -3017,6 +3017,9 @@ class AppLocalizationsRu extends AppLocalizations {
return '$n из $total сегодня';
}
+ @override
+ String get nextToday => 'Далее сегодня';
+
@override
String get planAboutMe => 'Обо мне:';
diff --git a/lib/l10n/app_localizations_tr.dart b/lib/l10n/app_localizations_tr.dart
index 1f94170..8b0a3ff 100644
--- a/lib/l10n/app_localizations_tr.dart
+++ b/lib/l10n/app_localizations_tr.dart
@@ -2848,7 +2848,7 @@ class AppLocalizationsTr extends AppLocalizations {
}
@override
- String get saveChangesBody => 'Program bir dahaki sefere böyle başlayacak.';
+ String get saveChangesBody => 'Bir dahaki sefere başlattığında program bu değişiklikleri içerecek.';
@override
String get routineOrderChanged => 'Yeni egzersiz sırası';
@@ -2932,6 +2932,9 @@ class AppLocalizationsTr extends AppLocalizations {
return 'Bugün $n/$total';
}
+ @override
+ String get nextToday => 'Bugün sıradaki';
+
@override
String get planAboutMe => 'Hakkımda:';
diff --git a/lib/l10n/app_localizations_uk.dart b/lib/l10n/app_localizations_uk.dart
index 71eba98..c2dee32 100644
--- a/lib/l10n/app_localizations_uk.dart
+++ b/lib/l10n/app_localizations_uk.dart
@@ -2853,7 +2853,7 @@ class AppLocalizationsUk extends AppLocalizations {
}
@override
- String get saveChangesBody => 'Наступного разу програма почнеться так.';
+ String get saveChangesBody => 'Наступного разу, коли ти її почнеш, у програмі будуть ці зміни.';
@override
String get routineOrderChanged => 'Новий порядок вправ';
@@ -2938,6 +2938,9 @@ class AppLocalizationsUk extends AppLocalizations {
return '$n з $total сьогодні';
}
+ @override
+ String get nextToday => 'Далі сьогодні';
+
@override
String get planAboutMe => 'Про мене:';
diff --git a/lib/l10n/app_localizations_zh.dart b/lib/l10n/app_localizations_zh.dart
index 28cc564..dbd962f 100644
--- a/lib/l10n/app_localizations_zh.dart
+++ b/lib/l10n/app_localizations_zh.dart
@@ -2718,7 +2718,7 @@ class AppLocalizationsZh extends AppLocalizations {
}
@override
- String get saveChangesBody => '下次这个训练计划会按这样开始。';
+ String get saveChangesBody => '下次开始时,训练计划会包含这些更改。';
@override
String get routineOrderChanged => '新的动作顺序';
@@ -2802,6 +2802,9 @@ class AppLocalizationsZh extends AppLocalizations {
return '今天第 $n/$total 个';
}
+ @override
+ String get nextToday => '今天的下一个';
+
@override
String get planAboutMe => '关于我:';
@@ -5960,7 +5963,7 @@ class AppLocalizationsZhHant extends AppLocalizationsZh {
}
@override
- String get saveChangesBody => '下次這個課表會照這樣開始。';
+ String get saveChangesBody => '下次開始時,課表會包含這些變更。';
@override
String get routineOrderChanged => '新的動作順序';
@@ -6044,6 +6047,9 @@ class AppLocalizationsZhHant extends AppLocalizationsZh {
return '今天第 $n/$total 個';
}
+ @override
+ String get nextToday => '今天的下一個';
+
@override
String get planAboutMe => '關於我:';
diff --git a/lib/l10n/app_nl.arb b/lib/l10n/app_nl.arb
index b363ae9..8fbff11 100644
--- a/lib/l10n/app_nl.arb
+++ b/lib/l10n/app_nl.arb
@@ -1095,7 +1095,7 @@
"saveToRoutine": "WIJZIGINGEN OPSLAAN IN ROUTINE",
"routineUpdated": "Routine bijgewerkt",
"saveChangesTitle": "Wijzigingen opslaan in {name}?",
- "saveChangesBody": "De volgende keer start deze routine zo.",
+ "saveChangesBody": "De volgende keer dat je hem start, heeft de routine deze wijzigingen.",
"routineOrderChanged": "Nieuwe volgorde van oefeningen",
"mineOnly": "Door jou gemaakt",
"createNamed": "Staat er niet bij? Maak „{name}”",
@@ -1122,6 +1122,7 @@
"multiPlanSetting": "Meerdere routines per dag",
"multiPlanHint": "Tik elke routine voor deze dag aan. Ze volgen de volgorde waarin je ze toevoegt.",
"routineOfDay": "{n} van {total} vandaag",
+ "nextToday": "Hierna vandaag",
"planAboutMe": "Over mij:",
"planBody": "{sex}, {age} jaar, {height} lang, {weight}.",
"planDays": "Ik wil {n} dagen per week trainen.",
diff --git a/lib/l10n/app_pl.arb b/lib/l10n/app_pl.arb
index 831d32b..e420d88 100644
--- a/lib/l10n/app_pl.arb
+++ b/lib/l10n/app_pl.arb
@@ -1095,7 +1095,7 @@
"saveToRoutine": "ZAPISZ ZMIANY W PLANIE",
"routineUpdated": "Plan zaktualizowany",
"saveChangesTitle": "Zapisać zmiany w {name}?",
- "saveChangesBody": "Następnym razem ten plan zacznie się tak.",
+ "saveChangesBody": "Gdy następnym razem go zaczniesz, plan będzie miał te zmiany.",
"routineOrderChanged": "Nowa kolejność ćwiczeń",
"mineOnly": "Utworzone przez ciebie",
"createNamed": "Nie ma? Utwórz „{name}”",
@@ -1122,6 +1122,7 @@
"multiPlanSetting": "Kilka planów dziennie",
"multiPlanHint": "Dotknij każdego planu na ten dzień. Idą w kolejności dodania.",
"routineOfDay": "{n} z {total} dziś",
+ "nextToday": "Następna dzisiaj",
"planAboutMe": "O mnie:",
"planBody": "{sex}, {age} lat, {height} wzrostu, {weight}.",
"planDays": "Chcę trenować {n} dni w tygodniu.",
diff --git a/lib/l10n/app_pt.arb b/lib/l10n/app_pt.arb
index ec38b2e..e76e350 100644
--- a/lib/l10n/app_pt.arb
+++ b/lib/l10n/app_pt.arb
@@ -877,7 +877,7 @@
"saveToRoutine": "GUARDAR ALTERAÇÕES NA ROTINA",
"routineUpdated": "Rotina atualizada",
"saveChangesTitle": "Guardar alterações em {name}?",
- "saveChangesBody": "Da próxima vez esta rotina começa assim.",
+ "saveChangesBody": "Da próxima vez que você começar, a rotina terá essas alterações.",
"routineOrderChanged": "Nova ordem dos exercícios",
"mineOnly": "Criados por ti",
"createNamed": "Não está? Criar «{name}»",
@@ -904,6 +904,7 @@
"multiPlanSetting": "Várias rotinas por dia",
"multiPlanHint": "Toca em cada rotina deste dia. Seguem a ordem em que as adicionas.",
"routineOfDay": "{n} de {total} hoje",
+ "nextToday": "Próxima hoje",
"planAboutMe": "Sobre mim:",
"planBody": "{sex}, {age} anos, {height} de altura, {weight}.",
"planDays": "Quero treinar {n} dias por semana.",
diff --git a/lib/l10n/app_ru.arb b/lib/l10n/app_ru.arb
index 3531642..2f412a0 100644
--- a/lib/l10n/app_ru.arb
+++ b/lib/l10n/app_ru.arb
@@ -904,7 +904,7 @@
"saveToRoutine": "СОХРАНИТЬ ИЗМЕНЕНИЯ В ПРОГРАММЕ",
"routineUpdated": "Программа обновлена",
"saveChangesTitle": "Сохранить изменения в {name}?",
- "saveChangesBody": "В следующий раз программа начнётся так.",
+ "saveChangesBody": "В следующий раз, когда ты её начнёшь, в программе будут эти изменения.",
"routineOrderChanged": "Новый порядок упражнений",
"mineOnly": "Созданные вами",
"createNamed": "Нет в списке? Создать «{name}»",
@@ -931,6 +931,7 @@
"multiPlanSetting": "Несколько программ в день",
"multiPlanHint": "Отметьте каждую программу на этот день. Они идут в порядке добавления.",
"routineOfDay": "{n} из {total} сегодня",
+ "nextToday": "Далее сегодня",
"planAboutMe": "Обо мне:",
"planBody": "{sex}, {age} лет, рост {height}, вес {weight}.",
"planDays": "Хочу тренироваться {n} дней в неделю.",
diff --git a/lib/l10n/app_tr.arb b/lib/l10n/app_tr.arb
index b3a70f9..a274e4d 100644
--- a/lib/l10n/app_tr.arb
+++ b/lib/l10n/app_tr.arb
@@ -1095,7 +1095,7 @@
"saveToRoutine": "DEĞİŞİKLİKLERİ PROGRAMA KAYDET",
"routineUpdated": "Program güncellendi",
"saveChangesTitle": "Değişiklikler {name} programına kaydedilsin mi?",
- "saveChangesBody": "Program bir dahaki sefere böyle başlayacak.",
+ "saveChangesBody": "Bir dahaki sefere başlattığında program bu değişiklikleri içerecek.",
"routineOrderChanged": "Yeni egzersiz sırası",
"mineOnly": "Senin oluşturdukların",
"createNamed": "Yok mu? “{name}” oluştur",
@@ -1122,6 +1122,7 @@
"multiPlanSetting": "Günde birden fazla program",
"multiPlanHint": "Bu günün her programına dokun. Eklediğin sırayla gelirler.",
"routineOfDay": "Bugün {n}/{total}",
+ "nextToday": "Bugün sıradaki",
"planAboutMe": "Hakkımda:",
"planBody": "{sex}, {age} yaşında, boy {height}, kilo {weight}.",
"planDays": "Haftada {n} gün antrenman yapmak istiyorum.",
diff --git a/lib/l10n/app_uk.arb b/lib/l10n/app_uk.arb
index a06f373..5f585fb 100644
--- a/lib/l10n/app_uk.arb
+++ b/lib/l10n/app_uk.arb
@@ -1095,7 +1095,7 @@
"saveToRoutine": "ЗБЕРЕГТИ ЗМІНИ В ПРОГРАМІ",
"routineUpdated": "Програму оновлено",
"saveChangesTitle": "Зберегти зміни в {name}?",
- "saveChangesBody": "Наступного разу програма почнеться так.",
+ "saveChangesBody": "Наступного разу, коли ти її почнеш, у програмі будуть ці зміни.",
"routineOrderChanged": "Новий порядок вправ",
"mineOnly": "Створені вами",
"createNamed": "Немає? Створити «{name}»",
@@ -1122,6 +1122,7 @@
"multiPlanSetting": "Кілька програм на день",
"multiPlanHint": "Позначте кожну програму на цей день. Вони йдуть у порядку додавання.",
"routineOfDay": "{n} з {total} сьогодні",
+ "nextToday": "Далі сьогодні",
"planAboutMe": "Про мене:",
"planBody": "{sex}, {age} років, зріст {height}, вага {weight}.",
"planDays": "Хочу тренуватися {n} днів на тиждень.",
diff --git a/lib/l10n/app_zh.arb b/lib/l10n/app_zh.arb
index 4aba13b..0df32b2 100644
--- a/lib/l10n/app_zh.arb
+++ b/lib/l10n/app_zh.arb
@@ -877,7 +877,7 @@
"saveToRoutine": "将更改保存到训练计划",
"routineUpdated": "训练计划已更新",
"saveChangesTitle": "将更改保存到{name}?",
- "saveChangesBody": "下次这个训练计划会按这样开始。",
+ "saveChangesBody": "下次开始时,训练计划会包含这些更改。",
"routineOrderChanged": "新的动作顺序",
"mineOnly": "我创建的",
"createNamed": "没有?创建“{name}”",
@@ -904,6 +904,7 @@
"multiPlanSetting": "一天多个训练计划",
"multiPlanHint": "点选这一天的每个计划,按添加顺序进行。",
"routineOfDay": "今天第 {n}/{total} 个",
+ "nextToday": "今天的下一个",
"planAboutMe": "关于我:",
"planBody": "{sex},{age} 岁,身高 {height},体重 {weight}。",
"planDays": "我想每周训练 {n} 天。",
diff --git a/lib/l10n/app_zh_Hant.arb b/lib/l10n/app_zh_Hant.arb
index e1fbe65..f9d9d55 100644
--- a/lib/l10n/app_zh_Hant.arb
+++ b/lib/l10n/app_zh_Hant.arb
@@ -1095,7 +1095,7 @@
"saveToRoutine": "將變更儲存到課表",
"routineUpdated": "課表已更新",
"saveChangesTitle": "將變更儲存到{name}?",
- "saveChangesBody": "下次這個課表會照這樣開始。",
+ "saveChangesBody": "下次開始時,課表會包含這些變更。",
"routineOrderChanged": "新的動作順序",
"mineOnly": "我建立的",
"createNamed": "沒有?建立「{name}」",
@@ -1122,6 +1122,7 @@
"multiPlanSetting": "一天多個課表",
"multiPlanHint": "點選這一天的每個課表,依加入順序進行。",
"routineOfDay": "今天第 {n}/{total} 個",
+ "nextToday": "今天的下一個",
"planAboutMe": "關於我:",
"planBody": "{sex},{age} 歲,身高 {height},體重 {weight}。",
"planDays": "我想每週訓練 {n} 天。",
diff --git a/lib/screens/routine_edit_screen.dart b/lib/screens/routine_edit_screen.dart
index 98ab60e..e959f72 100644
--- a/lib/screens/routine_edit_screen.dart
+++ b/lib/screens/routine_edit_screen.dart
@@ -81,7 +81,7 @@ class _RoutineEditScreenState extends State<RoutineEditScreen> {
return const SizedBox.shrink();
}
final list = _filtered;
- final start = routine.exerciseIds.isNotEmpty;
+ final start = routine.exerciseIds.isNotEmpty && MediaQuery.viewInsetsOf(context).bottom == 0;
final create = _q.trim().isNotEmpty && list.isNotEmpty;
return SafeArea(
bottom: false,
@@ -113,7 +113,12 @@ class _RoutineEditScreenState extends State<RoutineEditScreen> {
child: Container(
height: 56,
alignment: Alignment.center,
- decoration: BoxDecoration(color: gc.bgRaised2, borderRadius: BorderRadius.circular(100)),
+ decoration: BoxDecoration(
+ color: gc.bgRaised2,
+ borderRadius: BorderRadius.circular(100),
+ border: Border.all(color: gc.textTertiary.withValues(alpha: 0.45), width: 1.2),
+ boxShadow: [BoxShadow(color: Colors.black.withValues(alpha: 0.28), blurRadius: 14, offset: const Offset(0, 4))],
+ ),
child: Text(titleCase(t.save), style: AppTheme.f(15.5, weight: FontWeight.w700, color: gc.text)),
),
),
diff --git a/lib/screens/session_screen.dart b/lib/screens/session_screen.dart
index 30a9b5a..fc77037 100644
--- a/lib/screens/session_screen.dart
+++ b/lib/screens/session_screen.dart
@@ -1245,6 +1245,7 @@ class SessionScreen extends StatelessWidget {
final vsLast = fit.summaryVsLast;
final vol = fit.summaryVolumeKg;
final sets = fit.session?.summarySets ?? 0;
+ final next = fit.nextRoutineToday;
return _Celebrate(
active: sets > 0 && fit.gamification,
@@ -1283,11 +1284,19 @@ class SessionScreen extends StatelessWidget {
child: Rise(index: 3, child: _levelUpCard(context, gc, fit.summaryLevelUp!)),
),
),
+ if (next != null) ...[
+ const SizedBox(height: 18),
+ Rise(index: 3, child: _nextRoutineCard(gc, next)),
+ ],
const SizedBox(height: 18),
Rise(
index: 3,
child: Row(children: [
- Expanded(child: PrimaryButton(label: t.done, onTap: fit.saveAndExit)),
+ Expanded(
+ child: next == null
+ ? PrimaryButton(label: t.done, onTap: fit.saveAndExit)
+ : PrimaryButton(label: t.done, bg: gc.bgRaised, fg: gc.text, onTap: fit.saveAndExit),
+ ),
const SizedBox(width: 10),
Semantics(
button: true,
@@ -1341,6 +1350,39 @@ class SessionScreen extends StatelessWidget {
);
}
+ Widget _nextRoutineCard(GymColors gc, Routine next) {
+ final today = fit.routinesOn(DateTime.now());
+ return Container(
+ padding: const EdgeInsets.fromLTRB(20, 18, 20, 18),
+ decoration: BoxDecoration(
+ color: gc.bgRaised,
+ borderRadius: BorderRadius.circular(24),
+ border: Border.all(color: gc.accent.withValues(alpha: 0.35), width: 1.2),
+ ),
+ child: Column(
+ crossAxisAlignment: CrossAxisAlignment.stretch,
+ children: [
+ Text(t.nextToday.toUpperCase(),
+ style: AppTheme.f(10.5, weight: FontWeight.w700, color: gc.accent, letterSpacing: 1.4)),
+ const SizedBox(height: 7),
+ Text(fit.routineTitle(next),
+ maxLines: 2,
+ overflow: TextOverflow.ellipsis,
+ style: AppTheme.f(22, weight: FontWeight.w800, color: gc.text, height: 1.15)),
+ const SizedBox(height: 5),
+ Text(
+ [
+ t.exerciseCount(next.exerciseIds.length),
+ if (today.length > 1) t.routineOfDay(today.indexOf(next) + 1, today.length),
+ ].join(' · '),
+ style: AppTheme.f(13, weight: FontWeight.w500, color: gc.textSecondary)),
+ const SizedBox(height: 16),
+ PrimaryButton(label: t.startWorkout, icon: Ic.play, height: 52, onTap: fit.startNextRoutine),
+ ],
+ ),
+ );
+ }
+
Future<void> _saveRoutine(BuildContext context) async {
final accent = context.gc.sage;
final routine = fit.sessionRoutine;
diff --git a/lib/state/workout_state.dart b/lib/state/workout_state.dart
index e7f0722..0c3ab6e 100644
--- a/lib/state/workout_state.dart
+++ b/lib/state/workout_state.dart
@@ -420,6 +420,22 @@ mixin WorkoutState on FitCore, SettingsState, LibraryState, PlacesState, StatsSt
return routinesOn(now).length > 1 ? pendingRoutinesOn(now).isEmpty : isDayDone(todayIndex);
}
+ Routine? get nextRoutineToday {
+ final s = session;
+ if (s == null || s.manual) return null;
+ for (final r in pendingRoutinesOn(DateTime.now())) {
+ if (r.id != s.routineId && r.exerciseIds.isNotEmpty) return r;
+ }
+ return null;
+ }
+
+ void startNextRoutine() {
+ final r = nextRoutineToday;
+ if (r == null) return;
+ saveAndExit();
+ startRoutine(r);
+ }
+
bool get sessionParked => session != null && !session!.complete && route != 'session';
void stepOutOfSession() {
diff --git a/test/requests_27sep_test.dart b/test/requests_27sep_test.dart
index cd039a7..162d068 100644
--- a/test/requests_27sep_test.dart
+++ b/test/requests_27sep_test.dart
@@ -304,6 +304,29 @@ void main() {
expect(LoggedSession.fromJson(done(b.id).toJson()).routineId, b.id);
});
+ test('#156 al acabar una rutina ofrece la siguiente del día', () {
+ fit.toggleMultiPlan();
+ final a = routineOf(['Barbell Bench Press']);
+ final b = routineOf(['Barbell Squat']);
+ final today = DateTime.now().weekday;
+ fit.togglePlanDay(today, a.id);
+ fit.togglePlanDay(today, b.id);
+
+ fit.startRoutine(a);
+ fit.toggleSet(0, 0);
+ fit.finishSession();
+ expect(fit.sessions.last.routineId, a.id);
+ expect(fit.nextRoutineToday, same(b));
+
+ fit.startNextRoutine();
+ expect(fit.session?.routineId, b.id);
+ expect(fit.session?.complete, isFalse);
+ fit.toggleSet(0, 0);
+ fit.finishSession();
+ expect(fit.nextRoutineToday, isNull);
+ expect(fit.todayPlanDone, isTrue);
+ });
+
test('#157 hacer la segunda primero deja pendiente la primera', () {
fit.toggleMultiPlan();
final a = routineOf(['Barbell Bench Press']);