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/activities/DriveModeActivity.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/activities/DriveModeActivity.kt
@ -218,7 +218,7 @@ class DriveModeActivity : AbsMusicServiceActivity(), Callback {
            .build()
            .transform(BlurTransformation.Builder(this).build())
            .into(object : RetroMusicColoredTarget(image) {
-                override fun onColorReady(color: MediaNotificationProcessor) {
+                override fun onColorReady(colors: MediaNotificationProcessor) {
                }
            })
    }
--- a/app/src/main/java/io/github/muntashirakon/music/activities/MainActivity.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/activities/MainActivity.kt
@ -3,30 +3,23 @@ package io.github.muntashirakon.music.activities
 import android.content.Intent
 import android.content.SharedPreferences
 import android.content.SharedPreferences.OnSharedPreferenceChangeListener
+import android.net.Uri
 import android.os.Bundle
 import android.provider.MediaStore
-import android.util.Log
 import android.view.View
 import androidx.lifecycle.lifecycleScope
 import io.github.muntashirakon.music.*
 import io.github.muntashirakon.music.activities.base.AbsSlidingMusicPanelActivity
 import io.github.muntashirakon.music.extensions.findNavController
-import io.github.muntashirakon.music.fragments.LibraryViewModel
-import io.github.muntashirakon.music.helper.MusicPlayerRemote.openAndShuffleQueue
-import io.github.muntashirakon.music.helper.MusicPlayerRemote.openQueue
-import io.github.muntashirakon.music.helper.MusicPlayerRemote.playFromUri
-import io.github.muntashirakon.music.helper.MusicPlayerRemote.shuffleMode
+import io.github.muntashirakon.music.helper.MusicPlayerRemote
 import io.github.muntashirakon.music.helper.SearchQueryHelper.getSongs
 import io.github.muntashirakon.music.model.Song
-import io.github.muntashirakon.music.repository.PlaylistSongsLoader.getPlaylistSongList
-import io.github.muntashirakon.music.repository.Repository
+import io.github.muntashirakon.music.repository.PlaylistSongsLoader
 import io.github.muntashirakon.music.service.MusicService
-import io.github.muntashirakon.music.util.AppRater.appLaunched
+import io.github.muntashirakon.music.util.AppRater
 import io.github.muntashirakon.music.util.PreferenceUtil
-import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Dispatchers.IO
 import kotlinx.coroutines.launch
-import org.koin.android.ext.android.inject
-import java.util.*

 class MainActivity : AbsSlidingMusicPanelActivity(), OnSharedPreferenceChangeListener {
    companion object {
@ -35,11 +28,6 @@ class MainActivity : AbsSlidingMusicPanelActivity(), OnSharedPreferenceChangeLis
        const val APP_UPDATE_REQUEST_CODE = 9002
    }

-    private val repository by inject<Repository>()
-    private val libraryViewModel by inject<LibraryViewModel>()
-
-    private var blockRequestPermissions = false
-
    override fun createContentView(): View {
        return wrapSlidingMusicPanel(R.layout.activity_main_content)
    }
@ -47,13 +35,15 @@ class MainActivity : AbsSlidingMusicPanelActivity(), OnSharedPreferenceChangeLis
    override fun onCreate(savedInstanceState: Bundle?) {
        setDrawUnderStatusBar()
        super.onCreate(savedInstanceState)
+        if (!hasPermissions()) {
+            findNavController(R.id.fragment_container).navigate(R.id.permissionFragment)
+        }
        setStatusbarColorAuto()
        setNavigationbarColorAuto()
        setLightNavigationBar(true)
        setTaskDescriptionColorAuto()
        hideStatusBar()
-        appLaunched(this)
-        addMusicServiceEventListener(libraryViewModel)
+        AppRater.appLaunched(this)
        updateTabs()
    }

@ -72,24 +62,6 @@ class MainActivity : AbsSlidingMusicPanelActivity(), OnSharedPreferenceChangeLis
        }
    }

-    override fun onDestroy() {
-        super.onDestroy()
-        PreferenceUtil.unregisterOnSharedPreferenceChangedListener(this)
-    }
-
-    override fun requestPermissions() {
-        if (!blockRequestPermissions) {
-            super.requestPermissions()
-        }
-    }
-
-    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
-        super.onActivityResult(requestCode, resultCode, data)
-        if (!hasPermissions()) {
-            requestPermissions()
-        }
-    }
-
    override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences?, key: String?) {
        if (key == GENERAL_THEME || key == BLACK_THEME || key == ADAPTIVE_COLOR_APP || key == USER_NAME || key == TOGGLE_FULL_SCREEN || key == TOGGLE_VOLUME || key == ROUND_CORNERS || key == CAROUSEL_EFFECT || key == NOW_PLAYING_SCREEN_ID || key == TOGGLE_GENRE || key == BANNER_IMAGE_PATH || key == PROFILE_IMAGE_PATH || key == CIRCULAR_ALBUM_ART || key == KEEP_SCREEN_ON || key == TOGGLE_SEPARATE_LINE || key == TOGGLE_HOME_BANNER || key == TOGGLE_ADD_CONTROLS || key == ALBUM_COVER_STYLE || key == HOME_ARTIST_GRID_STYLE || key == ALBUM_COVER_TRANSFORM || key == DESATURATED_COLOR || key == EXTRA_SONG_INFO || key == TAB_TEXT_MODE || key == LANGUAGE_NAME || key == LIBRARY_CATEGORIES
        ) {
@ -99,64 +71,71 @@ class MainActivity : AbsSlidingMusicPanelActivity(), OnSharedPreferenceChangeLis

    override fun onServiceConnected() {
        super.onServiceConnected()
-        handlePlaybackIntent(intent)
-    }
-
-    private fun handlePlaybackIntent(intent: Intent?) {
        if (intent == null) {
            return
        }
-        val uri = intent.data
-        val mimeType = intent.type
-        var handled = false
-        if (intent.action != null && (intent.action == MediaStore.INTENT_ACTION_MEDIA_PLAY_FROM_SEARCH)
-        ) {
-            val songs: List<Song> =
-                getSongs(this, intent.extras!!)
-            if (shuffleMode == MusicService.SHUFFLE_MODE_SHUFFLE) {
-                openAndShuffleQueue(songs, true)
-            } else {
-                openQueue(songs, 0, true)
-            }
-            handled = true
-        }
-        if (uri != null && uri.toString().isNotEmpty()) {
-            playFromUri(uri)
-            handled = true
-        } else if (MediaStore.Audio.Playlists.CONTENT_TYPE == mimeType) {
-            val id = parseIdFromIntent(intent, "playlistId", "playlist").toInt()
-            if (id >= 0) {
-                val position = intent.getIntExtra("position", 0)
-                val songs: List<Song> =
-                    ArrayList(getPlaylistSongList(this, id))
-                openQueue(songs, position, true)
-                handled = true
-            }
-        } else if (MediaStore.Audio.Albums.CONTENT_TYPE == mimeType) {
-            val id = parseIdFromIntent(intent, "albumId", "album").toInt()
-            if (id >= 0) {
-                lifecycleScope.launch(Dispatchers.Main) {
-                    val position = intent.getIntExtra("position", 0)
-                    openQueue(repository.albumById(id).songs!!, position, true)
-                    handled = true
-                }
-            }
-        } else if (MediaStore.Audio.Artists.CONTENT_TYPE == mimeType) {
-            val id = parseIdFromIntent(intent, "artistId", "artist").toInt()
-            if (id >= 0) {
-                lifecycleScope.launch {
-                    val position = intent.getIntExtra("position", 0)
-                    openQueue(repository.artistById(id).songs, position, true)
-                    handled = true
-                }
-            }
-        }
-        if (handled) {
-            setIntent(Intent())
-        }
+        handlePlaybackIntent(intent)
    }

-    private fun parseIdFromIntent(
+    private fun handlePlaybackIntent(intent: Intent) {
+        lifecycleScope.launch(IO) {
+            val uri: Uri? = intent.data
+            val mimeType: String? = intent.type
+            var handled = false
+            if (intent.action != null &&
+                intent.action == MediaStore.INTENT_ACTION_MEDIA_PLAY_FROM_SEARCH
+            ) {
+                val songs: List<Song> = getSongs(intent.extras!!)
+                if (MusicPlayerRemote.shuffleMode == MusicService.SHUFFLE_MODE_SHUFFLE) {
+                    MusicPlayerRemote.openAndShuffleQueue(songs, true)
+                } else {
+                    MusicPlayerRemote.openQueue(songs, 0, true)
+                }
+                handled = true
+            }
+            if (uri != null && uri.toString().isNotEmpty()) {
+                MusicPlayerRemote.playFromUri(uri)
+                handled = true
+            } else if (MediaStore.Audio.Playlists.CONTENT_TYPE == mimeType) {
+                val id = parseLongFromIntent(intent, "playlistId", "playlist")
+                if (id >= 0L) {
+                    val position: Int = intent.getIntExtra("position", 0)
+                    val songs: List<Song> =
+                        PlaylistSongsLoader.getPlaylistSongList(this@MainActivity, id)
+                    MusicPlayerRemote.openQueue(songs, position, true)
+                    handled = true
+                }
+            } else if (MediaStore.Audio.Albums.CONTENT_TYPE == mimeType) {
+                val id = parseLongFromIntent(intent, "albumId", "album")
+                if (id >= 0L) {
+                    val position: Int = intent.getIntExtra("position", 0)
+                    MusicPlayerRemote.openQueue(
+                        libraryViewModel.albumById(id).songs,
+                        position,
+                        true
+                    )
+                    handled = true
+                }
+            } else if (MediaStore.Audio.Artists.CONTENT_TYPE == mimeType) {
+                val id = parseLongFromIntent(intent, "artistId", "artist")
+                if (id >= 0L) {
+                    val position: Int = intent.getIntExtra("position", 0)
+                    MusicPlayerRemote.openQueue(
+                        libraryViewModel.artistById(id).songs,
+                        position,
+                        true
+                    )
+                    handled = true
+                }
+            }
+            if (handled) {
+                setIntent(Intent())
+            }
+        }
+
+    }
+
+    private fun parseLongFromIntent(
        intent: Intent, longKey: String,
        stringKey: String
    ): Long {
@ -167,7 +146,7 @@ class MainActivity : AbsSlidingMusicPanelActivity(), OnSharedPreferenceChangeLis
                try {
                    id = idString.toLong()
                } catch (e: NumberFormatException) {
-                    Log.e(TAG, e.message)
+                    println(e.message)
                }
            }
        }
--- a/app/src/main/java/io/github/muntashirakon/music/activities/PermissionActivity.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/activities/PermissionActivity.kt
@ -0,0 +1,63 @@
+package code.name.monkey.retromusic.activities
+
+import android.content.Intent
+import android.net.Uri
+import android.os.Bundle
+import android.provider.Settings
+import androidx.core.text.HtmlCompat
+import code.name.monkey.appthemehelper.ThemeStore
+import code.name.monkey.appthemehelper.util.VersionUtils
+import code.name.monkey.retromusic.R
+import code.name.monkey.retromusic.activities.base.AbsMusicServiceActivity
+import code.name.monkey.retromusic.extensions.accentBackgroundColor
+import code.name.monkey.retromusic.extensions.show
+import code.name.monkey.retromusic.util.RingtoneManager
+import kotlinx.android.synthetic.main.activity_permission.*
+import kotlinx.android.synthetic.main.fragment_library.appNameText
+
+
+class PermissionActivity : AbsMusicServiceActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView((R.layout.activity_permission))
+        setStatusbarColorAuto()
+        setNavigationbarColorAuto()
+        setLightNavigationBar(true)
+        setTaskDescriptionColorAuto()
+        setupTitle()
+
+        storagePermission.setButtonClick {
+            requestPermissions()
+        }
+        if (VersionUtils.hasMarshmallow()) audioPermission.show()
+        audioPermission.setButtonClick {
+            if (RingtoneManager.requiresDialog(this@PermissionActivity)) {
+                val intent = Intent(Settings.ACTION_MANAGE_WRITE_SETTINGS)
+                intent.data = Uri.parse("package:" + applicationContext.packageName)
+                startActivity(intent)
+            }
+        }
+        finish.accentBackgroundColor()
+        finish.setOnClickListener {
+            if (hasPermissions() && !RingtoneManager.requiresDialog(this)) {
+                startActivity(
+                    Intent(this, MainActivity::class.java).addFlags(
+                        Intent.FLAG_ACTIVITY_NEW_TASK or
+                                Intent.FLAG_ACTIVITY_CLEAR_TASK
+                    )
+                )
+                finish()
+            }
+        }
+    }
+
+    private fun setupTitle() {
+        val color = ThemeStore.accentColor(this)
+        val hexColor = String.format("#%06X", 0xFFFFFF and color)
+        val appName = HtmlCompat.fromHtml(
+            "Hello there! <br>Welcome to <b>Retro <span  style='color:$hexColor';>Music</span></b>",
+            HtmlCompat.FROM_HTML_MODE_COMPACT
+        )
+        appNameText.text = appName
+    }
+}
--- a/app/src/main/java/io/github/muntashirakon/music/activities/PlayingQueueActivity.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/activities/PlayingQueueActivity.kt
@ -104,7 +104,7 @@ open class PlayingQueueActivity : AbsMusicServiceActivity() {
                }
            }
        })
-        val fastScroller = ThemedFastScroller.create(recyclerView)
+        ThemedFastScroller.create(recyclerView)
    }

    private fun checkForPadding() {
--- a/app/src/main/java/io/github/muntashirakon/music/activities/base/AbsBaseActivity.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/activities/base/AbsBaseActivity.kt
@ -46,7 +46,7 @@ abstract class AbsBaseActivity : AbsThemeActivity() {
    override fun onPostCreate(savedInstanceState: Bundle?) {
        super.onPostCreate(savedInstanceState)
        if (!hasPermissions()) {
-            requestPermissions()
+            //requestPermissions()
        }
    }

--- a/app/src/main/java/io/github/muntashirakon/music/activities/base/AbsMusicServiceActivity.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/activities/base/AbsMusicServiceActivity.kt
@ -4,17 +4,23 @@ import android.Manifest
 import android.content.*
 import android.os.Bundle
 import android.os.IBinder
+import androidx.lifecycle.lifecycleScope
 import io.github.muntashirakon.music.R
+import io.github.muntashirakon.music.db.toPlayCount
 import io.github.muntashirakon.music.helper.MusicPlayerRemote
 import io.github.muntashirakon.music.interfaces.MusicServiceEventListener
+import io.github.muntashirakon.music.repository.RealRepository
 import io.github.muntashirakon.music.service.MusicService.*
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import org.koin.android.ext.android.inject
 import java.lang.ref.WeakReference
 import java.util.*

 abstract class AbsMusicServiceActivity : AbsBaseActivity(), MusicServiceEventListener {

    private val mMusicServiceEventListeners = ArrayList<MusicServiceEventListener>()
-
+    private val repository: RealRepository by inject()
    private var serviceToken: MusicPlayerRemote.ServiceToken? = null
    private var musicStateReceiver: MusicStateReceiver? = null
    private var receiverRegistered: Boolean = false
@ -93,6 +99,22 @@ abstract class AbsMusicServiceActivity : AbsBaseActivity(), MusicServiceEventLis
        for (listener in mMusicServiceEventListeners) {
            listener.onPlayingMetaChanged()
        }
+        lifecycleScope.launch(Dispatchers.IO) {
+            val entity = repository.songPresentInHistory(MusicPlayerRemote.currentSong)
+            if (entity != null) {
+                repository.updateHistorySong(MusicPlayerRemote.currentSong)
+            } else {
+                repository.addSongToHistory(MusicPlayerRemote.currentSong)
+            }
+            val songs = repository.checkSongExistInPlayCount(MusicPlayerRemote.currentSong.id)
+            if (songs.isNotEmpty()) {
+                repository.updateSongInPlayCount(songs.first().apply {
+                    playCount += 1
+                })
+            } else {
+                repository.insertSongInPlayCount(MusicPlayerRemote.currentSong.toPlayCount())
+            }
+        }
    }

    override fun onQueueChanged() {
--- a/app/src/main/java/io/github/muntashirakon/music/activities/base/AbsSlidingMusicPanelActivity.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/activities/base/AbsSlidingMusicPanelActivity.kt
@ -12,11 +12,9 @@ import androidx.core.view.isVisible
 import androidx.lifecycle.Observer
 import code.name.monkey.appthemehelper.util.ATHUtil
 import code.name.monkey.appthemehelper.util.ColorUtil
-import com.google.android.material.bottomsheet.BottomSheetBehavior
 import io.github.muntashirakon.music.R
 import io.github.muntashirakon.music.RetroBottomSheetBehavior
 import io.github.muntashirakon.music.extensions.hide
-import io.github.muntashirakon.music.extensions.show
 import io.github.muntashirakon.music.extensions.whichFragment
 import io.github.muntashirakon.music.fragments.LibraryViewModel
 import io.github.muntashirakon.music.fragments.MiniPlayerFragment
@ -26,6 +24,7 @@ import io.github.muntashirakon.music.helper.MusicPlayerRemote
 import io.github.muntashirakon.music.model.CategoryInfo
 import io.github.muntashirakon.music.util.PreferenceUtil
 import io.github.muntashirakon.music.views.BottomNavigationBarTinted
+import com.google.android.material.bottomsheet.BottomSheetBehavior
 import kotlinx.android.synthetic.main.sliding_music_panel_layout.*
 import org.koin.androidx.viewmodel.ext.android.viewModel

@ -34,7 +33,7 @@ abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity() {
        val TAG: String = AbsSlidingMusicPanelActivity::class.java.simpleName
    }

-    private val libraryViewModel by viewModel<LibraryViewModel>()
+    protected val libraryViewModel by viewModel<LibraryViewModel>()
    private lateinit var behavior: RetroBottomSheetBehavior<FrameLayout>
    private var miniPlayerFragment: MiniPlayerFragment? = null
    private var cps: NowPlayingScreen? = null
@ -51,8 +50,6 @@ abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity() {

        override fun onSlide(bottomSheet: View, slideOffset: Float) {
            setMiniPlayerAlphaProgress(slideOffset)
-            dimBackground.show()
-            dimBackground.alpha = slideOffset
        }

        override fun onStateChanged(bottomSheet: View, newState: Int) {
@ -62,7 +59,6 @@ abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity() {
                }
                BottomSheetBehavior.STATE_COLLAPSED -> {
                    onPanelCollapsed()
-                    dimBackground.hide()
                }
                else -> {

@ -77,13 +73,9 @@ abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity() {
        setContentView(createContentView())
        chooseFragmentForTheme()
        setupSlidingUpPanel()
-        addMusicServiceEventListener(libraryViewModel)

        setupBottomSheet()

-        val themeColor = ATHUtil.resolveColor(this, android.R.attr.windowBackground, Color.GRAY)
-        dimBackground.setBackgroundColor(ColorUtil.withAlpha(themeColor, 0.5f))
-
        libraryViewModel.paletteColorLiveData.observe(this, Observer {
            this.paletteColor = it
            onPaletteColorChanged()
@ -186,6 +178,7 @@ abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity() {
            behavior.isHideable = true
            behavior.peekHeight = 0
            collapsePanel()
+            ViewCompat.setElevation(slidingPanel, 0f)
            ViewCompat.setElevation(bottomNavigationView, 10f)
        } else {
            ViewCompat.setElevation(bottomNavigationView, 10f)
--- a/app/src/main/java/io/github/muntashirakon/music/activities/bugreport/model/DeviceInfo.java
+++ b/app/src/main/java/io/github/muntashirakon/music/activities/bugreport/model/DeviceInfo.java
@ -87,7 +87,7 @@ public class DeviceInfo {
        return "Device info:\n"
                + "---\n"
                + "<table>\n"
-                + "<tr><td>App version</td><td>" + versionName + "</td></tr>\n"
+                + "<tr><td><b>App version</b></td><td>" + versionName + "</td></tr>\n"
                + "<tr><td>App version code</td><td>" + versionCode + "</td></tr>\n"
                + "<tr><td>Android build version</td><td>" + buildVersion + "</td></tr>\n"
                + "<tr><td>Android release version</td><td>" + releaseVersion + "</td></tr>\n"
--- a/app/src/main/java/io/github/muntashirakon/music/activities/tageditor/AbsTagEditorActivity.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/activities/tageditor/AbsTagEditorActivity.kt
@ -14,7 +14,6 @@ import android.view.MenuItem
 import android.view.View
 import android.view.animation.OvershootInterpolator
 import androidx.appcompat.app.AlertDialog
-import androidx.lifecycle.lifecycleScope
 import code.name.monkey.appthemehelper.ThemeStore
 import code.name.monkey.appthemehelper.util.ATHUtil
 import code.name.monkey.appthemehelper.util.ColorUtil
@ -41,7 +40,7 @@ abstract class AbsTagEditorActivity : AbsBaseActivity() {
    val repository by inject<Repository>()

    lateinit var saveFab: MaterialButton
-    protected var id: Int = 0
+    protected var id: Long = 0
        private set
    private var paletteColorPrimary: Int = 0
    private var isInNoImageMode: Boolean = false
@ -182,11 +181,9 @@ abstract class AbsTagEditorActivity : AbsBaseActivity() {
        saveFab = findViewById(R.id.saveTags)
        getIntentExtras()

-        lifecycleScope.launchWhenCreated {
-            songPaths = getSongPaths()
-            if (songPaths!!.isEmpty()) {
-                finish()
-            }
+        songPaths = getSongPaths()
+        if (songPaths!!.isEmpty()) {
+            finish()
        }
        setUpViews()
    }
@ -254,11 +251,11 @@ abstract class AbsTagEditorActivity : AbsBaseActivity() {
    private fun getIntentExtras() {
        val intentExtras = intent.extras
        if (intentExtras != null) {
-            id = intentExtras.getInt(EXTRA_ID)
+            id = intentExtras.getLong(EXTRA_ID)
        }
    }

-    protected abstract suspend fun getSongPaths(): List<String>
+    protected abstract fun getSongPaths(): List<String>

    protected fun searchWebFor(vararg keys: String) {
        val stringBuilder = StringBuilder()
@ -399,7 +396,7 @@ abstract class AbsTagEditorActivity : AbsBaseActivity() {
        }
    }

-    class ArtworkInfo constructor(val albumId: Int, val artwork: Bitmap?)
+    class ArtworkInfo constructor(val albumId: Long, val artwork: Bitmap?)

    companion object {

--- a/app/src/main/java/io/github/muntashirakon/music/activities/tageditor/AlbumTagEditorActivity.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/activities/tageditor/AlbumTagEditorActivity.kt
@ -14,17 +14,18 @@ import android.transition.Slide
 import android.widget.Toast
 import code.name.monkey.appthemehelper.util.ATHUtil
 import code.name.monkey.appthemehelper.util.MaterialUtil
-import com.bumptech.glide.Glide
-import com.bumptech.glide.load.engine.DiskCacheStrategy
-import com.bumptech.glide.request.animation.GlideAnimation
-import com.bumptech.glide.request.target.SimpleTarget
 import io.github.muntashirakon.music.R
 import io.github.muntashirakon.music.extensions.appHandleColor
 import io.github.muntashirakon.music.glide.palette.BitmapPaletteTranscoder
 import io.github.muntashirakon.music.glide.palette.BitmapPaletteWrapper
+import io.github.muntashirakon.music.model.Song
 import io.github.muntashirakon.music.util.ImageUtil
 import io.github.muntashirakon.music.util.RetroColorUtil.generatePalette
 import io.github.muntashirakon.music.util.RetroColorUtil.getColor
+import com.bumptech.glide.Glide
+import com.bumptech.glide.load.engine.DiskCacheStrategy
+import com.bumptech.glide.request.animation.GlideAnimation
+import com.bumptech.glide.request.target.SimpleTarget
 import kotlinx.android.synthetic.main.activity_album_tag_editor.*
 import org.jaudiotagger.tag.FieldKey
 import java.util.*
@ -44,9 +45,9 @@ class AlbumTagEditorActivity : AbsTagEditorActivity(), TextWatcher {
        window.enterTransition = slide
    }

-    override fun loadImageFromFile(selectedFileUri: Uri?) {
+    override fun loadImageFromFile(selectedFile: Uri?) {

-        Glide.with(this@AlbumTagEditorActivity).load(selectedFileUri).asBitmap()
+        Glide.with(this@AlbumTagEditorActivity).load(selectedFile).asBitmap()
            .transcode(BitmapPaletteTranscoder(this), BitmapPaletteWrapper::class.java)
            .diskCacheStrategy(DiskCacheStrategy.NONE).skipMemoryCache(true)
            .into(object : SimpleTarget<BitmapPaletteWrapper>() {
@ -167,13 +168,9 @@ class AlbumTagEditorActivity : AbsTagEditorActivity(), TextWatcher {
        )
    }

-    override suspend fun getSongPaths(): List<String> {
-        val songs = repository.albumById(id).songs
-        val paths = ArrayList<String>(songs!!.size)
-        for (song in songs) {
-            paths.add(song.data)
-        }
-        return paths
+    override fun getSongPaths(): List<String> {
+        return repository.albumById(id).songs
+            .map(Song::data)
    }

    override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) {
--- a/app/src/main/java/io/github/muntashirakon/music/activities/tageditor/SongTagEditorActivity.kt
+++ b/app/src/main/java/io/github/muntashirakon/music/activities/tageditor/SongTagEditorActivity.kt
@ -88,7 +88,7 @@ class SongTagEditorActivity : AbsTagEditorActivity(), TextWatcher {
        writeValuesToFiles(fieldKeyValueMap, null)
    }

-    override suspend fun getSongPaths(): List<String> {
+    override fun getSongPaths(): List<String> {
        val paths = ArrayList<String>(1)
        paths.add(songRepository.song(id).data)
        return paths