Gestures
This commit is contained in:
@@ -1,7 +1,6 @@
|
||||
package de.mm20.launcher2.preferences
|
||||
|
||||
import android.content.Context
|
||||
import android.graphics.Color
|
||||
import de.mm20.launcher2.preferences.Settings.SearchBarSettings.SearchBarColors
|
||||
import scheme.Scheme
|
||||
|
||||
@@ -14,11 +13,12 @@ fun createFactorySettings(context: Context): Settings {
|
||||
.setColorScheme(Settings.AppearanceSettings.ColorScheme.Default)
|
||||
.setDimWallpaper(false)
|
||||
.setBlurWallpaper(true)
|
||||
.setCustomColors(Settings.AppearanceSettings.CustomColors.newBuilder()
|
||||
.setAdvancedMode(false)
|
||||
.setBaseColors(DefaultCustomColorsBase)
|
||||
.setLightScheme(DefaultLightCustomColorScheme)
|
||||
.setDarkScheme(DefaultDarkCustomColorScheme)
|
||||
.setCustomColors(
|
||||
Settings.AppearanceSettings.CustomColors.newBuilder()
|
||||
.setAdvancedMode(false)
|
||||
.setBaseColors(DefaultCustomColorsBase)
|
||||
.setLightScheme(DefaultLightCustomColorScheme)
|
||||
.setDarkScheme(DefaultDarkCustomColorScheme)
|
||||
)
|
||||
.setFont(Settings.AppearanceSettings.Font.Outfit)
|
||||
.build()
|
||||
@@ -168,21 +168,29 @@ fun createFactorySettings(context: Context): Settings {
|
||||
.setBottomSearchBar(false)
|
||||
.setReverseSearchResults(false)
|
||||
)
|
||||
.setGestures(
|
||||
Settings.GestureSettings.newBuilder()
|
||||
.setDoubleTap(Settings.GestureSettings.GestureAction.LockScreen)
|
||||
.setLongPress(Settings.GestureSettings.GestureAction.None)
|
||||
.setSwipeDown(Settings.GestureSettings.GestureAction.OpenNotificationDrawer)
|
||||
.setSwipeLeft(Settings.GestureSettings.GestureAction.None)
|
||||
.setSwipeRight(Settings.GestureSettings.GestureAction.None)
|
||||
)
|
||||
.build()
|
||||
}
|
||||
|
||||
internal val DefaultCustomColorsBase: Settings.AppearanceSettings.CustomColors.BaseColors
|
||||
get() {
|
||||
val scheme = Scheme.light(0xFFACE330.toInt())
|
||||
return Settings.AppearanceSettings.CustomColors.BaseColors.newBuilder()
|
||||
.setAccent1(scheme.primary)
|
||||
.setAccent2(scheme.secondary)
|
||||
.setAccent3(scheme.tertiary)
|
||||
.setNeutral1(scheme.surface)
|
||||
.setNeutral2(scheme.surfaceVariant)
|
||||
.setError(scheme.error)
|
||||
.build()
|
||||
}
|
||||
get() {
|
||||
val scheme = Scheme.light(0xFFACE330.toInt())
|
||||
return Settings.AppearanceSettings.CustomColors.BaseColors.newBuilder()
|
||||
.setAccent1(scheme.primary)
|
||||
.setAccent2(scheme.secondary)
|
||||
.setAccent3(scheme.tertiary)
|
||||
.setNeutral1(scheme.surface)
|
||||
.setNeutral2(scheme.surfaceVariant)
|
||||
.setError(scheme.error)
|
||||
.build()
|
||||
}
|
||||
|
||||
internal val DefaultLightCustomColorScheme: Settings.AppearanceSettings.CustomColors.Scheme
|
||||
get() {
|
||||
|
||||
+9
@@ -1,6 +1,7 @@
|
||||
package de.mm20.launcher2.preferences.migrations
|
||||
|
||||
import de.mm20.launcher2.preferences.Settings
|
||||
import de.mm20.launcher2.preferences.Settings.GestureSettings
|
||||
import de.mm20.launcher2.preferences.Settings.LayoutSettings
|
||||
|
||||
class Migration_11_12: VersionedMigration(11, 12) {
|
||||
@@ -30,6 +31,14 @@ class Migration_11_12: VersionedMigration(11, 12) {
|
||||
.setBottomSearchBar(false)
|
||||
.setReverseSearchResults(false)
|
||||
)
|
||||
.setGestures(
|
||||
GestureSettings.newBuilder()
|
||||
.setDoubleTap(GestureSettings.GestureAction.LockScreen)
|
||||
.setLongPress(GestureSettings.GestureAction.None)
|
||||
.setSwipeDown(GestureSettings.GestureAction.OpenNotificationDrawer)
|
||||
.setSwipeLeft(GestureSettings.GestureAction.None)
|
||||
.setSwipeRight(GestureSettings.GestureAction.None)
|
||||
)
|
||||
}
|
||||
}
|
||||
return builder
|
||||
|
||||
@@ -299,4 +299,22 @@ message Settings {
|
||||
bool reverse_search_results = 3;
|
||||
}
|
||||
LayoutSettings layout = 27;
|
||||
|
||||
message GestureSettings {
|
||||
enum GestureAction {
|
||||
None = 0;
|
||||
OpenSearch = 1;
|
||||
OpenNotificationDrawer = 2;
|
||||
LockScreen = 3;
|
||||
OpenQuickSettings = 4;
|
||||
OpenRecents = 5;
|
||||
OpenPowerDialog = 6;
|
||||
}
|
||||
GestureAction swipe_down = 1;
|
||||
GestureAction swipe_left = 2;
|
||||
GestureAction swipe_right = 3;
|
||||
GestureAction double_tap = 4;
|
||||
GestureAction long_press = 5;
|
||||
}
|
||||
GestureSettings gestures = 28;
|
||||
}
|
||||
Reference in New Issue
Block a user