Skip to content

[FEAT/#141] Lottie 파일 적용 #142

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

Closed
hyeminililo wants to merge 12 commits into from
Closed

[FEAT/#141] Lottie 파일 적용 #142

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
b05d829
[ADD/#141] Lotti 파일 넣기
hyeminililo Jan 22, 2026
6e7074e
[FEAT/#141] Lottie 파일 적용
hyeminililo Jan 22, 2026
b7425b9
[FIX/#141] 로띠 오류 해결
sohee6989 Jan 22, 2026
a168ab7
[FIX/#135] challenge_start 챌린지 버튼 변경
hyeminililo Jan 21, 2026
6a3f3e0
[FIX/#135] challenge_loading qa 수정
hyeminililo Jan 22, 2026
cdff62f
[FIX/#135] view_challenge_mission_selected qa 수정
hyeminililo Jan 22, 2026
e9499e6
[FIX/#135] view_challenge_mission_progress qa 수정
hyeminililo Jan 22, 2026
4cef0d7
[FIX/#141] completeButton text 변경
hyeminililo Jan 22, 2026
d91c606
[FIX/#141] 챌린지 로직 관련 변경
hyeminililo Jan 22, 2026
b3432df
[CHORE/#141] ktLint 실행
hyeminililo Jan 22, 2026
6834f32
[CHORE/#141] 불필요한 코드 정리
hyeminililo Jan 22, 2026
a67ef69
Merge branch 'develop' into feat/#141-mypage-lotti
hyeminililo 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
34 changes: 26 additions & 8 deletions ...c/main/java/com/cherrish/android/presentation/challenge/loading/ChallengeLoadingScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,34 @@
package com.cherrish.android.presentation.challenge.loading

import androidx.compose.foundation.Image
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.aspectRatio
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.navigationBarsPadding
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.material3.Icon
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.getValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.vector.ImageVector
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.vectorResource
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import androidx.hilt.navigation.compose.hiltViewModel
import com.airbnb.lottie.compose.LottieAnimation
import com.airbnb.lottie.compose.LottieCompositionSpec
import com.airbnb.lottie.compose.LottieConstants
import com.airbnb.lottie.compose.animateLottieCompositionAsState
import com.airbnb.lottie.compose.rememberLottieComposition
import com.cherrish.android.R
import com.cherrish.android.core.common.extension.collectLatestSideEffect
import com.cherrish.android.core.common.extension.noRippleClickable
Expand Down Expand Up @@ -59,6 +64,14 @@ private fun ChallengeLoadingScreen(
onClick: () -> Unit,
modifier: Modifier = Modifier
) {
val composition by rememberLottieComposition(
LottieCompositionSpec.RawRes(R.raw.lt_challenge_loading)
)
val progress by animateLottieCompositionAsState(
composition,
iterations = LottieConstants.IterateForever,
isPlaying = true
)
Column(
modifier = modifier
.fillMaxSize()
Expand Down Expand Up @@ -104,12 +117,17 @@ private fun ChallengeLoadingScreen(
style = CherrishTheme.typography.title1SB18
)

Spacer(modifier = Modifier.height(60.dp))
Spacer(modifier = Modifier.height(80.dp))

Image(
painter = painterResource(id = R.drawable.img_challenge_loading),
contentDescription = null,
modifier = Modifier.size(150.dp)
LottieAnimation(
composition = composition,
progress = { progress },
modifier = Modifier
.fillMaxWidth()
.padding(horizontal = 105.dp)
.aspectRatio(130f / 154f)
.align(Alignment.CenterHorizontally)
.noRippleClickable(onClick = onClick)
)

Spacer(modifier = Modifier.height(80.dp))
Expand Down
63 changes: 38 additions & 25 deletions app/src/main/java/com/cherrish/android/presentation/splash/SplashScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,30 +1,36 @@
package com.cherrish.android.presentation.splash

import androidx.compose.foundation.Image
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.aspectRatio
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.getValue
import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.drawBehind
import androidx.compose.ui.geometry.Offset
import androidx.compose.ui.graphics.Brush
import androidx.compose.ui.graphics.vector.ImageVector
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.vectorResource
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import androidx.hilt.navigation.compose.hiltViewModel
import androidx.lifecycle.Lifecycle
import androidx.lifecycle.compose.LifecycleEventEffect
import com.airbnb.lottie.compose.LottieAnimation
import com.airbnb.lottie.compose.LottieCompositionSpec
import com.airbnb.lottie.compose.LottieConstants
import com.airbnb.lottie.compose.animateLottieCompositionAsState
import com.airbnb.lottie.compose.rememberLottieComposition
import com.cherrish.android.R
import com.cherrish.android.core.common.extension.collectLatestSideEffect
import com.cherrish.android.core.designsystem.theme.CherrishTheme
import kotlinx.coroutines.delay
import kotlinx.coroutines.launch

@Composable
fun SplashRoute(
Expand All @@ -33,20 +39,19 @@ fun SplashRoute(
paddingValues: PaddingValues,
viewModel: SplashViewModel = hiltViewModel()
) {
LaunchedEffect(Unit) {
viewModel.isAutoLoginCheck()
val scope = rememberCoroutineScope()

LifecycleEventEffect(Lifecycle.Event.ON_START) {
scope.launch {
delay(3000)
viewModel.isAutoLoginCheck()
}
}
Comment on lines +44 to 49
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

ON_START 이벤트 사용 시 중복 실행 가능성이 있습니다.

Lifecycle.Event.ON_START는 앱이 백그라운드에서 포그라운드로 돌아올 때마다 다시 트리거됩니다. 사용자가 스플래시 화면에서 다른 앱으로 전환했다가 돌아오면 3초 딜레이 후 네비게이션이 다시 시도될 수 있습니다.

또한 rememberCoroutineScope로 시작된 코루틴은 Composable이 dispose되어도 자동으로 취소되지 않을 수 있어, 화면 전환 후에도 네비게이션 로직이 실행될 위험이 있습니다.

🔧 LaunchedEffect 사용 권장 
-    val scope = rememberCoroutineScope()
-
-    LifecycleEventEffect(Lifecycle.Event.ON_START) {
-        scope.launch {
-            delay(3000)
-            viewModel.isAutoLoginCheck()
-        }
-    }
+    LaunchedEffect(Unit) {
+        delay(3000)
+        viewModel.isAutoLoginCheck()
+    }

LaunchedEffect(Unit)은 최초 composition 시 한 번만 실행되며, recomposition이나 lifecycle 변경에 영향받지 않습니다. 또한 Composable이 dispose될 때 자동으로 취소됩니다.

🤖 Prompt for AI Agents 
In `@app/src/main/java/com/cherrish/android/presentation/splash/SplashScreen.kt`
around lines 44 - 49, The code uses
LifecycleEventEffect(Lifecycle.Event.ON_START) with rememberCoroutineScope and
scope.launch+delay(3000) which can re-run when the app returns to foreground and
may continue after the Composable is disposed; replace this with
LaunchedEffect(Unit) and move the delay(3000) and viewModel.isAutoLoginCheck()
into the LaunchedEffect so it runs only once on initial composition and is
automatically cancelled when the Composable is disposed; specifically replace
the block containing LifecycleEventEffect, Lifecycle.Event.ON_START,
rememberCoroutineScope/ scope.launch and delay with a LaunchedEffect(Unit) {
delay(3000); viewModel.isAutoLoginCheck() } to fix duplicate navigation and
cancellation issues.


viewModel.sideEffect.collectLatestSideEffect { sideEffect ->
delay(3000)

when (sideEffect) {
SplashSideEffect.NavigateToOnboarding -> {
navigateToOnboarding()
}
SplashSideEffect.NavigateToHome -> {
navigateToHome()
}
SplashSideEffect.NavigateToOnboarding -> navigateToOnboarding()
SplashSideEffect.NavigateToHome -> navigateToHome()
}
}

Expand All @@ -62,6 +67,15 @@ private fun SplashScreen(
) {
val gradationColors = listOf(CherrishTheme.colors.gradation, CherrishTheme.colors.gradation2)

val composition by rememberLottieComposition(
LottieCompositionSpec.RawRes(R.raw.lt_challenge_loading)
)
val progress by animateLottieCompositionAsState(
composition,
iterations = LottieConstants.IterateForever,
isPlaying = true
)

Column(
modifier = modifier
.fillMaxSize()
Expand All @@ -77,19 +91,18 @@ private fun SplashScreen(
) {
Spacer(modifier = Modifier.weight(283f))

Image(
painter = painterResource(id = R.drawable.ic_app_logo),
contentDescription = null,
modifier = Modifier.size(width = 114.dp, height = 100.dp)
LottieAnimation(
composition = composition,
progress = { progress },
modifier = Modifier
.fillMaxWidth()
.padding(horizontal = 105.dp)
.aspectRatio(130f / 154f)
.align(Alignment.CenterHorizontally)
)

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

Image(
imageVector = ImageVector.vectorResource(id = R.drawable.ic_app_logo_title),
contentDescription = null
)

Spacer(modifier = Modifier.weight(298f))
}
}
Expand Down
12 changes: 7 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,13 @@ class SplashViewModel @Inject constructor(
viewModelScope.launch {
val id = tokenManager.getId()
_sideEffect.emit(
if (id != null) {
SplashSideEffect.NavigateToHome
} else {
SplashSideEffect.NavigateToOnboarding
}
// if (id != null) {
// SplashSideEffect.NavigateToHome
// } else {
// SplashSideEffect.NavigateToOnboarding
// }

SplashSideEffect.NavigateToOnboarding
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

주석 처리된 코드와 미사용 변수가 있습니다.

tokenManager.getId() 호출 결과(id)가 더 이상 사용되지 않으며, 자동 로그인 분기 로직이 주석 처리되어 항상 NavigateToOnboarding만 emit됩니다.

이 PR의 목적은 Lottie 애니메이션 적용인데, 자동 로그인 로직 변경은 범위를 벗어난 것으로 보입니다. 의도된 변경이라면 주석 처리된 코드를 완전히 제거하고 미사용 id 변수도 삭제해 주세요. 임시 디버깅용이라면 별도 이슈로 관리하는 것이 좋겠습니다.

🔧 주석 및 미사용 코드 제거 제안 
     fun isAutoLoginCheck() {
         viewModelScope.launch {
-            val id = tokenManager.getId()
             _sideEffect.emit(
-//                if (id != null) {
-//                    SplashSideEffect.NavigateToHome
-//                } else {
-//                    SplashSideEffect.NavigateToOnboarding
-//                }
-
                 SplashSideEffect.NavigateToOnboarding
             )
         }
     }

또는 자동 로그인 로직이 필요하다면:

     fun isAutoLoginCheck() {
         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
+                }
             )
         }
     }
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
val id = tokenManager.getId()
_sideEffect.emit(
if (id != null) {
SplashSideEffect.NavigateToHome
} else {
SplashSideEffect.NavigateToOnboarding
}
// if (id != null) {
// SplashSideEffect.NavigateToHome
// } else {
// SplashSideEffect.NavigateToOnboarding
// }
SplashSideEffect.NavigateToOnboarding
_sideEffect.emit(
SplashSideEffect.NavigateToOnboarding
)
Suggested change
val id = tokenManager.getId()
_sideEffect.emit(
if (id != null) {
SplashSideEffect.NavigateToHome
} else {
SplashSideEffect.NavigateToOnboarding
}
// if (id != null) {
// SplashSideEffect.NavigateToHome
// } else {
// SplashSideEffect.NavigateToOnboarding
// }
SplashSideEffect.NavigateToOnboarding
val id = tokenManager.getId()
_sideEffect.emit(
if (id != null) {
SplashSideEffect.NavigateToHome
} else {
SplashSideEffect.NavigateToOnboarding
}
)
🤖 Prompt for AI Agents 
In
`@app/src/main/java/com/cherrish/android/presentation/splash/SplashViewModel.kt`
around lines 22 - 30, The code calls tokenManager.getId() into a now-unused
variable id and leaves a commented-out auto-login branch before always emitting
SplashSideEffect.NavigateToOnboarding; either remove the dead code or restore
the branch: delete the commented if/else and the unused id variable (or
re-enable the conditional that emits SplashSideEffect.NavigateToHome when id !=
null) in SplashViewModel where _sideEffect.emit is called so there is no
leftover commented logic or unused tokenManager.getId() call.

)
}
}
Expand Down
Loading