improve widget layouts and simplify code

app/src/main/java/com/dkanada/gramophone/widgets/AppWidgetAlbum.java

@@ -1,10 +1,12 @@
 package com.dkanada.gramophone.widgets;
 
 import android.app.PendingIntent;
+import android.appwidget.AppWidgetManager;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
 import android.graphics.Point;
 import android.graphics.drawable.Drawable;
 import android.text.TextUtils;
@@ -41,11 +43,21 @@ public class AppWidgetAlbum extends BaseAppWidget {
         return mInstance;
     }
 
+    @Override
+    public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) {
+        Point p = Util.getScreenSize(context);
+
+        imageSize = Math.min(p.x, p.y);
+        cardRadius = context.getResources().getDimension(R.dimen.app_widget_card_radius);
+
+        super.onUpdate(context, appWidgetManager, appWidgetIds);
+    }
+
     protected void defaultAppWidget(final Context context, final int[] appWidgetIds) {
         final RemoteViews appWidgetView = new RemoteViews(context.getPackageName(), R.layout.app_widget_album);
 
         appWidgetView.setViewVisibility(R.id.media_titles, View.INVISIBLE);
-        appWidgetView.setImageViewResource(R.id.image, R.drawable.default_album_art);
+        appWidgetView.setImageViewBitmap(R.id.image, createRoundedBitmap(BitmapFactory.decodeResource(context.getResources(), R.drawable.default_album_art), imageSize, imageSize, cardRadius, cardRadius, cardRadius, cardRadius));
         appWidgetView.setImageViewBitmap(R.id.button_next, ImageUtil.createBitmap(ImageUtil.getTintedVectorDrawable(context, R.drawable.ic_skip_next_white_24dp, MaterialValueHelper.getPrimaryTextColor(context, false))));
         appWidgetView.setImageViewBitmap(R.id.button_prev, ImageUtil.createBitmap(ImageUtil.getTintedVectorDrawable(context, R.drawable.ic_skip_previous_white_24dp, MaterialValueHelper.getPrimaryTextColor(context, false))));
         appWidgetView.setImageViewBitmap(R.id.button_toggle_play_pause, ImageUtil.createBitmap(ImageUtil.getTintedVectorDrawable(context, R.drawable.ic_play_arrow_white_24dp, MaterialValueHelper.getPrimaryTextColor(context, false))));
@@ -77,19 +89,20 @@ public class AppWidgetAlbum extends BaseAppWidget {
         linkButtons(service, appWidgetView);
 
         Point p = Util.getScreenSize(service);
-        final int widgetImageSize = Math.min(p.x, p.y);
+        imageSize = Math.min(p.x, p.y);
-        final Context appContext = service.getApplicationContext();
+        cardRadius = service.getResources().getDimension(R.dimen.app_widget_card_radius);
+
         service.runOnUiThread(new Runnable() {
             @Override
             public void run() {
                 if (target != null) {
-                    Glide.with(appContext).clear(target);
+                    Glide.with(service).clear(target);
                 }
 
                 target = CustomGlideRequest.Builder
-                        .from(appContext, song.primary, song.blurHash)
+                        .from(service, song.primary, song.blurHash)
                         .bitmap().build()
-                        .into(new CustomTarget<Bitmap>(widgetImageSize, widgetImageSize) {
+                        .into(new CustomTarget<Bitmap>(imageSize, imageSize) {
                             @Override
                             public void onResourceReady(@NonNull Bitmap resource, Transition<? super Bitmap> glideAnimation) {
                                 update(resource);
@@ -108,13 +121,11 @@ public class AppWidgetAlbum extends BaseAppWidget {
                             }
 
                             private void update(@Nullable Bitmap bitmap) {
-                                if (bitmap == null) {
+                                final Drawable image = getAlbumArtDrawable(service.getResources(), bitmap);
-                                    appWidgetView.setImageViewResource(R.id.image, R.drawable.default_album_art);
+                                final Bitmap roundedBitmap = createRoundedBitmap(image, imageSize, imageSize, cardRadius, cardRadius, cardRadius, cardRadius);
-                                } else {
-                                    appWidgetView.setImageViewBitmap(R.id.image, bitmap);
-                                }
 
-                                pushUpdate(appContext, appWidgetIds, appWidgetView);
+                                appWidgetView.setImageViewBitmap(R.id.image, roundedBitmap);
+                                pushUpdate(service, appWidgetIds, appWidgetView);
                             }
                         });
             }

app/src/main/java/com/dkanada/gramophone/widgets/AppWidgetCard.java

@@ -1,10 +1,12 @@
 package com.dkanada.gramophone.widgets;
 
 import android.app.PendingIntent;
+import android.appwidget.AppWidgetManager;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
 import android.graphics.drawable.Drawable;
 import android.text.TextUtils;
 import android.view.View;
@@ -33,9 +35,6 @@ public class AppWidgetCard extends BaseAppWidget {
     private static AppWidgetCard mInstance;
     private Target<BitmapPaletteWrapper> target;
 
-    private static int imageSize = 0;
-    private static float cardRadius = 0f;
-
     public static synchronized AppWidgetCard getInstance() {
         if (mInstance == null) {
             mInstance = new AppWidgetCard();
@@ -44,11 +43,19 @@ public class AppWidgetCard extends BaseAppWidget {
         return mInstance;
     }
 
+    @Override
+    public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) {
+        imageSize = context.getResources().getDimensionPixelSize(R.dimen.app_widget_card_image_size);
+        cardRadius = context.getResources().getDimension(R.dimen.app_widget_card_radius);
+
+        super.onUpdate(context, appWidgetManager, appWidgetIds);
+    }
+
     protected void defaultAppWidget(final Context context, final int[] appWidgetIds) {
         final RemoteViews appWidgetView = new RemoteViews(context.getPackageName(), R.layout.app_widget_card);
 
         appWidgetView.setViewVisibility(R.id.media_titles, View.INVISIBLE);
-        appWidgetView.setImageViewResource(R.id.image, R.drawable.default_album_art);
+        appWidgetView.setImageViewBitmap(R.id.image, createRoundedBitmap(BitmapFactory.decodeResource(context.getResources(), R.drawable.default_album_art), imageSize, imageSize, cardRadius, 0, cardRadius, 0));
         appWidgetView.setImageViewBitmap(R.id.button_next, ImageUtil.createBitmap(ImageUtil.getTintedVectorDrawable(context, R.drawable.ic_skip_next_white_24dp, MaterialValueHelper.getSecondaryTextColor(context, true))));
         appWidgetView.setImageViewBitmap(R.id.button_prev, ImageUtil.createBitmap(ImageUtil.getTintedVectorDrawable(context, R.drawable.ic_skip_previous_white_24dp, MaterialValueHelper.getSecondaryTextColor(context, true))));
         appWidgetView.setImageViewBitmap(R.id.button_toggle_play_pause, ImageUtil.createBitmap(ImageUtil.getTintedVectorDrawable(context, R.drawable.ic_play_arrow_white_24dp, MaterialValueHelper.getSecondaryTextColor(context, true))));
@@ -79,10 +86,8 @@ public class AppWidgetCard extends BaseAppWidget {
 
         linkButtons(service, appWidgetView);
 
-        if (imageSize == 0)
         imageSize = service.getResources().getDimensionPixelSize(R.dimen.app_widget_card_image_size);
-        if (cardRadius == 0f)
+        cardRadius = service.getResources().getDimension(R.dimen.app_widget_card_radius) / 2;
-            cardRadius = service.getResources().getDimension(R.dimen.app_widget_card_radius);
 
         service.runOnUiThread(new Runnable() {
             @Override

app/src/main/java/com/dkanada/gramophone/widgets/AppWidgetClassic.java

@@ -1,10 +1,12 @@
 package com.dkanada.gramophone.widgets;
 
 import android.app.PendingIntent;
+import android.appwidget.AppWidgetManager;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
 import android.graphics.drawable.Drawable;
 import android.text.TextUtils;
 import android.view.View;
@@ -33,9 +35,6 @@ public class AppWidgetClassic extends BaseAppWidget {
     private static AppWidgetClassic mInstance;
     private Target<BitmapPaletteWrapper> target;
 
-    private static int imageSize = 0;
-    private static float cardRadius = 0f;
-
     public static synchronized AppWidgetClassic getInstance() {
         if (mInstance == null) {
             mInstance = new AppWidgetClassic();
@@ -44,11 +43,19 @@ public class AppWidgetClassic extends BaseAppWidget {
         return mInstance;
     }
 
+    @Override
+    public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) {
+        imageSize = context.getResources().getDimensionPixelSize(R.dimen.app_widget_classic_image_size);
+        cardRadius = context.getResources().getDimension(R.dimen.app_widget_card_radius);
+
+        super.onUpdate(context, appWidgetManager, appWidgetIds);
+    }
+
     protected void defaultAppWidget(final Context context, final int[] appWidgetIds) {
         final RemoteViews appWidgetView = new RemoteViews(context.getPackageName(), R.layout.app_widget_classic);
 
         appWidgetView.setViewVisibility(R.id.media_titles, View.INVISIBLE);
-        appWidgetView.setImageViewResource(R.id.image, R.drawable.default_album_art);
+        appWidgetView.setImageViewBitmap(R.id.image, createRoundedBitmap(BitmapFactory.decodeResource(context.getResources(), R.drawable.default_album_art), imageSize, imageSize, cardRadius, 0, cardRadius, 0));
         appWidgetView.setImageViewBitmap(R.id.button_next, ImageUtil.createBitmap(ImageUtil.getTintedVectorDrawable(context, R.drawable.ic_skip_next_white_24dp, MaterialValueHelper.getSecondaryTextColor(context, true))));
         appWidgetView.setImageViewBitmap(R.id.button_prev, ImageUtil.createBitmap(ImageUtil.getTintedVectorDrawable(context, R.drawable.ic_skip_previous_white_24dp, MaterialValueHelper.getSecondaryTextColor(context, true))));
         appWidgetView.setImageViewBitmap(R.id.button_toggle_play_pause, ImageUtil.createBitmap(ImageUtil.getTintedVectorDrawable(context, R.drawable.ic_play_arrow_white_24dp, MaterialValueHelper.getSecondaryTextColor(context, true))));
@@ -73,39 +80,36 @@ public class AppWidgetClassic extends BaseAppWidget {
 
         linkButtons(service, appWidgetView);
 
-        if (imageSize == 0)
         imageSize = service.getResources().getDimensionPixelSize(R.dimen.app_widget_classic_image_size);
-        if (cardRadius == 0f)
         cardRadius = service.getResources().getDimension(R.dimen.app_widget_card_radius);
 
-        final Context appContext = service.getApplicationContext();
         service.runOnUiThread(new Runnable() {
             @Override
             public void run() {
                 if (target != null) {
-                    Glide.with(appContext).clear(target);
+                    Glide.with(service).clear(target);
                 }
 
                 target = CustomGlideRequest.Builder
-                        .from(appContext, song.primary, song.blurHash)
+                        .from(service, song.primary, song.blurHash)
                         .palette().build()
                         .into(new CustomTarget<BitmapPaletteWrapper>(imageSize, imageSize) {
                             @Override
                             public void onResourceReady(@NonNull BitmapPaletteWrapper resource, Transition<? super BitmapPaletteWrapper> glideAnimation) {
                                 Palette palette = resource.getPalette();
-                                update(resource.getBitmap(), palette.getVibrantColor(palette.getMutedColor(MaterialValueHelper.getSecondaryTextColor(appContext, true))));
+                                update(resource.getBitmap(), palette.getVibrantColor(palette.getMutedColor(MaterialValueHelper.getSecondaryTextColor(service, true))));
                             }
 
                             @Override
                             public void onLoadFailed(Drawable drawable) {
                                 super.onLoadFailed(drawable);
-                                update(null, MaterialValueHelper.getSecondaryTextColor(appContext, true));
+                                update(null, MaterialValueHelper.getSecondaryTextColor(service, true));
                             }
 
                             @Override
                             public void onLoadCleared(Drawable drawable) {
                                 super.onLoadFailed(drawable);
-                                update(null, MaterialValueHelper.getSecondaryTextColor(appContext, true));
+                                update(null, MaterialValueHelper.getSecondaryTextColor(service, true));
                             }
 
                             private void update(@Nullable Bitmap bitmap, int color) {
@@ -119,7 +123,7 @@ public class AppWidgetClassic extends BaseAppWidget {
                                 final Bitmap roundedBitmap = createRoundedBitmap(image, imageSize, imageSize, cardRadius, 0, cardRadius, 0);
                                 appWidgetView.setImageViewBitmap(R.id.image, roundedBitmap);
 
-                                pushUpdate(appContext, appWidgetIds, appWidgetView);
+                                pushUpdate(service, appWidgetIds, appWidgetView);
                             }
                         });
             }

app/src/main/java/com/dkanada/gramophone/widgets/BaseAppWidget.java

@@ -16,6 +16,7 @@ import android.graphics.RectF;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
+import android.util.Log;
 import android.widget.RemoteViews;
 
 import androidx.core.content.res.ResourcesCompat;
@@ -25,16 +26,25 @@ import com.dkanada.gramophone.model.Song;
 import com.dkanada.gramophone.service.MusicService;
 import com.dkanada.gramophone.util.MusicUtil;
 
+import java.util.Arrays;
+
 public abstract class BaseAppWidget extends AppWidgetProvider {
     public static final String NAME = "app_widget";
 
+    public int imageSize = 0;
+    public float cardRadius = 0f;
+
     @Override
     public void onUpdate(final Context context, final AppWidgetManager appWidgetManager, final int[] appWidgetIds) {
+        Log.d(NAME, String.format("onUpdate: %s", Arrays.toString(appWidgetIds)));
         defaultAppWidget(context, appWidgetIds);
+
         final Intent updateIntent = new Intent(MusicService.INTENT_EXTRA_WIDGET_UPDATE);
+
         updateIntent.putExtra(MusicService.INTENT_EXTRA_WIDGET_NAME, NAME);
         updateIntent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, appWidgetIds);
         updateIntent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY);
+
         context.sendBroadcast(updateIntent);
     }
 
@@ -73,25 +83,29 @@ public abstract class BaseAppWidget extends AppWidgetProvider {
         }
     }
 
-    protected static Bitmap createRoundedBitmap(Drawable drawable, int width, int height, float tl, float tr, float bl, float br) {
+    protected static Bitmap createRoundedBitmap(Bitmap bitmap, int width, int height, float tl, float tr, float bl, float br) {
-        if (drawable == null) return null;
-
-        Bitmap bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
-        Canvas c = new Canvas(bitmap);
-        drawable.setBounds(0, 0, width, height);
-        drawable.draw(c);
-
         Bitmap rounded = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
-
         Canvas canvas = new Canvas(rounded);
         Paint paint = new Paint();
+
         paint.setShader(new BitmapShader(bitmap, BitmapShader.TileMode.CLAMP, BitmapShader.TileMode.CLAMP));
         paint.setAntiAlias(true);
+
         canvas.drawPath(composeRoundedRectPath(new RectF(0, 0, width, height), tl, tr, bl, br), paint);
 
         return rounded;
     }
 
+    protected static Bitmap createRoundedBitmap(Drawable drawable, int width, int height, float tl, float tr, float bl, float br) {
+        Bitmap bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
+        Canvas canvas = new Canvas(bitmap);
+
+        drawable.setBounds(0, 0, width, height);
+        drawable.draw(canvas);
+
+        return createRoundedBitmap(bitmap, width, height, tl, tr, bl, br);
+    }
+
     protected static Path composeRoundedRectPath(RectF rect, float tl, float tr, float bl, float br) {
         Path path = new Path();
         tl = tl < 0 ? 0 : tl;

app/src/main/res/drawable/card.xml

@@ -1,45 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item>
-        <shape>
-            <padding
-                android:top="0dp"
-                android:right="0dp"
-                android:bottom="0dp"
-                android:left="0dp"/>
-            <solid android:color="@android:color/transparent"/>
-        </shape>
-    </item>
-
-    <item>
-        <shape>
-            <padding
-                android:top="0dp"
-                android:right="0dp"
-                android:bottom="1dp"
-                android:left="0dp"/>
-            <solid android:color="#55d4d4d4"/>
-            <corners android:radius="@dimen/app_widget_card_radius"/>
-        </shape>
-    </item>
-    <item>
-        <shape>
-            <padding
-                android:top="0dp"
-                android:right="0dp"
-                android:bottom="1dp"
-                android:left="0dp"/>
-            <solid android:color="#55dddddd"/>
-            <corners android:radius="@dimen/app_widget_card_radius"/>
-        </shape>
-    </item>
-
-    <item>
-        <shape>
     <solid android:color="@android:color/white"/>
     <corners android:radius="@dimen/app_widget_card_radius"/>
 </shape>
-    </item>
-
-</layer-list>

app/src/main/res/layout/app_widget_album.xml

@@ -13,6 +13,11 @@
         tools:ignore="ContentDescription"
         tools:src="@drawable/default_album_art" />
 
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="#44000000" />
+
     <LinearLayout
         android:id="@+id/media_actions"
         android:layout_width="match_parent"
@@ -21,7 +26,7 @@
         android:background="@drawable/shadow_up_strong"
         android:layoutDirection="ltr"
         android:orientation="horizontal"
-        android:padding="16dp">
+        android:padding="8dp">
 
         <ImageButton
             android:id="@+id/button_prev"
@@ -69,14 +74,15 @@
         android:layout_alignParentTop="true"
         android:background="@drawable/shadow_down_strong"
         android:orientation="vertical"
-        android:padding="16dp">
+        android:paddingHorizontal="16dp"
+        android:paddingVertical="8dp">
 
         <TextView
             android:id="@+id/title"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_weight="1"
-            android:gravity="center_vertical"
+            android:gravity="center"
             android:singleLine="true"
             android:textAppearance="@style/TextAppearance.AppCompat.Headline"
             android:textColor="@color/ate_primary_text_dark"
@@ -87,7 +93,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_weight="1"
-            android:gravity="center_vertical"
+            android:gravity="center"
             android:singleLine="true"
             android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
             android:textColor="@color/ate_secondary_text_dark"

app/src/main/res/layout/app_widget_classic.xml

@@ -14,7 +14,6 @@
         android:layout_height="match_parent"
         android:adjustViewBounds="true"
         android:scaleType="centerCrop"
-        tools:ignore="ContentDescription"
         tools:src="@drawable/default_album_art" />
 
     <RelativeLayout
@@ -67,8 +66,7 @@
             android:layout_height="wrap_content"
             android:layout_above="@+id/media_actions"
             android:layout_alignParentTop="true"
-            android:layout_marginStart="8dp"
+            android:layout_marginHorizontal="16dp"
-            android:layout_marginEnd="8dp"
             android:gravity="center"
             android:orientation="vertical">
 
@@ -76,7 +74,7 @@
                 android:id="@+id/title"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:gravity="center_vertical"
+                android:gravity="center"
                 android:singleLine="true"
                 android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
                 android:textColor="@color/ate_primary_text_light"
@@ -86,8 +84,8 @@
                 android:id="@+id/text"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:gravity="center_vertical"
+                android:gravity="center"
-                android:singleLine="true"
+                android:maxLines="2"
                 android:textAppearance="@style/TextAppearance.AppCompat.Caption"
                 android:textColor="@color/ate_secondary_text_light"
                 tools:text="Text" />

app/src/main/res/values/dimens.xml

@@ -59,7 +59,7 @@ http://developer.android.com/guide/topics/appwidgets/index.html#CreatingLayout
     <dimen name="app_widget_card_min_width">250dp</dimen>
     <dimen name="app_widget_card_min_height">40dp</dimen>
     <dimen name="app_widget_card_buttons_width">128dp</dimen>
-    <dimen name="app_widget_card_radius">2dp</dimen>
+    <dimen name="app_widget_card_radius">4dp</dimen>
 
     <dimen name="card_on_app_bar_side_padding">8dp</dimen>