From 1ebd9bea70a557f3b9acb5261ea876ea6c36bf4b Mon Sep 17 00:00:00 2001 From: dkanada Date: Tue, 5 May 2020 17:26:38 +0900 Subject: [PATCH] update widget names --- app/src/main/AndroidManifest.xml | 2 +- .../kabouzeid/gramophone/service/MusicService.java | 10 +++++----- .../{AppWidgetBig.java => AppWidgetAlbum.java} | 13 +++++++------ .../kabouzeid/gramophone/widgets/AppWidgetCard.java | 3 ++- .../gramophone/widgets/AppWidgetClassic.java | 3 ++- .../kabouzeid/gramophone/widgets/BootReceiver.java | 4 ++-- app/src/main/res/values/strings.xml | 8 ++++---- 7 files changed, 23 insertions(+), 20 deletions(-) rename app/src/main/java/com/kabouzeid/gramophone/widgets/{AppWidgetBig.java => AppWidgetAlbum.java} (95%) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1a7a01d9..3e457070 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -92,7 +92,7 @@ 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 1f54a148..9e00698f 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/service/MusicService.java +++ b/app/src/main/java/com/kabouzeid/gramophone/service/MusicService.java @@ -41,7 +41,7 @@ import com.bumptech.glide.request.animation.GlideAnimation; import com.bumptech.glide.request.target.SimpleTarget; import com.kabouzeid.gramophone.R; import com.kabouzeid.gramophone.glide.CustomGlideRequest; -import com.kabouzeid.gramophone.widgets.AppWidgetBig; +import com.kabouzeid.gramophone.widgets.AppWidgetAlbum; import com.kabouzeid.gramophone.widgets.AppWidgetCard; import com.kabouzeid.gramophone.widgets.AppWidgetClassic; import com.kabouzeid.gramophone.widgets.AppWidgetSmall; @@ -121,7 +121,7 @@ public class MusicService extends Service implements SharedPreferences.OnSharedP public boolean pendingQuit = false; - private AppWidgetBig appWidgetBig = AppWidgetBig.getInstance(); + private AppWidgetAlbum appWidgetAlbum = AppWidgetAlbum.getInstance(); private AppWidgetClassic appWidgetClassic = AppWidgetClassic.getInstance(); private AppWidgetSmall appWidgetSmall = AppWidgetSmall.getInstance(); private AppWidgetCard appWidgetCard = AppWidgetCard.getInstance(); @@ -1042,7 +1042,7 @@ public class MusicService extends Service implements SharedPreferences.OnSharedP private void sendChangeInternal(final String what) { sendBroadcast(new Intent(what)); - appWidgetBig.notifyChange(this, what); + appWidgetAlbum.notifyChange(this, what); appWidgetClassic.notifyChange(this, what); appWidgetSmall.notifyChange(this, what); appWidgetCard.notifyChange(this, what); @@ -1299,8 +1299,8 @@ public class MusicService extends Service implements SharedPreferences.OnSharedP appWidgetSmall.performUpdate(MusicService.this, ids); break; } - case AppWidgetBig.NAME: { - appWidgetBig.performUpdate(MusicService.this, ids); + case AppWidgetAlbum.NAME: { + appWidgetAlbum.performUpdate(MusicService.this, ids); break; } case AppWidgetCard.NAME: { diff --git a/app/src/main/java/com/kabouzeid/gramophone/widgets/AppWidgetBig.java b/app/src/main/java/com/kabouzeid/gramophone/widgets/AppWidgetAlbum.java similarity index 95% rename from app/src/main/java/com/kabouzeid/gramophone/widgets/AppWidgetBig.java rename to app/src/main/java/com/kabouzeid/gramophone/widgets/AppWidgetAlbum.java index 193d03df..080ee882 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/widgets/AppWidgetBig.java +++ b/app/src/main/java/com/kabouzeid/gramophone/widgets/AppWidgetAlbum.java @@ -25,16 +25,17 @@ import com.kabouzeid.gramophone.ui.activities.MainActivity; import com.kabouzeid.gramophone.util.ImageUtil; import com.kabouzeid.gramophone.util.Util; -public class AppWidgetBig extends BaseAppWidget { - public static final String NAME = "app_widget_big"; +public class AppWidgetAlbum extends BaseAppWidget { + public static final String NAME = "app_widget_album"; - private static AppWidgetBig mInstance; - private Target target; // for cancellation + private static AppWidgetAlbum mInstance; + private Target target; - public static synchronized AppWidgetBig getInstance() { + public static synchronized AppWidgetAlbum getInstance() { if (mInstance == null) { - mInstance = new AppWidgetBig(); + mInstance = new AppWidgetAlbum(); } + return mInstance; } diff --git a/app/src/main/java/com/kabouzeid/gramophone/widgets/AppWidgetCard.java b/app/src/main/java/com/kabouzeid/gramophone/widgets/AppWidgetCard.java index db425f7a..bf148a03 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/widgets/AppWidgetCard.java +++ b/app/src/main/java/com/kabouzeid/gramophone/widgets/AppWidgetCard.java @@ -31,12 +31,13 @@ public class AppWidgetCard extends BaseAppWidget { private static AppWidgetCard mInstance; private static int imageSize = 0; private static float cardRadius = 0f; - private Target target; // for cancellation + private Target target; public static synchronized AppWidgetCard getInstance() { if (mInstance == null) { mInstance = new AppWidgetCard(); } + return mInstance; } diff --git a/app/src/main/java/com/kabouzeid/gramophone/widgets/AppWidgetClassic.java b/app/src/main/java/com/kabouzeid/gramophone/widgets/AppWidgetClassic.java index d98e29cb..83028dd6 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/widgets/AppWidgetClassic.java +++ b/app/src/main/java/com/kabouzeid/gramophone/widgets/AppWidgetClassic.java @@ -31,12 +31,13 @@ public class AppWidgetClassic extends BaseAppWidget { private static AppWidgetClassic mInstance; private static int imageSize = 0; private static float cardRadius = 0f; - private Target target; // for cancellation + private Target target; public static synchronized AppWidgetClassic getInstance() { if (mInstance == null) { mInstance = new AppWidgetClassic(); } + return mInstance; } 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 1aa4c51c..0205fe26 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/widgets/BootReceiver.java +++ b/app/src/main/java/com/kabouzeid/gramophone/widgets/BootReceiver.java @@ -15,13 +15,13 @@ public class BootReceiver extends BroadcastReceiver { final AppWidgetManager widgetManager = AppWidgetManager.getInstance(context); // start music service if there are any existing widgets - if (widgetManager.getAppWidgetIds(new ComponentName(context, AppWidgetBig.class)).length > 0 + 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); - // not allowed on Oreo + // not allowed on oreo if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) { context.startService(serviceIntent); } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 86999606..75d48202 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -190,10 +190,10 @@ Failed to save playlist (%s). Saved %1$d playlists to %2$s. Saved %1$d playlists to %2$s, failed to save %3$d. - Phonograph - Big - Phonograph - Classic - Phonograph - Small - Phonograph - Card + Phonograph Album + Phonograph Classic + Phonograph Small + Phonograph Card Login Logout Username