Skip to content

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

Edit the secondary muscles of any exercise

InlitXa93e953bc12e
diff --git a/lib/l10n/app_ar.arb b/lib/l10n/app_ar.arb
index 23561e5..7bdc1ad 100644
--- a/lib/l10n/app_ar.arb
+++ b/lib/l10n/app_ar.arb
@@ -373,6 +373,7 @@
"lightTheme": "فاتح",
"amoledTheme": "أسود AMOLED",
"editDuration": "مدة التمرين",
+ "secondaryPickHint": "اضغط على العضلات الأخرى التي يعمل عليها هذا التمرين.",
"languageLabel": "اللغة",
"unitsLabel": "الوحدات",
"restTimer": "مؤقت الراحة",
diff --git a/lib/l10n/app_de.arb b/lib/l10n/app_de.arb
index 881f4ad..4be0f5e 100644
--- a/lib/l10n/app_de.arb
+++ b/lib/l10n/app_de.arb
@@ -383,6 +383,7 @@
"lightTheme": "Hell",
"amoledTheme": "AMOLED-Schwarz",
"editDuration": "Trainingsdauer",
+ "secondaryPickHint": "Tippe die weiteren Muskeln an, die diese Übung trainiert.",
"languageLabel": "Sprache",
"unitsLabel": "Einheiten",
"restTimer": "Pausentimer",
diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb
index cc44c6d..a14b10d 100644
--- a/lib/l10n/app_en.arb
+++ b/lib/l10n/app_en.arb
@@ -385,6 +385,7 @@
"lightTheme": "Light",
"amoledTheme": "AMOLED black",
"editDuration": "Workout length",
+ "secondaryPickHint": "Tap the other muscles this exercise works.",
"languageLabel": "Language",
"unitsLabel": "Units",
"restTimer": "Rest timer",
diff --git a/lib/l10n/app_es.arb b/lib/l10n/app_es.arb
index 40d4aca..c4b6f29 100644
--- a/lib/l10n/app_es.arb
+++ b/lib/l10n/app_es.arb
@@ -350,6 +350,7 @@
"lightTheme": "Claro",
"amoledTheme": "Negro AMOLED",
"editDuration": "Duración del entreno",
+ "secondaryPickHint": "Toca los otros músculos que trabaja este ejercicio.",
"languageLabel": "Idioma",
"unitsLabel": "Unidades",
"restTimer": "Descanso",
diff --git a/lib/l10n/app_fa.arb b/lib/l10n/app_fa.arb
index 5e043fa..8709eb2 100644
--- a/lib/l10n/app_fa.arb
+++ b/lib/l10n/app_fa.arb
@@ -618,6 +618,7 @@
"lightTheme": "روشن",
"amoledTheme": "مشکی AMOLED",
"editDuration": "مدت تمرین",
+ "secondaryPickHint": "عضله‌های دیگری را که این حرکت درگیر می‌کند لمس کن.",
"languageLabel": "زبان",
"unitsLabel": "واحدها",
"restTimer": "تایمر استراحت",
diff --git a/lib/l10n/app_fr.arb b/lib/l10n/app_fr.arb
index 46c06fd..dfe2a28 100644
--- a/lib/l10n/app_fr.arb
+++ b/lib/l10n/app_fr.arb
@@ -373,6 +373,7 @@
"lightTheme": "Clair",
"amoledTheme": "Noir AMOLED",
"editDuration": "Durée de la séance",
+ "secondaryPickHint": "Touche les autres muscles que travaille cet exercice.",
"languageLabel": "Langue",
"unitsLabel": "Unités",
"restTimer": "Minuteur de repos",
diff --git a/lib/l10n/app_it.arb b/lib/l10n/app_it.arb
index 4b4f169..83dc65c 100644
--- a/lib/l10n/app_it.arb
+++ b/lib/l10n/app_it.arb
@@ -385,6 +385,7 @@
"lightTheme": "Chiaro",
"amoledTheme": "Nero AMOLED",
"editDuration": "Durata dell’allenamento",
+ "secondaryPickHint": "Tocca gli altri muscoli che lavora questo esercizio.",
"languageLabel": "Lingua",
"unitsLabel": "Unità",
"restTimer": "Recupero",
diff --git a/lib/l10n/app_ja.arb b/lib/l10n/app_ja.arb
index eed1bcf..77e7c67 100644
--- a/lib/l10n/app_ja.arb
+++ b/lib/l10n/app_ja.arb
@@ -373,6 +373,7 @@
"lightTheme": "ライト",
"amoledTheme": "AMOLEDブラック",
"editDuration": "トレーニング時間",
+ "secondaryPickHint": "この種目で使うほかの筋肉をタップしてください。",
"languageLabel": "言語",
"unitsLabel": "単位",
"restTimer": "休憩タイマー",
diff --git a/lib/l10n/app_ko.arb b/lib/l10n/app_ko.arb
index 95e2abd..418d996 100644
--- a/lib/l10n/app_ko.arb
+++ b/lib/l10n/app_ko.arb
@@ -373,6 +373,7 @@
"lightTheme": "라이트",
"amoledTheme": "AMOLED 블랙",
"editDuration": "운동 시간",
+ "secondaryPickHint": "이 운동이 함께 쓰는 다른 근육을 탭하세요.",
"languageLabel": "언어",
"unitsLabel": "단위",
"restTimer": "휴식 타이머",
diff --git a/lib/l10n/app_localizations.dart b/lib/l10n/app_localizations.dart
index ee26af5..faf9677 100644
--- a/lib/l10n/app_localizations.dart
+++ b/lib/l10n/app_localizations.dart
@@ -2020,6 +2020,12 @@ abstract class AppLocalizations {
/// **'Workout length'**
String get editDuration;
+ /// No description provided for @secondaryPickHint.
+ ///
+ /// In en, this message translates to:
+ /// **'Tap the other muscles this exercise works.'**
+ String get secondaryPickHint;
+
/// No description provided for @languageLabel.
///
/// In en, this message translates to:
diff --git a/lib/l10n/app_localizations_ar.dart b/lib/l10n/app_localizations_ar.dart
index 6226a00..e922dc3 100644
--- a/lib/l10n/app_localizations_ar.dart
+++ b/lib/l10n/app_localizations_ar.dart
@@ -1110,6 +1110,9 @@ class AppLocalizationsAr extends AppLocalizations {
@override
String get editDuration => 'مدة التمرين';
+ @override
+ String get secondaryPickHint => 'اضغط على العضلات الأخرى التي يعمل عليها هذا التمرين.';
+
@override
String get languageLabel => 'اللغة';
diff --git a/lib/l10n/app_localizations_de.dart b/lib/l10n/app_localizations_de.dart
index 8440c92..d35e559 100644
--- a/lib/l10n/app_localizations_de.dart
+++ b/lib/l10n/app_localizations_de.dart
@@ -1123,6 +1123,9 @@ class AppLocalizationsDe extends AppLocalizations {
@override
String get editDuration => 'Trainingsdauer';
+ @override
+ String get secondaryPickHint => 'Tippe die weiteren Muskeln an, die diese Übung trainiert.';
+
@override
String get languageLabel => 'Sprache';
diff --git a/lib/l10n/app_localizations_en.dart b/lib/l10n/app_localizations_en.dart
index ed44392..ce2af58 100644
--- a/lib/l10n/app_localizations_en.dart
+++ b/lib/l10n/app_localizations_en.dart
@@ -1118,6 +1118,9 @@ class AppLocalizationsEn extends AppLocalizations {
@override
String get editDuration => 'Workout length';
+ @override
+ String get secondaryPickHint => 'Tap the other muscles this exercise works.';
+
@override
String get languageLabel => 'Language';
diff --git a/lib/l10n/app_localizations_es.dart b/lib/l10n/app_localizations_es.dart
index afceda5..c99847b 100644
--- a/lib/l10n/app_localizations_es.dart
+++ b/lib/l10n/app_localizations_es.dart
@@ -1117,6 +1117,9 @@ class AppLocalizationsEs extends AppLocalizations {
@override
String get editDuration => 'Duración del entreno';
+ @override
+ String get secondaryPickHint => 'Toca los otros músculos que trabaja este ejercicio.';
+
@override
String get languageLabel => 'Idioma';
diff --git a/lib/l10n/app_localizations_fa.dart b/lib/l10n/app_localizations_fa.dart
index 703b6c6..914c426 100644
--- a/lib/l10n/app_localizations_fa.dart
+++ b/lib/l10n/app_localizations_fa.dart
@@ -1111,6 +1111,9 @@ class AppLocalizationsFa extends AppLocalizations {
@override
String get editDuration => 'مدت تمرین';
+ @override
+ String get secondaryPickHint => 'عضله‌های دیگری را که این حرکت درگیر می‌کند لمس کن.';
+
@override
String get languageLabel => 'زبان';
diff --git a/lib/l10n/app_localizations_fr.dart b/lib/l10n/app_localizations_fr.dart
index d48902d..a8588fe 100644
--- a/lib/l10n/app_localizations_fr.dart
+++ b/lib/l10n/app_localizations_fr.dart
@@ -1122,6 +1122,9 @@ class AppLocalizationsFr extends AppLocalizations {
@override
String get editDuration => 'Durée de la séance';
+ @override
+ String get secondaryPickHint => 'Touche les autres muscles que travaille cet exercice.';
+
@override
String get languageLabel => 'Langue';
diff --git a/lib/l10n/app_localizations_it.dart b/lib/l10n/app_localizations_it.dart
index 13ef1e1..161fc3f 100644
--- a/lib/l10n/app_localizations_it.dart
+++ b/lib/l10n/app_localizations_it.dart
@@ -1118,6 +1118,9 @@ class AppLocalizationsIt extends AppLocalizations {
@override
String get editDuration => 'Durata dell’allenamento';
+ @override
+ String get secondaryPickHint => 'Tocca gli altri muscoli che lavora questo esercizio.';
+
@override
String get languageLabel => 'Lingua';
diff --git a/lib/l10n/app_localizations_ja.dart b/lib/l10n/app_localizations_ja.dart
index 0b7cd33..76c462b 100644
--- a/lib/l10n/app_localizations_ja.dart
+++ b/lib/l10n/app_localizations_ja.dart
@@ -1069,6 +1069,9 @@ class AppLocalizationsJa extends AppLocalizations {
@override
String get editDuration => 'トレーニング時間';
+ @override
+ String get secondaryPickHint => 'この種目で使うほかの筋肉をタップしてください。';
+
@override
String get languageLabel => '言語';
diff --git a/lib/l10n/app_localizations_ko.dart b/lib/l10n/app_localizations_ko.dart
index e010ebb..ed2130c 100644
--- a/lib/l10n/app_localizations_ko.dart
+++ b/lib/l10n/app_localizations_ko.dart
@@ -1087,6 +1087,9 @@ class AppLocalizationsKo extends AppLocalizations {
@override
String get editDuration => '운동 시간';
+ @override
+ String get secondaryPickHint => '이 운동이 함께 쓰는 다른 근육을 탭하세요.';
+
@override
String get languageLabel => '언어';
diff --git a/lib/l10n/app_localizations_nl.dart b/lib/l10n/app_localizations_nl.dart
index 9dc8169..80bc073 100644
--- a/lib/l10n/app_localizations_nl.dart
+++ b/lib/l10n/app_localizations_nl.dart
@@ -1120,6 +1120,9 @@ class AppLocalizationsNl extends AppLocalizations {
@override
String get editDuration => 'Duur van de training';
+ @override
+ String get secondaryPickHint => 'Tik op de andere spieren die deze oefening traint.';
+
@override
String get languageLabel => 'Taal';
diff --git a/lib/l10n/app_localizations_pl.dart b/lib/l10n/app_localizations_pl.dart
index 329d38d..42706df 100644
--- a/lib/l10n/app_localizations_pl.dart
+++ b/lib/l10n/app_localizations_pl.dart
@@ -1119,6 +1119,9 @@ class AppLocalizationsPl extends AppLocalizations {
@override
String get editDuration => 'Czas treningu';
+ @override
+ String get secondaryPickHint => 'Stuknij inne mięśnie, które pracują w tym ćwiczeniu.';
+
@override
String get languageLabel => 'Język';
diff --git a/lib/l10n/app_localizations_pt.dart b/lib/l10n/app_localizations_pt.dart
index f145fdb..a47be3c 100644
--- a/lib/l10n/app_localizations_pt.dart
+++ b/lib/l10n/app_localizations_pt.dart
@@ -1121,6 +1121,9 @@ class AppLocalizationsPt extends AppLocalizations {
@override
String get editDuration => 'Duração do treino';
+ @override
+ String get secondaryPickHint => 'Toque nos outros músculos que este exercício trabalha.';
+
@override
String get languageLabel => 'Idioma';
diff --git a/lib/l10n/app_localizations_ru.dart b/lib/l10n/app_localizations_ru.dart
index 48ab387..9db2b9d 100644
--- a/lib/l10n/app_localizations_ru.dart
+++ b/lib/l10n/app_localizations_ru.dart
@@ -1160,6 +1160,9 @@ class AppLocalizationsRu extends AppLocalizations {
@override
String get editDuration => 'Длительность тренировки';
+ @override
+ String get secondaryPickHint => 'Отметь другие мышцы, которые работают в этом упражнении.';
+
@override
String get languageLabel => 'Язык';
diff --git a/lib/l10n/app_localizations_tr.dart b/lib/l10n/app_localizations_tr.dart
index 8d9acc8..674cc2a 100644
--- a/lib/l10n/app_localizations_tr.dart
+++ b/lib/l10n/app_localizations_tr.dart
@@ -1119,6 +1119,9 @@ class AppLocalizationsTr extends AppLocalizations {
@override
String get editDuration => 'Antrenman süresi';
+ @override
+ String get secondaryPickHint => 'Bu hareketin çalıştırdığı diğer kaslara dokun.';
+
@override
String get languageLabel => 'Dil';
diff --git a/lib/l10n/app_localizations_uk.dart b/lib/l10n/app_localizations_uk.dart
index a66f5f4..ab700bc 100644
--- a/lib/l10n/app_localizations_uk.dart
+++ b/lib/l10n/app_localizations_uk.dart
@@ -1118,6 +1118,9 @@ class AppLocalizationsUk extends AppLocalizations {
@override
String get editDuration => 'Тривалість тренування';
+ @override
+ String get secondaryPickHint => 'Познач інші мʼязи, які працюють у цій вправі.';
+
@override
String get languageLabel => 'Мова';
diff --git a/lib/l10n/app_localizations_zh.dart b/lib/l10n/app_localizations_zh.dart
index 856befc..44a8580 100644
--- a/lib/l10n/app_localizations_zh.dart
+++ b/lib/l10n/app_localizations_zh.dart
@@ -1064,6 +1064,9 @@ class AppLocalizationsZh extends AppLocalizations {
@override
String get editDuration => '训练时长';
+ @override
+ String get secondaryPickHint => '点选这个动作还会锻炼到的其他肌肉。';
+
@override
String get languageLabel => '语言';
@@ -4368,6 +4371,9 @@ class AppLocalizationsZhHant extends AppLocalizationsZh {
@override
String get editDuration => '訓練時長';
+ @override
+ String get secondaryPickHint => '點選這個動作還會鍛鍊到的其他肌肉。';
+
@override
String get languageLabel => '語言';
diff --git a/lib/l10n/app_nl.arb b/lib/l10n/app_nl.arb
index 95f8a2b..21b61bf 100644
--- a/lib/l10n/app_nl.arb
+++ b/lib/l10n/app_nl.arb
@@ -373,6 +373,7 @@
"lightTheme": "Licht",
"amoledTheme": "AMOLED-zwart",
"editDuration": "Duur van de training",
+ "secondaryPickHint": "Tik op de andere spieren die deze oefening traint.",
"languageLabel": "Taal",
"unitsLabel": "Eenheden",
"restTimer": "Rusttimer",
diff --git a/lib/l10n/app_pl.arb b/lib/l10n/app_pl.arb
index f1bbf6e..56f6f44 100644
--- a/lib/l10n/app_pl.arb
+++ b/lib/l10n/app_pl.arb
@@ -373,6 +373,7 @@
"lightTheme": "Jasny",
"amoledTheme": "Czerń AMOLED",
"editDuration": "Czas treningu",
+ "secondaryPickHint": "Stuknij inne mięśnie, które pracują w tym ćwiczeniu.",
"languageLabel": "Język",
"unitsLabel": "Jednostki",
"restTimer": "Minutnik odpoczynku",
diff --git a/lib/l10n/app_pt.arb b/lib/l10n/app_pt.arb
index 4dd0a44..1ee0a18 100644
--- a/lib/l10n/app_pt.arb
+++ b/lib/l10n/app_pt.arb
@@ -196,6 +196,7 @@
"lightTheme": "Claro",
"amoledTheme": "Preto AMOLED",
"editDuration": "Duração do treino",
+ "secondaryPickHint": "Toque nos outros músculos que este exercício trabalha.",
"languageLabel": "Idioma",
"unitsLabel": "Unidades",
"restTimer": "Descanso",
diff --git a/lib/l10n/app_ru.arb b/lib/l10n/app_ru.arb
index d672d4f..61c8313 100644
--- a/lib/l10n/app_ru.arb
+++ b/lib/l10n/app_ru.arb
@@ -344,6 +344,7 @@
"lightTheme": "Светлая",
"amoledTheme": "Чёрная AMOLED",
"editDuration": "Длительность тренировки",
+ "secondaryPickHint": "Отметь другие мышцы, которые работают в этом упражнении.",
"languageLabel": "Язык",
"unitsLabel": "Единицы",
"restTimer": "Таймер отдыха",
diff --git a/lib/l10n/app_tr.arb b/lib/l10n/app_tr.arb
index a6d1660..e1d18d1 100644
--- a/lib/l10n/app_tr.arb
+++ b/lib/l10n/app_tr.arb
@@ -373,6 +373,7 @@
"lightTheme": "Açık",
"amoledTheme": "AMOLED siyah",
"editDuration": "Antrenman süresi",
+ "secondaryPickHint": "Bu hareketin çalıştırdığı diğer kaslara dokun.",
"languageLabel": "Dil",
"unitsLabel": "Birimler",
"restTimer": "Dinlenme zamanlayıcısı",
diff --git a/lib/l10n/app_uk.arb b/lib/l10n/app_uk.arb
index 6aac706..dd08d20 100644
--- a/lib/l10n/app_uk.arb
+++ b/lib/l10n/app_uk.arb
@@ -373,6 +373,7 @@
"lightTheme": "Світла",
"amoledTheme": "Чорна AMOLED",
"editDuration": "Тривалість тренування",
+ "secondaryPickHint": "Познач інші мʼязи, які працюють у цій вправі.",
"languageLabel": "Мова",
"unitsLabel": "Одиниці",
"restTimer": "Таймер відпочинку",
diff --git a/lib/l10n/app_zh.arb b/lib/l10n/app_zh.arb
index 418cbdc..9b0af9d 100644
--- a/lib/l10n/app_zh.arb
+++ b/lib/l10n/app_zh.arb
@@ -196,6 +196,7 @@
"lightTheme": "浅色模式",
"amoledTheme": "AMOLED 纯黑",
"editDuration": "训练时长",
+ "secondaryPickHint": "点选这个动作还会锻炼到的其他肌肉。",
"languageLabel": "语言",
"unitsLabel": "单位",
"restTimer": "组间休息计时器",
diff --git a/lib/l10n/app_zh_Hant.arb b/lib/l10n/app_zh_Hant.arb
index 29bd7c6..d5b4446 100644
--- a/lib/l10n/app_zh_Hant.arb
+++ b/lib/l10n/app_zh_Hant.arb
@@ -373,6 +373,7 @@
"lightTheme": "淺色",
"amoledTheme": "AMOLED 純黑",
"editDuration": "訓練時長",
+ "secondaryPickHint": "點選這個動作還會鍛鍊到的其他肌肉。",
"languageLabel": "語言",
"unitsLabel": "單位",
"restTimer": "休息計時器",
diff --git a/lib/screens/exercise_detail_screen.dart b/lib/screens/exercise_detail_screen.dart
index 995a797..4a7fb03 100644
--- a/lib/screens/exercise_detail_screen.dart
+++ b/lib/screens/exercise_detail_screen.dart
@@ -181,7 +181,7 @@ class _ExerciseDetailScreenState extends State<ExerciseDetailScreen> {
children: [
_meta(gc, t.primaryLabel, muscleLabel(ex.primary)),
const SizedBox(width: 20),
- _meta(gc, t.secondaryLabel, secondary),
+ _meta(gc, t.secondaryLabel, secondary, onTap: () => _editSecondary(context, ex.id)),
const SizedBox(width: 20),
_meta(gc, t.equipmentLabel, t.equipment(ex.equipment)),
],
@@ -634,18 +634,93 @@ class _ExerciseDetailScreenState extends State<ExerciseDetailScreen> {
);
}
- Widget _meta(GymColors gc, String label, String value) {
+ Widget _meta(GymColors gc, String label, String value, {VoidCallback? onTap}) {
+ final column = Column(
+ crossAxisAlignment: CrossAxisAlignment.start,
+ children: [
+ Row(mainAxisSize: MainAxisSize.min, children: [
+ Flexible(child: _cardLabel(gc, label)),
+ if (onTap != null) ...[
+ const SizedBox(width: 4),
+ Icon(PhosphorIconsRegular.pencilSimple, size: 11, color: gc.textTertiary),
+ ],
+ ]),
+ const SizedBox(height: 5),
+ Text(value,
+ maxLines: 1,
+ overflow: TextOverflow.ellipsis,
+ style: AppTheme.f(14.5, weight: FontWeight.w600, color: gc.text)),
+ ],
+ );
return Flexible(
- child: Column(
- crossAxisAlignment: CrossAxisAlignment.start,
- children: [
- _cardLabel(gc, label),
- const SizedBox(height: 5),
- Text(value,
- maxLines: 1,
- overflow: TextOverflow.ellipsis,
- style: AppTheme.f(14.5, weight: FontWeight.w600, color: gc.text)),
- ],
+ child: onTap == null
+ ? column
+ : Semantics(
+ button: true,
+ child: GestureDetector(behavior: HitTestBehavior.opaque, onTap: onTap, child: column),
+ ),
+ );
+ }
+
+ void _editSecondary(BuildContext context, String id) {
+ showAppSheet<void>(
+ context: context,
+ backgroundColor: Colors.transparent,
+ isScrollControlled: true,
+ builder: (sheet) => AnimatedBuilder(
+ animation: fit,
+ builder: (sheet, _) {
+ final gc = sheet.gc;
+ final ex = fit.exerciseById(id);
+ if (ex == null) return const SizedBox.shrink();
+ return Container(
+ padding: sheetPad(sheet),
+ decoration: BoxDecoration(
+ color: gc.bgRaised,
+ borderRadius: const BorderRadius.vertical(top: Radius.circular(28)),
+ ),
+ child: Column(
+ mainAxisSize: MainAxisSize.min,
+ crossAxisAlignment: CrossAxisAlignment.stretch,
+ children: [
+ const SheetHandle(),
+ const SizedBox(height: 16),
+ SheetTitle(exerciseName(ex), subtitle: t.secondaryPickHint),
+ const SizedBox(height: 16),
+ Wrap(spacing: 8, runSpacing: 8, children: [
+ for (final m in kMuscles)
+ if (m.id != ex.primary)
+ Pill(
+ label: t.muscle(m.id),
+ bg: ex.secondary.contains(m.id) ? gc.ember : gc.bgRaised2,
+ fg: ex.secondary.contains(m.id) ? gc.onEmber : gc.textSecondary,
+ vPad: 7,
+ onTap: () => fit.setSecondary(
+ id,
+ ex.secondary.contains(m.id)
+ ? [...ex.secondary.where((s) => s != m.id)]
+ : [...ex.secondary, m.id]),
+ ),
+ ]),
+ if (fit.hasSecondaryOverride(id))
+ GestureDetector(
+ behavior: HitTestBehavior.opaque,
+ onTap: () => fit.resetSecondary(id),
+ child: Container(
+ height: 44,
+ margin: const EdgeInsets.only(top: 8),
+ alignment: Alignment.center,
+ child: Text(t.alarmReset,
+ style: AppTheme.f(13, weight: FontWeight.w600, color: gc.accent)),
+ ),
+ )
+ else
+ const SizedBox(height: 18),
+ PrimaryButton(label: t.done, onTap: () => Navigator.of(sheet).pop()),
+ ],
+ ),
+ );
+ },
),
);
}
diff --git a/lib/state/fit_core.dart b/lib/state/fit_core.dart
index ee46f3f..2bbf90e 100644
--- a/lib/state/fit_core.dart
+++ b/lib/state/fit_core.dart
@@ -80,6 +80,8 @@ abstract class FitCore extends ChangeNotifier {
final Map<String, double> exerciseBar = {};
final Map<String, String> modeOverride = {};
+
+ final Map<String, List<String>> secondaryOverride = {};
VoidCallback? onWidgetsShouldUpdate;
void refreshWidgets() => _refreshWidgets();
diff --git a/lib/state/fit_state.dart b/lib/state/fit_state.dart
index b468f52..9ac3585 100644
--- a/lib/state/fit_state.dart
+++ b/lib/state/fit_state.dart
@@ -198,6 +198,11 @@ class FitState extends FitCore
..clear()
..addAll(((data['exMode'] as Map?) ?? const {}).map((k, v) => MapEntry(k as String, v as String))
..removeWhere((_, v) => !const ['weight', 'cardio', 'time'].contains(v)));
+ secondaryOverride
+ ..clear()
+ ..addAll(((data['exSecondary'] as Map?) ?? const {})
+ .map((k, v) => MapEntry(k as String, (v as List).whereType<String>().toList())));
+ _builtInExercises = null;
bgDim = (data['bgDim'] as num?)?.toDouble() ?? 0.55;
showFocus = data['showFocus'] as bool? ?? true;
showRecommended = data['showRecs'] as bool? ?? true;
@@ -404,6 +409,7 @@ class FitState extends FitCore
'barKg': exerciseBar,
'marks': videoMarks.map((k, v) => MapEntry(k, v.map((i, ms) => MapEntry('$i', ms)))),
'exMode': modeOverride,
+ 'exSecondary': secondaryOverride,
'trainAt': trainReminderMin,
'trainSmart': smartReminder,
'alarmAskedAt': alarmAskedAt,
@@ -485,6 +491,8 @@ class FitState extends FitCore
videoMarks.clear();
exerciseBar.clear();
modeOverride.clear();
+ secondaryOverride.clear();
+ _builtInExercises = null;
demoSize = 'large';
demoLoop = 'always';
MediaStore.clearAll();
diff --git a/lib/state/library_state.dart b/lib/state/library_state.dart
index 357e4d7..2216909 100644
--- a/lib/state/library_state.dart
+++ b/lib/state/library_state.dart
@@ -8,7 +8,46 @@ mixin LibraryState on FitCore {
String? exKindFilter;
String? activeExerciseId;
int _customSeq = 0;
- List<Exercise> get allExercises => [...kExercises, ...customExercises];
+ List<Exercise>? _builtInExercises;
+
+ List<Exercise> get allExercises => [
+ ...(_builtInExercises ??= [
+ for (final e in kExercises)
+ if (secondaryOverride[e.id] case final s?) e.copyWith(secondary: _cleanSecondary(e.primary, s)) else e,
+ ]),
+ ...customExercises,
+ ];
+
+ bool hasSecondaryOverride(String id) => secondaryOverride.containsKey(id);
+
+ void setSecondary(String id, List<String> muscles) {
+ final ex = exerciseById(id);
+ if (ex == null) return;
+ final clean = _cleanSecondary(ex.primary, muscles);
+ final i = customExercises.indexWhere((e) => e.id == id);
+ if (i >= 0) {
+ customExercises[i] = customExercises[i].copyWith(secondary: clean);
+ } else {
+ final base = kExercises.firstWhere((e) => e.id == id);
+ if (_sameMuscles(clean, _cleanSecondary(base.primary, base.secondary))) {
+ secondaryOverride.remove(id);
+ } else {
+ secondaryOverride[id] = clean;
+ }
+ _builtInExercises = null;
+ }
+ _persist();
+ notifyListeners();
+ }
+
+ void resetSecondary(String id) {
+ if (secondaryOverride.remove(id) == null) return;
+ _builtInExercises = null;
+ _persist();
+ notifyListeners();
+ }
+
+ static bool _sameMuscles(List<String> a, List<String> b) => a.length == b.length && a.toSet().containsAll(b);
bool fitsHere(Exercise ex) => true;
diff --git a/test/requests_10oct_test.dart b/test/requests_10oct_test.dart
index c3b590b..d8e6a4b 100644
--- a/test/requests_10oct_test.dart
+++ b/test/requests_10oct_test.dart
@@ -1,3 +1,4 @@
+import 'package:flutter/material.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:gymmane/catalog/exercise_catalog.dart';
import 'package:gymmane/models/workout.dart';
@@ -59,4 +60,63 @@ void main() {
expect(fit.isRepsOnly(barbell.id), isFalse);
});
});
+
+ group('#180 duración de la sesión', () {
+ test('se corrige y se guarda', () {
+ final s = LoggedSession(DateTime.now(), 108 * 60, [
+ LoggedExercise('x', 'x', 'chest', [LoggedSet(8, 60)]),
+ ]);
+ fit.sessions.add(s);
+ fit.setSessionDuration(s, 45 * 60);
+ expect(fit.daySummary(DateTime.now())!.durationSec, 45 * 60);
+ fit.persistNow();
+ fit.loadFromStore();
+ expect(fit.sessions.single.durationSec, 45 * 60);
+ });
+ });
+
+ group('#181 negro AMOLED', () {
+ test('es un tema oscuro aparte y se recuerda', () {
+ fit.setThemePref('amoled');
+ expect(fit.dark, isTrue);
+ expect(fit.themeMode, ThemeMode.dark);
+ fit.persistNow();
+ fit.loadFromStore();
+ expect(fit.themePref, 'amoled');
+ fit.setThemePref('dark');
+ expect(fit.themePref, 'dark');
+ });
+ });
+
+ group('#167 músculos secundarios', () {
+ test('se cambian en un ejercicio de la app, se guardan y se pueden restablecer', () {
+ final ex = fit.allExercises.firstWhere((e) => e.secondary.length == 1 && e.primary == 'chest');
+ final before = [...ex.secondary];
+ fit.setSecondary(ex.id, [...before, 'shoulders']);
+ expect(fit.exerciseById(ex.id)!.secondary, containsAll([...before, 'shoulders']));
+ fit.setMuscleFilter('shoulders');
+ expect(fit.exercisesFiltered.map((e) => e.id), contains(ex.id));
+ fit.setMuscleFilter('shoulders');
+ fit.persistNow();
+ fit.loadFromStore();
+ expect(fit.exerciseById(ex.id)!.secondary, contains('shoulders'));
+ fit.resetSecondary(ex.id);
+ expect(fit.exerciseById(ex.id)!.secondary, before);
+ expect(fit.hasSecondaryOverride(ex.id), isFalse);
+ });
+
+ test('volver a lo de siempre no deja nada guardado y el primario no cuenta', () {
+ final ex = fit.allExercises.firstWhere((e) => e.secondary.isNotEmpty);
+ fit.setSecondary(ex.id, [...ex.secondary, ex.primary]);
+ expect(fit.hasSecondaryOverride(ex.id), isFalse);
+ expect(fit.exerciseById(ex.id)!.secondary, isNot(contains(ex.primary)));
+ });
+
+ test('en uno propio cambia el ejercicio', () {
+ final id = fit.addCustomExercise(name: 'Mío', primary: 'chest', equipment: 'Dumbbell');
+ fit.setSecondary(id, ['triceps']);
+ expect(fit.exerciseById(id)!.secondary, ['triceps']);
+ expect(fit.hasSecondaryOverride(id), isFalse);
+ });
+ });
}