From c281ab5a39ce95f49b500ff4479927d75aa1188a Mon Sep 17 00:00:00 2001
From: Koitharu <nvasya95@gmail.com>
Date: Wed, 29 Jun 2022 12:01:59 +0300
Subject: [PATCH] Fix widgets size and background

---
 .../kotatsu/widget/recent/RecentListFactory.kt       |  2 ++
 .../kotatsu/widget/shelf/ShelfListFactory.kt         |  2 ++
 app/src/main/res/layout/widget_recent.xml            |  5 ++++-
 app/src/main/res/values/themes.xml                   |  2 +-
 app/src/main/res/xml/widget_recent.xml               | 12 ++++++++----
 app/src/main/res/xml/widget_shelf.xml                |  8 +++++---
 6 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/org/koitharu/kotatsu/widget/recent/RecentListFactory.kt b/app/src/main/java/org/koitharu/kotatsu/widget/recent/RecentListFactory.kt
index bf8fbf202..3a2142032 100644
--- a/app/src/main/java/org/koitharu/kotatsu/widget/recent/RecentListFactory.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/widget/recent/RecentListFactory.kt
@@ -7,6 +7,7 @@ import android.widget.RemoteViewsService
 import coil.ImageLoader
 import coil.executeBlocking
 import coil.request.ImageRequest
+import coil.size.Scale
 import coil.size.Size
 import coil.transform.RoundedCornersTransformation
 import kotlinx.coroutines.runBlocking
@@ -54,6 +55,7 @@ class RecentListFactory(
 				ImageRequest.Builder(context)
 					.data(item.coverUrl)
 					.size(coverSize)
+					.scale(Scale.FILL)
 					.transformations(transformation)
 					.build()
 			).requireBitmap()
diff --git a/app/src/main/java/org/koitharu/kotatsu/widget/shelf/ShelfListFactory.kt b/app/src/main/java/org/koitharu/kotatsu/widget/shelf/ShelfListFactory.kt
index 2eb942ef5..58b9fef3a 100644
--- a/app/src/main/java/org/koitharu/kotatsu/widget/shelf/ShelfListFactory.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/widget/shelf/ShelfListFactory.kt
@@ -7,6 +7,7 @@ import android.widget.RemoteViewsService
 import coil.ImageLoader
 import coil.executeBlocking
 import coil.request.ImageRequest
+import coil.size.Scale
 import coil.size.Size
 import coil.transform.RoundedCornersTransformation
 import kotlinx.coroutines.runBlocking
@@ -65,6 +66,7 @@ class ShelfListFactory(
 				ImageRequest.Builder(context)
 					.data(item.coverUrl)
 					.size(coverSize)
+					.scale(Scale.FILL)
 					.transformations(transformation)
 					.build()
 			).requireBitmap()
diff --git a/app/src/main/res/layout/widget_recent.xml b/app/src/main/res/layout/widget_recent.xml
index f65032b83..e79d63786 100644
--- a/app/src/main/res/layout/widget_recent.xml
+++ b/app/src/main/res/layout/widget_recent.xml
@@ -2,7 +2,10 @@
 <FrameLayout
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="match_parent"
-	android:layout_height="match_parent">
+	android:layout_height="match_parent"
+	android:background="?android:attr/colorBackground"
+	android:padding="4dp"
+	android:theme="@style/Theme.Kotatsu.AppWidgetContainer">
 
 	<StackView
 		xmlns:tools="http://schemas.android.com/tools"
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 2d1ae4e76..ddf07925e 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -104,7 +104,7 @@
 	</style>
 
 	<style name="Theme.Kotatsu.AppWidgetContainer" parent="@style/Theme.MaterialComponents.Light">
-		<item name="android:colorBackground">@color/kotatsu_background</item>
+		<item name="android:colorBackground">@android:color/transparent</item>
 		<item name="android:panelColorBackground">@color/kotatsu_primaryContainer</item>
 	</style>
 </resources>
diff --git a/app/src/main/res/xml/widget_recent.xml b/app/src/main/res/xml/widget_recent.xml
index 7b6985481..476c83cda 100644
--- a/app/src/main/res/xml/widget_recent.xml
+++ b/app/src/main/res/xml/widget_recent.xml
@@ -1,13 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <appwidget-provider
 	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
 	android:description="@string/appwidget_recent_description"
 	android:initialLayout="@layout/widget_recent"
-	android:minWidth="110dp"
-	android:minHeight="110dp"
-	android:minResizeWidth="40dp"
+	android:minWidth="120dp"
+	android:minHeight="40dp"
+	android:minResizeWidth="120dp"
 	android:minResizeHeight="40dp"
 	android:previewImage="@drawable/ic_appwidget_recent"
 	android:resizeMode="horizontal|vertical"
+	android:targetCellWidth="2"
+	android:targetCellHeight="2"
 	android:updatePeriodMillis="0"
-	android:widgetCategory="home_screen" />
+	android:widgetCategory="home_screen"
+	tools:ignore="UnusedAttribute" />
diff --git a/app/src/main/res/xml/widget_shelf.xml b/app/src/main/res/xml/widget_shelf.xml
index b2eedc03e..c1e4879de 100644
--- a/app/src/main/res/xml/widget_shelf.xml
+++ b/app/src/main/res/xml/widget_shelf.xml
@@ -5,12 +5,14 @@
 	android:configure="org.koitharu.kotatsu.widget.shelf.ShelfConfigActivity"
 	android:description="@string/appwidget_shelf_description"
 	android:initialLayout="@layout/widget_shelf"
-	android:minWidth="110dp"
-	android:minHeight="110dp"
-	android:minResizeWidth="40dp"
+	android:minWidth="160dp"
+	android:minHeight="120dp"
+	android:minResizeWidth="120dp"
 	android:minResizeHeight="40dp"
 	android:previewImage="@drawable/ic_appwidget_shelf"
 	android:resizeMode="horizontal|vertical"
+	android:targetCellWidth="3"
+	android:targetCellHeight="2"
 	android:updatePeriodMillis="0"
 	android:widgetCategory="home_screen"
 	android:widgetFeatures="reconfigurable"