From 0efbefb6bd873c2760325e24a211eefd965f5045 Mon Sep 17 00:00:00 2001
From: Prathamesh More <prathameshmm02@gmail.com>
Date: Thu, 13 Jan 2022 18:21:30 +0530
Subject: [PATCH] [Widget] Fixed colors of MD3 widget

---
 .../monkey/retromusic/appwidgets/AppWidgetMD3.kt    |  8 +++++++-
 app/src/main/res/layout/app_widget_md3.xml          | 13 +++++++------
 app/src/main/res/values-night-v31/colors.xml        |  4 ++++
 app/src/main/res/values-night/colors.xml            |  1 +
 app/src/main/res/values-v31/colors.xml              |  4 ++++
 app/src/main/res/values/colors.xml                  |  1 +
 app/src/main/res/values/dimens.xml                  |  4 ++--
 7 files changed, 26 insertions(+), 9 deletions(-)
 create mode 100644 app/src/main/res/values-night-v31/colors.xml
 create mode 100644 app/src/main/res/values-v31/colors.xml

diff --git a/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetMD3.kt b/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetMD3.kt
index a60c7bca5..6a468be0c 100644
--- a/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetMD3.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetMD3.kt
@@ -208,7 +208,13 @@ class AppWidgetMD3 : BaseAppWidget() {
 
                         val image = getAlbumArtDrawable(service.resources, bitmap)
                         val roundedBitmap = createRoundedBitmap(
-                            image, imageSize, imageSize, cardRadius, cardRadius, cardRadius, cardRadius
+                            image,
+                            imageSize,
+                            imageSize,
+                            cardRadius,
+                            cardRadius,
+                            cardRadius,
+                            cardRadius
                         )
                         appWidgetView.setImageViewBitmap(R.id.image, roundedBitmap)
 
diff --git a/app/src/main/res/layout/app_widget_md3.xml b/app/src/main/res/layout/app_widget_md3.xml
index 55f3fb286..157819b48 100644
--- a/app/src/main/res/layout/app_widget_md3.xml
+++ b/app/src/main/res/layout/app_widget_md3.xml
@@ -5,18 +5,20 @@
     android:layout_width="match_parent"
     android:layout_height="@dimen/app_widget_md3_height"
     android:background="@drawable/app_widget_background"
-    android:backgroundTint="?android:attr/colorBackground"
+    android:backgroundTint="@color/widget_md3_bg_color"
     android:orientation="horizontal"
-    tools:ignore="ContentDescription">
+    tools:ignore="ContentDescription"
+    android:theme="@style/Theme.Material3.DynamicColors.DayNight">
 
     <ImageView
         android:id="@+id/image"
         android:layout_width="@dimen/app_widget_md3_image_size"
         android:layout_height="@dimen/app_widget_md3_image_size"
-        android:background="@drawable/app_widget_background"
-        android:layout_margin="8dp"
         android:layout_gravity="center_vertical"
-        android:scaleType="centerCrop" />
+        android:layout_margin="10dp"
+        android:background="@drawable/app_widget_background"
+        android:scaleType="centerCrop"
+        tools:src="@tools:sample/backgrounds/scenic[6]" />
 
     <RelativeLayout
         android:layout_width="match_parent"
@@ -94,7 +96,6 @@
                 android:textAppearance="@style/TextViewNormal"
                 android:textColor="?android:attr/textColorSecondary"
                 tools:text="Text" />
-
         </LinearLayout>
     </RelativeLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values-night-v31/colors.xml b/app/src/main/res/values-night-v31/colors.xml
new file mode 100644
index 000000000..12a321b43
--- /dev/null
+++ b/app/src/main/res/values-night-v31/colors.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="widget_md3_bg_color">@android:color/system_accent1_800</color>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index 5718c56e9..e25b5f1f4 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -4,4 +4,5 @@
     <color name="window_color">@android:color/black</color>
 
     <color name="bottomSheetColor">#202020</color>
+    <color name="widget_md3_bg_color">@color/darkerColorSurface</color>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-v31/colors.xml b/app/src/main/res/values-v31/colors.xml
new file mode 100644
index 000000000..292e53073
--- /dev/null
+++ b/app/src/main/res/values-v31/colors.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="widget_md3_bg_color">@android:color/system_accent1_50</color>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 9d64c9075..3f7a24e3b 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -35,4 +35,5 @@
     <color name="bottomSheetColorBlack">#000000</color>
 
     <color name="bottomSheetColor">#FFFFFF</color>
+    <color name="widget_md3_bg_color">@color/lighterColorSurface</color>
 </resources>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index bf5ba4946..a835130d6 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -39,8 +39,8 @@
     <dimen name="app_widget_card_radius">2dp</dimen>
     <dimen name="now_playing_top_margin">12dp</dimen>
 
-    <dimen name="app_widget_md3_height">96dp</dimen>
-    <dimen name="app_widget_md3_image_size">80dp</dimen>
+    <dimen name="app_widget_md3_height">90dp</dimen>
+    <dimen name="app_widget_md3_image_size">70dp</dimen>
 
     <dimen name="icon_notification_dimen">32dp</dimen>
     <dimen name="toolbar_margin_horizontal">8dp</dimen>