Merge branch 'dev' of https://github.com/h4h13/RetroMusicPlayer into dev

Conflicts: README.md app/build.gradle app/release/output-metadata.json app/src/main/java/code/name/monkey/retromusic/Result.kt app/src/main/java/code/name/monkey/retromusic/activities/PurchaseActivity.kt app/src/main/java/code/name/monkey/retromusic/activities/SupportDevelopmentActivity.kt app/src/main/java/code/name/monkey/retromusic/deezer/DeezerApiService.kt app/src/main/java/code/name/monkey/retromusic/deezer/DeezerResponse.kt app/src/main/java/io/github/muntashirakon/music/MainModule.kt app/src/main/java/io/github/muntashirakon/music/Result.kt app/src/main/java/io/github/muntashirakon/music/activities/MainActivity.kt app/src/main/java/io/github/muntashirakon/music/activities/base/AbsMusicServiceActivity.kt app/src/main/java/io/github/muntashirakon/music/activities/base/AbsSlidingMusicPanelActivity.kt app/src/main/java/io/github/muntashirakon/music/activities/tageditor/AlbumTagEditorActivity.kt app/src/main/java/io/github/muntashirakon/music/adapter/album/HorizontalAlbumAdapter.kt app/src/main/java/io/github/muntashirakon/music/adapter/playlist/PlaylistAdapter.kt app/src/main/java/io/github/muntashirakon/music/adapter/song/OrderablePlaylistSongAdapter.kt app/src/main/java/io/github/muntashirakon/music/adapter/song/PlayingQueueAdapter.kt app/src/main/java/io/github/muntashirakon/music/deezer/DeezerApiService.kt app/src/main/java/io/github/muntashirakon/music/deezer/DeezerResponse.kt app/src/main/java/io/github/muntashirakon/music/dialogs/AddToPlaylistDialog.kt app/src/main/java/io/github/muntashirakon/music/dialogs/CreatePlaylistDialog.kt app/src/main/java/io/github/muntashirakon/music/dialogs/DeletePlaylistDialog.kt app/src/main/java/io/github/muntashirakon/music/dialogs/DeleteSongsAsyncTask.java app/src/main/java/io/github/muntashirakon/music/dialogs/DeleteSongsDialog.kt app/src/main/java/io/github/muntashirakon/music/dialogs/RemoveFromPlaylistDialog.kt app/src/main/java/io/github/muntashirakon/music/dialogs/RenamePlaylistDialog.kt app/src/main/java/io/github/muntashirakon/music/dialogs/RetroSingleCheckedListAdapter.kt app/src/main/java/io/github/muntashirakon/music/extensions/ActivityEx.kt app/src/main/java/io/github/muntashirakon/music/fragments/DetailListFragment.kt app/src/main/java/io/github/muntashirakon/music/fragments/LibraryViewModel.kt app/src/main/java/io/github/muntashirakon/music/fragments/MiniPlayerFragment.kt app/src/main/java/io/github/muntashirakon/music/fragments/albums/AlbumDetailsFragment.kt app/src/main/java/io/github/muntashirakon/music/fragments/albums/AlbumDetailsViewModel.kt app/src/main/java/io/github/muntashirakon/music/fragments/albums/AlbumsFragment.kt app/src/main/java/io/github/muntashirakon/music/fragments/artists/ArtistDetailsFragment.kt app/src/main/java/io/github/muntashirakon/music/fragments/artists/ArtistDetailsViewModel.kt app/src/main/java/io/github/muntashirakon/music/fragments/artists/ArtistsFragment.kt app/src/main/java/io/github/muntashirakon/music/fragments/base/AbsPlayerFragment.kt app/src/main/java/io/github/muntashirakon/music/fragments/genres/GenresFragment.kt app/src/main/java/io/github/muntashirakon/music/fragments/home/HomeFragment.kt app/src/main/java/io/github/muntashirakon/music/fragments/library/LibraryFragment.kt app/src/main/java/io/github/muntashirakon/music/fragments/player/classic/ClassicPlayerFragment.kt app/src/main/java/io/github/muntashirakon/music/fragments/player/fit/FitPlaybackControlsFragment.kt app/src/main/java/io/github/muntashirakon/music/fragments/player/gradient/GradientPlayerFragment.kt app/src/main/java/io/github/muntashirakon/music/fragments/playlists/PlaylistDetailsFragment.kt app/src/main/java/io/github/muntashirakon/music/fragments/playlists/PlaylistDetailsViewModel.kt app/src/main/java/io/github/muntashirakon/music/fragments/playlists/PlaylistsFragment.kt app/src/main/java/io/github/muntashirakon/music/fragments/queue/PlayingQueueFragment.kt app/src/main/java/io/github/muntashirakon/music/fragments/settings/MainSettingsFragment.kt app/src/main/java/io/github/muntashirakon/music/fragments/settings/OtherSettingsFragment.kt app/src/main/java/io/github/muntashirakon/music/fragments/songs/SongsFragment.kt app/src/main/java/io/github/muntashirakon/music/glide/artistimage/ArtistImageLoader.kt app/src/main/java/io/github/muntashirakon/music/helper/M3UWriter.kt app/src/main/java/io/github/muntashirakon/music/helper/menu/GenreMenuHelper.kt app/src/main/java/io/github/muntashirakon/music/helper/menu/PlaylistMenuHelper.kt app/src/main/java/io/github/muntashirakon/music/helper/menu/SongMenuHelper.kt app/src/main/java/io/github/muntashirakon/music/helper/menu/SongsMenuHelper.kt app/src/main/java/io/github/muntashirakon/music/model/CategoryInfo.java app/src/main/java/io/github/muntashirakon/music/model/DeezerResponse.kt app/src/main/java/io/github/muntashirakon/music/model/Home.kt app/src/main/java/io/github/muntashirakon/music/model/PlaylistSong.java app/src/main/java/io/github/muntashirakon/music/network/DeezerService.kt app/src/main/java/io/github/muntashirakon/music/network/Result.kt app/src/main/java/io/github/muntashirakon/music/network/RetrofitClient.kt app/src/main/java/io/github/muntashirakon/music/repository/GenreRepository.kt app/src/main/java/io/github/muntashirakon/music/repository/PlaylistRepository.kt app/src/main/java/io/github/muntashirakon/music/repository/PlaylistSongsLoader.kt app/src/main/java/io/github/muntashirakon/music/repository/Repository.kt app/src/main/java/io/github/muntashirakon/music/repository/SongRepository.kt app/src/main/java/io/github/muntashirakon/music/service/MusicService.java app/src/main/java/io/github/muntashirakon/music/util/AppRater.kt app/src/main/java/io/github/muntashirakon/music/util/MusicUtil.kt app/src/main/java/io/github/muntashirakon/music/util/PlaylistsUtil.java app/src/main/res/font/pacifico.xml app/src/main/res/layout/fragment_gradient_player.xml app/src/main/res/layout/fragment_library.xml app/src/main/res/layout/fragment_main.xml app/src/main/res/layout/fragment_main_settings.xml app/src/main/res/navigation/library_graph.xml app/src/main/res/navigation/main_graph.xml
2020-09-22 11:14:00 +06:00 · 2020-09-22 11:14:00 +06:00 · 6df00b3e3a
commit 6df00b3e3a
parent 3c3cbf08a9 c3ddb066b7
244 changed files with 4912 additions and 2578 deletions
--- a/app/src/main/java/io/github/muntashirakon/music/service/MediaSessionCallback.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/service/MediaSessionCallback.kt
@ -90,7 +90,7 @@ class MediaSessionCallback(
        }
    }

-    private fun checkAndStartPlaying(songs: ArrayList<Song>, itemId: Int) {
+    private fun checkAndStartPlaying(songs: ArrayList<Song>, itemId: Long) {
        var songIndex = MusicUtil.indexOfSongInList(songs, itemId)
        if (songIndex == -1) {
            songIndex = 0
--- a/app/src/main/java/io/github/muntashirakon/music/service/MusicService.java
+++ b/app/src/main/java/io/github/muntashirakon/music/service/MusicService.java
@ -84,11 +84,11 @@ import io.github.muntashirakon.music.util.MusicUtil;
 import io.github.muntashirakon.music.util.PreferenceUtil;
 import io.github.muntashirakon.music.util.RetroUtil;

-import static io.github.muntashirakon.music.ConstantsKt.ALBUM_ART_ON_LOCKSCREEN;
+import static io.github.muntashirakon.music.ConstantsKt.ALBUM_ART_ON_LOCK_SCREEN;
 import static io.github.muntashirakon.music.ConstantsKt.BLURRED_ALBUM_ART;
 import static io.github.muntashirakon.music.ConstantsKt.CLASSIC_NOTIFICATION;
 import static io.github.muntashirakon.music.ConstantsKt.COLORED_NOTIFICATION;
-import static io.github.muntashirakon.music.ConstantsKt.GAPLESS_PLAYBACK;
+import static io.github.muntashirakon.music.ConstantsKt.GAP_LESS_PLAYBACK;
 import static io.github.muntashirakon.music.ConstantsKt.TOGGLE_HEADSET;

 /**
@ -618,7 +618,7 @@ public class MusicService extends Service implements
                break;
            case SHUFFLE_MODE_NONE:
                this.shuffleMode = shuffleMode;
-                int currentSongId = Objects.requireNonNull(getCurrentSong()).getId();
+                long currentSongId = Objects.requireNonNull(getCurrentSong()).getId();
                playingQueue = new ArrayList<>(originalPlayingQueue);
                int newPosition = 0;
                if (getPlayingQueue() != null) {
@ -727,7 +727,7 @@ public class MusicService extends Service implements
    @Override
    public void onSharedPreferenceChanged(@NonNull SharedPreferences sharedPreferences, @NonNull String key) {
        switch (key) {
-            case GAPLESS_PLAYBACK:
+            case GAP_LESS_PLAYBACK:
                if (sharedPreferences.getBoolean(key, false)) {
                    prepareNext();
                } else {
@ -736,7 +736,7 @@ public class MusicService extends Service implements
                    }
                }
                break;
-            case ALBUM_ART_ON_LOCKSCREEN:
+            case ALBUM_ART_ON_LOCK_SCREEN:
            case BLURRED_ALBUM_ART:
                updateMediaSessionMetaData();
                break;
@ -1054,15 +1054,17 @@ public class MusicService extends Service implements

        final Song song = getCurrentSong();

-        intent.putExtra("id", song.getId());
-        intent.putExtra("artist", song.getArtistName());
-        intent.putExtra("album", song.getAlbumName());
-        intent.putExtra("track", song.getTitle());
-        intent.putExtra("duration", song.getDuration());
-        intent.putExtra("position", (long) getSongProgressMillis());
-        intent.putExtra("playing", isPlaying());
-        intent.putExtra("scrobbling_source", RETRO_MUSIC_PACKAGE_NAME);
-        sendStickyBroadcast(intent);
+        if (song != null) {
+            intent.putExtra("id", song.getId());
+            intent.putExtra("artist", song.getArtistName());
+            intent.putExtra("album", song.getAlbumName());
+            intent.putExtra("track", song.getTitle());
+            intent.putExtra("duration", song.getDuration());
+            intent.putExtra("position", (long) getSongProgressMillis());
+            intent.putExtra("playing", isPlaying());
+            intent.putExtra("scrobbling_source", RETRO_MUSIC_PACKAGE_NAME);
+            sendStickyBroadcast(intent);
+        }
    }

    public void toggleShuffle() {
@ -1349,7 +1351,7 @@ public class MusicService extends Service implements
                0);

        mediaSession = new MediaSessionCompat(this,
-                "M",
+                "Metro",
                mediaButtonReceiverComponentName,
                mediaButtonReceiverPendingIntent);
        MediaSessionCallback mediasessionCallback = new MediaSessionCallback(
--- a/app/src/main/java/io/github/muntashirakon/music/service/notification/PlayingNotificationImpl.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/service/notification/PlayingNotificationImpl.kt
@ -22,8 +22,8 @@ import android.graphics.BitmapFactory
 import android.graphics.Color
 import android.graphics.drawable.Drawable
 import android.os.Build
-import android.text.Html
 import androidx.core.app.NotificationCompat
+import androidx.core.text.HtmlCompat
 import androidx.media.app.NotificationCompat.MediaStyle
 import io.github.muntashirakon.music.R
 import io.github.muntashirakon.music.activities.MainActivity
@ -132,9 +132,19 @@ class PlayingNotificationImpl : PlayingNotification() {
                            .setLargeIcon(bitmapFinal)
                            .setContentIntent(clickIntent)
                            .setDeleteIntent(deleteIntent)
-                            .setContentTitle(Html.fromHtml("<b>" + song.title + "</b>"))
+                            .setContentTitle(
+                                HtmlCompat.fromHtml(
+                                    "<b>" + song.title + "</b>",
+                                    HtmlCompat.FROM_HTML_MODE_LEGACY
+                                )
+                            )
                            .setContentText(song.artistName)
-                            .setSubText(Html.fromHtml("<b>" + song.albumName + "</b>"))
+                            .setSubText(
+                                HtmlCompat.fromHtml(
+                                    "<b>" + song.albumName + "</b>",
+                                    HtmlCompat.FROM_HTML_MODE_LEGACY
+                                )
+                            )
                            .setOngoing(isPlaying)
                            .setShowWhen(false)
                            .addAction(toggleFavorite)