diff --git a/app/src/main/java/org/tasks/widget/TasksWidget.kt b/app/src/main/java/org/tasks/widget/TasksWidget.kt index 3a913abd9..bf97e03b8 100644 --- a/app/src/main/java/org/tasks/widget/TasksWidget.kt +++ b/app/src/main/java/org/tasks/widget/TasksWidget.kt @@ -136,13 +136,10 @@ class TasksWidget : AppWidgetProvider() { hPad = hPad, onClick = getNewTaskIntent(context, filter, id), ) - addView( - R.id.title_container, - RemoteViews(context.packageName, widgetPreferences.headerLayout) - ) + setViewPadding( R.id.widget_title, - if (widgetPreferences.showMenu) 0 else hPad, 0, 0, 0 + if (widgetPreferences.showMenu) 0 else hPad, vPad, 0, vPad ) setTextColor(R.id.widget_title, color.colorOnPrimary) setOnClickPendingIntent(R.id.widget_title, getOpenListIntent(context, filter, id)) diff --git a/app/src/main/java/org/tasks/widget/WidgetPreferences.kt b/app/src/main/java/org/tasks/widget/WidgetPreferences.kt index e290a68a1..7e3aab5c1 100644 --- a/app/src/main/java/org/tasks/widget/WidgetPreferences.kt +++ b/app/src/main/java/org/tasks/widget/WidgetPreferences.kt @@ -25,7 +25,6 @@ class WidgetPreferences( val color: Int, val headerOpacity: Int, val headerSpacing: Int, - val headerLayout: Int, ) data class WidgetRowSettings( @@ -58,11 +57,6 @@ class WidgetPreferences( color = color, headerOpacity = getAlphaValue(R.string.p_widget_header_opacity), headerSpacing = getSpacing(R.string.p_widget_header_spacing), - headerLayout = when (getIntegerFromString(R.string.p_widget_header_spacing)) { - 1 -> R.layout.widget_title_compact - 2 -> R.layout.widget_title_none - else -> R.layout.widget_title_default - }, ) fun getWidgetListSettings() = WidgetRowSettings( diff --git a/app/src/main/res/layout/scrollable_widget.xml b/app/src/main/res/layout/scrollable_widget.xml index 86c9d722e..9f54a5f07 100644 --- a/app/src/main/res/layout/scrollable_widget.xml +++ b/app/src/main/res/layout/scrollable_widget.xml @@ -34,12 +34,15 @@ android:contentDescription="@string/widget_settings" tools:padding="@dimen/widget_padding"/> - + diff --git a/app/src/main/res/layout/widget_title_compact.xml b/app/src/main/res/layout/widget_title_compact.xml deleted file mode 100644 index 154aa1c9c..000000000 --- a/app/src/main/res/layout/widget_title_compact.xml +++ /dev/null @@ -1,8 +0,0 @@ - - \ No newline at end of file diff --git a/app/src/main/res/layout/widget_title_default.xml b/app/src/main/res/layout/widget_title_default.xml deleted file mode 100644 index 9a79914ef..000000000 --- a/app/src/main/res/layout/widget_title_default.xml +++ /dev/null @@ -1,8 +0,0 @@ - - \ No newline at end of file diff --git a/app/src/main/res/layout/widget_title_none.xml b/app/src/main/res/layout/widget_title_none.xml deleted file mode 100644 index 3406cd863..000000000 --- a/app/src/main/res/layout/widget_title_none.xml +++ /dev/null @@ -1,8 +0,0 @@ - - \ No newline at end of file