From a6a77ef06caedda60b1be980cbbb740260ce57d3 Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Tue, 26 Jan 2021 12:46:06 -0600 Subject: [PATCH] Add option to disable title in widget header --- .../org/tasks/preferences/fragments/ScrollableWidget.kt | 2 ++ app/src/main/java/org/tasks/widget/TasksWidget.kt | 6 +++++- app/src/main/java/org/tasks/widget/WidgetPreferences.java | 4 ++++ app/src/main/res/values/keys.xml | 1 + app/src/main/res/values/strings.xml | 1 + app/src/main/res/xml/preferences_widget.xml | 4 ++++ 6 files changed, 17 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/tasks/preferences/fragments/ScrollableWidget.kt b/app/src/main/java/org/tasks/preferences/fragments/ScrollableWidget.kt index 9ae16b4e1..2031c1480 100644 --- a/app/src/main/java/org/tasks/preferences/fragments/ScrollableWidget.kt +++ b/app/src/main/java/org/tasks/preferences/fragments/ScrollableWidget.kt @@ -99,6 +99,8 @@ class ScrollableWidget : InjectingPreferenceFragment() { setupList(R.string.p_widget_due_date_click) setupList(R.string.p_widget_due_date_position, widgetPreferences.dueDatePosition.toString()) val showHeader = setupCheckbox(R.string.p_widget_show_header) + val showTitle = setupCheckbox(R.string.p_widget_show_title) + showTitle.dependency = showHeader.key val showSettings = setupCheckbox(R.string.p_widget_show_settings) showSettings.dependency = showHeader.key val showMenu = setupCheckbox(R.string.p_widget_show_menu) diff --git a/app/src/main/java/org/tasks/widget/TasksWidget.kt b/app/src/main/java/org/tasks/widget/TasksWidget.kt index 7092c6b25..46100ae6a 100644 --- a/app/src/main/java/org/tasks/widget/TasksWidget.kt +++ b/app/src/main/java/org/tasks/widget/TasksWidget.kt @@ -89,7 +89,11 @@ class TasksWidget : AppWidgetProvider() { "setBackgroundColor", ColorUtils.setAlphaComponent(bgColor, widgetPreferences.footerOpacity)) val filter = runBlocking { defaultFilterProvider.getFilterFromPreference(filterId) } - remoteViews.setTextViewText(R.id.widget_title, filter.listingTitle) + remoteViews.setTextViewText(R.id.widget_title, if (widgetPreferences.showTitle()) { + filter.listingTitle + } else { + null + }) val cacheBuster = Uri.parse("tasks://widget/" + System.currentTimeMillis()) remoteViews.setRemoteAdapter( R.id.list_view, diff --git a/app/src/main/java/org/tasks/widget/WidgetPreferences.java b/app/src/main/java/org/tasks/widget/WidgetPreferences.java index 792aa5878..bac3721e9 100644 --- a/app/src/main/java/org/tasks/widget/WidgetPreferences.java +++ b/app/src/main/java/org/tasks/widget/WidgetPreferences.java @@ -28,6 +28,10 @@ public class WidgetPreferences implements QueryPreferences { return getBoolean(R.string.p_widget_show_header, true); } + boolean showTitle() { + return getBoolean(R.string.p_widget_show_title, true); + } + boolean showCheckboxes() { return getBoolean(R.string.p_widget_show_checkboxes, true); } diff --git a/app/src/main/res/values/keys.xml b/app/src/main/res/values/keys.xml index fcbeab54c..3f18eef33 100644 --- a/app/src/main/res/values/keys.xml +++ b/app/src/main/res/values/keys.xml @@ -357,6 +357,7 @@ widget-show-checkboxes- widget-show-header- widget-show-settings- + widget-show-title- widget-show-menu- widget-header-opacity- widget-empty-space-opacity- diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index bc8d45487..67c074ffd 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -312,6 +312,7 @@ File %1$s contained %2$s.\n\n Hide background Show header Show settings + Show title Show menu Show dividers Notifications diff --git a/app/src/main/res/xml/preferences_widget.xml b/app/src/main/res/xml/preferences_widget.xml index 32f98b1c1..71e522cce 100644 --- a/app/src/main/res/xml/preferences_widget.xml +++ b/app/src/main/res/xml/preferences_widget.xml @@ -82,6 +82,10 @@ android:title="@string/header_spacing" android:summary="%s" /> + +