diff --git a/app/src/main/java/io/timelimit/android/ui/manage/category/apps/add/AddCategoryAppsFragment.kt b/app/src/main/java/io/timelimit/android/ui/manage/category/apps/add/AddCategoryAppsFragment.kt index 02d9fa8..96772f7 100644 --- a/app/src/main/java/io/timelimit/android/ui/manage/category/apps/add/AddCategoryAppsFragment.kt +++ b/app/src/main/java/io/timelimit/android/ui/manage/category/apps/add/AddCategoryAppsFragment.kt @@ -97,7 +97,17 @@ class AddCategoryAppsFragment : DialogFragment() { apps -> apps?.sortedBy { app -> app.title.toLowerCase() } - }.observe(this, Observer { adapter.data = it }) + }.observe(this, Observer { + val selectedPackageNames = adapter.selectedApps + val visiblePackageNames = it?.map { it.packageName }?.toSet() ?: emptySet() + val hiddenSelectedPackageNames = selectedPackageNames.toMutableSet().apply { removeAll(visiblePackageNames) }.size + + adapter.data = it + binding.hiddenEntries = if (hiddenSelectedPackageNames == 0) + null + else + resources.getQuantityString(R.plurals.category_apps_add_dialog_hidden_entries, hiddenSelectedPackageNames, hiddenSelectedPackageNames) + }) database.category().getCategoriesByChildId(params.childId) .switchMap { categories -> diff --git a/app/src/main/res/layout/fragment_add_category_apps.xml b/app/src/main/res/layout/fragment_add_category_apps.xml index 34ad90c..c5e961b 100644 --- a/app/src/main/res/layout/fragment_add_category_apps.xml +++ b/app/src/main/res/layout/fragment_add_category_apps.xml @@ -18,32 +18,57 @@ xmlns:app="http://schemas.android.com/apk/res-auto" tools:context="io.timelimit.android.ui.manage.category.apps.add.AddCategoryAppsFragment"> - + + - + + + + + + - + + + - + - - + + - + + + + - - + android:layout_height="wrap_content" /> + diff --git a/app/src/main/res/values-de/strings-category-apps.xml b/app/src/main/res/values-de/strings-category-apps.xml index e5e262b..8937cfd 100644 --- a/app/src/main/res/values-de/strings-category-apps.xml +++ b/app/src/main/res/values-de/strings-category-apps.xml @@ -21,6 +21,10 @@ Nach Apps suchen Systemapps anzeigen Alle auswählen + + %d ausgeblendeten Eintrag ausgewählt + %s ausgeblendete Einträge ausgewählt + %s wurde entfernt diff --git a/app/src/main/res/values/strings-category-apps.xml b/app/src/main/res/values/strings-category-apps.xml index 5e83828..6990d12 100644 --- a/app/src/main/res/values/strings-category-apps.xml +++ b/app/src/main/res/values/strings-category-apps.xml @@ -21,6 +21,10 @@ Search Apps Show system Apps Select all + + %d hidden entry selected + %s hidden entries selected + %s was removed