Fix(AppDrawer): Resolve icon loading and sorting bugs

This commit addresses two key issues in the app drawer:

1.  **Fixes an icon loading race condition:**
    *   Previously, due to view recycling, fast scrolling could cause incorrect icons to be displayed for apps.
    *   This is resolved by tagging each app view with its package name. An icon is now only applied if the view's tag matches the package name for which the icon was loaded, preventing mismatched icons.

2.  **Corrects app list sorting with aliases:**
    *   The app drawer now correctly sorts applications based on their assigned alias, not just their original label.
    *   The scrollbar index has also been updated to use aliases, ensuring that tapping a letter in the scrollbar navigates to the correct position in the alphabetized list.

Additionally, a minor bug in the app renaming logic has been fixed.

Author: CreativeCodeCat

app/src/main/java/com/github/codeworkscreativehub/mlauncher/MainViewModel.kt

@@ -625,24 +625,30 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
                 category = raw.category
             )
         }
-            // 🔹 Sort pinned apps first, then regular/recent alphabetically
-            .sortedWith(
-                compareByDescending<AppListItem> { it.category == AppCategory.PINNED }
-                    .thenBy { normalizeForSort(it.activityLabel) }
-            )
-            .toMutableList()
+        // 1. Perform the sort using Alias priority
+        val sortedApps = allApps.sortedWith(
+            compareByDescending<AppListItem> { it.category == AppCategory.PINNED }
+                .thenBy { item ->
+                    val alias = prefs.getAppAlias(item.activityPackage)
+                    val displayName = alias.takeIf { it.isNotBlank() } ?: item.activityLabel
+                    normalizeForSort(displayName)
+                }
+        ).toMutableList()
 
-        // 🔹 Build scroll map and finalize
+        // 2. Build the scroll map using the same Alias priority
         buildList(
-            items = allApps,
+            items = sortedApps, // Use the sorted list here
             seenKey = mutableSetOf(),
             scrollMapLiveData = _appScrollMap,
             includeHidden = includeHiddenApps,
             getKey = { "${it.activityPackage}|${it.activityClass}|${it.user.hashCode()}" },
             isHidden = { it.activityPackage in hiddenAppsSet },
             isPinned = { it.activityPackage in pinnedPackages },
             buildItem = { it },
-            getLabel = { it.activityLabel },
+            // UPDATE: Use the alias here so the scroll index matches the sort
+            getLabel = { item ->
+                prefs.getAppAlias(item.activityPackage).takeIf { it.isNotBlank() } ?: item.activityLabel
+            },
             normalize = ::normalizeForSort
         )
     }

app/src/main/java/com/github/codeworkscreativehub/mlauncher/ui/adapter/AppDrawerAdapter.kt

@@ -169,7 +169,7 @@ class AppDrawerAdapter(
                     appRenameListener(appModel.activityPackage, emptyString()) // empty string = default
                 }
 
-                currentText == appModel.activityLabel -> { // Rename state
+                currentText != appModel.activityLabel -> { // Rename state
                     AppLogger.d("AppListDebug", "✏️ Renaming ${appModel.activityPackage} to $currentText")
                     appRenameListener(appModel.activityPackage, currentText)
                 }
@@ -474,6 +474,9 @@ class AppDrawerAdapter(
             setAppTitleIcon(appTitle, cachedIcon ?: placeholderIcon, prefs)
 
             if (cachedIcon == null && packageName.isNotBlank() && prefs.iconPackAppList != Constants.IconPacks.Disabled) {
+                // 1. Tag the view with the package name to prevent "wrong icon" bugs
+                appTitle.tag = packageName
+
                 iconLoadingScope.launch {
                     val icon = withContext(Dispatchers.IO) {
                         val nonNullDrawable: Drawable = getSafeAppIcon(
@@ -485,8 +488,15 @@ class AppDrawerAdapter(
                         )
                         getSystemIcons(context, prefs, IconCacheTarget.APP_LIST, nonNullDrawable) ?: nonNullDrawable
                     }
+
+                    // 2. Update cache (Ensure iconCache is thread-safe, e.g., ConcurrentHashMap)
                     iconCache[packageName] = icon
-                    if (appTitle.text == appListItem.activityLabel) setAppTitleIcon(appTitle, icon, prefs)
+
+                    // 3. ONLY update the UI if the view is still intended for THIS package
+                    // This prevents the wrong icon from appearing after scrolling
+                    if (appTitle.tag == packageName) {
+                        setAppTitleIcon(appTitle, icon, prefs)
+                    }
                 }
             }