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 @@ + android:resource="@xml/app_widget_album_info" /> - - - - - - - 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(imageSize, imageSize) { - @Override - public void onResourceReady(BitmapPaletteWrapper resource, GlideAnimation 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 7ae5a4c7..00000000 Binary files a/app/src/main/res/drawable/app_widget_small.jpg and /dev/null differ 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 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 @@ + 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 @@ - -