From fb33959863065cc7b46b5e714a40e47cfc5a75b0 Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Mon, 26 Jan 2026 15:39:07 -0300 Subject: [PATCH] Don't show category chip for the category of current list all apps will be in that category so it doesn't make sense to filter for that --- .../main/kotlin/org/fdroid/ui/lists/AppListPresenter.kt | 8 +++++++- .../main/kotlin/org/fdroid/ui/lists/AppListViewModel.kt | 1 + 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/app/src/main/kotlin/org/fdroid/ui/lists/AppListPresenter.kt b/app/src/main/kotlin/org/fdroid/ui/lists/AppListPresenter.kt index 20eafc36b..6fbbe2b21 100644 --- a/app/src/main/kotlin/org/fdroid/ui/lists/AppListPresenter.kt +++ b/app/src/main/kotlin/org/fdroid/ui/lists/AppListPresenter.kt @@ -15,6 +15,7 @@ import java.util.Locale @Composable fun AppListPresenter( + type: AppListType, appsFlow: StateFlow?>, sortByFlow: StateFlow, filterIncompatibleFlow: StateFlow, @@ -40,7 +41,12 @@ fun AppListPresenter( } val filteredCategories = remember(categories, apps) { categories?.filter { - it.id in availableCategoryIds + if (type is AppListType.Category) { + // don't show category for list we are currently seeing, because all apps are in it + it.id in availableCategoryIds && it.id != type.categoryId + } else { + it.id in availableCategoryIds + } } } val availableRepositories = remember(apps) { diff --git a/app/src/main/kotlin/org/fdroid/ui/lists/AppListViewModel.kt b/app/src/main/kotlin/org/fdroid/ui/lists/AppListViewModel.kt index 05d2e6e30..fb87b641c 100644 --- a/app/src/main/kotlin/org/fdroid/ui/lists/AppListViewModel.kt +++ b/app/src/main/kotlin/org/fdroid/ui/lists/AppListViewModel.kt @@ -86,6 +86,7 @@ class AppListViewModel @AssistedInject constructor( val appListModel: StateFlow by lazy(LazyThreadSafetyMode.NONE) { moleculeScope.launchMolecule(mode = ContextClock) { AppListPresenter( + type = type, appsFlow = apps, sortByFlow = sortBy, filterIncompatibleFlow = filterIncompatible,