[Feature/#875] fortune amulet TodayFortuneCard API #876
+169
−51
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| package org.sopt.official.domain.fortune.usecase | ||
|
|
||
| import org.sopt.official.domain.fortune.model.TodayFortuneCard | ||
| import org.sopt.official.domain.fortune.repository.FortuneRepository | ||
| import javax.inject.Inject | ||
|
|
||
| class GetTodayFortuneCardUseCase @Inject constructor( | ||
| private val fortuneRepository: FortuneRepository, | ||
| ) { | ||
| suspend operator fun invoke(): TodayFortuneCard = fortuneRepository.fetchTodayFortuneCard() | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| package org.sopt.official.feature.fortune.feature.fortuneAmulet | ||
|
|
||
| import androidx.compose.ui.graphics.Color | ||
|
|
||
| data class FortuneAmuletState( | ||
| val isLoading: Boolean = false, | ||
| val isFailure: Boolean = false, | ||
| val description: String = "", | ||
| val imageColor: Color = Color.White, | ||
| val imageUrl: String = "", | ||
| val name: String = "", | ||
| ) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| package org.sopt.official.feature.fortune.feature.fortuneAmulet | ||
|
|
||
| import androidx.compose.ui.graphics.Color | ||
| import androidx.lifecycle.ViewModel | ||
| import androidx.lifecycle.viewModelScope | ||
| import dagger.hilt.android.lifecycle.HiltViewModel | ||
| import kotlinx.coroutines.flow.MutableStateFlow | ||
| import kotlinx.coroutines.flow.StateFlow | ||
| import kotlinx.coroutines.flow.asStateFlow | ||
| import kotlinx.coroutines.flow.update | ||
| import kotlinx.coroutines.launch | ||
| import org.sopt.official.domain.fortune.usecase.GetTodayFortuneCardUseCase | ||
| import javax.inject.Inject | ||
|
|
||
| @HiltViewModel | ||
| internal class FortuneAmuletViewModel @Inject constructor( | ||
| getTodayFortuneCardUseCase: GetTodayFortuneCardUseCase, | ||
| ) : ViewModel() { | ||
| private val _state: MutableStateFlow<FortuneAmuletState> = MutableStateFlow(FortuneAmuletState()) | ||
| val state: StateFlow<FortuneAmuletState> = _state.asStateFlow() | ||
|
|
||
| init { | ||
| viewModelScope.launch { | ||
| runCatching { | ||
| _state.value = _state.value.copy(isLoading = true) | ||
| getTodayFortuneCardUseCase() | ||
| }.onSuccess { todayFortuneCard -> | ||
| _state.update { | ||
| it.copy( | ||
| description = todayFortuneCard.description, | ||
| imageColor = parseColor(todayFortuneCard.imageColorCode), | ||
| imageUrl = todayFortuneCard.imageUrl, | ||
| name = todayFortuneCard.name, | ||
| isLoading = false | ||
| ) | ||
| } | ||
| }.onFailure { | ||
| _state.value = _state.value.copy(isFailure = true) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private fun parseColor(colorCode: String): Color { | ||
| val color: Color = try { | ||
| Color(android.graphics.Color.parseColor(colorCode)) | ||
|
There was a problem hiding this comment. 오호 이건 생각을 못해본 방법이네요! |
||
| } catch (e: IllegalArgumentException) { | ||
| Color.White | ||
| } | ||
|
|
||
| return color | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -24,7 +24,6 @@ | |
| */ | ||
| package org.sopt.official.feature.fortune.feature.fortuneAmulet.navigation | ||
|
|
||
| import androidx.navigation.NavGraphBuilder | ||
| import androidx.navigation.compose.composable | ||
| import kotlinx.serialization.Serializable | ||
|
|
@@ -34,12 +33,10 @@ import org.sopt.official.feature.fortune.feature.fortuneAmulet.FortuneAmuletRout | |
| data object FortuneAmulet | ||
|
|
||
| fun NavGraphBuilder.fortuneAmuletNavGraph( | ||
| navigateToHome: () -> Unit, | ||
| ) { | ||
| composable<FortuneAmulet> { | ||
| FortuneAmuletRoute( | ||
| navigateToHome = navigateToHome | ||
| ) | ||
| } | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -29,7 +29,6 @@ import androidx.compose.foundation.background | |||||
| import androidx.compose.foundation.clickable | ||||||
| import androidx.compose.foundation.layout.Box | ||||||
| import androidx.compose.foundation.layout.Column | ||||||
| import androidx.compose.foundation.layout.Spacer | ||||||
| import androidx.compose.foundation.layout.fillMaxSize | ||||||
| import androidx.compose.foundation.layout.fillMaxWidth | ||||||
|
|
@@ -38,7 +37,7 @@ import androidx.compose.foundation.layout.padding | |||||
| import androidx.compose.foundation.shape.RoundedCornerShape | ||||||
| import androidx.compose.material3.Text | ||||||
| import androidx.compose.runtime.Composable | ||||||
| import androidx.compose.runtime.saveable.rememberSaveable | ||||||
| import androidx.compose.ui.Alignment | ||||||
| import androidx.compose.ui.Modifier | ||||||
| import androidx.compose.ui.draw.clip | ||||||
|
|
@@ -55,13 +54,11 @@ import java.util.Locale | |||||
|
|
||||||
| @Composable | ||||||
| internal fun HomeRoute( | ||||||
| navigateToFortuneDetail: (String) -> Unit, | ||||||
| ) { | ||||||
| val date = rememberSaveable { getTodayInfo() } | ||||||
|
There was a problem hiding this comment.
Suggested change
이건 어떤가요? There was a problem hiding this comment. 좋은거 같습니다! |
||||||
|
|
||||||
| HomeScreen( | ||||||
| date = date, | ||||||
| navigateToFortuneDetail = { | ||||||
| navigateToFortuneDetail(date) | ||||||
|
|
@@ -71,13 +68,11 @@ internal fun HomeRoute( | |||||
|
|
||||||
| @Composable | ||||||
| private fun HomeScreen( | ||||||
| date: String, | ||||||
| navigateToFortuneDetail: () -> Unit = {}, | ||||||
| ) { | ||||||
| Column( | ||||||
| modifier = Modifier | ||||||
| .fillMaxSize() | ||||||
| .background(SoptTheme.colors.background), | ||||||
| horizontalAlignment = Alignment.CenterHorizontally | ||||||
|
|
@@ -156,7 +151,6 @@ fun getTodayInfo(): String { | |||||
| fun HomeScreenPreview() { | ||||||
| SoptTheme { | ||||||
| HomeScreen( | ||||||
| date = getTodayInfo() | ||||||
| ) | ||||||
| } | ||||||
|
|
||||||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -34,12 +34,10 @@ import org.sopt.official.feature.fortune.feature.home.HomeRoute | |
| data object Home | ||
|
|
||
| fun NavGraphBuilder.homeNavGraph( | ||
| navigateToFortuneDetail: (String) -> Unit, | ||
| ) { | ||
| composable<Home> { | ||
| HomeRoute( | ||
| navigateToFortuneDetail = navigateToFortuneDetail | ||
| ) | ||
| } | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
단순히 데이터만 패스하는 경우엔 유즈케이스까진 필요 없어보여요 :)