Code Cleanup

app/src/main/java/code/name/monkey/retromusic/activities/DriveModeActivity.kt

@@ -22,11 +22,11 @@ import android.os.Bundle
 import android.view.animation.LinearInterpolator
 import android.widget.SeekBar
 import androidx.lifecycle.lifecycleScope
-import code.name.monkey.appthemehelper.ThemeStore
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.activities.base.AbsMusicServiceActivity
 import code.name.monkey.retromusic.databinding.ActivityDriveModeBinding
 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.fragments.base.AbsPlayerControlsFragment
 import code.name.monkey.retromusic.glide.BlurTransformation
@@ -66,7 +66,7 @@ class DriveModeActivity : AbsMusicServiceActivity(), Callback {
         setUpMusicControllers()
 
         progressViewUpdateHelper = MusicProgressViewUpdateHelper(this)
-        lastPlaybackControlsColor = ThemeStore.accentColor(this)
+        lastPlaybackControlsColor = accentColor()
         binding.close.setOnClickListener {
             onBackPressed()
         }
@@ -91,14 +91,12 @@ class DriveModeActivity : AbsMusicServiceActivity(), Callback {
     private fun toggleFavorite(song: Song) {
         lifecycleScope.launch(Dispatchers.IO) {
             val playlist = repository.favoritePlaylist()
-            if (playlist != null) {
-                val songEntity = song.toSongEntity(playlist.playListId)
-                val isFavorite = repository.isSongFavorite(song.id)
-                if (isFavorite) {
-                    repository.removeSongFromPlaylist(songEntity)
-                } else {
-                    repository.insertSongs(listOf(song.toSongEntity(playlist.playListId)))
-                }
+            val songEntity = song.toSongEntity(playlist.playListId)
+            val isFavorite = repository.isSongFavorite(song.id)
+            if (isFavorite) {
+                repository.removeSongFromPlaylist(songEntity)
+            } else {
+                repository.insertSongs(listOf(song.toSongEntity(playlist.playListId)))
             }
             sendBroadcast(Intent(MusicService.FAVORITE_STATE_CHANGED))
         }
@@ -139,7 +137,6 @@ class DriveModeActivity : AbsMusicServiceActivity(), Callback {
     }
 
     private fun setUpPrevNext() {
-
         binding.nextButton.setOnClickListener { MusicPlayerRemote.playNextSong() }
         binding.previousButton.setOnClickListener { MusicPlayerRemote.back() }
     }
@@ -246,7 +243,8 @@ class DriveModeActivity : AbsMusicServiceActivity(), Callback {
 
         GlideApp.with(this)
             .load(RetroGlideExtension.getSongModel(song))
-            .songCoverOptions(song).transform(BlurTransformation.Builder(this).build())
+            .songCoverOptions(song)
+            .transform(BlurTransformation.Builder(this).build())
             .into(binding.image)
     }
 

app/src/main/java/code/name/monkey/retromusic/activities/LicenseActivity.kt

@@ -16,12 +16,12 @@ package code.name.monkey.retromusic.activities
 import android.graphics.Color
 import android.os.Bundle
 import android.view.MenuItem
-import code.name.monkey.appthemehelper.ThemeStore.Companion.accentColor
 import code.name.monkey.appthemehelper.util.ATHUtil.isWindowBackgroundDark
 import code.name.monkey.appthemehelper.util.ColorUtil.lightenColor
 import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper
 import code.name.monkey.retromusic.activities.base.AbsThemeActivity
 import code.name.monkey.retromusic.databinding.ActivityLicenseBinding
+import code.name.monkey.retromusic.extensions.accentColor
 import code.name.monkey.retromusic.extensions.drawAboveSystemBars
 import code.name.monkey.retromusic.extensions.surfaceColor
 import java.io.BufferedReader
@@ -59,11 +59,11 @@ class LicenseActivity : AbsThemeActivity() {
                         "body { background-color: %s; color: %s; }", backgroundColor, contentColor
                     )
                 )
-                .replace("{link-color}", colorToCSS(accentColor(this)))
+                .replace("{link-color}", colorToCSS(accentColor()))
                 .replace(
                     "{link-color-active}",
                     colorToCSS(
-                        lightenColor(accentColor(this))
+                        lightenColor(accentColor())
                     )
                 )
             binding.license.loadData(changeLog, "text/html", "UTF-8")

app/src/main/java/code/name/monkey/retromusic/activities/PermissionActivity.kt

@@ -25,14 +25,10 @@ import androidx.annotation.RequiresApi
 import androidx.core.net.toUri
 import androidx.core.text.parseAsHtml
 import androidx.core.view.isVisible
-import code.name.monkey.appthemehelper.ThemeStore
 import code.name.monkey.appthemehelper.util.VersionUtils
 import code.name.monkey.retromusic.activities.base.AbsMusicServiceActivity
 import code.name.monkey.retromusic.databinding.ActivityPermissionBinding
-import code.name.monkey.retromusic.extensions.accentBackgroundColor
-import code.name.monkey.retromusic.extensions.setStatusBarColorAuto
-import code.name.monkey.retromusic.extensions.setTaskDescriptionColorAuto
-import code.name.monkey.retromusic.extensions.show
+import code.name.monkey.retromusic.extensions.*
 import code.name.monkey.retromusic.util.RingtoneManager
 
 class PermissionActivity : AbsMusicServiceActivity() {
@@ -75,10 +71,11 @@ class PermissionActivity : AbsMusicServiceActivity() {
     }
 
     private fun setupTitle() {
-        val color = ThemeStore.accentColor(this)
+        val color = accentColor()
         val hexColor = String.format("#%06X", 0xFFFFFF and color)
-        val appName = "Hello there! <br>Welcome to <b>Retro <span  style='color:$hexColor';>Music</span></b>"
-            .parseAsHtml()
+        val appName =
+            "Hello there! <br>Welcome to <b>Retro <span  style='color:$hexColor';>Music</span></b>"
+                .parseAsHtml()
         binding.appNameText.text = appName
     }
 
@@ -87,14 +84,13 @@ class PermissionActivity : AbsMusicServiceActivity() {
         if (hasStoragePermission()) {
             binding.storagePermission.checkImage.isVisible = true
             binding.storagePermission.checkImage.imageTintList =
-                ColorStateList.valueOf(ThemeStore.accentColor(this))
+                ColorStateList.valueOf(accentColor())
         }
         if (hasAudioPermission()) {
             binding.audioPermission.checkImage.isVisible = true
             binding.audioPermission.checkImage.imageTintList =
-                ColorStateList.valueOf(ThemeStore.accentColor(this))
+                ColorStateList.valueOf(accentColor())
         }
-
         super.onResume()
     }
 

app/src/main/java/code/name/monkey/retromusic/activities/PurchaseActivity.kt

@@ -28,6 +28,7 @@ import code.name.monkey.retromusic.Constants.PRO_VERSION_PRODUCT_ID
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.activities.base.AbsBaseActivity
 import code.name.monkey.retromusic.databinding.ActivityProVersionBinding
+import code.name.monkey.retromusic.extensions.accentColor
 import code.name.monkey.retromusic.extensions.setLightStatusBar
 import code.name.monkey.retromusic.extensions.setStatusBarColor
 import com.anjlab.android.iab.v3.BillingProcessor
@@ -61,7 +62,7 @@ class PurchaseActivity : AbsBaseActivity(), BillingProcessor.IBillingHandler {
             billingProcessor.purchase(this@PurchaseActivity, PRO_VERSION_PRODUCT_ID)
         }
         binding.bannerContainer.backgroundTintList =
-            ColorStateList.valueOf(ThemeStore.accentColor(this))
+            ColorStateList.valueOf(accentColor())
     }
 
     private fun restorePurchase() {

app/src/main/java/code/name/monkey/retromusic/activities/ShareInstagramStory.kt

@@ -28,6 +28,7 @@ import code.name.monkey.appthemehelper.util.ColorUtil
 import code.name.monkey.appthemehelper.util.MaterialValueHelper
 import code.name.monkey.retromusic.activities.base.AbsBaseActivity
 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
@@ -96,11 +97,11 @@ class ShareInstagramStory : AbsBaseActivity() {
         binding.shareButton.setTextColor(
             MaterialValueHelper.getPrimaryTextColor(
                 this,
-                ColorUtil.isColorLight(ThemeStore.accentColor(this))
+                ColorUtil.isColorLight(accentColor())
             )
         )
         binding.shareButton.backgroundTintList =
-            ColorStateList.valueOf(ThemeStore.accentColor(this))
+            ColorStateList.valueOf(accentColor())
     }
 
     private fun setColors(colorLight: Boolean, color: Int) {

app/src/main/java/code/name/monkey/retromusic/activities/SupportDevelopmentActivity.kt

@@ -75,8 +75,8 @@ class SupportDevelopmentActivity : AbsBaseActivity(), BillingProcessor.IBillingH
         setupToolbar()
 
         billingProcessor = BillingProcessor(this, BuildConfig.GOOGLE_PLAY_LICENSING_KEY, this)
-        TintHelper.setTint(binding.progress, ThemeStore.accentColor(this))
-        binding.donation.setTextColor(ThemeStore.accentColor(this))
+        TintHelper.setTint(binding.progress, accentColor())
+        binding.donation.setTextColor(accentColor())
     }
 
     private fun setupToolbar() {

app/src/main/java/code/name/monkey/retromusic/activities/WhatsNewActivity.kt

@@ -5,7 +5,6 @@ import android.content.pm.PackageManager
 import android.graphics.Color
 import android.os.Bundle
 import androidx.core.widget.NestedScrollView
-import code.name.monkey.appthemehelper.ThemeStore.Companion.accentColor
 import code.name.monkey.appthemehelper.util.ATHUtil.isWindowBackgroundDark
 import code.name.monkey.appthemehelper.util.ColorUtil.isColorLight
 import code.name.monkey.appthemehelper.util.ColorUtil.lightenColor
@@ -14,12 +13,8 @@ import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper
 import code.name.monkey.retromusic.Constants
 import code.name.monkey.retromusic.activities.base.AbsThemeActivity
 import code.name.monkey.retromusic.databinding.ActivityWhatsNewBinding
-import code.name.monkey.retromusic.extensions.accentColor
-import code.name.monkey.retromusic.extensions.drawAboveSystemBars
-import code.name.monkey.retromusic.extensions.setTaskDescriptionColorAuto
-import code.name.monkey.retromusic.extensions.surfaceColor
+import code.name.monkey.retromusic.extensions.*
 import code.name.monkey.retromusic.util.PreferenceUtil.lastVersion
-import code.name.monkey.retromusic.util.RetroUtil
 import java.io.BufferedReader
 import java.io.InputStreamReader
 import java.nio.charset.StandardCharsets
@@ -45,13 +40,13 @@ class WhatsNewActivity : AbsThemeActivity() {
 
             // Inject color values for WebView body background and links
             val isDark = isWindowBackgroundDark(this)
-            val accentColor = accentColor(this)
+            val accentColor = accentColor()
             val backgroundColor = colorToCSS(
                 surfaceColor(Color.parseColor(if (isDark) "#424242" else "#ffffff"))
             )
             val contentColor = colorToCSS(Color.parseColor(if (isDark) "#ffffff" else "#000000"))
             val textColor = colorToCSS(Color.parseColor(if (isDark) "#60FFFFFF" else "#80000000"))
-            val accentColorString = colorToCSS(accentColor(this))
+            val accentColorString = colorToCSS(accentColor())
             val cardBackgroundColor =
                 colorToCSS(Color.parseColor(if (isDark) "#353535" else "#ffffff"))
             val accentTextColor = colorToCSS(
@@ -64,11 +59,11 @@ class WhatsNewActivity : AbsThemeActivity() {
                     "{style-placeholder}",
                     "body { background-color: $backgroundColor; color: $contentColor; } li {color: $textColor;} h3 {color: $accentColorString;} .tag {background-color: $accentColorString; color: $accentTextColor; } div{background-color: $cardBackgroundColor;}"
                 )
-                .replace("{link-color}", colorToCSS(accentColor(this)))
+                .replace("{link-color}", colorToCSS(accentColor()))
                 .replace(
                     "{link-color-active}",
                     colorToCSS(
-                        lightenColor(accentColor(this))
+                        lightenColor(accentColor())
                     )
                 )
             binding.webView.loadData(changeLog, "text/html", "UTF-8")
@@ -79,10 +74,7 @@ class WhatsNewActivity : AbsThemeActivity() {
         }
         setChangelogRead(this)
         binding.tgFab.setOnClickListener {
-            RetroUtil.openUrl(
-                this,
-                Constants.TELEGRAM_CHANGE_LOG
-            )
+            openUrl(Constants.TELEGRAM_CHANGE_LOG)
         }
         binding.tgFab.accentColor()
         binding.tgFab.shrink()

app/src/main/java/code/name/monkey/retromusic/activities/base/AbsBaseActivity.kt

@@ -29,9 +29,9 @@ import android.view.inputmethod.InputMethodManager
 import android.widget.EditText
 import androidx.core.app.ActivityCompat
 import androidx.core.content.getSystemService
-import code.name.monkey.appthemehelper.ThemeStore
 import code.name.monkey.appthemehelper.util.VersionUtils
 import code.name.monkey.retromusic.R
+import code.name.monkey.retromusic.extensions.accentColor
 import com.google.android.material.snackbar.Snackbar
 
 abstract class AbsBaseActivity : AbsThemeActivity() {
@@ -126,24 +126,25 @@ abstract class AbsBaseActivity : AbsThemeActivity() {
                             Snackbar.LENGTH_INDEFINITE
                         )
                             .setAction(R.string.action_grant) { requestPermissions() }
-                            .setActionTextColor(ThemeStore.accentColor(this)).show()
+                            .setActionTextColor(accentColor()).show()
                     } else {
                         // User has deny permission and checked never show permission dialog so you can redirect to Application settings page
                         Snackbar.make(
                             snackBarContainer,
                             permissionDeniedMessage!!,
                             Snackbar.LENGTH_INDEFINITE
-                        ).setAction(R.string.action_settings) {
-                            val intent = Intent()
-                            intent.action = Settings.ACTION_APPLICATION_DETAILS_SETTINGS
-                            val uri = Uri.fromParts(
-                                "package",
-                                this@AbsBaseActivity.packageName,
-                                null
-                            )
-                            intent.data = uri
-                            startActivity(intent)
-                        }.setActionTextColor(ThemeStore.accentColor(this)).show()
+                        )
+                            .setAction(R.string.action_settings) {
+                                val intent = Intent()
+                                intent.action = Settings.ACTION_APPLICATION_DETAILS_SETTINGS
+                                val uri = Uri.fromParts(
+                                    "package",
+                                    this@AbsBaseActivity.packageName,
+                                    null
+                                )
+                                intent.data = uri
+                                startActivity(intent)
+                            }.setActionTextColor(accentColor()).show()
                     }
                     return
                 }
@@ -156,6 +157,7 @@ abstract class AbsBaseActivity : AbsThemeActivity() {
     companion object {
         const val PERMISSION_REQUEST = 100
     }
+
     // this  lets keyboard close when clicked in backgroud
     override fun dispatchTouchEvent(event: MotionEvent): Boolean {
         if (event.action == MotionEvent.ACTION_DOWN) {
@@ -165,7 +167,10 @@ abstract class AbsBaseActivity : AbsThemeActivity() {
                 v.getGlobalVisibleRect(outRect)
                 if (!outRect.contains(event.rawX.toInt(), event.rawY.toInt())) {
                     v.clearFocus()
-                    getSystemService<InputMethodManager>()?.hideSoftInputFromWindow(v.windowToken, 0)
+                    getSystemService<InputMethodManager>()?.hideSoftInputFromWindow(
+                        v.windowToken,
+                        0
+                    )
                 }
             }
         }

app/src/main/java/code/name/monkey/retromusic/activities/base/AbsCastActivity.kt

@@ -4,7 +4,7 @@ import android.os.Bundle
 import android.view.ViewStub
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.cast.CastHelper
-import code.name.monkey.retromusic.cast.RetroSessionManager
+import code.name.monkey.retromusic.cast.RetroSessionManagerListener
 import code.name.monkey.retromusic.cast.RetroWebServer
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
 import com.google.android.gms.cast.framework.CastContext
@@ -22,7 +22,7 @@ abstract class AbsCastActivity : AbsSlidingMusicPanelActivity() {
     private var playServicesAvailable: Boolean = false
 
     private val sessionManagerListener by lazy {
-        object : RetroSessionManager {
+        object : RetroSessionManagerListener {
             override fun onSessionStarting(castSession: CastSession) {
                 invalidateOptionsMenu()
                 webServer = RetroWebServer.getInstance(this@AbsCastActivity)
@@ -88,7 +88,7 @@ abstract class AbsCastActivity : AbsSlidingMusicPanelActivity() {
     }
 
     private fun setupCast() {
-        sessionManager = CastContext.getSharedInstance(applicationContext).sessionManager
+        sessionManager = CastContext.getSharedInstance(this).sessionManager
     }
 
     override fun onResume() {
@@ -104,9 +104,15 @@ abstract class AbsCastActivity : AbsSlidingMusicPanelActivity() {
         super.onResume()
     }
 
-    override fun onStop() {
-        super.onStop()
-        mCastSession = null
+    override fun onPause() {
+        super.onPause()
+        if (playServicesAvailable) {
+            sessionManager.removeSessionManagerListener(
+                sessionManagerListener,
+                CastSession::class.java
+            )
+            mCastSession = null
+        }
     }
 
     private fun songChanged(position: Int) {

app/src/main/java/code/name/monkey/retromusic/activities/bugreport/BugReportActivity.kt

@@ -26,7 +26,6 @@ import androidx.annotation.StringRes
 import androidx.core.content.getSystemService
 import androidx.core.net.toUri
 import androidx.lifecycle.lifecycleScope
-import code.name.monkey.appthemehelper.ThemeStore
 import code.name.monkey.appthemehelper.util.MaterialUtil
 import code.name.monkey.appthemehelper.util.TintHelper
 import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper
@@ -38,6 +37,7 @@ import code.name.monkey.retromusic.activities.bugreport.model.github.ExtraInfo
 import code.name.monkey.retromusic.activities.bugreport.model.github.GithubLogin
 import code.name.monkey.retromusic.activities.bugreport.model.github.GithubTarget
 import code.name.monkey.retromusic.databinding.ActivityBugReportBinding
+import code.name.monkey.retromusic.extensions.accentColor
 import code.name.monkey.retromusic.extensions.setTaskDescriptionColorAuto
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.floatingactionbutton.FloatingActionButton
@@ -87,7 +87,7 @@ open class BugReportActivity : AbsThemeActivity() {
     }
 
     private fun initViews() {
-        val accentColor = ThemeStore.accentColor(this)
+        val accentColor = accentColor()
         setSupportActionBar(binding.toolbar)
         ToolbarContentTintHelper.colorBackButton(binding.toolbar)
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
@@ -314,6 +314,7 @@ open class BugReportActivity : AbsThemeActivity() {
 
         private const val STATUS_BAD_CREDENTIALS = 401
         private const val STATUS_ISSUES_NOT_ENABLED = 410
-        private const val ISSUE_TRACKER_LINK = "https://github.com/RetroMusicPlayer/RetroMusicPlayer"
+        private const val ISSUE_TRACKER_LINK =
+            "https://github.com/RetroMusicPlayer/RetroMusicPlayer"
     }
 }

app/src/main/java/code/name/monkey/retromusic/activities/tageditor/AbsTagEditorActivity.kt

@@ -41,6 +41,7 @@ import code.name.monkey.retromusic.R.drawable
 import code.name.monkey.retromusic.activities.base.AbsBaseActivity
 import code.name.monkey.retromusic.activities.saf.SAFGuideActivity
 import code.name.monkey.retromusic.extensions.accentColor
+import code.name.monkey.retromusic.extensions.hideSoftKeyboard
 import code.name.monkey.retromusic.extensions.setTaskDescriptionColorAuto
 import code.name.monkey.retromusic.model.ArtworkInfo
 import code.name.monkey.retromusic.model.AudioTagInfo
@@ -346,7 +347,7 @@ abstract class AbsTagEditorActivity<VB : ViewBinding> : AbsBaseActivity() {
         fieldKeyValueMap: Map<FieldKey, String>,
         artworkInfo: ArtworkInfo?
     ) {
-        RetroUtil.hideSoftKeyboard(this)
+        hideSoftKeyboard()
 
         hideFab()
         println(fieldKeyValueMap)