forked from geode-sdk/android-launcher
uninvert the settings colors
This commit is contained in:
3 files changed
+4
-5
No files matched your search
@@ -108,7 +108,6 @@ fun DeveloperSettingsScreen(onBackPressedDispatcher: OnBackPressedDispatcher?) {
|
|||||||
|
|
||||||
Scaffold(
|
Scaffold(
|
||||||
modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection),
|
modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection),
|
||||||
containerColor = MaterialTheme.colorScheme.surfaceContainerLow,
|
|
||||||
topBar = {
|
topBar = {
|
||||||
Column {
|
Column {
|
||||||
TopAppBar(
|
TopAppBar(
|
||||||
@@ -128,7 +127,7 @@ fun DeveloperSettingsScreen(onBackPressedDispatcher: OnBackPressedDispatcher?) {
|
|||||||
)
|
)
|
||||||
},
|
},
|
||||||
scrollBehavior = scrollBehavior,
|
scrollBehavior = scrollBehavior,
|
||||||
colors = TopAppBarDefaults.topAppBarColors(MaterialTheme.colorScheme.surfaceContainerLow),
|
colors = TopAppBarDefaults.topAppBarColors(MaterialTheme.colorScheme.background),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -261,7 +261,7 @@ fun SettingsScreen(
|
|||||||
|
|
||||||
// fix theme transition by giving it the exact same animation as the top bar
|
// fix theme transition by giving it the exact same animation as the top bar
|
||||||
val containerColor by animateColorAsState(
|
val containerColor by animateColorAsState(
|
||||||
targetValue = MaterialTheme.colorScheme.surfaceContainerLow,
|
targetValue = MaterialTheme.colorScheme.background,
|
||||||
animationSpec = spring(stiffness = Spring.StiffnessMediumLow),
|
animationSpec = spring(stiffness = Spring.StiffnessMediumLow),
|
||||||
label = "background color"
|
label = "background color"
|
||||||
)
|
)
|
||||||
@@ -291,7 +291,7 @@ fun SettingsScreen(
|
|||||||
)
|
)
|
||||||
},
|
},
|
||||||
scrollBehavior = scrollBehavior,
|
scrollBehavior = scrollBehavior,
|
||||||
colors = TopAppBarDefaults.topAppBarColors(MaterialTheme.colorScheme.surfaceContainerLow),
|
colors = TopAppBarDefaults.topAppBarColors(MaterialTheme.colorScheme.background),
|
||||||
)
|
)
|
||||||
},
|
},
|
||||||
content = { innerPadding ->
|
content = { innerPadding ->
|
||||||
|
|||||||
@@ -963,7 +963,7 @@ fun OptionsCard(modifier: Modifier = Modifier, wrapContent: Boolean = false, tit
|
|||||||
.padding(vertical = 1.dp)
|
.padding(vertical = 1.dp)
|
||||||
.clip(RoundedCornerShape(4.dp))
|
.clip(RoundedCornerShape(4.dp))
|
||||||
.then(modifier)
|
.then(modifier)
|
||||||
.background(MaterialTheme.colorScheme.background)
|
.background(MaterialTheme.colorScheme.surfaceContainer)
|
||||||
.defaultMinSize(minHeight = 64.dp)
|
.defaultMinSize(minHeight = 64.dp)
|
||||||
.padding(horizontal = 16.dp),
|
.padding(horizontal = 16.dp),
|
||||||
Arrangement.SpaceBetween,
|
Arrangement.SpaceBetween,
|
||||||
|
|||||||
Reference in new issue
Block a user