From 52c668820d858917aadd00c874a587f67ab3f1ce Mon Sep 17 00:00:00 2001
From: dkanada <dkanada@users.noreply.github.com>
Date: Tue, 5 May 2020 17:34:12 +0900
Subject: [PATCH] remove small widget and rename some files

---
 app/src/main/AndroidManifest.xml              |  14 +-
 .../gramophone/service/MusicService.java      |   7 -
 .../gramophone/widgets/AppWidgetAlbum.java    |   4 +-
 .../gramophone/widgets/AppWidgetSmall.java    | 164 ------------------
 .../gramophone/widgets/BootReceiver.java      |   1 -
 ...pp_widget_big.jpg => app_widget_album.jpg} | Bin
 .../main/res/drawable/app_widget_small.jpg    | Bin 19596 -> 0 bytes
 ...pp_widget_big.xml => app_widget_album.xml} |   0
 app/src/main/res/layout/app_widget_small.xml  | 113 ------------
 ...big_info.xml => app_widget_album_info.xml} |   4 +-
 .../main/res/xml/app_widget_small_info.xml    |  11 --
 11 files changed, 5 insertions(+), 313 deletions(-)
 delete mode 100644 app/src/main/java/com/kabouzeid/gramophone/widgets/AppWidgetSmall.java
 rename app/src/main/res/drawable/{app_widget_big.jpg => app_widget_album.jpg} (100%)
 delete mode 100644 app/src/main/res/drawable/app_widget_small.jpg
 rename app/src/main/res/layout/{app_widget_big.xml => app_widget_album.xml} (100%)
 delete mode 100644 app/src/main/res/layout/app_widget_small.xml
 rename app/src/main/res/xml/{app_widget_big_info.xml => app_widget_album_info.xml} (80%)
 delete mode 100644 app/src/main/res/xml/app_widget_small_info.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 3e457070..7d1adc2c 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -101,7 +101,7 @@
 
             <meta-data
                 android:name="android.appwidget.provider"
-                android:resource="@xml/app_widget_big_info" />
+                android:resource="@xml/app_widget_album_info" />
         </receiver>
         <receiver
             android:name=".widgets.AppWidgetClassic"
@@ -115,18 +115,6 @@
                 android:name="android.appwidget.provider"
                 android:resource="@xml/app_widget_classic_info" />
         </receiver>
-        <receiver
-            android:name=".widgets.AppWidgetSmall"
-            android:exported="false"
-            android:label="@string/app_widget_small_name">
-            <intent-filter>
-                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
-            </intent-filter>
-
-            <meta-data
-                android:name="android.appwidget.provider"
-                android:resource="@xml/app_widget_small_info" />
-        </receiver>
         <receiver
             android:name=".widgets.AppWidgetCard"
             android:exported="false"
diff --git a/app/src/main/java/com/kabouzeid/gramophone/service/MusicService.java b/app/src/main/java/com/kabouzeid/gramophone/service/MusicService.java
index 9e00698f..fd81a1ca 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/service/MusicService.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/service/MusicService.java
@@ -44,7 +44,6 @@ import com.kabouzeid.gramophone.glide.CustomGlideRequest;
 import com.kabouzeid.gramophone.widgets.AppWidgetAlbum;
 import com.kabouzeid.gramophone.widgets.AppWidgetCard;
 import com.kabouzeid.gramophone.widgets.AppWidgetClassic;
-import com.kabouzeid.gramophone.widgets.AppWidgetSmall;
 import com.kabouzeid.gramophone.glide.BlurTransformation;
 import com.kabouzeid.gramophone.helper.ShuffleHelper;
 import com.kabouzeid.gramophone.helper.StopWatch;
@@ -123,7 +122,6 @@ public class MusicService extends Service implements SharedPreferences.OnSharedP
 
     private AppWidgetAlbum appWidgetAlbum = AppWidgetAlbum.getInstance();
     private AppWidgetClassic appWidgetClassic = AppWidgetClassic.getInstance();
-    private AppWidgetSmall appWidgetSmall = AppWidgetSmall.getInstance();
     private AppWidgetCard appWidgetCard = AppWidgetCard.getInstance();
 
     private Playback playback;
@@ -1044,7 +1042,6 @@ public class MusicService extends Service implements SharedPreferences.OnSharedP
         sendBroadcast(new Intent(what));
         appWidgetAlbum.notifyChange(this, what);
         appWidgetClassic.notifyChange(this, what);
-        appWidgetSmall.notifyChange(this, what);
         appWidgetCard.notifyChange(this, what);
     }
 
@@ -1295,10 +1292,6 @@ public class MusicService extends Service implements SharedPreferences.OnSharedP
                     appWidgetClassic.performUpdate(MusicService.this, ids);
                     break;
                 }
-                case AppWidgetSmall.NAME: {
-                    appWidgetSmall.performUpdate(MusicService.this, ids);
-                    break;
-                }
                 case AppWidgetAlbum.NAME: {
                     appWidgetAlbum.performUpdate(MusicService.this, ids);
                     break;
diff --git a/app/src/main/java/com/kabouzeid/gramophone/widgets/AppWidgetAlbum.java b/app/src/main/java/com/kabouzeid/gramophone/widgets/AppWidgetAlbum.java
index 080ee882..83968587 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/widgets/AppWidgetAlbum.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/widgets/AppWidgetAlbum.java
@@ -44,7 +44,7 @@ public class AppWidgetAlbum extends BaseAppWidget {
      * default click and hide actions if service not running.
      */
     protected void defaultAppWidget(final Context context, final int[] appWidgetIds) {
-        final RemoteViews appWidgetView = new RemoteViews(context.getPackageName(), R.layout.app_widget_big);
+        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);
@@ -60,7 +60,7 @@ public class AppWidgetAlbum extends BaseAppWidget {
      * Update all active widget instances by pushing changes
      */
     public void performUpdate(final MusicService service, final int[] appWidgetIds) {
-        final RemoteViews appWidgetView = new RemoteViews(service.getPackageName(), R.layout.app_widget_big);
+        final RemoteViews appWidgetView = new RemoteViews(service.getPackageName(), R.layout.app_widget_album);
 
         final boolean isPlaying = service.isPlaying();
         final Song song = service.getCurrentSong();
diff --git a/app/src/main/java/com/kabouzeid/gramophone/widgets/AppWidgetSmall.java b/app/src/main/java/com/kabouzeid/gramophone/widgets/AppWidgetSmall.java
deleted file mode 100644
index 02c87272..00000000
--- a/app/src/main/java/com/kabouzeid/gramophone/widgets/AppWidgetSmall.java
+++ /dev/null
@@ -1,164 +0,0 @@
-package com.kabouzeid.gramophone.widgets;
-
-import android.app.PendingIntent;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.graphics.Bitmap;
-import android.graphics.drawable.Drawable;
-import androidx.annotation.Nullable;
-import androidx.palette.graphics.Palette;
-import android.text.TextUtils;
-import android.view.View;
-import android.widget.RemoteViews;
-
-import com.bumptech.glide.Glide;
-import com.bumptech.glide.request.animation.GlideAnimation;
-import com.bumptech.glide.request.target.SimpleTarget;
-import com.bumptech.glide.request.target.Target;
-import com.kabouzeid.appthemehelper.util.MaterialValueHelper;
-import com.kabouzeid.gramophone.R;
-import com.kabouzeid.gramophone.glide.CustomGlideRequest;
-import com.kabouzeid.gramophone.glide.palette.BitmapPaletteWrapper;
-import com.kabouzeid.gramophone.model.Song;
-import com.kabouzeid.gramophone.service.MusicService;
-import com.kabouzeid.gramophone.ui.activities.MainActivity;
-import com.kabouzeid.gramophone.util.ImageUtil;
-
-public class AppWidgetSmall extends BaseAppWidget {
-    public static final String NAME = "app_widget_small";
-
-    private static AppWidgetSmall mInstance;
-    private static int imageSize = 0;
-    private static float cardRadius = 0f;
-    private Target<BitmapPaletteWrapper> target; // for cancellation
-
-    public static synchronized AppWidgetSmall getInstance() {
-        if (mInstance == null) {
-            mInstance = new AppWidgetSmall();
-        }
-        return mInstance;
-    }
-
-    /**
-     * Initialize given widgets to default state, where we launch Music on
-     * default click and hide actions if service not running.
-     */
-    protected void defaultAppWidget(final Context context, final int[] appWidgetIds) {
-        final RemoteViews appWidgetView = new RemoteViews(context.getPackageName(), R.layout.app_widget_small);
-
-        appWidgetView.setViewVisibility(R.id.media_titles, View.INVISIBLE);
-        appWidgetView.setImageViewResource(R.id.image, R.drawable.default_album_art);
-        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))));
-
-        linkButtons(context, appWidgetView);
-        pushUpdate(context, appWidgetIds, appWidgetView);
-    }
-
-    /**
-     * Update all active widget instances by pushing changes
-     */
-    public void performUpdate(final MusicService service, final int[] appWidgetIds) {
-        final RemoteViews appWidgetView = new RemoteViews(service.getPackageName(), R.layout.app_widget_small);
-
-        final boolean isPlaying = service.isPlaying();
-        final Song song = service.getCurrentSong();
-
-        // Set the titles and artwork
-        if (TextUtils.isEmpty(song.title) && TextUtils.isEmpty(song.artistName)) {
-            appWidgetView.setViewVisibility(R.id.media_titles, View.INVISIBLE);
-        } else {
-            if (TextUtils.isEmpty(song.title) || TextUtils.isEmpty(song.artistName)) {
-                appWidgetView.setTextViewText(R.id.text_separator, "");
-            } else {
-                appWidgetView.setTextViewText(R.id.text_separator, "•");
-            }
-
-            appWidgetView.setViewVisibility(R.id.media_titles, View.VISIBLE);
-            appWidgetView.setTextViewText(R.id.title, song.title);
-            appWidgetView.setTextViewText(R.id.text, song.artistName);
-        }
-
-        // Link actions buttons to intents
-        linkButtons(service, appWidgetView);
-
-        if (imageSize == 0)
-            imageSize = service.getResources().getDimensionPixelSize(R.dimen.app_widget_small_image_size);
-        if (cardRadius == 0f)
-            cardRadius = service.getResources().getDimension(R.dimen.app_widget_card_radius);
-
-        // Load the album cover async and push the update on completion
-        final Context appContext = service.getApplicationContext();
-        service.runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                if (target != null) {
-                    Glide.clear(target);
-                }
-                target = CustomGlideRequest.Builder.from(Glide.with(appContext), song.primary)
-                        .generatePalette(service).build()
-                        .centerCrop()
-                        .into(new SimpleTarget<BitmapPaletteWrapper>(imageSize, imageSize) {
-                            @Override
-                            public void onResourceReady(BitmapPaletteWrapper resource, GlideAnimation<? super BitmapPaletteWrapper> glideAnimation) {
-                                Palette palette = resource.getPalette();
-                                update(resource.getBitmap(), palette.getVibrantColor(palette.getMutedColor(MaterialValueHelper.getSecondaryTextColor(appContext, true))));
-                            }
-
-                            @Override
-                            public void onLoadFailed(Exception e, Drawable errorDrawable) {
-                                super.onLoadFailed(e, errorDrawable);
-                                update(null, MaterialValueHelper.getSecondaryTextColor(appContext, true));
-                            }
-
-                            private void update(@Nullable Bitmap bitmap, int color) {
-                                // Set correct drawable for pause state
-                                int playPauseRes = isPlaying ? R.drawable.ic_pause_white_24dp : R.drawable.ic_play_arrow_white_24dp;
-                                appWidgetView.setImageViewBitmap(R.id.button_toggle_play_pause, ImageUtil.createBitmap(ImageUtil.getTintedVectorDrawable(service, playPauseRes, color)));
-
-                                // Set prev/next button drawables
-                                appWidgetView.setImageViewBitmap(R.id.button_next, ImageUtil.createBitmap(ImageUtil.getTintedVectorDrawable(service, R.drawable.ic_skip_next_white_24dp, color)));
-                                appWidgetView.setImageViewBitmap(R.id.button_prev, ImageUtil.createBitmap(ImageUtil.getTintedVectorDrawable(service, R.drawable.ic_skip_previous_white_24dp, color)));
-
-                                final Drawable image = getAlbumArtDrawable(service.getResources(), bitmap);
-                                final Bitmap roundedBitmap = createRoundedBitmap(image, imageSize, imageSize, cardRadius, 0, 0, 0);
-                                appWidgetView.setImageViewBitmap(R.id.image, roundedBitmap);
-
-                                pushUpdate(appContext, appWidgetIds, appWidgetView);
-                            }
-                        });
-            }
-        });
-    }
-
-    /**
-     * Link up various button actions using {@link PendingIntent}.
-     */
-    private void linkButtons(final Context context, final RemoteViews views) {
-        Intent action;
-        PendingIntent pendingIntent;
-
-        final ComponentName serviceName = new ComponentName(context, MusicService.class);
-
-        // Home
-        action = new Intent(context, MainActivity.class);
-        action.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
-        pendingIntent = PendingIntent.getActivity(context, 0, action, 0);
-        views.setOnClickPendingIntent(R.id.image, pendingIntent);
-        views.setOnClickPendingIntent(R.id.media_titles, pendingIntent);
-
-        // Previous track
-        pendingIntent = buildPendingIntent(context, MusicService.ACTION_REWIND, serviceName);
-        views.setOnClickPendingIntent(R.id.button_prev, pendingIntent);
-
-        // Play and pause
-        pendingIntent = buildPendingIntent(context, MusicService.ACTION_TOGGLE_PAUSE, serviceName);
-        views.setOnClickPendingIntent(R.id.button_toggle_play_pause, pendingIntent);
-
-        // Next track
-        pendingIntent = buildPendingIntent(context, MusicService.ACTION_SKIP, serviceName);
-        views.setOnClickPendingIntent(R.id.button_next, pendingIntent);
-    }
-}
diff --git a/app/src/main/java/com/kabouzeid/gramophone/widgets/BootReceiver.java b/app/src/main/java/com/kabouzeid/gramophone/widgets/BootReceiver.java
index 0205fe26..94c60626 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/widgets/BootReceiver.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/widgets/BootReceiver.java
@@ -17,7 +17,6 @@ public class BootReceiver extends BroadcastReceiver {
         // start music service if there are any existing widgets
         if (widgetManager.getAppWidgetIds(new ComponentName(context, AppWidgetAlbum.class)).length > 0
                 || widgetManager.getAppWidgetIds(new ComponentName(context, AppWidgetClassic.class)).length > 0
-                || widgetManager.getAppWidgetIds(new ComponentName(context, AppWidgetSmall.class)).length > 0
                 || widgetManager.getAppWidgetIds(new ComponentName(context, AppWidgetCard.class)).length > 0) {
             final Intent serviceIntent = new Intent(context, MusicService.class);
 
diff --git a/app/src/main/res/drawable/app_widget_big.jpg b/app/src/main/res/drawable/app_widget_album.jpg
similarity index 100%
rename from app/src/main/res/drawable/app_widget_big.jpg
rename to app/src/main/res/drawable/app_widget_album.jpg
diff --git a/app/src/main/res/drawable/app_widget_small.jpg b/app/src/main/res/drawable/app_widget_small.jpg
deleted file mode 100644
index 7ae5a4c7157098b69817f83070a7a517c1e1e50f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 19596
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
GzX<@lDTuWI

diff --git a/app/src/main/res/layout/app_widget_big.xml b/app/src/main/res/layout/app_widget_album.xml
similarity index 100%
rename from app/src/main/res/layout/app_widget_big.xml
rename to app/src/main/res/layout/app_widget_album.xml
diff --git a/app/src/main/res/layout/app_widget_small.xml b/app/src/main/res/layout/app_widget_small.xml
deleted file mode 100644
index 4200f6a2..00000000
--- a/app/src/main/res/layout/app_widget_small.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<GridLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@drawable/card"
-    android:columnCount="2"
-    android:gravity="top"
-    android:rowCount="3">
-
-    <ImageView
-        android:id="@+id/image"
-        android:layout_width="@dimen/app_widget_small_image_size"
-        android:layout_height="@dimen/app_widget_small_image_size"
-        android:scaleType="centerInside"
-        tools:ignore="ContentDescription"
-        tools:src="@drawable/default_album_art" />
-
-    <LinearLayout
-        android:id="@+id/media_actions"
-        android:layout_gravity="fill_horizontal"
-        android:focusable="true"
-        android:gravity="center_horizontal"
-        android:layoutDirection="ltr"
-        android:orientation="horizontal">
-
-        <ImageButton
-            android:id="@+id/button_prev"
-            android:layout_width="0dp"
-            android:layout_height="@dimen/app_widget_small_button_height"
-            android:layout_weight="1"
-            android:background="@drawable/widget_selector_light"
-            tools:ignore="ContentDescription"
-            tools:src="@drawable/ic_skip_previous_white_24dp"
-            tools:tint="@color/ate_secondary_text_light" />
-
-        <ImageButton
-            android:id="@+id/button_toggle_play_pause"
-            android:layout_width="0dp"
-            android:layout_height="@dimen/app_widget_small_button_height"
-            android:layout_weight="1"
-            android:background="@drawable/widget_selector_light"
-            tools:ignore="ContentDescription"
-            tools:src="@drawable/ic_play_arrow_white_24dp"
-            tools:tint="@color/ate_secondary_text_light" />
-
-        <ImageButton
-            android:id="@+id/button_next"
-            android:layout_width="0dp"
-            android:layout_height="@dimen/app_widget_small_button_height"
-            android:layout_weight="1"
-            android:background="@drawable/widget_selector_light"
-            tools:ignore="ContentDescription"
-            tools:src="@drawable/ic_skip_next_white_24dp"
-            tools:tint="@color/ate_secondary_text_light" />
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/separator"
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:layout_columnSpan="2"
-        android:layout_gravity="fill_horizontal"
-        android:background="@color/md_divider_white"
-        tools:ignore="Orientation" />
-
-    <LinearLayout
-        android:id="@+id/media_titles"
-        android:layout_columnSpan="2"
-        android:layout_gravity="fill"
-        android:focusable="true"
-        android:gravity="center_vertical"
-        android:orientation="horizontal"
-        android:paddingLeft="8dp"
-        android:paddingRight="8dp">
-
-        <TextView
-            android:id="@+id/title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center_vertical"
-            android:singleLine="true"
-            android:textAppearance="@style/TextAppearance.AppCompat.Body2"
-            android:textColor="@color/ate_primary_text_light"
-            tools:text="Title" />
-
-        <TextView
-            android:id="@+id/text_separator"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center_vertical"
-            android:paddingLeft="4dp"
-            android:paddingRight="4dp"
-            android:singleLine="true"
-            android:textAppearance="@style/TextAppearance.AppCompat.Body1"
-            android:textColor="@color/ate_secondary_text_light"
-            tools:ignore="HardcodedText"
-            tools:text="•" />
-
-        <TextView
-            android:id="@+id/text"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center_vertical"
-            android:singleLine="true"
-            android:textAppearance="@style/TextAppearance.AppCompat.Body1"
-            android:textColor="@color/ate_secondary_text_light"
-            tools:text="Text" />
-
-    </LinearLayout>
-
-</GridLayout>
diff --git a/app/src/main/res/xml/app_widget_big_info.xml b/app/src/main/res/xml/app_widget_album_info.xml
similarity index 80%
rename from app/src/main/res/xml/app_widget_big_info.xml
rename to app/src/main/res/xml/app_widget_album_info.xml
index 9ec13e60..b56e0d27 100644
--- a/app/src/main/res/xml/app_widget_big_info.xml
+++ b/app/src/main/res/xml/app_widget_album_info.xml
@@ -1,11 +1,11 @@
 <?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:initialLayout="@layout/app_widget_big"
+    android:initialLayout="@layout/app_widget_album"
     android:minHeight="@dimen/app_widget_big_min_height"
     android:minWidth="@dimen/app_widget_big_min_width"
     android:resizeMode="horizontal|vertical"
     android:updatePeriodMillis="0"
     android:widgetCategory="keyguard|home_screen"
     tools:ignore="UnusedAttribute"
-    android:previewImage="@drawable/app_widget_big"/>
+    android:previewImage="@drawable/app_widget_album"/>
diff --git a/app/src/main/res/xml/app_widget_small_info.xml b/app/src/main/res/xml/app_widget_small_info.xml
deleted file mode 100644
index 3a178b6e..00000000
--- a/app/src/main/res/xml/app_widget_small_info.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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:initialLayout="@layout/app_widget_small"
-    android:minHeight="@dimen/app_widget_small_min_height"
-    android:minWidth="@dimen/app_widget_small_min_width"
-    android:resizeMode="horizontal|vertical"
-    android:updatePeriodMillis="0"
-    android:widgetCategory="keyguard|home_screen"
-    tools:ignore="UnusedAttribute"
-    android:previewImage="@drawable/app_widget_small"/>