Offline gym log for Android. No account, no ads, no internet.
Dart androidbodybuildingdartexercisesf-droidfitnessfluttergymgym-apphealthprivacyself-hostedworkoutworkout-appworkout-tracker
Let medals and levels be switched off
InlitXd093eb3dd627
diff --git a/lib/l10n/app_ar.arb b/lib/l10n/app_ar.arbindex 9c4bfe6..2fa2950 100644--- a/lib/l10n/app_ar.arb+++ b/lib/l10n/app_ar.arb@@ -1158,5 +1158,7 @@"effortHint": "RPE: 10 يعني أنك لا تستطيع تكرارًا آخر، و8 يعني أنه بقي لديك تكراران. RIR يعدّ التكرارات المتبقية. إذا كانت المجموعة تحتوي عليه، يستخدم الحد الأقصى المقدَّر جدول RPE.","rirTitle": "الاحتياط (RIR)","rirHint": "0 يعني أنك لا تستطيع تكرارًا آخر، و2 يعني أنه بقي لديك تكراران.",- "addWeekWidget": "إضافة أداة الأسبوع"+ "addWeekWidget": "إضافة أداة الأسبوع",++ "gamificationSetting": "الميداليات والمستويات"}diff --git a/lib/l10n/app_de.arb b/lib/l10n/app_de.arbindex 4478f13..a9f41af 100644--- a/lib/l10n/app_de.arb+++ b/lib/l10n/app_de.arb@@ -1026,5 +1026,7 @@"effortHint": "RPE: 10 heißt, keine Wiederholung mehr, 8 heißt, zwei wären noch gegangen. RIR zählt die Wiederholungen, die übrig waren. Hat ein Satz einen Wert, nutzt das geschätzte 1RM die RPE-Tabelle.","rirTitle": "RESERVE (RIR)","rirHint": "0 heißt, keine Wiederholung mehr, 2 heißt, zwei wären noch gegangen.",- "addWeekWidget": "Wochen-Widget hinzufügen"+ "addWeekWidget": "Wochen-Widget hinzufügen",++ "gamificationSetting": "Medaillen und Stufen"}diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arbindex e266c16..657ac6d 100644--- a/lib/l10n/app_en.arb+++ b/lib/l10n/app_en.arb@@ -1039,5 +1039,7 @@"effortHint": "RPE: 10 means nothing left, 8 means two reps to spare. RIR counts the reps you had left. When a set has it, the estimated 1RM uses the RPE chart.","rirTitle": "RESERVE (RIR)","rirHint": "0 is nothing left in the tank, 2 is two reps to spare.",- "addWeekWidget": "Add week widget"+ "addWeekWidget": "Add week widget",++ "gamificationSetting": "Medals and levels"}diff --git a/lib/l10n/app_es.arb b/lib/l10n/app_es.arbindex cc1df98..0b6f535 100644--- a/lib/l10n/app_es.arb+++ b/lib/l10n/app_es.arb@@ -966,5 +966,7 @@"effortHint": "RPE: 10 es no poder con una más; 8, que te sobraban dos. RIR cuenta las repeticiones que te quedaban. Si la serie lo lleva, el 1RM estimado usa la tabla de RPE.","rirTitle": "RESERVA (RIR)","rirHint": "0 es no poder con una más; 2, que te sobraban dos.",- "addWeekWidget": "Añadir widget de la semana"+ "addWeekWidget": "Añadir widget de la semana",++ "gamificationSetting": "Medallas y niveles"}diff --git a/lib/l10n/app_fr.arb b/lib/l10n/app_fr.arbindex 8e2a9be..1d5c619 100644--- a/lib/l10n/app_fr.arb+++ b/lib/l10n/app_fr.arb@@ -1158,5 +1158,7 @@"effortHint": "RPE : 10, c'est ne plus pouvoir en faire une ; 8, qu'il en restait deux. Le RIR compte les répétitions qu'il te restait. Si la série en a un, le 1RM estimé utilise la table RPE.","rirTitle": "RÉSERVE (RIR)","rirHint": "0, c'est ne plus pouvoir en faire une ; 2, qu'il en restait deux.",- "addWeekWidget": "Ajouter le widget de la semaine"+ "addWeekWidget": "Ajouter le widget de la semaine",++ "gamificationSetting": "Médailles et niveaux"}diff --git a/lib/l10n/app_it.arb b/lib/l10n/app_it.arbindex debc13b..0d75a9d 100644--- a/lib/l10n/app_it.arb+++ b/lib/l10n/app_it.arb@@ -1006,5 +1006,7 @@"effortHint": "RPE: 10 è non riuscire a farne un’altra; 8, che te ne restavano due. RIR conta le ripetizioni che ti restavano. Se la serie lo ha, l’1RM stimato usa la tabella RPE.","rirTitle": "RISERVA (RIR)","rirHint": "0 è non riuscire a farne un’altra; 2, che te ne restavano due.",- "addWeekWidget": "Aggiungi widget della settimana"+ "addWeekWidget": "Aggiungi widget della settimana",++ "gamificationSetting": "Medaglie e livelli"}diff --git a/lib/l10n/app_ja.arb b/lib/l10n/app_ja.arbindex 5d4e394..4ad445e 100644--- a/lib/l10n/app_ja.arb+++ b/lib/l10n/app_ja.arb@@ -1158,5 +1158,7 @@"effortHint": "RPE:10 はもう 1 回もできない、8 はあと 2 回できた状態。RIR は残っていた回数。記録したセットは、推定 1RM に RPE 表を使います。","rirTitle": "余力 (RIR)","rirHint": "0 はもう 1 回もできない、2 はあと 2 回できた状態。",- "addWeekWidget": "今週のウィジェットを追加"+ "addWeekWidget": "今週のウィジェットを追加",++ "gamificationSetting": "メダルとレベル"}diff --git a/lib/l10n/app_ko.arb b/lib/l10n/app_ko.arbindex acfe2e2..a8c6152 100644--- a/lib/l10n/app_ko.arb+++ b/lib/l10n/app_ko.arb@@ -1158,5 +1158,7 @@"effortHint": "RPE: 10은 한 번도 더 못 하는 상태, 8은 두 번 더 할 수 있던 상태예요. RIR은 남아 있던 반복 수예요. 기록된 세트는 예상 1RM에 RPE 표를 사용해요.","rirTitle": "여력 (RIR)","rirHint": "0은 한 번도 더 못 하는 상태, 2는 두 번 더 할 수 있던 상태예요.",- "addWeekWidget": "이번 주 위젯 추가"+ "addWeekWidget": "이번 주 위젯 추가",++ "gamificationSetting": "메달과 레벨"}diff --git a/lib/l10n/app_localizations.dart b/lib/l10n/app_localizations.dartindex ac26709..c333135 100644--- a/lib/l10n/app_localizations.dart+++ b/lib/l10n/app_localizations.dart@@ -5359,6 +5359,12 @@ abstract class AppLocalizations {/// In en, this message translates to:/// **'Add week widget'**String get addWeekWidget;++ /// No description provided for @gamificationSetting.+ ///+ /// In en, this message translates to:+ /// **'Medals and levels'**+ String get gamificationSetting;}class _AppLocalizationsDelegate extends LocalizationsDelegate<AppLocalizations> {diff --git a/lib/l10n/app_localizations_ar.dart b/lib/l10n/app_localizations_ar.dartindex a8219b9..7d0e89b 100644--- a/lib/l10n/app_localizations_ar.dart+++ b/lib/l10n/app_localizations_ar.dart@@ -2982,4 +2982,7 @@ class AppLocalizationsAr extends AppLocalizations {@overrideString get addWeekWidget => 'إضافة أداة الأسبوع';++ @override+ String get gamificationSetting => 'الميداليات والمستويات';}diff --git a/lib/l10n/app_localizations_de.dart b/lib/l10n/app_localizations_de.dartindex 178770d..c2b850d 100644--- a/lib/l10n/app_localizations_de.dart+++ b/lib/l10n/app_localizations_de.dart@@ -3004,4 +3004,7 @@ class AppLocalizationsDe extends AppLocalizations {@overrideString get addWeekWidget => 'Wochen-Widget hinzufügen';++ @override+ String get gamificationSetting => 'Medaillen und Stufen';}diff --git a/lib/l10n/app_localizations_en.dart b/lib/l10n/app_localizations_en.dartindex 98a19a5..72fe80e 100644--- a/lib/l10n/app_localizations_en.dart+++ b/lib/l10n/app_localizations_en.dart@@ -2986,4 +2986,7 @@ class AppLocalizationsEn extends AppLocalizations {@overrideString get addWeekWidget => 'Add week widget';++ @override+ String get gamificationSetting => 'Medals and levels';}diff --git a/lib/l10n/app_localizations_es.dart b/lib/l10n/app_localizations_es.dartindex 179e6c5..db43b8e 100644--- a/lib/l10n/app_localizations_es.dart+++ b/lib/l10n/app_localizations_es.dart@@ -2988,4 +2988,7 @@ class AppLocalizationsEs extends AppLocalizations {@overrideString get addWeekWidget => 'Añadir widget de la semana';++ @override+ String get gamificationSetting => 'Medallas y niveles';}diff --git a/lib/l10n/app_localizations_fr.dart b/lib/l10n/app_localizations_fr.dartindex 81aeaf4..14f2283 100644--- a/lib/l10n/app_localizations_fr.dart+++ b/lib/l10n/app_localizations_fr.dart@@ -3001,4 +3001,7 @@ class AppLocalizationsFr extends AppLocalizations {@overrideString get addWeekWidget => 'Ajouter le widget de la semaine';++ @override+ String get gamificationSetting => 'Médailles et niveaux';}diff --git a/lib/l10n/app_localizations_it.dart b/lib/l10n/app_localizations_it.dartindex 8af0fa3..6cad14f 100644--- a/lib/l10n/app_localizations_it.dart+++ b/lib/l10n/app_localizations_it.dart@@ -2993,4 +2993,7 @@ class AppLocalizationsIt extends AppLocalizations {@overrideString get addWeekWidget => 'Aggiungi widget della settimana';++ @override+ String get gamificationSetting => 'Medaglie e livelli';}diff --git a/lib/l10n/app_localizations_ja.dart b/lib/l10n/app_localizations_ja.dartindex f1cf93b..f017f38 100644--- a/lib/l10n/app_localizations_ja.dart+++ b/lib/l10n/app_localizations_ja.dart@@ -2899,4 +2899,7 @@ class AppLocalizationsJa extends AppLocalizations {@overrideString get addWeekWidget => '今週のウィジェットを追加';++ @override+ String get gamificationSetting => 'メダルとレベル';}diff --git a/lib/l10n/app_localizations_ko.dart b/lib/l10n/app_localizations_ko.dartindex 933d744..a269436 100644--- a/lib/l10n/app_localizations_ko.dart+++ b/lib/l10n/app_localizations_ko.dart@@ -2914,4 +2914,7 @@ class AppLocalizationsKo extends AppLocalizations {@overrideString get addWeekWidget => '이번 주 위젯 추가';++ @override+ String get gamificationSetting => '메달과 레벨';}diff --git a/lib/l10n/app_localizations_nl.dart b/lib/l10n/app_localizations_nl.dartindex f8653ec..0e5b68c 100644--- a/lib/l10n/app_localizations_nl.dart+++ b/lib/l10n/app_localizations_nl.dart@@ -2996,4 +2996,7 @@ class AppLocalizationsNl extends AppLocalizations {@overrideString get addWeekWidget => 'Weekwidget toevoegen';++ @override+ String get gamificationSetting => 'Medailles en niveaus';}diff --git a/lib/l10n/app_localizations_pl.dart b/lib/l10n/app_localizations_pl.dartindex e8e8637..4c57a9e 100644--- a/lib/l10n/app_localizations_pl.dart+++ b/lib/l10n/app_localizations_pl.dart@@ -2996,4 +2996,7 @@ class AppLocalizationsPl extends AppLocalizations {@overrideString get addWeekWidget => 'Dodaj widżet tygodnia';++ @override+ String get gamificationSetting => 'Medale i poziomy';}diff --git a/lib/l10n/app_localizations_pt.dart b/lib/l10n/app_localizations_pt.dartindex 6e10be1..87c5325 100644--- a/lib/l10n/app_localizations_pt.dart+++ b/lib/l10n/app_localizations_pt.dart@@ -2989,4 +2989,7 @@ class AppLocalizationsPt extends AppLocalizations {@overrideString get addWeekWidget => 'Adicionar widget da semana';++ @override+ String get gamificationSetting => 'Medalhas e níveis';}diff --git a/lib/l10n/app_localizations_ru.dart b/lib/l10n/app_localizations_ru.dartindex 1912a9d..1b46aa5 100644--- a/lib/l10n/app_localizations_ru.dart+++ b/lib/l10n/app_localizations_ru.dart@@ -3076,4 +3076,7 @@ class AppLocalizationsRu extends AppLocalizations {@overrideString get addWeekWidget => 'Добавить виджет недели';++ @override+ String get gamificationSetting => 'Медали и уровни';}diff --git a/lib/l10n/app_localizations_tr.dart b/lib/l10n/app_localizations_tr.dartindex bc061ac..080a3a9 100644--- a/lib/l10n/app_localizations_tr.dart+++ b/lib/l10n/app_localizations_tr.dart@@ -2991,4 +2991,7 @@ class AppLocalizationsTr extends AppLocalizations {@overrideString get addWeekWidget => 'Hafta widget’ı ekle';++ @override+ String get gamificationSetting => 'Madalyalar ve seviyeler';}diff --git a/lib/l10n/app_localizations_uk.dart b/lib/l10n/app_localizations_uk.dartindex 7e2ba37..13c85f6 100644--- a/lib/l10n/app_localizations_uk.dart+++ b/lib/l10n/app_localizations_uk.dart@@ -2994,4 +2994,7 @@ class AppLocalizationsUk extends AppLocalizations {@overrideString get addWeekWidget => 'Додати віджет тижня';++ @override+ String get gamificationSetting => 'Медалі та рівні';}diff --git a/lib/l10n/app_localizations_zh.dart b/lib/l10n/app_localizations_zh.dartindex 813cc48..a82cfc5 100644--- a/lib/l10n/app_localizations_zh.dart+++ b/lib/l10n/app_localizations_zh.dart@@ -2860,6 +2860,9 @@ class AppLocalizationsZh extends AppLocalizations {@overrideString get addWeekWidget => '添加本周小组件';++ @override+ String get gamificationSetting => '勋章和等级';}/// The translations for Chinese, using the Han script (`zh_Hant`).@@ -5741,4 +5744,7 @@ class AppLocalizationsZhHant extends AppLocalizationsZh {@overrideString get addWeekWidget => '新增本週小工具';++ @override+ String get gamificationSetting => '獎牌和等級';}diff --git a/lib/l10n/app_nl.arb b/lib/l10n/app_nl.arbindex 5f2fe47..bd8e398 100644--- a/lib/l10n/app_nl.arb+++ b/lib/l10n/app_nl.arb@@ -1158,5 +1158,7 @@"effortHint": "RPE: 10 is er geen meer kunnen doen, 8 is er nog twee over hebben. RIR telt de herhalingen die je nog had. Heeft een set er een, dan gebruikt de geschatte 1RM de RPE-tabel.","rirTitle": "RESERVE (RIR)","rirHint": "0 is er geen meer kunnen doen, 2 is er nog twee over hebben.",- "addWeekWidget": "Weekwidget toevoegen"+ "addWeekWidget": "Weekwidget toevoegen",++ "gamificationSetting": "Medailles en niveaus"}diff --git a/lib/l10n/app_pl.arb b/lib/l10n/app_pl.arbindex 334aaeb..403c9ca 100644--- a/lib/l10n/app_pl.arb+++ b/lib/l10n/app_pl.arb@@ -1158,5 +1158,7 @@"effortHint": "RPE: 10 to brak sił na kolejne powtórzenie, 8 to jeszcze dwa w zapasie. RIR liczy powtórzenia, które zostały. Jeśli seria go ma, szacowany 1RM korzysta z tabeli RPE.","rirTitle": "ZAPAS (RIR)","rirHint": "0 to brak sił na kolejne powtórzenie, 2 to jeszcze dwa w zapasie.",- "addWeekWidget": "Dodaj widżet tygodnia"+ "addWeekWidget": "Dodaj widżet tygodnia",++ "gamificationSetting": "Medale i poziomy"}diff --git a/lib/l10n/app_pt.arb b/lib/l10n/app_pt.arbindex 5c16ead..81bde3e 100644--- a/lib/l10n/app_pt.arb+++ b/lib/l10n/app_pt.arb@@ -918,5 +918,7 @@"effortHint": "RPE: 10 é não conseguir fazer mais uma; 8, que sobravam duas. RIR conta as repetições que te sobravam. Se a série o tiver, o 1RM estimado usa a tabela de RPE.","rirTitle": "RESERVA (RIR)","rirHint": "0 é não conseguir fazer mais uma; 2, que sobravam duas.",- "addWeekWidget": "Adicionar widget da semana"+ "addWeekWidget": "Adicionar widget da semana",++ "gamificationSetting": "Medalhas e níveis"}diff --git a/lib/l10n/app_ru.arb b/lib/l10n/app_ru.arbindex 3884ee7..1348e93 100644--- a/lib/l10n/app_ru.arb+++ b/lib/l10n/app_ru.arb@@ -947,5 +947,7 @@"effortHint": "RPE: 10 — больше ни одного повтора, 8 — оставалось два. RIR — сколько повторов оставалось в запасе. Если у подхода есть оценка, 1ПМ считается по таблице RPE.","rirTitle": "ЗАПАС (RIR)","rirHint": "0 — больше ни одного повтора, 2 — оставалось два.",- "addWeekWidget": "Добавить виджет недели"+ "addWeekWidget": "Добавить виджет недели",++ "gamificationSetting": "Медали и уровни"}diff --git a/lib/l10n/app_tr.arb b/lib/l10n/app_tr.arbindex b78342f..a222971 100644--- a/lib/l10n/app_tr.arb+++ b/lib/l10n/app_tr.arb@@ -1158,5 +1158,7 @@"effortHint": "RPE: 10 bir tekrar daha yapamamak, 8 iki tekrar daha yapabilmek demek. RIR kalan tekrarları sayar. Sette varsa tahmini 1RM, RPE tablosunu kullanır.","rirTitle": "YEDEK (RIR)","rirHint": "0 bir tekrar daha yapamamak, 2 iki tekrar daha yapabilmek demek.",- "addWeekWidget": "Hafta widget’ı ekle"+ "addWeekWidget": "Hafta widget’ı ekle",++ "gamificationSetting": "Madalyalar ve seviyeler"}diff --git a/lib/l10n/app_uk.arb b/lib/l10n/app_uk.arbindex 989e990..0fd5c85 100644--- a/lib/l10n/app_uk.arb+++ b/lib/l10n/app_uk.arb@@ -1158,5 +1158,7 @@"effortHint": "RPE: 10 — більше жодного повторення, 8 — залишалося два. RIR — скільки повторень залишалося в запасі. Якщо підхід має оцінку, 1ПМ рахується за таблицею RPE.","rirTitle": "ЗАПАС (RIR)","rirHint": "0 — більше жодного повторення, 2 — залишалося два.",- "addWeekWidget": "Додати віджет тижня"+ "addWeekWidget": "Додати віджет тижня",++ "gamificationSetting": "Медалі та рівні"}diff --git a/lib/l10n/app_zh.arb b/lib/l10n/app_zh.arbindex 5acd0df..4822e14 100644--- a/lib/l10n/app_zh.arb+++ b/lib/l10n/app_zh.arb@@ -918,5 +918,7 @@"effortHint": "RPE:10 表示一次都做不动了,8 表示还能再做两次。RIR 表示还剩几次。记录后,估算 1RM 会使用 RPE 表。","rirTitle": "余力 (RIR)","rirHint": "0 表示一次都做不动了,2 表示还能再做两次。",- "addWeekWidget": "添加本周小组件"+ "addWeekWidget": "添加本周小组件",++ "gamificationSetting": "勋章和等级"}diff --git a/lib/l10n/app_zh_Hant.arb b/lib/l10n/app_zh_Hant.arbindex c17e7e7..f0ae600 100644--- a/lib/l10n/app_zh_Hant.arb+++ b/lib/l10n/app_zh_Hant.arb@@ -1158,5 +1158,7 @@"effortHint": "RPE:10 表示一次都做不動了,8 表示還能再做兩次。RIR 表示還剩幾次。記錄後,估算 1RM 會使用 RPE 表。","rirTitle": "餘力 (RIR)","rirHint": "0 表示一次都做不動了,2 表示還能再做兩次。",- "addWeekWidget": "新增本週小工具"+ "addWeekWidget": "新增本週小工具",++ "gamificationSetting": "獎牌和等級"}diff --git a/lib/screens/profile_screen.dart b/lib/screens/profile_screen.dartindex b19b89e..3135145 100644--- a/lib/screens/profile_screen.dart+++ b/lib/screens/profile_screen.dart@@ -105,15 +105,17 @@ class _ProfileScreenState extends State<ProfileScreen> {child: Column(crossAxisAlignment: CrossAxisAlignment.stretch,children: [- Rise(- index: 1,- child: Column(crossAxisAlignment: CrossAxisAlignment.stretch, children: [- _heading(gc, t.awardsTitle, count: '${fit.awardCount}', onMore: fit.goAwards),- const SizedBox(height: 16),- const MedalShelf(size: 66),- ]),- ),- const SizedBox(height: 30),+ if (fit.gamification) ...[+ Rise(+ index: 1,+ child: Column(crossAxisAlignment: CrossAxisAlignment.stretch, children: [+ _heading(gc, t.awardsTitle, count: '${fit.awardCount}', onMore: fit.goAwards),+ const SizedBox(height: 16),+ const MedalShelf(size: 66),+ ]),+ ),+ const SizedBox(height: 30),+ ],Rise(index: 2,child: Column(crossAxisAlignment: CrossAxisAlignment.stretch, children: [@@ -445,9 +447,12 @@ class _ProfileHeader extends SliverPersistentHeaderDelegate {final VoidCallback onShare;static const _banner = 176.0;- static const _identity = 128.0;static const _bar = 60.0;- static const _identityBlock = 136.0;+ static const _levelRow = 34.0;++ double get _cut => fit.gamification ? 0 : _levelRow;+ double get _identity => 128.0 - _cut;+ double get _identityBlock => 136.0 - _cut;@overridedouble get maxExtent => _banner + _identity;@@ -628,6 +633,7 @@ class _ProfileHeader extends SliverPersistentHeaderDelegate {overflow: TextOverflow.ellipsis,style: AppTheme.f(13, weight: FontWeight.w500, color: gc.textSecondary),),+ if (fit.gamification) ...[const SizedBox(height: 8),Row(children: [Container(@@ -649,6 +655,7 @@ class _ProfileHeader extends SliverPersistentHeaderDelegate {),),]),+ ],],);}diff --git a/lib/screens/session_screen.dart b/lib/screens/session_screen.dartindex c1ec42d..a774c8b 100644--- a/lib/screens/session_screen.dart+++ b/lib/screens/session_screen.dart@@ -1122,7 +1122,7 @@ class SessionScreen extends StatelessWidget {}Widget _complete(BuildContext context, GymColors gc) {- final prs = fit.summaryPrs;+ final prs = fit.gamification ? fit.summaryPrs : 0;final streak = fit.currentStreak;final goalHit = fit.goalPct >= 100;final vsLast = fit.summaryVsLast;@@ -1130,7 +1130,7 @@ class SessionScreen extends StatelessWidget {final sets = fit.session?.summarySets ?? 0;return _Celebrate(- active: sets > 0,+ active: sets > 0 && fit.gamification,child: Padding(padding: const EdgeInsets.only(top: 24),child: Column(diff --git a/lib/screens/settings_screen.dart b/lib/screens/settings_screen.dartindex fe9aa03..0b85324 100644--- a/lib/screens/settings_screen.dart+++ b/lib/screens/settings_screen.dart@@ -229,6 +229,12 @@ class SettingsScreen extends StatelessWidget {child: _prefRow(gc, PhosphorIconsRegular.sun, t.keepScreenOn,TinySwitch(on: fit.keepScreenOn)),),+ GestureDetector(+ behavior: HitTestBehavior.opaque,+ onTap: fit.toggleGamification,+ child: _prefRow(gc, PhosphorIconsRegular.medal, t.gamificationSetting,+ TinySwitch(on: fit.gamification)),+ ),_choiceRow(context,gc,diff --git a/lib/state/awards_state.dart b/lib/state/awards_state.dartindex 2151746..ef15d59 100644--- a/lib/state/awards_state.dart+++ b/lib/state/awards_state.dart@@ -90,7 +90,11 @@ mixin AwardsState on FitCore, StatsState, SettingsState {for (final id in AwardId.values) {if (hasAward(id) || awardValue(id) < awardGoal(id)) continue;awards[id.name] = DateTime.now();- if (!silent) pendingAwards.add(id);+ if (!gamification) {+ awardsSeen.add(id.name);+ } else if (!silent) {+ pendingAwards.add(id);+ }won = true;}if (!won) return;@@ -102,7 +106,17 @@ mixin AwardsState on FitCore, StatsState, SettingsState {void backFromAwards() => popRoute(fallback: 'settings');- AwardId? get nextCelebration => pendingAwards.isEmpty ? null : pendingAwards.first;+ AwardId? get nextCelebration => !gamification || pendingAwards.isEmpty ? null : pendingAwards.first;++ void toggleGamification() {+ gamification = !gamification;+ if (!gamification) {+ awardsSeen.addAll(awards.keys);+ pendingAwards.clear();+ }+ _persist();+ notifyListeners();+ }void celebrationShown() {if (pendingAwards.isEmpty) return;diff --git a/lib/state/fit_state.dart b/lib/state/fit_state.dartindex d598276..b6dfd7d 100644--- a/lib/state/fit_state.dart+++ b/lib/state/fit_state.dart@@ -125,9 +125,8 @@ class FitState extends FitCore_seedCalculatorsFromProfile();_loading = false;refreshAwards(silent: true);- pendingAwards- ..clear()- ..addAll(unseenAwards);+ pendingAwards.clear();+ if (gamification) pendingAwards.addAll(unseenAwards);notifyListeners();}@@ -164,6 +163,7 @@ class FitState extends FitCoreautoAdvance = data['autoAdvance'] as bool? ?? true;keepScreenOn = data['keepAwake'] as bool? ?? true;startCountdown = data['countdown'] as bool? ?? true;+ gamification = data['gamify'] as bool? ?? true;logRpe = data['rpe'] as bool? ?? false;effortScale = data['effort'] == 'rir' ? 'rir' : 'rpe';trainReminderMin = (data['trainAt'] as num?)?.toInt();@@ -318,6 +318,7 @@ class FitState extends FitCore'autoAdvance': autoAdvance,'keepAwake': keepScreenOn,'countdown': startCountdown,+ 'gamify': gamification,'rpe': logRpe,'effort': effortScale,'demo': demoSize,@@ -403,6 +404,7 @@ class FitState extends FitCoreshowFocus = true;autoAdvance = true;startCountdown = true;+ gamification = true;logRpe = false;effortScale = 'rpe';trainReminderMin = null;diff --git a/lib/state/settings_state.dart b/lib/state/settings_state.dartindex fcddab0..2700526 100644--- a/lib/state/settings_state.dart+++ b/lib/state/settings_state.dart@@ -31,6 +31,7 @@ mixin SettingsState on FitCore, ToolsState, LibraryState {bool autoAdvance = true;bool keepScreenOn = true;bool startCountdown = true;+ bool gamification = true;bool logRpe = false;String effortScale = 'rpe';int? trainReminderMin;diff --git a/test/gamification_test.dart b/test/gamification_test.dartnew file mode 100644index 0000000..2aab1a0--- /dev/null+++ b/test/gamification_test.dart@@ -0,0 +1,107 @@+import 'package:flutter/widgets.dart';+import 'package:flutter_test/flutter_test.dart';+import 'package:gymmane/app/gymmane_app.dart';+import 'package:gymmane/l10n/l10n.dart';+import 'package:gymmane/models/workout.dart';+import 'package:gymmane/services/local_store.dart';+import 'package:gymmane/services/progress_reminder.dart';+import 'package:gymmane/services/train_reminder.dart';+import 'package:gymmane/state/fit_state.dart';+import 'package:gymmane/widgets/medal_shelf.dart';+import 'package:shared_preferences/shared_preferences.dart';++void main() {+ TestWidgetsFlutterBinding.ensureInitialized();++ setUp(() async {+ SharedPreferences.setMockInitialValues({});+ await Store.instance.init();+ ProgressReminder.instance.enabled = false;+ TrainReminder.instance.enabled = false;+ fit.resetAllData();+ fit.onboarded = true;+ fit.awardsSeen.clear();+ fit.pendingAwards.clear();+ });++ void logWorkouts(int n) {+ final now = DateTime.now();+ for (var i = 0; i < n; i++) {+ fit.sessions.add(LoggedSession(now.subtract(Duration(days: i + 1)), 1800, [+ LoggedExercise('EIeI8Vf', 'Barbell Bench Press', 'chest', [LoggedSet(8, 60)]),+ ]));+ }+ }++ test('it is on by default and a new medal is queued to be shown', () {+ expect(fit.gamification, isTrue);+ logWorkouts(1);+ fit.refreshAwards();+ expect(fit.nextCelebration, isNotNull);+ });++ test('switched off, medals are still earned but nothing pops up', () {+ fit.toggleGamification();+ expect(fit.gamification, isFalse);+ logWorkouts(10);+ fit.refreshAwards();+ expect(fit.hasAward(AwardId.workouts10), isTrue);+ expect(fit.pendingAwards, isEmpty);+ expect(fit.nextCelebration, isNull);+ expect(fit.unseenAwards, isEmpty);+ });++ test('switching it off drops the medals waiting to be shown', () {+ logWorkouts(1);+ fit.refreshAwards();+ expect(fit.pendingAwards, isNotEmpty);+ fit.toggleGamification();+ expect(fit.pendingAwards, isEmpty);+ expect(fit.nextCelebration, isNull);+ });++ test('turning it back on does not replay old medals', () {+ fit.toggleGamification();+ logWorkouts(10);+ fit.refreshAwards();+ fit.toggleGamification();+ expect(fit.gamification, isTrue);+ expect(fit.nextCelebration, isNull);+ });++ test('the choice survives a restart', () {+ fit.toggleGamification();+ fit.persistNow();+ fit.gamification = true;+ fit.loadFromStore();+ expect(fit.gamification, isFalse);+ expect(fit.nextCelebration, isNull);+ });++ testWidgets('the profile hides medals and level when it is off', (tester) async {+ setAppLanguage('en');+ logWorkouts(3);+ fit.refreshAwards(silent: true);+ fit.pendingAwards.clear();+ fit.resetRoute('settings');++ Future<void> show() async {+ await tester.pumpWidget(const GymManeApp());+ for (var i = 0; i < 20; i++) {+ await tester.pump(const Duration(milliseconds: 100));+ }+ }++ await show();+ expect(find.byType(MedalShelf), findsOneWidget);+ expect(find.text(t.levelShort(fit.athleteLevel)), findsOneWidget);++ fit.toggleGamification();+ await show();+ expect(find.byType(MedalShelf), findsNothing);+ expect(find.text(t.levelShort(fit.athleteLevel)), findsNothing);+ expect(find.text(t.awardsTitle), findsNothing);++ await tester.pumpWidget(const SizedBox());+ });+}