Refactor: Cleaned up code and replaced deprecated code.

DroidWorksStudio · Feb 8, 2025 · 5b13384 · 5b13384
1 parent 7857729
commit 5b13384
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 21 deletions.
diff --git a/app/src/main/java/com/github/droidworksstudio/mlauncher/ui/FavoriteFragment.kt b/app/src/main/java/com/github/droidworksstudio/mlauncher/ui/FavoriteFragment.kt
@@ -169,7 +169,7 @@ class FavoriteFragment : Fragment() {
     }
 
     /**
-     * TODO it looks very complicated. Shouldn't we just rerender the whole list?
+     * TODO it looks very complicated. Shouldn't we just re-render the whole list?
      *      When does it happen?
      *        - Only when the config option changes,
      *        - or also when we switch pages of the home screen?
@@ -220,12 +220,7 @@ class FavoriteFragment : Fragment() {
             view.setOnLongClickListener { v ->
                 val dragData = ClipData.newPlainText("", "")
                 val shadowBuilder = View.DragShadowBuilder(v)
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-                    v.startDragAndDrop(dragData, shadowBuilder, v, 0)
-                } else {
-                    @Suppress("DEPRECATION")
-                    v.startDrag(dragData, shadowBuilder, v, 0)
-                }
+                v.startDragAndDrop(dragData, shadowBuilder, v, 0)
                 true
             }
         }

diff --git a/app/src/main/java/com/github/droidworksstudio/mlauncher/ui/SettingsFragment.kt b/app/src/main/java/com/github/droidworksstudio/mlauncher/ui/SettingsFragment.kt
@@ -225,7 +225,7 @@ class SettingsFragment : Fragment() {
                             open = open,
                             onChange = onChange,
                             currentSelection = remember { mutableStateOf(prefs.appTheme) },
-                            values = Constants.Theme.values(),
+                            values = Constants.Theme.entries.toTypedArray(),
                             onSelect = { j -> setTheme(j) }
                         )
                     },
@@ -237,7 +237,7 @@ class SettingsFragment : Fragment() {
                                 open = open,
                                 onChange = onChange,
                                 currentSelection = remember { mutableStateOf(prefs.appDarkColors) },
-                                values = Constants.DarkColors.values(),
+                                values = Constants.DarkColors.entries.toTypedArray(),
                                 onSelect = { j -> setDarkColors(j) }
                             )
                         }
@@ -248,7 +248,7 @@ class SettingsFragment : Fragment() {
                                 open = open,
                                 onChange = onChange,
                                 currentSelection = remember { mutableStateOf(prefs.appLightColors) },
-                                values = Constants.LightColors.values(),
+                                values = Constants.LightColors.entries.toTypedArray(),
                                 onSelect = { j -> setLightColors(j) }
                             )
                         }
@@ -260,7 +260,7 @@ class SettingsFragment : Fragment() {
                             open = open,
                             onChange = onChange,
                             currentSelection = remember { mutableStateOf(prefs.language) },
-                            values = Constants.Language.values(),
+                            values = Constants.Language.entries.toTypedArray(),
                             onSelect = { j -> setLang(j) }
                         )
                     },
@@ -360,7 +360,7 @@ class SettingsFragment : Fragment() {
                             open = open,
                             onChange = onChange,
                             currentSelection = remember { mutableStateOf(prefs.launcherFont) },
-                            values = Constants.Fonts.values(),
+                            values = Constants.Fonts.entries.toTypedArray(),
                             onSelect = { j -> setLauncherFont(j) }
                         )
                     },
@@ -563,7 +563,7 @@ class SettingsFragment : Fragment() {
                                 open = open,
                                 onChange = onChange,
                                 currentSelection = remember { mutableStateOf(prefs.homeAlignment) },
-                                values = Constants.Gravity.values(),
+                                values = Constants.Gravity.entries.toTypedArray(),
                                 onSelect = { gravity -> setHomeAlignment(gravity) }
                             )
                         }
@@ -575,7 +575,7 @@ class SettingsFragment : Fragment() {
                             open = open,
                             onChange = onChange,
                             currentSelection = remember { mutableStateOf(prefs.clockAlignment) },
-                            values = Constants.Gravity.values(),
+                            values = Constants.Gravity.entries.toTypedArray(),
                             onSelect = { gravity -> setClockAlignment(gravity) }
                         )
                     },
@@ -586,7 +586,7 @@ class SettingsFragment : Fragment() {
                             open = open,
                             onChange = onChange,
                             currentSelection = remember { mutableStateOf(prefs.drawerAlignment) },
-                            values = Constants.Gravity.values(),
+                            values = Constants.Gravity.entries.toTypedArray(),
                             onSelect = { j -> viewModel.updateDrawerAlignment(j) }
                         )
                     },
@@ -743,7 +743,7 @@ class SettingsFragment : Fragment() {
                             open = open,
                             onChange = onChange,
                             currentSelection = remember { mutableStateOf(prefs.searchEngines) },
-                            values = Constants.SearchEngines.values(),
+                            values = Constants.SearchEngines.entries.toTypedArray(),
                             onSelect = { j -> setEngine(j) }
                         )
                     },

diff --git a/app/src/main/java/com/github/droidworksstudio/mlauncher/ui/compose/SettingsComposable.kt b/app/src/main/java/com/github/droidworksstudio/mlauncher/ui/compose/SettingsComposable.kt
@@ -1,14 +1,33 @@
 package com.github.droidworksstudio.mlauncher.ui.compose
 
 import android.graphics.Typeface
-import androidx.compose.foundation.*
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.background
+import androidx.compose.foundation.border
+import androidx.compose.foundation.clickable
 import androidx.compose.foundation.gestures.detectTapGestures
-import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.lazy.LazyRow
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.Text
 import androidx.compose.material.TextButton
-import androidx.compose.runtime.*
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.MutableState
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableFloatStateOf
+import androidx.compose.runtime.mutableIntStateOf
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment.Companion.CenterEnd
 import androidx.compose.ui.Alignment.Companion.CenterStart
 import androidx.compose.ui.Alignment.Companion.End
@@ -33,7 +52,9 @@ import com.github.droidworksstudio.mlauncher.style.BORDER_SIZE
 import com.github.droidworksstudio.mlauncher.style.CORNER_RADIUS
 import com.github.droidworksstudio.mlauncher.style.SETTINGS_PADDING
 import com.github.droidworksstudio.mlauncher.style.SettingsTheme
-import com.smarttoolfactory.slider.*
+import com.smarttoolfactory.slider.ColorfulSlider
+import com.smarttoolfactory.slider.MaterialSliderDefaults
+import com.smarttoolfactory.slider.SliderBrushColor
 
 object SettingsComposable {
 
@@ -296,7 +317,7 @@ object SettingsComposable {
             title = title,
             currentSelection = remember { mutableStateOf(currentAction) },
             currentSelectionName = if (currentAction == Constants.Action.OpenApp) "Open $appLabel" else currentAction.string(),
-            values = Constants.Action.values(),
+            values = Constants.Action.entries.toTypedArray(),
             fontSize = fontSize,
             active = currentAction != Constants.Action.Disabled,
             onSelect = onSelect,