diff --git a/app/src/main/java/com/droiddeck/launcher/MainActivity.kt b/app/src/main/java/com/droiddeck/launcher/MainActivity.kt index cde1deb0a..975707083 100644 --- a/app/src/main/java/com/droiddeck/launcher/MainActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/MainActivity.kt @@ -205,7 +205,7 @@ class MainActivity : ComponentActivity() { private var customResolution by mutableStateOf?>(null) private var fexPreset by mutableStateOf("") private var steamChannel by mutableStateOf("publicbeta") - private var theme by mutableStateOf("paper") + private var theme by mutableStateOf("graphite") private var shapeMode by mutableStateOf(SessionPrefs.SHAPE_AUTO) private var hdrOn by mutableStateOf(false) private var hdrReason by mutableStateOf(null) diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt index 7498b4ad9..37990e086 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt @@ -336,8 +336,8 @@ object SessionPrefs { prefs(context).edit().putString("addedExe:$folderPath", path).apply() } - /** The app's colour theme (ui/Themes ids); Paper on black unless chosen otherwise. */ - fun theme(context: Context): String = prefs(context).getString("theme", "paper") ?: "paper" + /** The app's colour theme (ui/Themes ids); Graphite unless chosen otherwise. */ + fun theme(context: Context): String = prefs(context).getString("theme", "graphite") ?: "graphite" fun setTheme(context: Context, id: String) { prefs(context).edit().putString("theme", id).apply() diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt index 7ec03096b..368b3cf3e 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt @@ -163,7 +163,7 @@ class FrontEndState( val frameGenMultiplier: Int = 2, val lsfgReady: Boolean = false, val pageKey: String? = null, - val theme: String = Themes.PAPER, + val theme: String = Themes.GRAPHITE, val isHomeApp: Boolean = false, val homeScreenEnabled: Boolean = false, val defaultHomeLabel: String? = null, diff --git a/app/src/main/java/com/droiddeck/launcher/ui/Theme.kt b/app/src/main/java/com/droiddeck/launcher/ui/Theme.kt index 16eb84857..fdbdcf4cb 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/Theme.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/Theme.kt @@ -18,11 +18,19 @@ class Palette( ) object Themes { + const val GRAPHITE = "graphite" const val PAPER = "paper" const val ICON_BLUE = "blue" const val ELECTRIC = "electric" val all: List = listOf( + Palette( + GRAPHITE, "Graphite", "Graphite surfaces, with the logo's own orb blue for everything selected, focused or pressed.", + background = Color(0xFF0A0B0D), surface = Color(0xFF121417), surfaceVariant = Color(0xFF1A1D22), line = Color(0xFF262A31), line2 = Color(0xFF343A43), + onBackground = Color(0xFFF2F4F7), onSurfaceVariant = Color(0xFF9AA3AF), + primary = Color(0xFF1A9FFF), primary2 = Color(0xFF1487DB), onPrimary = Color(0xFF03111F), signal = Color(0xFF1A9FFF), + good = Color(0xFF4CD37F), + ), Palette( PAPER, "Paper on black", "White is the primary, the icon's blue is the signal for rules, rings and dots.", background = Color(0xFF000000), surface = Color(0xFF0F0F10), surfaceVariant = Color(0xFF191A1C), line = Color(0xFF262729), line2 = Color(0xFF343638), @@ -49,7 +57,7 @@ object Themes { fun byId(id: String): Palette = all.firstOrNull { it.id == id } ?: all[0] } -val LocalPalette = staticCompositionLocalOf { Themes.byId(Themes.PAPER) } +val LocalPalette = staticCompositionLocalOf { Themes.byId(Themes.GRAPHITE) } @Composable fun DroidDeckTheme(theme: String? = null, content: @Composable () -> Unit) {