Funkwhale
/
Audinaut-subsonic-app-android
mirror of https://github.com/nvllsvm/Audinaut
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #63 from mlim15/mediaStyle-clean 

Implement glennguy's MediaStyle notifications
This commit is contained in:
Andrew Rabert 2020-01-11 17:54:39 -05:00 committed by GitHub
parent 02a8b1909a ff4a1f3b13
commit bf9e9ad1e6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 52 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@ -35,6 +35,8 @@ dependencies {
implementation 'com.github.hannesa2:AndroidSlidingUpPanel:4.1.0' implementation 'com.github.hannesa2:AndroidSlidingUpPanel:4.1.0'
implementation 'com.squareup.okhttp3:okhttp:4.2.2' implementation 'com.squareup.okhttp3:okhttp:4.2.2'
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
implementation "androidx.media:media:1.1.0"
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
} }
buildscript { buildscript {

138
app/src/main/java/net/nullsum/audinaut/util/Notifications.java
View File

@ -23,14 +23,16 @@ import android.content.ComponentName;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.os.Build; import android.os.Build;
import android.os.Handler; import android.os.Handler;
import android.util.Log; import android.util.Log;
import android.view.KeyEvent; import android.view.KeyEvent;
import android.view.View;
import android.widget.RemoteViews;
import androidx.core.app.NotificationCompat; import androidx.core.app.NotificationCompat;
import androidx.media.app.NotificationCompat.MediaStyle;
import android.support.v4.media.session.MediaSessionCompat;
import android.support.v4.media.MediaMetadataCompat;
import net.nullsum.audinaut.R; import net.nullsum.audinaut.R;
import net.nullsum.audinaut.activity.SubsonicActivity; import net.nullsum.audinaut.activity.SubsonicActivity;
@ -67,28 +69,42 @@ public final class Notifications {
} }
final boolean playing = downloadService.getPlayerState() == PlayerState.STARTED; final boolean playing = downloadService.getPlayerState() == PlayerState.STARTED;
RemoteViews expandedContentView = new RemoteViews(context.getPackageName(), R.layout.notification_expanded);
setupViews(expandedContentView, context, song, true, playing);
RemoteViews smallContentView = new RemoteViews(context.getPackageName(), R.layout.notification);
setupViews(smallContentView, context, song, false, playing);
Intent notificationIntent = new Intent(context, SubsonicFragmentActivity.class); Intent notificationIntent = new Intent(context, SubsonicFragmentActivity.class);
notificationIntent.putExtra(Constants.INTENT_EXTRA_NAME_DOWNLOAD, true); notificationIntent.putExtra(Constants.INTENT_EXTRA_NAME_DOWNLOAD, true);
notificationIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP); notificationIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
final Notification notification = new NotificationCompat.Builder(context, CHANNEL_PLAYING_ID) Intent cancelIntent = new Intent("KEYCODE_MEDIA_STOP")
.setComponent(new ComponentName(context, DownloadService.class))
.putExtra(Intent.EXTRA_KEY_EVENT, new KeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_MEDIA_STOP));
int[] compactActions = new int[]{0, 1, 2};
MediaSessionCompat mediaSession = new MediaSessionCompat(context, "Audinaut");
MediaMetadataCompat.Builder metadataBuilder = new MediaMetadataCompat.Builder();
mediaSession.setMetadata(metadataBuilder.putLong(MediaMetadataCompat.METADATA_KEY_DURATION, -1).build());
MediaStyle mediaStyle = new MediaStyle()
.setShowActionsInCompactView(compactActions)
.setShowCancelButton(true)
.setCancelButtonIntent(PendingIntent.getService(context, 0, cancelIntent, 0))
.setMediaSession(mediaSession.getSessionToken());
NotificationCompat.Builder builder = new NotificationCompat.Builder(context, CHANNEL_PLAYING_ID)
.setChannelId(CHANNEL_PLAYING_ID) .setChannelId(CHANNEL_PLAYING_ID)
.setSmallIcon(R.drawable.stat_notify_playing) .setSmallIcon(R.drawable.stat_notify_playing)
.setContentTitle(song.getTitle()) .setContentTitle(song.getTitle())
.setContentText(song.getTitle()) .setContentText(song.getArtist())
.setSubText(song.getAlbum())
.setTicker(song.getTitle())
.setOngoing(playing) .setOngoing(playing)
.setVisibility(Notification.VISIBILITY_PUBLIC) .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
.setCustomContentView(smallContentView) .setShowWhen(false)
.setCustomBigContentView(expandedContentView) .setLargeIcon(getAlbumArt(context, song))
.setContentIntent(PendingIntent.getActivity(context, 0, notificationIntent, 0)) .setStyle(mediaStyle)
.setPriority(NotificationCompat.PRIORITY_LOW).build(); .setContentIntent(PendingIntent.getActivity(context, 0, notificationIntent, 0));
addActions(context, builder, playing);
final Notification notification = builder.build();
if(playing) {
notification.flags |= Notification.FLAG_NO_CLEAR | Notification.FLAG_ONGOING_EVENT;
}
playShowing = true; playShowing = true;
if (downloadForeground && downloadShowing) { if (downloadForeground && downloadShowing) {
@ -116,13 +132,7 @@ public final class Notifications {
AudinautWidgetProvider.notifyInstances(context, downloadService, playing); AudinautWidgetProvider.notifyInstances(context, downloadService, playing);
} }
private static void setupViews(RemoteViews rv, Context context, MusicDirectory.Entry song, boolean expanded, boolean playing) { private static Bitmap getAlbumArt(Context context, MusicDirectory.Entry song) {
// Use the same text for the ticker and the expanded notification
String title = song.getTitle();
String arist = song.getArtist();
String album = song.getAlbum();
// Set the album art.
try { try {
ImageLoader imageLoader = SubsonicActivity.getStaticImageLoader(context); ImageLoader imageLoader = SubsonicActivity.getStaticImageLoader(context);
Bitmap bitmap = null; Bitmap bitmap = null;
@ -131,90 +141,42 @@ public final class Notifications {
} }
if (bitmap == null) { if (bitmap == null) {
// set default album art // set default album art
rv.setImageViewResource(R.id.notification_image, R.drawable.unknown_album); return BitmapFactory.decodeResource(context.getResources(), R.drawable.unknown_album);
} else { } else {
imageLoader.setNowPlayingSmall(bitmap); return bitmap;
rv.setImageViewBitmap(R.id.notification_image, bitmap);
} }
} catch (Exception x) { } catch (Exception x) {
Log.w(TAG, "Failed to get notification cover art", x); Log.w(TAG, "Failed to get notification cover art", x);
rv.setImageViewResource(R.id.notification_image, R.drawable.unknown_album); return BitmapFactory.decodeResource(context.getResources(), R.drawable.unknown_album);
} }
}
// set the text for the notifications private static void addActions(final Context context, final NotificationCompat.Builder builder, final boolean playing) {
rv.setTextViewText(R.id.notification_title, title);
rv.setTextViewText(R.id.notification_artist, arist);
rv.setTextViewText(R.id.notification_album, album);
boolean persistent = Util.getPreferences(context).getBoolean(Constants.PREFERENCES_KEY_PERSISTENT_NOTIFICATION, false);
if (persistent) {
if (expanded) {
rv.setImageViewResource(R.id.control_pause, playing ? R.drawable.notification_media_pause : R.drawable.notification_media_start);
rv.setImageViewResource(R.id.control_previous, R.drawable.notification_media_backward);
rv.setImageViewResource(R.id.control_next, R.drawable.notification_media_forward);
} else {
rv.setImageViewResource(R.id.control_previous, playing ? R.drawable.notification_media_pause : R.drawable.notification_media_start);
rv.setImageViewResource(R.id.control_pause, R.drawable.notification_media_forward);
rv.setImageViewResource(R.id.control_next, R.drawable.notification_close);
}
} else {
// Necessary for switching back since it appears to re-use the same layout
rv.setImageViewResource(R.id.control_previous, R.drawable.notification_media_backward);
rv.setImageViewResource(R.id.control_pause, R.drawable.notification_media_pause);
rv.setImageViewResource(R.id.control_next, R.drawable.notification_media_forward);
}
// Create actions for media buttons
PendingIntent pendingIntent; PendingIntent pendingIntent;
int previous = 0, pause, next, close = 0;
if (persistent && !expanded) {
pause = R.id.control_previous;
next = R.id.control_pause;
close = R.id.control_next;
} else {
previous = R.id.control_previous;
pause = R.id.control_pause;
next = R.id.control_next;
}
if (persistent && close == 0 && expanded) { Intent prevIntent = new Intent("KEYCODE_MEDIA_PREVIOUS");
close = R.id.notification_close; prevIntent.setComponent(new ComponentName(context, DownloadService.class));
rv.setViewVisibility(close, View.VISIBLE); prevIntent.putExtra(Intent.EXTRA_KEY_EVENT, new KeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_MEDIA_PREVIOUS));
} pendingIntent = PendingIntent.getService(context, 0, prevIntent, 0);
builder.addAction(R.drawable.notification_media_backward, "Previous", pendingIntent);
if (previous > 0) {
Intent prevIntent = new Intent("KEYCODE_MEDIA_PREVIOUS");
prevIntent.setComponent(new ComponentName(context, DownloadService.class));
prevIntent.putExtra(Intent.EXTRA_KEY_EVENT, new KeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_MEDIA_PREVIOUS));
pendingIntent = PendingIntent.getService(context, 0, prevIntent, 0);
rv.setOnClickPendingIntent(previous, pendingIntent);
}
if (playing) { if (playing) {
Intent pauseIntent = new Intent("KEYCODE_MEDIA_PLAY_PAUSE"); Intent pauseIntent = new Intent("KEYCODE_MEDIA_PLAY_PAUSE");
pauseIntent.setComponent(new ComponentName(context, DownloadService.class)); pauseIntent.setComponent(new ComponentName(context, DownloadService.class));
pauseIntent.putExtra(Intent.EXTRA_KEY_EVENT, new KeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE)); pauseIntent.putExtra(Intent.EXTRA_KEY_EVENT, new KeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE));
pendingIntent = PendingIntent.getService(context, 0, pauseIntent, 0); pendingIntent = PendingIntent.getService(context, 0, pauseIntent, 0);
rv.setOnClickPendingIntent(pause, pendingIntent); builder.addAction(R.drawable.notification_media_pause, "Pause", pendingIntent);
} else { } else {
Intent prevIntent = new Intent("KEYCODE_MEDIA_START"); Intent playIntent = new Intent("KEYCODE_MEDIA_PLAY");
prevIntent.setComponent(new ComponentName(context, DownloadService.class)); playIntent.setComponent(new ComponentName(context, DownloadService.class));
prevIntent.putExtra(Intent.EXTRA_KEY_EVENT, new KeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_MEDIA_PLAY)); playIntent.putExtra(Intent.EXTRA_KEY_EVENT, new KeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_MEDIA_PLAY));
pendingIntent = PendingIntent.getService(context, 0, prevIntent, 0); pendingIntent = PendingIntent.getService(context, 0, playIntent, 0);
rv.setOnClickPendingIntent(pause, pendingIntent); builder.addAction(R.drawable.notification_media_start, "Play", pendingIntent);
} }
Intent nextIntent = new Intent("KEYCODE_MEDIA_NEXT"); Intent nextIntent = new Intent("KEYCODE_MEDIA_NEXT");
nextIntent.setComponent(new ComponentName(context, DownloadService.class)); nextIntent.setComponent(new ComponentName(context, DownloadService.class));
nextIntent.putExtra(Intent.EXTRA_KEY_EVENT, new KeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_MEDIA_NEXT)); nextIntent.putExtra(Intent.EXTRA_KEY_EVENT, new KeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_MEDIA_NEXT));
pendingIntent = PendingIntent.getService(context, 0, nextIntent, 0); pendingIntent = PendingIntent.getService(context, 0, nextIntent, 0);
rv.setOnClickPendingIntent(next, pendingIntent); builder.addAction(R.drawable.notification_media_forward, "Next", pendingIntent);
if (close > 0) {
Intent prevIntent = new Intent("KEYCODE_MEDIA_STOP");
prevIntent.setComponent(new ComponentName(context, DownloadService.class));
prevIntent.putExtra(Intent.EXTRA_KEY_EVENT, new KeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_MEDIA_STOP));
pendingIntent = PendingIntent.getService(context, 0, prevIntent, 0);
rv.setOnClickPendingIntent(close, pendingIntent);
}
} }
public static void hidePlayingNotification(final Context context, final DownloadService downloadService, Handler handler) { public static void hidePlayingNotification(final Context context, final DownloadService downloadService, Handler handler) {