aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-27 23:36:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename gesture handler pref keys

Browse Source
This commit is contained in:
Suphon Thanakornpakapong
2022-05-26 20:31:10 +07:00
parent a5e4112dfb
commit 2a78a2d9d0
6 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lawnchair/src/app/lawnchair/LawnchairLauncher.kt
View File

@@ -220,7 +220,7 @@ class LawnchairLauncher : QuickstepLauncher(), LifecycleOwner,
preferenceManager2.darkStatusBar.onEach(launchIn = lifecycleScope) { darkStatusBar ->
systemUiController.updateUiState(UI_STATE_BASE_WINDOW, isWorkspaceDarkText || darkStatusBar)
}
preferenceManager2.backTapGestureHandler.onEach(launchIn = lifecycleScope) { handler ->
preferenceManager2.backPressGestureHandler.onEach(launchIn = lifecycleScope) { handler ->
hasBackGesture = handler !is GestureHandlerConfig.NoOp
}
@@ -274,7 +274,7 @@ class LawnchairLauncher : QuickstepLauncher(), LifecycleOwner,
}
override fun handleHomeTap() {
gestureController.onHomeTap()
gestureController.onHomePressed()
}
override fun shouldBackButtonBeHidden(toState: LauncherState): Boolean {

14
lawnchair/src/app/lawnchair/gestures/GestureController.kt
View File

@@ -30,11 +30,11 @@ class GestureController(private val launcher: LawnchairLauncher) {
private val prefs = PreferenceManager2.getInstance(launcher)
private val scope = MainScope()
private val doubleTapHandler = handler(prefs.doubleTapHandler)
private val doubleTapHandler = handler(prefs.doubleTapGestureHandler)
private val swipeUpHandler = handler(prefs.swipeUpGestureHandler)
private val swipeDownHandler = handler(prefs.swipeDownGestureHandler)
private val homeTapHandler = handler(prefs.homeTapGestureHandler)
private val backTapHandler = handler(prefs.backTapGestureHandler)
private val homePressHandler = handler(prefs.homePressGestureHandler)
private val backPressHandler = handler(prefs.backPressGestureHandler)
fun onDoubleTap() {
triggerHandler(doubleTapHandler)
@@ -48,12 +48,12 @@ class GestureController(private val launcher: LawnchairLauncher) {
triggerHandler(swipeDownHandler)
}
fun onHomeTap() {
triggerHandler(homeTapHandler)
fun onHomePressed() {
triggerHandler(homePressHandler)
}
fun onBackTap() {
triggerHandler(backTapHandler, false)
fun onBackPressed() {
triggerHandler(backPressHandler, false)
}
private fun triggerHandler(handlerFlow: Flow<GestureHandler>, withHaptic: Boolean = true) {

12
lawnchair/src/app/lawnchair/preferences2/PreferenceManager2.kt
View File

@@ -303,8 +303,8 @@ class PreferenceManager2(private val context: Context) : PreferenceManager {
save = { it.toString() },
)
val doubleTapHandler = serializablePreference<GestureHandlerConfig>(
key = stringPreferencesKey("double_tap_handler"),
val doubleTapGestureHandler = serializablePreference<GestureHandlerConfig>(
key = stringPreferencesKey("double_tap_gesture_handler"),
defaultValue = GestureHandlerConfig.Sleep
)
@@ -318,13 +318,13 @@ class PreferenceManager2(private val context: Context) : PreferenceManager {
defaultValue = GestureHandlerConfig.OpenNotifications
)
val homeTapGestureHandler = serializablePreference<GestureHandlerConfig>(
key = stringPreferencesKey("home_tap_gesture_handler"),
val homePressGestureHandler = serializablePreference<GestureHandlerConfig>(
key = stringPreferencesKey("home_press_gesture_handler"),
defaultValue = GestureHandlerConfig.NoOp
)
val backTapGestureHandler = serializablePreference<GestureHandlerConfig>(
key = stringPreferencesKey("back_tap_gesture_handler"),
val backPressGestureHandler = serializablePreference<GestureHandlerConfig>(
key = stringPreferencesKey("back_press_gesture_handler"),
defaultValue = GestureHandlerConfig.NoOp
)

6
lawnchair/src/app/lawnchair/ui/preferences/GesturePreferences.kt
View File

@@ -20,7 +20,7 @@ fun GesturePreferences() {
PreferenceLayout(label = stringResource(id = R.string.gestures_label)) {
PreferenceGroup {
GestureHandlerPreference(
adapter = prefs.doubleTapHandler.getAdapter(),
adapter = prefs.doubleTapGestureHandler.getAdapter(),
label = stringResource(id = R.string.gesture_double_tap)
)
GestureHandlerPreference(
@@ -32,11 +32,11 @@ fun GesturePreferences() {
label = stringResource(id = R.string.gesture_swipe_down)
)
GestureHandlerPreference(
adapter = prefs.homeTapGestureHandler.getAdapter(),
adapter = prefs.homePressGestureHandler.getAdapter(),
label = stringResource(id = R.string.gesture_home_tap)
)
GestureHandlerPreference(
adapter = prefs.backTapGestureHandler.getAdapter(),
adapter = prefs.backPressGestureHandler.getAdapter(),
label = stringResource(id = R.string.gesture_back_tap)
)
}

2
lawnchair/src/app/lawnchair/ui/preferences/HomeScreenPreferences.kt
View File

@@ -60,7 +60,7 @@ fun HomeScreenPreferences() {
label = stringResource(id = R.string.wallpaper_scrolling_label),
)
GestureHandlerPreference(
adapter = prefs2.doubleTapHandler.getAdapter(),
adapter = prefs2.doubleTapGestureHandler.getAdapter(),
label = stringResource(id = R.string.gesture_double_tap)
)
val feedAvailable = OverlayCallbackImpl.minusOneAvailable(LocalContext.current)

2
src/com/android/launcher3/LauncherState.java
View File

@@ -111,7 +111,7 @@ public abstract class LauncherState implements BaseState<LauncherState> {
@Override
public void onBackPressed(Launcher launcher) {
if (launcher instanceof LawnchairLauncher) {
((LawnchairLauncher) launcher).getGestureController().onBackTap();
((LawnchairLauncher) launcher).getGestureController().onBackPressed();
}
super.onBackPressed(launcher);
}