Skip to content

[FIX/#143] 2์ฐจ qa #148

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. Weโ€™ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sohee6989 merged 8 commits into from
Jan 22, 2026
Merged

[FIX/#143] 2์ฐจ qa #148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3552b7c
[CHORE/#143] 2์ฐจ ํ์—์ด ๋ฐ˜์˜
sohee6989 Jan 22, 2026
951713b
[CHORE/#143] ktlint ์ฒดํฌ
sohee6989 Jan 22, 2026
4b16d0b
[CHORE/#143] ์ž๋™ ๋กœ๊ทธ์ธ ์ž„์‹œ ์‚ญ์ œ
sohee6989 Jan 22, 2026
1c38c27
[CHORE/#143] 2์ฐจ qa ๋ฐ˜์˜
sohee6989 Jan 22, 2026
5f8a10e
[FIX/#143] ์ฑŒ๋ฆฐ์ง€ gauge ๋ฐ˜์˜ ์˜ค๋ฅ˜ ํ•ด๊ฒฐ
sohee6989 Jan 22, 2026
d3bba74
[CHORE/#143] ktlint ์ฒดํฌ
sohee6989 Jan 22, 2026
e34e47e
[CHORE/#143] ๋ถˆํ•„์š”ํ•œ ์ฃผ์„ ์ œ๊ฑฐ
nhyeonii Jan 22, 2026
2987191
[CHORE/#143] ๋ถˆํ•„์š”ํ•œ ์ฃผ์„ ์ œ๊ฑฐ
nhyeonii Jan 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/src/main/java/com/cherrish/android/core/designsystem/theme/Color.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ val green3 = Color(0xFF9AD342)
val shadow = Color(0xFF9098A7).copy(alpha = 0.12f)

val gradation = Color(0xFFFFFDFD)
val gradation2 = Color(0xFFFAE0E6)
val gradation2 = Color(0xFFFFE0E0)

val graStart = Color(0xFFFFF7f7)
val graStart = Color(0xFFFFEBEB)
val graEnd = Color(0xFFFFFDFD)

val bottomSheetScrimColor = Color(0x1A464C52)
Expand Down
8 changes: 5 additions & 3 deletions ...cherrish/android/presentation/challenge/component/ChallengeMissionProgressCherrygrowth.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ import kotlinx.collections.immutable.toImmutableList
@Composable
fun ChallengeMissionProgressCherrygrowth(
cherryType: CherryType,
gaugeStep: Int,
remainingGuideText: String,
challengeProgress: Int,
modifier: Modifier = Modifier
Expand Down Expand Up @@ -86,7 +87,7 @@ fun ChallengeMissionProgressCherrygrowth(

CherryGrowthProgressSection(
challengeProgress = challengeProgress,
cherryType = cherryType,
gaugeStep = gaugeStep,
modifier = Modifier
.fillMaxWidth()
.padding(horizontal = 18.dp)
Expand Down Expand Up @@ -121,7 +122,7 @@ private fun CherryGrowthSection(
@Composable
private fun CherryGrowthProgressSection(
challengeProgress: Int,
cherryType: CherryType,
gaugeStep: Int,
modifier: Modifier = Modifier
) {
Column(
Expand All @@ -147,7 +148,7 @@ private fun CherryGrowthProgressSection(
}

CherrishGaugeBar(
currentStep = cherryType.step,
currentStep = gaugeStep,
gauges = CherrishGaugeType.entries.toImmutableList()

)
Expand Down Expand Up @@ -179,6 +180,7 @@ private fun ChallengeMissionProgressCherrygrowthPreview() {
}
ChallengeMissionProgressCherrygrowth(
cherryType = type,
gaugeStep = 0,
remainingGuideText = remainingGuide,
challengeProgress = progress
)
Expand Down
2 changes: 2 additions & 0 deletions ...cherrish/android/presentation/challenge/missionprogress/ChallengeMissionProgressScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ private fun ChallengeMissionprogressScreen(
item {
ChallengeMissionProgressCherrygrowth(
cherryType = uiState.cherryType,
gaugeStep = uiState.gaugeStep,
remainingGuideText = uiState.remainingGuideText,
challengeProgress = uiState.progressPercentage
)
Expand Down Expand Up @@ -162,6 +163,7 @@ private fun ChallengeMissionprogressScreenPreview() {
challengeName = "ํ”ผ๋ถ€ ์ปจ๋””์…˜ ์ฑŒ๋ฆฐ์ง€",
currentDay = 3,
cherryType = CherryType.BBANGBBANG,
gaugeStep = 0,
remainingCount = 3,
progressPercentage = 25,
remainingGuideText = "์ฒด๋ฆฌ๊ฐ€ ํฌ๋ ค๋ฉด 3๊ฐœ์˜ ๋ฏธ์…˜์„ ์ˆ˜ํ–‰ํ•ด์•ผ ํ•ด์š”!",
Expand Down
1 change: 1 addition & 0 deletions ...herrish/android/presentation/challenge/missionprogress/ChallengeMissionProgressUiState.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ data class ChallengeMissionProgressUiState(
val challengeId: Long,
val challengeName: String,
val currentDay: Int,
val gaugeStep: Int,
val cherryType: CherryType,
val remainingCount: Int,
val progressPercentage: Int,
Expand Down
22 changes: 15 additions & 7 deletions ...rrish/android/presentation/challenge/missionprogress/ChallengeMissionProgressViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,26 +98,34 @@ class ChallengeMissionProgressViewModel @Inject constructor(
}

private fun ChallengeMissionProgressResponseModel.toUiState(): ChallengeMissionProgressUiState {
val cherryType = CherryType.entries.first { it.step == cherryLevel }
val gaugeStep = cherryLevel.coerceIn(0, 4)

val stepForCherry = when (cherryLevel) {
0, 1 -> 1
else -> cherryLevel
}

val cherryType = CherryType.entries.firstOrNull { it.step == stepForCherry }
?: CherryType.MONGRONG

Comment on lines +101 to +110
Copy link

@coderabbitai coderabbitai bot Jan 22, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

โš ๏ธ Potential issue | ๐ŸŸ  Major

๊ฒŒ์ด์ง€ ๋‹จ๊ณ„์™€ ์ฒด๋ฆฌ ํƒ€์ž… ๊ณ„์‚ฐ์ด ์„œ๋กœ ๋ถˆ์ผ์น˜ํ•  ์ˆ˜ ์žˆ์Šต๋‹ˆ๋‹ค.

gaugeStep๋Š” ํด๋žจํ”„๋˜์ง€๋งŒ stepForCherry๋Š” ์›๋ณธ cherryLevel์„ ์‚ฌ์šฉํ•ฉ๋‹ˆ๋‹ค. ๋ฒ”์œ„๋ฅผ ๋ฒ—์–ด๋‚œ ๊ฐ’์ด ์˜ค๋ฉด ๊ฒŒ์ด์ง€๋Š” ์ตœ๋Œ€์ธ๋ฐ ์ฒด๋ฆฌ ํƒ€์ž…์€ ๊ธฐ๋ณธ๊ฐ’(MONGRONG)์œผ๋กœ ๋–จ์–ด์ ธ UI๊ฐ€ ์—‡๊ฐˆ๋ฆด ์ˆ˜ ์žˆ์–ด์š”. ๋™์ผํ•œ ๊ธฐ์ค€(ํด๋žจํ”„๋œ ๊ฐ’)์œผ๋กœ ์ •๋ ฌํ•˜๋Š” ํŽธ์ด ์•ˆ์ „ํ•ฉ๋‹ˆ๋‹ค.

๐Ÿ› ๏ธ ์ œ์•ˆ ์ˆ˜์ • 
-    val gaugeStep = cherryLevel.coerceIn(0, 4)
-
-    val stepForCherry = when (cherryLevel) {
+    val gaugeStep = cherryLevel.coerceIn(0, 4)
+
+    val stepForCherry = when (gaugeStep) {
         0, 1 -> 1
-        else -> cherryLevel
+        else -> gaugeStep
     }
๐Ÿค– Prompt for AI Agents 
In
`@app/src/main/java/com/cherrish/android/presentation/challenge/missionprogress/ChallengeMissionProgressViewModel.kt`
around lines 101 - 110, The bug is that stepForCherry uses the raw cherryLevel
while gaugeStep is clamped, causing mismatched UI; change stepForCherry to base
itself on the clamped gaugeStep (use gaugeStep instead of cherryLevel) so both
gaugeStep and CherryType lookup (CherryType.entries.firstOrNull { it.step ==
stepForCherry } ?: CherryType.MONGRONG) use the same bounded value; ensure the
comparison uses the same numeric range and types as gaugeStep to avoid falling
back to MONGRONG unexpectedly.

val isMaxLevel = cherryType == CherryType.KKUKKU

val remainingText = if (isMaxLevel) {
"์ฑŒ๋ฆฐ์ง€ ์™„๋ฃŒ๊นŒ์ง€ ${remainingRoutinesToNextLevel}๊ฐœ์˜ ๋ฏธ์…˜์„ ์ˆ˜ํ–‰ํ•ด์•ผ ํ•ด์š”!"
} else {
"์ฒด๋ฆฌ๊ฐ€ ํฌ๋ ค๋ฉด ${remainingRoutinesToNextLevel}๊ฐœ์˜ ๋ฏธ์…˜์„ ์ˆ˜ํ–‰ํ•ด์•ผ ํ•ด์š”!"
}
val completeButtonText = if (isMaxLevel) {
"์ฑŒ๋ฆฐ์ง€ ์™„๋ฃŒํ•˜๊ธฐ"
} else {
"์˜ค๋Š˜ ๋ฏธ์…˜ ์ข…๋ฃŒํ•˜๊ธฐ"
}

val completeButtonText = if (isMaxLevel) "์ฑŒ๋ฆฐ์ง€ ์ข…๋ฃŒํ•˜๊ธฐ" else "์˜ค๋Š˜ ๋ฏธ์…˜ ์ข…๋ฃŒํ•˜๊ธฐ"

return ChallengeMissionProgressUiState(
challengeId = challengeId,
challengeName = title,
currentDay = currentDay,
progressPercentage = progressPercentage,
cherryType = cherryType,
gaugeStep = gaugeStep,
remainingCount = remainingRoutinesToNextLevel,
progressPercentage = progressPercentage,
routines = todayRoutines.map { routine ->
ChallengeRoutineUiModel(
routineId = routine.routineId,
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/com/cherrish/android/presentation/challenge/start/ChallengeStartScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ private fun ChallengeStartScreen(
.fillMaxSize()
.background(CherrishTheme.colors.gray0)
.padding(paddingValues)
.padding(horizontal = 17.dp)

.padding(horizontal = 17.dp),
horizontalAlignment = Alignment.CenterHorizontally
) {
Spacer(modifier = Modifier.weight(98f))

Expand Down
1 change: 1 addition & 0 deletions app/src/main/java/com/cherrish/android/presentation/home/HomeScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ fun HomeRoute(
is HomeSideEffect.NavigateToChallenge -> {
navigateToChallenge()
}

is HomeSideEffect.NavigateToCalendar -> {
navigateToCalendar(sideEffect.date)
}
Expand Down
12 changes: 8 additions & 4 deletions app/src/main/java/com/cherrish/android/presentation/home/HomeViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,22 +40,26 @@ class HomeViewModel @Inject constructor(
_uiState.update { UiState.Loading }

homeRepository.getMainDashboard().onSuccess { response ->
val level = response.cherryLevel
val safeIndex = level.coerceIn(
1,
CherrishGaugeType.entries.lastIndex
)
_uiState.update {
UiState.Success(
HomeUiState(
currentStep = response.cherryLevel,
currentStep = level,
gauges = CherrishGaugeType.entries.toImmutableList(),
challengeRate = response.challengeRate,
challengeName = response.challengeName,
todayDate = response.toTodayDateString(),
plans = response.recentProcedures.toImmutableList(),
upcomingPlans = response.upcomingProcedures.toImmutableList(),
selectedIndex = (response.cherryLevel - 1)
.coerceIn(0, CherrishGaugeType.entries.size - 1)
selectedIndex = safeIndex
)
Comment on lines +43 to 59
Copy link

@coderabbitai coderabbitai bot Jan 22, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

โš ๏ธ Potential issue | ๐ŸŸ  Major

LEVEL0 ํฌํ•จ ์‹œ ์ƒํƒœ ๋ถˆ์ผ์น˜ ๊ฐ€๋Šฅ์„ฑ ์žˆ์Šต๋‹ˆ๋‹ค.

ํ˜„์žฌ safeIndex๊ฐ€ ์ตœ์†Œ 1๋กœ ๊ณ ์ •๋˜์–ด level=0์ผ ๋•Œ selectedIndex๊ฐ€ 1๋กœ ์น˜์šฐ์น˜๊ณ , currentStep์€ 0์œผ๋กœ ๋‚จ์•„ UI ์ƒํƒœ๊ฐ€ ์–ด๊ธ‹๋‚  ์ˆ˜ ์žˆ์Šต๋‹ˆ๋‹ค. ๋‘˜ ๋‹ค ๊ฐ™์€ ์•ˆ์ „ ๋ฒ”์œ„๋ฅผ ๊ณต์œ ํ•˜๋„๋ก ์ •๋ฆฌํ•˜๋Š” ๊ฒŒ ์•ˆ์ „ํ•ฉ๋‹ˆ๋‹ค.

๐Ÿ”ง ์ œ์•ˆ ์ˆ˜์ • 
-                val level = response.cherryLevel
-                val safeIndex = level.coerceIn(
-                    1,
-                    CherrishGaugeType.entries.lastIndex
-                )
+                val level = response.cherryLevel
+                val safeLevel = level.coerceIn(
+                    0,
+                    CherrishGaugeType.entries.lastIndex
+                )
 ...
-                            currentStep = level,
+                            currentStep = safeLevel,
 ...
-                            selectedIndex = safeIndex
+                            selectedIndex = safeLevel
๐Ÿค– Prompt for AI Agents 
In `@app/src/main/java/com/cherrish/android/presentation/home/HomeViewModel.kt`
around lines 43 - 59, The current code clamps selectedIndex to at least 1
(safeIndex) but leaves currentStep using the raw response.cherryLevel, causing
UI mismatch when level == 0; inside the _uiState.update ->
UiState.Success(HomeUiState(...)) block, compute a single clamped value (e.g.,
safeLevel) from response.cherryLevel using coerceIn(1,
CherrishGaugeType.entries.lastIndex) and use that same safeLevel for both
currentStep and selectedIndex (replace references to level/currentStep or
safeIndex accordingly) so both fields share the identical safe range.

)
}
}.onLogFailure {}
}.onLogFailure { }
}
}

Expand Down
14 changes: 7 additions & 7 deletions app/src/main/java/com/cherrish/android/presentation/home/component/ChallengeSection.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,17 @@ fun ChallengeSection(
gauges: ImmutableList<CherrishGaugeType>,
modifier: Modifier = Modifier,
currentStep: Int = 0,
@DrawableRes imageRes: Int? = R.drawable.img_challenge_lv2,
@DrawableRes imageRes: Int? = R.drawable.img_challenge_lv1,
onChallengeStartClick: () -> Unit = {},
challengeName: String? = "์›ฐ๋‹ˆ์Šค โ€ข ๋งˆ์Œ์ฑ™๊น€",
challengeRate: Int = 0
) {
val hasChallenge = !challengeName.isNullOrBlank()

Box(
modifier = modifier.fillMaxWidth()
) {
if (currentStep != 0 && imageRes != null) {
if (hasChallenge && imageRes != null) {
Image(
painter = painterResource(id = imageRes),
contentDescription = null,
Expand All @@ -71,9 +73,9 @@ fun ChallengeSection(

Spacer(modifier = Modifier.height(10.dp))

if (currentStep == 0) {
if (!hasChallenge) {
NoChallenge(
currentStep = currentStep,
currentStep = 0,
gauges = gauges,
onChallengeStartClick = onChallengeStartClick
)
Expand All @@ -97,8 +99,6 @@ private fun Challenge(
challengeRate: Int,
modifier: Modifier = Modifier
) {
val safeStep = currentStep.coerceIn(1, gauges.size)

Column(
modifier = modifier
.fillMaxWidth()
Expand Down Expand Up @@ -139,7 +139,7 @@ private fun Challenge(
Spacer(modifier = Modifier.height(16.dp))

CherrishGaugeBar(
currentStep = safeStep,
currentStep = currentStep,
gauges = gauges
)
Comment on lines 141 to 144
Copy link

@coderabbitai coderabbitai bot Jan 22, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

โš ๏ธ Potential issue | ๐Ÿ”ด Critical

๐Ÿงฉ Analysis chain

๐Ÿ Script executed:

# Find CherrishGaugeBar implementation
fd -e kt | xargs grep -l "fun CherrishGaugeBar" | head -5

Repository: TEAM-Cherrish/Cherrish-Android

Length of output: 169

๐Ÿ Script executed:

# Find ChallengeSection.kt and examine the context around lines 141-144
fd "ChallengeSection.kt" -e kt

Repository: TEAM-Cherrish/Cherrish-Android

Length of output: 160

๐Ÿ Script executed:

# Search for safeStep references to understand what was removed
rg "safeStep" -B 2 -A 2

Repository: TEAM-Cherrish/Cherrish-Android

Length of output: 2405

๐Ÿ Script executed:

# Examine CherrishGaugeBar implementation
cat -n app/src/main/java/com/cherrish/android/core/designsystem/component/gaugebar/CherrishGaugeBar.kt

Repository: TEAM-Cherrish/Cherrish-Android

Length of output: 6359

๐Ÿ Script executed:

# Examine Challenge composable around lines 141-144 in ChallengeSection.kt
sed -n '120,155p' app/src/main/java/com/cherrish/android/presentation/home/component/ChallengeSection.kt | cat -n

Repository: TEAM-Cherrish/Cherrish-Android

Length of output: 1163

๐Ÿ Script executed:

# Search for Challenge composable function signature and currentStep initialization
sed -n '1,100p' app/src/main/java/com/cherrish/android/presentation/home/component/ChallengeSection.kt | cat -n

Repository: TEAM-Cherrish/Cherrish-Android

Length of output: 4374

๐Ÿ Script executed:

# Check CherrishGaugeType to understand step values
fd "CherrishGaugeType" -e kt | head -3

Repository: TEAM-Cherrish/Cherrish-Android

Length of output: 156

๐Ÿ Script executed:

# Look at ChallengeSection Challenge composable more thoroughly
sed -n '94,155p' app/src/main/java/com/cherrish/android/presentation/home/component/ChallengeSection.kt | cat -n

Repository: TEAM-Cherrish/Cherrish-Android

Length of output: 2119

๐Ÿ Script executed:

# Search for how currentStep is derived in the call hierarchy
rg "Challenge\(" -B 3 -A 3 app/src/main/java/com/cherrish/android/presentation/home/component/ChallengeSection.kt

Repository: TEAM-Cherrish/Cherrish-Android

Length of output: 1018

๐Ÿ Script executed:

# Examine CherrishGaugeType enum
cat -n app/src/main/java/com/cherrish/android/presentation/home/type/CherrishGaugeType.kt

Repository: TEAM-Cherrish/Cherrish-Android

Length of output: 662

๐Ÿ Script executed:

# Check ChallengeSection function signature and default values for currentStep
sed -n '38,50p' app/src/main/java/com/cherrish/android/presentation/home/component/ChallengeSection.kt | cat -n

Repository: TEAM-Cherrish/Cherrish-Android

Length of output: 551

๐Ÿ Script executed:

# Search for usages of ChallengeSection to see how currentStep is passed
rg "ChallengeSection\(" -B 2 -A 5 --type kt | head -50

Repository: TEAM-Cherrish/Cherrish-Android

Length of output: 100

๐Ÿ Script executed:

# Check how currentStep values are generated/passed from ViewModels
rg "currentStep" --type-add 'kt:*.kt' -B 2 -A 2 app/src/main/java/com/cherrish/android/presentation/home | head -80

Repository: TEAM-Cherrish/Cherrish-Android

Length of output: 7865

๐Ÿ Script executed:

# Look for usages of ChallengeSection in the codebase
fd -e kt | xargs grep -l "ChallengeSection" | head -5

Repository: TEAM-Cherrish/Cherrish-Android

Length of output: 231

๐Ÿ Script executed:

# Examine HomeViewModel to see how currentStep (level) is set
sed -n '1,80p' app/src/main/java/com/cherrish/android/presentation/home/HomeViewModel.kt | cat -n

Repository: TEAM-Cherrish/Cherrish-Android

Length of output: 3564

๐Ÿ Script executed:

# Check the complete flow - HomeScreen usage of currentStep
sed -n '1,120p' app/src/main/java/com/cherrish/android/presentation/home/HomeScreen.kt | cat -n

Repository: TEAM-Cherrish/Cherrish-Android

Length of output: 5062

๐Ÿ Script executed:

# Check the git history or PR context - look for recent changes around safeStep
rg "safeStep" -B 5 -A 5 app/src/main/java/com/cherrish/android/core/designsystem/component/gaugebar/CherrishGaugeBar.kt

Repository: TEAM-Cherrish/Cherrish-Android

Length of output: 56

๐Ÿ Script executed:

# Verify what values currentStep can actually receive at runtime
# Check HomeViewModel more carefully - does response.cherryLevel have validation?
cat -n app/src/main/java/com/cherrish/android/presentation/home/HomeViewModel.kt | grep -A 15 "loadHomeData"

Repository: TEAM-Cherrish/Cherrish-Android

Length of output: 921

๐Ÿ Script executed:

# Check if there's any validation at the data layer for cherryLevel
fd -e kt | xargs grep -l "cherryLevel\|cherryLevel" | head -5

Repository: TEAM-Cherrish/Cherrish-Android

Length of output: 536

๐Ÿ Script executed:

# Check the HomeResponseModel and HomeResponseDto for cherryLevel definition/validation
cat -n app/src/main/java/com/cherrish/android/data/model/HomeResponseModel.kt

Repository: TEAM-Cherrish/Cherrish-Android

Length of output: 2592

๐Ÿ Script executed:

# Also check the DTO
cat -n app/src/main/java/com/cherrish/android/data/remote/dto/response/HomeResponseDto.kt

Repository: TEAM-Cherrish/Cherrish-Android

Length of output: 1466

๐Ÿ Script executed:

# Final verification: Check if there's any validation in Challenge composable for currentStep
sed -n '94,110p' app/src/main/java/com/cherrish/android/presentation/home/component/ChallengeSection.kt | cat -n

Repository: TEAM-Cherrish/Cherrish-Android

Length of output: 653

currentStep ๊ฒฝ๊ณ„ ๊ฒ€์ฆ ๋ถ€์กฑ์œผ๋กœ ์ธํ•œ ๋Ÿฐํƒ€์ž„ ์˜ค๋ฅ˜ ๊ฐ€๋Šฅ์„ฑ

HomeViewModel์—์„œ currentStep์ด ๋ฐฑ์—”๋“œ ์‘๋‹ต๊ฐ’(response.cherryLevel)์œผ๋กœ ์ง์ ‘ ์„ค์ •๋˜๋ฉฐ, ๊ฒฝ๊ณ„ ๊ฒ€์ฆ ์—†์ด ChallengeSection โ†’ Challenge โ†’ CherrishGaugeBar๋กœ ์ „๋‹ฌ๋ฉ๋‹ˆ๋‹ค. CherrishGaugeBar์˜ isActive ๋กœ์ง(line 54: gauge.step <= currentStep)์ด ๊ฒฝ๊ณ„๊ฐ’์„ ์ฒ˜๋ฆฌํ•˜์ง€ ์•Š์œผ๋ฉด:

  • currentStep โ‰ค 0: ๋ชจ๋“  ๊ฒŒ์ด์ง€๊ฐ€ ๋น„ํ™œ์„ฑ
  • currentStep > 4: ๋ชจ๋“  ๊ฒŒ์ด์ง€๊ฐ€ ํ™œ์„ฑ (์˜๋„ํ•˜์ง€ ์•Š์€ ์ƒํƒœ)

HomeViewModel ๋ผ์ธ 44-46์—์„œ safeIndex๋Š” ๊ฒฝ๊ณ„ ์ฒ˜๋ฆฌ๋˜์ง€๋งŒ currentStep์€ ์ฒ˜๋ฆฌ๋˜์ง€ ์•Š์Šต๋‹ˆ๋‹ค. StepProgressBar.kt์™€ ์œ ์‚ฌํ•˜๊ฒŒ currentStep.coerceIn(1, gauges.size) ๋˜๋Š” ๋™๋“ฑํ•œ ๊ฒ€์ฆ์ด ํ•„์š”ํ•ฉ๋‹ˆ๋‹ค.

๐Ÿค– Prompt for AI Agents 
In
`@app/src/main/java/com/cherrish/android/presentation/home/component/ChallengeSection.kt`
around lines 141 - 144, The currentStep coming from HomeViewModel (set from
response.cherryLevel) is not clamped and can produce incorrect states in
CherrishGaugeBar (its isActive logic uses gauge.step <= currentStep); fix this
by bounding currentStep before passing it into ChallengeSection/CherrishGaugeBar
(e.g., use currentStep.coerceIn(1, gauges.size) or equivalent) โ€” update the code
that sets or forwards currentStep (HomeViewModel assignment and the
ChallengeSection invocation where currentStep is passed) so the value is
validated like safeIndex/StepProgressBar does.

}
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/com/cherrish/android/presentation/home/type/CherrishGaugeType.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import com.cherrish.android.R

enum class CherrishGaugeType(
val step: Int,
@DrawableRes val image: Int?
@DrawableRes val image: Int
) {
LEVEL0(step = 0, image = null),
LEVEL0(step = 0, image = R.drawable.img_home_lv1),
LEVEL1(step = 1, image = R.drawable.img_home_lv1),
LEVEL2(step = 2, image = R.drawable.img_home_lv2),
LEVEL3(step = 3, image = R.drawable.img_home_lv3),
Expand Down
1 change: 1 addition & 0 deletions app/src/main/java/com/cherrish/android/presentation/mypage/MyPageScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ private fun MyPageScreen(
Text(
text = "์•—! ์•„์ง ์ค€๋น„์ค‘์ด์—์š”.",
color = CherrishTheme.colors.gray600,
style = CherrishTheme.typography.body1M14,
modifier = Modifier.padding(top = 20.dp)
)

Expand Down
5 changes: 4 additions & 1 deletion app/src/main/java/com/cherrish/android/presentation/mypage/component/MyPageHeader.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
Expand Down Expand Up @@ -33,7 +34,9 @@ fun MyPageHeader(
Image(
painter = painterResource(id = profileIcon),
contentDescription = null,
modifier = Modifier.clip(CircleShape)
modifier = Modifier
.size(48.dp)
.clip(CircleShape)
)

Column(
Expand Down
11 changes: 6 additions & 5 deletions app/src/main/java/com/cherrish/android/presentation/splash/SplashViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,12 @@ class SplashViewModel @Inject constructor(
viewModelScope.launch {
val id = tokenManager.getId()
_sideEffect.emit(
if (id != null) {
SplashSideEffect.NavigateToHome
} else {
SplashSideEffect.NavigateToOnboarding
}
SplashSideEffect.NavigateToOnboarding
// if (id != null) {
// SplashSideEffect.NavigateToHome
// } else {
// SplashSideEffect.NavigateToOnboarding
// }
)
}
}
Expand Down