Skip to content

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

Show rest days on the Today widget and follow the week start on the week widget

InlitXa1c3208ca532
diff --git a/android/app/src/main/kotlin/com/gymmane/app/TodayWidgetProvider.kt b/android/app/src/main/kotlin/com/gymmane/app/TodayWidgetProvider.kt
index a83468a..66db68d 100644
--- a/android/app/src/main/kotlin/com/gymmane/app/TodayWidgetProvider.kt
+++ b/android/app/src/main/kotlin/com/gymmane/app/TodayWidgetProvider.kt
@@ -15,9 +15,11 @@ class TodayWidgetProvider : DayWidgetProvider() {
) {
val now = Calendar.getInstance()
val saved = widgetData.getString("today_stamp", null)
+ val week = widgetData.getString("today_week", null).orEmpty()
val key = when {
saved == null || saved == dayStamp(now) -> "today_img"
- widgetData.getString("today_week", null)?.getOrNull(weekdayIndex(now)) == '1' -> "today_plan_img"
+ week.getOrNull(weekdayIndex(now)) == '1' -> "today_plan_img"
+ '1' in week -> "today_rest_img"
else -> "today_idle_img"
}
val shown = if (widgetData.getString(key, null) == null) "today_img" else key
diff --git a/android/app/src/main/kotlin/com/gymmane/app/WeekWidgetProvider.kt b/android/app/src/main/kotlin/com/gymmane/app/WeekWidgetProvider.kt
index 67cc7e9..389d36d 100644
--- a/android/app/src/main/kotlin/com/gymmane/app/WeekWidgetProvider.kt
+++ b/android/app/src/main/kotlin/com/gymmane/app/WeekWidgetProvider.kt
@@ -19,11 +19,12 @@ class WeekWidgetProvider : DayWidgetProvider() {
widgetData: SharedPreferences
) {
val now = Calendar.getInstance()
- val monday = (now.clone() as Calendar).apply { add(Calendar.DAY_OF_YEAR, -weekdayIndex(now)) }
+ val first = widgetData.getString("week_first", null)?.toIntOrNull() ?: 1
+ val today = (weekdayIndex(now) - (first - 1) + 7) % 7
+ val start = (now.clone() as Calendar).apply { add(Calendar.DAY_OF_YEAR, -today) }
val saved = widgetData.getString("week_start", null)
- val fresh = saved != null && saved != dayStamp(monday)
+ val fresh = saved != null && saved != dayStamp(start)
val key = if (fresh && widgetData.getString("week_fresh_img", null) != null) "week_fresh_img" else "week_img"
- val today = weekdayIndex(now)
val doneToday = !fresh && widgetData.getString("week_done", null)?.getOrNull(today) == '1'
val geo = widgetData.getString("week_geo", null)?.split(',')?.mapNotNull { it.toFloatOrNull() }
diff --git a/lib/services/home_widget_bridge.dart b/lib/services/home_widget_bridge.dart
index f108984..253240a 100644
--- a/lib/services/home_widget_bridge.dart
+++ b/lib/services/home_widget_bridge.dart
@@ -19,6 +19,7 @@ class HomeWidgetBridge {
static const todayKey = 'today_img';
static const todayIdleKey = 'today_idle_img';
static const todayPlanKey = 'today_plan_img';
+ static const todayRestKey = 'today_rest_img';
static const weekKey = 'week_img';
static const weekFreshKey = 'week_fresh_img';
static const darkKey = 'widget_dark';
@@ -47,6 +48,8 @@ class HomeWidgetBridge {
final week = [for (var i = 0; i < 7; i++) fit.isDayDone(i)];
final levels = fit.heatmapLevelsFor(182);
final heat = fit.muscleHeatOver(bodyDays);
+ final plannedToday = fit.todayRoutine != null;
+ final hasPlan = fit.weeklyPlan.isNotEmpty;
final views = <(String, Size, Widget Function(GymColors))>[
(
@@ -66,7 +69,7 @@ class HomeWidgetBridge {
(gc) => StatsWidgetView(
gc: gc,
streak: fit.currentStreak,
- sessionsThisWeek: fit.sessionsThisWeek,
+ sessionsThisWeek: fit.daysDoneThisWeek,
goalPct: fit.goalPct,
size: statsSize,
framed: framed,
@@ -88,21 +91,27 @@ class HomeWidgetBridge {
todaySize,
(gc) => TodayWidgetView(
gc: gc,
- done: fit.isDayDone(fit.todayIndex),
- planned: fit.todayRoutine != null,
+ done: fit.todayPlanDone,
+ planned: plannedToday,
+ rest: !plannedToday && hasPlan,
streak: fit.currentStreak,
size: todaySize,
framed: framed,
),
),
- for (final planned in [false, true])
+ for (final (key, planned, rest) in [
+ (todayIdleKey, false, false),
+ (todayPlanKey, true, false),
+ (todayRestKey, false, true),
+ ])
(
- planned ? todayPlanKey : todayIdleKey,
+ key,
todaySize,
(gc) => TodayWidgetView(
gc: gc,
done: false,
planned: planned,
+ rest: rest,
streak: 0,
size: todaySize,
framed: framed,
@@ -141,6 +150,7 @@ class HomeWidgetBridge {
];
await HomeWidget.saveWidgetData<String>('today_week', plan.join());
await HomeWidget.saveWidgetData<String>('week_start', _stamp(fit.weekStartDate));
+ await HomeWidget.saveWidgetData<String>('week_first', '${fit.weekStartDay}');
await HomeWidget.saveWidgetData<String>('week_done', [for (final d in week) d ? '1' : '0'].join());
await HomeWidget.saveWidgetData<String>(
'week_geo', WeekWidgetView.geometry(weekSize, framed: framed).map((v) => v.toStringAsFixed(5)).join(','));
diff --git a/lib/widgets/home_widget_views.dart b/lib/widgets/home_widget_views.dart
index c1b4432..b4df37b 100644
--- a/lib/widgets/home_widget_views.dart
+++ b/lib/widgets/home_widget_views.dart
@@ -246,6 +246,7 @@ class TodayWidgetView extends StatelessWidget {
required this.done,
required this.planned,
required this.streak,
+ this.rest = false,
this.size = const Size(120, 120),
this.framed = true,
});
@@ -253,6 +254,7 @@ class TodayWidgetView extends StatelessWidget {
final GymColors gc;
final bool done;
final bool planned;
+ final bool rest;
final int streak;
final Size size;
final bool framed;
@@ -270,14 +272,16 @@ class TodayWidgetView extends StatelessWidget {
width: side * 0.62,
height: side * 0.62,
decoration: BoxDecoration(
- color: done ? gc.accent : Colors.transparent,
+ color: done ? gc.accent : (rest ? gc.sageSoft : Colors.transparent),
shape: BoxShape.circle,
- border: done ? null : Border.all(color: planned ? gc.brass : gc.border, width: side * 0.035),
+ border: done || rest ? null : Border.all(color: planned ? gc.brass : gc.border, width: side * 0.035),
),
child: Center(
child: done
? Icon(Icons.check_rounded, size: side * 0.34, color: gc.bgRaised)
- : Icon(Icons.fitness_center_rounded, size: side * 0.22, color: tone),
+ : rest
+ ? Icon(Icons.local_cafe_rounded, size: side * 0.24, color: gc.sage)
+ : Icon(Icons.fitness_center_rounded, size: side * 0.22, color: tone),
),
),
),
@@ -390,7 +394,7 @@ class WeekWidgetView extends StatelessWidget {
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
- Text(t.weekdayInitial(i + 1),
+ Text(t.weekdayInitial(fit.weekdayAt(i)),
style: TextStyle(
fontFamily: _kBody,
fontSize: 10,