Skip to content

Commit

Permalink
Fix : 와인 취향 분석 스파클링 와인이 아니라도 탄산감이 표시되는 버그 수정
Browse files Browse the repository at this point in the history
  • Loading branch information
DongChyeon committed Oct 11, 2024
1 parent 7407483 commit 4ade1d1
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ import com.teamwiney.analysis.component.pagercontent.WineTasteContent
import com.teamwiney.analysis.component.pagercontent.WineTypeContent
import com.teamwiney.analysis.component.pagercontent.WineVarietyContent
import com.teamwiney.core.common.WineyAppState
import com.teamwiney.core.common.model.WineType
import com.teamwiney.core.design.R
import com.teamwiney.ui.components.TopBar
import com.teamwiney.ui.theme.WineyTheme
Expand Down Expand Up @@ -155,6 +156,7 @@ fun AnalysisResultScreen(
3 -> {
WineTasteContent(
progress = animatedProgress.value,
wineType = WineType.typeOf(analysisData.recommendWineType),
tastes = analysisData.taste
)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.unit.dp
import com.teamwiney.core.common.model.WineType
import com.teamwiney.data.network.model.response.Taste
import com.teamwiney.ui.components.HeightSpacer
import com.teamwiney.ui.components.RadarChart
Expand All @@ -27,6 +28,7 @@ import com.teamwiney.ui.theme.WineyTheme
@Composable
fun WineTasteContent(
progress: Float,
wineType: WineType,
tastes: Taste
) {
Column(
Expand Down Expand Up @@ -60,7 +62,7 @@ fun WineTasteContent(
data = listOf(
RadarData("당도", tastes.sweetness.toFloat()),
RadarData("여운", tastes.finish.toFloat()),
if (tastes.sparkling > 0) {
if (wineType == WineType.SPARKLING) {
RadarData("탄산감", tastes.sparkling.toFloat())
} else {
RadarData("알코올", tastes.alcohol.toFloat())
Expand Down

0 comments on commit 4ade1d1

Please sign in to comment.