🔀 :: (#134) 홈 페이지 수정

Team-SIGNAL · Dec 1, 2023 · 499de29 · 499de29
2 parents 20e9d64 + 0eadb71
commit 499de29
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 17 deletions.
diff --git a/presentation/src/main/java/com/signal/signal_android/feature/coin/CoinHistory.kt b/presentation/src/main/java/com/signal/signal_android/feature/coin/CoinHistory.kt
@@ -44,7 +44,7 @@ internal fun CoinHistory(
         coinViewModel.fetchCoins()
     }
 
-    Column {
+    Column(modifier = Modifier.padding(horizontal = 12.dp)) {
         Header(
             title = stringResource(id = R.string.coin_history),
             onLeadingClicked = { moveToBack() },
@@ -60,10 +60,7 @@ private fun Coins(
     LazyColumn(
         modifier = Modifier
             .fillMaxSize()
-            .padding(
-                horizontal = 12.dp,
-                vertical = 16.dp,
-            ),
+            .padding(vertical = 16.dp),
     ) {
         items(coins) {
             CoinItemList(

diff --git a/presentation/src/main/java/com/signal/signal_android/feature/main/Main.kt b/presentation/src/main/java/com/signal/signal_android/feature/main/Main.kt
@@ -63,8 +63,9 @@ internal fun Main(
         ) {
             composable(NavigationRoute.Main.Home) {
                 Home(
-                  moveToReservation = moveToReservation,
-                  moveToDiagnosisLanding = moveToDiagnosisLanding,
+                    moveToReservation = moveToReservation,
+                    moveToDiagnosisLanding = moveToDiagnosisLanding,
+                    moveToCoinHistory = moveToCoinHistory,
                 )
             }
 

diff --git a/presentation/src/main/java/com/signal/signal_android/feature/main/home/Home.kt b/presentation/src/main/java/com/signal/signal_android/feature/main/home/Home.kt
@@ -53,15 +53,19 @@ import com.signal.signal_android.designsystem.foundation.BodyStrong
 import com.signal.signal_android.designsystem.foundation.SignalColor
 import com.signal.signal_android.designsystem.foundation.SubTitle
 import com.signal.signal_android.designsystem.util.signalClickable
+import com.signal.signal_android.feature.main.mypage.MyPageViewModel
 import org.koin.androidx.compose.koinViewModel
 
 @Composable
 internal fun Home(
     moveToReservation: () -> Unit,
     moveToDiagnosisLanding: () -> Unit,
+    moveToCoinHistory: () -> Unit,
     homeViewModel: HomeViewModel = koinViewModel(),
+    myPageViewModel: MyPageViewModel = koinViewModel(),
 ) {
     val state by homeViewModel.state.collectAsState()
+    val myPageState by myPageViewModel.state.collectAsState()
 
     var dialogState by remember { mutableStateOf(false) }
     val showDialog = { dialogState = true }
@@ -84,8 +88,7 @@ internal fun Home(
                             rippleEnabled = true,
                             onClick = {},
                         ),
-                    model = state.profile
-                        ?: R.drawable.ic_profile_image,
+                    model = state.profile ?: R.drawable.ic_profile_image,
                     contentDescription = stringResource(id = R.string.my_page_profile_image),
                 )
             }
@@ -138,18 +141,18 @@ internal fun Home(
                 onClick = moveToReservation,
             )
             Spacer(modifier = Modifier.height(14.dp))
-            /*ActivityCard(
+            ActivityCard(
                 title = stringResource(id = R.string.home_activity_ongoing),
-                description = "총 17개",
-                onClick = { *//*TODO*//* },
+                description = null,
+                onClick = { moveToCoinHistory() },
             ) {
                 Spacer(modifier = Modifier.height(20.dp))
                 OngoingActivity(
-                    title = "댓글 작성 완료",
-                    max = 4f,
-                    current = 2f,
+                    title = "총 코인 : ${myPageState.coinCount} 🪙",
+                    max = 500f,
+                    current = "${myPageState.coinCount}".toFloat(),
                 )
-            }*/
+            }
             Spacer(modifier = Modifier.weight(1f))
         }
     }

diff --git a/presentation/src/main/res/values/strings.xml b/presentation/src/main/res/values/strings.xml
@@ -82,7 +82,7 @@
     <string name="home_chart">우울감 수치 그래프</string>
     <string name="home_previous">이전</string>
     <string name="home_activity">활동</string>
-    <string name="home_activity_ongoing">진행중인 활동</string>
+    <string name="home_activity_ongoing">코인 내역 보러가기</string>
 
     <string name="home_diagnosis_history_null">데이터가 부족해요!</string>