From 9993b45660d167958ea7faebf93332c9cba80ae6 Mon Sep 17 00:00:00 2001 From: Dongmin Date: Mon, 23 Sep 2024 14:21:37 +0900 Subject: [PATCH] feature #866: feat FortuneTopBar preview --- .../fortuneAmulet/FortuneAmuletScreen.kt | 31 +++++++------------ 1 file changed, 11 insertions(+), 20 deletions(-) diff --git a/feature/fortune/src/main/java/org/sopt/official/feature/fortune/feature/fortuneAmulet/FortuneAmuletScreen.kt b/feature/fortune/src/main/java/org/sopt/official/feature/fortune/feature/fortuneAmulet/FortuneAmuletScreen.kt index 56f1e1747..cc605aa5d 100644 --- a/feature/fortune/src/main/java/org/sopt/official/feature/fortune/feature/fortuneAmulet/FortuneAmuletScreen.kt +++ b/feature/fortune/src/main/java/org/sopt/official/feature/fortune/feature/fortuneAmulet/FortuneAmuletScreen.kt @@ -1,27 +1,22 @@ package org.sopt.official.feature.fortune.feature.fortuneAmulet import androidx.compose.foundation.background -import androidx.compose.foundation.border -import androidx.compose.foundation.clickable -import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.Spacer 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.shape.RoundedCornerShape import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier -import androidx.compose.ui.draw.clip import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import coil.compose.AsyncImage import kotlinx.serialization.Serializable import org.sopt.official.designsystem.SoptTheme +import org.sopt.official.feature.fortune.component.RoundedCornerButton @Serializable data object FortuneAmulet @@ -74,21 +69,17 @@ private fun FortuneAmuletScreen( Spacer(modifier = Modifier.weight(1f)) - Box( - modifier = Modifier - .border( - width = 1.dp, - color = SoptTheme.colors.primary, - shape = RoundedCornerShape(9999.dp) - ), - contentAlignment = Alignment.Center + RoundedCornerButton( + content = { + Text( + text = "홈으로 돌아가기", + style = SoptTheme.typography.label18SB, + color = SoptTheme.colors.onBackground, + modifier = Modifier.padding(horizontal = 20.dp, vertical = 12.dp) + ) + } ) { - Text( - text = "홈으로 돌아가기", - style = SoptTheme.typography.label18SB, - color = SoptTheme.colors.onBackground, - modifier = Modifier.padding(horizontal = 20.dp, vertical = 12.dp) - ) + // TODO: Navigate to Home } Spacer(modifier = Modifier.height(50.dp))