From 6256c5acfe37d5ea7f22154c71b6c37f3ba537cd Mon Sep 17 00:00:00 2001 From: TheScarastic Date: Tue, 23 May 2023 13:56:53 +0530 Subject: [PATCH] eleven: Change artist name from root service --- build.gradle | 3 +++ .../eleven/MusicPlaybackService.java | 21 ++++++++++++------- .../eleven/appwidgets/AppWidgetLarge.java | 2 +- .../appwidgets/AppWidgetLargeAlternate.java | 2 +- .../eleven/appwidgets/AppWidgetSmall.java | 2 +- 5 files changed, 20 insertions(+), 10 deletions(-) diff --git a/build.gradle b/build.gradle index 38e3da75..2f6cc777 100644 --- a/build.gradle +++ b/build.gradle @@ -16,6 +16,7 @@ allprojects { repositories { google() mavenCentral() + maven { url 'https://gitlab.e.foundation/api/v4/groups/9/-/packages/maven'} } } @@ -143,4 +144,6 @@ dependencies { // see https://github.com/material-components/material-components-android/releases implementation "com.google.android.material:material:1.4.0" + + implementation 'foundation.e:elib:0.0.1-alpha11' } diff --git a/src/org/lineageos/eleven/MusicPlaybackService.java b/src/org/lineageos/eleven/MusicPlaybackService.java index 2355d0a0..b7156dbb 100644 --- a/src/org/lineageos/eleven/MusicPlaybackService.java +++ b/src/org/lineageos/eleven/MusicPlaybackService.java @@ -1480,7 +1480,7 @@ public class MusicPlaybackService extends Service final Intent intent = new Intent(what); intent.putExtra("id", getAudioId()); - intent.putExtra("artist", getArtistName()); + intent.putExtra("artist", getArtistName(getApplicationContext())); intent.putExtra("album", getAlbumName()); intent.putExtra("track", getTrackName()); intent.putExtra("playing", isPlaying()); @@ -1560,7 +1560,8 @@ public class MusicPlaybackService extends Service } mSession.setMetadata(new MediaMetadata.Builder() - .putString(MediaMetadata.METADATA_KEY_ARTIST, getArtistName()) + .putString(MediaMetadata.METADATA_KEY_ARTIST, + getArtistName(getApplicationContext())) .putString(MediaMetadata.METADATA_KEY_ALBUM_ARTIST, getAlbumArtistName()) .putString(MediaMetadata.METADATA_KEY_ALBUM, getAlbumName()) .putString(MediaMetadata.METADATA_KEY_TITLE, getTrackName()) @@ -1592,7 +1593,7 @@ public class MusicPlaybackService extends Service private Notification buildNotification() { final String albumName = getAlbumName(); - final String artistName = getArtistName(); + final String artistName = getArtistName(getApplicationContext()); final boolean isPlaying = isPlaying(); String text = TextUtils.isEmpty(albumName) ? artistName : artistName + " - " + albumName; @@ -2125,12 +2126,18 @@ public class MusicPlaybackService extends Service * * @return The current song artist name */ - public String getArtistName() { + public String getArtistName(Context context) { synchronized (this) { if (mCursor == null) { return null; } - return mCursor.getString(mCursor.getColumnIndexOrThrow(AudioColumns.ARTIST)); + String artistName = + mCursor.getString(mCursor.getColumnIndexOrThrow(AudioColumns.ARTIST)); + + if (artistName.equals(MediaStore.UNKNOWN_STRING)) { + artistName = context.getResources().getString(R.string.unknown_metadata); + } + return artistName; } } @@ -2826,7 +2833,7 @@ public class MusicPlaybackService extends Service */ public BitmapWithColors getAlbumArt(boolean smallBitmap) { final String albumName = getAlbumName(); - final String artistName = getArtistName(); + final String artistName = getArtistName(getApplicationContext()); final long albumId = getAlbumId(); final String key = albumName + "_" + artistName + "_" + albumId; final int targetIndex = smallBitmap ? 0 : 1; @@ -3587,7 +3594,7 @@ public class MusicPlaybackService extends Service @Override public String getArtistName() { - return mService.get().getArtistName(); + return mService.get().getArtistName(mService.get()); } @Override diff --git a/src/org/lineageos/eleven/appwidgets/AppWidgetLarge.java b/src/org/lineageos/eleven/appwidgets/AppWidgetLarge.java index 2cb27ac9..d81e3742 100644 --- a/src/org/lineageos/eleven/appwidgets/AppWidgetLarge.java +++ b/src/org/lineageos/eleven/appwidgets/AppWidgetLarge.java @@ -113,7 +113,7 @@ public class AppWidgetLarge extends AppWidgetBase { R.layout.app_widget_large); final CharSequence trackName = service.getTrackName(); - final CharSequence artistName = service.getArtistName(); + final CharSequence artistName = service.getArtistName(service); final CharSequence albumName = service.getAlbumName(); final Bitmap bitmap = service.getAlbumArt(true).getBitmap(); diff --git a/src/org/lineageos/eleven/appwidgets/AppWidgetLargeAlternate.java b/src/org/lineageos/eleven/appwidgets/AppWidgetLargeAlternate.java index 04909659..207bdcab 100644 --- a/src/org/lineageos/eleven/appwidgets/AppWidgetLargeAlternate.java +++ b/src/org/lineageos/eleven/appwidgets/AppWidgetLargeAlternate.java @@ -118,7 +118,7 @@ public class AppWidgetLargeAlternate extends AppWidgetBase { R.layout.app_widget_large_alternate); final CharSequence trackName = service.getTrackName(); - final CharSequence artistName = service.getArtistName(); + final CharSequence artistName = service.getArtistName(service); final CharSequence albumName = service.getAlbumName(); final Bitmap bitmap = service.getAlbumArt(true).getBitmap(); diff --git a/src/org/lineageos/eleven/appwidgets/AppWidgetSmall.java b/src/org/lineageos/eleven/appwidgets/AppWidgetSmall.java index 34344d54..2c2587e3 100644 --- a/src/org/lineageos/eleven/appwidgets/AppWidgetSmall.java +++ b/src/org/lineageos/eleven/appwidgets/AppWidgetSmall.java @@ -115,7 +115,7 @@ public class AppWidgetSmall extends AppWidgetBase { final CharSequence trackName = service.getTrackName(); final CharSequence albumName = service.getAlbumName(); - final CharSequence artistName = service.getArtistName(); + final CharSequence artistName = service.getArtistName(service); final Bitmap bitmap = service.getAlbumArt(true).getBitmap(); // Set the titles and artwork -- GitLab