Feature/dutchpay UI fix

app/src/main/java/com/ssafy/tiggle/data/model/dutchpay/response/DutchPayDetailResponseDto.kt

@@ -13,19 +13,6 @@ data class DutchPayDetailResponseDto(
     val shares: List<ShareDto>,
     val roundedPerPerson: Int?,
     val payMore: Boolean,
-    val createdAt: String
-)
-
-@Serializable
-data class CreatorDto(
-    val id: Long,
-    val name: String
-)
-
-@Serializable
-data class ShareDto(
-    val userId: Long,
-    val name: String,
-    val amount: Int,
-    val status: String
+    val createdAt: String,
+    val requestUserId: Long
 )

app/src/main/java/com/ssafy/tiggle/data/model/dutchpay/response/DutchPayRequestDetailResponseDto.kt

@@ -1,16 +1,30 @@
 package com.ssafy.tiggle.data.model.dutchpay.response
 
+import kotlinx.serialization.Serializable
+@Serializable
 data class DutchPayRequestDetailResponseDto(
-    val dutchpayId: Long,
+    val id: Long,
+    val requestUserId: Long,
     val title: String,
     val message: String,
-    val requesterName: String,
-    val participantCount: Int,
     val totalAmount: Long,
-    val requestedAt: String,
-    val myAmount: Long,
-    val originalAmount: Long,
-    val tiggleAmount: Long,
-    val payMoreDefault: Boolean,
-    val creator: Boolean
+    val status: String,
+    val creator: CreatorDto,
+    val shares: List<ShareDto>,
+    val roundedPerPerson: Long,
+    val createdAt: String
+)
+@Serializable
+data class CreatorDto(
+    val id: Long,
+    val name: String
+)
+
+@Serializable
+data class ShareDto(
+    val userId: Long,
+    val name: String,
+    val amount: Long,
+    val status: String,
+    val tiggleAmount: Long?
 )

app/src/main/java/com/ssafy/tiggle/data/model/dutchpay/response/UserSummaryDto.kt

@@ -7,10 +7,14 @@ import com.ssafy.tiggle.domain.entity.dutchpay.UserSummary
  */
 data class UserSummaryDto(
     val id: Long,
-    val name: String
+    val name: String,
+    val university: String? = null,
+    val department: String? = null
 ) {
     fun toDomain(): UserSummary = UserSummary(
         id = id,
-        name = name
+        name = name,
+        university = university,
+        department = department
     )
 }

app/src/main/java/com/ssafy/tiggle/data/repository/DutchPayRepositoryImpl.kt

@@ -49,19 +49,23 @@ class DutchPayRepositoryImpl @Inject constructor(
             if (response.isSuccessful) {
                 val responseData = response.body()?.data
                 if (responseData != null) {
+
+                    val currentUserId = responseData.requestUserId
+                    val currentShare = responseData.shares.find { it.userId == currentUserId }
+
                     val detail = DutchPayRequestDetail(
-                        dutchPayId = responseData.dutchpayId,
+                        dutchPayId = responseData.id,
                         title = responseData.title,
                         message = responseData.message,
-                        requesterName = responseData.requesterName,
-                        participantCount = responseData.participantCount,
+                        requesterName = responseData.creator.name,
+                        participantCount = responseData.shares.size,
                         totalAmount = responseData.totalAmount,
-                        requestedAt = responseData.requestedAt,
-                        myAmount = responseData.myAmount,
-                        originalAmount = responseData.originalAmount,
-                        tiggleAmount = responseData.tiggleAmount,
-                        payMoreDefault = responseData.payMoreDefault,
-                        isCreator = responseData.creator
+                        requestedAt = responseData.createdAt,
+                        myAmount = currentShare?.amount ?: 0L,
+                        originalAmount = currentShare?.amount ?: 0L,
+                        tiggleAmount = responseData.roundedPerPerson - (currentShare?.amount ?: 0L),
+                        payMoreDefault = true, // 기본값으로 설정
+                        isCreator = responseData.creator.id == currentUserId
                     )
                     Result.success(detail)
                 } else {
@@ -96,13 +100,15 @@ class DutchPayRepositoryImpl @Inject constructor(
                             Share(
                                 userId = shareDto.userId,
                                 name = shareDto.name,
-                                amount = shareDto.amount,
+                                amount = shareDto.amount.toInt(),
+                                tiggleAmount = shareDto.tiggleAmount?.toInt(),
                                 status = shareDto.status
                             )
                         },
                         roundedPerPerson = responseData.roundedPerPerson,
                         payMore = responseData.payMore,
-                        createdAt = responseData.createdAt
+                        createdAt = responseData.createdAt,
+                        requestUserId = responseData.requestUserId
                     )
                     Result.success(detail)
                 } else {

app/src/main/java/com/ssafy/tiggle/domain/entity/dutchpay/DutchPayDetail.kt

@@ -10,7 +10,8 @@ data class DutchPayDetail(
     val shares: List<Share>,
     val roundedPerPerson: Int?,
     val payMore: Boolean,
-    val createdAt: String
+    val createdAt: String,
+    val requestUserId: Long
 )
 
 data class Creator(
@@ -22,5 +23,6 @@ data class Share(
     val userId: Long,
     val name: String,
     val amount: Int,
+    val tiggleAmount: Int? = null,
     val status: String
 )

app/src/main/java/com/ssafy/tiggle/domain/entity/dutchpay/UserSummary.kt

@@ -5,5 +5,7 @@ package com.ssafy.tiggle.domain.entity.dutchpay
  */
 data class UserSummary(
     val id: Long,
-    val name: String
+    val name: String,
+    val university: String? = null,
+    val department: String? = null
 )

app/src/main/java/com/ssafy/tiggle/presentation/navigation/NavigationGraph.kt

@@ -239,7 +239,10 @@ fun NavigationGraph(
                     is Screen.DutchPayDetail -> NavEntry(key) {
                         DutchPayDetailScreen(
                             dutchPayId = key.dutchPayId,
-                            onBackClick = { navBackStack.removeLastOrNull() }
+                            onBackClick = { navBackStack.removeLastOrNull() },
+                            onPaymentClick = {
+                                navBackStack.add(Screen.DutchpayRecieve(key.dutchPayId))
+                            }
                         )
                     }
 

app/src/main/java/com/ssafy/tiggle/presentation/ui/components/UserPicker.kt

@@ -19,6 +19,7 @@ import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Close
+import androidx.compose.material.icons.filled.Check
 import androidx.compose.material3.Card
 import androidx.compose.material3.CardDefaults
 import androidx.compose.material3.Icon
@@ -35,15 +36,20 @@ import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import com.ssafy.tiggle.R
 import com.ssafy.tiggle.domain.entity.dutchpay.UserSummary
+import com.ssafy.tiggle.presentation.ui.theme.AppTypography
 import com.ssafy.tiggle.presentation.ui.theme.TiggleBlue
+import com.ssafy.tiggle.presentation.ui.theme.TiggleBlueLight
 import com.ssafy.tiggle.presentation.ui.theme.TiggleGrayLight
 import com.ssafy.tiggle.presentation.ui.theme.TiggleGrayText
+import com.ssafy.tiggle.presentation.ui.theme.TiggleSkyBlue
 
 @Composable
 fun UserPicker(
@@ -123,39 +129,93 @@ private fun UserRow(user: UserSummary, isSelected: Boolean, onClick: () -> Unit)
         modifier = Modifier
             .fillMaxWidth()
             .clickable { onClick() }
-            .padding(horizontal = 12.dp, vertical = 14.dp),
+            .padding(horizontal = 16.dp, vertical = 16.dp),
         verticalAlignment = Alignment.CenterVertically
     ) {
-        // 아바타 (이니셜)
+        // 아바타 (둥근 사각형)
         Box(
             modifier = Modifier
-                .size(32.dp)
+                .size(48.dp)
+                .clip(RoundedCornerShape(12.dp))
                 .background(
-                    color = if (isSelected) TiggleBlue else TiggleGrayLight,
-                    shape = CircleShape
+                    color = if (isSelected) TiggleBlue else TiggleGrayLight
                 ),
             contentAlignment = Alignment.Center
         ) {
             Text(
                 text = user.name.firstOrNull()?.toString() ?: "?",
                 color = if (isSelected) Color.White else Color.Black,
-                fontWeight = FontWeight.Bold
+                fontWeight = FontWeight.Bold,
+                style = AppTypography.titleMedium
             )
         }
 
         Column(
             modifier = Modifier
                 .weight(1f)
-                .padding(start = 12.dp)
+                .padding(start = 16.dp)
         ) {
-            Text(text = user.name, color = Color.Black)
+            Text(
+                text = user.name,
+                color = Color.Black,
+                fontWeight = FontWeight.Medium,
+                style = AppTypography.bodyLarge
+            )
+
+            // 학교와 학과 정보
+            if (user.university != null || user.department != null) {
+                Spacer(Modifier.height(2.dp))
+                Text(
+                    text = buildString {
+                        if (user.university != null) {
+                            append(user.university)
+                        }
+                        if (user.university != null && user.department != null) {
+                            append(" • ")
+                        }
+                        if (user.department != null) {
+                            append(user.department)
+                        }
+                    },
+                    color = TiggleGrayText,
+                    style = AppTypography.bodySmall,
+                    maxLines = 1,
+                    overflow = TextOverflow.Ellipsis
+                )
+            }
         }
 
-        Icon(
-            painter = androidx.compose.ui.res.painterResource(id = R.drawable.check),
-            contentDescription = null,
-            tint = if (isSelected) TiggleBlue else TiggleGrayText
-        )
+        // 선택 상태 표시 (TiggleSkyBlue 원형 버튼)
+        Box(
+            modifier = Modifier
+                .size(24.dp)
+                .clip(CircleShape)
+                .background(
+                    color = if (isSelected) TiggleBlueLight else Color.White
+                )
+                .padding(2.dp),
+            contentAlignment = Alignment.Center
+        ) {
+            if (isSelected) {
+                Icon(
+                    imageVector = Icons.Default.Check,
+                    contentDescription = "selected",
+                    tint = Color.White,
+                    modifier = Modifier.size(16.dp)
+                )
+            } else {
+                // 선택되지 않은 상태의 테두리 (동일한 크기 유지)
+                Box(
+                    modifier = Modifier
+                        .size(20.dp)
+                        .clip(CircleShape)
+                        .background(
+                            color = TiggleGrayText.copy(alpha = 0.3f),
+                            shape = CircleShape
+                        )
+                )
+            }
+        }
     }
 }
 
@@ -167,7 +227,7 @@ private fun SelectedUserChip(name: String, onRemove: () -> Unit, modifier: Modif
             .padding(horizontal = 10.dp, vertical = 6.dp),
         verticalAlignment = Alignment.CenterVertically
     ) {
-        Text(text = name, style = MaterialTheme.typography.bodySmall)
+        Text(text = name, style = AppTypography.bodySmall)
         Spacer(Modifier.size(6.dp))
         Box(
             modifier = Modifier

app/src/main/java/com/ssafy/tiggle/presentation/ui/dutchpay/CreateDutchPayScreen.kt

@@ -1,5 +1,7 @@
 package com.ssafy.tiggle.presentation.ui.dutchpay
 
+import android.R.attr.label
+import android.util.Log
 import androidx.compose.animation.core.animateIntAsState
 import androidx.compose.animation.core.tween
 import androidx.compose.foundation.Image
@@ -327,9 +329,18 @@ private fun AnimatedNumberCounter(
     targetValue: Long,
     modifier: Modifier = Modifier
 ) {
+    var isVisible by remember { mutableStateOf(false) }
+
+    LaunchedEffect(Unit) {
+        isVisible = true
+    }
+
     val animatedValue by animateIntAsState(
-        targetValue = targetValue.toInt(),
-        animationSpec = tween(durationMillis = 1000),
+        targetValue = if (isVisible) targetValue.toInt() else 0,
+        animationSpec = tween(
+            durationMillis = 1000,
+            easing = androidx.compose.animation.core.LinearEasing
+        ),
         label = "number_animation"
     )
 
@@ -512,8 +523,12 @@ fun DutchPayCompleteContent(
                 val myAmount = if (payMore) roundUpToHundreds(perHead) else perHead.toLong()
                 val friendAmount = perHead.toLong()
 
+
+
+                Text("참여자 (${participantCount}명)")
+
                 DetailRow(
-                    label = "참여자 (${participantCount}명)",
+                    label = "내가 낸 금액",
                     value = Formatter.formatCurrency(myAmount)
                 )
 
@@ -614,9 +629,9 @@ private fun InfoStep(text: String) {
 @Composable
 private fun PreviewDutchPay_PickUsers() {
     val sampleUsers = listOf(
-        UserSummary(4, "김테스트"),
-        UserSummary(5, "박테스트"),
-        UserSummary(6, "이테스트")
+        UserSummary(4, "김테스트", "신은대학교", "컴퓨터학부"),
+        UserSummary(5, "박테스트", "신한대학교", "건축학과"),
+        UserSummary(6, "이테스트", "싸피대학교", "인공지능학과")
     )
     val uiState = CreateDutchPayState(
         step = CreateDutchPayStep.PICK_USERS,
@@ -668,9 +683,9 @@ private fun PreviewDutchPay_InputAmount() {
     ) {
         DutchPayInputAmountContent(
             selectedUsers = listOf(
-                UserSummary(1, "김민호"),
-                UserSummary(2, "민경이"),
-                UserSummary(3, "홍길동")
+                UserSummary(1, "김민호", "신은대학교", "컴퓨터학부"),
+                UserSummary(2, "민경이", "신한대학교", "건축학과"),
+                UserSummary(3, "홍길동", "싸피대학교", "인공지능학과")
             ),
             amountText = uiState.amountText,
             onAmountChange = {},
@@ -704,8 +719,8 @@ private fun PreviewDutchPay_Complete() {
         DutchPayCompleteContent(
             totalAmount = 50000L,
             selectedUsers = listOf(
-                UserSummary(1, "김민준"),
-                UserSummary(2, "박예준")
+                UserSummary(1, "김민준", "신은대학교", "컴퓨터학부"),
+                UserSummary(2, "박예준", "신한대학교", "건축학과")
             ),
             payMore = true
         )