diff --git a/app/build.gradle b/app/build.gradle index 7992010c4..4258c8d61 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -3,6 +3,7 @@ apply plugin: 'kotlin-android' apply plugin: 'kotlin-kapt' apply plugin: "androidx.navigation.safeargs.kotlin" apply plugin: 'kotlin-parcelize' +apply plugin: 'com.google.devtools.ksp' android { compileSdk 33 @@ -123,7 +124,7 @@ dependencies { def room_version = '2.5.0' implementation "androidx.room:room-runtime:$room_version" implementation "androidx.room:room-ktx:$room_version" - kapt "androidx.room:room-compiler:$room_version" + ksp "androidx.room:room-compiler:$room_version" implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version" implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version" @@ -156,7 +157,7 @@ dependencies { def glide_version = '4.15.0' implementation "com.github.bumptech.glide:glide:$glide_version" - kapt "com.github.bumptech.glide:compiler:$glide_version" + ksp "com.github.bumptech.glide:ksp:$glide_version" implementation "com.github.bumptech.glide:okhttp3-integration:$glide_version" implementation 'com.h6ah4i.android.widget.advrecyclerview:advrecyclerview:1.0.0' diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/DriveModeActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/DriveModeActivity.kt index 9c6178aaf..af3890d22 100644 --- a/app/src/main/java/code/name/monkey/retromusic/activities/DriveModeActivity.kt +++ b/app/src/main/java/code/name/monkey/retromusic/activities/DriveModeActivity.kt @@ -26,8 +26,8 @@ import code.name.monkey.retromusic.db.toSongEntity import code.name.monkey.retromusic.extensions.accentColor import code.name.monkey.retromusic.extensions.drawAboveSystemBars import code.name.monkey.retromusic.glide.BlurTransformation -import code.name.monkey.retromusic.glide.GlideApp import code.name.monkey.retromusic.glide.RetroGlideExtension +import code.name.monkey.retromusic.glide.RetroGlideExtension.songCoverOptions import code.name.monkey.retromusic.helper.MusicPlayerRemote import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper.Callback @@ -36,6 +36,7 @@ import code.name.monkey.retromusic.model.Song import code.name.monkey.retromusic.repository.RealRepository import code.name.monkey.retromusic.service.MusicService import code.name.monkey.retromusic.util.MusicUtil +import com.bumptech.glide.Glide import com.google.android.material.slider.Slider import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch @@ -64,7 +65,7 @@ class DriveModeActivity : AbsMusicServiceActivity(), Callback { progressViewUpdateHelper = MusicProgressViewUpdateHelper(this) lastPlaybackControlsColor = accentColor() binding.close.setOnClickListener { - onBackPressed() + onBackPressedDispatcher.onBackPressed() } binding.repeatButton.drawAboveSystemBars() } @@ -185,6 +186,7 @@ class DriveModeActivity : AbsMusicServiceActivity(), Callback { lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN ) + else -> binding.shuffleButton.setColorFilter( lastDisabledPlaybackControlsColor, PorterDuff.Mode.SRC_IN @@ -201,6 +203,7 @@ class DriveModeActivity : AbsMusicServiceActivity(), Callback { PorterDuff.Mode.SRC_IN ) } + MusicService.REPEAT_MODE_ALL -> { binding.repeatButton.setImageResource(R.drawable.ic_repeat) binding.repeatButton.setColorFilter( @@ -208,6 +211,7 @@ class DriveModeActivity : AbsMusicServiceActivity(), Callback { PorterDuff.Mode.SRC_IN ) } + MusicService.REPEAT_MODE_THIS -> { binding.repeatButton.setImageResource(R.drawable.ic_repeat_one) binding.repeatButton.setColorFilter( @@ -235,7 +239,7 @@ class DriveModeActivity : AbsMusicServiceActivity(), Callback { binding.songTitle.text = song.title binding.songText.text = song.artistName - GlideApp.with(this) + Glide.with(this) .load(RetroGlideExtension.getSongModel(song)) .songCoverOptions(song) .transform(BlurTransformation.Builder(this).build()) diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/LicenseActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/LicenseActivity.kt index 755793938..e41352dae 100644 --- a/app/src/main/java/code/name/monkey/retromusic/activities/LicenseActivity.kt +++ b/app/src/main/java/code/name/monkey/retromusic/activities/LicenseActivity.kt @@ -77,7 +77,7 @@ class LicenseActivity : AbsThemeActivity() { override fun onOptionsItemSelected(item: MenuItem): Boolean { if (item.itemId == android.R.id.home) { - onBackPressed() + onBackPressedDispatcher.onBackPressed() return true } return super.onOptionsItemSelected(item) diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/LockScreenActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/LockScreenActivity.kt index b4e86ab87..3ac219871 100644 --- a/app/src/main/java/code/name/monkey/retromusic/activities/LockScreenActivity.kt +++ b/app/src/main/java/code/name/monkey/retromusic/activities/LockScreenActivity.kt @@ -26,11 +26,13 @@ import code.name.monkey.retromusic.extensions.hideStatusBar import code.name.monkey.retromusic.extensions.setTaskDescriptionColorAuto import code.name.monkey.retromusic.extensions.whichFragment import code.name.monkey.retromusic.fragments.player.lockscreen.LockScreenControlsFragment -import code.name.monkey.retromusic.glide.GlideApp import code.name.monkey.retromusic.glide.RetroGlideExtension +import code.name.monkey.retromusic.glide.RetroGlideExtension.asBitmapPalette +import code.name.monkey.retromusic.glide.RetroGlideExtension.songCoverOptions import code.name.monkey.retromusic.glide.RetroMusicColoredTarget import code.name.monkey.retromusic.helper.MusicPlayerRemote import code.name.monkey.retromusic.util.color.MediaNotificationProcessor +import com.bumptech.glide.Glide import com.r0adkll.slidr.Slidr import com.r0adkll.slidr.model.SlidrConfig import com.r0adkll.slidr.model.SlidrListener @@ -88,7 +90,7 @@ class LockScreenActivity : AbsMusicServiceActivity() { } else { window.addFlags( WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED - // or WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON + // or WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON ) } } @@ -105,7 +107,7 @@ class LockScreenActivity : AbsMusicServiceActivity() { private fun updateSongs() { val song = MusicPlayerRemote.currentSong - GlideApp.with(this) + Glide.with(this) .asBitmapPalette() .songCoverOptions(song) .load(RetroGlideExtension.getSongModel(song)) diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/PermissionActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/PermissionActivity.kt index 8e32a859a..da88b2a90 100644 --- a/app/src/main/java/code/name/monkey/retromusic/activities/PermissionActivity.kt +++ b/app/src/main/java/code/name/monkey/retromusic/activities/PermissionActivity.kt @@ -22,6 +22,7 @@ import android.content.res.ColorStateList import android.os.Build import android.os.Bundle import android.provider.Settings +import androidx.activity.OnBackPressedCallback import androidx.annotation.RequiresApi import androidx.core.app.ActivityCompat import androidx.core.net.toUri @@ -61,9 +62,11 @@ class PermissionActivity : AbsMusicServiceActivity() { if (VersionUtils.hasS()) { binding.bluetoothPermission.show() binding.bluetoothPermission.setButtonClick { - ActivityCompat.requestPermissions(this, + ActivityCompat.requestPermissions( + this, arrayOf(BLUETOOTH_CONNECT), - BLUETOOTH_PERMISSION_REQUEST) + BLUETOOTH_PERMISSION_REQUEST + ) } } else { binding.audioPermission.setNumber("2") @@ -81,14 +84,22 @@ class PermissionActivity : AbsMusicServiceActivity() { finish() } } + onBackPressedDispatcher.addCallback(object : OnBackPressedCallback(true) { + override fun handleOnBackPressed() { + finishAffinity() + remove() + } + }) } private fun setupTitle() { val color = accentColor() val hexColor = String.format("#%06X", 0xFFFFFF and color) val appName = - getString(R.string.message_welcome, - "Retro Music") + getString( + R.string.message_welcome, + "Retro Music" + ) .parseAsHtml() binding.appNameText.text = appName } @@ -118,23 +129,22 @@ class PermissionActivity : AbsMusicServiceActivity() { } private fun hasStoragePermission(): Boolean { - return ActivityCompat.checkSelfPermission(this, - Manifest.permission.READ_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED + return ActivityCompat.checkSelfPermission( + this, + Manifest.permission.READ_EXTERNAL_STORAGE + ) == PackageManager.PERMISSION_GRANTED } @RequiresApi(Build.VERSION_CODES.S) private fun hasBluetoothPermission(): Boolean { - return ActivityCompat.checkSelfPermission(this, - BLUETOOTH_CONNECT) == PackageManager.PERMISSION_GRANTED + return ActivityCompat.checkSelfPermission( + this, + BLUETOOTH_CONNECT + ) == PackageManager.PERMISSION_GRANTED } @RequiresApi(Build.VERSION_CODES.M) private fun hasAudioPermission(): Boolean { return Settings.System.canWrite(this) } - - override fun onBackPressed() { - super.onBackPressed() - finishAffinity() - } } diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/ShareInstagramStory.kt b/app/src/main/java/code/name/monkey/retromusic/activities/ShareInstagramStory.kt index 444749211..f232c6d2e 100644 --- a/app/src/main/java/code/name/monkey/retromusic/activities/ShareInstagramStory.kt +++ b/app/src/main/java/code/name/monkey/retromusic/activities/ShareInstagramStory.kt @@ -30,12 +30,14 @@ import code.name.monkey.retromusic.databinding.ActivityShareInstagramBinding import code.name.monkey.retromusic.extensions.accentColor import code.name.monkey.retromusic.extensions.setLightStatusBar import code.name.monkey.retromusic.extensions.setStatusBarColor -import code.name.monkey.retromusic.glide.GlideApp import code.name.monkey.retromusic.glide.RetroGlideExtension +import code.name.monkey.retromusic.glide.RetroGlideExtension.asBitmapPalette +import code.name.monkey.retromusic.glide.RetroGlideExtension.songCoverOptions import code.name.monkey.retromusic.glide.RetroMusicColoredTarget import code.name.monkey.retromusic.model.Song import code.name.monkey.retromusic.util.Share import code.name.monkey.retromusic.util.color.MediaNotificationProcessor +import com.bumptech.glide.Glide /** * Created by hemanths on 2020-02-02. @@ -51,7 +53,7 @@ class ShareInstagramStory : AbsThemeActivity() { override fun onOptionsItemSelected(item: MenuItem): Boolean { if (item.itemId == android.R.id.home) { - onBackPressed() + onBackPressedDispatcher.onBackPressed() return true } return super.onOptionsItemSelected(item) @@ -68,7 +70,7 @@ class ShareInstagramStory : AbsThemeActivity() { val song = intent.extras?.getParcelable(EXTRA_SONG) song?.let { songFinal -> - GlideApp.with(this) + Glide.with(this) .asBitmapPalette() .songCoverOptions(songFinal) .load(RetroGlideExtension.getSongModel(songFinal)) diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/SupportDevelopmentActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/SupportDevelopmentActivity.kt index 495e56f25..546f087f3 100644 --- a/app/src/main/java/code/name/monkey/retromusic/activities/SupportDevelopmentActivity.kt +++ b/app/src/main/java/code/name/monkey/retromusic/activities/SupportDevelopmentActivity.kt @@ -30,7 +30,7 @@ class SupportDevelopmentActivity : AbsThemeActivity() { lateinit var binding: ActivityDonationBinding override fun onOptionsItemSelected(item: MenuItem): Boolean { if (item.itemId == android.R.id.home) { - onBackPressed() + onBackPressedDispatcher.onBackPressed() return true } return super.onOptionsItemSelected(item) diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/WhatsNewFragment.kt b/app/src/main/java/code/name/monkey/retromusic/activities/WhatsNewFragment.kt index dd0f50821..cc5f663cc 100644 --- a/app/src/main/java/code/name/monkey/retromusic/activities/WhatsNewFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/activities/WhatsNewFragment.kt @@ -22,7 +22,7 @@ import code.name.monkey.retromusic.extensions.openUrl import code.name.monkey.retromusic.util.PreferenceUtil.lastVersion import com.google.android.material.bottomsheet.BottomSheetDialogFragment import java.nio.charset.StandardCharsets -import java.util.* +import java.util.Locale class WhatsNewFragment : BottomSheetDialogFragment() { private var _binding: FragmentWhatsNewBinding? = null @@ -41,7 +41,7 @@ class WhatsNewFragment : BottomSheetDialogFragment() { super.onViewCreated(view, savedInstanceState) try { val buf = StringBuilder() - val stream= requireContext().assets.open("retro-changelog.html") + val stream = requireContext().assets.open("retro-changelog.html") stream.reader(StandardCharsets.UTF_8).buffered().use { br -> var str: String? while (br.readLine().also { str = it } != null) { diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsSlidingMusicPanelActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsSlidingMusicPanelActivity.kt index ab31dd814..41f0fa720 100644 --- a/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsSlidingMusicPanelActivity.kt +++ b/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsSlidingMusicPanelActivity.kt @@ -33,10 +33,44 @@ import androidx.core.view.isVisible import androidx.core.view.updateLayoutParams import androidx.fragment.app.commit import code.name.monkey.appthemehelper.util.VersionUtils -import code.name.monkey.retromusic.* +import code.name.monkey.retromusic.ADAPTIVE_COLOR_APP +import code.name.monkey.retromusic.ALBUM_COVER_STYLE +import code.name.monkey.retromusic.ALBUM_COVER_TRANSFORM +import code.name.monkey.retromusic.CAROUSEL_EFFECT +import code.name.monkey.retromusic.CIRCLE_PLAY_BUTTON +import code.name.monkey.retromusic.EXTRA_SONG_INFO +import code.name.monkey.retromusic.KEEP_SCREEN_ON +import code.name.monkey.retromusic.LIBRARY_CATEGORIES +import code.name.monkey.retromusic.NOW_PLAYING_SCREEN_ID +import code.name.monkey.retromusic.R +import code.name.monkey.retromusic.SCREEN_ON_LYRICS +import code.name.monkey.retromusic.SWIPE_ANYWHERE_NOW_PLAYING +import code.name.monkey.retromusic.SWIPE_DOWN_DISMISS +import code.name.monkey.retromusic.TAB_TEXT_MODE +import code.name.monkey.retromusic.TOGGLE_ADD_CONTROLS +import code.name.monkey.retromusic.TOGGLE_FULL_SCREEN +import code.name.monkey.retromusic.TOGGLE_VOLUME import code.name.monkey.retromusic.activities.PermissionActivity import code.name.monkey.retromusic.databinding.SlidingMusicPanelLayoutBinding -import code.name.monkey.retromusic.extensions.* +import code.name.monkey.retromusic.extensions.currentFragment +import code.name.monkey.retromusic.extensions.darkAccentColor +import code.name.monkey.retromusic.extensions.dip +import code.name.monkey.retromusic.extensions.getBottomInsets +import code.name.monkey.retromusic.extensions.hide +import code.name.monkey.retromusic.extensions.isColorLight +import code.name.monkey.retromusic.extensions.isLandscape +import code.name.monkey.retromusic.extensions.keepScreenOn +import code.name.monkey.retromusic.extensions.maybeSetScreenOn +import code.name.monkey.retromusic.extensions.peekHeightAnimate +import code.name.monkey.retromusic.extensions.setLightNavigationBar +import code.name.monkey.retromusic.extensions.setLightNavigationBarAuto +import code.name.monkey.retromusic.extensions.setLightStatusBar +import code.name.monkey.retromusic.extensions.setLightStatusBarAuto +import code.name.monkey.retromusic.extensions.setNavigationBarColorPreOreo +import code.name.monkey.retromusic.extensions.setTaskDescriptionColor +import code.name.monkey.retromusic.extensions.show +import code.name.monkey.retromusic.extensions.surfaceColor +import code.name.monkey.retromusic.extensions.whichFragment import code.name.monkey.retromusic.fragments.LibraryViewModel import code.name.monkey.retromusic.fragments.NowPlayingScreen import code.name.monkey.retromusic.fragments.NowPlayingScreen.* @@ -68,7 +102,13 @@ import code.name.monkey.retromusic.util.ViewUtil import code.name.monkey.retromusic.util.logD import com.google.android.material.bottomnavigation.BottomNavigationView import com.google.android.material.bottomsheet.BottomSheetBehavior -import com.google.android.material.bottomsheet.BottomSheetBehavior.* +import com.google.android.material.bottomsheet.BottomSheetBehavior.BottomSheetCallback +import com.google.android.material.bottomsheet.BottomSheetBehavior.STATE_COLLAPSED +import com.google.android.material.bottomsheet.BottomSheetBehavior.STATE_DRAGGING +import com.google.android.material.bottomsheet.BottomSheetBehavior.STATE_EXPANDED +import com.google.android.material.bottomsheet.BottomSheetBehavior.STATE_HIDDEN +import com.google.android.material.bottomsheet.BottomSheetBehavior.STATE_SETTLING +import com.google.android.material.bottomsheet.BottomSheetBehavior.from import org.koin.androidx.viewmodel.ext.android.viewModel @@ -120,21 +160,25 @@ abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity(), keepScreenOn(true) } } + STATE_COLLAPSED -> { onPanelCollapsed() if ((PreferenceUtil.lyricsScreenOn && PreferenceUtil.showLyrics) || !PreferenceUtil.isScreenOnEnabled) { keepScreenOn(false) } } + STATE_SETTLING, STATE_DRAGGING -> { if (fromNotification) { binding.navigationView.bringToFront() fromNotification = false } } + STATE_HIDDEN -> { MusicPlayerRemote.clearQueue() } + else -> { logD("Do a flip") } @@ -198,9 +242,11 @@ abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity(), SWIPE_DOWN_DISMISS -> { bottomSheetBehavior.isHideable = PreferenceUtil.swipeDownToDismiss } + TOGGLE_ADD_CONTROLS -> { miniPlayerFragment?.setUpButtons() } + NOW_PLAYING_SCREEN_ID -> { chooseFragmentForTheme() binding.slidingPanel.updateLayoutParams { @@ -212,33 +258,41 @@ abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity(), onServiceConnected() } } + ALBUM_COVER_TRANSFORM, CAROUSEL_EFFECT, ALBUM_COVER_STYLE, TOGGLE_VOLUME, EXTRA_SONG_INFO, CIRCLE_PLAY_BUTTON, -> { chooseFragmentForTheme() onServiceConnected() } + SWIPE_ANYWHERE_NOW_PLAYING -> { playerFragment.addSwipeDetector() } + ADAPTIVE_COLOR_APP -> { if (PreferenceUtil.nowPlayingScreen in listOf(Normal, Material, Flat)) { chooseFragmentForTheme() onServiceConnected() } } + LIBRARY_CATEGORIES -> { updateTabs() } + TAB_TEXT_MODE -> { navigationView.labelVisibilityMode = PreferenceUtil.tabTitleMode } + TOGGLE_FULL_SCREEN -> { recreate() } + SCREEN_ON_LYRICS -> { keepScreenOn(bottomSheetBehavior.state == STATE_EXPANDED && PreferenceUtil.lyricsScreenOn && PreferenceUtil.showLyrics || PreferenceUtil.isScreenOnEnabled) } + KEEP_SCREEN_ON -> { maybeSetScreenOn() } @@ -446,14 +500,14 @@ abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity(), hideBottomSheet( hide = hideBottomSheet, animate = animate, - isBottomNavVisible = visible && navigationView is BottomNavigationView + isBottomNavVisible = visible && navigationView is BottomNavigationView ) } fun hideBottomSheet( hide: Boolean, animate: Boolean = false, - isBottomNavVisible: Boolean = navigationView.isVisible && navigationView is BottomNavigationView, + isBottomNavVisible: Boolean = navigationView.isVisible && navigationView is BottomNavigationView, ) { val heightOfBar = windowInsets.getBottomInsets() + dip(R.dimen.mini_player_height) val heightOfBarWithTabs = heightOfBar + dip(R.dimen.bottom_nav_height) @@ -475,8 +529,10 @@ abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity(), } else { bottomSheetBehavior.peekHeight = heightOfBarWithTabs } - libraryViewModel.setFabMargin(this, - dip(R.dimen.bottom_nav_mini_player_height)) + libraryViewModel.setFabMargin( + this, + dip(R.dimen.bottom_nav_mini_player_height) + ) } else { logD("Details") if (animate) { diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/bugreport/BugReportActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/bugreport/BugReportActivity.kt index 44482f76d..b37c115bb 100644 --- a/app/src/main/java/code/name/monkey/retromusic/activities/bugreport/BugReportActivity.kt +++ b/app/src/main/java/code/name/monkey/retromusic/activities/bugreport/BugReportActivity.kt @@ -79,7 +79,7 @@ open class BugReportActivity : AbsThemeActivity() { override fun onOptionsItemSelected(item: MenuItem): Boolean { if (item.itemId == android.R.id.home) { - onBackPressed() + onBackPressedDispatcher.onBackPressed() } return super.onOptionsItemSelected(item) } diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/tageditor/AbsTagEditorActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/tageditor/AbsTagEditorActivity.kt index 16d21e003..c8ca11247 100755 --- a/app/src/main/java/code/name/monkey/retromusic/activities/tageditor/AbsTagEditorActivity.kt +++ b/app/src/main/java/code/name/monkey/retromusic/activities/tageditor/AbsTagEditorActivity.kt @@ -56,7 +56,7 @@ import org.jaudiotagger.audio.AudioFileIO import org.jaudiotagger.tag.FieldKey import org.koin.android.ext.android.inject import java.io.File -import java.util.* +import java.util.Collections abstract class AbsTagEditorActivity : AbsBaseActivity() { abstract val editorImage: ImageView @@ -307,7 +307,7 @@ abstract class AbsTagEditorActivity : AbsBaseActivity() { override fun onOptionsItemSelected(item: MenuItem): Boolean { when (item.itemId) { android.R.id.home -> { - super.onBackPressed() + onBackPressedDispatcher.onBackPressed() return true } } @@ -409,15 +409,18 @@ abstract class AbsTagEditorActivity : AbsBaseActivity() { loadImageFromFile(it) } } + SAFGuideActivity.REQUEST_CODE_SAF_GUIDE -> { SAFUtil.openTreePicker(this) } + SAFUtil.REQUEST_SAF_PICK_TREE -> { if (resultCode == Activity.RESULT_OK) { SAFUtil.saveTreeUri(this, intent) writeTags(savedSongPaths) } } + SAFUtil.REQUEST_SAF_PICK_FILE -> { if (resultCode == Activity.RESULT_OK) { writeTags(Collections.singletonList(currentSongPath + SAFUtil.SEPARATOR + intent!!.dataString)) diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/tageditor/AlbumTagEditorActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/tageditor/AlbumTagEditorActivity.kt index 1e669d851..1436da954 100755 --- a/app/src/main/java/code/name/monkey/retromusic/activities/tageditor/AlbumTagEditorActivity.kt +++ b/app/src/main/java/code/name/monkey/retromusic/activities/tageditor/AlbumTagEditorActivity.kt @@ -30,8 +30,12 @@ import androidx.core.widget.doAfterTextChanged import code.name.monkey.appthemehelper.util.MaterialValueHelper import code.name.monkey.retromusic.R import code.name.monkey.retromusic.databinding.ActivityAlbumTagEditorBinding -import code.name.monkey.retromusic.extensions.* -import code.name.monkey.retromusic.glide.GlideApp +import code.name.monkey.retromusic.extensions.appHandleColor +import code.name.monkey.retromusic.extensions.defaultFooterColor +import code.name.monkey.retromusic.extensions.isColorLight +import code.name.monkey.retromusic.extensions.setTint +import code.name.monkey.retromusic.extensions.showToast +import code.name.monkey.retromusic.glide.RetroGlideExtension.asBitmapPalette import code.name.monkey.retromusic.glide.palette.BitmapPaletteWrapper import code.name.monkey.retromusic.model.ArtworkInfo import code.name.monkey.retromusic.model.Song @@ -40,12 +44,13 @@ import code.name.monkey.retromusic.util.MusicUtil import code.name.monkey.retromusic.util.RetroColorUtil.generatePalette import code.name.monkey.retromusic.util.RetroColorUtil.getColor import code.name.monkey.retromusic.util.logD +import com.bumptech.glide.Glide import com.bumptech.glide.load.engine.DiskCacheStrategy import com.bumptech.glide.request.target.ImageViewTarget import com.bumptech.glide.request.transition.Transition import com.google.android.material.shape.MaterialShapeDrawable import org.jaudiotagger.tag.FieldKey -import java.util.* +import java.util.EnumMap class AlbumTagEditorActivity : AbsTagEditorActivity() { @@ -132,7 +137,9 @@ class AlbumTagEditorActivity : AbsTagEditorActivity(binding.editorImage) { override fun onResourceReady( diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/tageditor/SongTagEditorActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/tageditor/SongTagEditorActivity.kt index 1d2ab76ee..93dd8a44f 100755 --- a/app/src/main/java/code/name/monkey/retromusic/activities/tageditor/SongTagEditorActivity.kt +++ b/app/src/main/java/code/name/monkey/retromusic/activities/tageditor/SongTagEditorActivity.kt @@ -31,7 +31,7 @@ import code.name.monkey.appthemehelper.util.MaterialValueHelper import code.name.monkey.retromusic.R import code.name.monkey.retromusic.databinding.ActivitySongTagEditorBinding import code.name.monkey.retromusic.extensions.* -import code.name.monkey.retromusic.glide.GlideApp +import code.name.monkey.retromusic.glide.RetroGlideExtension.asBitmapPalette import code.name.monkey.retromusic.glide.palette.BitmapPaletteWrapper import code.name.monkey.retromusic.model.ArtworkInfo import code.name.monkey.retromusic.repository.SongRepository @@ -39,6 +39,7 @@ import code.name.monkey.retromusic.util.ImageUtil import code.name.monkey.retromusic.util.MusicUtil import code.name.monkey.retromusic.util.RetroColorUtil import code.name.monkey.retromusic.util.logD +import com.bumptech.glide.Glide import com.bumptech.glide.load.engine.DiskCacheStrategy import com.bumptech.glide.request.target.ImageViewTarget import com.bumptech.glide.request.transition.Transition @@ -171,8 +172,11 @@ class SongTagEditorActivity : AbsTagEditorActivity override fun getSongUris(): List = listOf(MusicUtil.getSongFileUri(id)) override fun loadImageFromFile(selectedFile: Uri?) { - GlideApp.with(this@SongTagEditorActivity).asBitmapPalette().load(selectedFile) - .diskCacheStrategy(DiskCacheStrategy.NONE).skipMemoryCache(true) + Glide.with(this@SongTagEditorActivity) + .asBitmapPalette() + .load(selectedFile) + .diskCacheStrategy(DiskCacheStrategy.NONE) + .skipMemoryCache(true) .into(object : ImageViewTarget(binding.editorImage) { override fun onResourceReady( resource: BitmapPaletteWrapper, diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/GenreAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/GenreAdapter.kt index 383c19e26..b139a0af8 100644 --- a/app/src/main/java/code/name/monkey/retromusic/adapter/GenreAdapter.kt +++ b/app/src/main/java/code/name/monkey/retromusic/adapter/GenreAdapter.kt @@ -23,13 +23,15 @@ import androidx.fragment.app.FragmentActivity import androidx.recyclerview.widget.RecyclerView import code.name.monkey.retromusic.R import code.name.monkey.retromusic.databinding.ItemGenreBinding -import code.name.monkey.retromusic.glide.GlideApp import code.name.monkey.retromusic.glide.RetroGlideExtension +import code.name.monkey.retromusic.glide.RetroGlideExtension.asBitmapPalette +import code.name.monkey.retromusic.glide.RetroGlideExtension.songCoverOptions import code.name.monkey.retromusic.glide.RetroMusicColoredTarget import code.name.monkey.retromusic.interfaces.IGenreClickListener import code.name.monkey.retromusic.model.Genre import code.name.monkey.retromusic.util.MusicUtil import code.name.monkey.retromusic.util.color.MediaNotificationProcessor +import com.bumptech.glide.Glide import java.util.* /** @@ -68,10 +70,10 @@ class GenreAdapter( private fun loadGenreImage(genre: Genre, holder: GenreAdapter.ViewHolder) { val genreSong = MusicUtil.songByGenre(genre.id) - GlideApp.with(activity) + Glide.with(activity) .asBitmapPalette() - .load(RetroGlideExtension.getSongModel(genreSong)) .songCoverOptions(genreSong) + .load(RetroGlideExtension.getSongModel(genreSong)) .into(object : RetroMusicColoredTarget(holder.binding.image) { override fun onColorReady(colors: MediaNotificationProcessor) { setColors(holder, colors) diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/SearchAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/SearchAdapter.kt index 8cf77ad52..f1b1123a4 100644 --- a/app/src/main/java/code/name/monkey/retromusic/adapter/SearchAdapter.kt +++ b/app/src/main/java/code/name/monkey/retromusic/adapter/SearchAdapter.kt @@ -29,8 +29,10 @@ import code.name.monkey.appthemehelper.ThemeStore import code.name.monkey.retromusic.* import code.name.monkey.retromusic.adapter.base.MediaEntryViewHolder import code.name.monkey.retromusic.db.PlaylistWithSongs -import code.name.monkey.retromusic.glide.GlideApp import code.name.monkey.retromusic.glide.RetroGlideExtension +import code.name.monkey.retromusic.glide.RetroGlideExtension.albumCoverOptions +import code.name.monkey.retromusic.glide.RetroGlideExtension.artistImageOptions +import code.name.monkey.retromusic.glide.RetroGlideExtension.songCoverOptions import code.name.monkey.retromusic.helper.MusicPlayerRemote import code.name.monkey.retromusic.helper.menu.SongMenuHelper import code.name.monkey.retromusic.model.Album @@ -38,6 +40,7 @@ import code.name.monkey.retromusic.model.Artist import code.name.monkey.retromusic.model.Genre import code.name.monkey.retromusic.model.Song import code.name.monkey.retromusic.util.MusicUtil +import com.bumptech.glide.Glide import java.util.* class SearchAdapter( @@ -68,6 +71,7 @@ class SearchAdapter( false ), viewType ) + ALBUM, ARTIST, ALBUM_ARTIST -> ViewHolder( LayoutInflater.from(activity).inflate( R.layout.item_list_big, @@ -75,6 +79,7 @@ class SearchAdapter( false ), viewType ) + else -> ViewHolder( LayoutInflater.from(activity).inflate(R.layout.item_list, parent, false), viewType @@ -89,24 +94,30 @@ class SearchAdapter( val album = dataSet[position] as Album holder.title?.text = album.title holder.text?.text = album.artistName - GlideApp.with(activity).asDrawable().albumCoverOptions(album.safeGetFirstSong()).load(RetroGlideExtension.getSongModel(album.safeGetFirstSong())) + Glide.with(activity).asDrawable().albumCoverOptions(album.safeGetFirstSong()) + .load(RetroGlideExtension.getSongModel(album.safeGetFirstSong())) .into(holder.image!!) } + ARTIST -> { holder.imageTextContainer?.isVisible = true val artist = dataSet[position] as Artist holder.title?.text = artist.name holder.text?.text = MusicUtil.getArtistInfoString(activity, artist) - GlideApp.with(activity).asDrawable().artistImageOptions(artist).load( - RetroGlideExtension.getArtistModel(artist)).into(holder.image!!) + Glide.with(activity).asDrawable().artistImageOptions(artist).load( + RetroGlideExtension.getArtistModel(artist) + ).into(holder.image!!) } + SONG -> { holder.imageTextContainer?.isVisible = true val song = dataSet[position] as Song holder.title?.text = song.title holder.text?.text = song.albumName - GlideApp.with(activity).asDrawable().songCoverOptions(song).load(RetroGlideExtension.getSongModel(song)).into(holder.image!!) + Glide.with(activity).asDrawable().songCoverOptions(song) + .load(RetroGlideExtension.getSongModel(song)).into(holder.image!!) } + GENRE -> { val genre = dataSet[position] as Genre holder.title?.text = genre.name @@ -119,19 +130,23 @@ class SearchAdapter( ) ) } + PLAYLIST -> { val playlist = dataSet[position] as PlaylistWithSongs holder.title?.text = playlist.playlistEntity.playlistName //holder.text?.text = MusicUtil.playlistInfoString(activity, playlist.songs) } + ALBUM_ARTIST -> { holder.imageTextContainer?.isVisible = true val artist = dataSet[position] as Artist holder.title?.text = artist.name holder.text?.text = MusicUtil.getArtistInfoString(activity, artist) - GlideApp.with(activity).asDrawable().artistImageOptions(artist).load( - RetroGlideExtension.getArtistModel(artist)).into(holder.image!!) + Glide.with(activity).asDrawable().artistImageOptions(artist).load( + RetroGlideExtension.getArtistModel(artist) + ).into(holder.image!!) } + else -> { holder.title?.text = dataSet[position].toString() holder.title?.setTextColor(ThemeStore.accentColor(activity)) @@ -177,30 +192,35 @@ class SearchAdapter( bundleOf(EXTRA_ALBUM_ID to (item as Album).id) ) } + ARTIST -> { activity.findNavController(R.id.fragment_container).navigate( R.id.artistDetailsFragment, bundleOf(EXTRA_ARTIST_ID to (item as Artist).id) ) } - ALBUM_ARTIST ->{ + + ALBUM_ARTIST -> { activity.findNavController(R.id.fragment_container).navigate( R.id.albumArtistDetailsFragment, bundleOf(EXTRA_ARTIST_NAME to (item as Artist).name) ) } + GENRE -> { activity.findNavController(R.id.fragment_container).navigate( R.id.genreDetailsFragment, bundleOf(EXTRA_GENRE to (item as Genre)) ) } + PLAYLIST -> { activity.findNavController(R.id.fragment_container).navigate( R.id.playlistDetailsFragment, bundleOf(EXTRA_PLAYLIST to (item as PlaylistWithSongs)) ) } + SONG -> { MusicPlayerRemote.playNext(item as Song) MusicPlayerRemote.playNextSong() diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/SongFileAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/SongFileAdapter.kt index b032e6e54..bb390db32 100644 --- a/app/src/main/java/code/name/monkey/retromusic/adapter/SongFileAdapter.kt +++ b/app/src/main/java/code/name/monkey/retromusic/adapter/SongFileAdapter.kt @@ -26,11 +26,11 @@ import code.name.monkey.retromusic.R import code.name.monkey.retromusic.adapter.base.AbsMultiSelectAdapter import code.name.monkey.retromusic.adapter.base.MediaEntryViewHolder import code.name.monkey.retromusic.extensions.getTintedDrawable -import code.name.monkey.retromusic.glide.GlideApp import code.name.monkey.retromusic.glide.RetroGlideExtension import code.name.monkey.retromusic.glide.audiocover.AudioFileCover import code.name.monkey.retromusic.interfaces.ICallbacks import code.name.monkey.retromusic.util.MusicUtil +import com.bumptech.glide.Glide import com.bumptech.glide.load.engine.DiskCacheStrategy import com.bumptech.glide.signature.MediaStoreSignature import me.zhanghai.android.fastscroll.PopupTextProvider @@ -109,7 +109,7 @@ class SongFileAdapter( ) } else { val error = activity.getTintedDrawable(R.drawable.ic_audio_file, iconColor) - GlideApp.with(activity) + Glide.with(activity) .load(AudioFileCover(file.path)) .diskCacheStrategy(DiskCacheStrategy.NONE) .error(error) diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumAdapter.kt index 33580acd2..160af7e47 100644 --- a/app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumAdapter.kt +++ b/app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumAdapter.kt @@ -24,8 +24,9 @@ import androidx.fragment.app.FragmentActivity import code.name.monkey.retromusic.R import code.name.monkey.retromusic.adapter.base.AbsMultiSelectAdapter import code.name.monkey.retromusic.adapter.base.MediaEntryViewHolder -import code.name.monkey.retromusic.glide.GlideApp import code.name.monkey.retromusic.glide.RetroGlideExtension +import code.name.monkey.retromusic.glide.RetroGlideExtension.albumCoverOptions +import code.name.monkey.retromusic.glide.RetroGlideExtension.asBitmapPalette import code.name.monkey.retromusic.glide.RetroMusicColoredTarget import code.name.monkey.retromusic.helper.SortOrder import code.name.monkey.retromusic.helper.menu.SongsMenuHelper @@ -35,6 +36,7 @@ import code.name.monkey.retromusic.model.Song import code.name.monkey.retromusic.util.MusicUtil import code.name.monkey.retromusic.util.PreferenceUtil import code.name.monkey.retromusic.util.color.MediaNotificationProcessor +import com.bumptech.glide.Glide import me.zhanghai.android.fastscroll.PopupTextProvider open class AlbumAdapter( @@ -110,7 +112,9 @@ open class AlbumAdapter( return } val song = album.safeGetFirstSong() - GlideApp.with(activity).asBitmapPalette().albumCoverOptions(song) + Glide.with(activity) + .asBitmapPalette() + .albumCoverOptions(song) //.checkIgnoreMediaStore() .load(RetroGlideExtension.getSongModel(song)) .into(object : RetroMusicColoredTarget(holder.image!!) { @@ -160,6 +164,7 @@ open class AlbumAdapter( when (PreferenceUtil.albumSortOrder) { SortOrder.AlbumSortOrder.ALBUM_A_Z, SortOrder.AlbumSortOrder.ALBUM_Z_A -> sectionName = dataSet[position].title + SortOrder.AlbumSortOrder.ALBUM_ARTIST -> sectionName = dataSet[position].albumArtist SortOrder.AlbumSortOrder.ALBUM_YEAR -> return MusicUtil.getYearString( dataSet[position].year diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumCoverPagerAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumCoverPagerAdapter.kt index f40fe91af..1295a8e31 100644 --- a/app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumCoverPagerAdapter.kt +++ b/app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumCoverPagerAdapter.kt @@ -26,16 +26,24 @@ import androidx.lifecycle.lifecycleScope import code.name.monkey.retromusic.R import code.name.monkey.retromusic.activities.MainActivity import code.name.monkey.retromusic.fragments.AlbumCoverStyle -import code.name.monkey.retromusic.fragments.NowPlayingScreen.* +import code.name.monkey.retromusic.fragments.NowPlayingScreen.Card +import code.name.monkey.retromusic.fragments.NowPlayingScreen.Classic +import code.name.monkey.retromusic.fragments.NowPlayingScreen.Fit +import code.name.monkey.retromusic.fragments.NowPlayingScreen.Full +import code.name.monkey.retromusic.fragments.NowPlayingScreen.Gradient +import code.name.monkey.retromusic.fragments.NowPlayingScreen.Peek +import code.name.monkey.retromusic.fragments.NowPlayingScreen.Tiny import code.name.monkey.retromusic.fragments.base.goToLyrics -import code.name.monkey.retromusic.glide.GlideApp import code.name.monkey.retromusic.glide.RetroGlideExtension +import code.name.monkey.retromusic.glide.RetroGlideExtension.asBitmapPalette +import code.name.monkey.retromusic.glide.RetroGlideExtension.songCoverOptions import code.name.monkey.retromusic.glide.RetroMusicColoredTarget import code.name.monkey.retromusic.misc.CustomFragmentStatePagerAdapter import code.name.monkey.retromusic.model.Song import code.name.monkey.retromusic.util.MusicUtil import code.name.monkey.retromusic.util.PreferenceUtil import code.name.monkey.retromusic.util.color.MediaNotificationProcessor +import com.bumptech.glide.Glide import com.google.android.material.bottomsheet.BottomSheetBehavior.STATE_EXPANDED import com.google.android.material.dialog.MaterialAlertDialogBuilder import kotlinx.coroutines.Dispatchers @@ -164,7 +172,9 @@ class AlbumCoverPagerAdapter( } private fun loadAlbumCover(albumCover: ImageView) { - GlideApp.with(this).asBitmapPalette().songCoverOptions(song) + Glide.with(this) + .asBitmapPalette() + .songCoverOptions(song) //.checkIgnoreMediaStore() .load(RetroGlideExtension.getSongModel(song)) .dontAnimate() diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/album/HorizontalAlbumAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/album/HorizontalAlbumAdapter.kt index fe360b1dd..7a9f7fa6e 100644 --- a/app/src/main/java/code/name/monkey/retromusic/adapter/album/HorizontalAlbumAdapter.kt +++ b/app/src/main/java/code/name/monkey/retromusic/adapter/album/HorizontalAlbumAdapter.kt @@ -17,14 +17,16 @@ package code.name.monkey.retromusic.adapter.album import android.view.View import android.view.ViewGroup import androidx.fragment.app.FragmentActivity -import code.name.monkey.retromusic.glide.GlideApp import code.name.monkey.retromusic.glide.RetroGlideExtension +import code.name.monkey.retromusic.glide.RetroGlideExtension.albumCoverOptions +import code.name.monkey.retromusic.glide.RetroGlideExtension.asBitmapPalette import code.name.monkey.retromusic.glide.RetroMusicColoredTarget import code.name.monkey.retromusic.helper.HorizontalAdapterHelper import code.name.monkey.retromusic.interfaces.IAlbumClickListener import code.name.monkey.retromusic.model.Album import code.name.monkey.retromusic.util.MusicUtil import code.name.monkey.retromusic.util.color.MediaNotificationProcessor +import com.bumptech.glide.Glide class HorizontalAlbumAdapter( activity: FragmentActivity, @@ -47,7 +49,9 @@ class HorizontalAlbumAdapter( override fun loadAlbumCover(album: Album, holder: ViewHolder) { if (holder.image == null) return - GlideApp.with(activity).asBitmapPalette().albumCoverOptions(album.safeGetFirstSong()) + Glide.with(activity) + .asBitmapPalette() + .albumCoverOptions(album.safeGetFirstSong()) .load(RetroGlideExtension.getSongModel(album.safeGetFirstSong())) .into(object : RetroMusicColoredTarget(holder.image!!) { override fun onColorReady(colors: MediaNotificationProcessor) { diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/artist/ArtistAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/artist/ArtistAdapter.kt index 30436a97d..a0f8091e1 100644 --- a/app/src/main/java/code/name/monkey/retromusic/adapter/artist/ArtistAdapter.kt +++ b/app/src/main/java/code/name/monkey/retromusic/adapter/artist/ArtistAdapter.kt @@ -27,8 +27,9 @@ import code.name.monkey.retromusic.R import code.name.monkey.retromusic.adapter.base.AbsMultiSelectAdapter import code.name.monkey.retromusic.adapter.base.MediaEntryViewHolder import code.name.monkey.retromusic.extensions.hide -import code.name.monkey.retromusic.glide.GlideApp import code.name.monkey.retromusic.glide.RetroGlideExtension +import code.name.monkey.retromusic.glide.RetroGlideExtension.artistImageOptions +import code.name.monkey.retromusic.glide.RetroGlideExtension.asBitmapPalette import code.name.monkey.retromusic.glide.RetroMusicColoredTarget import code.name.monkey.retromusic.helper.menu.SongsMenuHelper import code.name.monkey.retromusic.interfaces.IAlbumArtistClickListener @@ -38,6 +39,7 @@ import code.name.monkey.retromusic.model.Song import code.name.monkey.retromusic.util.MusicUtil import code.name.monkey.retromusic.util.PreferenceUtil import code.name.monkey.retromusic.util.color.MediaNotificationProcessor +import com.bumptech.glide.Glide import me.zhanghai.android.fastscroll.PopupTextProvider class ArtistAdapter( @@ -109,10 +111,10 @@ class ArtistAdapter( if (holder.image == null) { return } - GlideApp.with(activity) + Glide.with(activity) .asBitmapPalette() - .load(RetroGlideExtension.getArtistModel(artist)) .artistImageOptions(artist) + .load(RetroGlideExtension.getArtistModel(artist)) .transition(RetroGlideExtension.getDefaultTransition()) .into(object : RetroMusicColoredTarget(holder.image!!) { override fun onColorReady(colors: MediaNotificationProcessor) { diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/playlist/PlaylistAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/playlist/PlaylistAdapter.kt index f752e2765..3c93c0de2 100755 --- a/app/src/main/java/code/name/monkey/retromusic/adapter/playlist/PlaylistAdapter.kt +++ b/app/src/main/java/code/name/monkey/retromusic/adapter/playlist/PlaylistAdapter.kt @@ -33,7 +33,7 @@ import code.name.monkey.retromusic.db.PlaylistEntity import code.name.monkey.retromusic.db.PlaylistWithSongs import code.name.monkey.retromusic.db.toSongs import code.name.monkey.retromusic.extensions.dipToPix -import code.name.monkey.retromusic.glide.GlideApp +import code.name.monkey.retromusic.glide.RetroGlideExtension.playlistOptions import code.name.monkey.retromusic.glide.playlistPreview.PlaylistPreview import code.name.monkey.retromusic.helper.SortOrder.PlaylistSortOrder import code.name.monkey.retromusic.helper.menu.PlaylistMenuHelper @@ -42,6 +42,7 @@ import code.name.monkey.retromusic.interfaces.IPlaylistClickListener import code.name.monkey.retromusic.model.Song import code.name.monkey.retromusic.util.MusicUtil import code.name.monkey.retromusic.util.PreferenceUtil +import com.bumptech.glide.Glide import me.zhanghai.android.fastscroll.PopupTextProvider class PlaylistAdapter( @@ -105,7 +106,7 @@ class PlaylistAdapter( holder.image?.setPadding(activity.dipToPix(8F).toInt()) holder.image?.setImageDrawable(getIconRes()) } else { - GlideApp.with(activity) + Glide.with(activity) .load( PlaylistPreview(playlist) ) diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/song/PlayingQueueAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/song/PlayingQueueAdapter.kt index c3e955936..2d387be44 100644 --- a/app/src/main/java/code/name/monkey/retromusic/adapter/song/PlayingQueueAdapter.kt +++ b/app/src/main/java/code/name/monkey/retromusic/adapter/song/PlayingQueueAdapter.kt @@ -19,8 +19,8 @@ import android.view.View import androidx.core.view.isVisible import androidx.fragment.app.FragmentActivity import code.name.monkey.retromusic.R -import code.name.monkey.retromusic.glide.GlideApp import code.name.monkey.retromusic.glide.RetroGlideExtension +import code.name.monkey.retromusic.glide.RetroGlideExtension.songCoverOptions import code.name.monkey.retromusic.helper.MusicPlayerRemote import code.name.monkey.retromusic.helper.MusicPlayerRemote.isPlaying import code.name.monkey.retromusic.helper.MusicPlayerRemote.playNextSong @@ -28,6 +28,7 @@ import code.name.monkey.retromusic.helper.MusicPlayerRemote.removeFromQueue import code.name.monkey.retromusic.model.Song import code.name.monkey.retromusic.util.MusicUtil import code.name.monkey.retromusic.util.ViewUtil +import com.bumptech.glide.Glide import com.h6ah4i.android.widget.advrecyclerview.draggable.DraggableItemAdapter import com.h6ah4i.android.widget.advrecyclerview.draggable.ItemDraggableRange import com.h6ah4i.android.widget.advrecyclerview.draggable.annotation.DraggableItemStateFlags @@ -76,7 +77,7 @@ class PlayingQueueAdapter( if (holder.image == null) { return } - GlideApp.with(activity) + Glide.with(activity) .load(RetroGlideExtension.getSongModel(song)) .songCoverOptions(song) .into(holder.image!!) @@ -195,7 +196,7 @@ class PlayingQueueAdapter( return if (result == SwipeableItemConstants.RESULT_CANCELED) { SwipeResultActionDefault() } else { - SwipedResultActionRemoveItem(this, position, activity) + SwipedResultActionRemoveItem(this, position) } } @@ -216,12 +217,9 @@ class PlayingQueueAdapter( internal class SwipedResultActionRemoveItem( private val adapter: PlayingQueueAdapter, private val position: Int, - private val activity: FragmentActivity, ) : SwipeResultActionRemoveItem() { private var songToRemove: Song? = null - private val isPlaying: Boolean = MusicPlayerRemote.isPlaying - private val songProgressMillis = 0 override fun onPerformAction() { // currentlyShownSnackbar = null } diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/song/SongAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/song/SongAdapter.kt index 889861b0d..7b7b7bf99 100644 --- a/app/src/main/java/code/name/monkey/retromusic/adapter/song/SongAdapter.kt +++ b/app/src/main/java/code/name/monkey/retromusic/adapter/song/SongAdapter.kt @@ -29,8 +29,9 @@ import code.name.monkey.retromusic.EXTRA_ALBUM_ID import code.name.monkey.retromusic.R import code.name.monkey.retromusic.adapter.base.AbsMultiSelectAdapter import code.name.monkey.retromusic.adapter.base.MediaEntryViewHolder -import code.name.monkey.retromusic.glide.GlideApp import code.name.monkey.retromusic.glide.RetroGlideExtension +import code.name.monkey.retromusic.glide.RetroGlideExtension.asBitmapPalette +import code.name.monkey.retromusic.glide.RetroGlideExtension.songCoverOptions import code.name.monkey.retromusic.glide.RetroMusicColoredTarget import code.name.monkey.retromusic.helper.MusicPlayerRemote import code.name.monkey.retromusic.helper.SortOrder @@ -41,6 +42,7 @@ import code.name.monkey.retromusic.util.MusicUtil import code.name.monkey.retromusic.util.PreferenceUtil import code.name.monkey.retromusic.util.RetroUtil import code.name.monkey.retromusic.util.color.MediaNotificationProcessor +import com.bumptech.glide.Glide import me.zhanghai.android.fastscroll.PopupTextProvider /** @@ -116,7 +118,9 @@ open class SongAdapter( if (holder.image == null) { return } - GlideApp.with(activity).asBitmapPalette().songCoverOptions(song) + Glide.with(activity) + .asBitmapPalette() + .songCoverOptions(song) .load(RetroGlideExtension.getSongModel(song)) .into(object : RetroMusicColoredTarget(holder.image!!) { override fun onColorReady(colors: MediaNotificationProcessor) { @@ -155,7 +159,11 @@ open class SongAdapter( override fun getPopupText(position: Int): String { val sectionName: String? = when (PreferenceUtil.songSortOrder) { - SortOrder.SongSortOrder.SONG_DEFAULT -> return MusicUtil.getSectionName(dataSet[position].title, true) + SortOrder.SongSortOrder.SONG_DEFAULT -> return MusicUtil.getSectionName( + dataSet[position].title, + true + ) + SortOrder.SongSortOrder.SONG_A_Z, SortOrder.SongSortOrder.SONG_Z_A -> dataSet[position].title SortOrder.SongSortOrder.SONG_ALBUM -> dataSet[position].albumName SortOrder.SongSortOrder.SONG_ARTIST -> dataSet[position].artistName diff --git a/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetBig.kt b/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetBig.kt index 0aea9d366..7d9497209 100644 --- a/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetBig.kt +++ b/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetBig.kt @@ -29,7 +29,6 @@ import code.name.monkey.retromusic.R import code.name.monkey.retromusic.activities.MainActivity import code.name.monkey.retromusic.appwidgets.base.BaseAppWidget import code.name.monkey.retromusic.extensions.getTintedDrawable -import code.name.monkey.retromusic.glide.GlideApp import code.name.monkey.retromusic.glide.RetroGlideExtension import code.name.monkey.retromusic.service.MusicService import code.name.monkey.retromusic.service.MusicService.Companion.ACTION_REWIND @@ -152,7 +151,7 @@ class AppWidgetBig : BaseAppWidget() { if (target != null) { Glide.with(service).clear(target) } - target = GlideApp.with(appContext) + target = Glide.with(appContext) .asBitmap() //.checkIgnoreMediaStore() .load(RetroGlideExtension.getSongModel(song)) diff --git a/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetCard.kt b/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetCard.kt index 80e0b09ea..471d908d6 100644 --- a/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetCard.kt +++ b/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetCard.kt @@ -29,8 +29,9 @@ import code.name.monkey.retromusic.R import code.name.monkey.retromusic.activities.MainActivity import code.name.monkey.retromusic.appwidgets.base.BaseAppWidget import code.name.monkey.retromusic.extensions.getTintedDrawable -import code.name.monkey.retromusic.glide.GlideApp import code.name.monkey.retromusic.glide.RetroGlideExtension +import code.name.monkey.retromusic.glide.RetroGlideExtension.asBitmapPalette +import code.name.monkey.retromusic.glide.RetroGlideExtension.songCoverOptions import code.name.monkey.retromusic.glide.palette.BitmapPaletteWrapper import code.name.monkey.retromusic.service.MusicService import code.name.monkey.retromusic.service.MusicService.Companion.ACTION_REWIND @@ -143,7 +144,9 @@ class AppWidgetCard : BaseAppWidget() { if (target != null) { Glide.with(service).clear(target) } - target = GlideApp.with(service).asBitmapPalette().songCoverOptions(song) + target = Glide.with(service) + .asBitmapPalette() + .songCoverOptions(song) .load(RetroGlideExtension.getSongModel(song)) .centerCrop() .into(object : CustomTarget(imageSize, imageSize) { diff --git a/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetCircle.kt b/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetCircle.kt index 6ca5b050e..cb3ae0e44 100644 --- a/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetCircle.kt +++ b/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetCircle.kt @@ -28,8 +28,9 @@ import code.name.monkey.retromusic.R import code.name.monkey.retromusic.activities.MainActivity import code.name.monkey.retromusic.appwidgets.base.BaseAppWidget import code.name.monkey.retromusic.extensions.getTintedDrawable -import code.name.monkey.retromusic.glide.GlideApp import code.name.monkey.retromusic.glide.RetroGlideExtension +import code.name.monkey.retromusic.glide.RetroGlideExtension.asBitmapPalette +import code.name.monkey.retromusic.glide.RetroGlideExtension.songCoverOptions import code.name.monkey.retromusic.glide.palette.BitmapPaletteWrapper import code.name.monkey.retromusic.service.MusicService import code.name.monkey.retromusic.service.MusicService.Companion.ACTION_TOGGLE_PAUSE @@ -114,7 +115,9 @@ class AppWidgetCircle : BaseAppWidget() { if (target != null) { Glide.with(service).clear(target) } - target = GlideApp.with(service).asBitmapPalette().songCoverOptions(song) + target = Glide.with(service) + .asBitmapPalette() + .songCoverOptions(song) .load(RetroGlideExtension.getSongModel(song)) .apply(RequestOptions.circleCropTransform()) .into(object : CustomTarget(imageSize, imageSize) { diff --git a/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetClassic.kt b/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetClassic.kt index 2f1d7b173..ad04f8aae 100644 --- a/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetClassic.kt +++ b/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetClassic.kt @@ -30,8 +30,9 @@ import code.name.monkey.retromusic.R import code.name.monkey.retromusic.activities.MainActivity import code.name.monkey.retromusic.appwidgets.base.BaseAppWidget import code.name.monkey.retromusic.extensions.getTintedDrawable -import code.name.monkey.retromusic.glide.GlideApp import code.name.monkey.retromusic.glide.RetroGlideExtension +import code.name.monkey.retromusic.glide.RetroGlideExtension.asBitmapPalette +import code.name.monkey.retromusic.glide.RetroGlideExtension.songCoverOptions import code.name.monkey.retromusic.glide.palette.BitmapPaletteWrapper import code.name.monkey.retromusic.service.MusicService import code.name.monkey.retromusic.service.MusicService.Companion.ACTION_REWIND @@ -119,7 +120,9 @@ class AppWidgetClassic : BaseAppWidget() { if (target != null) { Glide.with(service).clear(target) } - target = GlideApp.with(service).asBitmapPalette().songCoverOptions(song) + target = Glide.with(service) + .asBitmapPalette() + .songCoverOptions(song) .load(RetroGlideExtension.getSongModel(song)) //.checkIgnoreMediaStore() .centerCrop() diff --git a/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetMD3.kt b/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetMD3.kt index cc07fa1d2..618914ff3 100644 --- a/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetMD3.kt +++ b/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetMD3.kt @@ -29,8 +29,9 @@ import code.name.monkey.retromusic.R import code.name.monkey.retromusic.activities.MainActivity import code.name.monkey.retromusic.appwidgets.base.BaseAppWidget import code.name.monkey.retromusic.extensions.getTintedDrawable -import code.name.monkey.retromusic.glide.GlideApp import code.name.monkey.retromusic.glide.RetroGlideExtension +import code.name.monkey.retromusic.glide.RetroGlideExtension.asBitmapPalette +import code.name.monkey.retromusic.glide.RetroGlideExtension.songCoverOptions import code.name.monkey.retromusic.glide.palette.BitmapPaletteWrapper import code.name.monkey.retromusic.service.MusicService import code.name.monkey.retromusic.service.MusicService.Companion.ACTION_REWIND @@ -144,7 +145,9 @@ class AppWidgetMD3 : BaseAppWidget() { if (target != null) { Glide.with(service).clear(target) } - target = GlideApp.with(service).asBitmapPalette().songCoverOptions(song) + target = Glide.with(service) + .asBitmapPalette() + .songCoverOptions(song) .load(RetroGlideExtension.getSongModel(song)) .centerCrop() .into(object : CustomTarget(imageSize, imageSize) { diff --git a/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetSmall.kt b/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetSmall.kt index 12246e860..ee4e87e99 100644 --- a/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetSmall.kt +++ b/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetSmall.kt @@ -29,8 +29,9 @@ import code.name.monkey.retromusic.R import code.name.monkey.retromusic.activities.MainActivity import code.name.monkey.retromusic.appwidgets.base.BaseAppWidget import code.name.monkey.retromusic.extensions.getTintedDrawable -import code.name.monkey.retromusic.glide.GlideApp import code.name.monkey.retromusic.glide.RetroGlideExtension +import code.name.monkey.retromusic.glide.RetroGlideExtension.asBitmapPalette +import code.name.monkey.retromusic.glide.RetroGlideExtension.songCoverOptions import code.name.monkey.retromusic.glide.palette.BitmapPaletteWrapper import code.name.monkey.retromusic.service.MusicService import code.name.monkey.retromusic.service.MusicService.Companion.ACTION_REWIND @@ -122,7 +123,9 @@ class AppWidgetSmall : BaseAppWidget() { if (target != null) { Glide.with(service).clear(target) } - target = GlideApp.with(service).asBitmapPalette().songCoverOptions(song) + target = Glide.with(service) + .asBitmapPalette() + .songCoverOptions(song) //.checkIgnoreMediaStore() .load(RetroGlideExtension.getSongModel(song)) .centerCrop() diff --git a/app/src/main/java/code/name/monkey/retromusic/dialogs/AddToPlaylistDialog.kt b/app/src/main/java/code/name/monkey/retromusic/dialogs/AddToPlaylistDialog.kt index c4bdd047d..aa47f0fe2 100644 --- a/app/src/main/java/code/name/monkey/retromusic/dialogs/AddToPlaylistDialog.kt +++ b/app/src/main/java/code/name/monkey/retromusic/dialogs/AddToPlaylistDialog.kt @@ -27,10 +27,10 @@ import code.name.monkey.retromusic.extensions.extraNotNull import code.name.monkey.retromusic.extensions.materialDialog import code.name.monkey.retromusic.fragments.LibraryViewModel import code.name.monkey.retromusic.model.Song -import org.koin.androidx.viewmodel.ext.android.sharedViewModel +import org.koin.androidx.viewmodel.ext.android.activityViewModel class AddToPlaylistDialog : DialogFragment() { - private val libraryViewModel by sharedViewModel() + private val libraryViewModel by activityViewModel() companion object { fun create(playlistEntities: List, song: Song): AddToPlaylistDialog { @@ -58,8 +58,8 @@ class AddToPlaylistDialog : DialogFragment() { playlistNames.add(entity.playlistName) } return materialDialog(R.string.add_playlist_title) - .setItems(playlistNames.toTypedArray()) { dialog, which-> - if (which == 0) { + .setItems(playlistNames.toTypedArray()) { dialog, which -> + if (which == 0) { showCreateDialog(songs) } else { libraryViewModel.addToPlaylist(requireContext(), playlistNames[which], songs) diff --git a/app/src/main/java/code/name/monkey/retromusic/dialogs/CreatePlaylistDialog.kt b/app/src/main/java/code/name/monkey/retromusic/dialogs/CreatePlaylistDialog.kt index bd9b3e258..7d7a01c90 100644 --- a/app/src/main/java/code/name/monkey/retromusic/dialogs/CreatePlaylistDialog.kt +++ b/app/src/main/java/code/name/monkey/retromusic/dialogs/CreatePlaylistDialog.kt @@ -29,12 +29,12 @@ import code.name.monkey.retromusic.fragments.LibraryViewModel import code.name.monkey.retromusic.model.Song import com.google.android.material.textfield.TextInputEditText import com.google.android.material.textfield.TextInputLayout -import org.koin.androidx.viewmodel.ext.android.sharedViewModel +import org.koin.androidx.viewmodel.ext.android.activityViewModel class CreatePlaylistDialog : DialogFragment() { private var _binding: DialogPlaylistBinding? = null private val binding get() = _binding!! - private val libraryViewModel by sharedViewModel() + private val libraryViewModel by activityViewModel() companion object { fun create(song: Song): CreatePlaylistDialog { diff --git a/app/src/main/java/code/name/monkey/retromusic/dialogs/DeletePlaylistDialog.kt b/app/src/main/java/code/name/monkey/retromusic/dialogs/DeletePlaylistDialog.kt index be133cbe5..30675d88a 100644 --- a/app/src/main/java/code/name/monkey/retromusic/dialogs/DeletePlaylistDialog.kt +++ b/app/src/main/java/code/name/monkey/retromusic/dialogs/DeletePlaylistDialog.kt @@ -27,11 +27,11 @@ import code.name.monkey.retromusic.extensions.extraNotNull import code.name.monkey.retromusic.extensions.materialDialog import code.name.monkey.retromusic.fragments.LibraryViewModel import code.name.monkey.retromusic.fragments.ReloadType -import org.koin.androidx.viewmodel.ext.android.sharedViewModel +import org.koin.androidx.viewmodel.ext.android.activityViewModel class DeletePlaylistDialog : DialogFragment() { - private val libraryViewModel by sharedViewModel() + private val libraryViewModel by activityViewModel() companion object { @@ -55,10 +55,13 @@ class DeletePlaylistDialog : DialogFragment() { //noinspection ConstantConditions if (playlists.size > 1) { title = R.string.delete_playlists_title - message = String.format(getString(R.string.delete_x_playlists), playlists.size).parseAsHtml() + message = + String.format(getString(R.string.delete_x_playlists), playlists.size).parseAsHtml() } else { title = R.string.delete_playlist_title - message = String.format(getString(R.string.delete_playlist_x), playlists[0].playlistName).parseAsHtml() + message = + String.format(getString(R.string.delete_playlist_x), playlists[0].playlistName) + .parseAsHtml() } return materialDialog(title) diff --git a/app/src/main/java/code/name/monkey/retromusic/dialogs/ImportPlaylistDialog.kt b/app/src/main/java/code/name/monkey/retromusic/dialogs/ImportPlaylistDialog.kt index 2d16b223b..87e3b6dbd 100644 --- a/app/src/main/java/code/name/monkey/retromusic/dialogs/ImportPlaylistDialog.kt +++ b/app/src/main/java/code/name/monkey/retromusic/dialogs/ImportPlaylistDialog.kt @@ -21,10 +21,10 @@ import code.name.monkey.retromusic.R import code.name.monkey.retromusic.extensions.colorButtons import code.name.monkey.retromusic.extensions.materialDialog import code.name.monkey.retromusic.fragments.LibraryViewModel -import org.koin.androidx.viewmodel.ext.android.sharedViewModel +import org.koin.androidx.viewmodel.ext.android.activityViewModel class ImportPlaylistDialog : DialogFragment() { - private val libraryViewModel by sharedViewModel() + private val libraryViewModel by activityViewModel() override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { return materialDialog(R.string.import_playlist) diff --git a/app/src/main/java/code/name/monkey/retromusic/dialogs/RemoveSongFromPlaylistDialog.kt b/app/src/main/java/code/name/monkey/retromusic/dialogs/RemoveSongFromPlaylistDialog.kt index a51479248..cd94bc480 100644 --- a/app/src/main/java/code/name/monkey/retromusic/dialogs/RemoveSongFromPlaylistDialog.kt +++ b/app/src/main/java/code/name/monkey/retromusic/dialogs/RemoveSongFromPlaylistDialog.kt @@ -26,10 +26,10 @@ import code.name.monkey.retromusic.extensions.colorButtons import code.name.monkey.retromusic.extensions.extraNotNull import code.name.monkey.retromusic.extensions.materialDialog import code.name.monkey.retromusic.fragments.LibraryViewModel -import org.koin.androidx.viewmodel.ext.android.sharedViewModel +import org.koin.androidx.viewmodel.ext.android.activityViewModel class RemoveSongFromPlaylistDialog : DialogFragment() { - private val libraryViewModel by sharedViewModel() + private val libraryViewModel by activityViewModel() companion object { fun create(song: SongEntity): RemoveSongFromPlaylistDialog { diff --git a/app/src/main/java/code/name/monkey/retromusic/dialogs/RenamePlaylistDialog.kt b/app/src/main/java/code/name/monkey/retromusic/dialogs/RenamePlaylistDialog.kt index 18a3ab714..803315277 100644 --- a/app/src/main/java/code/name/monkey/retromusic/dialogs/RenamePlaylistDialog.kt +++ b/app/src/main/java/code/name/monkey/retromusic/dialogs/RenamePlaylistDialog.kt @@ -29,11 +29,11 @@ import code.name.monkey.retromusic.fragments.LibraryViewModel import code.name.monkey.retromusic.fragments.ReloadType import com.google.android.material.textfield.TextInputEditText import com.google.android.material.textfield.TextInputLayout -import org.koin.androidx.viewmodel.ext.android.sharedViewModel +import org.koin.androidx.viewmodel.ext.android.activityViewModel class RenamePlaylistDialog : DialogFragment() { - private val libraryViewModel by sharedViewModel() + private val libraryViewModel by activityViewModel() companion object { fun create(playlistEntity: PlaylistEntity): RenamePlaylistDialog { diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/about/AboutFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/about/AboutFragment.kt index 5b549ce89..a1e5eee72 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/about/AboutFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/about/AboutFragment.kt @@ -30,12 +30,12 @@ import code.name.monkey.retromusic.extensions.openUrl import code.name.monkey.retromusic.fragments.LibraryViewModel import code.name.monkey.retromusic.util.NavigationUtil import dev.chrisbanes.insetter.applyInsetter -import org.koin.androidx.viewmodel.ext.android.sharedViewModel +import org.koin.androidx.viewmodel.ext.android.activityViewModel class AboutFragment : Fragment(R.layout.fragment_about), View.OnClickListener { private var _binding: FragmentAboutBinding? = null private val binding get() = _binding!! - private val libraryViewModel by sharedViewModel() + private val libraryViewModel by activityViewModel() override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/albums/AlbumDetailsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/albums/AlbumDetailsFragment.kt index 6fdbbf967..f9efbf0ad 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/albums/AlbumDetailsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/albums/AlbumDetailsFragment.kt @@ -18,7 +18,11 @@ import android.app.ActivityOptions import android.content.Intent import android.graphics.Color import android.os.Bundle -import android.view.* +import android.view.Menu +import android.view.MenuInflater +import android.view.MenuItem +import android.view.SubMenu +import android.view.View import androidx.appcompat.app.AppCompatActivity import androidx.core.os.bundleOf import androidx.core.text.parseAsHtml @@ -43,10 +47,16 @@ import code.name.monkey.retromusic.adapter.song.SimpleSongAdapter import code.name.monkey.retromusic.databinding.FragmentAlbumDetailsBinding import code.name.monkey.retromusic.dialogs.AddToPlaylistDialog import code.name.monkey.retromusic.dialogs.DeleteSongsDialog -import code.name.monkey.retromusic.extensions.* +import code.name.monkey.retromusic.extensions.applyColor +import code.name.monkey.retromusic.extensions.applyOutlineColor +import code.name.monkey.retromusic.extensions.findActivityNavController +import code.name.monkey.retromusic.extensions.show +import code.name.monkey.retromusic.extensions.surfaceColor import code.name.monkey.retromusic.fragments.base.AbsMainActivityFragment -import code.name.monkey.retromusic.glide.GlideApp import code.name.monkey.retromusic.glide.RetroGlideExtension +import code.name.monkey.retromusic.glide.RetroGlideExtension.albumCoverOptions +import code.name.monkey.retromusic.glide.RetroGlideExtension.artistImageOptions +import code.name.monkey.retromusic.glide.RetroGlideExtension.asBitmapPalette import code.name.monkey.retromusic.glide.SingleColorTarget import code.name.monkey.retromusic.helper.MusicPlayerRemote import code.name.monkey.retromusic.helper.SortOrder.AlbumSongSortOrder.Companion.SONG_A_Z @@ -59,7 +69,12 @@ import code.name.monkey.retromusic.model.Artist import code.name.monkey.retromusic.network.Result import code.name.monkey.retromusic.network.model.LastFmAlbum import code.name.monkey.retromusic.repository.RealRepository -import code.name.monkey.retromusic.util.* +import code.name.monkey.retromusic.util.MusicUtil +import code.name.monkey.retromusic.util.PreferenceUtil +import code.name.monkey.retromusic.util.RetroUtil +import code.name.monkey.retromusic.util.logD +import code.name.monkey.retromusic.util.logE +import com.bumptech.glide.Glide import com.google.android.material.shape.MaterialShapeDrawable import com.google.android.material.transition.MaterialArcMotion import com.google.android.material.transition.MaterialContainerTransform @@ -230,9 +245,11 @@ class AlbumDetailsFragment : AbsMainActivityFragment(R.layout.fragment_album_det is Result.Loading -> { logD("Loading") } + is Result.Error -> { logE("Error") } + is Result.Success -> { aboutAlbum(result.data) } @@ -285,7 +302,7 @@ class AlbumDetailsFragment : AbsMainActivityFragment(R.layout.fragment_album_det detailsViewModel.getMoreAlbums(artist).observe(viewLifecycleOwner) { moreAlbums(it) } - GlideApp.with(requireContext()) + Glide.with(requireContext()) //.forceDownload(PreferenceUtil.isAllowedToDownloadMetadata()) .load( RetroGlideExtension.getArtistModel( @@ -300,7 +317,8 @@ class AlbumDetailsFragment : AbsMainActivityFragment(R.layout.fragment_album_det } private fun loadAlbumCover(album: Album) { - GlideApp.with(requireContext()).asBitmapPalette() + Glide.with(requireContext()) + .asBitmapPalette() .albumCoverOptions(album.safeGetFirstSong()) //.checkIgnoreMediaStore() .load(RetroGlideExtension.getSongModel(album.safeGetFirstSong())) @@ -354,10 +372,12 @@ class AlbumDetailsFragment : AbsMainActivityFragment(R.layout.fragment_album_det MusicPlayerRemote.playNext(songs) return true } + R.id.action_add_to_current_playing -> { MusicPlayerRemote.enqueue(songs) return true } + R.id.action_add_to_playlist -> { lifecycleScope.launch(Dispatchers.IO) { val playlists = get().fetchPlaylists() @@ -368,10 +388,12 @@ class AlbumDetailsFragment : AbsMainActivityFragment(R.layout.fragment_album_det } return true } + R.id.action_delete_from_device -> { DeleteSongsDialog.create(songs).show(childFragmentManager, "DELETE_SONGS") return true } + R.id.action_tag_editor -> { val intent = Intent(requireContext(), AlbumTagEditorActivity::class.java) intent.putExtra(AbsTagEditorActivity.EXTRA_ID, album.id) @@ -385,6 +407,7 @@ class AlbumDetailsFragment : AbsMainActivityFragment(R.layout.fragment_album_det ) return true } + R.id.action_sort_order_title -> sortOrder = SONG_A_Z R.id.action_sort_order_title_desc -> sortOrder = SONG_Z_A R.id.action_sort_order_track_list -> sortOrder = SONG_TRACK_LIST @@ -403,6 +426,7 @@ class AlbumDetailsFragment : AbsMainActivityFragment(R.layout.fragment_album_det SONG_Z_A -> sortOrder.findItem(R.id.action_sort_order_title_desc).isChecked = true SONG_TRACK_LIST -> sortOrder.findItem(R.id.action_sort_order_track_list).isChecked = true + SONG_DURATION -> sortOrder.findItem(R.id.action_sort_order_artist_song_duration).isChecked = true } @@ -416,19 +440,23 @@ class AlbumDetailsFragment : AbsMainActivityFragment(R.layout.fragment_album_det o2.trackNumber ) } + SONG_A_Z -> { val collator = Collator.getInstance() album.songs.sortedWith { o1, o2 -> collator.compare(o1.title, o2.title) } } + SONG_Z_A -> { val collator = Collator.getInstance() album.songs.sortedWith { o1, o2 -> collator.compare(o2.title, o1.title) } } + SONG_DURATION -> album.songs.sortedWith { o1, o2 -> o1.duration.compareTo( o2.duration ) } + else -> throw IllegalArgumentException("invalid $sortOrder") } album = album.copy(songs = songs) diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/artists/AbsArtistDetailsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/artists/AbsArtistDetailsFragment.kt index 4af6750dc..3dfae6cd5 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/artists/AbsArtistDetailsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/artists/AbsArtistDetailsFragment.kt @@ -27,10 +27,15 @@ import code.name.monkey.retromusic.adapter.album.HorizontalAlbumAdapter import code.name.monkey.retromusic.adapter.song.SimpleSongAdapter import code.name.monkey.retromusic.databinding.FragmentArtistDetailsBinding import code.name.monkey.retromusic.dialogs.AddToPlaylistDialog -import code.name.monkey.retromusic.extensions.* +import code.name.monkey.retromusic.extensions.applyColor +import code.name.monkey.retromusic.extensions.applyOutlineColor +import code.name.monkey.retromusic.extensions.show +import code.name.monkey.retromusic.extensions.showToast +import code.name.monkey.retromusic.extensions.surfaceColor import code.name.monkey.retromusic.fragments.base.AbsMainActivityFragment -import code.name.monkey.retromusic.glide.GlideApp import code.name.monkey.retromusic.glide.RetroGlideExtension +import code.name.monkey.retromusic.glide.RetroGlideExtension.artistImageOptions +import code.name.monkey.retromusic.glide.RetroGlideExtension.asBitmapPalette import code.name.monkey.retromusic.glide.SingleColorTarget import code.name.monkey.retromusic.helper.MusicPlayerRemote import code.name.monkey.retromusic.helper.SortOrder @@ -39,14 +44,20 @@ import code.name.monkey.retromusic.model.Artist import code.name.monkey.retromusic.network.Result import code.name.monkey.retromusic.network.model.LastFmArtist import code.name.monkey.retromusic.repository.RealRepository -import code.name.monkey.retromusic.util.* +import code.name.monkey.retromusic.util.CustomArtistImageUtil +import code.name.monkey.retromusic.util.MusicUtil +import code.name.monkey.retromusic.util.PreferenceUtil +import code.name.monkey.retromusic.util.RetroUtil +import code.name.monkey.retromusic.util.logD +import code.name.monkey.retromusic.util.logE +import com.bumptech.glide.Glide import com.google.android.material.shape.MaterialShapeDrawable import com.google.android.material.transition.MaterialContainerTransform import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import kotlinx.coroutines.withContext import org.koin.android.ext.android.get -import java.util.* +import java.util.Locale abstract class AbsArtistDetailsFragment : AbsMainActivityFragment(R.layout.fragment_artist_details), IAlbumClickListener { @@ -203,7 +214,9 @@ abstract class AbsArtistDetailsFragment : AbsMainActivityFragment(R.layout.fragm } private fun loadArtistImage(artist: Artist) { - GlideApp.with(requireContext()).asBitmapPalette().artistImageOptions(artist) + Glide.with(requireContext()) + .asBitmapPalette() + .artistImageOptions(artist) .load(RetroGlideExtension.getArtistModel(artist)) .dontAnimate() .into(object : SingleColorTarget(binding.image) { @@ -243,10 +256,12 @@ abstract class AbsArtistDetailsFragment : AbsMainActivityFragment(R.layout.fragm MusicPlayerRemote.playNext(songs) return true } + R.id.action_add_to_current_playing -> { MusicPlayerRemote.enqueue(songs) return true } + R.id.action_add_to_playlist -> { lifecycleScope.launch(Dispatchers.IO) { val playlists = get().fetchPlaylists() @@ -257,6 +272,7 @@ abstract class AbsArtistDetailsFragment : AbsMainActivityFragment(R.layout.fragm } return true } + R.id.action_set_artist_image -> { val intent = Intent(Intent.ACTION_GET_CONTENT) intent.type = "image/*" @@ -268,6 +284,7 @@ abstract class AbsArtistDetailsFragment : AbsMainActivityFragment(R.layout.fragm ) return true } + R.id.action_reset_artist_image -> { showToast(resources.getString(R.string.updating)) lifecycleScope.launch { @@ -315,14 +332,19 @@ abstract class AbsArtistDetailsFragment : AbsMainActivityFragment(R.layout.fragm when (savedSongSortOrder) { SortOrder.ArtistSongSortOrder.SONG_A_Z -> sortOrder.findItem(R.id.action_sort_order_title).isChecked = true + SortOrder.ArtistSongSortOrder.SONG_Z_A -> sortOrder.findItem(R.id.action_sort_order_title_desc).isChecked = true + SortOrder.ArtistSongSortOrder.SONG_ALBUM -> sortOrder.findItem(R.id.action_sort_order_album).isChecked = true + SortOrder.ArtistSongSortOrder.SONG_YEAR -> sortOrder.findItem(R.id.action_sort_order_year).isChecked = true + SortOrder.ArtistSongSortOrder.SONG_DURATION -> sortOrder.findItem(R.id.action_sort_order_song_duration).isChecked = true + else -> { throw IllegalArgumentException("invalid $savedSongSortOrder") } diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsMainActivityFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsMainActivityFragment.kt index 8571ffdcb..31018b1c3 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsMainActivityFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsMainActivityFragment.kt @@ -22,18 +22,18 @@ import androidx.core.view.MenuProvider import androidx.lifecycle.Lifecycle import code.name.monkey.retromusic.activities.MainActivity import code.name.monkey.retromusic.fragments.LibraryViewModel -import org.koin.androidx.viewmodel.ext.android.sharedViewModel +import org.koin.androidx.viewmodel.ext.android.activityViewModel abstract class AbsMainActivityFragment(@LayoutRes layout: Int) : AbsMusicServiceFragment(layout), MenuProvider { - val libraryViewModel: LibraryViewModel by sharedViewModel() + val libraryViewModel: LibraryViewModel by activityViewModel() val mainActivity: MainActivity get() = activity as MainActivity override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) - val menuHost: MenuHost = requireActivity() as MenuHost + val menuHost: MenuHost = requireActivity() menuHost.addMenuProvider(this, viewLifecycleOwner, Lifecycle.State.STARTED) } } diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsPlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsPlayerFragment.kt index e1da72d8a..a1d52c580 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsPlayerFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsPlayerFragment.kt @@ -65,13 +65,13 @@ import kotlinx.coroutines.Dispatchers.Main import kotlinx.coroutines.launch import kotlinx.coroutines.withContext import org.koin.android.ext.android.get -import org.koin.androidx.viewmodel.ext.android.sharedViewModel +import org.koin.androidx.viewmodel.ext.android.activityViewModel import kotlin.math.abs abstract class AbsPlayerFragment(@LayoutRes layout: Int) : AbsMusicServiceFragment(layout), Toolbar.OnMenuItemClickListener, IPaletteColorHolder, PlayerAlbumCoverFragment.Callbacks { - val libraryViewModel: LibraryViewModel by sharedViewModel() + val libraryViewModel: LibraryViewModel by activityViewModel() val mainActivity: MainActivity get() = activity as MainActivity @@ -87,6 +87,7 @@ abstract class AbsPlayerFragment(@LayoutRes layout: Int) : AbsMusicServiceFragme PlaybackSpeedDialog.newInstance().show(childFragmentManager, "PLAYBACK_SETTINGS") return true } + R.id.action_toggle_lyrics -> { PreferenceUtil.showLyrics = !PreferenceUtil.showLyrics showLyricsIcon(item) @@ -97,26 +98,32 @@ abstract class AbsPlayerFragment(@LayoutRes layout: Int) : AbsMusicServiceFragme } return true } + R.id.action_go_to_lyrics -> { goToLyrics(requireActivity()) return true } + R.id.action_toggle_favorite -> { toggleFavorite(song) return true } + R.id.action_share -> { SongShareDialog.create(song).show(childFragmentManager, "SHARE_SONG") return true } + R.id.action_go_to_drive_mode -> { NavigationUtil.gotoDriveMode(requireActivity()) return true } + R.id.action_delete_from_device -> { DeleteSongsDialog.create(song).show(childFragmentManager, "DELETE_SONGS") return true } + R.id.action_add_to_playlist -> { lifecycleScope.launch(IO) { val playlists = get().fetchPlaylists() @@ -127,25 +134,30 @@ abstract class AbsPlayerFragment(@LayoutRes layout: Int) : AbsMusicServiceFragme } return true } + R.id.action_clear_playing_queue -> { MusicPlayerRemote.clearQueue() return true } + R.id.action_save_playing_queue -> { CreatePlaylistDialog.create(ArrayList(MusicPlayerRemote.playingQueue)) .show(childFragmentManager, "ADD_TO_PLAYLIST") return true } + R.id.action_tag_editor -> { val intent = Intent(activity, SongTagEditorActivity::class.java) intent.putExtra(AbsTagEditorActivity.EXTRA_ID, song.id) startActivity(intent) return true } + R.id.action_details -> { SongDetailDialog.create(song).show(childFragmentManager, "SONG_DETAIL") return true } + R.id.action_go_to_album -> { //Hide Bottom Bar First, else Bottom Sheet doesn't collapse fully mainActivity.setBottomNavVisibility(false) @@ -156,10 +168,12 @@ abstract class AbsPlayerFragment(@LayoutRes layout: Int) : AbsMusicServiceFragme ) return true } + R.id.action_go_to_artist -> { goToArtist(requireActivity()) return true } + R.id.now_playing -> { requireActivity().findNavController(R.id.fragment_container).navigate( R.id.playing_queue_fragment, @@ -169,18 +183,22 @@ abstract class AbsPlayerFragment(@LayoutRes layout: Int) : AbsMusicServiceFragme mainActivity.collapsePanel() return true } + R.id.action_show_lyrics -> { goToLyrics(requireActivity()) return true } + R.id.action_equalizer -> { NavigationUtil.openEqualizer(requireActivity()) return true } + R.id.action_sleep_timer -> { SleepTimerDialog().show(parentFragmentManager, "SLEEP_TIMER") return true } + R.id.action_set_as_ringtone -> { requireContext().run { if (RingtoneManager.requiresDialog(this)) { @@ -192,6 +210,7 @@ abstract class AbsPlayerFragment(@LayoutRes layout: Int) : AbsMusicServiceFragme return true } + R.id.action_go_to_genre -> { val retriever = MediaMetadataRetriever() val trackUri = @@ -363,6 +382,7 @@ abstract class AbsPlayerFragment(@LayoutRes layout: Int) : AbsMusicServiceFragme view.parent.requestDisallowInterceptTouchEvent(true) true } + else -> { false } diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/folder/FoldersFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/folder/FoldersFragment.kt index c3c23460e..6933cd183 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/folder/FoldersFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/folder/FoldersFragment.kt @@ -17,7 +17,11 @@ import android.content.Context import android.media.MediaScannerConnection import android.os.Bundle import android.os.Environment -import android.view.* +import android.view.Menu +import android.view.MenuInflater +import android.view.MenuItem +import android.view.View +import android.view.ViewGroup import android.webkit.MimeTypeMap import androidx.activity.OnBackPressedCallback import androidx.appcompat.widget.PopupMenu @@ -70,7 +74,8 @@ import java.io.File import java.io.FileFilter import java.io.IOException import java.lang.ref.WeakReference -import java.util.* +import java.util.Collections +import java.util.LinkedList class FoldersFragment : AbsMainActivityFragment(R.layout.fragment_folder), IMainActivityFragmentCallbacks, SelectionCallback, ICallbacks, @@ -113,7 +118,7 @@ class FoldersFragment : AbsMainActivityFragment(R.layout.fragment_folder), override fun handleOnBackPressed() { if (!handleBackPress()) { remove() - requireActivity().onBackPressed() + requireActivity().onBackPressedDispatcher.onBackPressed() } } }) @@ -187,10 +192,12 @@ class FoldersFragment : AbsMainActivityFragment(R.layout.fragment_folder), } return@setOnMenuItemClickListener true } + R.id.action_add_to_blacklist -> { BlacklistStore.getInstance(requireContext()).addPath(file) return@setOnMenuItemClickListener true } + R.id.action_set_as_start_directory -> { startDirectory = file showToast( @@ -198,6 +205,7 @@ class FoldersFragment : AbsMainActivityFragment(R.layout.fragment_folder), ) return@setOnMenuItemClickListener true } + R.id.action_scan -> { lifecycleScope.launch { listPaths(file, AUDIO_FILE_FILTER) { paths -> scanPaths(paths) } @@ -229,6 +237,7 @@ class FoldersFragment : AbsMainActivityFragment(R.layout.fragment_folder), } return@setOnMenuItemClickListener true } + R.id.action_scan -> { lifecycleScope.launch { listPaths(file, AUDIO_FILE_FILTER) { paths -> scanPaths(paths) } @@ -353,6 +362,7 @@ class FoldersFragment : AbsMainActivityFragment(R.layout.fragment_folder), ) return true } + R.id.action_scan -> { val crumb = activeCrumb if (crumb != null) { @@ -362,6 +372,7 @@ class FoldersFragment : AbsMainActivityFragment(R.layout.fragment_folder), } return true } + R.id.action_settings -> { findNavController().navigate( R.id.settings_fragment, diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/home/HomeFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/home/HomeFragment.kt index 4a915690e..729fa44fb 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/home/HomeFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/home/HomeFragment.kt @@ -15,8 +15,12 @@ package code.name.monkey.retromusic.fragments.home import android.os.Bundle -import android.view.* +import android.view.Menu +import android.view.MenuInflater +import android.view.MenuItem import android.view.MenuItem.SHOW_AS_ACTION_IF_ROOM +import android.view.View +import android.view.ViewGroup import androidx.coordinatorlayout.widget.CoordinatorLayout import androidx.core.os.bundleOf import androidx.core.text.parseAsHtml @@ -30,21 +34,32 @@ import androidx.recyclerview.widget.LinearLayoutManager import code.name.monkey.appthemehelper.common.ATHToolbarActivity import code.name.monkey.appthemehelper.util.ColorUtil import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper -import code.name.monkey.retromusic.* +import code.name.monkey.retromusic.EXTRA_PLAYLIST_TYPE +import code.name.monkey.retromusic.HISTORY_PLAYLIST +import code.name.monkey.retromusic.LAST_ADDED_PLAYLIST +import code.name.monkey.retromusic.R +import code.name.monkey.retromusic.TOP_PLAYED_PLAYLIST import code.name.monkey.retromusic.adapter.HomeAdapter import code.name.monkey.retromusic.databinding.FragmentHomeBinding import code.name.monkey.retromusic.dialogs.CreatePlaylistDialog import code.name.monkey.retromusic.dialogs.ImportPlaylistDialog -import code.name.monkey.retromusic.extensions.* +import code.name.monkey.retromusic.extensions.accentColor +import code.name.monkey.retromusic.extensions.dip +import code.name.monkey.retromusic.extensions.drawNextToNavbar +import code.name.monkey.retromusic.extensions.elevatedAccentColor +import code.name.monkey.retromusic.extensions.setUpMediaRouteButton import code.name.monkey.retromusic.fragments.ReloadType import code.name.monkey.retromusic.fragments.base.AbsMainActivityFragment -import code.name.monkey.retromusic.glide.GlideApp import code.name.monkey.retromusic.glide.RetroGlideExtension +import code.name.monkey.retromusic.glide.RetroGlideExtension.profileBannerOptions +import code.name.monkey.retromusic.glide.RetroGlideExtension.songCoverOptions +import code.name.monkey.retromusic.glide.RetroGlideExtension.userProfileOptions import code.name.monkey.retromusic.helper.MusicPlayerRemote import code.name.monkey.retromusic.interfaces.IScrollHelper import code.name.monkey.retromusic.model.Song import code.name.monkey.retromusic.util.PreferenceUtil import code.name.monkey.retromusic.util.PreferenceUtil.userName +import com.bumptech.glide.Glide import com.google.android.material.shape.MaterialShapeDrawable import com.google.android.material.transition.MaterialFadeThrough import com.google.android.material.transition.MaterialSharedAxis @@ -169,12 +184,12 @@ class HomeFragment : private fun loadProfile() { binding.bannerImage?.let { - GlideApp.with(requireContext()) + Glide.with(requireContext()) .load(RetroGlideExtension.getBannerModel()) .profileBannerOptions(RetroGlideExtension.getBannerModel()) .into(it) } - GlideApp.with(requireActivity()) + Glide.with(requireActivity()) .load(RetroGlideExtension.getUserModel()) .userProfileOptions(RetroGlideExtension.getUserModel(), requireContext()) .into(binding.userImage) @@ -265,7 +280,7 @@ class HomeFragment : MusicPlayerRemote.playNextSong() } } - GlideApp.with(this) + Glide.with(this) .load(RetroGlideExtension.getSongModel(songs[index])) .songCoverOptions(songs[index]) .into(imageView) @@ -289,10 +304,12 @@ class HomeFragment : null, navOptions ) + R.id.action_import_playlist -> ImportPlaylistDialog().show( childFragmentManager, "ImportPlaylist" ) + R.id.action_add_to_playlist -> CreatePlaylistDialog.create(emptyList()).show( childFragmentManager, "ShowCreatePlaylistDialog" diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/other/MiniPlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/other/MiniPlayerFragment.kt index 552773b91..0ae18f6dd 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/other/MiniPlayerFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/other/MiniPlayerFragment.kt @@ -31,13 +31,14 @@ import code.name.monkey.retromusic.extensions.show import code.name.monkey.retromusic.extensions.textColorPrimary import code.name.monkey.retromusic.extensions.textColorSecondary import code.name.monkey.retromusic.fragments.base.AbsMusicServiceFragment -import code.name.monkey.retromusic.glide.GlideApp import code.name.monkey.retromusic.glide.RetroGlideExtension +import code.name.monkey.retromusic.glide.RetroGlideExtension.songCoverOptions import code.name.monkey.retromusic.helper.MusicPlayerRemote import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper import code.name.monkey.retromusic.helper.PlayPauseButtonOnClickHandler import code.name.monkey.retromusic.util.PreferenceUtil import code.name.monkey.retromusic.util.RetroUtil +import com.bumptech.glide.Glide import kotlin.math.abs open class MiniPlayerFragment : AbsMusicServiceFragment(R.layout.fragment_mini_player), @@ -113,7 +114,7 @@ open class MiniPlayerFragment : AbsMusicServiceFragment(R.layout.fragment_mini_p private fun updateSongCover() { val song = MusicPlayerRemote.currentSong - GlideApp.with(requireContext()) + Glide.with(requireContext()) .load(RetroGlideExtension.getSongModel(song)) .transition(RetroGlideExtension.getDefaultTransition()) .songCoverOptions(song) diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/other/UserInfoFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/other/UserInfoFragment.kt index 7b4946506..16a013a0a 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/other/UserInfoFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/other/UserInfoFragment.kt @@ -37,8 +37,9 @@ import code.name.monkey.retromusic.extensions.accentColor import code.name.monkey.retromusic.extensions.applyToolbar import code.name.monkey.retromusic.extensions.showToast import code.name.monkey.retromusic.fragments.LibraryViewModel -import code.name.monkey.retromusic.glide.GlideApp import code.name.monkey.retromusic.glide.RetroGlideExtension +import code.name.monkey.retromusic.glide.RetroGlideExtension.profileBannerOptions +import code.name.monkey.retromusic.glide.RetroGlideExtension.userProfileOptions import code.name.monkey.retromusic.util.ImageUtil import code.name.monkey.retromusic.util.PreferenceUtil.userName import com.bumptech.glide.Glide @@ -54,14 +55,14 @@ import com.google.android.material.transition.MaterialContainerTransform import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import kotlinx.coroutines.withContext -import org.koin.androidx.viewmodel.ext.android.sharedViewModel +import org.koin.androidx.viewmodel.ext.android.activityViewModel import java.io.File class UserInfoFragment : Fragment() { private var _binding: FragmentUserInfoBinding? = null private val binding get() = _binding!! - private val libraryViewModel: LibraryViewModel by sharedViewModel() + private val libraryViewModel: LibraryViewModel by activityViewModel() override fun onCreateView( inflater: LayoutInflater, @@ -155,12 +156,12 @@ class UserInfoFragment : Fragment() { private fun loadProfile() { binding.bannerImage.let { - GlideApp.with(this) + Glide.with(this) .load(RetroGlideExtension.getBannerModel()) .profileBannerOptions(RetroGlideExtension.getBannerModel()) .into(it) } - GlideApp.with(this) + Glide.with(this) .load(RetroGlideExtension.getUserModel()) .userProfileOptions(RetroGlideExtension.getUserModel(), requireContext()) .into(binding.userImage) @@ -209,9 +210,11 @@ class UserInfoFragment : Fragment() { doIfResultOk(uri) } } + ImagePicker.RESULT_ERROR -> { showToast(ImagePicker.getError(data)) } + else -> { showToast("Task Cancelled") } diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/adaptive/AdaptiveFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/adaptive/AdaptiveFragment.kt index a67eadd9c..9fb6dda8f 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/adaptive/AdaptiveFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/adaptive/AdaptiveFragment.kt @@ -20,7 +20,12 @@ import androidx.appcompat.widget.Toolbar import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper import code.name.monkey.retromusic.R import code.name.monkey.retromusic.databinding.FragmentAdaptivePlayerBinding -import code.name.monkey.retromusic.extensions.* +import code.name.monkey.retromusic.extensions.colorControlNormal +import code.name.monkey.retromusic.extensions.drawAboveSystemBars +import code.name.monkey.retromusic.extensions.surfaceColor +import code.name.monkey.retromusic.extensions.textColorPrimary +import code.name.monkey.retromusic.extensions.textColorSecondary +import code.name.monkey.retromusic.extensions.whichFragment import code.name.monkey.retromusic.fragments.base.AbsPlayerFragment import code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment import code.name.monkey.retromusic.helper.MusicPlayerRemote @@ -60,7 +65,7 @@ class AdaptiveFragment : AbsPlayerFragment(R.layout.fragment_adaptive_player) { private fun setUpPlayerToolbar() { binding.playerToolbar.apply { inflateMenu(R.menu.menu_player) - setNavigationOnClickListener { requireActivity().onBackPressed() } + setNavigationOnClickListener { requireActivity().onBackPressedDispatcher.onBackPressed() } ToolbarContentTintHelper.colorizeToolbar(this, surfaceColor(), requireActivity()) setTitleTextColor(textColorPrimary()) setSubtitleTextColor(textColorSecondary()) diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/blur/BlurPlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/blur/BlurPlayerFragment.kt index 8c631bb01..48798ff45 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/blur/BlurPlayerFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/blur/BlurPlayerFragment.kt @@ -30,17 +30,22 @@ import code.name.monkey.retromusic.extensions.drawAboveSystemBars import code.name.monkey.retromusic.extensions.whichFragment import code.name.monkey.retromusic.fragments.base.AbsPlayerFragment import code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment -import code.name.monkey.retromusic.glide.* +import code.name.monkey.retromusic.glide.BlurTransformation +import code.name.monkey.retromusic.glide.RetroGlideExtension +import code.name.monkey.retromusic.glide.RetroGlideExtension.simpleSongCoverOptions +import code.name.monkey.retromusic.glide.crossfadeListener import code.name.monkey.retromusic.helper.MusicPlayerRemote import code.name.monkey.retromusic.model.Song import code.name.monkey.retromusic.util.PreferenceUtil.blurAmount import code.name.monkey.retromusic.util.color.MediaNotificationProcessor +import com.bumptech.glide.Glide +import com.bumptech.glide.RequestBuilder class BlurPlayerFragment : AbsPlayerFragment(R.layout.fragment_blur), SharedPreferences.OnSharedPreferenceChangeListener { - private var lastRequest: GlideRequest? = null + private var lastRequest: RequestBuilder? = null override fun playerToolbar(): Toolbar { return binding.playerToolbar @@ -72,7 +77,7 @@ class BlurPlayerFragment : AbsPlayerFragment(R.layout.fragment_blur), private fun setUpPlayerToolbar() { binding.playerToolbar.apply { inflateMenu(R.menu.menu_player) - setNavigationOnClickListener { requireActivity().onBackPressed() } + setNavigationOnClickListener { requireActivity().onBackPressedDispatcher.onBackPressed() } ToolbarContentTintHelper.colorizeToolbar(this, Color.WHITE, activity) }.setOnMenuItemClickListener(this) } @@ -114,14 +119,14 @@ class BlurPlayerFragment : AbsPlayerFragment(R.layout.fragment_blur), private fun updateBlur() { // https://github.com/bumptech/glide/issues/527#issuecomment-148840717 - GlideApp.with(this) + Glide.with(this) .load(RetroGlideExtension.getSongModel(MusicPlayerRemote.currentSong)) .simpleSongCoverOptions(MusicPlayerRemote.currentSong) .transform( BlurTransformation.Builder(requireContext()).blurRadius(blurAmount.toFloat()) .build() ).thumbnail(lastRequest) - .error(GlideApp.with(this).load(ColorDrawable(Color.DKGRAY)).fitCenter()) + .error(Glide.with(this).load(ColorDrawable(Color.DKGRAY)).fitCenter()) .also { lastRequest = it.clone() it.crossfadeListener() diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/card/CardFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/card/CardFragment.kt index c75448b27..d2ce1d9cb 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/card/CardFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/card/CardFragment.kt @@ -97,7 +97,7 @@ class CardFragment : AbsPlayerFragment(R.layout.fragment_card_player) { private fun setUpPlayerToolbar() { binding.playerToolbar.apply { inflateMenu(R.menu.menu_player) - setNavigationOnClickListener { requireActivity().onBackPressed() } + setNavigationOnClickListener { requireActivity().onBackPressedDispatcher.onBackPressed() } setOnMenuItemClickListener(this@CardFragment) ToolbarContentTintHelper.colorizeToolbar(this, Color.WHITE, activity) diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/cardblur/CardBlurFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/cardblur/CardBlurFragment.kt index f3d26ed19..9a4726610 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/cardblur/CardBlurFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/cardblur/CardBlurFragment.kt @@ -30,11 +30,16 @@ import code.name.monkey.retromusic.extensions.whichFragment import code.name.monkey.retromusic.fragments.base.AbsPlayerFragment import code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment import code.name.monkey.retromusic.fragments.player.normal.PlayerFragment -import code.name.monkey.retromusic.glide.* +import code.name.monkey.retromusic.glide.BlurTransformation +import code.name.monkey.retromusic.glide.RetroGlideExtension +import code.name.monkey.retromusic.glide.RetroGlideExtension.simpleSongCoverOptions +import code.name.monkey.retromusic.glide.crossfadeListener import code.name.monkey.retromusic.helper.MusicPlayerRemote import code.name.monkey.retromusic.model.Song import code.name.monkey.retromusic.util.PreferenceUtil.blurAmount import code.name.monkey.retromusic.util.color.MediaNotificationProcessor +import com.bumptech.glide.Glide +import com.bumptech.glide.RequestBuilder class CardBlurFragment : AbsPlayerFragment(R.layout.fragment_card_blur_player), SharedPreferences.OnSharedPreferenceChangeListener { @@ -49,7 +54,7 @@ class CardBlurFragment : AbsPlayerFragment(R.layout.fragment_card_blur_player), private var _binding: FragmentCardBlurPlayerBinding? = null private val binding get() = _binding!! - private var lastRequest: GlideRequest? = null + private var lastRequest: RequestBuilder? = null override fun onShow() { playbackControlsFragment.show() @@ -108,7 +113,7 @@ class CardBlurFragment : AbsPlayerFragment(R.layout.fragment_card_blur_player), private fun setUpPlayerToolbar() { binding.playerToolbar.apply { inflateMenu(R.menu.menu_player) - setNavigationOnClickListener { requireActivity().onBackPressed() } + setNavigationOnClickListener { requireActivity().onBackPressedDispatcher.onBackPressed() } setTitleTextColor(Color.WHITE) setSubtitleTextColor(Color.WHITE) ToolbarContentTintHelper.colorizeToolbar(binding.playerToolbar, Color.WHITE, activity) @@ -138,7 +143,7 @@ class CardBlurFragment : AbsPlayerFragment(R.layout.fragment_card_blur_player), private fun updateBlur() { // https://github.com/bumptech/glide/issues/527#issuecomment-148840717 - GlideApp.with(this) + Glide.with(this) .load(RetroGlideExtension.getSongModel(MusicPlayerRemote.currentSong)) .simpleSongCoverOptions(MusicPlayerRemote.currentSong) .transform( diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/circle/CirclePlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/circle/CirclePlayerFragment.kt index c98c4fdd6..eacc6e43d 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/circle/CirclePlayerFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/circle/CirclePlayerFragment.kt @@ -38,9 +38,8 @@ import code.name.monkey.retromusic.fragments.MusicSeekSkipTouchListener import code.name.monkey.retromusic.fragments.base.AbsPlayerFragment import code.name.monkey.retromusic.fragments.base.goToAlbum import code.name.monkey.retromusic.fragments.base.goToArtist -import code.name.monkey.retromusic.glide.GlideApp -import code.name.monkey.retromusic.glide.GlideRequest import code.name.monkey.retromusic.glide.RetroGlideExtension +import code.name.monkey.retromusic.glide.RetroGlideExtension.simpleSongCoverOptions import code.name.monkey.retromusic.glide.crossfadeListener import code.name.monkey.retromusic.helper.MusicPlayerRemote import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper @@ -51,6 +50,8 @@ import code.name.monkey.retromusic.util.PreferenceUtil import code.name.monkey.retromusic.util.color.MediaNotificationProcessor import code.name.monkey.retromusic.volume.AudioVolumeObserver import code.name.monkey.retromusic.volume.OnAudioVolumeChangedListener +import com.bumptech.glide.Glide +import com.bumptech.glide.RequestBuilder import com.google.android.material.slider.Slider import me.tankery.lib.circularseekbar.CircularSeekBar @@ -72,9 +73,8 @@ class CirclePlayerFragment : AbsPlayerFragment(R.layout.fragment_circle_player), private val binding get() = _binding!! private var rotateAnimator: ObjectAnimator? = null - private var lastRequest: GlideRequest? = null + private var lastRequest: RequestBuilder? = null - private var progressAnimator: ObjectAnimator? = null var isSeeking = false override fun onCreate(savedInstanceState: Bundle?) { @@ -100,7 +100,7 @@ class CirclePlayerFragment : AbsPlayerFragment(R.layout.fragment_circle_player), private fun setUpPlayerToolbar() { binding.playerToolbar.apply { inflateMenu(R.menu.menu_player) - setNavigationOnClickListener { requireActivity().onBackPressed() } + setNavigationOnClickListener { requireActivity().onBackPressedDispatcher.onBackPressed() } setOnMenuItemClickListener(this@CirclePlayerFragment) ToolbarContentTintHelper.colorizeToolbar( this, @@ -129,8 +129,12 @@ class CirclePlayerFragment : AbsPlayerFragment(R.layout.fragment_circle_player), private fun setUpPrevNext() { updatePrevNextColor() binding.nextButton.setOnTouchListener(MusicSeekSkipTouchListener(requireActivity(), true)) - binding.previousButton.setOnTouchListener(MusicSeekSkipTouchListener(requireActivity(), - false)) + binding.previousButton.setOnTouchListener( + MusicSeekSkipTouchListener( + requireActivity(), + false + ) + ) } private fun updatePrevNextColor() { @@ -237,11 +241,11 @@ class CirclePlayerFragment : AbsPlayerFragment(R.layout.fragment_circle_player), } else { binding.songInfo.hide() } - GlideApp.with(this) + Glide.with(this) .load(RetroGlideExtension.getSongModel(MusicPlayerRemote.currentSong)) .simpleSongCoverOptions(MusicPlayerRemote.currentSong) .thumbnail(lastRequest) - .error(GlideApp.with(this).load(R.drawable.default_audio_art).fitCenter()) + .error(Glide.with(this).load(R.drawable.default_audio_art).fitCenter()) .fitCenter().also { lastRequest = it.clone() it.crossfadeListener() diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/classic/ClassicPlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/classic/ClassicPlayerFragment.kt index 2dbff8be2..eb0709792 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/classic/ClassicPlayerFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/classic/ClassicPlayerFragment.kt @@ -102,10 +102,12 @@ class ClassicPlayerFragment : AbsPlayerFragment(R.layout.fragment_classic_player BottomSheetBehavior.STATE_DRAGGING -> { mainActivity.getBottomSheetBehavior().isDraggable = false } + BottomSheetBehavior.STATE_COLLAPSED -> { resetToCurrentPosition() mainActivity.getBottomSheetBehavior().isDraggable = true } + else -> { mainActivity.getBottomSheetBehavior().isDraggable = true } @@ -377,7 +379,7 @@ class ClassicPlayerFragment : AbsPlayerFragment(R.layout.fragment_classic_player private fun setUpPlayerToolbar() { binding.playerToolbar.inflateMenu(R.menu.menu_player) - binding.playerToolbar.setNavigationOnClickListener { requireActivity().onBackPressed() } + binding.playerToolbar.setNavigationOnClickListener { requireActivity().onBackPressedDispatcher.onBackPressed() } binding.playerToolbar.setOnMenuItemClickListener(this) ToolbarContentTintHelper.colorizeToolbar( @@ -491,6 +493,7 @@ class ClassicPlayerFragment : AbsPlayerFragment(R.layout.fragment_classic_player lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN ) + else -> binding.playerControlsContainer.shuffleButton.setColorFilter( lastDisabledPlaybackControlsColor, PorterDuff.Mode.SRC_IN @@ -511,6 +514,7 @@ class ClassicPlayerFragment : AbsPlayerFragment(R.layout.fragment_classic_player PorterDuff.Mode.SRC_IN ) } + MusicService.REPEAT_MODE_ALL -> { binding.playerControlsContainer.repeatButton.setImageResource(R.drawable.ic_repeat) binding.playerControlsContainer.repeatButton.setColorFilter( @@ -518,6 +522,7 @@ class ClassicPlayerFragment : AbsPlayerFragment(R.layout.fragment_classic_player PorterDuff.Mode.SRC_IN ) } + MusicService.REPEAT_MODE_THIS -> { binding.playerControlsContainer.repeatButton.setImageResource(R.drawable.ic_repeat_one) binding.playerControlsContainer.repeatButton.setColorFilter( diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/color/ColorFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/color/ColorFragment.kt index bd5a29e46..7031f60bd 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/color/ColorFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/color/ColorFragment.kt @@ -124,7 +124,7 @@ class ColorFragment : AbsPlayerFragment(R.layout.fragment_color_player) { private fun setUpPlayerToolbar() { binding.playerToolbar.apply { inflateMenu(R.menu.menu_player) - setNavigationOnClickListener { requireActivity().onBackPressed() } + setNavigationOnClickListener { requireActivity().onBackPressedDispatcher.onBackPressed() } setOnMenuItemClickListener(this@ColorFragment) ToolbarContentTintHelper.colorizeToolbar( this, diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/fit/FitFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/fit/FitFragment.kt index 468ce3c1b..72d219bee 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/fit/FitFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/fit/FitFragment.kt @@ -100,7 +100,7 @@ class FitFragment : AbsPlayerFragment(R.layout.fragment_fit) { private fun setUpPlayerToolbar() { binding.playerToolbar.apply { inflateMenu(R.menu.menu_player) - setNavigationOnClickListener { requireActivity().onBackPressed() } + setNavigationOnClickListener { requireActivity().onBackPressedDispatcher.onBackPressed() } setOnMenuItemClickListener(this@FitFragment) ToolbarContentTintHelper.colorizeToolbar( this, diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/flat/FlatPlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/flat/FlatPlayerFragment.kt index bd84e4eca..12e5343b9 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/flat/FlatPlayerFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/flat/FlatPlayerFragment.kt @@ -61,7 +61,7 @@ class FlatPlayerFragment : AbsPlayerFragment(R.layout.fragment_flat_player) { private fun setUpPlayerToolbar() { binding.playerToolbar.inflateMenu(R.menu.menu_player) - binding.playerToolbar.setNavigationOnClickListener { requireActivity().onBackPressed() } + binding.playerToolbar.setNavigationOnClickListener { requireActivity().onBackPressedDispatcher.onBackPressed() } binding.playerToolbar.setOnMenuItemClickListener(this) ToolbarContentTintHelper.colorizeToolbar( binding.playerToolbar, diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/full/FullPlaybackControlsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/full/FullPlaybackControlsFragment.kt index 256be3987..f42b204b7 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/full/FullPlaybackControlsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/full/FullPlaybackControlsFragment.kt @@ -32,7 +32,11 @@ import code.name.monkey.retromusic.R import code.name.monkey.retromusic.databinding.FragmentFullPlayerControlsBinding import code.name.monkey.retromusic.db.PlaylistEntity import code.name.monkey.retromusic.db.toSongEntity -import code.name.monkey.retromusic.extensions.* +import code.name.monkey.retromusic.extensions.applyColor +import code.name.monkey.retromusic.extensions.getSongInfo +import code.name.monkey.retromusic.extensions.getTintedDrawable +import code.name.monkey.retromusic.extensions.hide +import code.name.monkey.retromusic.extensions.show import code.name.monkey.retromusic.fragments.LibraryViewModel import code.name.monkey.retromusic.fragments.ReloadType import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment @@ -48,7 +52,7 @@ import com.google.android.material.slider.Slider import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import kotlinx.coroutines.withContext -import org.koin.androidx.viewmodel.ext.android.sharedViewModel +import org.koin.androidx.viewmodel.ext.android.activityViewModel /** * Created by hemanths on 20/09/17. @@ -58,7 +62,7 @@ class FullPlaybackControlsFragment : AbsPlayerControlsFragment(R.layout.fragment_full_player_controls), PopupMenu.OnMenuItemClickListener { - private val libraryViewModel: LibraryViewModel by sharedViewModel() + private val libraryViewModel: LibraryViewModel by activityViewModel() private var _binding: FragmentFullPlayerControlsBinding? = null private val binding get() = _binding!! diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/full/FullPlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/full/FullPlayerFragment.kt index c2ebc9428..0470188f5 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/full/FullPlayerFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/full/FullPlayerFragment.kt @@ -30,11 +30,12 @@ import code.name.monkey.retromusic.fragments.base.AbsPlayerFragment import code.name.monkey.retromusic.fragments.base.goToArtist import code.name.monkey.retromusic.fragments.player.CoverLyricsFragment import code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment -import code.name.monkey.retromusic.glide.GlideApp import code.name.monkey.retromusic.glide.RetroGlideExtension +import code.name.monkey.retromusic.glide.RetroGlideExtension.artistImageOptions import code.name.monkey.retromusic.helper.MusicPlayerRemote import code.name.monkey.retromusic.model.Song import code.name.monkey.retromusic.util.color.MediaNotificationProcessor +import com.bumptech.glide.Glide class FullPlayerFragment : AbsPlayerFragment(R.layout.fragment_full) { private var _binding: FragmentFullBinding? = null @@ -51,7 +52,7 @@ class FullPlayerFragment : AbsPlayerFragment(R.layout.fragment_full) { private fun setUpPlayerToolbar() { binding.playerToolbar.apply { - setNavigationOnClickListener { requireActivity().onBackPressed() } + setNavigationOnClickListener { requireActivity().onBackPressedDispatcher.onBackPressed() } } } @@ -135,7 +136,7 @@ class FullPlayerFragment : AbsPlayerFragment(R.layout.fragment_full) { libraryViewModel.artist(MusicPlayerRemote.currentSong.artistId) .observe(viewLifecycleOwner) { artist -> if (artist.id != -1L) { - GlideApp.with(requireActivity()) + Glide.with(requireActivity()) .load(RetroGlideExtension.getArtistModel(artist)) .artistImageOptions(artist) .into(binding.artistImage) diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/home/HomePlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/home/HomePlayerFragment.kt index d9ae39ffa..f40a4433b 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/home/HomePlayerFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/home/HomePlayerFragment.kt @@ -122,7 +122,7 @@ class HomePlayerFragment : AbsPlayerFragment(R.layout.fragment_home_player), private fun setUpPlayerToolbar() { binding.playerToolbar.inflateMenu(R.menu.menu_player) - binding.playerToolbar.setNavigationOnClickListener { requireActivity().onBackPressed() } + binding.playerToolbar.setNavigationOnClickListener { requireActivity().onBackPressedDispatcher.onBackPressed() } binding.playerToolbar.setOnMenuItemClickListener(this) ToolbarContentTintHelper.colorizeToolbar( diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/material/MaterialFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/material/MaterialFragment.kt index 1af54215d..cb00c8de0 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/material/MaterialFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/material/MaterialFragment.kt @@ -144,7 +144,7 @@ class MaterialFragment : AbsPlayerFragment(R.layout.fragment_material) { private fun setUpPlayerToolbar() { binding.playerToolbar.apply { inflateMenu(R.menu.menu_player) - setNavigationOnClickListener { requireActivity().onBackPressed() } + setNavigationOnClickListener { requireActivity().onBackPressedDispatcher.onBackPressed() } setOnMenuItemClickListener(this@MaterialFragment) ToolbarContentTintHelper.colorizeToolbar( this, diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/md3/MD3PlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/md3/MD3PlayerFragment.kt index efb395e43..850316dc8 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/md3/MD3PlayerFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/md3/MD3PlayerFragment.kt @@ -103,7 +103,7 @@ class MD3PlayerFragment : AbsPlayerFragment(R.layout.fragment_md3_player) { private fun setUpPlayerToolbar() { binding.playerToolbar.inflateMenu(R.menu.menu_player) //binding.playerToolbar.menu.setUpWithIcons() - binding.playerToolbar.setNavigationOnClickListener { requireActivity().onBackPressed() } + binding.playerToolbar.setNavigationOnClickListener { requireActivity().onBackPressedDispatcher.onBackPressed() } binding.playerToolbar.setOnMenuItemClickListener(this) ToolbarContentTintHelper.colorizeToolbar( diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/normal/PlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/normal/PlayerFragment.kt index 2356aeba9..8126f9817 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/normal/PlayerFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/normal/PlayerFragment.kt @@ -27,7 +27,11 @@ import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper import code.name.monkey.retromusic.R import code.name.monkey.retromusic.SNOWFALL import code.name.monkey.retromusic.databinding.FragmentPlayerBinding -import code.name.monkey.retromusic.extensions.* +import code.name.monkey.retromusic.extensions.colorControlNormal +import code.name.monkey.retromusic.extensions.drawAboveSystemBars +import code.name.monkey.retromusic.extensions.isColorLight +import code.name.monkey.retromusic.extensions.surfaceColor +import code.name.monkey.retromusic.extensions.whichFragment import code.name.monkey.retromusic.fragments.base.AbsPlayerFragment import code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment import code.name.monkey.retromusic.helper.MusicPlayerRemote @@ -147,7 +151,7 @@ class PlayerFragment : AbsPlayerFragment(R.layout.fragment_player), private fun setUpPlayerToolbar() { binding.playerToolbar.inflateMenu(R.menu.menu_player) //binding.playerToolbar.menu.setUpWithIcons() - binding.playerToolbar.setNavigationOnClickListener { requireActivity().onBackPressed() } + binding.playerToolbar.setNavigationOnClickListener { requireActivity().onBackPressedDispatcher.onBackPressed() } binding.playerToolbar.setOnMenuItemClickListener(this) ToolbarContentTintHelper.colorizeToolbar( diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/peek/PeekPlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/peek/PeekPlayerFragment.kt index 2d17d5a99..8e5c9a1c7 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/peek/PeekPlayerFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/peek/PeekPlayerFragment.kt @@ -20,7 +20,12 @@ import androidx.appcompat.widget.Toolbar import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper import code.name.monkey.retromusic.R import code.name.monkey.retromusic.databinding.FragmentPeekPlayerBinding -import code.name.monkey.retromusic.extensions.* +import code.name.monkey.retromusic.extensions.colorControlNormal +import code.name.monkey.retromusic.extensions.drawAboveSystemBarsWithPadding +import code.name.monkey.retromusic.extensions.getSongInfo +import code.name.monkey.retromusic.extensions.hide +import code.name.monkey.retromusic.extensions.show +import code.name.monkey.retromusic.extensions.whichFragment import code.name.monkey.retromusic.fragments.base.AbsPlayerFragment import code.name.monkey.retromusic.fragments.base.goToAlbum import code.name.monkey.retromusic.fragments.base.goToArtist @@ -68,7 +73,7 @@ class PeekPlayerFragment : AbsPlayerFragment(R.layout.fragment_peek_player) { private fun setUpPlayerToolbar() { binding.playerToolbar.apply { inflateMenu(R.menu.menu_player) - setNavigationOnClickListener { requireActivity().onBackPressed() } + setNavigationOnClickListener { requireActivity().onBackPressedDispatcher.onBackPressed() } setOnMenuItemClickListener(this@PeekPlayerFragment) ToolbarContentTintHelper.colorizeToolbar( this, diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/plain/PlainPlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/plain/PlainPlayerFragment.kt index fbbb7cd26..4fc01cb6d 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/plain/PlainPlayerFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/plain/PlainPlayerFragment.kt @@ -63,7 +63,7 @@ class PlainPlayerFragment : AbsPlayerFragment(R.layout.fragment_plain_player) { private fun setUpPlayerToolbar() { binding.playerToolbar.apply { inflateMenu(R.menu.menu_player) - setNavigationOnClickListener { requireActivity().onBackPressed() } + setNavigationOnClickListener { requireActivity().onBackPressedDispatcher.onBackPressed() } setOnMenuItemClickListener(this@PlainPlayerFragment) ToolbarContentTintHelper.colorizeToolbar( this, diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/simple/SimplePlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/simple/SimplePlayerFragment.kt index 722ab28ba..63aac7083 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/simple/SimplePlayerFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/simple/SimplePlayerFragment.kt @@ -101,7 +101,7 @@ class SimplePlayerFragment : AbsPlayerFragment(R.layout.fragment_simple_player) private fun setUpPlayerToolbar() { binding.playerToolbar.inflateMenu(R.menu.menu_player) - binding.playerToolbar.setNavigationOnClickListener { requireActivity().onBackPressed() } + binding.playerToolbar.setNavigationOnClickListener { requireActivity().onBackPressedDispatcher.onBackPressed() } binding.playerToolbar.setOnMenuItemClickListener(this) ToolbarContentTintHelper.colorizeToolbar( binding.playerToolbar, diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/tiny/TinyPlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/tiny/TinyPlayerFragment.kt index f18bd53c9..5088d03cb 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/tiny/TinyPlayerFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/tiny/TinyPlayerFragment.kt @@ -159,7 +159,7 @@ class TinyPlayerFragment : AbsPlayerFragment(R.layout.fragment_tiny_player), private fun setUpPlayerToolbar() { binding.playerToolbar.apply { inflateMenu(R.menu.menu_player) - setNavigationOnClickListener { requireActivity().onBackPressed() } + setNavigationOnClickListener { requireActivity().onBackPressedDispatcher.onBackPressed() } setOnMenuItemClickListener(this@TinyPlayerFragment) } } @@ -251,6 +251,7 @@ class TinyPlayerFragment : AbsPlayerFragment(R.layout.fragment_tiny_player), initialY = event.y.toInt() progressViewUpdateHelper.stop() } + MotionEvent.ACTION_UP, MotionEvent.ACTION_CANCEL -> { progressViewUpdateHelper.start() @@ -260,6 +261,7 @@ class TinyPlayerFragment : AbsPlayerFragment(R.layout.fragment_tiny_player), return true } } + MotionEvent.ACTION_MOVE -> { if (isDragEnabled) { val diffY = (initialY - event.y).toInt() diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/settings/OtherSettingsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/OtherSettingsFragment.kt index 554bc674a..9a52238e1 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/settings/OtherSettingsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/OtherSettingsFragment.kt @@ -24,14 +24,14 @@ import code.name.monkey.retromusic.R import code.name.monkey.retromusic.extensions.installLanguageAndRecreate import code.name.monkey.retromusic.fragments.LibraryViewModel import code.name.monkey.retromusic.fragments.ReloadType.HomeSections -import org.koin.androidx.viewmodel.ext.android.sharedViewModel +import org.koin.androidx.viewmodel.ext.android.activityViewModel /** * @author Hemanth S (h4h13). */ class OtherSettingsFragment : AbsSettingsFragment() { - private val libraryViewModel by sharedViewModel() + private val libraryViewModel by activityViewModel() override fun invalidateSettings() { val languagePreference: ATEListPreference? = findPreference(LANGUAGE_NAME) diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/settings/SettingsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/SettingsFragment.kt index 5c3f5a4a0..2b180e072 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/settings/SettingsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/SettingsFragment.kt @@ -41,7 +41,7 @@ class SettingsFragment : Fragment(R.layout.fragment_settings), ColorCallback { private fun setupToolbar() { applyToolbar(binding.toolbar) binding.toolbar.setNavigationOnClickListener { - requireActivity().onBackPressed() + requireActivity().onBackPressedDispatcher.onBackPressed() } val navController: NavController = findNavController(R.id.contentFrame) navController.addOnDestinationChangedListener { _, _, _ -> diff --git a/app/src/main/java/code/name/monkey/retromusic/glide/RetroGlideExtension.kt b/app/src/main/java/code/name/monkey/retromusic/glide/RetroGlideExtension.kt index 71d42fc9f..47d1168ad 100644 --- a/app/src/main/java/code/name/monkey/retromusic/glide/RetroGlideExtension.kt +++ b/app/src/main/java/code/name/monkey/retromusic/glide/RetroGlideExtension.kt @@ -23,14 +23,11 @@ import code.name.monkey.retromusic.util.PreferenceUtil import com.bumptech.glide.GenericTransitionOptions import com.bumptech.glide.Priority import com.bumptech.glide.RequestBuilder -import com.bumptech.glide.annotation.GlideExtension -import com.bumptech.glide.annotation.GlideOption -import com.bumptech.glide.annotation.GlideType +import com.bumptech.glide.RequestManager import com.bumptech.glide.load.DataSource import com.bumptech.glide.load.Key import com.bumptech.glide.load.engine.DiskCacheStrategy import com.bumptech.glide.load.engine.GlideException -import com.bumptech.glide.request.BaseRequestOptions import com.bumptech.glide.request.RequestListener import com.bumptech.glide.request.target.Target import com.bumptech.glide.request.target.Target.SIZE_ORIGINAL @@ -40,7 +37,6 @@ import com.bumptech.glide.signature.MediaStoreSignature import java.io.File -@GlideExtension object RetroGlideExtension { private const val DEFAULT_ARTIST_IMAGE = @@ -54,10 +50,8 @@ object RetroGlideExtension { private const val DEFAULT_ANIMATION = android.R.anim.fade_in - @JvmStatic - @GlideType(BitmapPaletteWrapper::class) - fun asBitmapPalette(requestBuilder: RequestBuilder): RequestBuilder { - return requestBuilder + fun RequestManager.asBitmapPalette(): RequestBuilder { + return this.`as`(BitmapPaletteWrapper::class.java) } private fun getSongModel(song: Song, ignoreMediaStore: Boolean): Any { @@ -100,14 +94,10 @@ object RetroGlideExtension { } } - @JvmStatic - @GlideOption - fun artistImageOptions( - baseRequestOptions: BaseRequestOptions<*>, + fun RequestBuilder.artistImageOptions( artist: Artist - ): BaseRequestOptions<*> { - return baseRequestOptions - .diskCacheStrategy(DEFAULT_DISK_CACHE_STRATEGY_ARTIST) + ): RequestBuilder { + return diskCacheStrategy(DEFAULT_DISK_CACHE_STRATEGY_ARTIST) .priority(Priority.LOW) .error(getDrawable(DEFAULT_ARTIST_IMAGE)) .placeholder(getDrawable(DEFAULT_ARTIST_IMAGE)) @@ -115,70 +105,52 @@ object RetroGlideExtension { .signature(createSignature(artist)) } - @JvmStatic - @GlideOption - fun songCoverOptions( - baseRequestOptions: BaseRequestOptions<*>, + fun RequestBuilder.songCoverOptions( song: Song - ): BaseRequestOptions<*> { - return baseRequestOptions.diskCacheStrategy(DEFAULT_DISK_CACHE_STRATEGY) + ): RequestBuilder { + return diskCacheStrategy(DEFAULT_DISK_CACHE_STRATEGY) .error(getDrawable(DEFAULT_SONG_IMAGE)) .placeholder(getDrawable(DEFAULT_SONG_IMAGE)) .signature(createSignature(song)) } - @JvmStatic - @GlideOption - fun simpleSongCoverOptions( - baseRequestOptions: BaseRequestOptions<*>, + fun RequestBuilder.simpleSongCoverOptions( song: Song - ): BaseRequestOptions<*> { - return baseRequestOptions.diskCacheStrategy(DEFAULT_DISK_CACHE_STRATEGY) + ): RequestBuilder { + return diskCacheStrategy(DEFAULT_DISK_CACHE_STRATEGY) .signature(createSignature(song)) } - @JvmStatic - @GlideOption - fun albumCoverOptions( - baseRequestOptions: BaseRequestOptions<*>, + fun RequestBuilder.albumCoverOptions( song: Song - ): BaseRequestOptions<*> { - return baseRequestOptions.diskCacheStrategy(DEFAULT_DISK_CACHE_STRATEGY) + ): RequestBuilder { + return diskCacheStrategy(DEFAULT_DISK_CACHE_STRATEGY) .error(ContextCompat.getDrawable(getContext(), DEFAULT_ALBUM_IMAGE)) .placeholder(ContextCompat.getDrawable(getContext(), DEFAULT_ALBUM_IMAGE)) .signature(createSignature(song)) } - @JvmStatic - @GlideOption - fun userProfileOptions( - baseRequestOptions: BaseRequestOptions<*>, + fun RequestBuilder.userProfileOptions( file: File, context: Context - ): BaseRequestOptions<*> { - return baseRequestOptions.diskCacheStrategy(DEFAULT_DISK_CACHE_STRATEGY) + ): RequestBuilder { + return diskCacheStrategy(DEFAULT_DISK_CACHE_STRATEGY) .error(getErrorUserProfile(context)) .signature(createSignature(file)) } - @JvmStatic - @GlideOption - fun profileBannerOptions( - baseRequestOptions: BaseRequestOptions<*>, + fun RequestBuilder.profileBannerOptions( file: File - ): BaseRequestOptions<*> { - return baseRequestOptions.diskCacheStrategy(DEFAULT_DISK_CACHE_STRATEGY) + ): RequestBuilder { + return diskCacheStrategy(DEFAULT_DISK_CACHE_STRATEGY) .placeholder(DEFAULT_ERROR_IMAGE_BANNER) .error(DEFAULT_ERROR_IMAGE_BANNER) .signature(createSignature(file)) } - @JvmStatic - @GlideOption - fun playlistOptions( - baseRequestOptions: BaseRequestOptions<*> - ): BaseRequestOptions<*> { - return baseRequestOptions.diskCacheStrategy(DEFAULT_DISK_CACHE_STRATEGY) + fun RequestBuilder.playlistOptions( + ): RequestBuilder { + return diskCacheStrategy(DEFAULT_DISK_CACHE_STRATEGY) .error(getDrawable(DEFAULT_ALBUM_IMAGE)) } @@ -223,7 +195,7 @@ object RetroGlideExtension { } // https://github.com/bumptech/glide/issues/527#issuecomment-148840717 -fun GlideRequest.crossfadeListener(): GlideRequest { +fun RequestBuilder.crossfadeListener(): RequestBuilder { return listener(object : RequestListener { override fun onLoadFailed( e: GlideException?, diff --git a/app/src/main/java/code/name/monkey/retromusic/service/MusicService.kt b/app/src/main/java/code/name/monkey/retromusic/service/MusicService.kt index 40c725610..173be0923 100644 --- a/app/src/main/java/code/name/monkey/retromusic/service/MusicService.kt +++ b/app/src/main/java/code/name/monkey/retromusic/service/MusicService.kt @@ -37,6 +37,7 @@ import android.support.v4.media.session.MediaSessionCompat import android.support.v4.media.session.PlaybackStateCompat import android.util.Log import android.widget.Toast +import androidx.core.app.ServiceCompat import androidx.core.content.edit import androidx.core.content.getSystemService import androidx.media.MediaBrowserServiceCompat @@ -51,8 +52,9 @@ import code.name.monkey.retromusic.extensions.showToast import code.name.monkey.retromusic.extensions.toMediaSessionQueue import code.name.monkey.retromusic.extensions.uri import code.name.monkey.retromusic.glide.BlurTransformation -import code.name.monkey.retromusic.glide.GlideApp +import code.name.monkey.retromusic.glide.RetroGlideExtension.getDefaultTransition import code.name.monkey.retromusic.glide.RetroGlideExtension.getSongModel +import code.name.monkey.retromusic.glide.RetroGlideExtension.songCoverOptions import code.name.monkey.retromusic.helper.ShuffleHelper.makeShuffleList import code.name.monkey.retromusic.model.Song import code.name.monkey.retromusic.model.Song.Companion.emptySong @@ -82,6 +84,7 @@ import code.name.monkey.retromusic.util.PreferenceUtil.registerOnSharedPreferenc import code.name.monkey.retromusic.util.PreferenceUtil.unregisterOnSharedPreferenceChangedListener import code.name.monkey.retromusic.volume.AudioVolumeObserver import code.name.monkey.retromusic.volume.OnAudioVolumeChangedListener +import com.bumptech.glide.Glide import com.bumptech.glide.request.target.CustomTarget import com.bumptech.glide.request.target.Target import com.bumptech.glide.request.transition.Transition @@ -134,21 +137,27 @@ class MusicService : MediaBrowserServiceCompat(), AppWidgetClassic.NAME -> { appWidgetClassic.performUpdate(this@MusicService, ids) } + AppWidgetSmall.NAME -> { appWidgetSmall.performUpdate(this@MusicService, ids) } + AppWidgetBig.NAME -> { appWidgetBig.performUpdate(this@MusicService, ids) } + AppWidgetCard.NAME -> { appWidgetCard.performUpdate(this@MusicService, ids) } + AppWidgetText.NAME -> { appWidgetText.performUpdate(this@MusicService, ids) } + AppWidgetMD3.NAME -> { appWidgetMd3.performUpdate(this@MusicService, ids) } + AppWidgetCircle.NAME -> { appWidgetCircle.performUpdate(this@MusicService, ids) } @@ -412,6 +421,7 @@ class MusicService : MediaBrowserServiceCompat(), REPEAT_MODE_ALL -> if (isLastTrack) { position = 0 } + REPEAT_MODE_THIS -> if (force) { if (isLastTrack) { position = 0 @@ -419,9 +429,11 @@ class MusicService : MediaBrowserServiceCompat(), } else { position -= 1 } + REPEAT_MODE_NONE -> if (isLastTrack) { position -= 1 } + else -> if (isLastTrack) { position -= 1 } @@ -447,6 +459,7 @@ class MusicService : MediaBrowserServiceCompat(), REPEAT_MODE_ALL -> if (newPosition < 0) { newPosition = playingQueue.size - 1 } + REPEAT_MODE_THIS -> if (force) { if (newPosition < 0) { newPosition = playingQueue.size - 1 @@ -454,9 +467,11 @@ class MusicService : MediaBrowserServiceCompat(), } else { newPosition = getPosition() } + REPEAT_MODE_NONE -> if (newPosition < 0) { newPosition = 0 } + else -> if (newPosition < 0) { newPosition = 0 } @@ -486,6 +501,7 @@ class MusicService : MediaBrowserServiceCompat(), makeShuffleList(playingQueue, getPosition()) position = 0 } + SHUFFLE_MODE_NONE -> { this.shuffleMode = shuffleMode val currentSongId = Objects.requireNonNull(currentSong).id @@ -553,9 +569,11 @@ class MusicService : MediaBrowserServiceCompat(), currentPosition in to until from -> { position = currentPosition + 1 } + currentPosition in (from + 1)..to -> { position = currentPosition - 1 } + from == currentPosition -> { position = to } @@ -617,6 +635,7 @@ class MusicService : MediaBrowserServiceCompat(), updateMediaSessionPlaybackState() playbackManager.setPlaybackSpeedPitch(playbackSpeed, playbackPitch) } + CROSS_FADE_DURATION -> { val progress = songProgressMillis val wasPlaying = isPlaying @@ -627,6 +646,7 @@ class MusicService : MediaBrowserServiceCompat(), playbackManager.setCrossFadeDuration(crossFadeDuration) } } + ALBUM_ART_ON_LOCK_SCREEN, BLURRED_ALBUM_ART -> updateMediaSessionMetaData(::updateMediaSessionPlaybackState) COLORED_NOTIFICATION -> { playingNotification?.updateMetadata(currentSong) { @@ -634,6 +654,7 @@ class MusicService : MediaBrowserServiceCompat(), startForegroundOrNotify() } } + CLASSIC_NOTIFICATION -> { updateNotification() playingNotification?.updateMetadata(currentSong) { @@ -641,6 +662,7 @@ class MusicService : MediaBrowserServiceCompat(), startForegroundOrNotify() } } + TOGGLE_HEADSET -> registerHeadsetEvents() } } @@ -655,6 +677,7 @@ class MusicService : MediaBrowserServiceCompat(), } else { play() } + ACTION_PAUSE -> pause() ACTION_PLAY -> play() ACTION_PLAY_PLAYLIST -> playFromPlaylist(intent) @@ -664,6 +687,7 @@ class MusicService : MediaBrowserServiceCompat(), pendingQuit = false quit() } + ACTION_PENDING_QUIT -> pendingQuit = true TOGGLE_FAVORITE -> toggleFavorite() } @@ -829,7 +853,7 @@ class MusicService : MediaBrowserServiceCompat(), fun quit() { pause() - stopForeground(true) + ServiceCompat.stopForeground(this, ServiceCompat.STOP_FOREGROUND_REMOVE) isForeground = false notificationManager?.cancel(PlayingNotification.NOTIFICATION_ID) @@ -1023,7 +1047,7 @@ class MusicService : MediaBrowserServiceCompat(), if (isAlbumArtOnLockScreen) { // val screenSize: Point = RetroUtil.getScreenSize(this) - val request = GlideApp.with(this) + val request = Glide.with(this) .asBitmap() .songCoverOptions(song) .load(getSongModel(song)) @@ -1078,12 +1102,14 @@ class MusicService : MediaBrowserServiceCompat(), playingNotification?.setPlaying(isPlaying) startForegroundOrNotify() } + FAVORITE_STATE_CHANGED -> { isCurrentFavorite { isFavorite -> playingNotification?.updateFavorite(isFavorite) startForegroundOrNotify() } } + META_CHANGED -> { playingNotification?.updateMetadata(currentSong) { startForegroundOrNotify() } isCurrentFavorite { isFavorite -> @@ -1107,6 +1133,7 @@ class MusicService : MediaBrowserServiceCompat(), storage.saveSong(currentSong) } } + QUEUE_CHANGED -> { mediaSession?.setQueueTitle(getString(R.string.now_playing_queue)) mediaSession?.setQueue(playingQueue.toMediaSessionQueue()) @@ -1128,7 +1155,7 @@ class MusicService : MediaBrowserServiceCompat(), // We can't call stopForeground(false) on A12 though, which may result in crashes // when we call startForeground after that e.g. when Alarm goes off, if (!VersionUtils.hasS()) { - stopForeground(false) + ServiceCompat.stopForeground(this, ServiceCompat.STOP_FOREGROUND_DETACH) isForeground = false } } @@ -1156,7 +1183,7 @@ class MusicService : MediaBrowserServiceCompat(), } private fun stopForegroundAndNotification() { - stopForeground(true) + ServiceCompat.stopForeground(this, ServiceCompat.STOP_FOREGROUND_REMOVE) notificationManager?.cancel(PlayingNotification.NOTIFICATION_ID) isForeground = false } diff --git a/app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotificationClassic.kt b/app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotificationClassic.kt index 5697278b3..9da412d9b 100644 --- a/app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotificationClassic.kt +++ b/app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotificationClassic.kt @@ -36,8 +36,9 @@ import code.name.monkey.retromusic.extensions.getTintedDrawable import code.name.monkey.retromusic.extensions.isColorLight import code.name.monkey.retromusic.extensions.isSystemDarkModeEnabled import code.name.monkey.retromusic.extensions.toBitmap -import code.name.monkey.retromusic.glide.GlideApp import code.name.monkey.retromusic.glide.RetroGlideExtension +import code.name.monkey.retromusic.glide.RetroGlideExtension.asBitmapPalette +import code.name.monkey.retromusic.glide.RetroGlideExtension.songCoverOptions import code.name.monkey.retromusic.glide.palette.BitmapPaletteWrapper import code.name.monkey.retromusic.model.Song import code.name.monkey.retromusic.service.MusicService @@ -47,6 +48,7 @@ import code.name.monkey.retromusic.service.MusicService.Companion.ACTION_SKIP import code.name.monkey.retromusic.service.MusicService.Companion.ACTION_TOGGLE_PAUSE import code.name.monkey.retromusic.util.PreferenceUtil import code.name.monkey.retromusic.util.color.MediaNotificationProcessor +import com.bumptech.glide.Glide import com.bumptech.glide.request.target.CustomTarget import com.bumptech.glide.request.transition.Transition @@ -105,7 +107,9 @@ class PlayingNotificationClassic( setOngoing(true) val bigNotificationImageSize = context.resources .getDimensionPixelSize(R.dimen.notification_big_image_size) - GlideApp.with(context).asBitmapPalette().songCoverOptions(song) + Glide.with(context) + .asBitmapPalette() + .songCoverOptions(song) .load(RetroGlideExtension.getSongModel(song)) .centerCrop() .into(object : CustomTarget( @@ -124,14 +128,22 @@ class PlayingNotificationClassic( super.onLoadFailed(errorDrawable) update( null, - resolveColor(context, com.google.android.material.R.attr.colorSurface, Color.WHITE) + resolveColor( + context, + com.google.android.material.R.attr.colorSurface, + Color.WHITE + ) ) } override fun onLoadCleared(placeholder: Drawable?) { update( null, - resolveColor(context, com.google.android.material.R.attr.colorSurface, Color.WHITE) + resolveColor( + context, + com.google.android.material.R.attr.colorSurface, + Color.WHITE + ) ) } @@ -157,7 +169,11 @@ class PlayingNotificationClassic( if (!VersionUtils.hasS()) { if (!PreferenceUtil.isColoredNotification) { bgColorFinal = - resolveColor(context, com.google.android.material.R.attr.colorSurface, Color.WHITE) + resolveColor( + context, + com.google.android.material.R.attr.colorSurface, + Color.WHITE + ) } setBackgroundColor(bgColorFinal) setNotificationContent(ColorUtil.isColorLight(bgColorFinal)) diff --git a/app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotificationImpl24.kt b/app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotificationImpl24.kt index 51bbd2257..55dbb9ade 100644 --- a/app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotificationImpl24.kt +++ b/app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotificationImpl24.kt @@ -28,8 +28,8 @@ import androidx.media.app.NotificationCompat.MediaStyle import code.name.monkey.appthemehelper.util.VersionUtils import code.name.monkey.retromusic.R import code.name.monkey.retromusic.activities.MainActivity -import code.name.monkey.retromusic.glide.GlideApp import code.name.monkey.retromusic.glide.RetroGlideExtension +import code.name.monkey.retromusic.glide.RetroGlideExtension.songCoverOptions import code.name.monkey.retromusic.model.Song import code.name.monkey.retromusic.service.MusicService import code.name.monkey.retromusic.service.MusicService.Companion.ACTION_QUIT @@ -38,6 +38,7 @@ import code.name.monkey.retromusic.service.MusicService.Companion.ACTION_SKIP import code.name.monkey.retromusic.service.MusicService.Companion.ACTION_TOGGLE_PAUSE import code.name.monkey.retromusic.service.MusicService.Companion.TOGGLE_FAVORITE import code.name.monkey.retromusic.util.PreferenceUtil +import com.bumptech.glide.Glide import com.bumptech.glide.request.target.CustomTarget import com.bumptech.glide.request.transition.Transition @@ -116,7 +117,7 @@ class PlayingNotificationImpl24( setSubText(song.albumName) val bigNotificationImageSize = context.resources .getDimensionPixelSize(R.dimen.notification_big_image_size) - GlideApp.with(context) + Glide.with(context) .asBitmap() .songCoverOptions(song) .load(RetroGlideExtension.getSongModel(song)) diff --git a/app/src/main/java/code/name/monkey/retromusic/util/AutoGeneratedPlaylistBitmap.kt b/app/src/main/java/code/name/monkey/retromusic/util/AutoGeneratedPlaylistBitmap.kt index 1024e03fc..8c5fa078c 100644 --- a/app/src/main/java/code/name/monkey/retromusic/util/AutoGeneratedPlaylistBitmap.kt +++ b/app/src/main/java/code/name/monkey/retromusic/util/AutoGeneratedPlaylistBitmap.kt @@ -4,10 +4,10 @@ import android.content.Context import android.graphics.Bitmap import android.graphics.BitmapFactory import code.name.monkey.retromusic.R -import code.name.monkey.retromusic.glide.GlideApp import code.name.monkey.retromusic.model.Song import code.name.monkey.retromusic.util.MergedImageUtils.joinImages import code.name.monkey.retromusic.util.MusicUtil.getMediaStoreAlbumCoverUri +import com.bumptech.glide.Glide import com.bumptech.glide.load.resource.bitmap.RoundedCorners object AutoGeneratedPlaylistBitmap { @@ -31,7 +31,7 @@ object AutoGeneratedPlaylistBitmap { private fun getBitmapWithAlbumId(context: Context, id: Long): Bitmap? { return try { - GlideApp.with(context) + Glide.with(context) .asBitmap() .transform(RoundedCorners(20)) .load(getMediaStoreAlbumCoverUri(id)) diff --git a/app/src/main/java/code/name/monkey/retromusic/util/CustomArtistImageUtil.kt b/app/src/main/java/code/name/monkey/retromusic/util/CustomArtistImageUtil.kt index a4a3ed27e..4cc73fae8 100644 --- a/app/src/main/java/code/name/monkey/retromusic/util/CustomArtistImageUtil.kt +++ b/app/src/main/java/code/name/monkey/retromusic/util/CustomArtistImageUtil.kt @@ -24,14 +24,14 @@ import androidx.core.content.edit import code.name.monkey.retromusic.App import code.name.monkey.retromusic.R import code.name.monkey.retromusic.extensions.showToast -import code.name.monkey.retromusic.glide.GlideApp import code.name.monkey.retromusic.model.Artist +import com.bumptech.glide.Glide import com.bumptech.glide.load.engine.DiskCacheStrategy import kotlinx.coroutines.Dispatchers.IO import kotlinx.coroutines.withContext import java.io.File import java.io.IOException -import java.util.* +import java.util.Locale class CustomArtistImageUtil private constructor(context: Context) { @@ -45,7 +45,7 @@ class CustomArtistImageUtil private constructor(context: Context) { val context = App.getContext() withContext(IO) { runCatching { - GlideApp.with(context) + Glide.with(context) .asBitmap() .load(uri) .diskCacheStrategy(DiskCacheStrategy.NONE) diff --git a/app/src/normal/java/code/name/monkey/retromusic/activities/PurchaseActivity.kt b/app/src/normal/java/code/name/monkey/retromusic/activities/PurchaseActivity.kt index b23e1d62d..dd0254400 100644 --- a/app/src/normal/java/code/name/monkey/retromusic/activities/PurchaseActivity.kt +++ b/app/src/normal/java/code/name/monkey/retromusic/activities/PurchaseActivity.kt @@ -31,7 +31,7 @@ class PurchaseActivity : AbsThemeActivity(), BillingProcessor.IBillingHandler { setStatusBarColor(Color.TRANSPARENT) setLightStatusBar(false) binding.toolbar.navigationIcon?.setTint(Color.WHITE) - binding.toolbar.setNavigationOnClickListener { onBackPressed() } + binding.toolbar.setNavigationOnClickListener { onBackPressedDispatcher.onBackPressed() } binding.restoreButton.isEnabled = false binding.purchaseButton.isEnabled = false diff --git a/build.gradle b/build.gradle index e3161a5eb..8fe3e1653 100644 --- a/build.gradle +++ b/build.gradle @@ -2,12 +2,12 @@ buildscript { ext { - lifecycle_version='2.5.1' + lifecycle_version = '2.5.1' navigation_version = '2.5.3' mdc_version = '1.9.0-alpha02' preference_version = '1.2.0' appcompat_version = '1.6.1' - core_version='1.9.0' + core_version = '1.9.0' } repositories { @@ -21,7 +21,8 @@ buildscript { } } plugins { - id "com.github.ben-manes.versions" version "0.42.0" + id "com.github.ben-manes.versions" version "0.42.0" apply false + id 'com.google.devtools.ksp' version '1.8.10-1.0.9' apply false } tasks.register('clean', Delete) {