[GMSS-203] 채팅방 상세 화면 UI 및 토큰 사용량 조회 기능 추가

app/src/main/AndroidManifest.xml

@@ -51,6 +51,7 @@
             android:exported="true"
             android:screenOrientation="portrait"
             android:theme="@style/Theme.GAMSS"
+            android:windowSoftInputMode="adjustResize"
             tools:ignore="DiscouragedApi,LockedOrientationActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

app/src/main/kotlin/com/gamss/android/app/main/MainScreen.kt

@@ -178,6 +178,7 @@ private fun mainEntryProvider(navigator: Navigator) = entryProvider {
         ChatRoomScreen(
             conversationId = key.conversationId,
             onCardClose = navigator::goBack,
+            onBackClick = navigator::goBack,
         )
     }
 }

core/common/src/main/java/com/gamss/android/core/common/util/Date.kt

@@ -1,34 +1,24 @@
 package com.gamss.android.core.common.util
 
-import java.time.Instant
 import java.time.LocalDateTime
 import java.time.ZoneId
 import java.time.format.DateTimeFormatter
-import java.time.format.DateTimeParseException
 import java.util.Locale
 
+/** 기기 시간대와 무관하게 한국 기준으로 "오늘"/"이번 달"을 고정해야 할 때 쓴다. */
+val KoreanTimeZone: ZoneId = ZoneId.of("Asia/Seoul")
+
 private const val KOREAN_TIME_PATTERN = "a h:mm"
 
-val KoreanTimeZone: ZoneId = ZoneId.of("Asia/Seoul")
-private val KoreanTimeFormatter: DateTimeFormatter = DateTimeFormatter
-    .ofPattern(KOREAN_TIME_PATTERN, Locale.KOREAN)
-    .withZone(KoreanTimeZone)
+private const val CONVERSATION_DATE_PATTERN = "yy.MM.dd"
 
 // 존을 덮지 않는다. 이미 벽시계로 변환된 값을 그대로 찍는 용도다.
 private val KoreanWallClockFormatter: DateTimeFormatter =
     DateTimeFormatter.ofPattern(KOREAN_TIME_PATTERN, Locale.KOREAN)
 
-/**
- * UTC ISO-8601 날짜 문자열을 한국 시간의 `오전/오후 h:mm` 형식으로 변환한다.
- *
- * [isoDateTime]이 ISO-8601 형식이 아니면 `null`을 반환한다.
- */
-fun formatKoreanTime(isoDateTime: String): String? =
-    try {
-        KoreanTimeFormatter.format(Instant.parse(isoDateTime))
-    } catch (_: DateTimeParseException) {
-        null
-    }
+// 불교력이나 일본력 로케일에서 연도가 밀리지 않게 ROOT 로 고정한다.
+private val ConversationDateFormatter: DateTimeFormatter =
+    DateTimeFormatter.ofPattern(CONVERSATION_DATE_PATTERN, Locale.ROOT)
 
 /**
  * 이미 벽시계로 바뀐 시각을 `오전/오후 h:mm` 형식으로 변환한다.
@@ -37,3 +27,6 @@ fun formatKoreanTime(isoDateTime: String): String? =
  * 기기 로케일이 영어여도 `AM/PM` 으로 바뀌지 않는다.
  */
 fun formatKoreanTime(dateTime: LocalDateTime): String = KoreanWallClockFormatter.format(dateTime)
+
+/** 대화방 생성 시각을 `yy.MM.dd` 형식의 날짜로 표시한다. */
+fun formatConversationDate(dateTime: LocalDateTime): String = ConversationDateFormatter.format(dateTime)

core/common/src/main/java/com/gamss/android/core/common/util/TokenUsage.kt

@@ -0,0 +1,20 @@
+package com.gamss.android.core.common.util
+
+import kotlin.math.roundToInt
+
+/**
+ * 오늘 사용한 토큰량을 오늘 하루 총 한도 대비 백분율로 환산한다.
+ *
+ * @param usedTokens 오늘 사용한 토큰 수.
+ * @param dailyLimit 오늘 하루 총 한도. 서버가 "한도 없음"을 null 로 내려줄 수 있어 nullable 이다.
+ * @return 0~100 사이로 clamp 된 정수 퍼센트. [dailyLimit] 이 null 이거나 0 이하라 나눌 수 없으면
+ *  "0%"로 거짓 표시하지 않도록 null 을 반환한다 — 호출부가 무제한 상태를 구분해서 다뤄야 한다.
+ */
+fun calculateTokenUsagePercent(usedTokens: Long, dailyLimit: Long?): Int? {
+    if (dailyLimit == null || dailyLimit <= 0) return null
+
+    val percent = (usedTokens.toDouble() / dailyLimit.toDouble() * PERCENT_SCALE).roundToInt()
+    return percent.coerceIn(0, 100)
+}
+
+private const val PERCENT_SCALE = 100

core/designsystem/src/main/java/com/gamss/android/core/designsystem/component/GamssTokenUsageTooltip.kt

@@ -10,7 +10,9 @@ import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
+import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
@@ -28,12 +30,15 @@ private val TooltipContentGap = 6.dp
 private val TooltipBorderWidth = 1.dp
 private val ProgressBarHeight = 9.dp
 private val TooltipShadowElevation = 40.dp
+private val LoadingIndicatorSize = 24.dp
+private val LoadingIndicatorStrokeWidth = 2.dp
 
 /**
  * 상단 내비게이션의 토큰 사용량 아이콘을 눌렀을 때 그 아래 뜨는 툴팁.
  *
  * [usagePercent]는 0~100 사이 값을 그대로 받는다 — 계산(도메인 값 유무 판단 등)은 호출부 책임이다.
- * null이면 조회에 실패한 것으로 보고 [failMessage]와 재시도 액션([retryLabel]/[onRetryClick])을 대신 보여준다.
+ * [isLoading]이 true면 조회 중으로 보고 로딩 인디케이터를 대신 보여준다.
+ * 그 외에 null이면 조회에 실패한 것으로 보고 [failMessage]와 재시도 액션([retryLabel]/[onRetryClick])을 대신 보여준다.
  */
 @Composable
 fun GamssTokenUsageTooltip(
@@ -45,6 +50,7 @@ fun GamssTokenUsageTooltip(
     retryLabel: String,
     onRetryClick: () -> Unit,
     modifier: Modifier = Modifier,
+    isLoading: Boolean = false,
 ) {
     Column(
         modifier = modifier
@@ -55,7 +61,23 @@ fun GamssTokenUsageTooltip(
             .padding(TooltipPadding),
         verticalArrangement = Arrangement.spacedBy(TooltipContentGap),
     ) {
-        if (usagePercent != null) {
+        if (isLoading) {
+            Text(
+                text = title,
+                style = GamssTheme.typography.subtitle4,
+                color = GamssTheme.colors.gray900,
+            )
+            Box(
+                modifier = Modifier.fillMaxWidth(),
+                contentAlignment = Alignment.Center,
+            ) {
+                CircularProgressIndicator(
+                    modifier = Modifier.size(LoadingIndicatorSize),
+                    color = GamssTheme.colors.gray900,
+                    strokeWidth = LoadingIndicatorStrokeWidth,
+                )
+            }
+        } else if (usagePercent != null) {
             Row(
                 modifier = Modifier.fillMaxWidth(),
                 horizontalArrangement = Arrangement.SpaceBetween,

core/designsystem/src/main/java/com/gamss/android/core/designsystem/component/chat/GamssChatBubble.kt

@@ -165,10 +165,14 @@ fun GamssReceivedChatBubble(
 
 /**
  * 상대가 입력중일때 말풍선. 아바타 + 이름 + 말풍선이 왼쪽에 정렬된다.
+ *
+ * @param avatar 다음에 도착할 답장의 발신자를 이미 알 때(예: pendingComments) 그 캐릭터 아바타를
+ *  넘기면 빈 프로필 대신 표시한다.
  */
 @Composable
 fun GamssLoadingMessageBubble(
-    senderStatus: String
+    senderStatus: String,
+    avatar: (@Composable () -> Unit)? = null,
 ) {
     Row(
         horizontalArrangement = Arrangement.spacedBy(GamssTheme.spacing.spacing100),
@@ -178,7 +182,7 @@ fun GamssLoadingMessageBubble(
             horizontalArrangement = Arrangement.spacedBy(GamssTheme.spacing.spacing100),
             verticalAlignment = Alignment.Top,
         ) {
-            ChatAvatar(avatar = null)
+            ChatAvatar(avatar = avatar)
             Column(verticalArrangement = Arrangement.spacedBy(GamssTheme.spacing.spacing075)) {
                 Text(
                     text = senderStatus,

data/src/main/java/com/gamss/android/data/remote/conversation/ConversationService.kt

@@ -3,7 +3,7 @@ package com.gamss.android.data.remote.conversation
 import com.gamss.android.data.remote.conversation.model.request.SaveMessageRequest
 import com.gamss.android.data.remote.conversation.model.request.UpdateConversationTitleRequest
 import com.gamss.android.data.remote.conversation.model.response.ChattingRoomSearchResponse
-import com.gamss.android.data.remote.conversation.model.response.ConversationMessage
+import com.gamss.android.data.remote.conversation.model.response.ConversationDetailResponse
 import com.gamss.android.data.remote.conversation.model.response.ConversationResponse
 import com.gamss.android.data.remote.conversation.model.response.SaveMessageResponse
 import com.gamss.android.data.remote.model.response.ApiResponse
@@ -23,8 +23,8 @@ internal interface ConversationService {
     @POST("/api/conversations/messages")
     suspend fun saveMessage(@Body request: SaveMessageRequest): ApiResponse<SaveMessageResponse>
 
-    @GET("/api/conversations/{conversationId}/messages")
-    suspend fun getMessages(@Path("conversationId") conversationId: Long): ApiResponse<List<ConversationMessage>>
+    @GET("/api/conversations/{conversationId}")
+    suspend fun getConversation(@Path("conversationId") conversationId: Long): ApiResponse<ConversationDetailResponse>
 
     @PATCH("/api/conversations/{conversationId}/title")
     suspend fun updateTitle(

data/src/main/java/com/gamss/android/data/remote/conversation/model/response/ConversationDetailResponse.kt

@@ -0,0 +1,18 @@
+package com.gamss.android.data.remote.conversation.model.response
+
+import com.gamss.android.domain.conversation.ConversationDetail
+import kotlinx.serialization.Serializable
+
+@Serializable
+internal data class ConversationDetailResponse(
+    val conversation: ConversationResponse,
+    val messages: List<ConversationMessage> = emptyList(),
+)
+
+internal fun ConversationDetailResponse.toDomain(): ConversationDetail? =
+    conversation.toDomain()?.let { conversation ->
+        ConversationDetail(
+            conversation = conversation,
+            messages = messages.map(ConversationMessage::toDomain),
+        )
+    }

data/src/main/java/com/gamss/android/data/remote/conversation/model/response/ConversationMessage.kt

@@ -47,7 +47,7 @@ private fun ConversationMessage.toMessage(sender: MessageSender): Message = Mess
     sender = sender,
     content = content,
     repliesToMessageId = repliesToMessageId,
-    createdTime = formatKoreanTime(createdAt)
+    createdTime = parseConversationCreatedAt(createdAt)?.let(::formatKoreanTime)
 )
 
 private fun ConversationMessage.resolveSender(): MessageSender = when (senderType) {

data/src/main/java/com/gamss/android/data/repository/ConversationRepositoryImpl.kt

@@ -11,15 +11,14 @@ import com.gamss.android.data.di.ApplicationScope
 import com.gamss.android.data.remote.conversation.ConversationService
 import com.gamss.android.data.remote.conversation.model.request.SaveMessageRequest
 import com.gamss.android.data.remote.conversation.model.request.UpdateConversationTitleRequest
-import com.gamss.android.data.remote.conversation.model.response.ConversationMessage
 import com.gamss.android.data.remote.conversation.model.response.ConversationResponse
 import com.gamss.android.data.remote.conversation.model.response.toDomain
 import com.gamss.android.data.remote.emotion.toServerEmotionType
 import com.gamss.android.data.remote.runCatchingApiCall
 import com.gamss.android.data.remote.throwIfFailed
 import com.gamss.android.domain.conversation.Conversation
+import com.gamss.android.domain.conversation.ConversationDetail
 import com.gamss.android.domain.conversation.ConversationRepository
-import com.gamss.android.domain.conversation.Message
 import com.gamss.android.domain.conversation.SentMessage
 import com.gamss.android.domain.conversation.chattingsearch.ChattingRoomSummary
 import com.gamss.android.domain.emotion.EmotionCharacter
@@ -62,10 +61,9 @@ internal class ConversationRepositoryImpl @Inject constructor(
         checkNotNull(response.data) { "No available saved message data" }.toDomain()
     }
 
-    override suspend fun getMessages(conversationId: Long): AppResult<List<Message>> = runCatchingApiCall {
-        val response = conversationService.getMessages(conversationId)
-        checkNotNull(response.data) { "No available message data" }
-            .mapNotNull(ConversationMessage::toDomain)
+    override suspend fun getConversation(conversationId: Long): AppResult<ConversationDetail> = runCatchingApiCall {
+        val response = conversationService.getConversation(conversationId)
+        checkNotNull(response.data?.toDomain()) { "No available conversation detail data" }
     }
 
     override suspend fun updateTitle(conversationId: Long, title: String): AppResult<Unit> =

data/src/test/kotlin/com/gamss/android/data/remote/conversation/ConversationResponseTest.kt

@@ -1,5 +1,7 @@
 package com.gamss.android.data.remote.conversation
 
+import com.gamss.android.data.remote.conversation.model.response.ConversationDetailResponse
+import com.gamss.android.data.remote.conversation.model.response.ConversationMessage
 import com.gamss.android.data.remote.conversation.model.response.ConversationResponse
 import com.gamss.android.data.remote.conversation.model.response.parseConversationCreatedAt
 import com.gamss.android.data.remote.conversation.model.response.toDomain
@@ -75,4 +77,27 @@ class ConversationResponseTest {
     fun 빈_문자열_시각은_null_이다() {
         assertNull(parseConversationCreatedAt(" "))
     }
+
+    @Test
+    fun 대화_상세는_생성_시각과_메시지를_도메인으로_옮긴다() {
+        val detail = ConversationDetailResponse(
+            conversation = ConversationResponse(
+                id = 37,
+                title = "비 오는 날의 짜증",
+                createdAt = "2026-08-15T17:16:52.320",
+            ),
+            messages = listOf(
+                ConversationMessage(
+                    id = 1,
+                    conversationId = 37,
+                    senderType = ConversationMessage.SENDER_USER,
+                    content = "오늘 억울한 일이 있었어",
+                    createdAt = "2026-08-15T17:16:52.320",
+                ),
+            ),
+        ).toDomain()
+
+        assertEquals(LocalDateTime.of(2026, 8, 15, 17, 16, 52, 320_000_000), detail?.conversation?.createdAt)
+        assertEquals(listOf(1L), detail?.messages?.map { it.id })
+    }
 }

domain/src/main/kotlin/com/gamss/android/domain/conversation/ConversationDetail.kt

@@ -0,0 +1,6 @@
+package com.gamss.android.domain.conversation
+
+data class ConversationDetail(
+    val conversation: Conversation,
+    val messages: List<Message>,
+)

domain/src/main/kotlin/com/gamss/android/domain/conversation/ConversationRepository.kt

@@ -22,7 +22,7 @@ interface ConversationRepository {
         excludeCharacters: Set<EmotionCharacter>,
     ): AppResult<SentMessage>
 
-    suspend fun getMessages(conversationId: Long): AppResult<List<Message>>
+    suspend fun getConversation(conversationId: Long): AppResult<ConversationDetail>
 
     suspend fun updateTitle(conversationId: Long, title: String): AppResult<Unit>
 

domain/src/main/kotlin/com/gamss/android/domain/conversation/ConversationSession.kt

@@ -17,7 +17,7 @@ import javax.inject.Inject
 @Suppress("LongParameterList")
 class ConversationSession @Inject constructor(
     private val sendMessage: SendMessageUseCase,
-    private val getMessages: GetMessagesUseCase,
+    private val getConversation: GetConversationUseCase,
     private val updateConversationTitle: UpdateConversationTitleUseCase,
     private val endConversation: EndConversationUseCase,
     private val createConversationCard: CreateConversationCardUseCase,
@@ -30,12 +30,12 @@ class ConversationSession @Inject constructor(
 
     private var pendingTitle: PendingTitle? = null
 
-    suspend fun restore(conversationId: Long): AppResult<List<Message>> {
+    suspend fun restore(conversationId: Long): AppResult<ConversationDetail> {
         clearPendingTitle()
-        val result = getMessages(conversationId)
+        val result = getConversation(conversationId)
         when (result) {
             is AppResult.Success -> {
-                val utterances = result.data.userUtterances()
+                val utterances = result.data.messages.userUtterances()
                 summaryStore.restore(utterances)
                 emotionAccumulator.restore(utterances)
             }
@@ -83,12 +83,12 @@ class ConversationSession @Inject constructor(
     }
 
     /** 홈 쪽 인스턴스에서만 채워진 요약·감정 상태를, [restore] 와 같은 방식으로 이 인스턴스에도 시드해 둔다. */
-    suspend fun consumePendingReveal(conversationId: Long): SentMessage? {
-        val sent = pendingReveal.consume(conversationId) ?: return null
-        val utterances = listOf(sent.message).userUtterances()
+    suspend fun consumePendingReveal(conversationId: Long): PendingReveal? {
+        val pending = pendingReveal.consume(conversationId) ?: return null
+        val utterances = listOf(pending.sent.message).userUtterances()
         summaryStore.restore(utterances)
         emotionAccumulator.restore(utterances)
-        return sent
+        return pending
     }
 
     suspend fun finishSend() = coroutineScope {

domain/src/main/kotlin/com/gamss/android/domain/conversation/GetMessagesUseCase.kt → domain/src/main/kotlin/com/gamss/android/domain/conversation/GetConversationUseCase.kt

@@ -4,10 +4,10 @@ import com.gamss.android.core.common.AppResult
 import com.gamss.android.domain.usecase.UseCase
 import javax.inject.Inject
 
-class GetMessagesUseCase @Inject constructor(
+class GetConversationUseCase @Inject constructor(
     private val conversationRepository: ConversationRepository,
-) : UseCase<Long, AppResult<List<Message>>> {
+) : UseCase<Long, AppResult<ConversationDetail>> {
 
-    override suspend fun invoke(params: Long): AppResult<List<Message>> =
-        conversationRepository.getMessages(params)
+    override suspend fun invoke(params: Long): AppResult<ConversationDetail> =
+        conversationRepository.getConversation(params)
 }

domain/src/main/kotlin/com/gamss/android/domain/conversation/PendingConversationReveal.kt

@@ -2,6 +2,9 @@ package com.gamss.android.domain.conversation
 
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
+import java.time.Instant
+import java.time.LocalDateTime
+import java.time.ZoneId
 import javax.inject.Inject
 import javax.inject.Singleton
 
@@ -18,12 +21,26 @@ class PendingConversationReveal @Inject constructor() {
         mutex.withLock { pending = Entry(sent, now) }
     }
 
-    suspend fun consume(conversationId: Long, now: Long = System.currentTimeMillis()): SentMessage? =
+    suspend fun consume(conversationId: Long, now: Long = System.currentTimeMillis()): PendingReveal? =
         mutex.withLock {
             val current = pending?.takeIf { it.sent.message.conversationId == conversationId } ?: return@withLock null
             pending = null
-            current.sent.takeIf { now - current.savedAtMillis <= PENDING_REVEAL_EXPIRY_MILLIS }
+            current.takeIf { now - it.savedAtMillis <= PENDING_REVEAL_EXPIRY_MILLIS }?.toPendingReveal()
         }
 
-    private data class Entry(val sent: SentMessage, val savedAtMillis: Long)
+    private data class Entry(val sent: SentMessage, val savedAtMillis: Long) {
+        fun toPendingReveal() = PendingReveal(
+            sent = sent,
+            createdAt = Instant.ofEpochMilli(savedAtMillis).atZone(ZoneId.systemDefault()).toLocalDateTime(),
+        )
+    }
 }
+
+/**
+ * [PendingConversationReveal.consume] 결과. 서버 대화 상세를 다시 받아오기 전이라 [createdAt] 은
+ * 서버 값이 아니라 [PendingConversationReveal.save] 가 호출된(=대화가 막 생긴) 시각이다.
+ */
+data class PendingReveal(
+    val sent: SentMessage,
+    val createdAt: LocalDateTime,
+)