From 7a5427e0289b0178bed86158202d337aeff7c74e Mon Sep 17 00:00:00 2001 From: Arjan Schrijver Date: Mon, 23 Feb 2026 15:11:20 +0100 Subject: [PATCH] Dashboard: Add preference for disabling dimming in Today widget --- .../DashboardPreferencesActivity.java | 1 + .../dashboard/DashboardTodayWidget.java | 17 +++++++++-------- app/src/main/res/values/strings.xml | 4 +++- app/src/main/res/xml/dashboard_preferences.xml | 7 +++++++ 4 files changed, 20 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/DashboardPreferencesActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/DashboardPreferencesActivity.java index 58812bb871..30366fbc24 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/DashboardPreferencesActivity.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/DashboardPreferencesActivity.java @@ -69,6 +69,7 @@ public class DashboardPreferencesActivity extends AbstractSettingsActivityV2 { "dashboard_widget_today_24h", "dashboard_widget_today_24h_upside_down", "dashboard_widget_today_show_yesterday", + "dashboard_widget_today_dim_yesterday", "dashboard_widget_today_time_indicator", "dashboard_widget_today_2columns", "dashboard_widget_today_legend", diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/dashboard/DashboardTodayWidget.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/dashboard/DashboardTodayWidget.java index db05067c75..9806f79aeb 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/dashboard/DashboardTodayWidget.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/dashboard/DashboardTodayWidget.java @@ -148,6 +148,7 @@ public class DashboardTodayWidget extends AbstractDashboardWidget { Prefs prefs = GBApplication.getPrefs(); boolean upsideDown24h = prefs.getBoolean("dashboard_widget_today_24h_upside_down", false); boolean showYesterday = prefs.getBoolean("dashboard_widget_today_show_yesterday", false); + boolean dimYesterday = prefs.getBoolean("dashboard_widget_today_dim_yesterday", true); // Prepare circular chart long currentDayStart = dashboardData.timeTo - 86400; @@ -276,56 +277,56 @@ public class DashboardTodayWidget extends AbstractDashboardWidget { if (activity.activityKind == ActivityKind.NOT_MEASURED) { paint.setStrokeWidth(barWidth / 3f); paint.setColor(color_worn); - if (showYesterday && dayIsToday && activity.timeFrom < currentDayStart) { + if (showYesterday && dimYesterday && dayIsToday && activity.timeFrom < currentDayStart) { paint.setAlpha(64); } canvas.drawArc(margin, margin, width - margin, height - margin, start_angle, sweep_angle, false, paint); } else if (activity.activityKind == ActivityKind.NOT_WORN) { paint.setStrokeWidth(barWidth / 3f); paint.setColor(color_not_worn); - if (showYesterday && dayIsToday && activity.timeFrom < currentDayStart) { + if (showYesterday && dimYesterday && dayIsToday && activity.timeFrom < currentDayStart) { paint.setAlpha(64); } canvas.drawArc(margin, margin, width - margin, height - margin, start_angle, sweep_angle, false, paint); } else if (activity.activityKind == ActivityKind.LIGHT_SLEEP || activity.activityKind == ActivityKind.SLEEP_ANY) { paint.setStrokeWidth(barWidth); paint.setColor(color_light_sleep); - if (showYesterday && dayIsToday && activity.timeFrom < currentDayStart) { + if (showYesterday && dimYesterday && dayIsToday && activity.timeFrom < currentDayStart) { paint.setAlpha(64); } canvas.drawArc(margin, margin, width - margin, height - margin, start_angle, sweep_angle, false, paint); } else if (activity.activityKind == ActivityKind.REM_SLEEP) { paint.setStrokeWidth(barWidth); paint.setColor(color_rem_sleep); - if (showYesterday && dayIsToday && activity.timeFrom < currentDayStart) { + if (showYesterday && dimYesterday && dayIsToday && activity.timeFrom < currentDayStart) { paint.setAlpha(64); } canvas.drawArc(margin, margin, width - margin, height - margin, start_angle, sweep_angle, false, paint); } else if (activity.activityKind == ActivityKind.DEEP_SLEEP) { paint.setStrokeWidth(barWidth); paint.setColor(color_deep_sleep); - if (showYesterday && dayIsToday && activity.timeFrom < currentDayStart) { + if (showYesterday && dimYesterday && dayIsToday && activity.timeFrom < currentDayStart) { paint.setAlpha(64); } canvas.drawArc(margin, margin, width - margin, height - margin, start_angle, sweep_angle, false, paint); } else if (activity.activityKind == ActivityKind.AWAKE_SLEEP) { paint.setStrokeWidth(barWidth); paint.setColor(color_awake_sleep); - if (showYesterday && dayIsToday && activity.timeFrom < currentDayStart) { + if (showYesterday && dimYesterday && dayIsToday && activity.timeFrom < currentDayStart) { paint.setAlpha(64); } canvas.drawArc(margin, margin, width - margin, height - margin, start_angle, sweep_angle, false, paint); } else if (activity.activityKind == ActivityKind.EXERCISE) { paint.setStrokeWidth(barWidth); paint.setColor(color_exercise); - if (showYesterday && dayIsToday && activity.timeFrom < currentDayStart) { + if (showYesterday && dimYesterday && dayIsToday && activity.timeFrom < currentDayStart) { paint.setAlpha(64); } canvas.drawArc(margin, margin, width - margin, height - margin, start_angle, sweep_angle, false, paint); } else { paint.setStrokeWidth(barWidth); paint.setColor(color_activity); - if (showYesterday && dayIsToday && activity.timeFrom < currentDayStart) { + if (showYesterday && dimYesterday && dayIsToday && activity.timeFrom < currentDayStart) { paint.setAlpha(64); } canvas.drawArc(margin, margin, width - margin, height - margin, start_angle, sweep_angle, false, paint); diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 1132dd84b8..113ab9b443 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -4105,7 +4105,9 @@ %1s\'s birthday Birthdays Data from yesterday - Show data from yesterday dimmed between the current time and midnight + Show data from yesterday between the current time and midnight + Show yesterday dimmed + Show data from yesterday with dimmed colors Current time indicator Show an indicator at the current time, to visually separate data from yesterday and today Follow phone DND setting diff --git a/app/src/main/res/xml/dashboard_preferences.xml b/app/src/main/res/xml/dashboard_preferences.xml index 4b61f195b9..9b833b1bde 100644 --- a/app/src/main/res/xml/dashboard_preferences.xml +++ b/app/src/main/res/xml/dashboard_preferences.xml @@ -61,6 +61,13 @@ android:title="@string/pref_dashboard_widget_today_yesterday_data_title" android:summary="@string/pref_dashboard_widget_today_yesterday_data_summary" app:iconSpaceReserved="false" /> +