Refactor: Rename Favorite Apps

Author: CreativeCodeCat

app/src/main/java/com/github/droidworksstudio/mlauncher/ui/ReorderHomeAppsFragment.kt renamed to app/src/main/java/com/github/droidworksstudio/mlauncher/ui/FavoriteFragment.kt

@@ -30,28 +30,28 @@ import androidx.lifecycle.ViewModelProvider
 import com.github.droidworksstudio.mlauncher.MainViewModel
 import com.github.droidworksstudio.mlauncher.R
 import com.github.droidworksstudio.mlauncher.data.Prefs
-import com.github.droidworksstudio.mlauncher.databinding.FragmentReorderHomeAppsBinding
+import com.github.droidworksstudio.mlauncher.databinding.FragmentFavoriteBinding
 import com.github.droidworksstudio.mlauncher.helper.getHexFontColor
 import com.github.droidworksstudio.mlauncher.helper.getHexForOpacity
 import com.github.droidworksstudio.mlauncher.helper.hideStatusBar
 import com.github.droidworksstudio.mlauncher.helper.showStatusBar
 
-class ReorderHomeAppsFragment : Fragment() {
+class FavoriteFragment : Fragment() {
 
     private lateinit var prefs: Prefs
     private lateinit var viewModel: MainViewModel
     private lateinit var deviceManager: DevicePolicyManager
     private lateinit var vibrator: Vibrator
 
-    private var _binding: FragmentReorderHomeAppsBinding? = null
+    private var _binding: FragmentFavoriteBinding? = null
     private val binding get() = _binding!!
 
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View {
-        _binding = FragmentReorderHomeAppsBinding.inflate(inflater, container, false)
+        _binding = FragmentFavoriteBinding.inflate(inflater, container, false)
 
         val view = binding.root
         prefs = Prefs(requireContext())
@@ -110,35 +110,41 @@ class ReorderHomeAppsFragment : Fragment() {
                 // Indicate that we accept drag events
                 return true
             }
+
             DragEvent.ACTION_DRAG_ENTERED -> {
                 // Highlight the target view as the drag enters
                 targetView.setBackgroundResource(R.drawable.reorder_apps_background)
                 return true
             }
+
             DragEvent.ACTION_DRAG_EXITED -> {
                 // Remove highlighting when the drag exits
                 targetView.background = null
                 return true
             }
+
             DragEvent.ACTION_DROP -> {
                 // Remove highlighting
                 targetView.background = null
-                
+
                 // Extract the dragged TextView
                 val draggedTextView = event.localState as TextView
 
                 // Reorder apps based on the drop position
-                val draggedIndex = (draggedTextView.parent as ViewGroup).indexOfChild(draggedTextView)
+                val draggedIndex =
+                    (draggedTextView.parent as ViewGroup).indexOfChild(draggedTextView)
                 val targetIndex = (targetView.parent as ViewGroup).indexOfChild(targetView)
                 reorderApps(draggedIndex, targetIndex)
 
                 return true
             }
+
             DragEvent.ACTION_DRAG_ENDED -> {
                 // Remove highlighting when the drag ends
                 targetView.background = null
                 return true
             }
+
             else -> return false
         }
     }
@@ -149,7 +155,10 @@ class ReorderHomeAppsFragment : Fragment() {
             targetIndex < 0 || targetIndex >= binding.homeAppsLayout.childCount
         ) {
             // Handle out of bounds indices gracefully, or log an error
-            Log.e("ReorderApps", "Invalid indices: draggedIndex=$draggedIndex, targetIndex=$targetIndex")
+            Log.e(
+                "ReorderApps",
+                "Invalid indices: draggedIndex=$draggedIndex, targetIndex=$targetIndex"
+            )
             return
         }
 
@@ -182,12 +191,14 @@ class ReorderHomeAppsFragment : Fragment() {
         if (diff in 1 until oldAppsNum) { // 1 <= diff <= oldNumApps
             binding.homeAppsLayout.children.drop(diff)
         } else if (diff < 0) {
-            val prefixDrawable: Drawable? = context?.let { ContextCompat.getDrawable(it, R.drawable.ic_prefix_drawable) }
+            val prefixDrawable: Drawable? =
+                context?.let { ContextCompat.getDrawable(it, R.drawable.ic_prefix_drawable) }
             // add all missing apps to list
             for (i in oldAppsNum until newAppsNum) {
                 val view = layoutInflater.inflate(R.layout.home_app_button, null) as TextView
                 view.apply {
-                    val appLabel = prefs.getHomeAppModel(i).activityLabel.ifEmpty { getString(R.string.app) }
+                    val appLabel =
+                        prefs.getHomeAppModel(i).activityLabel.ifEmpty { getString(R.string.app) }
                     textSize = prefs.appSize.toFloat()
                     id = i
                     text = "   $appLabel"
@@ -201,7 +212,7 @@ class ReorderHomeAppsFragment : Fragment() {
                 }
                 val padding: Int = prefs.textPaddingSize
                 view.setPadding(0, padding, 0, padding)
-                binding.pageName.text = getString(R.string.reorder_apps)
+                binding.pageName.text = getString(R.string.favorite_apps)
                 binding.pageName.textSize = prefs.appSize * 1.5f
 
                 if (prefs.followAccentColors) {

app/src/main/res/layout/fragment_reorder_home_apps.xml renamed to app/src/main/res/layout/fragment_favorite.xml

@@ -6,14 +6,14 @@
     android:layout_height="match_parent"
     android:animateLayoutChanges="true"
     android:orientation="vertical"
-    tools:context=".ui.ReorderHomeAppsFragment">
+    tools:context=".ui.FavoriteFragment">
 
     <FrameLayout
         android:id="@+id/touchArea"
-        android:layout_marginTop="50dp"
-        android:layout_marginBottom="50dp"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"/>
+        android:layout_height="match_parent"
+        android:layout_marginTop="50dp"
+        android:layout_marginBottom="50dp" />
 
     <LinearLayout
         android:id="@+id/pageLayout"
@@ -46,8 +46,8 @@
                 android:gravity="center_vertical"
                 android:orientation="vertical"
                 android:paddingHorizontal="20dp"
-                android:paddingBottom="80dp"
-                android:paddingTop="112dp" />
+                android:paddingTop="112dp"
+                android:paddingBottom="80dp" />
 
         </ScrollView>
     </LinearLayout>

app/src/main/res/navigation/nav_graph.xml

@@ -44,10 +44,9 @@
 
     <fragment
         android:id="@+id/appListReorderFragment"
-        android:name="com.github.droidworksstudio.mlauncher.ui.ReorderHomeAppsFragment"
+        android:name="com.github.droidworksstudio.mlauncher.ui.FavoriteFragment"
         android:label="app_list_fragment"
-        tools:layout="@layout/fragment_reorder_home_apps">
-    </fragment>
+        tools:layout="@layout/fragment_favorite"></fragment>
 
     <fragment
         android:id="@+id/settingsFragment"

app/src/main/res/values/strings.xml

@@ -16,7 +16,7 @@
 
     <!-- Home Strings -->
     <string name="hidden_apps">Hidden Apps</string>
-    <string name="reorder_apps">Re-Order Apps</string>
+    <string name="favorite_apps">Re-Order Apps</string>
     <string name="set_as_default_launcher">Set as Default Launcher</string>
     <string name="change_default_launcher">Change Default Launcher</string>