[Cleanup] Converted functions of super class(AbsThemeActivity) to extension functions

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

@@ -24,6 +24,7 @@ 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.extensions.setDrawUnderStatusBar
 import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment
 import code.name.monkey.retromusic.glide.BlurTransformation
 import code.name.monkey.retromusic.glide.GlideApp

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

@@ -24,7 +24,7 @@ import androidx.core.view.ViewCompat
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.activities.base.AbsMusicServiceActivity
 import code.name.monkey.retromusic.databinding.ActivityLockScreenBinding
-import code.name.monkey.retromusic.extensions.whichFragment
+import code.name.monkey.retromusic.extensions.*
 import code.name.monkey.retromusic.fragments.player.lockscreen.LockScreenControlsFragment
 import code.name.monkey.retromusic.glide.GlideApp
 import code.name.monkey.retromusic.glide.RetroGlideExtension
@@ -47,7 +47,7 @@ class LockScreenActivity : AbsMusicServiceActivity() {
         binding = ActivityLockScreenBinding.inflate(layoutInflater)
         setContentView(binding.root)
         hideStatusBar()
-        setStatusbarColorAuto()
+        setStatusBarColorAuto()
         setTaskDescriptionColorAuto()
 
         val config = SlidrConfig.Builder().listener(object : SlidrListener {

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

@@ -26,9 +26,7 @@ import androidx.navigation.ui.setupWithNavController
 import code.name.monkey.retromusic.*
 import code.name.monkey.retromusic.activities.base.AbsCastActivity
 import code.name.monkey.retromusic.databinding.SlidingMusicPanelLayoutBinding
-import code.name.monkey.retromusic.extensions.currentFragment
-import code.name.monkey.retromusic.extensions.extra
-import code.name.monkey.retromusic.extensions.findNavController
+import code.name.monkey.retromusic.extensions.*
 import code.name.monkey.retromusic.fragments.base.AbsRecyclerViewFragment
 import code.name.monkey.retromusic.fragments.home.HomeFragment
 import code.name.monkey.retromusic.helper.MusicPlayerRemote

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

@@ -30,6 +30,8 @@ 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.util.RingtoneManager
 
@@ -40,7 +42,7 @@ class PermissionActivity : AbsMusicServiceActivity() {
         super.onCreate(savedInstanceState)
         binding = ActivityPermissionBinding.inflate(layoutInflater)
         setContentView(binding.root)
-        setStatusbarColorAuto()
+        setStatusBarColorAuto()
         setTaskDescriptionColorAuto()
         setupTitle()
 

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

@@ -28,6 +28,9 @@ 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.setDrawUnderStatusBar
+import code.name.monkey.retromusic.extensions.setLightStatusBar
+import code.name.monkey.retromusic.extensions.setStatusBarColor
 import com.anjlab.android.iab.v3.BillingProcessor
 import com.anjlab.android.iab.v3.PurchaseInfo
 
@@ -41,8 +44,8 @@ class PurchaseActivity : AbsBaseActivity(), BillingProcessor.IBillingHandler {
         super.onCreate(savedInstanceState)
         binding = ActivityProVersionBinding.inflate(layoutInflater)
         setContentView(binding.root)
-        setStatusbarColor(Color.TRANSPARENT)
-        setLightStatusbar(false)
+        setStatusBarColor(Color.TRANSPARENT)
+        setLightStatusBar(false)
         binding.toolbar.navigationIcon?.setTint(Color.WHITE)
         binding.toolbar.setNavigationOnClickListener { onBackPressed() }
 

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

@@ -25,10 +25,7 @@ import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.activities.base.AbsThemeActivity
 import code.name.monkey.retromusic.appshortcuts.DynamicShortcutManager
 import code.name.monkey.retromusic.databinding.ActivitySettingsBinding
-import code.name.monkey.retromusic.extensions.applyToolbar
-import code.name.monkey.retromusic.extensions.extra
-import code.name.monkey.retromusic.extensions.findNavController
-import code.name.monkey.retromusic.extensions.surfaceColor
+import code.name.monkey.retromusic.extensions.*
 import com.afollestad.materialdialogs.MaterialDialog
 import com.afollestad.materialdialogs.color.ColorCallback
 
@@ -38,7 +35,7 @@ class SettingsActivity : AbsThemeActivity(), ColorCallback, OnThemeChangedListen
         setDrawUnderStatusBar()
         val mSavedInstanceState = extra<Bundle>(TAG).value ?: savedInstanceState
         super.onCreate(mSavedInstanceState)
-        setLightStatusbarAuto(surfaceColor())
+        setLightStatusBarAuto(surfaceColor())
         binding = ActivitySettingsBinding.inflate(layoutInflater)
         setContentView(binding.root)
         setupToolbar()

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

@@ -28,6 +28,10 @@ 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.applyToolbar
+import code.name.monkey.retromusic.extensions.setDrawUnderStatusBar
+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.RetroMusicColoredTarget
@@ -60,7 +64,7 @@ class ShareInstagramStory : AbsBaseActivity() {
         super.onCreate(savedInstanceState)
         binding = ActivityShareInstagramBinding.inflate(layoutInflater)
         setContentView(binding.root)
-        setStatusbarColor(Color.TRANSPARENT)
+        setStatusBarColor(Color.TRANSPARENT)
 
         binding.toolbar.setBackgroundColor(Color.TRANSPARENT)
         setSupportActionBar(binding.toolbar)
@@ -104,7 +108,7 @@ class ShareInstagramStory : AbsBaseActivity() {
     }
 
     private fun setColors(colorLight: Boolean, color: Int) {
-        setLightStatusbar(colorLight)
+        setLightStatusBar(colorLight)
         binding.toolbar.setTitleTextColor(
             MaterialValueHelper.getPrimaryTextColor(
                 this@ShareInstagramStory,

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

@@ -37,6 +37,8 @@ import code.name.monkey.retromusic.BuildConfig
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.activities.base.AbsBaseActivity
 import code.name.monkey.retromusic.databinding.ActivityDonationBinding
+import code.name.monkey.retromusic.extensions.setStatusBarColorAuto
+import code.name.monkey.retromusic.extensions.setTaskDescriptionColorAuto
 import code.name.monkey.retromusic.extensions.textColorPrimary
 import code.name.monkey.retromusic.extensions.textColorSecondary
 import com.anjlab.android.iab.v3.BillingProcessor
@@ -73,7 +75,7 @@ class SupportDevelopmentActivity : AbsBaseActivity(), BillingProcessor.IBillingH
         binding = ActivityDonationBinding.inflate(layoutInflater)
         setContentView(binding.root)
 
-        setStatusbarColorAuto()
+        setStatusBarColorAuto()
         setTaskDescriptionColorAuto()
 
         setupToolbar()

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

@@ -17,6 +17,8 @@ import code.name.monkey.retromusic.R
 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.setLightStatusBarAuto
+import code.name.monkey.retromusic.extensions.setTaskDescriptionColorAuto
 import code.name.monkey.retromusic.util.PreferenceUtil.lastVersion
 import code.name.monkey.retromusic.util.RetroUtil
 import java.io.BufferedReader
@@ -29,7 +31,7 @@ class WhatsNewActivity : AbsThemeActivity() {
         super.onCreate(savedInstanceState)
         val binding = ActivityWhatsNewBinding.inflate(layoutInflater)
         setContentView(binding.root)
-        setLightStatusbarAuto(resolveColor(this, R.attr.colorSurface))
+        setLightStatusBarAuto(resolveColor(this, R.attr.colorSurface))
         setTaskDescriptionColorAuto()
         binding.toolbar.setNavigationOnClickListener { onBackPressed() }
         ToolbarContentTintHelper.colorBackButton(binding.toolbar)

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

@@ -184,9 +184,9 @@ abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity() {
     open fun onPanelCollapsed() {
         setMiniPlayerAlphaProgress(0F)
         // restore values
-        super.setLightStatusbarAuto(surfaceColor())
-        super.setLightNavigationAuto()
-        super.setTaskDescriptionColor(taskColor)
+        setLightStatusBarAuto(surfaceColor())
+        setLightNavigationAuto()
+        setTaskDescriptionColor(taskColor)
     }
 
     open fun onPanelExpanded() {
@@ -257,26 +257,26 @@ abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity() {
 
     private fun onPaletteColorChanged() {
         if (panelState == STATE_EXPANDED) {
-            super.setTaskDescriptionColor(paletteColor)
+            setTaskDescColor(paletteColor)
             val isColorLight = ColorUtil.isColorLight(paletteColor)
             if (PreferenceUtil.isAdaptiveColor && (nowPlayingScreen == Normal || nowPlayingScreen == Flat)) {
-                super.setLightNavigationBar(true)
-                super.setLightStatusbar(isColorLight)
+                setLightNavigationBar(true)
+                setLightStatusBar(isColorLight)
             } else if (nowPlayingScreen == Card || nowPlayingScreen == Blur || nowPlayingScreen == BlurCard) {
-                super.setLightStatusbar(false)
-                super.setLightNavigationBar(true)
+                setLightStatusBar(false)
+                setLightNavigationBar(true)
             } else if (nowPlayingScreen == Color || nowPlayingScreen == Tiny || nowPlayingScreen == Gradient) {
-                super.setLightNavigationBar(isColorLight)
-                super.setLightStatusbar(isColorLight)
+                setLightNavigationBar(isColorLight)
+                setLightStatusBar(isColorLight)
             } else if (nowPlayingScreen == Full) {
-                super.setLightNavigationBar(isColorLight)
-                super.setLightStatusbar(false)
+                setLightNavigationBar(isColorLight)
+                setLightStatusBar(false)
             } else if (nowPlayingScreen == Classic) {
-                super.setLightStatusbar(false)
+                setLightStatusBar(false)
             } else if (nowPlayingScreen == Fit) {
-                super.setLightStatusbar(false)
+                setLightStatusBar(false)
             } else {
-                super.setLightStatusbar(
+                setLightStatusBar(
                     ColorUtil.isColorLight(
                         ATHUtil.resolveColor(
                             this,
@@ -284,15 +284,15 @@ abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity() {
                         )
                     )
                 )
-                super.setLightNavigationBar(true)
+                setLightNavigationBar(true)
             }
         }
     }
 
-    override fun setTaskDescriptionColor(color: Int) {
+    private fun setTaskDescColor(color: Int) {
         taskColor = color
         if (panelState == STATE_COLLAPSED) {
-            super.setTaskDescriptionColor(color)
+            setTaskDescriptionColor(color)
         }
     }
 

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

@@ -16,29 +16,16 @@ package code.name.monkey.retromusic.activities.base
 
 import android.content.Context
 import android.content.res.Resources
-import android.graphics.Color
-import android.os.Build
 import android.os.Bundle
 import android.os.Handler
 import android.view.KeyEvent
 import android.view.View
-import android.view.WindowManager
-import androidx.annotation.ColorInt
 import androidx.appcompat.app.AppCompatDelegate.setDefaultNightMode
 import androidx.core.os.ConfigurationCompat
-import androidx.core.view.WindowInsetsCompat
-import androidx.core.view.WindowInsetsControllerCompat
-import code.name.monkey.appthemehelper.ATH
-import code.name.monkey.appthemehelper.ThemeStore
 import code.name.monkey.appthemehelper.common.ATHToolbarActivity
-import code.name.monkey.appthemehelper.util.ATHUtil
-import code.name.monkey.appthemehelper.util.ColorUtil
-import code.name.monkey.appthemehelper.util.VersionUtils
 import code.name.monkey.retromusic.LanguageContextWrapper
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.extensions.surfaceColor
+import code.name.monkey.retromusic.extensions.*
 import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.util.RetroUtil
 import code.name.monkey.retromusic.util.theme.ThemeManager
 import com.google.android.material.color.DynamicColors
 import java.util.*
@@ -54,9 +41,8 @@ abstract class AbsThemeActivity : ATHToolbarActivity(), Runnable {
         setImmersiveFullscreen()
         registerSystemUiVisibility()
         toggleScreenOn()
-        setDrawUnderNavigationBar()
         setLightNavigationAuto()
-        setLightStatusbarAuto(surfaceColor())
+        setLightStatusBarAuto(surfaceColor())
     }
 
     private fun updateTheme() {
@@ -72,14 +58,6 @@ abstract class AbsThemeActivity : ATHToolbarActivity(), Runnable {
         }
     }
 
-    private fun toggleScreenOn() {
-        if (PreferenceUtil.isScreenOnEnabled) {
-            window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
-        } else {
-            window.clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
-        }
-    }
-
     override fun onWindowFocusChanged(hasFocus: Boolean) {
         super.onWindowFocusChanged(hasFocus)
         if (hasFocus) {
@@ -91,95 +69,6 @@ abstract class AbsThemeActivity : ATHToolbarActivity(), Runnable {
         }
     }
 
-    fun hideStatusBar() {
-        hideStatusBar(PreferenceUtil.isFullScreenMode)
-    }
-
-    private fun hideStatusBar(fullscreen: Boolean) {
-        val statusBar = window.decorView.rootView.findViewById<View>(R.id.status_bar)
-        if (statusBar != null) {
-            statusBar.visibility = if (fullscreen) View.GONE else View.VISIBLE
-        }
-    }
-
-    fun setDrawUnderStatusBar() {
-        RetroUtil.setAllowDrawUnderStatusBar(window)
-    }
-
-    private fun setDrawUnderNavigationBar() {
-        RetroUtil.setAllowDrawUnderNavigationBar(window)
-    }
-
-    /**
-     * This will set the color of the view with the id "status_bar" on KitKat and Lollipop. On
-     * Lollipop if no such view is found it will set the statusbar color using the native method.
-     *
-     * @param color the new statusbar color (will be shifted down on Lollipop and above)
-     */
-    fun setStatusbarColor(color: Int) {
-        val statusBar = window.decorView.rootView.findViewById<View>(R.id.status_bar)
-        if (statusBar != null) {
-            when {
-                VersionUtils.hasMarshmallow() -> statusBar.setBackgroundColor(color)
-                else -> statusBar.setBackgroundColor(
-                    ColorUtil.darkenColor(
-                        color
-                    )
-                )
-            }
-        } else {
-            when {
-                VersionUtils.hasMarshmallow() -> window.statusBarColor = color
-                else -> window.statusBarColor = ColorUtil.darkenColor(color)
-            }
-        }
-        setLightStatusbarAuto(ATHUtil.resolveColor(this, R.attr.colorSurface))
-    }
-
-    fun setStatusbarColorAuto() {
-        // we don't want to use statusbar color because we are doing the color darkening on our own to support KitKat
-        setStatusbarColor(ATHUtil.resolveColor(this, R.attr.colorSurface))
-        setLightStatusbarAuto(ATHUtil.resolveColor(this, R.attr.colorSurface))
-    }
-
-    open fun setTaskDescriptionColor(@ColorInt color: Int) {
-        ATH.setTaskDescriptionColor(this, color)
-    }
-
-    fun setTaskDescriptionColorAuto() {
-        setTaskDescriptionColor(ATHUtil.resolveColor(this, R.attr.colorSurface))
-    }
-
-    open fun setNavigationbarColor(color: Int) {
-        if (ThemeStore.coloredNavigationBar(this)) {
-            ATH.setNavigationbarColor(this, color)
-        } else {
-            ATH.setNavigationbarColor(this, Color.BLACK)
-        }
-    }
-
-    fun setNavigationbarColorAuto() {
-        setNavigationbarColor(ATHUtil.resolveColor(this, R.attr.colorSurface))
-    }
-
-    fun setLightNavigationAuto() {
-        ATH.setLightNavigationbarAuto(this, surfaceColor())
-    }
-
-    open fun setLightStatusbar(enabled: Boolean) {
-        ATH.setLightStatusbar(this, enabled)
-    }
-
-    fun setLightStatusbarAuto(bgColor: Int) {
-        setLightStatusbar(ColorUtil.isColorLight(bgColor))
-    }
-
-    open fun setLightNavigationBar(enabled: Boolean) {
-        if (!ATHUtil.isWindowBackgroundDark(this) and ThemeStore.coloredNavigationBar(this)) {
-            ATH.setLightNavigationbar(this, enabled)
-        }
-    }
-
     private fun registerSystemUiVisibility() {
         val decorView = window.decorView
         decorView.setOnSystemUiVisibilityChangeListener { visibility ->
@@ -194,26 +83,6 @@ abstract class AbsThemeActivity : ATHToolbarActivity(), Runnable {
         decorView.setOnSystemUiVisibilityChangeListener(null)
     }
 
-    private fun setImmersiveFullscreen() {
-        if (PreferenceUtil.isFullScreenMode) {
-            WindowInsetsControllerCompat(window, window.decorView).apply {
-                systemBarsBehavior =
-                    WindowInsetsControllerCompat.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE
-                hide(WindowInsetsCompat.Type.systemBars())
-            }
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
-                window.attributes.layoutInDisplayCutoutMode = WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES
-            }
-        }
-    }
-
-    private fun exitFullscreen() {
-        WindowInsetsControllerCompat(window, window.decorView).apply {
-            systemBarsBehavior = WindowInsetsControllerCompat.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE
-            show(WindowInsetsCompat.Type.systemBars())
-        }
-    }
-
     override fun run() {
         setImmersiveFullscreen()
     }

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

@@ -41,6 +41,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.setTaskDescriptionColorAuto
 import code.name.monkey.retromusic.misc.DialogAsyncTask
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.floatingactionbutton.FloatingActionButton

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

@@ -42,6 +42,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.setTaskDescriptionColorAuto
 import code.name.monkey.retromusic.model.ArtworkInfo
 import code.name.monkey.retromusic.model.AudioTagInfo
 import code.name.monkey.retromusic.repository.Repository

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

@@ -32,6 +32,7 @@ import code.name.monkey.appthemehelper.util.ATHUtil
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.databinding.ActivityAlbumTagEditorBinding
 import code.name.monkey.retromusic.extensions.appHandleColor
+import code.name.monkey.retromusic.extensions.setDrawUnderStatusBar
 import code.name.monkey.retromusic.extensions.setTint
 import code.name.monkey.retromusic.glide.GlideApp
 import code.name.monkey.retromusic.glide.palette.BitmapPaletteWrapper