diff --git a/app/src/main/kotlin/io/github/asutorufa/yuhaiin/compose/AppList.kt b/app/src/main/kotlin/io/github/asutorufa/yuhaiin/compose/AppList.kt index 81f5bf3..3c0a118 100644 --- a/app/src/main/kotlin/io/github/asutorufa/yuhaiin/compose/AppList.kt +++ b/app/src/main/kotlin/io/github/asutorufa/yuhaiin/compose/AppList.kt @@ -110,15 +110,16 @@ fun SharedTransitionScope.AppListComponent( val checkedApps = MainApplication.Companion.store.getStringSet("app_list") val apps = mutableListOf() - packages?.sortBy { it.loadLabel(packageManager).toString() } - - var index = 0 - packages?.forEach { - val app = AppListData( + val appList = packages?.map { + AppListData( it.loadLabel(packageManager).toString(), // app name it.packageName, it.loadIcon(packageManager), // icon (it.flags and ApplicationInfo.FLAG_SYSTEM) > 0, // is system ) + }?.sortedBy { it.appName } + + var index = 0 + appList?.forEach { app -> if (checkedApps.contains(app.packageName)) apps.add(index++, app) else apps.add(app) }