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 d65126151..fa8ce6bb1 100644 --- a/app/src/main/java/org/tasks/preferences/fragments/ScrollableWidget.kt +++ b/app/src/main/java/org/tasks/preferences/fragments/ScrollableWidget.kt @@ -59,7 +59,7 @@ class ScrollableWidget : InjectingPreferenceFragment() { val row = setupSlider(R.string.p_widget_opacity, 100) val header = setupSlider(R.string.p_widget_header_opacity, row.value) - val footer = setupSlider(R.string.p_widget_empty_space_opacity, row.value) + val footer = setupSlider(R.string.p_widget_footer_opacity, row.value) val opacity = findPreference(R.string.opacity) as SeekBarPreference opacity.value = max(header.value, row.value, footer.value) diff --git a/app/src/main/java/org/tasks/widget/TasksWidget.java b/app/src/main/java/org/tasks/widget/TasksWidget.java index 729fbfa72..944bc39c4 100644 --- a/app/src/main/java/org/tasks/widget/TasksWidget.java +++ b/app/src/main/java/org/tasks/widget/TasksWidget.java @@ -100,7 +100,7 @@ public class TasksWidget extends InjectingAppWidgetProvider { remoteViews.setInt( R.id.empty_view, "setBackgroundColor", - ColorUtils.setAlphaComponent(bgColor, widgetPreferences.getEmptySpaceOpacity())); + ColorUtils.setAlphaComponent(bgColor, widgetPreferences.getFooterOpacity())); Filter filter = defaultFilterProvider.getFilterFromPreference(filterId); remoteViews.setTextViewText(R.id.widget_title, filter.listingTitle); diff --git a/app/src/main/java/org/tasks/widget/WidgetPreferences.java b/app/src/main/java/org/tasks/widget/WidgetPreferences.java index 6b5cabc7c..333ba93ed 100644 --- a/app/src/main/java/org/tasks/widget/WidgetPreferences.java +++ b/app/src/main/java/org/tasks/widget/WidgetPreferences.java @@ -90,23 +90,29 @@ public class WidgetPreferences { } int getHeaderOpacity() { - return getAlphaValue(R.string.p_widget_header_opacity); + int headerOpacity = preferences.getInt(getKey(R.string.p_widget_header_opacity), -1); + return headerOpacity >= 0 && headerOpacity <= 100 + ? getAlphaValue(headerOpacity) + : getRowOpacity(); } - int getRowOpacity() { - return getAlphaValue(R.string.p_widget_opacity); + int getFooterOpacity() { + int footerOpacity = preferences.getInt(getKey(R.string.p_widget_footer_opacity), -1); + return footerOpacity >= 0 && footerOpacity <= 100 + ? getAlphaValue(footerOpacity) + : getRowOpacity(); } - int getEmptySpaceOpacity() { - return getAlphaValue(R.string.p_widget_empty_space_opacity); + int getRowOpacity() { + return getAlphaValue(preferences.getInt(getKey(R.string.p_widget_opacity), 100)); } boolean openOnEmptySpaceClick() { return preferences.getIntegerFromString(getKey(R.string.p_widget_empty_space_click), 0) == 1; } - private int getAlphaValue(int resId) { - return (int) ((preferences.getInt(getKey(resId), 100) / 100.0) * 255.0); + private int getAlphaValue(int percentage) { + return (int) (percentage / 100.0 * 255.0); } public void setColor(int color) { diff --git a/app/src/main/res/values/keys.xml b/app/src/main/res/values/keys.xml index e7a52e10f..03ce802ca 100644 --- a/app/src/main/res/values/keys.xml +++ b/app/src/main/res/values/keys.xml @@ -300,7 +300,7 @@ widget-show-settings- widget-show-menu- widget-header-opacity- - widget-empty-space-opacity- + widget-empty-space-opacity- widget-empty-space-click- widget-due-date-position- widget-spacing- diff --git a/app/src/main/res/xml/preferences_widget.xml b/app/src/main/res/xml/preferences_widget.xml index 4ddff5a55..5a49e4b12 100644 --- a/app/src/main/res/xml/preferences_widget.xml +++ b/app/src/main/res/xml/preferences_widget.xml @@ -43,7 +43,7 @@