Merge pull request #38 from Nexters/feature/home-v2

eshc123 · web-flow · commit b6aca344ffcd · 2025-08-11T17:33:00.000+09:00
변경된 홈 디자인과 바텀 시트를 구현합니다.
diff --git a/core/data/src/main/java/com/plottwist/core/data/mapper/Member.kt b/core/data/src/main/java/com/plottwist/core/data/mapper/Member.kt
@@ -0,0 +1,12 @@
+package com.plottwist.core.data.mapper
+
+import com.plottwist.core.domain.model.MemberInfo
+import com.plottwist.core.network.model.onboarding.MemberInfoData
+
+fun MemberInfoData.toDomainModel() : MemberInfo {
+    return MemberInfo(
+        memberId = this.memberId,
+        email = this.email,
+        name = this.name
+    )
+}
diff --git a/core/data/src/main/java/com/plottwist/core/data/onboarding/OnboardingRepositoryImpl.kt b/core/data/src/main/java/com/plottwist/core/data/onboarding/OnboardingRepositoryImpl.kt
@@ -1,5 +1,7 @@
 package com.plottwist.core.data.onboarding
 
+import com.plottwist.core.data.mapper.toDomainModel
+import com.plottwist.core.domain.model.MemberInfo
 import com.plottwist.core.domain.onboarding.OnboardingRepository
 import com.plottwist.core.network.model.onboarding.UpdateOnboardingInfoRequest
 import com.plottwist.core.network.service.OnboardingService
@@ -27,4 +29,18 @@ class OnboardingRepositoryImpl @Inject constructor(
             return Result.failure(Exception(e))
         }
     }
+
+    override suspend fun getMemberInfo(): Result<MemberInfo> {
+        try {
+            val result = onboardingService.getMemberInfo()
+
+            if (result.success) {
+                return Result.success(result.data.toDomainModel())
+            }
+
+            return Result.failure(Exception("Fail to get member info"))
+        } catch (e:Exception) {
+            return Result.failure(Exception(e))
+        }
+    }
 }
diff --git a/core/designsystem/src/main/java/com/plottwist/core/designsystem/component/Button.kt b/core/designsystem/src/main/java/com/plottwist/core/designsystem/component/Button.kt
@@ -14,6 +14,7 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.Shape
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import com.plottwist.core.designsystem.foundation.TukColorTokens.Gray000
 import com.plottwist.core.designsystem.foundation.TukColorTokens.Gray200
@@ -85,21 +86,22 @@ fun TukOutlinedButton(
 }
 
 @Composable
-private fun TukButton(
+fun TukButton(
     containerColor: Color,
     disabledContainerColor: Color,
     contentColor: Color,
     disabledContentColor: Color,
     onClick: () -> Unit,
     modifier: Modifier = Modifier,
+    height: Dp = 52.dp,
     enabled: Boolean = true,
     shape:Shape = RoundedCornerShape(15.dp),
     contentPadding: PaddingValues = PaddingValues(vertical = 10.dp, horizontal = 10.dp),
     border: BorderStroke? = null,
     content: @Composable () -> Unit
 ) {
     Button(
-        modifier = modifier.height(52.dp),
+        modifier = modifier.height(height),
         enabled = enabled,
         shape = shape,
         border = border,
diff --git a/core/designsystem/src/main/java/com/plottwist/core/designsystem/component/TopAppBar.kt b/core/designsystem/src/main/java/com/plottwist/core/designsystem/component/TopAppBar.kt
@@ -33,7 +33,7 @@ fun TukTopAppBar(
     Row(
         modifier = modifier
             .statusBarsPadding()
-            .height(64.dp)
+            .height(TOP_APP_BAR_HEIGHT.dp)
             .fillMaxWidth()
             .padding(
                 start = if(type == TukTopAppBarType.PLAIN) 20.dp else 12.dp,
@@ -78,8 +78,9 @@ fun TopAppBarBackButton(
     }
 }
 
+const val TOP_APP_BAR_HEIGHT = 64
 
 enum class TukTopAppBarType {
     DEPTH,
     PLAIN
-}
+}
diff --git a/core/designsystem/src/main/java/com/plottwist/core/designsystem/foundation/type/SerifType.kt b/core/designsystem/src/main/java/com/plottwist/core/designsystem/foundation/type/SerifType.kt
@@ -41,6 +41,12 @@ val TukSerifTypography = SerifTypography(
         letterSpacing = (-1.5).sp,
         fontWeight = FontWeight.Medium
     ),
+    title18M = SerifStyle.copy(
+        fontSize = 18.sp,
+        lineHeight = 25.sp,
+        letterSpacing = (-1.5).sp,
+        fontWeight = FontWeight.Medium
+    ),
     body18M = SerifStyle.copy(
         fontSize = 18.sp,
         lineHeight = 24.sp,
@@ -65,6 +71,7 @@ val TukSerifTypography = SerifTypography(
 data class SerifTypography(
     val title24M: TextStyle,
     val title22M: TextStyle,
+    val title18M: TextStyle,
     val body18M: TextStyle,
     val body16M: TextStyle,
     val body14R: TextStyle,
diff --git a/core/designsystem/src/main/res/drawable/ic_next_arrow_circle.xml b/core/designsystem/src/main/res/drawable/ic_next_arrow_circle.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="16dp"
+    android:viewportWidth="16"
+    android:viewportHeight="16">
+  <path
+      android:pathData="M8,0C12.418,0 16,3.582 16,8C16,12.418 12.418,16 8,16C3.582,16 0,12.418 0,8C0,3.582 3.582,0 8,0ZM7.209,4.779L9.875,7.445H4V8.555H9.875L7.209,11.221L8,12L12,8L8,4L7.209,4.779Z"
+      android:fillColor="#ffffff"/>
+</vector>
diff --git a/core/designsystem/src/main/res/drawable/ic_stop.xml b/core/designsystem/src/main/res/drawable/ic_stop.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M14,18V6H17.5V18H14ZM6.5,18V6H10V18H6.5Z"
+      android:fillColor="#ffffff"/>
+</vector>
diff --git a/core/designsystem/src/main/res/values/strings.xml b/core/designsystem/src/main/res/values/strings.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="home_title">누군가 나의 연락을\n기다리고 있을지도</string>
+    <string name="home_title">친구들은 요즘\n어떻게 지내고 있을까요</string>
+    <string name="home_subtitle">%s 님,</string>
     <string name="home_bottom_sheet_nudging_text">툭, 찔러만봐</string>
+    <string name="home_bottom_sheet_stop_text">멈추기</string>
     <string name="home_bottom_create_gathering_description">모임을 생성하고\n넌지시 만남을 제안해 보세요</string>
     <string name="home_bottom_create_gathering_button_text">모임 생성하기</string>
     <string name="home_last_alarm">마지막 알람</string>
-    <string name="home_random_proposal_description_prefix">연락이 뜸해진 우리</string>
+    <string name="home_random_proposal_description_prefix">웃긴거 아는데, 우리</string>
     <string name="home_random_proposal_description_suffix">어때</string>
     <string name="home_proposals">받은 초대장</string>
     
@@ -44,5 +46,5 @@
 
 
     <string name="common_next">다음</string>
-
+    <string name="common_confirm">다음</string>
 </resources>
diff --git a/core/domain/src/main/java/com/plottwist/core/domain/model/MemberInfo.kt b/core/domain/src/main/java/com/plottwist/core/domain/model/MemberInfo.kt
@@ -0,0 +1,7 @@
+package com.plottwist.core.domain.model
+
+data class MemberInfo(
+    val memberId: Long,
+    val email: String,
+    val name: String
+)
diff --git a/core/domain/src/main/java/com/plottwist/core/domain/onboarding/OnboardingRepository.kt b/core/domain/src/main/java/com/plottwist/core/domain/onboarding/OnboardingRepository.kt
@@ -1,7 +1,11 @@
 package com.plottwist.core.domain.onboarding
 
+import com.plottwist.core.domain.model.MemberInfo
+
 interface OnboardingRepository {
     suspend fun updateOnboardingInfo(
         name: String
     ): Result<Unit>
+
+    suspend fun getMemberInfo(): Result<MemberInfo>
 }
diff --git a/core/domain/src/main/java/com/plottwist/core/domain/onboarding/usecase/GetMemberInfoUseCase.kt b/core/domain/src/main/java/com/plottwist/core/domain/onboarding/usecase/GetMemberInfoUseCase.kt
@@ -0,0 +1,13 @@
+package com.plottwist.core.domain.onboarding.usecase
+
+import com.plottwist.core.domain.model.MemberInfo
+import com.plottwist.core.domain.onboarding.OnboardingRepository
+import javax.inject.Inject
+
+class GetMemberInfoUseCase @Inject constructor(
+    private val onboardingRepository: OnboardingRepository
+) {
+    suspend operator fun invoke(): Result<MemberInfo> {
+        return onboardingRepository.getMemberInfo()
+    }
+}
diff --git a/core/network/src/main/java/com/plottwist/core/network/model/onboarding/MemberInfoResponse.kt b/core/network/src/main/java/com/plottwist/core/network/model/onboarding/MemberInfoResponse.kt
@@ -0,0 +1,18 @@
+package com.plottwist.core.network.model.onboarding
+
+import com.plottwist.core.network.model.auth.Meta
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class MemberInfoResponse(
+    val success: Boolean,
+    val data: MemberInfoData,
+    val meta: Meta?
+)
+
+@Serializable
+data class MemberInfoData(
+    val memberId: Long,
+    val email: String,
+    val name: String
+)
diff --git a/core/network/src/main/java/com/plottwist/core/network/service/OnboardingService.kt b/core/network/src/main/java/com/plottwist/core/network/service/OnboardingService.kt
@@ -1,11 +1,12 @@
 package com.plottwist.core.network.service
 
-import com.plottwist.core.network.model.auth.DeviceInfo
 import com.plottwist.core.network.model.auth.DeviceInfoRequest
+import com.plottwist.core.network.model.onboarding.MemberInfoResponse
 import com.plottwist.core.network.model.onboarding.UpdateDeviceInfoResponse
 import com.plottwist.core.network.model.onboarding.UpdateOnboardingInfoRequest
 import com.plottwist.core.network.model.onboarding.UpdateOnboardingInfoResponse
 import retrofit2.http.Body
+import retrofit2.http.GET
 import retrofit2.http.POST
 import retrofit2.http.PUT
 
@@ -19,4 +20,7 @@ interface OnboardingService {
     suspend fun updateDeviceToken(
         @Body deviceInfo: DeviceInfoRequest
     ): UpdateDeviceInfoResponse
+
+    @GET("/api/v1/members/me")
+    suspend fun getMemberInfo(): MemberInfoResponse
 }
diff --git a/feature/home/src/main/java/com/plottwist/feature/home/HomeContract.kt b/feature/home/src/main/java/com/plottwist/feature/home/HomeContract.kt
@@ -4,6 +4,7 @@ import com.plottwist.core.domain.model.Gatherings
 
 data class HomeState(
     val loginState: LoginState = LoginState.Loading,
+    val userName: String = "",
     val gatherings: Gatherings = Gatherings(),
     val whenLabel: String = "",
     val whereLabel: String = "",
@@ -20,7 +21,7 @@ sealed class HomeAction {
     data object ClickRefreshWhen : HomeAction()
     data object ClickRefreshWhat : HomeAction()
     data class ClickGathering(val gatheringId: Long): HomeAction()
-    data object ClickPropose: HomeAction()
+    data class ClickPropose(val index : Int): HomeAction()
     data object ClickProposals: HomeAction()
     data object OnPermissionGranted: HomeAction()
 }
diff --git a/feature/home/src/main/java/com/plottwist/feature/home/HomeScreen.kt b/feature/home/src/main/java/com/plottwist/feature/home/HomeScreen.kt
diff --git a/feature/home/src/main/java/com/plottwist/feature/home/HomeViewModel.kt b/feature/home/src/main/java/com/plottwist/feature/home/HomeViewModel.kt
diff --git a/feature/home/src/main/java/com/plottwist/feature/home/component/GatheringsCard.kt b/feature/home/src/main/java/com/plottwist/feature/home/component/GatheringsCard.kt
diff --git a/feature/home/src/main/java/com/plottwist/feature/home/component/HomeBottomSheet.kt b/feature/home/src/main/java/com/plottwist/feature/home/component/HomeBottomSheet.kt
diff --git a/feature/home/src/main/java/com/plottwist/feature/home/component/RandomProposal.kt b/feature/home/src/main/java/com/plottwist/feature/home/component/RandomProposal.kt
