From 4f187feab2c663162b7f90f2debf4a50305ab130 Mon Sep 17 00:00:00 2001
From: Eric85710 <ericchen87887@gmail.com>
Date: Tue, 26 May 2026 15:09:20 +0800
Subject: [PATCH] dm-43

---
 .../Detail/Message_Messaging_ViewModel.kt         | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/example/login_v3/home/Message/ViewModel/Detail/Message_Messaging_ViewModel.kt b/app/src/main/java/com/example/login_v3/home/Message/ViewModel/Detail/Message_Messaging_ViewModel.kt
index 9e17437..9753152 100644
--- a/app/src/main/java/com/example/login_v3/home/Message/ViewModel/Detail/Message_Messaging_ViewModel.kt
+++ b/app/src/main/java/com/example/login_v3/home/Message/ViewModel/Detail/Message_Messaging_ViewModel.kt
@@ -48,8 +48,13 @@ class ChatViewModel @Inject constructor(
     private val tokenManager: TokenManager
 ) : ViewModel() {
 
+    //reply function
     private val _replyingMessage = MutableStateFlow<Message?>(null)
     val replyingMessage: StateFlow<Message?> = _replyingMessage.asStateFlow()
+    // 💡 新增：當使用者點選某條訊息的「回覆」按鈕時呼叫
+    fun setReplyingMessage(message: Message?) {
+        _replyingMessage.value = message
+    }
 
     //UI state var
     private val _uiState = MutableStateFlow<MessagesUiState>(MessagesUiState.Loading)
@@ -119,10 +124,18 @@ class ChatViewModel @Inject constructor(
         viewModelScope.launch {
             _sendMessageState.value = SendMessageState.Loading
 
-            val result = repository.sendMessage(roomId, content, replyToId)
+            // 💡 取得當前是否有正在回覆的訊息 ID
+            val replyToId = _replyingMessage.value?.id
+
+            val result = repository.sendMessage(
+                roomId = roomId,
+                content = content,
+                replyToId = replyToId
+            )
 
             result.onSuccess { newMessage ->
                 _sendMessageState.value = SendMessageState.Success(newMessage)
+                _replyingMessage.value = null
 
                 // 😎【超讚的體驗優化】：發送成功後，直接把新訊息手動塞進現有的 UI 列表裡
                 val currentState = _uiState.value