Skip to content

Commit 112998e

Browse files
committed
fix: restore WakeUpScreen layout, center math challenge, and revert button colors
1 parent 3be5a53 commit 112998e

1 file changed

Lines changed: 10 additions & 18 deletions

File tree

app/src/main/java/com/hotbell/radio/ui/wakeup/WakeUpScreen.kt

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@ fun WakeUpScreen(
9090
val dismissType by viewModel.dismissType.collectAsState()
9191
val isVerifying by viewModel.isVerifying.collectAsState()
9292
val verificationResult by viewModel.verificationResult.collectAsState()
93-
val targetPhotoPath by viewModel.targetPhotoPath.collectAsState()
9493

9594
val context = LocalContext.current
9695
val prefs = remember { context.getSharedPreferences("hotbell_prefs", android.content.Context.MODE_PRIVATE) }
@@ -134,13 +133,6 @@ fun WakeUpScreen(
134133
var flashColor by remember { mutableStateOf(Color.Transparent) }
135134
val coroutineScope = rememberCoroutineScope()
136135

137-
val colors = listOf(
138-
Color.White,
139-
Color.White,
140-
Color.White,
141-
Color.White
142-
)
143-
144136
Box(
145137
modifier = Modifier
146138
.fillMaxSize()
@@ -163,14 +155,13 @@ fun WakeUpScreen(
163155
Column(
164156
modifier = Modifier
165157
.fillMaxSize()
166-
.padding(24.dp),
158+
.padding(vertical = 48.dp, horizontal = 24.dp),
167159
horizontalAlignment = Alignment.CenterHorizontally,
168160
verticalArrangement = Arrangement.SpaceBetween
169161
) {
170162
// Top Section (Time & Status)
171163
Column(
172-
horizontalAlignment = Alignment.CenterHorizontally,
173-
modifier = Modifier.padding(top = 48.dp)
164+
horizontalAlignment = Alignment.CenterHorizontally
174165
) {
175166
Text(
176167
text = "WAKE UP!",
@@ -309,7 +300,8 @@ fun WakeUpScreen(
309300
// MATH CHALLENGE UI
310301
Column(
311302
horizontalAlignment = Alignment.CenterHorizontally,
312-
modifier = Modifier.fillMaxWidth()
303+
modifier = Modifier.fillMaxWidth(),
304+
verticalArrangement = Arrangement.Center
313305
) {
314306
Text(
315307
text = "Brain Check to Dismiss",
@@ -344,20 +336,20 @@ fun WakeUpScreen(
344336
}
345337

346338
// Bottom Section (Answer Grid)
339+
val buttonColors = listOf(Color.White, Color.White, Color.White, Color.White)
340+
347341
Column(
348342
modifier = Modifier.fillMaxWidth(),
349343
verticalArrangement = Arrangement.spacedBy(16.dp)
350344
) {
351-
val colors = listOf(ElectricBlue, NeonPink, Purple, HotBellOrange)
352-
353345
Row(
354346
modifier = Modifier.fillMaxWidth(),
355347
horizontalArrangement = Arrangement.spacedBy(16.dp)
356348
) {
357349
ChallengeButton(
358350
text = challenge.options[0].toString(),
359351
isCorrect = challenge.correctIndex == 0,
360-
baseColor = colors[0],
352+
baseColor = buttonColors[0],
361353
holdDurationMs = holdDurationMs,
362354
modifier = Modifier.weight(1f),
363355
onSuccess = {
@@ -372,7 +364,7 @@ fun WakeUpScreen(
372364
ChallengeButton(
373365
text = challenge.options[1].toString(),
374366
isCorrect = challenge.correctIndex == 1,
375-
baseColor = colors[1],
367+
baseColor = buttonColors[1],
376368
holdDurationMs = holdDurationMs,
377369
modifier = Modifier.weight(1f),
378370
onSuccess = {
@@ -392,7 +384,7 @@ fun WakeUpScreen(
392384
ChallengeButton(
393385
text = challenge.options[2].toString(),
394386
isCorrect = challenge.correctIndex == 2,
395-
baseColor = colors[2],
387+
baseColor = buttonColors[2],
396388
holdDurationMs = holdDurationMs,
397389
modifier = Modifier.weight(1f),
398390
onSuccess = {
@@ -407,7 +399,7 @@ fun WakeUpScreen(
407399
ChallengeButton(
408400
text = challenge.options[3].toString(),
409401
isCorrect = challenge.correctIndex == 3,
410-
baseColor = colors[3],
402+
baseColor = buttonColors[3],
411403
holdDurationMs = holdDurationMs,
412404
modifier = Modifier.weight(1f),
413405
onSuccess = {

0 commit comments

Comments
 (0)