fenix/Simple-App-Launcher
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-App-Launcher.git synced 2025-04-30 09:38:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

apply the selected column count at the app picker too

Browse Source
This commit is contained in:
tibbi 2020-11-07 22:03:30 +01:00
parent 4765b23831
commit 5c609d6acb
4 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/kotlin/com/simplemobiletools/applauncher/dialogs/AddAppLauncherDialog.kt
View File

@ -5,9 +5,11 @@ import android.view.ViewGroup
import androidx.appcompat.app.AlertDialog import androidx.appcompat.app.AlertDialog
import com.simplemobiletools.applauncher.R import com.simplemobiletools.applauncher.R
import com.simplemobiletools.applauncher.adapters.LaunchersDialogAdapter import com.simplemobiletools.applauncher.adapters.LaunchersDialogAdapter
import com.simplemobiletools.applauncher.extensions.config
import com.simplemobiletools.applauncher.extensions.dbHelper import com.simplemobiletools.applauncher.extensions.dbHelper
import com.simplemobiletools.applauncher.models.AppLauncher import com.simplemobiletools.applauncher.models.AppLauncher
import com.simplemobiletools.commons.extensions.setupDialogStuff import com.simplemobiletools.commons.extensions.setupDialogStuff
import com.simplemobiletools.commons.views.MyGridLayoutManager
import kotlinx.android.synthetic.main.dialog_pick_launchers.view.* import kotlinx.android.synthetic.main.dialog_pick_launchers.view.*
class AddAppLauncherDialog(val activity: Activity, val notDisplayedLaunchers: ArrayList<AppLauncher>, val callback: () -> Unit) { class AddAppLauncherDialog(val activity: Activity, val notDisplayedLaunchers: ArrayList<AppLauncher>, val callback: () -> Unit) {
@ -15,6 +17,8 @@ class AddAppLauncherDialog(val activity: Activity, val notDisplayedLaunchers: Ar
private var adapter: LaunchersDialogAdapter? = null private var adapter: LaunchersDialogAdapter? = null
init { init {
(view.pick_launchers_holder.layoutManager as MyGridLayoutManager).spanCount = activity.config.columnCnt
AlertDialog.Builder(activity) AlertDialog.Builder(activity)
.setPositiveButton(R.string.ok) { dialogInterface, i -> confirmSelection() } .setPositiveButton(R.string.ok) { dialogInterface, i -> confirmSelection() }
.setNegativeButton(R.string.cancel, null) .setNegativeButton(R.string.cancel, null)

6
app/src/main/kotlin/com/simplemobiletools/applauncher/extensions/Context.kt
View File

@ -47,7 +47,9 @@ fun Context.getNotDisplayedLaunchers(displayedLaunchers: ArrayList<AppLauncher>)
allApps.add(AppLauncher(0, label, packageName, drawable)) allApps.add(AppLauncher(0, label, packageName, drawable))
} }
val sorted = allApps.sortedWith(compareBy { it.title.toLowerCase() }) AppLauncher.sorting = config.sorting
val unique = sorted.distinctBy { it.packageName } allApps.sort()
val unique = allApps.distinctBy { it.packageName }
return unique.filter { !displayedLaunchers.contains(it) && it.packageName != "com.simplemobiletools.applauncher" } as ArrayList<AppLauncher> return unique.filter { !displayedLaunchers.contains(it) && it.packageName != "com.simplemobiletools.applauncher" } as ArrayList<AppLauncher>
} }

2
app/src/main/kotlin/com/simplemobiletools/applauncher/models/AppLauncher.kt
View File

@ -15,7 +15,7 @@ data class AppLauncher(val id: Int, var title: String, val packageName: String,
override fun compareTo(other: AppLauncher): Int { override fun compareTo(other: AppLauncher): Int {
var result = when { var result = when {
sorting and SORT_BY_TITLE != 0 -> title.compareTo(other.title) sorting and SORT_BY_TITLE != 0 -> title.toLowerCase().compareTo(other.title.toLowerCase())
else -> 1 else -> 1
} }

3
app/src/main/res/layout/dialog_pick_launchers.xml
View File

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<com.simplemobiletools.commons.views.MyRecyclerView <com.simplemobiletools.commons.views.MyRecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/pick_launchers_holder" android:id="@+id/pick_launchers_holder"
android:layout_width="match_parent" android:layout_width="match_parent"