lun_admin/NeoLaunch_From_Kvaesitso
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Gesture settings: don't show permission banners for actions that are shadowed by "open search"

Browse Source
This commit is contained in:
MM20 2023-01-20 11:45:08 +01:00
parent 9e7286b3bb
commit 93985b2a6c
No known key found for this signature in database
GPG Key ID: 0B61A8F2DEAFA389
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
app/ui/src/main/java/de/mm20/launcher2/ui/settings/gestures/GestureSettingsScreen.kt
View File

@ -70,7 +70,8 @@ fun GestureSettingsScreen() {
onValueChanged = { if (it != null) viewModel.setLongPress(it) } onValueChanged = { if (it != null) viewModel.setLongPress(it) }
) )
val swipeDown by viewModel.swipeDown.observeAsState() val swipeDown by viewModel.swipeDown.observeAsState()
AnimatedVisibility(hasPermission == false && requiresAccessibilityService(swipeDown)) { val swipeDownIsSearch = layout == Layout.PullDown
AnimatedVisibility(hasPermission == false && requiresAccessibilityService(swipeDown) && !swipeDownIsSearch) {
MissingPermissionBanner( MissingPermissionBanner(
modifier = Modifier.padding(16.dp), modifier = Modifier.padding(16.dp),
text = stringResource(R.string.missing_permission_accessibility_gesture_settings), text = stringResource(R.string.missing_permission_accessibility_gesture_settings),
@ -79,13 +80,14 @@ fun GestureSettingsScreen() {
} }
ListPreference( ListPreference(
title = stringResource(R.string.preference_gesture_swipe_down), title = stringResource(R.string.preference_gesture_swipe_down),
enabled = layout != Layout.PullDown, enabled = !swipeDownIsSearch,
items = options, items = options,
value = if (layout == Layout.PullDown) GestureAction.OpenSearch else swipeDown, value = if (swipeDownIsSearch) GestureAction.OpenSearch else swipeDown,
onValueChanged = { if (it != null) viewModel.setSwipeDown(it) } onValueChanged = { if (it != null) viewModel.setSwipeDown(it) }
) )
val swipeLeft by viewModel.swipeLeft.observeAsState() val swipeLeft by viewModel.swipeLeft.observeAsState()
AnimatedVisibility(hasPermission == false && requiresAccessibilityService(swipeLeft)) { val swipeLeftIsSearch = layout == Layout.Pager
AnimatedVisibility(hasPermission == false && requiresAccessibilityService(swipeLeft) && !swipeLeftIsSearch) {
MissingPermissionBanner( MissingPermissionBanner(
modifier = Modifier.padding(16.dp), modifier = Modifier.padding(16.dp),
text = stringResource(R.string.missing_permission_accessibility_gesture_settings), text = stringResource(R.string.missing_permission_accessibility_gesture_settings),
@ -94,13 +96,14 @@ fun GestureSettingsScreen() {
} }
ListPreference( ListPreference(
title = stringResource(R.string.preference_gesture_swipe_left), title = stringResource(R.string.preference_gesture_swipe_left),
enabled = layout != Layout.Pager, enabled = !swipeLeftIsSearch,
items = options, items = options,
value = if (layout == Layout.Pager) GestureAction.OpenSearch else swipeLeft, value = if (swipeLeftIsSearch) GestureAction.OpenSearch else swipeLeft,
onValueChanged = { if (it != null) viewModel.setSwipeLeft(it) } onValueChanged = { if (it != null) viewModel.setSwipeLeft(it) }
) )
val swipeRight by viewModel.swipeRight.observeAsState() val swipeRight by viewModel.swipeRight.observeAsState()
AnimatedVisibility(hasPermission == false && requiresAccessibilityService(swipeRight)) { val swipeRightIsSearch = layout == Layout.PagerReversed
AnimatedVisibility(hasPermission == false && requiresAccessibilityService(swipeRight) && !swipeRightIsSearch) {
MissingPermissionBanner( MissingPermissionBanner(
modifier = Modifier.padding(16.dp), modifier = Modifier.padding(16.dp),
text = stringResource(R.string.missing_permission_accessibility_gesture_settings), text = stringResource(R.string.missing_permission_accessibility_gesture_settings),
@ -109,9 +112,9 @@ fun GestureSettingsScreen() {
} }
ListPreference( ListPreference(
title = stringResource(R.string.preference_gesture_swipe_right), title = stringResource(R.string.preference_gesture_swipe_right),
enabled = layout != Layout.PagerReversed, enabled = !swipeRightIsSearch,
items = options, items = options,
value = if (layout == Layout.PagerReversed) GestureAction.OpenSearch else swipeRight, value = if (swipeRightIsSearch) GestureAction.OpenSearch else swipeRight,
onValueChanged = { if (it != null) viewModel.setSwipeRight(it) } onValueChanged = { if (it != null) viewModel.setSwipeRight(it) }
) )
} }