Myzel394/NumberHub
1
0
Fork 0
mirror of https://github.com/Myzel394/NumberHub.git synced 2025-06-19 16:55:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed wrongly used colors

Browse Source
This commit is contained in:
Sad Ellie 2022-06-07 20:40:51 +03:00
parent e034e7bfb7
commit e79ecedfcc
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/sadellie/unitto/screens/second/components/UnitsList.kt
View File

@ -52,7 +52,7 @@ fun UnitsList(
.padding(vertical = 12.dp, horizontal = 8.dp), .padding(vertical = 12.dp, horizontal = 8.dp),
text = stringResource(id = unitGroup.res), text = stringResource(id = unitGroup.res),
style = MaterialTheme.typography.titleMedium, style = MaterialTheme.typography.titleMedium,
color = MaterialTheme.colorScheme.onPrimaryContainer color = MaterialTheme.colorScheme.primary
) )
} }
items(items = listOfUnits, key = { it.unitId }) { unit -> items(items = listOfUnits, key = { it.unitId }) { unit ->

2
app/src/main/java/com/sadellie/unitto/screens/setttings/AlertDialogWithList.kt
View File

@ -70,7 +70,7 @@ fun AlertDialogWithList(
}, },
confirmButton = { confirmButton = {
TextButton(onClick = dismissAction) { TextButton(onClick = dismissAction) {
Text(text = dismissButtonLabel, color = MaterialTheme.colorScheme.onPrimaryContainer) Text(text = dismissButtonLabel, color = MaterialTheme.colorScheme.primary)
} }
} }
) )

4
app/src/main/java/com/sadellie/unitto/screens/setttings/SettingsScreen.kt
View File

@ -89,7 +89,7 @@ fun SettingsScreen(
.padding(start = 16.dp, end = 16.dp, top = 24.dp, bottom = 12.dp), .padding(start = 16.dp, end = 16.dp, top = 24.dp, bottom = 12.dp),
text = stringResource(id = R.string.general_settings_group), text = stringResource(id = R.string.general_settings_group),
style = MaterialTheme.typography.titleSmall, style = MaterialTheme.typography.titleSmall,
color = MaterialTheme.colorScheme.onPrimaryContainer color = MaterialTheme.colorScheme.primary
) )
SettingsListItem( SettingsListItem(
label = stringResource(R.string.precision_setting), label = stringResource(R.string.precision_setting),
@ -123,7 +123,7 @@ fun SettingsScreen(
.padding(start = 16.dp, end = 16.dp, top = 24.dp, bottom = 12.dp), .padding(start = 16.dp, end = 16.dp, top = 24.dp, bottom = 12.dp),
text = stringResource(id = R.string.additional_settings_group), text = stringResource(id = R.string.additional_settings_group),
style = MaterialTheme.typography.titleSmall, style = MaterialTheme.typography.titleSmall,
color = MaterialTheme.colorScheme.onPrimaryContainer color = MaterialTheme.colorScheme.primary
) )
SettingsListItem( SettingsListItem(
label = stringResource(R.string.terms_and_conditions), label = stringResource(R.string.terms_and_conditions),

6
app/src/main/java/com/sadellie/unitto/ui/theme/ColorSchemeUtils.kt
View File

@ -75,9 +75,10 @@ fun dynamicLightTheme(context: Context): ColorScheme {
return lightColorScheme( return lightColorScheme(
// Settings screen group text, units screen units group text // Settings screen group text, units screen units group text
primary = primary.shiftTo0(0.7f), primary = primary,
// Text color on Third party Licenses screen // Text color on Third party Licenses screen
onPrimary = primary.shiftTo255(0.3f), onPrimary = primary.shiftTo255(0.3f),
onPrimaryContainer = primary.shiftTo0(0.7f),
// Selected unit, group, keyboard buttons // Selected unit, group, keyboard buttons
secondaryContainer = secondary, secondaryContainer = secondary,
onSecondaryContainer = secondary.getAppropriateTextColor(), onSecondaryContainer = secondary.getAppropriateTextColor(),
@ -130,9 +131,10 @@ fun dynamicDarkTheme(context: Context): ColorScheme {
return darkColorScheme( return darkColorScheme(
// Settings screen group text, units screen units group text // Settings screen group text, units screen units group text
primary = primary.shiftTo255(0.7f), primary = primary,
// Text color on Third party Licenses screen // Text color on Third party Licenses screen
onPrimary = primary.shiftTo0(0.3f), onPrimary = primary.shiftTo0(0.3f),
onPrimaryContainer = primary.shiftTo255(0.7f),
// Selected unit, group, keyboard buttons // Selected unit, group, keyboard buttons
secondaryContainer = secondary, secondaryContainer = secondary,
onSecondaryContainer = secondary.getAppropriateTextColor(), onSecondaryContainer = secondary.getAppropriateTextColor(),