diff --git a/app/src/main/java/org/oxycblt/auxio/widgets/WidgetProvider.kt b/app/src/main/java/org/oxycblt/auxio/widgets/WidgetProvider.kt
index e6edbdbcc..45abec297 100644
--- a/app/src/main/java/org/oxycblt/auxio/widgets/WidgetProvider.kt
+++ b/app/src/main/java/org/oxycblt/auxio/widgets/WidgetProvider.kt
@@ -30,7 +30,7 @@ import android.os.Bundle
import android.util.SizeF
import android.widget.RemoteViews
import androidx.core.graphics.drawable.toBitmap
-import coil.Coil
+import coil.imageLoader
import coil.request.ImageRequest
import coil.transform.RoundedCornersTransformation
import org.oxycblt.auxio.BuildConfig
@@ -98,6 +98,10 @@ class WidgetProvider : AppWidgetProvider() {
val coverRequest = ImageRequest.Builder(context)
.data(song.album)
.size(imageSize)
+ .target(
+ onError = { onDone(null) },
+ onSuccess = { onDone(it.toBitmap()) }
+ )
// If we are on Android 12 or higher, round out the album cover so that the widget is
// cohesive. I really don't like this, but whatever.
@@ -111,12 +115,7 @@ class WidgetProvider : AppWidgetProvider() {
coverRequest.transformations(transform)
}
- coverRequest.target(
- onError = { onDone(null) },
- onSuccess = { onDone(it.toBitmap()) }
- )
-
- Coil.imageLoader(context).enqueue(coverRequest.build())
+ context.imageLoader.enqueue(coverRequest.build())
}
/*
diff --git a/app/src/main/res/layout/widget_small.xml b/app/src/main/res/layout/widget_small.xml
index 4fcd0da5b..0c9ff799c 100644
--- a/app/src/main/res/layout/widget_small.xml
+++ b/app/src/main/res/layout/widget_small.xml
@@ -57,7 +57,6 @@
android:paddingBottom="@dimen/spacing_small"
android:paddingStart="@dimen/spacing_small"
android:paddingEnd="@dimen/spacing_small"
- android:elevation="@dimen/elevation_normal"
android:orientation="horizontal"
android:background="@drawable/ui_widget_panel"
android:layout_gravity="center">
diff --git a/app/src/main/res/layout/widget_wide.xml b/app/src/main/res/layout/widget_wide.xml
index 65b8d532b..90e5b0d13 100644
--- a/app/src/main/res/layout/widget_wide.xml
+++ b/app/src/main/res/layout/widget_wide.xml
@@ -55,7 +55,6 @@
android:layout_alignParentBottom="true"
android:layout_gravity="center"
android:background="@drawable/ui_widget_panel"
- android:elevation="@dimen/elevation_normal"
android:orientation="horizontal"
android:paddingTop="@dimen/spacing_small"
android:paddingBottom="@dimen/spacing_small"
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 2d5f82d65..a22309f0a 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -36,5 +36,5 @@
176dp
110dp
@dimen/widget_width_min
- 110dp
+ @dimen/widget_height_min
\ No newline at end of file
diff --git a/app/src/main/res/xml-v31/widget_info.xml b/app/src/main/res/xml-v31/widget_info.xml
index 71ce304c0..e618e617a 100644
--- a/app/src/main/res/xml-v31/widget_info.xml
+++ b/app/src/main/res/xml-v31/widget_info.xml
@@ -7,9 +7,9 @@
android:minResizeWidth="@dimen/widget_width_min"
android:minResizeHeight="@dimen/widget_height_min"
android:previewImage="@drawable/ui_widget_preview"
- android:previewLayout="@layout/widget_medium"
+ android:previewLayout="@layout/widget_small"
android:resizeMode="horizontal|vertical"
android:targetCellWidth="3"
- android:targetCellHeight="3"
+ android:targetCellHeight="2"
android:updatePeriodMillis="0"
android:widgetCategory="home_screen" />
\ No newline at end of file