Code refactor and Flat, Fit, Full, Circle theme toolbar shadow fixes

app/src/main/java/code/name/monkey/retromusic/preferences/AlbumCoverStylePreferenceDialog.kt

@@ -35,10 +35,7 @@ import code.name.monkey.retromusic.App
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.extensions.colorControlNormal
 import code.name.monkey.retromusic.fragments.AlbumCoverStyle
-import code.name.monkey.retromusic.fragments.AlbumCoverStyle.CARD
-import code.name.monkey.retromusic.fragments.AlbumCoverStyle.CIRCLE
-import code.name.monkey.retromusic.fragments.AlbumCoverStyle.FULL_CARD
-import code.name.monkey.retromusic.fragments.AlbumCoverStyle.values
+import code.name.monkey.retromusic.fragments.AlbumCoverStyle.*
 import code.name.monkey.retromusic.util.NavigationUtil
 import code.name.monkey.retromusic.util.PreferenceUtil
 import code.name.monkey.retromusic.util.ViewUtil
@@ -61,11 +58,15 @@ class AlbumCoverStylePreference @JvmOverloads constructor(
 
     init {
         icon?.colorFilter =
-            BlendModeColorFilterCompat.createBlendModeColorFilterCompat(colorControlNormal(context), SRC_IN)
+            BlendModeColorFilterCompat.createBlendModeColorFilterCompat(
+                colorControlNormal(context),
+                SRC_IN
+            )
     }
 }
 
-class AlbumCoverStylePreferenceDialog : PreferenceDialogFragmentCompat(), ViewPager.OnPageChangeListener {
+class AlbumCoverStylePreferenceDialog : PreferenceDialogFragmentCompat(),
+    ViewPager.OnPageChangeListener {
     override fun onDialogClosed(positiveResult: Boolean) {
     }
 
@@ -73,7 +74,8 @@ class AlbumCoverStylePreferenceDialog : PreferenceDialogFragmentCompat(), ViewPa
 
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
         @SuppressLint("InflateParams") val view =
-            LayoutInflater.from(activity).inflate(R.layout.preference_dialog_now_playing_screen, null)
+            LayoutInflater.from(activity)
+                .inflate(R.layout.preference_dialog_now_playing_screen, null)
         val viewPager = view.findViewById<ViewPager>(R.id.now_playing_screen_view_pager)
         viewPager.adapter = AlbumCoverStyleAdapter(activity!!)
         viewPager.addOnPageChangeListener(this)
@@ -109,13 +111,18 @@ class AlbumCoverStylePreferenceDialog : PreferenceDialogFragmentCompat(), ViewPa
     override fun onPageScrollStateChanged(state: Int) {
     }
 
-    private class AlbumCoverStyleAdapter internal constructor(private val context: Context) : PagerAdapter() {
+    private class AlbumCoverStyleAdapter internal constructor(private val context: Context) :
+        PagerAdapter() {
 
         override fun instantiateItem(collection: ViewGroup, position: Int): Any {
             val albumCoverStyle = values()[position]
 
             val inflater = LayoutInflater.from(context)
-            val layout = inflater.inflate(R.layout.preference_now_playing_screen_item, collection, false) as ViewGroup
+            val layout = inflater.inflate(
+                R.layout.preference_now_playing_screen_item,
+                collection,
+                false
+            ) as ViewGroup
             collection.addView(layout)
 
             val image = layout.findViewById<ImageView>(R.id.image)

app/src/main/java/code/name/monkey/retromusic/preferences/BlacklistPreferenceDialog.kt

@@ -33,7 +33,7 @@ import com.afollestad.materialdialogs.MaterialDialog
 import com.afollestad.materialdialogs.bottomsheets.BottomSheet
 import com.afollestad.materialdialogs.list.listItems
 import java.io.File
-import java.util.ArrayList
+import java.util.*
 
 class BlacklistPreference @JvmOverloads constructor(
     context: Context,
@@ -44,7 +44,10 @@ class BlacklistPreference @JvmOverloads constructor(
 
     init {
         icon?.colorFilter =
-            BlendModeColorFilterCompat.createBlendModeColorFilterCompat(colorControlNormal(context), SRC_IN)
+            BlendModeColorFilterCompat.createBlendModeColorFilterCompat(
+                colorControlNormal(context),
+                SRC_IN
+            )
     }
 }
 

app/src/main/java/code/name/monkey/retromusic/preferences/LibraryPreference.kt

@@ -34,7 +34,7 @@ import com.afollestad.materialdialogs.LayoutMode
 import com.afollestad.materialdialogs.MaterialDialog
 import com.afollestad.materialdialogs.bottomsheets.BottomSheet
 import com.afollestad.materialdialogs.customview.customView
-import java.util.ArrayList
+import java.util.*
 
 class LibraryPreference @JvmOverloads constructor(
     context: Context,
@@ -46,7 +46,10 @@ class LibraryPreference @JvmOverloads constructor(
 
     init {
         icon?.colorFilter =
-            BlendModeColorFilterCompat.createBlendModeColorFilterCompat(colorControlNormal(context), SRC_IN)
+            BlendModeColorFilterCompat.createBlendModeColorFilterCompat(
+                colorControlNormal(context),
+                SRC_IN
+            )
     }
 }
 
@@ -58,7 +61,10 @@ class LibraryPreferenceDialog : PreferenceDialogFragmentCompat() {
     lateinit var adapter: CategoryInfoAdapter
 
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-        val view = requireActivity().layoutInflater.inflate(R.layout.preference_dialog_library_categories, null)
+        val view = requireActivity().layoutInflater.inflate(
+            R.layout.preference_dialog_library_categories,
+            null
+        )
 
         val categoryInfos: List<CategoryInfo> = if (savedInstanceState != null) {
             savedInstanceState.getParcelableArrayList(PreferenceUtil.LIBRARY_CATEGORIES)!!
@@ -85,14 +91,18 @@ class LibraryPreferenceDialog : PreferenceDialogFragmentCompat() {
                 dismiss()
             }
             .neutralButton(R.string.reset_action) {
-                adapter.categoryInfos = PreferenceUtil.getInstance(requireContext()).defaultLibraryCategoryInfos
+                adapter.categoryInfos =
+                    PreferenceUtil.getInstance(requireContext()).defaultLibraryCategoryInfos
             }
             .noAutoDismiss()
     }
 
     override fun onSaveInstanceState(outState: Bundle) {
         super.onSaveInstanceState(outState)
-        outState.putParcelableArrayList(PreferenceUtil.LIBRARY_CATEGORIES, ArrayList(adapter.categoryInfos))
+        outState.putParcelableArrayList(
+            PreferenceUtil.LIBRARY_CATEGORIES,
+            ArrayList(adapter.categoryInfos)
+        )
     }
 
     private fun updateCategories(categories: List<CategoryInfo>) {

app/src/main/java/code/name/monkey/retromusic/preferences/NowPlayingScreenPreferenceDialog.kt

@@ -34,16 +34,7 @@ import code.name.monkey.retromusic.App
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.extensions.colorControlNormal
 import code.name.monkey.retromusic.fragments.NowPlayingScreen
-import code.name.monkey.retromusic.fragments.NowPlayingScreen.ADAPTIVE
-import code.name.monkey.retromusic.fragments.NowPlayingScreen.BLUR
-import code.name.monkey.retromusic.fragments.NowPlayingScreen.BLUR_CARD
-import code.name.monkey.retromusic.fragments.NowPlayingScreen.CARD
-import code.name.monkey.retromusic.fragments.NowPlayingScreen.CIRCLE
-import code.name.monkey.retromusic.fragments.NowPlayingScreen.COLOR
-import code.name.monkey.retromusic.fragments.NowPlayingScreen.FULL
-import code.name.monkey.retromusic.fragments.NowPlayingScreen.PLAIN
-import code.name.monkey.retromusic.fragments.NowPlayingScreen.SIMPLE
-import code.name.monkey.retromusic.fragments.NowPlayingScreen.values
+import code.name.monkey.retromusic.fragments.NowPlayingScreen.*
 import code.name.monkey.retromusic.util.NavigationUtil
 import code.name.monkey.retromusic.util.PreferenceUtil
 import code.name.monkey.retromusic.util.ViewUtil
@@ -72,7 +63,8 @@ class NowPlayingScreenPreference @JvmOverloads constructor(
     }
 }
 
-class NowPlayingScreenPreferenceDialog : PreferenceDialogFragmentCompat(), ViewPager.OnPageChangeListener {
+class NowPlayingScreenPreferenceDialog : PreferenceDialogFragmentCompat(),
+    ViewPager.OnPageChangeListener {
 
     private var viewPagerPosition: Int = 0
 
@@ -90,13 +82,15 @@ class NowPlayingScreenPreferenceDialog : PreferenceDialogFragmentCompat(), ViewP
     }
 
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-        val view = LayoutInflater.from(activity).inflate(R.layout.preference_dialog_now_playing_screen, null)
+        val view = LayoutInflater.from(activity)
+            .inflate(R.layout.preference_dialog_now_playing_screen, null)
         val viewPager = view.findViewById<ViewPager>(R.id.now_playing_screen_view_pager)
             ?: throw  IllegalStateException("Dialog view must contain a ViewPager with id 'now_playing_screen_view_pager'")
         viewPager.adapter = NowPlayingScreenAdapter(requireContext())
         viewPager.addOnPageChangeListener(this)
         viewPager.pageMargin = ViewUtil.convertDpToPixel(32f, resources).toInt()
-        viewPager.currentItem = PreferenceUtil.getInstance(requireContext()).nowPlayingScreen.ordinal
+        viewPager.currentItem =
+            PreferenceUtil.getInstance(requireContext()).nowPlayingScreen.ordinal
 
 
         return MaterialDialog(requireContext()).show {
@@ -104,7 +98,8 @@ class NowPlayingScreenPreferenceDialog : PreferenceDialogFragmentCompat(), ViewP
             positiveButton(R.string.set) {
                 val nowPlayingScreen = values()[viewPagerPosition]
                 if (isNowPlayingThemes(nowPlayingScreen)) {
-                    val result = getString(nowPlayingScreen.titleRes) + " theme is Pro version feature."
+                    val result =
+                        getString(nowPlayingScreen.titleRes) + " theme is Pro version feature."
                     Toast.makeText(context, result, Toast.LENGTH_SHORT).show()
                     NavigationUtil.goToProVersion(activity!!)
                 } else {
@@ -134,7 +129,11 @@ private class NowPlayingScreenAdapter(private val context: Context) : PagerAdapt
         val nowPlayingScreen = values()[position]
 
         val inflater = LayoutInflater.from(context)
-        val layout = inflater.inflate(R.layout.preference_now_playing_screen_item, collection, false) as ViewGroup
+        val layout = inflater.inflate(
+            R.layout.preference_now_playing_screen_item,
+            collection,
+            false
+        ) as ViewGroup
         collection.addView(layout)
 
         val image = layout.findViewById<ImageView>(R.id.image)