Offline gym log for Android. No account, no ads, no internet.
Dart androidbodybuildingdartexercisesf-droidfitnessfluttergymgym-apphealthprivacyself-hostedworkoutworkout-appworkout-tracker
Show archived routines in their own section
InlitX2ab510677a1f
diff --git a/lib/screens/home_screen.dart b/lib/screens/home_screen.dartindex ccc7592..17f91c2 100644--- a/lib/screens/home_screen.dart+++ b/lib/screens/home_screen.dart@@ -124,7 +124,7 @@ class HomeScreen extends StatelessWidget {Expanded(child: HomeFolder(title: _tc(t.routines),- detail: t.routineCount(fit.routines.length),+ detail: t.routineCount(fit.activeRoutines.length),peek: const RoutinesPeek(),onTap: fit.goRoutines,),diff --git a/lib/screens/routines_screen.dart b/lib/screens/routines_screen.dartindex d5a7a3f..371a02c 100644--- a/lib/screens/routines_screen.dart+++ b/lib/screens/routines_screen.dart@@ -44,7 +44,7 @@ class RoutinesScreen extends StatelessWidget {child: Icon(PhosphorIconsRegular.downloadSimple, size: 17, color: gc.text),),),- if (fit.routines.isNotEmpty) ...[+ if (fit.activeRoutines.isNotEmpty) ...[const SizedBox(width: 8),Semantics(button: true,@@ -86,14 +86,14 @@ class RoutinesScreen extends StatelessWidget {padding: const EdgeInsets.symmetric(horizontal: 4, vertical: 4),child: Column(children: [for (int i = 0; i < 7; i++) _dayRow(context, gc, i)]),),- if (!fit.rotation && fit.routines.isNotEmpty) ...[+ if (!fit.rotation && fit.activeRoutines.isNotEmpty) ...[const SizedBox(height: 10),_plansRow(context, gc),],const SizedBox(height: 26),Text(t.yourRoutines, style: AppTheme.f(12, weight: FontWeight.w600, color: gc.textSecondary, letterSpacing: 1.5)),const SizedBox(height: 10),- if (fit.routines.isEmpty)+ if (fit.activeRoutines.isEmpty)Padding(padding: const EdgeInsets.symmetric(vertical: 26),child: Text(t.noRoutines,@@ -107,6 +107,11 @@ class RoutinesScreen extends StatelessWidget {],_folders(context, fit.routinesInGroup('')),],+ if (fit.archivedRoutines.isNotEmpty) ...[+ const SizedBox(height: 6),+ _archivedHeader(gc),+ if (fit.showArchivedRoutines) Opacity(opacity: 0.6, child: _folders(context, fit.archivedRoutines)),+ ],const SizedBox(height: 16),PrimaryButton(label: t.newRoutine,@@ -138,7 +143,7 @@ class RoutinesScreen extends StatelessWidget {void _shareMenu(BuildContext context) {final gc = context.gc;- final planned = fit.routines.where((r) => [for (var d = 1; d <= 7; d++) ...fit.planIdsOn(d)].contains(r.id)).toList();+ final planned = fit.activeRoutines.where((r) => [for (var d = 1; d <= 7; d++) ...fit.planIdsOn(d)].contains(r.id)).toList();showAppSheet<void>(context: context,backgroundColor: Colors.transparent,@@ -159,16 +164,16 @@ class RoutinesScreen extends StatelessWidget {const SizedBox(height: 18),_shareOption(gc, PhosphorIconsRegular.calendarDots, t.shareWeek, t.shareWeekHint, () {Navigator.pop(sheet);- sharePlan(planned.isEmpty ? fit.routines : [+ sharePlan(planned.isEmpty ? fit.activeRoutines : [...planned,- ...fit.routines.where((r) => !planned.contains(r)),+ ...fit.activeRoutines.where((r) => !planned.contains(r)),], title: t.weeklyPlan);}),_shareOption(gc, PhosphorIconsRegular.filePdf, t.pdfPlan, t.pdfPlanHint, () {Navigator.pop(sheet);- sharePlanPdf(planned.isEmpty ? fit.routines : [+ sharePlanPdf(planned.isEmpty ? fit.activeRoutines : [...planned,- ...fit.routines.where((r) => !planned.contains(r)),+ ...fit.activeRoutines.where((r) => !planned.contains(r)),], week: true);}),const SizedBox(height: 14),@@ -759,6 +764,42 @@ class RoutinesScreen extends StatelessWidget {);}+ Widget _archivedHeader(GymColors gc) {+ final open = fit.showArchivedRoutines;+ return Semantics(+ button: true,+ expanded: open,+ label: t.archivedRoutines,+ child: GestureDetector(+ behavior: HitTestBehavior.opaque,+ onTap: fit.toggleArchivedRoutines,+ child: Padding(+ padding: const EdgeInsets.only(bottom: 8, left: 4, top: 4),+ child: Row(+ children: [+ Icon(PhosphorIconsRegular.archive, size: 15, color: gc.textTertiary),+ const SizedBox(width: 8),+ Expanded(+ child: Text(t.archivedRoutines,+ maxLines: 1,+ overflow: TextOverflow.ellipsis,+ style: AppTheme.f(13, weight: FontWeight.w700, color: gc.textSecondary, letterSpacing: 1)),+ ),+ Text('${fit.archivedRoutines.length}',+ style: AppTheme.f(12, weight: FontWeight.w500, color: gc.textTertiary)),+ const SizedBox(width: 6),+ AnimatedRotation(+ turns: open ? 0.5 : 0,+ duration: const Duration(milliseconds: 200),+ child: Icon(PhosphorIconsBold.caretDown, size: 14, color: gc.textTertiary),+ ),+ ],+ ),+ ),+ ),+ );+ }+Widget _groupHeader(BuildContext context, GymColors gc, String name, int count) {return Semantics(button: true,@@ -1081,6 +1122,21 @@ void showRoutineMenu(BuildContext context, Routine r) {Navigator.pop(sheet);fit.duplicateRoutine(r.id);}),+ OptionItem(r.archived ? t.restoreExercise : t.archiveRoutine,+ icon: r.archived ? PhosphorIconsRegular.arrowUUpLeft : PhosphorIconsRegular.archive, onTap: () {+ Navigator.pop(sheet);+ final undo = fit.archiveRoutine(r.id, !r.archived);+ if (undo == null) return;+ showNotchToast(+ context,+ t.routineArchived,+ icon: PhosphorIconsFill.archive,+ accent: gc.brass,+ action: t.undo,+ onTap: undo,+ duration: const Duration(milliseconds: 3600),+ );+ }),OptionItem(t.delete, icon: PhosphorIconsRegular.trash, danger: true, onTap: () async {Navigator.pop(sheet);final ok = await askConfirm(diff --git a/lib/wear/wear_shell.dart b/lib/wear/wear_shell.dartindex fadc184..1fe2b66 100644--- a/lib/wear/wear_shell.dart+++ b/lib/wear/wear_shell.dart@@ -555,7 +555,7 @@ class WearRoutines extends StatelessWidget {Widget build(BuildContext context) {final gc = context.gc;final planned = fit.todayRoutine;- final list = [...fit.routines]+ final list = [...fit.activeRoutines]..sort((a, b) => (a.id == planned?.id ? 0 : 1) - (b.id == planned?.id ? 0 : 1));return WearPage(children: [_heading(gc, t.routines),diff --git a/lib/widgets/home_folder.dart b/lib/widgets/home_folder.dartindex 5cf2b47..55e2be8 100644--- a/lib/widgets/home_folder.dart+++ b/lib/widgets/home_folder.dart@@ -219,7 +219,7 @@ class RoutinesPeek extends StatelessWidget {Widget build(BuildContext context) {final gc = context.gc;final dark = gc.bg.computeLuminance() < 0.5;- final hues = [for (final r in fit.routines.take(3)) folderHue(r)];+ final hues = [for (final r in fit.activeRoutines.take(3)) folderHue(r)];final colors = hues.isEmpty ? kFolderHues.take(3).toList() : hues;return _Fan(width: 60,