diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/helpers/MyWidgetDateTimeProvider.kt b/app/src/main/kotlin/com/simplemobiletools/clock/helpers/MyWidgetDateTimeProvider.kt index b64a6147..b313685f 100644 --- a/app/src/main/kotlin/com/simplemobiletools/clock/helpers/MyWidgetDateTimeProvider.kt +++ b/app/src/main/kotlin/com/simplemobiletools/clock/helpers/MyWidgetDateTimeProvider.kt @@ -68,11 +68,10 @@ class MyWidgetDateTimeProvider : AppWidgetProvider() { private fun updateColors(context: Context, views: RemoteViews) { val config = context.config - val widgetBgColor = config.widgetBgColor val widgetTextColor = config.widgetTextColor views.apply { - setBackgroundColor(R.id.widget_date_time_holder, widgetBgColor) + applyColorFilter(R.id.widget_background, config.widgetBgColor) setTextColor(R.id.widget_time, widgetTextColor) setTextColor(R.id.widget_date, widgetTextColor) setTextColor(R.id.widget_next_alarm, widgetTextColor) diff --git a/app/src/main/res/layout/widget_date_time.xml b/app/src/main/res/layout/widget_date_time.xml index abf143bb..926e4ecb 100644 --- a/app/src/main/res/layout/widget_date_time.xml +++ b/app/src/main/res/layout/widget_date_time.xml @@ -1,69 +1,85 @@ - + android:layout_height="wrap_content"> - + + - - - - - - + android:layout_height="match_parent" + android:orientation="vertical" + android:paddingLeft="@dimen/small_margin" + android:paddingRight="@dimen/small_margin" + android:paddingBottom="@dimen/small_margin" + tools:ignore="UnusedAttribute"> + tools:text="00:00" /> - - + + + + + + + + + + + diff --git a/app/src/main/res/layout/widget_date_time_pre_oreo.xml b/app/src/main/res/layout/widget_date_time_pre_oreo.xml index f67468b9..0036f0c3 100644 --- a/app/src/main/res/layout/widget_date_time_pre_oreo.xml +++ b/app/src/main/res/layout/widget_date_time_pre_oreo.xml @@ -1,59 +1,74 @@ - + android:layout_height="wrap_content"> - + android:layout_alignParentStart="true" + android:layout_alignParentTop="true" + android:layout_alignParentEnd="true" + android:layout_alignParentBottom="true" + android:src="@drawable/widget_round_background" /> - - - - - + android:layout_height="match_parent" + android:orientation="vertical" + android:paddingLeft="@dimen/small_margin" + android:paddingRight="@dimen/small_margin" + android:paddingBottom="@dimen/small_margin"> + android:textSize="@dimen/widget_time_text_size_small" + tools:text="00:00" /> - - + + + + + + + + + + + diff --git a/app/src/main/res/layout/widget_date_time_with_shadow.xml b/app/src/main/res/layout/widget_date_time_with_shadow.xml index 3511432c..0ba9fa5e 100644 --- a/app/src/main/res/layout/widget_date_time_with_shadow.xml +++ b/app/src/main/res/layout/widget_date_time_with_shadow.xml @@ -1,78 +1,94 @@ - + android:layout_height="wrap_content"> - + + - - - - - - + android:layout_height="match_parent" + android:orientation="vertical" + android:paddingLeft="@dimen/small_margin" + android:paddingRight="@dimen/small_margin" + android:paddingBottom="@dimen/small_margin" + tools:ignore="UnusedAttribute"> + tools:text="00:00" /> - - + + + + + + + + + + + diff --git a/app/src/main/res/layout/widget_date_time_with_shadow_pre_oreo.xml b/app/src/main/res/layout/widget_date_time_with_shadow_pre_oreo.xml index c1ada64c..e4a79f5a 100644 --- a/app/src/main/res/layout/widget_date_time_with_shadow_pre_oreo.xml +++ b/app/src/main/res/layout/widget_date_time_with_shadow_pre_oreo.xml @@ -1,68 +1,83 @@ - + android:layout_height="wrap_content"> - + android:layout_alignParentStart="true" + android:layout_alignParentTop="true" + android:layout_alignParentEnd="true" + android:layout_alignParentBottom="true" + android:src="@drawable/widget_round_background" /> - - - - - + android:layout_height="match_parent" + android:orientation="vertical" + android:paddingLeft="@dimen/small_margin" + android:paddingRight="@dimen/small_margin" + android:paddingBottom="@dimen/small_margin"> + + + tools:text="Mon, 1 January" /> - - + + + + + + + + +