From b64ba7293ac558279ffc5d16761e2da77e946043 Mon Sep 17 00:00:00 2001 From: MM20 <15646950+MM2-0@users.noreply.github.com> Date: Fri, 19 Jul 2024 23:07:57 +0200 Subject: [PATCH] Remove obsolete preference --- .../launcher2/ui/launcher/search/SearchVM.kt | 2 -- .../settings/search/SearchSettingsScreen.kt | 20 ------------------- .../settings/search/SearchSettingsScreenVM.kt | 13 ------------ 3 files changed, 35 deletions(-) diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/SearchVM.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/SearchVM.kt index 1c3635c1..cde64c69 100644 --- a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/SearchVM.kt +++ b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/SearchVM.kt @@ -137,8 +137,6 @@ class SearchVM : ViewModel(), KoinComponent { val filterBar = searchFilterSettings.filterBar val filterBarItems = searchFilterSettings.filterBarItems - val separateWorkProfile = searchUiSettings.separateWorkProfile - val bestMatch = mutableStateOf(null) init { diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/search/SearchSettingsScreen.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/search/SearchSettingsScreen.kt index 919f315b..87114f1f 100644 --- a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/search/SearchSettingsScreen.kt +++ b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/search/SearchSettingsScreen.kt @@ -61,8 +61,6 @@ fun SearchSettingsScreen() { val navController = LocalNavController.current - val hasWorkProfile by viewModel.hasWorkProfile - LaunchedEffect(Unit) { lifecycleOwner.lifecycle.repeatOnLifecycle(Lifecycle.State.RESUMED) { viewModel.onResume(context) @@ -294,24 +292,6 @@ fun SearchSettingsScreen() { } } } - if (hasWorkProfile) { - item { - PreferenceCategory { - val separateWorkProfile by viewModel.separateWorkProfile.collectAsStateWithLifecycle( - null - ) - SwitchPreference( - title = stringResource(R.string.preference_search_bar_separate_work_profile), - summary = stringResource(R.string.preference_search_bar_separate_work_profile_summary), - icon = Icons.Rounded.Work, - value = separateWorkProfile == true, - onValueChanged = { - viewModel.setSeparateWorkProfile(it) - } - ) - } - } - } item { PreferenceCategory { val autoFocus by viewModel.autoFocus.collectAsStateWithLifecycle(null) diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/search/SearchSettingsScreenVM.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/search/SearchSettingsScreenVM.kt index c35e0907..e17d6db8 100644 --- a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/search/SearchSettingsScreenVM.kt +++ b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/search/SearchSettingsScreenVM.kt @@ -40,12 +40,6 @@ class SearchSettingsScreenVM : ViewModel(), KoinComponent { private val permissionsManager: PermissionsManager by inject() private val locationSearchSettings: LocationSearchSettings by inject() - val hasWorkProfile = mutableStateOf(false) - - fun onResume(context: Context) { - hasWorkProfile.value = context.getSystemService()!!.profiles.size > 1 - } - val favorites = searchUiSettings.favorites .stateIn(viewModelScope, SharingStarted.WhileSubscribed(), null) @@ -145,13 +139,6 @@ class SearchSettingsScreenVM : ViewModel(), KoinComponent { searchUiSettings.setReversedResults(reverseSearchResults) } - val separateWorkProfile = searchUiSettings.separateWorkProfile - .stateIn(viewModelScope, SharingStarted.WhileSubscribed(), null) - - fun setSeparateWorkProfile(separateWorkProfile: Boolean) { - searchUiSettings.setSeparateWorkProfile(separateWorkProfile) - } - fun requestAppShortcutsPermission(activity: AppCompatActivity) { permissionsManager.requestPermission(activity, PermissionGroup.AppShortcuts) }