Skip to content

Commit 7a7cbb2

Browse files
committed
[ADD/#215] Screen에 isFirstMission 상태 추가
1 parent 2b5214e commit 7a7cbb2

File tree

2 files changed

+38
-16
lines changed

2 files changed

+38
-16
lines changed

feature/alarm-interaction/src/main/java/com/yapp/alarm/interaction/action/AlarmActionScreen.kt

Lines changed: 22 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ internal fun AlarmActionScreen(
8585
snoozeEnabled = state.snoozeEnabled,
8686
snoozeInterval = state.snoozeInterval,
8787
snoozeCount = state.snoozeCount,
88+
isFirstMission = state.isFirstMission,
8889
onSnoozeClick = { eventDispatcher(AlarmActionContract.Action.Snooze) },
8990
onDismissClick = {
9091
eventDispatcher(AlarmActionContract.Action.Dismiss)
@@ -120,6 +121,7 @@ private fun AlarmActionContent(
120121
snoozeEnabled: Boolean,
121122
snoozeInterval: Int,
122123
snoozeCount: Int,
124+
isFirstMission: Boolean?,
123125
onSnoozeClick: () -> Unit,
124126
onDismissClick: () -> Unit,
125127
) {
@@ -167,18 +169,26 @@ private fun AlarmActionContent(
167169

168170
Spacer(modifier = Modifier.weight(1f))
169171

170-
OrbitButton(
171-
label = stringResource(id = R.string.alarm_off_mission_start_btn),
172-
enabled = true,
173-
modifier = Modifier
174-
.padding(
175-
start = 40.dp,
176-
end = 40.dp,
177-
bottom = 48.dp,
178-
)
179-
.height(62.dp),
180-
onClick = onDismissClick,
181-
)
172+
if (isFirstMission != null) {
173+
OrbitButton(
174+
label = if (isFirstMission) {
175+
stringResource(id = R.string.alarm_off_mission_start_btn)
176+
} else {
177+
stringResource(id = R.string.alarm_off_btn)
178+
},
179+
enabled = true,
180+
modifier = Modifier
181+
.padding(
182+
start = 40.dp,
183+
end = 40.dp,
184+
bottom = 48.dp,
185+
)
186+
.height(62.dp),
187+
onClick = onDismissClick,
188+
)
189+
} else {
190+
Spacer(modifier = Modifier.height(62.dp))
191+
}
182192
}
183193

184194
AdsBanner()

feature/alarm-interaction/src/main/java/com/yapp/alarm/interaction/snooze/AlarmSnoozeTimerScreen.kt

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ internal fun AlarmSnoozeTimerScreen(
9090
AlarmSnoozeContent(
9191
remainingSeconds = state.remainingSeconds,
9292
totalSeconds = state.totalSeconds,
93+
isFirstMission = state.isFirstMission,
9394
onDismissClick = {
9495
eventDispatcher(AlarmSnoozeTimerContract.Action.Dismiss)
9596
(context as? ComponentActivity)?.finish()
@@ -119,6 +120,7 @@ private fun AlarmSnoozeLoadingScreen() {
119120
private fun AlarmSnoozeContent(
120121
remainingSeconds: Int,
121122
totalSeconds: Int,
123+
isFirstMission: Boolean?,
122124
onDismissClick: () -> Unit,
123125
) {
124126
Column(
@@ -147,9 +149,14 @@ private fun AlarmSnoozeContent(
147149
)
148150
}
149151

150-
AlarmOffButton(
151-
onClick = onDismissClick,
152-
)
152+
if (isFirstMission != null) {
153+
AlarmOffButton(
154+
onClick = onDismissClick,
155+
isFirstMission = isFirstMission,
156+
)
157+
} else {
158+
Spacer(modifier = Modifier.height(58.dp))
159+
}
153160

154161
Spacer(modifier = Modifier.height(48.dp))
155162
}
@@ -273,6 +280,7 @@ private fun formatSecondsToTime(seconds: Int): String {
273280
private fun AlarmOffButton(
274281
modifier: Modifier = Modifier,
275282
onClick: () -> Unit,
283+
isFirstMission: Boolean,
276284
height: Dp = 58.dp,
277285
containerColor: Color = OrbitTheme.colors.white.copy(alpha = 0.2f),
278286
contentColor: Color = OrbitTheme.colors.white,
@@ -291,7 +299,11 @@ private fun AlarmOffButton(
291299
),
292300
) {
293301
Text(
294-
text = stringResource(id = R.string.alarm_off_mission_start_btn),
302+
text = if (isFirstMission) {
303+
stringResource(id = R.string.alarm_off_mission_start_btn)
304+
} else {
305+
stringResource(id = R.string.alarm_off_btn)
306+
},
295307
style = OrbitTheme.typography.headline2SemiBold,
296308
)
297309
}

0 commit comments

Comments
 (0)