luckyimnotanigger/HeliBoard
1
0
Fork 0
mirror of https://github.com/Helium314/HeliBoard.git synced 2025-04-21 22:59:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

adjust welcome wizard colors

Browse source
This commit is contained in:
Helium314 2025-03-01 23:36:05 +01:00
parent 3d690ae371
commit 122b51c0ed
1 changed files with 20 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
app/src/main/java/helium314/keyboard/settings/WelcomeWizard.kt
View file

@ -36,6 +36,7 @@ import androidx.compose.runtime.saveable.rememberSaveable
import androidx.compose.runtime.setValue import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.painter.Painter import androidx.compose.ui.graphics.painter.Painter
import androidx.compose.ui.platform.LocalConfiguration import androidx.compose.ui.platform.LocalConfiguration
import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalContext
@ -44,6 +45,7 @@ import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.core.content.ContextCompat
import helium314.keyboard.latin.R import helium314.keyboard.latin.R
import helium314.keyboard.latin.utils.UncachedInputMethodManagerUtils import helium314.keyboard.latin.utils.UncachedInputMethodManagerUtils
import kotlinx.coroutines.delay import kotlinx.coroutines.delay
@ -75,6 +77,9 @@ fun WelcomeWizard(
} }
} }
val useWideLayout = height < 500 && width > height val useWideLayout = height < 500 && width > height
val stepBackgroundColor = Color(ContextCompat.getColor(ctx, R.color.setup_step_background))
val textColor = Color(ContextCompat.getColor(ctx, R.color.setup_step_action_text))
val textColorDim = textColor.copy(alpha = 0.5f)
val appName = stringResource(ctx.applicationInfo.labelRes) val appName = stringResource(ctx.applicationInfo.labelRes)
@Composable fun bigText() { @Composable fun bigText() {
val resource = if (step == 0) R.string.setup_welcome_title else R.string.setup_steps_title val resource = if (step == 0) R.string.setup_welcome_title else R.string.setup_steps_title
@ -91,7 +96,7 @@ fun WelcomeWizard(
Image(painterResource(R.drawable.setup_welcome_image), null) Image(painterResource(R.drawable.setup_welcome_image), null)
Row(Modifier.clickable { step = 1 } Row(Modifier.clickable { step = 1 }
.padding(top = 4.dp, start = 4.dp, end = 4.dp) .padding(top = 4.dp, start = 4.dp, end = 4.dp)
.background(color = MaterialTheme.colorScheme.primary) //.background(color = MaterialTheme.colorScheme.primary)
) { ) {
Spacer(Modifier.weight(1f)) Spacer(Modifier.weight(1f))
Text( Text(
@ -135,40 +140,40 @@ fun WelcomeWizard(
action = close action = close
} }
Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween) { Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween) {
Text("1", color = if (step == 1) MaterialTheme.colorScheme.primary else MaterialTheme.colorScheme.onPrimary) Text("1", color = if (step == 1) textColor else textColorDim)
Text("2", color = if (step == 2) MaterialTheme.colorScheme.primary else MaterialTheme.colorScheme.onPrimary) Text("2", color = if (step == 2) textColor else textColorDim)
Text("3", color = if (step == 3) MaterialTheme.colorScheme.primary else MaterialTheme.colorScheme.onPrimary) Text("3", color = if (step == 3) textColor else textColorDim)
} }
Column(Modifier Column(Modifier
.background(color = MaterialTheme.colorScheme.primary) .background(color = stepBackgroundColor)
.padding(8.dp) .padding(16.dp)
) { ) {
Text(title) Text(title)
Text(instruction, style = MaterialTheme.typography.bodyLarge.merge(color = MaterialTheme.colorScheme.onPrimary)) Text(instruction, style = MaterialTheme.typography.bodyLarge.merge(color = textColor))
} }
Spacer(Modifier.height(4.dp)) Spacer(Modifier.height(4.dp))
Row( Row(
Modifier.clickable { action() } Modifier.clickable { action() }
.background(color = MaterialTheme.colorScheme.primary) .background(color = stepBackgroundColor)
.padding(8.dp), .padding(16.dp),
verticalAlignment = Alignment.CenterVertically verticalAlignment = Alignment.CenterVertically
) { ) {
Icon(icon, null, Modifier.padding(end = 6.dp).size(32.dp), tint = MaterialTheme.colorScheme.onPrimary) Icon(icon, null, Modifier.padding(end = 6.dp).size(32.dp), tint = textColor)
Text(actionText, Modifier.weight(1f)) Text(actionText, Modifier.weight(1f))
} }
if (step == 3) { if (step == 3) {
Spacer(Modifier.height(4.dp)) Spacer(Modifier.height(4.dp))
Row( Row(
Modifier.clickable { finish() } Modifier.clickable { finish() }
.background(color = MaterialTheme.colorScheme.primary) .background(color = stepBackgroundColor)
.padding(8.dp), .padding(16.dp),
verticalAlignment = Alignment.CenterVertically verticalAlignment = Alignment.CenterVertically
) { ) {
Icon( Icon(
painterResource(R.drawable.ic_setup_check), painterResource(R.drawable.ic_setup_check),
null, null,
Modifier.padding(end = 6.dp).size(32.dp), Modifier.padding(end = 6.dp).size(32.dp),
tint = MaterialTheme.colorScheme.onPrimary tint = textColor
) )
Text(stringResource(R.string.setup_finish_action), Modifier.weight(1f)) Text(stringResource(R.string.setup_finish_action), Modifier.weight(1f))
} }
@ -177,8 +182,8 @@ fun WelcomeWizard(
} }
Surface { Surface {
CompositionLocalProvider( CompositionLocalProvider(
LocalContentColor provides MaterialTheme.colorScheme.primary, LocalContentColor provides textColor,
LocalTextStyle provides MaterialTheme.typography.titleLarge.merge(color = MaterialTheme.colorScheme.onPrimary), LocalTextStyle provides MaterialTheme.typography.titleLarge.merge(color = textColor),
) { ) {
Box( Box(
modifier = Modifier.fillMaxSize().padding(32.dp), modifier = Modifier.fillMaxSize().padding(32.dp),