From 9953139619cdef30f4433374364d1cb349169caa Mon Sep 17 00:00:00 2001 From: MM20 <15646950+MM2-0@users.noreply.github.com> Date: Sun, 31 May 2026 13:32:46 +0200 Subject: [PATCH] invert hide app details preference --- .../java/de/mm20/launcher2/ui/base/ProvideSettings.kt | 8 ++++---- .../de/mm20/launcher2/ui/launcher/search/apps/AppItem.kt | 6 +++--- .../java/de/mm20/launcher2/ui/locals/CompositionLocals.kt | 2 +- .../launcher2/ui/settings/apps/AppSearchSettingsScreen.kt | 8 ++++---- .../ui/settings/apps/AppSearchSettingsScreenVM.kt | 4 ++-- core/i18n/src/main/res/values/strings.xml | 4 ++-- .../de/mm20/launcher2/preferences/LauncherSettingsData.kt | 2 +- .../de/mm20/launcher2/preferences/ui/SearchUiSettings.kt | 8 ++++---- 8 files changed, 21 insertions(+), 21 deletions(-) diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/base/ProvideSettings.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/base/ProvideSettings.kt index 70e5167e3..d52dc1ed5 100644 --- a/app/ui/src/main/java/de/mm20/launcher2/ui/base/ProvideSettings.kt +++ b/app/ui/src/main/java/de/mm20/launcher2/ui/base/ProvideSettings.kt @@ -23,7 +23,7 @@ import de.mm20.launcher2.ui.component.ProvideIconShape import de.mm20.launcher2.ui.locals.LocalCalendarSystemIds import de.mm20.launcher2.ui.locals.LocalCalendarSystems import de.mm20.launcher2.ui.locals.LocalFavoritesEnabled -import de.mm20.launcher2.ui.locals.LocalHideAppDetails +import de.mm20.launcher2.ui.locals.LocalShowAppDetails import de.mm20.launcher2.ui.locals.LocalGridSettings import de.mm20.launcher2.ui.locals.LocalMeasurementSystem import de.mm20.launcher2.ui.locals.LocalTimeFormat @@ -60,8 +60,8 @@ fun ProvideSettings( settings.gridSettings.distinctUntilChanged() }.collectAsState(GridSettings()) - val hideAppDetails by remember { - searchUiSettings.hideAppDetails.distinctUntilChanged() + val showAppDetails by remember { + searchUiSettings.showAppDetails.distinctUntilChanged() }.collectAsState(false) val timeFormat by remember(context) { @@ -123,7 +123,7 @@ fun ProvideSettings( CompositionLocalProvider( LocalFavoritesEnabled provides favoritesEnabled, - LocalHideAppDetails provides hideAppDetails, + LocalShowAppDetails provides showAppDetails, LocalGridSettings provides gridSettings, LocalTimeFormat provides timeFormat!!, LocalMeasurementSystem provides measurementSystem!!, diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/apps/AppItem.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/apps/AppItem.kt index c3af23dcd..03f0c9dcb 100644 --- a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/apps/AppItem.kt +++ b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/apps/AppItem.kt @@ -65,7 +65,7 @@ import de.mm20.launcher2.ui.launcher.search.common.SearchableItemVM import de.mm20.launcher2.ui.launcher.search.listItemViewModel import de.mm20.launcher2.ui.launcher.sheets.LocalBottomSheetManager import de.mm20.launcher2.ui.locals.LocalFavoritesEnabled -import de.mm20.launcher2.ui.locals.LocalHideAppDetails +import de.mm20.launcher2.ui.locals.LocalShowAppDetails import de.mm20.launcher2.ui.locals.LocalGridSettings import kotlinx.coroutines.launch @@ -81,7 +81,7 @@ fun AppItem( val badge by viewModel.badge.collectAsStateWithLifecycle(null) val icon by viewModel.icon.collectAsStateWithLifecycle() - val hideAppDetails = LocalHideAppDetails.current + val showAppDetails = LocalShowAppDetails.current LaunchedEffect(app) { viewModel.init(app, iconSize.toInt()) @@ -124,7 +124,7 @@ fun AppItem( ) } - if (!hideAppDetails) { + if (showAppDetails) { app.versionName?.let { Text( text = stringResource(R.string.app_info_version, it), diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/locals/CompositionLocals.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/locals/CompositionLocals.kt index f3809f48c..fbceba0b6 100644 --- a/app/ui/src/main/java/de/mm20/launcher2/ui/locals/CompositionLocals.kt +++ b/app/ui/src/main/java/de/mm20/launcher2/ui/locals/CompositionLocals.kt @@ -21,7 +21,7 @@ val LocalCardStyle = compositionLocalOf { CardStyle() } val LocalFavoritesEnabled = compositionLocalOf { true } -val LocalHideAppDetails = compositionLocalOf { false } +val LocalShowAppDetails = compositionLocalOf { false } val LocalGridSettings = compositionLocalOf { GridSettings() } diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/apps/AppSearchSettingsScreen.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/apps/AppSearchSettingsScreen.kt index 22cd53c34..8ef0884b0 100644 --- a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/apps/AppSearchSettingsScreen.kt +++ b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/apps/AppSearchSettingsScreen.kt @@ -22,7 +22,7 @@ fun AppSearchSettingsScreen() { val viewModel = viewModel() val allApps by viewModel.allApps.collectAsStateWithLifecycle() - val hideAppDetails by viewModel.hideAppDetails.collectAsStateWithLifecycle() + val showAppDetails by viewModel.showAppDetails.collectAsStateWithLifecycle() val showList by viewModel.showList.collectAsStateWithLifecycle() val showListIcons by viewModel.showListIcons.collectAsStateWithLifecycle() @@ -41,9 +41,9 @@ fun AppSearchSettingsScreen() { } ) SwitchPreference( - title = stringResource(R.string.preference_search_apps_hide_details), - summary = stringResource(R.string.preference_search_apps_hide_details_summary), - value = hideAppDetails == true, + title = stringResource(R.string.preference_search_apps_show_details), + summary = stringResource(R.string.preference_search_apps_show_details_summary), + value = showAppDetails == true, onValueChanged = { viewModel.setHideAppDetails(it) } diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/apps/AppSearchSettingsScreenVM.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/apps/AppSearchSettingsScreenVM.kt index bb6740042..c291f418e 100644 --- a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/apps/AppSearchSettingsScreenVM.kt +++ b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/apps/AppSearchSettingsScreenVM.kt @@ -17,7 +17,7 @@ class AppSearchSettingsScreenVM: ViewModel(), KoinComponent { val allApps = searchUiSettings.allApps .stateIn(viewModelScope, SharingStarted.WhileSubscribed(), null) - val hideAppDetails = searchUiSettings.hideAppDetails + val showAppDetails = searchUiSettings.showAppDetails .stateIn(viewModelScope, SharingStarted.WhileSubscribed(), null) fun setAllApps(allApps: Boolean) { @@ -25,7 +25,7 @@ class AppSearchSettingsScreenVM: ViewModel(), KoinComponent { } fun setHideAppDetails(hideAppDetails: Boolean) { - searchUiSettings.setHideAppDetails(hideAppDetails) + searchUiSettings.setShowAppDetails(hideAppDetails) } val showList = uiSettings.gridSettings.map { it.showList } diff --git a/core/i18n/src/main/res/values/strings.xml b/core/i18n/src/main/res/values/strings.xml index 9e14f242f..94385d22f 100644 --- a/core/i18n/src/main/res/values/strings.xml +++ b/core/i18n/src/main/res/values/strings.xml @@ -628,8 +628,8 @@ Show pinned and frequently used items above app grid Apps Show all apps when the search field is empty - Hide app details - When enabled, long-pressing an app item will not show its version and package name + Show app information + Display additional app information, including the version and package name Files Search local files and cloud files Contacts diff --git a/core/preferences/src/main/java/de/mm20/launcher2/preferences/LauncherSettingsData.kt b/core/preferences/src/main/java/de/mm20/launcher2/preferences/LauncherSettingsData.kt index 5096bda71..2e566b38e 100644 --- a/core/preferences/src/main/java/de/mm20/launcher2/preferences/LauncherSettingsData.kt +++ b/core/preferences/src/main/java/de/mm20/launcher2/preferences/LauncherSettingsData.kt @@ -72,7 +72,7 @@ data class LauncherSettingsData internal constructor( val favoritesCompactTags: Boolean = false, val searchAllApps: Boolean = true, - val hideAppDetails: Boolean = false, + val appsShowDetails: Boolean = true, val fileSearchProviders: Set = setOf("local"), diff --git a/core/preferences/src/main/java/de/mm20/launcher2/preferences/ui/SearchUiSettings.kt b/core/preferences/src/main/java/de/mm20/launcher2/preferences/ui/SearchUiSettings.kt index ba59ad8cb..3b3e4828a 100644 --- a/core/preferences/src/main/java/de/mm20/launcher2/preferences/ui/SearchUiSettings.kt +++ b/core/preferences/src/main/java/de/mm20/launcher2/preferences/ui/SearchUiSettings.kt @@ -70,12 +70,12 @@ class SearchUiSettings internal constructor( } } - val hideAppDetails - get() = launcherDataStore.data.map { it.hideAppDetails }.distinctUntilChanged() + val showAppDetails + get() = launcherDataStore.data.map { it.appsShowDetails }.distinctUntilChanged() - fun setHideAppDetails(hideAppDetails: Boolean) { + fun setShowAppDetails(showAppDetails: Boolean) { launcherDataStore.update { - it.copy(hideAppDetails = hideAppDetails) + it.copy(appsShowDetails = showAppDetails) } }