Converted PreferencUtil to Kotlin class

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

@@ -37,7 +37,8 @@ import code.name.monkey.retromusic.extensions.colorControlNormal
 import code.name.monkey.retromusic.fragments.AlbumCoverStyle
 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.PreferenceUtilKT
 import code.name.monkey.retromusic.util.ViewUtil
 import com.afollestad.materialdialogs.MaterialDialog
 import com.afollestad.materialdialogs.customview.customView
@@ -80,11 +81,11 @@ class AlbumCoverStylePreferenceDialog : PreferenceDialogFragmentCompat(),
         viewPager.adapter = AlbumCoverStyleAdapter(requireContext())
         viewPager.addOnPageChangeListener(this)
         viewPager.pageMargin = ViewUtil.convertDpToPixel(32f, resources).toInt()
-        viewPager.currentItem = PreferenceUtil.getInstance(requireContext()).albumCoverStyle.ordinal
+        viewPager.currentItem = PreferenceUtilKT.albumCoverStyle.ordinal
 
         return MaterialDialog(requireActivity()).show {
             title(R.string.pref_title_album_cover_style)
-            cornerRadius(PreferenceUtil.getInstance(requireContext()).dialogCorner)
+
             positiveButton(R.string.set) {
                 val coverStyle = values()[viewPagerPosition]
                 if (isAlbumCoverStyle(coverStyle)) {
@@ -92,9 +93,8 @@ class AlbumCoverStylePreferenceDialog : PreferenceDialogFragmentCompat(),
                     Toast.makeText(context, result, Toast.LENGTH_SHORT).show()
                     NavigationUtil.goToProVersion(requireActivity())
                 } else {
-                    PreferenceUtil.getInstance(requireContext()).albumCoverStyle = coverStyle
+                    PreferenceUtilKT.albumCoverStyle = coverStyle
                 }
-
             }
             negativeButton(android.R.string.cancel)
             customView(view = view, scrollable = false, noVerticalPadding = false)

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

@@ -27,7 +27,7 @@ import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.dialogs.BlacklistFolderChooserDialog
 import code.name.monkey.retromusic.extensions.colorControlNormal
 import code.name.monkey.retromusic.providers.BlacklistStore
-import code.name.monkey.retromusic.util.PreferenceUtil
+
 import com.afollestad.materialdialogs.MaterialDialog
 import com.afollestad.materialdialogs.list.listItems
 import java.io.File
@@ -63,7 +63,7 @@ class BlacklistPreferenceDialog : DialogFragment(), BlacklistFolderChooserDialog
         refreshBlacklistData()
         return MaterialDialog(requireContext()).show {
             title(R.string.blacklist)
-            cornerRadius(PreferenceUtil.getInstance(requireContext()).dialogCorner)
+
             positiveButton(android.R.string.ok) {
                 dismiss()
             }
@@ -71,7 +71,7 @@ class BlacklistPreferenceDialog : DialogFragment(), BlacklistFolderChooserDialog
                 MaterialDialog(requireContext()).show {
                     title(code.name.monkey.retromusic.R.string.clear_blacklist)
                     message(code.name.monkey.retromusic.R.string.do_you_want_to_clear_the_blacklist)
-                    cornerRadius(PreferenceUtil.getInstance(requireContext()).dialogCorner)
+
                     positiveButton(code.name.monkey.retromusic.R.string.clear_action) {
                         BlacklistStore.getInstance(requireContext()).clear()
                         refreshBlacklistData()
@@ -86,7 +86,7 @@ class BlacklistPreferenceDialog : DialogFragment(), BlacklistFolderChooserDialog
             }
             listItems(items = paths, waitForPositiveButton = false) { _, _, text ->
                 MaterialDialog(requireContext()).show {
-                    cornerRadius(PreferenceUtil.getInstance(requireContext()).dialogCorner)
+
                     title(code.name.monkey.retromusic.R.string.remove_from_blacklist)
                     message(
                         text = HtmlCompat.fromHtml(

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

@@ -18,6 +18,7 @@ import android.app.Dialog
 import android.content.Context
 import android.os.Bundle
 import android.util.AttributeSet
+import android.view.LayoutInflater
 import android.widget.Toast
 import androidx.core.graphics.BlendModeColorFilterCompat
 import androidx.core.graphics.BlendModeCompat.SRC_IN
@@ -29,10 +30,10 @@ import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.adapter.CategoryInfoAdapter
 import code.name.monkey.retromusic.extensions.colorControlNormal
 import code.name.monkey.retromusic.model.CategoryInfo
-import code.name.monkey.retromusic.util.PreferenceUtil
+
+import code.name.monkey.retromusic.util.PreferenceUtilKT
 import com.afollestad.materialdialogs.MaterialDialog
 import com.afollestad.materialdialogs.customview.customView
-import java.util.*
 
 class LibraryPreference @JvmOverloads constructor(
     context: Context,
@@ -59,17 +60,9 @@ 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 categoryInfos: List<CategoryInfo> = if (savedInstanceState != null) {
-            savedInstanceState.getParcelableArrayList(PreferenceUtil.LIBRARY_CATEGORIES)!!
-        } else {
-            PreferenceUtil.getInstance(requireContext()).libraryCategoryInfos
-        }
-        adapter = CategoryInfoAdapter(categoryInfos)
+        val view = LayoutInflater.from(requireContext())
+            .inflate(R.layout.preference_dialog_library_categories, null)
+        adapter = CategoryInfoAdapter(PreferenceUtilKT.libraryCategory)
 
         val recyclerView = view.findViewById<RecyclerView>(R.id.recycler_view)
         recyclerView.layoutManager = LinearLayoutManager(activity)
@@ -79,7 +72,6 @@ class LibraryPreferenceDialog : PreferenceDialogFragmentCompat() {
 
         return MaterialDialog(requireContext())
             .title(R.string.library_categories)
-            .cornerRadius(PreferenceUtil.getInstance(requireContext()).dialogCorner)
             .customView(view = view)
             .positiveButton(android.R.string.ok) {
                 updateCategories(adapter.categoryInfos)
@@ -89,27 +81,18 @@ class LibraryPreferenceDialog : PreferenceDialogFragmentCompat() {
                 dismiss()
             }
             .neutralButton(R.string.reset_action) {
-                adapter.categoryInfos =
-                    PreferenceUtil.getInstance(requireContext()).defaultLibraryCategoryInfos
+                adapter.categoryInfos = PreferenceUtilKT.defaultCategories
             }
             .noAutoDismiss()
     }
 
-    override fun onSaveInstanceState(outState: Bundle) {
-        super.onSaveInstanceState(outState)
-        outState.putParcelableArrayList(
-            PreferenceUtil.LIBRARY_CATEGORIES,
-            ArrayList(adapter.categoryInfos)
-        )
-    }
-
     private fun updateCategories(categories: List<CategoryInfo>) {
         if (getSelected(categories) == 0) return
         if (getSelected(categories) > 5) {
             Toast.makeText(context, "Not more than 5 items", Toast.LENGTH_SHORT).show()
             return
         }
-        PreferenceUtil.getInstance(requireContext()).libraryCategoryInfos = categories
+        PreferenceUtilKT.libraryCategory = categories
     }
 
     private fun getSelected(categories: List<CategoryInfo>): Int {
@@ -122,13 +105,8 @@ class LibraryPreferenceDialog : PreferenceDialogFragmentCompat() {
     }
 
     companion object {
-
-        fun newInstance(key: String): LibraryPreferenceDialog {
-            val bundle = Bundle()
-            bundle.putString(ARG_KEY, key)
-            val fragment = LibraryPreferenceDialog()
-            fragment.arguments = bundle
-            return fragment
+        fun newInstance(): LibraryPreferenceDialog {
+            return LibraryPreferenceDialog()
         }
     }
 }

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

@@ -26,7 +26,6 @@ import androidx.preference.PreferenceDialogFragmentCompat
 import code.name.monkey.appthemehelper.ThemeStore
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.extensions.colorControlNormal
-import code.name.monkey.retromusic.util.PreferenceUtil
 import com.afollestad.materialdialogs.MaterialDialog
 import com.afollestad.materialdialogs.WhichButton
 import com.afollestad.materialdialogs.actions.getActionButton
@@ -76,7 +75,6 @@ class MaterialListPreferenceDialog : PreferenceDialogFragmentCompat() {
         materialDialog = MaterialDialog(requireContext())
             .title(text = materialListPreference.title.toString())
             .positiveButton(R.string.set)
-            .cornerRadius(PreferenceUtil.getInstance(requireContext()).dialogCorner)
             .listItemsSingleChoice(
                 items = entries,
                 initialSelection = position,

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

@@ -36,7 +36,7 @@ import code.name.monkey.retromusic.extensions.colorControlNormal
 import code.name.monkey.retromusic.fragments.NowPlayingScreen
 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.PreferenceUtilKT
 import code.name.monkey.retromusic.util.ViewUtil
 import com.afollestad.materialdialogs.MaterialDialog
 import com.afollestad.materialdialogs.customview.customView
@@ -89,9 +89,7 @@ class NowPlayingScreenPreferenceDialog : PreferenceDialogFragmentCompat(),
         viewPager.adapter = NowPlayingScreenAdapter(requireContext())
         viewPager.addOnPageChangeListener(this)
         viewPager.pageMargin = ViewUtil.convertDpToPixel(32f, resources).toInt()
-        viewPager.currentItem =
-            PreferenceUtil.getInstance(requireContext()).nowPlayingScreen.ordinal
-
+        viewPager.currentItem = PreferenceUtilKT.nowPlayingScreen.ordinal
 
         return MaterialDialog(requireContext()).show {
             title(R.string.pref_title_now_playing_screen_appearance)
@@ -103,10 +101,10 @@ class NowPlayingScreenPreferenceDialog : PreferenceDialogFragmentCompat(),
                     Toast.makeText(context, result, Toast.LENGTH_SHORT).show()
                     NavigationUtil.goToProVersion(requireContext())
                 } else {
-                    PreferenceUtil.getInstance(requireContext()).nowPlayingScreen = nowPlayingScreen
+                    PreferenceUtilKT.nowPlayingScreen = nowPlayingScreen
                 }
             }
-            cornerRadius(PreferenceUtil.getInstance(requireContext()).dialogCorner)
+
             negativeButton(android.R.string.cancel)
             customView(view = view, scrollable = false, noVerticalPadding = false)
         }