luisgulo/Gitnuro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Unified components from settings and changed subtitle to secondary color

Browse source
This commit is contained in:
Abdelilah El Aissaoui 2022-06-23 22:30:11 +02:00
parent 32fae01e6e
commit cbedb0e82c
1 changed files with 5 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
src/main/kotlin/app/ui/dialogs/SettingsDialog.kt
View file

@ -131,22 +131,10 @@ fun <T : DropDownOption> SettingDropDown(
modifier = Modifier.padding(vertical = 8.dp, horizontal = 8.dp), modifier = Modifier.padding(vertical = 8.dp, horizontal = 8.dp),
verticalAlignment = Alignment.CenterVertically verticalAlignment = Alignment.CenterVertically
) { ) {
Column(verticalArrangement = Arrangement.Center) { FieldTitles(title, subtitle)
Text(
text = title,
color = MaterialTheme.colors.primaryTextColor,
fontSize = 16.sp,
)
Text(
text = subtitle,
color = MaterialTheme.colors.primaryTextColor,
modifier = Modifier.padding(top = 4.dp),
fontSize = 12.sp,
)
}
Spacer(modifier = Modifier.weight(1f)) Spacer(modifier = Modifier.weight(1f))
Box { Box {
OutlinedButton(onClick = { showThemeDropdown = true }) { OutlinedButton(onClick = { showThemeDropdown = true }) {
Text( Text(
@ -187,20 +175,7 @@ fun SettingButton(
modifier = Modifier.padding(vertical = 8.dp, horizontal = 8.dp), modifier = Modifier.padding(vertical = 8.dp, horizontal = 8.dp),
verticalAlignment = Alignment.CenterVertically verticalAlignment = Alignment.CenterVertically
) { ) {
Column(verticalArrangement = Arrangement.Center) { FieldTitles(title, subtitle)
Text(
text = title,
color = MaterialTheme.colors.primaryTextColor,
fontSize = 14.sp,
)
Text(
text = subtitle,
color = MaterialTheme.colors.primaryTextColor,
modifier = Modifier.padding(top = 4.dp),
fontSize = 12.sp,
)
}
Spacer(modifier = Modifier.weight(1f)) Spacer(modifier = Modifier.weight(1f))
@ -225,22 +200,7 @@ fun SettingToogle(
modifier = Modifier.padding(vertical = 8.dp, horizontal = 8.dp), modifier = Modifier.padding(vertical = 8.dp, horizontal = 8.dp),
verticalAlignment = Alignment.CenterVertically verticalAlignment = Alignment.CenterVertically
) { ) {
Column( FieldTitles(title, subtitle)
verticalArrangement = Arrangement.Center
) {
Text(
text = title,
color = MaterialTheme.colors.primaryTextColor,
fontSize = 14.sp,
)
Text(
text = subtitle,
color = MaterialTheme.colors.primaryTextColor,
modifier = Modifier.padding(top = 4.dp),
fontSize = 12.sp,
)
}
Spacer(modifier = Modifier.weight(1f)) Spacer(modifier = Modifier.weight(1f))
@ -316,7 +276,7 @@ private fun FieldTitles(
Text( Text(
text = subtitle, text = subtitle,
color = MaterialTheme.colors.primaryTextColor, color = MaterialTheme.colors.secondaryTextColor,
modifier = Modifier.padding(top = 4.dp), modifier = Modifier.padding(top = 4.dp),
fontSize = 12.sp, fontSize = 12.sp,
) )