diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index aeae49b..e62f585 100644 Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ diff --git a/app/build.gradle b/app/build.gradle index eada9a2..ad1ed4b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -22,7 +22,7 @@ android { applicationId "com.tommasoberlose.anotherwidget" minSdkVersion 23 targetSdkVersion 30 - versionCode 127 + versionCode 128 versionName "2.2.2" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/activities/tabs/ChooseApplicationActivity.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/activities/tabs/ChooseApplicationActivity.kt index 6652a33..db82d49 100644 --- a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/activities/tabs/ChooseApplicationActivity.kt +++ b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/activities/tabs/ChooseApplicationActivity.kt @@ -19,6 +19,7 @@ import com.google.android.material.card.MaterialCardView import com.tommasoberlose.anotherwidget.databinding.ActivityChooseApplicationBinding import com.tommasoberlose.anotherwidget.global.Constants import com.tommasoberlose.anotherwidget.helpers.IntentHelper +import com.tommasoberlose.anotherwidget.helpers.MediaPlayerHelper import com.tommasoberlose.anotherwidget.ui.viewmodels.tabs.ChooseApplicationViewModel import kotlinx.coroutines.* import net.idik.lib.slimadapter.SlimAdapter @@ -171,6 +172,18 @@ class ChooseApplicationActivity : AppCompatActivity() { list.filter { it.loadLabel(viewModel.pm).contains(search, true) } + }.sortedWith { app1, app2 -> + when (selectedPackage) { + app1.activityInfo.packageName -> { + -1 + } + app2.activityInfo.packageName -> { + 1 + } + else -> { + app1.loadLabel(viewModel.pm).toString().compareTo(app2.loadLabel(viewModel.pm).toString(), ignoreCase = true) + } + } } withContext(Dispatchers.Main) { adapter.updateData(listOf(IntentHelper.DO_NOTHING_OPTION, IntentHelper.DEFAULT_OPTION, IntentHelper.REFRESH_WIDGET_OPTION) + filteredList)