mirror of
https://github.com/Droid-Deck/DroidDeck.git
synced 2026-11-21 22:05:59 +00:00
feat(theme): add graphite theme as default
This commit is contained in:
1 parent
7aa760b696
commit
2ae693ceed
4 files changed
+13
-5
No files matched your search
@@ -205,7 +205,7 @@ class MainActivity : ComponentActivity() {
|
|||||||
private var customResolution by mutableStateOf<Pair<Int, Int>?>(null)
|
private var customResolution by mutableStateOf<Pair<Int, Int>?>(null)
|
||||||
private var fexPreset by mutableStateOf("")
|
private var fexPreset by mutableStateOf("")
|
||||||
private var steamChannel by mutableStateOf("publicbeta")
|
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 shapeMode by mutableStateOf(SessionPrefs.SHAPE_AUTO)
|
||||||
private var hdrOn by mutableStateOf(false)
|
private var hdrOn by mutableStateOf(false)
|
||||||
private var hdrReason by mutableStateOf<String?>(null)
|
private var hdrReason by mutableStateOf<String?>(null)
|
||||||
|
|||||||
@@ -336,8 +336,8 @@ object SessionPrefs {
|
|||||||
prefs(context).edit().putString("addedExe:$folderPath", path).apply()
|
prefs(context).edit().putString("addedExe:$folderPath", path).apply()
|
||||||
}
|
}
|
||||||
|
|
||||||
/** The app's colour theme (ui/Themes ids); Paper on black unless chosen otherwise. */
|
/** The app's colour theme (ui/Themes ids); Graphite unless chosen otherwise. */
|
||||||
fun theme(context: Context): String = prefs(context).getString("theme", "paper") ?: "paper"
|
fun theme(context: Context): String = prefs(context).getString("theme", "graphite") ?: "graphite"
|
||||||
|
|
||||||
fun setTheme(context: Context, id: String) {
|
fun setTheme(context: Context, id: String) {
|
||||||
prefs(context).edit().putString("theme", id).apply()
|
prefs(context).edit().putString("theme", id).apply()
|
||||||
|
|||||||
@@ -163,7 +163,7 @@ class FrontEndState(
|
|||||||
val frameGenMultiplier: Int = 2,
|
val frameGenMultiplier: Int = 2,
|
||||||
val lsfgReady: Boolean = false,
|
val lsfgReady: Boolean = false,
|
||||||
val pageKey: String? = null,
|
val pageKey: String? = null,
|
||||||
val theme: String = Themes.PAPER,
|
val theme: String = Themes.GRAPHITE,
|
||||||
val isHomeApp: Boolean = false,
|
val isHomeApp: Boolean = false,
|
||||||
val homeScreenEnabled: Boolean = false,
|
val homeScreenEnabled: Boolean = false,
|
||||||
val defaultHomeLabel: String? = null,
|
val defaultHomeLabel: String? = null,
|
||||||
|
|||||||
@@ -18,11 +18,19 @@ class Palette(
|
|||||||
)
|
)
|
||||||
|
|
||||||
object Themes {
|
object Themes {
|
||||||
|
const val GRAPHITE = "graphite"
|
||||||
const val PAPER = "paper"
|
const val PAPER = "paper"
|
||||||
const val ICON_BLUE = "blue"
|
const val ICON_BLUE = "blue"
|
||||||
const val ELECTRIC = "electric"
|
const val ELECTRIC = "electric"
|
||||||
|
|
||||||
val all: List<Palette> = listOf(
|
val all: List<Palette> = 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(
|
Palette(
|
||||||
PAPER, "Paper on black", "White is the primary, the icon's blue is the signal for rules, rings and dots.",
|
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),
|
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]
|
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
|
@Composable
|
||||||
fun DroidDeckTheme(theme: String? = null, content: @Composable () -> Unit) {
|
fun DroidDeckTheme(theme: String? = null, content: @Composable () -> Unit) {
|
||||||
|
|||||||
Reference in new issue
Block a user