From 77a4fb29af6155022d020b2dfc460dfa4c8bfb53 Mon Sep 17 00:00:00 2001
From: Naeun Kim <102296721+Nico1eKim@users.noreply.github.com>
Date: Tue, 22 Jul 2025 21:09:23 +0900
Subject: [PATCH 01/25] =?UTF-8?q?[ui]:=20=ED=88=AC=ED=91=9C=20=EB=82=B4?=
 =?UTF-8?q?=EC=9A=A9=20=EC=97=86=EC=9D=84=20=EB=95=8C=20ui=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80=20(#50)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../texthip/thip/ui/common/cards/CardVote.kt  | 114 ++++++++++--------
 .../thip/ui/group/room/mock/VoteData.kt       |   6 +-
 app/src/main/res/values/strings.xml           |   3 +-
 3 files changed, 70 insertions(+), 53 deletions(-)

diff --git a/app/src/main/java/com/texthip/thip/ui/common/cards/CardVote.kt b/app/src/main/java/com/texthip/thip/ui/common/cards/CardVote.kt
index 12df707f..7795853e 100644
--- a/app/src/main/java/com/texthip/thip/ui/common/cards/CardVote.kt
+++ b/app/src/main/java/com/texthip/thip/ui/common/cards/CardVote.kt
@@ -1,11 +1,13 @@
 package com.texthip.thip.ui.common.cards
 
 import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 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.pager.HorizontalPager
@@ -14,9 +16,7 @@ import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.mutableStateMapOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.toMutableStateList
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
@@ -30,17 +30,12 @@ import com.texthip.thip.ui.theme.ThipTheme.typography
 
 @Composable
 fun CardVote(
-    voteData: List<VoteData>
+    voteData: List<VoteData>,
+    onVoteClick: (VoteData) -> Unit = {}
 ) {
     val pageCount = voteData.size
     val pagerState = rememberPagerState(pageCount = { pageCount })
 
-    // 각 페이지별 상태 기억: 선택 인덱스, 선택 여부 포함한 voteItems
-    val selectedIndexes = remember { mutableStateMapOf<Int, Int?>() }
-    val voteItemStates = remember {
-        voteData.map { it.voteItems.toMutableStateList() }.toMutableStateList()
-    }
-
     Column(
         modifier = Modifier
             .fillMaxWidth()
@@ -55,52 +50,65 @@ fun CardVote(
             modifier = Modifier.padding(horizontal = 12.dp)
         )
 
-        HorizontalPager(
-            state = pagerState,
-            modifier = Modifier.fillMaxWidth()
-        ) { page ->
-            val voteItems = voteItemStates[page]
-            val selectedIndex = selectedIndexes[page]
-            val hasVoted = voteItems.any { it.isVoted }
-
-            Column(
-                modifier = Modifier.padding(horizontal = 12.dp),
-                verticalArrangement = Arrangement.spacedBy(10.dp)
+        if (voteData.isEmpty()) {
+            Box(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .padding(top = 12.dp)
+                    .padding(vertical = 60.dp),
+                contentAlignment = Alignment.Center
             ) {
                 Text(
-                    text = voteData[page].description,
+                    text = stringResource(R.string.no_vote),
                     style = typography.info_m500_s12,
-                    color = colors.White,
-                )
-
-                GroupVoteButton(
-                    voteItems = voteItems,
-                    selectedIndex = selectedIndex,
-                    hasVoted = hasVoted,
-                    onOptionSelected = { index ->
-                        selectedIndexes[page] = if (selectedIndex == index) null else index
-
-                        voteItemStates[page] = voteItems.mapIndexed { i, item ->
-                            item.copy(isVoted = i == index && selectedIndex != index)
-                        }.toMutableStateList()
-                    }
+                    color = colors.Grey
                 )
             }
-        }
+        } else {
+            HorizontalPager(
+                state = pagerState,
+                modifier = Modifier.fillMaxWidth()
+            ) { page ->
+                val vote = voteData[page]
+                val voteItems = vote.voteItems.take(3) // 최대 3개만
 
-        Row(
-            Modifier
-                .fillMaxWidth(),
-            horizontalArrangement = Arrangement.Center
-        ) {
-            repeat(pageCount) { iteration ->
-                val color = if (pagerState.currentPage == iteration) colors.White else colors.Grey02
-                Box(
+                Column(
                     modifier = Modifier
+                        .height(176.dp)
                         .padding(horizontal = 12.dp)
-                        .background(color, CircleShape)
-                        .size(4.dp)
-                )
+                        .clickable { onVoteClick(vote) }, // 전체 클릭 시 이동
+                    verticalArrangement = Arrangement.spacedBy(10.dp)
+                ) {
+                    Text(
+                        text = vote.description,
+                        style = typography.info_m500_s12,
+                        color = colors.White,
+                    )
+
+                    GroupVoteButton(
+                        voteItems = voteItems,
+                        selectedIndex = null, // 표시용이므로 선택 없음
+                        hasVoted = false, // 투표 상태 없음
+                        onOptionSelected = { onVoteClick(vote) } // 어떤 항목을 눌러도 이동
+                    )
+                }
+            }
+
+            Row(
+                Modifier
+                    .fillMaxWidth(),
+                horizontalArrangement = Arrangement.Center
+            ) {
+                repeat(pageCount) { iteration ->
+                    val color =
+                        if (pagerState.currentPage == iteration) colors.White else colors.Grey02
+                    Box(
+                        modifier = Modifier
+                            .padding(horizontal = 12.dp)
+                            .background(color, CircleShape)
+                            .size(4.dp)
+                    )
+                }
             }
         }
     }
@@ -109,5 +117,13 @@ fun CardVote(
 @Preview
 @Composable
 private fun CardVotePreview() {
-    CardVote(voteData = mockVoteData)
+    Column(
+        modifier = Modifier
+            .fillMaxWidth()
+            .padding(16.dp),
+        verticalArrangement = Arrangement.spacedBy(16.dp)
+    ) {
+        CardVote(voteData = mockVoteData)
+        CardVote(voteData = emptyList())
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/texthip/thip/ui/group/room/mock/VoteData.kt b/app/src/main/java/com/texthip/thip/ui/group/room/mock/VoteData.kt
index 638cd8f7..acff9b1a 100644
--- a/app/src/main/java/com/texthip/thip/ui/group/room/mock/VoteData.kt
+++ b/app/src/main/java/com/texthip/thip/ui/group/room/mock/VoteData.kt
@@ -13,9 +13,9 @@ val mockVoteData = listOf(
         voteItems = listOf(
             VoteItem(1, "김땡땡", 50, false),
             VoteItem(2, "이땡땡", 10, false),
-            VoteItem(3, "박땡땡", 20, false),
-            VoteItem(4, "최땡땡", 15, false),
-            VoteItem(5, "정땡땡", 5, false)
+//            VoteItem(3, "박땡땡", 20, false),
+//            VoteItem(4, "최땡땡", 15, false),
+//            VoteItem(5, "정땡땡", 5, false)
         )
     ),
     VoteData(
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1b87df01..dd424c49 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -50,7 +50,8 @@
     <string name="card_book_explain">도서 소개</string>
     <string name="card_author">%1$s 저</string>
     <string name="record_book">기록장</string>
-    <string name="vote_title">🔥모임방의 뜨거운 감자</string>
+    <string name="vote_title">모임방의 뜨거운 감자</string>
+    <string name="no_vote">모임방에 생성된 투표가 없어요</string>
 
     <!--    top app bar 컴포넌트    -->
     <string name="subscriber">님의 구독자</string>

From 716d88122775067c9d9c8a6e49f6c66e01047d03 Mon Sep 17 00:00:00 2001
From: Naeun Kim <102296721+Nico1eKim@users.noreply.github.com>
Date: Wed, 23 Jul 2025 00:23:01 +0900
Subject: [PATCH 02/25] =?UTF-8?q?[refactor]:=20=EB=B0=A9=20=EC=82=AD?=
 =?UTF-8?q?=EC=A0=9C,=20=EB=82=98=EA=B0=80=EA=B8=B0=20=EB=B0=94=ED=85=80?=
 =?UTF-8?q?=EC=8B=9C=ED=8A=B8=20=EB=B0=8F=20=EB=AA=A8=EB=8B=AC=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95=20(#50)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ui/common/bottomsheet/MenuBottomSheet.kt  | 46 ++++++-----
 .../ui/group/room/screen/GroupRoomScreen.kt   | 81 +++++++++++++++----
 app/src/main/res/values/strings.xml           |  4 +
 3 files changed, 95 insertions(+), 36 deletions(-)

diff --git a/app/src/main/java/com/texthip/thip/ui/common/bottomsheet/MenuBottomSheet.kt b/app/src/main/java/com/texthip/thip/ui/common/bottomsheet/MenuBottomSheet.kt
index 1a32c7bd..ebda7048 100644
--- a/app/src/main/java/com/texthip/thip/ui/common/bottomsheet/MenuBottomSheet.kt
+++ b/app/src/main/java/com/texthip/thip/ui/common/bottomsheet/MenuBottomSheet.kt
@@ -27,30 +27,32 @@ fun MenuBottomSheet(
     CustomBottomSheet(
         onDismiss = onDismiss,
     ) {
-        items.forEachIndexed { index, item ->
-            if (index > 0) {
-                Spacer(modifier = Modifier.height(8.dp))
-                HorizontalDivider(modifier = Modifier.height(1.dp), color = colors.Grey03)
-                Spacer(modifier = Modifier.height(8.dp))
-            }
+        Column(modifier = Modifier.padding(20.dp)) {
+            items.forEachIndexed { index, item ->
+                if (index > 0) {
+                    Spacer(modifier = Modifier.height(8.dp))
+                    HorizontalDivider(modifier = Modifier.height(1.dp), color = colors.Grey03)
+                    Spacer(modifier = Modifier.height(8.dp))
+                }
 
-            Column(
-                modifier = Modifier
-                    .height(50.dp)
-                    .padding(horizontal = 12.dp, vertical = 8.dp),
-                verticalArrangement = Arrangement.Center
-            ) {
-                Text(
-                    text = item.text,
-                    style = typography.menu_m500_s16_h24,
-                    color = item.color,
+                Column(
                     modifier = Modifier
-                        .fillMaxWidth()
-                        .clickable {
-                            item.onClick()
-                            onDismiss()
-                        }
-                )
+                        .height(50.dp)
+                        .padding(horizontal = 12.dp, vertical = 8.dp),
+                    verticalArrangement = Arrangement.Center
+                ) {
+                    Text(
+                        text = item.text,
+                        style = typography.menu_m500_s16_h24,
+                        color = item.color,
+                        modifier = Modifier
+                            .fillMaxWidth()
+                            .clickable {
+                                item.onClick()
+                                onDismiss()
+                            }
+                    )
+                }
             }
         }
     }
diff --git a/app/src/main/java/com/texthip/thip/ui/group/room/screen/GroupRoomScreen.kt b/app/src/main/java/com/texthip/thip/ui/group/room/screen/GroupRoomScreen.kt
index 92521fdd..9b42ef22 100644
--- a/app/src/main/java/com/texthip/thip/ui/group/room/screen/GroupRoomScreen.kt
+++ b/app/src/main/java/com/texthip/thip/ui/group/room/screen/GroupRoomScreen.kt
@@ -16,6 +16,7 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.blur
 import androidx.compose.ui.layout.ContentScale
@@ -25,6 +26,7 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.texthip.thip.R
 import com.texthip.thip.ui.common.bottomsheet.MenuBottomSheet
+import com.texthip.thip.ui.common.modal.DialogPopup
 import com.texthip.thip.ui.common.topappbar.GradationTopAppBar
 import com.texthip.thip.ui.group.room.component.GroupRoomBody
 import com.texthip.thip.ui.group.room.component.GroupRoomHeader
@@ -41,9 +43,13 @@ fun GroupRoomScreen() {
     val scrollState = rememberScrollState()
 
     var isBottomSheetVisible by remember { mutableStateOf(false) }
+    var isLeaveDialogVisible by remember { mutableStateOf(false) }
+    var isDeleteDialogVisible by remember { mutableStateOf(false) }
+
+    val isOwner = false // 서버에서 받아오기
 
     Box(
-        if (isBottomSheetVisible) {
+        if (isBottomSheetVisible || isLeaveDialogVisible || isDeleteDialogVisible) {
             Modifier
                 .fillMaxSize()
                 .blur(5.dp)
@@ -98,29 +104,76 @@ fun GroupRoomScreen() {
     }
 
     if (isBottomSheetVisible) {
-        MenuBottomSheet(
-            items = listOf(
+        val menuItems = if (isOwner) {
+            // 방 주인일 때
+            listOf(
+                MenuBottomSheetItem(
+                    text = stringResource(R.string.delete_room),
+                    color = colors.Red,
+                    onClick = { isDeleteDialogVisible = true }
+                )
+            )
+        } else {
+            // 방 참여자일 때
+            listOf(
                 MenuBottomSheetItem(
                     text = stringResource(R.string.leave_room),
                     color = colors.White,
-                    onClick = { }
+                    onClick = { isLeaveDialogVisible = true }
                 ),
                 MenuBottomSheetItem(
                     text = stringResource(R.string.report_room),
                     color = colors.Red,
-                    onClick = { }
-                ),
-                MenuBottomSheetItem(
-                    text = stringResource(R.string.delete_room),
-                    color = colors.Red,
-                    onClick = { }
+                    onClick = { /* 신고 로직 */ }
                 )
-            ),
-            onDismiss = {
-                isBottomSheetVisible = false
-            }
+            )
+        }
+
+        MenuBottomSheet(
+            items = menuItems,
+            onDismiss = { isBottomSheetVisible = false }
         )
     }
+
+    if (isLeaveDialogVisible) {
+        Box(
+            modifier = Modifier
+                .fillMaxSize(),
+            contentAlignment = Alignment.Center
+        ) {
+            DialogPopup(
+                title = stringResource(R.string.leave_room_modal_title),
+                description = stringResource(R.string.leave_room_modal_content),
+                onConfirm = {
+                    // 방 나가기 로직
+                    isLeaveDialogVisible = false
+                },
+                onCancel = {
+                    isLeaveDialogVisible = false
+                }
+            )
+        }
+    }
+
+    if (isDeleteDialogVisible) {
+        Box(
+            modifier = Modifier
+                .fillMaxSize(),
+            contentAlignment = Alignment.Center
+        ) {
+            DialogPopup(
+                title = stringResource(R.string.delete_room_modal_title),
+                description = stringResource(R.string.delete_room_modal_content),
+                onConfirm = {
+                    // 방 삭제하기 로직
+                    isDeleteDialogVisible = false
+                },
+                onCancel = {
+                    isDeleteDialogVisible = false
+                }
+            )
+        }
+    }
 }
 
 @Preview
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index dd424c49..6973e548 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -149,8 +149,12 @@
     <string name="comment_to">님에게 답글 작성</string>
     <string name="group_room_chat_hint">메이트들과 간단한 인사를 나눠보세요!</string>
     <string name="leave_room">방 나가기</string>
+    <string name="leave_room_modal_title">모임방을 나가시겠어요?</string>
+    <string name="leave_room_modal_content">방을 나가시게 되면\n독서메이트들과의 추억이 사라집니다.</string>
     <string name="report_room">방 신고하기</string>
     <string name="delete_room">방 삭제하기</string>
+    <string name="delete_room_modal_title">모임방을 삭제하시겠어요?</string>
+    <string name="delete_room_modal_content">방을 삭제하게 되면\n독서메이트들과의 추억이 사라집니다.</string>
 
     <!--    group note    -->
     <string name="tilde">~</string>

From 617aaa5e81560a9fa80096e593232ece218a7e3a Mon Sep 17 00:00:00 2001
From: Naeun Kim <102296721+Nico1eKim@users.noreply.github.com>
Date: Wed, 23 Jul 2025 00:46:22 +0900
Subject: [PATCH 03/25] =?UTF-8?q?[chore]:=20=EB=B0=A9=20=EA=B2=80=EC=83=89?=
 =?UTF-8?q?=20=ED=8F=B4=EB=8D=94=20=EA=B5=AC=EC=A1=B0=20=EC=88=98=EC=A0=95?=
 =?UTF-8?q?=20(#50)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../screen/GroupRoomRecruitScreen.kt}            | 16 ++++++++--------
 .../screen/GroupRoomUnlockScreen.kt}             | 11 ++++++-----
 .../component/GroupEmptyResult.kt}               |  4 ++--
 .../component/GroupFilteredSearchResult.kt}      |  6 +++---
 .../component/GroupLiveSearchResult.kt}          |  4 ++--
 .../component/GroupRecentSearch.kt}              | 10 +++++-----
 .../screen/GroupSearchScreen.kt                  | 16 ++++++++++------
 7 files changed, 36 insertions(+), 31 deletions(-)
 rename app/src/main/java/com/texthip/thip/ui/group/{myroom/screen/GroupRoomScreen.kt => room/screen/GroupRoomRecruitScreen.kt} (98%)
 rename app/src/main/java/com/texthip/thip/ui/group/{myroom/screen/GroupRoomSecretScreen.kt => room/screen/GroupRoomUnlockScreen.kt} (96%)
 rename app/src/main/java/com/texthip/thip/ui/group/{myroom/screen/GroupEmptyResultScreen.kt => search/component/GroupEmptyResult.kt} (93%)
 rename app/src/main/java/com/texthip/thip/ui/group/{myroom/screen/GroupFilteredSearchResultScreen.kt => search/component/GroupFilteredSearchResult.kt} (96%)
 rename app/src/main/java/com/texthip/thip/ui/group/{myroom/screen/GroupLiveSearchResultScreen.kt => search/component/GroupLiveSearchResult.kt} (94%)
 rename app/src/main/java/com/texthip/thip/ui/group/{myroom/screen/GroupRecentSearchScreen.kt => search/component/GroupRecentSearch.kt} (95%)
 rename app/src/main/java/com/texthip/thip/ui/group/{myroom => search}/screen/GroupSearchScreen.kt (93%)

diff --git a/app/src/main/java/com/texthip/thip/ui/group/myroom/screen/GroupRoomScreen.kt b/app/src/main/java/com/texthip/thip/ui/group/room/screen/GroupRoomRecruitScreen.kt
similarity index 98%
rename from app/src/main/java/com/texthip/thip/ui/group/myroom/screen/GroupRoomScreen.kt
rename to app/src/main/java/com/texthip/thip/ui/group/room/screen/GroupRoomRecruitScreen.kt
index 269577eb..e9614956 100644
--- a/app/src/main/java/com/texthip/thip/ui/group/myroom/screen/GroupRoomScreen.kt
+++ b/app/src/main/java/com/texthip/thip/ui/group/room/screen/GroupRoomRecruitScreen.kt
@@ -1,4 +1,4 @@
-package com.texthip.thip.ui.group.myroom.screen
+package com.texthip.thip.ui.group.room.screen
 
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
@@ -51,7 +51,7 @@ import com.texthip.thip.ui.theme.ThipTheme.typography
 import kotlinx.coroutines.delay
 
 @Composable
-fun GroupRoomScreen(
+fun GroupRoomRecruitScreen(
     detail: GroupRoomData,
     buttonType: GroupBottomButtonType,
     onRecommendationClick: (GroupCardItemRoomData) -> Unit = {},
@@ -437,7 +437,7 @@ fun GroupRoomScreen(
 
 @Preview(name = "참여 버튼 상태")
 @Composable
-fun GroupRoomScreenPreview_Join() {
+fun GroupRoomRecruitScreenPreviewJoin() {
     ThipTheme {
         val recommendations = listOf(
             GroupCardItemRoomData(
@@ -504,7 +504,7 @@ fun GroupRoomScreenPreview_Join() {
             recommendations = recommendations
         )
 
-        GroupRoomScreen(
+        GroupRoomRecruitScreen(
             detail = detailJoin,
             buttonType = GroupBottomButtonType.JOIN,
             onRecommendationClick = {},
@@ -518,7 +518,7 @@ fun GroupRoomScreenPreview_Join() {
 
 @Preview(name = "참여 취소 버튼 상태")
 @Composable
-fun GroupRoomScreenPreview_Cancel() {
+fun GroupRoomRecruitScreenPreviewCancel() {
     ThipTheme {
         val recommendations = listOf(
             GroupCardItemRoomData(
@@ -569,7 +569,7 @@ fun GroupRoomScreenPreview_Cancel() {
             recommendations = recommendations
         )
 
-        GroupRoomScreen(
+        GroupRoomRecruitScreen(
             detail = detailCancel,
             buttonType = GroupBottomButtonType.CANCEL,
             onRecommendationClick = {},
@@ -583,7 +583,7 @@ fun GroupRoomScreenPreview_Cancel() {
 
 @Preview(name = "모집 마감 버튼 상태")
 @Composable
-fun GroupRoomScreenPreview_Close() {
+fun GroupRoomRecruitScreenClose() {
     ThipTheme {
         val recommendations = listOf(
             GroupCardItemRoomData(
@@ -634,7 +634,7 @@ fun GroupRoomScreenPreview_Close() {
             recommendations = recommendations
         )
 
-        GroupRoomScreen(
+        GroupRoomRecruitScreen(
             detail = detailClose,
             buttonType = GroupBottomButtonType.CLOSE,
             onRecommendationClick = {},
diff --git a/app/src/main/java/com/texthip/thip/ui/group/myroom/screen/GroupRoomSecretScreen.kt b/app/src/main/java/com/texthip/thip/ui/group/room/screen/GroupRoomUnlockScreen.kt
similarity index 96%
rename from app/src/main/java/com/texthip/thip/ui/group/myroom/screen/GroupRoomSecretScreen.kt
rename to app/src/main/java/com/texthip/thip/ui/group/room/screen/GroupRoomUnlockScreen.kt
index 3cd62a38..52a36a10 100644
--- a/app/src/main/java/com/texthip/thip/ui/group/myroom/screen/GroupRoomSecretScreen.kt
+++ b/app/src/main/java/com/texthip/thip/ui/group/room/screen/GroupRoomUnlockScreen.kt
@@ -1,4 +1,4 @@
-package com.texthip.thip.ui.group.myroom.screen
+package com.texthip.thip.ui.group.room.screen
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
@@ -32,9 +32,10 @@ import com.texthip.thip.ui.common.topappbar.DefaultTopAppBar
 import com.texthip.thip.ui.theme.ThipTheme
 import com.texthip.thip.ui.theme.ThipTheme.colors
 import com.texthip.thip.ui.theme.ThipTheme.typography
+import kotlinx.coroutines.delay
 
 @Composable
-fun GroupRoomSecretScreen(
+fun GroupRoomUnlockScreen(
     onBackClick: () -> Unit = {},
     onPasswordComplete: (String) -> Unit = {},
     correctPassword: String = "1234" // 실제로는 외부에서 받아올 값
@@ -53,7 +54,7 @@ fun GroupRoomSecretScreen(
                 onPasswordComplete(fullPassword)
             } else {
                 showError = true
-                kotlinx.coroutines.delay(1000)
+                delay(1000)
                 password = arrayOf("", "", "", "")
                 showError = false
                 focusRequesters[0].requestFocus()
@@ -157,9 +158,9 @@ fun GroupRoomSecretScreen(
 
 @Preview(showBackground = true)
 @Composable
-fun GroupRoomSecretScreenPreview() {
+fun GroupRoomUnlockScreenPreview() {
     ThipTheme {
-        GroupRoomSecretScreen(
+        GroupRoomUnlockScreen(
             onBackClick = {},
             onPasswordComplete = { password ->
             },
diff --git a/app/src/main/java/com/texthip/thip/ui/group/myroom/screen/GroupEmptyResultScreen.kt b/app/src/main/java/com/texthip/thip/ui/group/search/component/GroupEmptyResult.kt
similarity index 93%
rename from app/src/main/java/com/texthip/thip/ui/group/myroom/screen/GroupEmptyResultScreen.kt
rename to app/src/main/java/com/texthip/thip/ui/group/search/component/GroupEmptyResult.kt
index 0cf28824..2ecaca4a 100644
--- a/app/src/main/java/com/texthip/thip/ui/group/myroom/screen/GroupEmptyResultScreen.kt
+++ b/app/src/main/java/com/texthip/thip/ui/group/search/component/GroupEmptyResult.kt
@@ -1,4 +1,4 @@
-package com.texthip.thip.ui.group.myroom.screen
+package com.texthip.thip.ui.group.search.component
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -12,7 +12,7 @@ import androidx.compose.ui.unit.dp
 import com.texthip.thip.ui.theme.ThipTheme
 
 @Composable
-fun GroupEmptyResultScreen(
+fun GroupEmptyResult(
     mainText: String,
     subText: String
 ) {
diff --git a/app/src/main/java/com/texthip/thip/ui/group/myroom/screen/GroupFilteredSearchResultScreen.kt b/app/src/main/java/com/texthip/thip/ui/group/search/component/GroupFilteredSearchResult.kt
similarity index 96%
rename from app/src/main/java/com/texthip/thip/ui/group/myroom/screen/GroupFilteredSearchResultScreen.kt
rename to app/src/main/java/com/texthip/thip/ui/group/search/component/GroupFilteredSearchResult.kt
index f18ac4c3..9d688020 100644
--- a/app/src/main/java/com/texthip/thip/ui/group/myroom/screen/GroupFilteredSearchResultScreen.kt
+++ b/app/src/main/java/com/texthip/thip/ui/group/search/component/GroupFilteredSearchResult.kt
@@ -1,4 +1,4 @@
-package com.texthip.thip.ui.group.myroom.screen
+package com.texthip.thip.ui.group.search.component
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
@@ -23,7 +23,7 @@ import com.texthip.thip.ui.group.myroom.mock.GroupCardItemRoomData
 import com.texthip.thip.ui.theme.ThipTheme
 
 @Composable
-fun GroupFilteredSearchResultScreen(
+fun GroupFilteredSearchResult(
     genres: List<String>,
     selectedGenreIndex: Int,
     onGenreSelect: (Int) -> Unit,
@@ -58,7 +58,7 @@ fun GroupFilteredSearchResultScreen(
             .background(colors.DarkGrey02)
     )
     if (roomList.isEmpty()) {
-        GroupEmptyResultScreen(
+        GroupEmptyResult(
             mainText = stringResource(R.string.group_no_search_result1),
             subText = stringResource(R.string.group_no_search_result2)
         )
diff --git a/app/src/main/java/com/texthip/thip/ui/group/myroom/screen/GroupLiveSearchResultScreen.kt b/app/src/main/java/com/texthip/thip/ui/group/search/component/GroupLiveSearchResult.kt
similarity index 94%
rename from app/src/main/java/com/texthip/thip/ui/group/myroom/screen/GroupLiveSearchResultScreen.kt
rename to app/src/main/java/com/texthip/thip/ui/group/search/component/GroupLiveSearchResult.kt
index abf2ea50..b5244d7b 100644
--- a/app/src/main/java/com/texthip/thip/ui/group/myroom/screen/GroupLiveSearchResultScreen.kt
+++ b/app/src/main/java/com/texthip/thip/ui/group/search/component/GroupLiveSearchResult.kt
@@ -1,4 +1,4 @@
-package com.texthip.thip.ui.group.myroom.screen
+package com.texthip.thip.ui.group.search.component
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
@@ -15,7 +15,7 @@ import com.texthip.thip.ui.group.myroom.mock.GroupCardItemRoomData
 import com.texthip.thip.ui.theme.ThipTheme.colors
 
 @Composable
-fun GroupLiveSearchResultScreen(
+fun GroupLiveSearchResult(
     roomList: List<GroupCardItemRoomData>
 ) {
     LazyColumn(
diff --git a/app/src/main/java/com/texthip/thip/ui/group/myroom/screen/GroupRecentSearchScreen.kt b/app/src/main/java/com/texthip/thip/ui/group/search/component/GroupRecentSearch.kt
similarity index 95%
rename from app/src/main/java/com/texthip/thip/ui/group/myroom/screen/GroupRecentSearchScreen.kt
rename to app/src/main/java/com/texthip/thip/ui/group/search/component/GroupRecentSearch.kt
index 1958776f..23f5f0df 100644
--- a/app/src/main/java/com/texthip/thip/ui/group/myroom/screen/GroupRecentSearchScreen.kt
+++ b/app/src/main/java/com/texthip/thip/ui/group/search/component/GroupRecentSearch.kt
@@ -1,6 +1,9 @@
-package com.texthip.thip.ui.group.myroom.screen
+package com.texthip.thip.ui.group.search.component
 
 import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.FlowRow
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.height
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
@@ -9,12 +12,9 @@ import androidx.compose.ui.unit.dp
 import com.texthip.thip.R
 import com.texthip.thip.ui.common.buttons.GenreChipButton
 import com.texthip.thip.ui.theme.ThipTheme
-import androidx.compose.foundation.layout.FlowRow
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.height
 
 @Composable
-fun GroupRecentSearchScreen(
+fun GroupRecentSearch(
     recentSearches: List<String>,
     onSearchClick: (String) -> Unit,
     onRemove: (String) -> Unit
diff --git a/app/src/main/java/com/texthip/thip/ui/group/myroom/screen/GroupSearchScreen.kt b/app/src/main/java/com/texthip/thip/ui/group/search/screen/GroupSearchScreen.kt
similarity index 93%
rename from app/src/main/java/com/texthip/thip/ui/group/myroom/screen/GroupSearchScreen.kt
rename to app/src/main/java/com/texthip/thip/ui/group/search/screen/GroupSearchScreen.kt
index 43ec959c..76bd00c9 100644
--- a/app/src/main/java/com/texthip/thip/ui/group/myroom/screen/GroupSearchScreen.kt
+++ b/app/src/main/java/com/texthip/thip/ui/group/search/screen/GroupSearchScreen.kt
@@ -1,4 +1,4 @@
-package com.texthip.thip.ui.group.myroom.screen
+package com.texthip.thip.ui.group.search.screen
 
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
@@ -29,6 +29,10 @@ import com.texthip.thip.ui.common.buttons.FilterButton
 import com.texthip.thip.ui.common.forms.SearchBookTextField
 import com.texthip.thip.ui.common.topappbar.DefaultTopAppBar
 import com.texthip.thip.ui.group.myroom.mock.GroupCardItemRoomData
+import com.texthip.thip.ui.group.search.component.GroupEmptyResult
+import com.texthip.thip.ui.group.search.component.GroupLiveSearchResult
+import com.texthip.thip.ui.group.search.component.GroupRecentSearch
+import com.texthip.thip.ui.group.search.component.GroupFilteredSearchResult
 import com.texthip.thip.ui.theme.ThipTheme
 
 @Composable
@@ -132,14 +136,14 @@ fun GroupSearchScreen(
 
                 when {
                     searchText.isBlank() && !isSearched && recentSearches.isEmpty() -> {
-                        GroupRecentSearchScreen(
+                        GroupRecentSearch(
                             recentSearches = emptyList(),
                             onSearchClick = {},
                             onRemove = {}
                         )
                     }
                     searchText.isBlank() && !isSearched && recentSearches.isNotEmpty() -> {
-                        GroupRecentSearchScreen(
+                        GroupRecentSearch(
                             recentSearches = recentSearches,
                             onSearchClick = { keyword ->
                                 searchText = keyword
@@ -152,18 +156,18 @@ fun GroupSearchScreen(
                     }
                     searchText.isNotBlank() && !isSearched -> {
                         if (liveFilteredRoomList.isEmpty()) {
-                            GroupEmptyResultScreen(
+                            GroupEmptyResult(
                                 mainText = stringResource(R.string.group_no_search_result1),
                                 subText = stringResource(R.string.group_no_search_result2)
                             )
                         } else {
-                            GroupLiveSearchResultScreen(
+                            GroupLiveSearchResult(
                                 roomList = liveFilteredRoomList
                             )
                         }
                     }
                     isSearched -> {
-                        GroupFilteredSearchResultScreen(
+                        GroupFilteredSearchResult(
                             genres = genres,
                             selectedGenreIndex = selectedGenreIndex,
                             onGenreSelect = { selectedGenreIndex = it },

From 605b0fd077b44b477157647659df95f45ab4cfe7 Mon Sep 17 00:00:00 2001
From: Naeun Kim <102296721+Nico1eKim@users.noreply.github.com>
Date: Wed, 23 Jul 2025 01:00:40 +0900
Subject: [PATCH 04/25] =?UTF-8?q?[ui]:=20=EC=98=A4=EB=8A=98=EC=9D=98=20?=
 =?UTF-8?q?=ED=95=9C=EB=A7=88=EB=94=94=20=EB=8C=93=EA=B8=80=20=EB=B0=94?=
 =?UTF-8?q?=ED=85=80=EC=8B=9C=ED=8A=B8=20=EC=B6=94=EA=B0=80=20(#50)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../thip/ui/common/cards/CardCommentGroup.kt  |  12 +-
 .../ui/group/room/mock/GroupRoomChatData.kt   |   3 +-
 .../group/room/screen/GroupRoomChatScreen.kt  | 168 +++++++++++++-----
 app/src/main/res/values/strings.xml           |   3 +
 4 files changed, 134 insertions(+), 52 deletions(-)

diff --git a/app/src/main/java/com/texthip/thip/ui/common/cards/CardCommentGroup.kt b/app/src/main/java/com/texthip/thip/ui/common/cards/CardCommentGroup.kt
index caf7a8e1..73036875 100644
--- a/app/src/main/java/com/texthip/thip/ui/common/cards/CardCommentGroup.kt
+++ b/app/src/main/java/com/texthip/thip/ui/common/cards/CardCommentGroup.kt
@@ -17,7 +17,8 @@ import com.texthip.thip.ui.theme.ThipTheme.typography
 
 @Composable
 fun CardCommentGroup(
-    data: GroupRoomChatData
+    data: GroupRoomChatData,
+    onMenuClick: () -> Unit
 ) {
     Column(
         modifier = Modifier
@@ -27,7 +28,8 @@ fun CardCommentGroup(
         ProfileBarWithDate(
             profileImage = data.profileImage,
             nickname = data.nickname,
-            dateText = data.date
+            dateText = data.date,
+            onMenuClick = onMenuClick
         )
         Spacer(Modifier.height(8.dp))
         Text(
@@ -47,7 +49,9 @@ private fun CardCommentGroupPreview() {
             profileImage = null,
             nickname = "user.01",
             date = "11시간 전",
-            content = "이것은 그룹 채팅의 댓글입니다. 이곳에 댓글 내용을 작성할 수 있습니다. 여러 줄로 작성해도 됩니다."
-        )
+            content = "이것은 그룹 채팅의 댓글입니다. 이곳에 댓글 내용을 작성할 수 있습니다. 여러 줄로 작성해도 됩니다.",
+            isMine = false
+        ),
+        onMenuClick = {}
     )
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/texthip/thip/ui/group/room/mock/GroupRoomChatData.kt b/app/src/main/java/com/texthip/thip/ui/group/room/mock/GroupRoomChatData.kt
index 039859bb..05324dbf 100644
--- a/app/src/main/java/com/texthip/thip/ui/group/room/mock/GroupRoomChatData.kt
+++ b/app/src/main/java/com/texthip/thip/ui/group/room/mock/GroupRoomChatData.kt
@@ -6,5 +6,6 @@ data class GroupRoomChatData(
     val profileImage: Painter?,
     val nickname: String,
     val date: String,
-    val content: String
+    val content: String,
+    val isMine: Boolean
 )
diff --git a/app/src/main/java/com/texthip/thip/ui/group/room/screen/GroupRoomChatScreen.kt b/app/src/main/java/com/texthip/thip/ui/group/room/screen/GroupRoomChatScreen.kt
index 1b86cb09..e7f12221 100644
--- a/app/src/main/java/com/texthip/thip/ui/group/room/screen/GroupRoomChatScreen.kt
+++ b/app/src/main/java/com/texthip/thip/ui/group/room/screen/GroupRoomChatScreen.kt
@@ -1,6 +1,7 @@
 package com.texthip.thip.ui.group.room.screen
 
 import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
@@ -14,15 +15,18 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.blur
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.texthip.thip.R
+import com.texthip.thip.ui.common.bottomsheet.MenuBottomSheet
 import com.texthip.thip.ui.common.cards.CardCommentGroup
 import com.texthip.thip.ui.common.forms.CommentTextField
 import com.texthip.thip.ui.common.topappbar.DefaultTopAppBar
 import com.texthip.thip.ui.common.view.CountingBar
 import com.texthip.thip.ui.group.room.mock.GroupRoomChatData
+import com.texthip.thip.ui.group.room.mock.MenuBottomSheetItem
 import com.texthip.thip.ui.theme.ThipTheme
 import com.texthip.thip.ui.theme.ThipTheme.colors
 
@@ -33,78 +37,148 @@ fun GroupRoomChatScreen() {
             null,
             "user.01",
             "2024.04.29",
-            "공백 포함 글자 입력입니다. 공백 포함 글자 입력입니다. 공백 포함 글자 입력입니다. 공백 포함 글자 입력입니다. 공백 포함 글자 입력입니다."
+            "공백 포함 글자 입력입니다. 공백 포함 글자 입력입니다. 공백 포함 글자 입력입니다. 공백 포함 글자 입력입니다. 공백 포함 글자 입력입니다.",
+            isMine = true
         ),
         GroupRoomChatData(
             null,
             "user.01",
             "2024.04.28",
-            "공백 포함 글자 입력입니다. 공백 포함 글자 입력입니다. 공백 포함 글자 입력입니다. 공백 포함 글자 입력입니다. 공백 포함 글자 입력입니다."
+            "공백 포함 글자 입력입니다. 공백 포함 글자 입력입니다. 공백 포함 글자 입력입니다. 공백 포함 글자 입력입니다. 공백 포함 글자 입력입니다.",
+            isMine = true
         ),
-        GroupRoomChatData(null, "user.01", "2024.04.30", "공백 포함 글자 입력입니다."),
-        GroupRoomChatData(null, "user.01", "2024.04.30", "공백 포함 글자 입력입니다. 공백 포함 글자 입력입니다."),
+        GroupRoomChatData(null, "user.01", "2024.04.30", "공백 포함 글자 입력입니다.", isMine = false),
         GroupRoomChatData(
             null,
             "user.01",
             "2024.04.30",
-            "공백 포함 글자 입력입니다. 공백 포함 글자 입력입니다. 공백 포함 글자 입력입니다. 공백 포함 글자 입력입니다. 공백 포함 글자 입력입니다."
+            "공백 포함 글자 입력입니다. 공백 포함 글자 입력입니다.",
+            isMine = true
+        ),
+        GroupRoomChatData(
+            null,
+            "user.01",
+            "2024.04.30",
+            "공백 포함 글자 입력입니다. 공백 포함 글자 입력입니다. 공백 포함 글자 입력입니다. 공백 포함 글자 입력입니다. 공백 포함 글자 입력입니다.",
+            isMine = false
         ),
     ).sortedByDescending { it.date }
 
     var input by remember { mutableStateOf("") }
     var replyTo by remember { mutableStateOf<String?>(null) }
 
-    Column(
-        modifier = Modifier
-            .fillMaxSize()
-    ) {
-        DefaultTopAppBar(
-            title = stringResource(R.string.group_room_chat),
-            onLeftClick = {},
-        )
+    var isBottomSheetVisible by remember { mutableStateOf(false) }
+    var selectedMessage by remember { mutableStateOf<GroupRoomChatData?>(null) }
 
-        LazyColumn(
-            reverseLayout = true,
-            modifier = Modifier.weight(1f),
-            verticalArrangement = Arrangement.spacedBy(20.dp)
+    Box(
+        if (isBottomSheetVisible) {
+            Modifier
+                .fillMaxSize()
+                .blur(5.dp)
+        } else {
+            Modifier.fillMaxSize()
+        }
+    ) {
+        Column(
+            modifier = Modifier
+                .fillMaxSize()
         ) {
-            itemsIndexed(messages) { index, message ->
-                val isNewDate = when {
-                    index == 0 -> true
-                    messages[index - 1].date != message.date -> true
-                    else -> false
-                }
+            DefaultTopAppBar(
+                title = stringResource(R.string.group_room_chat),
+                onLeftClick = {},
+            )
 
-                val isBottomItem = index == 0
+            LazyColumn(
+                reverseLayout = true,
+                modifier = Modifier.weight(1f),
+                verticalArrangement = Arrangement.spacedBy(20.dp)
+            ) {
+                itemsIndexed(messages) { index, message ->
+                    val isNewDate = when {
+                        index == 0 -> true
+                        messages[index - 1].date != message.date -> true
+                        else -> false
+                    }
+                    val isBottomItem = index == 0
 
-                Column(
-                    verticalArrangement = Arrangement.spacedBy(20.dp),
-                    modifier = if (isBottomItem) Modifier.padding(bottom = 20.dp) else Modifier
-                ) {
-                    if (isNewDate) {
-                        HorizontalDivider(
-                            color = colors.DarkGrey02,
-                            thickness = 10.dp
-                        )
-                        CountingBar(
-                            modifier = Modifier.align(Alignment.CenterHorizontally),
-                            content = message.date
+                    Column(
+                        verticalArrangement = Arrangement.spacedBy(20.dp),
+                        modifier = if (isBottomItem) Modifier.padding(bottom = 20.dp) else Modifier
+                    ) {
+                        if (isNewDate) {
+                            HorizontalDivider(
+                                color = colors.DarkGrey02,
+                                thickness = 10.dp
+                            )
+                            CountingBar(
+                                modifier = Modifier.align(Alignment.CenterHorizontally),
+                                content = message.date
+                            )
+                        }
+
+                        CardCommentGroup(
+                            data = message,
+                            onMenuClick = {
+                                selectedMessage = message
+                                isBottomSheetVisible = true
+                            }
                         )
                     }
-                    CardCommentGroup(data = message)
                 }
             }
+            CommentTextField(
+                input = input,
+                hint = stringResource(R.string.group_room_chat_hint),
+                onInputChange = { input = it },
+                onSendClick = {
+                    input = ""
+                    replyTo = null
+                },
+                replyTo = replyTo,
+                onCancelReply = { replyTo = null }
+            )
+        }
+    }
+
+    if (isBottomSheetVisible && selectedMessage != null) {
+        val menuItems = if (selectedMessage!!.isMine) {
+            listOf(
+                MenuBottomSheetItem(
+                    text = stringResource(R.string.modify),
+                    color = colors.White,
+                    onClick = {
+                        // TODO: 수정 처리
+                        isBottomSheetVisible = false
+                    }
+                ),
+                MenuBottomSheetItem(
+                    text = stringResource(R.string.delete),
+                    color = colors.Red,
+                    onClick = {
+                        // TODO: 삭제 처리
+                        isBottomSheetVisible = false
+                    }
+                )
+            )
+        } else {
+            listOf(
+                MenuBottomSheetItem(
+                    text = stringResource(R.string.report),
+                    color = colors.Red,
+                    onClick = {
+                        // TODO: 신고 처리
+                        isBottomSheetVisible = false
+                    }
+                )
+            )
         }
-        CommentTextField(
-            input = input,
-            hint = stringResource(R.string.group_room_chat_hint),
-            onInputChange = { input = it },
-            onSendClick = {
-                input = ""
-                replyTo = null
-            },
-            replyTo = replyTo,
-            onCancelReply = { replyTo = null }
+
+        MenuBottomSheet(
+            items = menuItems,
+            onDismiss = {
+                isBottomSheetVisible = false
+                selectedMessage = null
+            }
         )
     }
 }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6973e548..893c8ab4 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -155,6 +155,9 @@
     <string name="delete_room">방 삭제하기</string>
     <string name="delete_room_modal_title">모임방을 삭제하시겠어요?</string>
     <string name="delete_room_modal_content">방을 삭제하게 되면\n독서메이트들과의 추억이 사라집니다.</string>
+    <string name="delete">삭제하기</string>
+    <string name="modify">수정하기</string>
+    <string name="report">신고하기</string>
 
     <!--    group note    -->
     <string name="tilde">~</string>

From 35c34c020f34106cc90ee8f753f760760a31d5a6 Mon Sep 17 00:00:00 2001
From: Naeun Kim <102296721+Nico1eKim@users.noreply.github.com>
Date: Wed, 23 Jul 2025 01:08:07 +0900
Subject: [PATCH 05/25] =?UTF-8?q?[ui]:=20=EC=98=A4=EB=8A=98=EC=9D=98=20?=
 =?UTF-8?q?=ED=95=9C=EB=A7=88=EB=94=94=20=EC=97=86=EC=9D=84=20=EB=95=8C=20?=
 =?UTF-8?q?=ED=99=94=EB=A9=B4=20=EC=B6=94=EA=B0=80=20(#50)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../group/room/screen/GroupRoomChatScreen.kt  | 82 ++++++++++++-------
 app/src/main/res/values/strings.xml           |  2 +
 2 files changed, 54 insertions(+), 30 deletions(-)

diff --git a/app/src/main/java/com/texthip/thip/ui/group/room/screen/GroupRoomChatScreen.kt b/app/src/main/java/com/texthip/thip/ui/group/room/screen/GroupRoomChatScreen.kt
index e7f12221..72ee598f 100644
--- a/app/src/main/java/com/texthip/thip/ui/group/room/screen/GroupRoomChatScreen.kt
+++ b/app/src/main/java/com/texthip/thip/ui/group/room/screen/GroupRoomChatScreen.kt
@@ -8,6 +8,7 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
@@ -29,6 +30,7 @@ import com.texthip.thip.ui.group.room.mock.GroupRoomChatData
 import com.texthip.thip.ui.group.room.mock.MenuBottomSheetItem
 import com.texthip.thip.ui.theme.ThipTheme
 import com.texthip.thip.ui.theme.ThipTheme.colors
+import com.texthip.thip.ui.theme.ThipTheme.typography
 
 @Composable
 fun GroupRoomChatScreen() {
@@ -88,41 +90,61 @@ fun GroupRoomChatScreen() {
                 onLeftClick = {},
             )
 
-            LazyColumn(
-                reverseLayout = true,
-                modifier = Modifier.weight(1f),
-                verticalArrangement = Arrangement.spacedBy(20.dp)
-            ) {
-                itemsIndexed(messages) { index, message ->
-                    val isNewDate = when {
-                        index == 0 -> true
-                        messages[index - 1].date != message.date -> true
-                        else -> false
-                    }
-                    val isBottomItem = index == 0
-
+            if (messages.isEmpty()) {
                     Column(
-                        verticalArrangement = Arrangement.spacedBy(20.dp),
-                        modifier = if (isBottomItem) Modifier.padding(bottom = 20.dp) else Modifier
+                        modifier = Modifier
+                            .fillMaxSize(),
+                        horizontalAlignment = Alignment.CenterHorizontally,
+                        verticalArrangement = Arrangement.Center
                     ) {
-                        if (isNewDate) {
-                            HorizontalDivider(
-                                color = colors.DarkGrey02,
-                                thickness = 10.dp
-                            )
-                            CountingBar(
-                                modifier = Modifier.align(Alignment.CenterHorizontally),
-                                content = message.date
-                            )
+                        Text(
+                            text = stringResource(R.string.group_room_no_chat_title),
+                            style = typography.smalltitle_sb600_s18_h24,
+                            color = colors.White
+                        )
+                        Text(
+                            text = stringResource(R.string.group_room_no_chat_content),
+                            style = typography.copy_r400_s14,
+                            color = colors.Grey
+                        )
+                    }
+            } else {
+                LazyColumn(
+                    reverseLayout = true,
+                    modifier = Modifier.weight(1f),
+                    verticalArrangement = Arrangement.spacedBy(20.dp)
+                ) {
+                    itemsIndexed(messages) { index, message ->
+                        val isNewDate = when {
+                            index == 0 -> true
+                            messages[index - 1].date != message.date -> true
+                            else -> false
                         }
+                        val isBottomItem = index == 0
 
-                        CardCommentGroup(
-                            data = message,
-                            onMenuClick = {
-                                selectedMessage = message
-                                isBottomSheetVisible = true
+                        Column(
+                            verticalArrangement = Arrangement.spacedBy(20.dp),
+                            modifier = if (isBottomItem) Modifier.padding(bottom = 20.dp) else Modifier
+                        ) {
+                            if (isNewDate) {
+                                HorizontalDivider(
+                                    color = colors.DarkGrey02,
+                                    thickness = 10.dp
+                                )
+                                CountingBar(
+                                    modifier = Modifier.align(Alignment.CenterHorizontally),
+                                    content = message.date
+                                )
                             }
-                        )
+
+                            CardCommentGroup(
+                                data = message,
+                                onMenuClick = {
+                                    selectedMessage = message
+                                    isBottomSheetVisible = true
+                                }
+                            )
+                        }
                     }
                 }
             }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 893c8ab4..0f44fa33 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -158,6 +158,8 @@
     <string name="delete">삭제하기</string>
     <string name="modify">수정하기</string>
     <string name="report">신고하기</string>
+    <string name="group_room_no_chat_title">아직 대화가 없어요</string>
+    <string name="group_room_no_chat_content">첫번째 한마디를 남겨보세요!</string>
 
     <!--    group note    -->
     <string name="tilde">~</string>

From 2c3cab79743d163ca18e4f8ee6c8cc7bd08cb14c Mon Sep 17 00:00:00 2001
From: Naeun Kim <102296721+Nico1eKim@users.noreply.github.com>
Date: Wed, 23 Jul 2025 01:30:06 +0900
Subject: [PATCH 06/25] =?UTF-8?q?[refactor]:=20=EC=B4=9D=ED=8F=89=EB=B2=84?=
 =?UTF-8?q?=ED=8A=BC=20=EB=B9=84=ED=99=9C=EC=84=B1=ED=99=94=EC=9D=BC=20?=
 =?UTF-8?q?=EB=95=8C=20toast=20message=20=EB=9C=A8=EB=8F=84=EB=A1=9D=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95=20(#50)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ui/common/buttons/OptionChipButton.kt     |  13 +-
 .../note/component/FilterHeaderSection.kt     |   4 +-
 .../ui/group/note/screen/GroupNoteScreen.kt   | 243 ++++++++++--------
 app/src/main/res/values/strings.xml           |   1 +
 4 files changed, 149 insertions(+), 112 deletions(-)

diff --git a/app/src/main/java/com/texthip/thip/ui/common/buttons/OptionChipButton.kt b/app/src/main/java/com/texthip/thip/ui/common/buttons/OptionChipButton.kt
index a631aebf..21f0ba2a 100644
--- a/app/src/main/java/com/texthip/thip/ui/common/buttons/OptionChipButton.kt
+++ b/app/src/main/java/com/texthip/thip/ui/common/buttons/OptionChipButton.kt
@@ -32,10 +32,11 @@ fun OptionChipButton(
     modifier: Modifier = Modifier,
     text: String,
     isFilled: Boolean = false,
-    isSelected: Boolean? = null,  // 추가
+    isSelected: Boolean? = null,
     enabled: Boolean = true,
     textStyle: TextStyle = typography.info_r400_s12,
     onClick: () -> Unit,
+    onDisabledClick: () -> Unit = { }
 ) {
     var isClicked by remember { mutableStateOf(false) }
     val checked = isSelected ?: isClicked
@@ -69,9 +70,13 @@ fun OptionChipButton(
                 color = borderColor,
                 shape = RoundedCornerShape(20.dp)
             )
-            .clickable(enabled = enabled) {
-                if (isSelected == null) isClicked = !isClicked
-                onClick()
+            .clickable {
+                if (enabled) {
+                    if (isSelected == null) isClicked = !isClicked
+                    onClick()
+                } else {
+                    onDisabledClick.invoke()
+                }
             }
             .height(30.dp)
             .padding(horizontal = 12.dp),
diff --git a/app/src/main/java/com/texthip/thip/ui/group/note/component/FilterHeaderSection.kt b/app/src/main/java/com/texthip/thip/ui/group/note/component/FilterHeaderSection.kt
index b1452684..33e37221 100644
--- a/app/src/main/java/com/texthip/thip/ui/group/note/component/FilterHeaderSection.kt
+++ b/app/src/main/java/com/texthip/thip/ui/group/note/component/FilterHeaderSection.kt
@@ -31,6 +31,7 @@ fun FilterHeaderSection(
     onFirstPageChange: (String) -> Unit,
     onLastPageChange: (String) -> Unit,
     onTotalToggle: () -> Unit,
+    onDisabledClick: () -> Unit = { }
 ) {
     var isPageInputVisible by rememberSaveable { mutableStateOf(false) }
     val isPageFiltered = firstPage.isNotBlank() || lastPage.isNotBlank()
@@ -63,7 +64,8 @@ fun FilterHeaderSection(
                 isSelected = isTotalSelected,
                 enabled = totalEnabled,
                 textStyle = typography.menu_r400_s14_h24,
-                onClick = onTotalToggle
+                onClick = onTotalToggle,
+                onDisabledClick = onDisabledClick
             )
         }
 
diff --git a/app/src/main/java/com/texthip/thip/ui/group/note/screen/GroupNoteScreen.kt b/app/src/main/java/com/texthip/thip/ui/group/note/screen/GroupNoteScreen.kt
index 8a5cfbb1..77bcb364 100644
--- a/app/src/main/java/com/texthip/thip/ui/group/note/screen/GroupNoteScreen.kt
+++ b/app/src/main/java/com/texthip/thip/ui/group/note/screen/GroupNoteScreen.kt
@@ -12,6 +12,7 @@ import androidx.compose.foundation.lazy.items
 import androidx.compose.material3.Icon
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.mutableStateOf
@@ -25,11 +26,13 @@ import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import androidx.compose.ui.zIndex
 import com.texthip.thip.R
 import com.texthip.thip.ui.common.buttons.ExpandableFloatingButton
 import com.texthip.thip.ui.common.buttons.FabMenuItem
 import com.texthip.thip.ui.common.buttons.FilterButton
 import com.texthip.thip.ui.common.header.HeaderMenuBarTab
+import com.texthip.thip.ui.common.modal.ToastWithDate
 import com.texthip.thip.ui.common.topappbar.DefaultTopAppBar
 import com.texthip.thip.ui.group.note.component.CommentBottomSheet
 import com.texthip.thip.ui.group.note.component.FilterHeaderSection
@@ -42,6 +45,7 @@ import com.texthip.thip.ui.group.note.mock.mockGroupNoteItems
 import com.texthip.thip.ui.theme.ThipTheme
 import com.texthip.thip.ui.theme.ThipTheme.colors
 import com.texthip.thip.ui.theme.ThipTheme.typography
+import kotlinx.coroutines.delay
 
 @Composable
 fun GroupNoteScreen() {
@@ -66,6 +70,16 @@ fun GroupNoteScreen() {
     var selectedNoteRecord by remember { mutableStateOf<GroupNoteRecord?>(null) }
     var selectedNoteVote by remember { mutableStateOf<GroupNoteVote?>(null) }
 
+    var showToast by remember { mutableStateOf(false) }
+
+    // 토스트 3초
+    LaunchedEffect(showToast) {
+        if (showToast) {
+            delay(3000) // TODO: 수정 가능
+            showToast = false
+        }
+    }
+
     Box(
         if (isBottomSheetVisible) {
             Modifier
@@ -75,126 +89,141 @@ fun GroupNoteScreen() {
             Modifier.fillMaxSize()
         }
     ) {
-        Column(modifier = Modifier.fillMaxSize()) {
-            DefaultTopAppBar(
-                title = stringResource(R.string.record_book),
-                onLeftClick = {}
-            )
+        Box {
+            // 토스트 팝업
+            if (showToast) {
+                ToastWithDate(
+                    message = stringResource(R.string.condition_of_view_general_review),
+                    modifier = Modifier
+                        .align(Alignment.TopCenter)
+                        .padding(horizontal = 20.dp, vertical = 16.dp)
+                        .zIndex(2f)
+                )
+            }
 
-            HeaderMenuBarTab(
-                titles = tabs,
-                selectedTabIndex = selectedTabIndex,
-                onTabSelected = { selectedTabIndex = it },
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .padding(top = 20.dp, bottom = 56.dp)
-            )
+            Column(modifier = Modifier.fillMaxSize()) {
+                DefaultTopAppBar(
+                    title = stringResource(R.string.record_book),
+                    onLeftClick = {}
+                )
 
-            // 피드 리스트 영역
-            LazyColumn(
-                modifier = Modifier
-                    .fillMaxSize()
-                    .padding(bottom = 82.dp),
-            ) {
-                item {
-                    Row(
-                        modifier = Modifier.padding(
-                            start = 20.dp,
-                            end = 20.dp,
-                            bottom = 16.dp,
-                            top = 20.dp
-                        ),
-                        verticalAlignment = Alignment.CenterVertically,
-                        horizontalArrangement = Arrangement.spacedBy(4.dp),
-                    ) {
-                        Icon(
-                            painterResource(R.drawable.ic_information),
-                            contentDescription = null,
-                            tint = colors.White,
-                        )
-                        Text(
-                            text = stringResource(R.string.group_note_info),
-                            modifier = Modifier.padding(start = 8.dp),
-                            color = colors.Grey01,
-                            style = typography.info_r400_s12
-                        )
+                HeaderMenuBarTab(
+                    titles = tabs,
+                    selectedTabIndex = selectedTabIndex,
+                    onTabSelected = { selectedTabIndex = it },
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .padding(top = 20.dp, bottom = 56.dp)
+                )
+
+
+                // 피드 리스트 영역
+                LazyColumn(
+                    modifier = Modifier
+                        .fillMaxSize()
+                        .padding(bottom = 82.dp),
+                ) {
+                    item {
+                        Row(
+                            modifier = Modifier.padding(
+                                start = 20.dp,
+                                end = 20.dp,
+                                bottom = 16.dp,
+                                top = 20.dp
+                            ),
+                            verticalAlignment = Alignment.CenterVertically,
+                            horizontalArrangement = Arrangement.spacedBy(4.dp),
+                        ) {
+                            Icon(
+                                painterResource(R.drawable.ic_information),
+                                contentDescription = null,
+                                tint = colors.White,
+                            )
+                            Text(
+                                text = stringResource(R.string.group_note_info),
+                                modifier = Modifier.padding(start = 8.dp),
+                                color = colors.Grey01,
+                                style = typography.info_r400_s12
+                            )
+                        }
                     }
-                }
-                items(filteredItems) { item ->
-                    when (item) {
-                        is GroupNoteRecord -> TextCommentCard(
-                            data = item,
-                            onCommentClick = {
-                                selectedNoteRecord = item
-                                isBottomSheetVisible = true
-                            }
-                        )
-
-                        is GroupNoteVote -> VoteCommentCard(
-                            data = item,
-                            onCommentClick = {
-                                selectedNoteVote = item
-                                isBottomSheetVisible = true
-                            }
-                        )
+                    items(filteredItems) { item ->
+                        when (item) {
+                            is GroupNoteRecord -> TextCommentCard(
+                                data = item,
+                                onCommentClick = {
+                                    selectedNoteRecord = item
+                                    isBottomSheetVisible = true
+                                }
+                            )
+
+                            is GroupNoteVote -> VoteCommentCard(
+                                data = item,
+                                onCommentClick = {
+                                    selectedNoteVote = item
+                                    isBottomSheetVisible = true
+                                }
+                            )
+                        }
                     }
                 }
             }
-        }
 
-        Box(
-            modifier = Modifier
-                .fillMaxWidth()
-                .padding(top = 136.dp),
-        ) {
-            FilterButton(
+            Box(
                 modifier = Modifier
-                    .align(Alignment.CenterEnd)
-                    .padding(end = 20.dp),
-                selectedOption = selectedFilter,
-                options = filters,
-                onOptionSelected = { selectedFilter = it }
-            )
+                    .fillMaxWidth()
+                    .padding(top = 136.dp),
+            ) {
+                FilterButton(
+                    modifier = Modifier
+                        .align(Alignment.CenterEnd)
+                        .padding(end = 20.dp),
+                    selectedOption = selectedFilter,
+                    options = filters,
+                    onOptionSelected = { selectedFilter = it }
+                )
 
-            FilterHeaderSection(
-                firstPage = firstPage,
-                lastPage = lastPage,
-                isTotalSelected = isTotalSelected,
-                totalEnabled = totalEnabled,
-                onFirstPageChange = { firstPage = it },
-                onLastPageChange = { lastPage = it },
-                onTotalToggle = { isTotalSelected = !isTotalSelected },
-            )
-        }
+                FilterHeaderSection(
+                    firstPage = firstPage,
+                    lastPage = lastPage,
+                    isTotalSelected = isTotalSelected,
+                    totalEnabled = totalEnabled,
+                    onFirstPageChange = { firstPage = it },
+                    onLastPageChange = { lastPage = it },
+                    onTotalToggle = { isTotalSelected = !isTotalSelected },
+                    onDisabledClick = { showToast = true }
+                )
+            }
 
-        ExpandableFloatingButton(
-            menuItems = listOf(
-                FabMenuItem(
-                    icon = painterResource(R.drawable.ic_write),
-                    text = stringResource(R.string.write_record),
-                    onClick = { }
-                ),
-                FabMenuItem(
-                    icon = painterResource(R.drawable.ic_vote),
-                    text = stringResource(R.string.create_vote),
-                    onClick = { }
+            ExpandableFloatingButton(
+                menuItems = listOf(
+                    FabMenuItem(
+                        icon = painterResource(R.drawable.ic_write),
+                        text = stringResource(R.string.write_record),
+                        onClick = { }
+                    ),
+                    FabMenuItem(
+                        icon = painterResource(R.drawable.ic_vote),
+                        text = stringResource(R.string.create_vote),
+                        onClick = { }
+                    )
                 )
             )
-        )
-    }
+        }
 
-    if (isBottomSheetVisible && (selectedNoteRecord != null || selectedNoteVote != null)) {
-        CommentBottomSheet(
-            commentResponse = listOf(mockComment, mockComment, mockComment),
-            onDismiss = {
-                isBottomSheetVisible = false
-                selectedNoteRecord = null
-                selectedNoteVote = null
-            },
-            onSendReply = { replyText, commentId, replyTo ->
-                // 댓글 전송 로직 구현
-            }
-        )
+        if (isBottomSheetVisible && (selectedNoteRecord != null || selectedNoteVote != null)) {
+            CommentBottomSheet(
+                commentResponse = listOf(mockComment, mockComment, mockComment),
+                onDismiss = {
+                    isBottomSheetVisible = false
+                    selectedNoteRecord = null
+                    selectedNoteVote = null
+                },
+                onSendReply = { replyText, commentId, replyTo ->
+                    // 댓글 전송 로직 구현
+                }
+            )
+        }
     }
 }
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0f44fa33..b771bdb5 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -197,6 +197,7 @@
     <string name="vote_title_placeholder">투표 내용을 20자 이내로 입력하세요.</string>
     <string name="vote_content_placeholder">항목을 20자 이내로 입력</string>
     <string name="add_content">항목 추가</string>
+    <string name="condition_of_view_general_review">독서 진행도 80% 이상부터 총평을 볼 수 있어요.</string>
 
     <!--    alarm    -->
     <string name="alarm_feed">피드</string>

From 60288143eefaab84961374615c762054d76e36b9 Mon Sep 17 00:00:00 2001
From: Naeun Kim <102296721+Nico1eKim@users.noreply.github.com>
Date: Wed, 23 Jul 2025 01:56:58 +0900
Subject: [PATCH 07/25] =?UTF-8?q?[ui]:=20=EA=B8=B0=EB=A1=9D=20=EB=8D=94?=
 =?UTF-8?q?=EB=B3=B4=EA=B8=B0=20=EB=B0=94=ED=85=80=EC=8B=9C=ED=8A=B8=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80=20(#50)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../group/note/component/TextCommentCard.kt   | 10 +++-
 .../group/note/component/VoteCommentCard.kt   | 10 +++-
 .../ui/group/note/screen/GroupNoteScreen.kt   | 55 +++++++++++++++++--
 3 files changed, 67 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/com/texthip/thip/ui/group/note/component/TextCommentCard.kt b/app/src/main/java/com/texthip/thip/ui/group/note/component/TextCommentCard.kt
index a93dccfe..97179f05 100644
--- a/app/src/main/java/com/texthip/thip/ui/group/note/component/TextCommentCard.kt
+++ b/app/src/main/java/com/texthip/thip/ui/group/note/component/TextCommentCard.kt
@@ -1,5 +1,6 @@
 package com.texthip.thip.ui.group.note.component
 
+import androidx.compose.foundation.gestures.detectTapGestures
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.padding
@@ -11,6 +12,7 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.blur
+import androidx.compose.ui.input.pointer.pointerInput
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
@@ -26,13 +28,19 @@ import com.texthip.thip.ui.theme.ThipTheme.typography
 fun TextCommentCard(
     modifier: Modifier = Modifier,
     data: GroupNoteRecord,
-    onCommentClick: () -> Unit = {}
+    onCommentClick: () -> Unit = {},
+    onLongPress: () -> Unit = {}
 ) {
     var isLiked by remember { mutableStateOf(data.isLiked) }
 
     Column(
         modifier = modifier
             .blur(if (data.isLocked) 5.dp else 0.dp)
+            .pointerInput(Unit) {
+                detectTapGestures(
+                    onLongPress = { onLongPress() }
+                )
+            }
             .padding(vertical = 16.dp, horizontal = 20.dp),
         verticalArrangement = Arrangement.spacedBy(8.dp)
     ) {
diff --git a/app/src/main/java/com/texthip/thip/ui/group/note/component/VoteCommentCard.kt b/app/src/main/java/com/texthip/thip/ui/group/note/component/VoteCommentCard.kt
index b227b296..47ce8bc8 100644
--- a/app/src/main/java/com/texthip/thip/ui/group/note/component/VoteCommentCard.kt
+++ b/app/src/main/java/com/texthip/thip/ui/group/note/component/VoteCommentCard.kt
@@ -1,5 +1,6 @@
 package com.texthip.thip.ui.group.note.component
 
+import androidx.compose.foundation.gestures.detectTapGestures
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.padding
@@ -11,6 +12,7 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.blur
+import androidx.compose.ui.input.pointer.pointerInput
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
@@ -28,7 +30,8 @@ import com.texthip.thip.ui.theme.ThipTheme.typography
 fun VoteCommentCard(
     modifier: Modifier = Modifier,
     data: GroupNoteVote,
-    onCommentClick: () -> Unit = {}
+    onCommentClick: () -> Unit = {},
+    onLongPress: () -> Unit = {}
 ) {
     var isLiked by remember { mutableStateOf(data.isLiked) }
     var selected by remember { mutableStateOf<Int?>(null) }
@@ -38,6 +41,11 @@ fun VoteCommentCard(
     Column(
         modifier = modifier
             .blur(if (data.isLocked) 5.dp else 0.dp)
+            .pointerInput(Unit) {
+                detectTapGestures(
+                    onLongPress = { onLongPress() }
+                )
+            }
             .padding(vertical = 16.dp, horizontal = 20.dp),
         verticalArrangement = Arrangement.spacedBy(8.dp)
     ) {
diff --git a/app/src/main/java/com/texthip/thip/ui/group/note/screen/GroupNoteScreen.kt b/app/src/main/java/com/texthip/thip/ui/group/note/screen/GroupNoteScreen.kt
index 77bcb364..0d17c537 100644
--- a/app/src/main/java/com/texthip/thip/ui/group/note/screen/GroupNoteScreen.kt
+++ b/app/src/main/java/com/texthip/thip/ui/group/note/screen/GroupNoteScreen.kt
@@ -28,6 +28,7 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.zIndex
 import com.texthip.thip.R
+import com.texthip.thip.ui.common.bottomsheet.MenuBottomSheet
 import com.texthip.thip.ui.common.buttons.ExpandableFloatingButton
 import com.texthip.thip.ui.common.buttons.FabMenuItem
 import com.texthip.thip.ui.common.buttons.FilterButton
@@ -42,6 +43,7 @@ import com.texthip.thip.ui.group.note.mock.GroupNoteRecord
 import com.texthip.thip.ui.group.note.mock.GroupNoteVote
 import com.texthip.thip.ui.group.note.mock.mockComment
 import com.texthip.thip.ui.group.note.mock.mockGroupNoteItems
+import com.texthip.thip.ui.group.room.mock.MenuBottomSheetItem
 import com.texthip.thip.ui.theme.ThipTheme
 import com.texthip.thip.ui.theme.ThipTheme.colors
 import com.texthip.thip.ui.theme.ThipTheme.typography
@@ -66,10 +68,12 @@ fun GroupNoteScreen() {
         else -> emptyList()
     }
 
-    var isBottomSheetVisible by rememberSaveable { mutableStateOf(false) }
+    var isCommentBottomSheetVisible by rememberSaveable { mutableStateOf(false) }
     var selectedNoteRecord by remember { mutableStateOf<GroupNoteRecord?>(null) }
     var selectedNoteVote by remember { mutableStateOf<GroupNoteVote?>(null) }
 
+    var isMenuBottomSheetVisible by rememberSaveable { mutableStateOf(false) }
+
     var showToast by remember { mutableStateOf(false) }
 
     // 토스트 3초
@@ -81,7 +85,7 @@ fun GroupNoteScreen() {
     }
 
     Box(
-        if (isBottomSheetVisible) {
+        if (isCommentBottomSheetVisible || isMenuBottomSheetVisible) {
             Modifier
                 .fillMaxSize()
                 .blur(5.dp)
@@ -153,7 +157,10 @@ fun GroupNoteScreen() {
                                 data = item,
                                 onCommentClick = {
                                     selectedNoteRecord = item
-                                    isBottomSheetVisible = true
+                                    isCommentBottomSheetVisible = true
+                                },
+                                onLongPress = {
+                                    isMenuBottomSheetVisible = true
                                 }
                             )
 
@@ -161,7 +168,10 @@ fun GroupNoteScreen() {
                                 data = item,
                                 onCommentClick = {
                                     selectedNoteVote = item
-                                    isBottomSheetVisible = true
+                                    isCommentBottomSheetVisible = true
+                                },
+                                onLongPress = {
+                                    isMenuBottomSheetVisible = true
                                 }
                             )
                         }
@@ -211,11 +221,11 @@ fun GroupNoteScreen() {
             )
         }
 
-        if (isBottomSheetVisible && (selectedNoteRecord != null || selectedNoteVote != null)) {
+        if (isCommentBottomSheetVisible && (selectedNoteRecord != null || selectedNoteVote != null)) {
             CommentBottomSheet(
                 commentResponse = listOf(mockComment, mockComment, mockComment),
                 onDismiss = {
-                    isBottomSheetVisible = false
+                    isCommentBottomSheetVisible = false
                     selectedNoteRecord = null
                     selectedNoteVote = null
                 },
@@ -225,6 +235,39 @@ fun GroupNoteScreen() {
             )
         }
     }
+
+    if (isMenuBottomSheetVisible) {
+        val isWriter = selectedTabIndex == 1
+
+        val menuItems = if (isWriter) {
+            listOf(
+                MenuBottomSheetItem(
+                    text = stringResource(R.string.delete),
+                    color = colors.Red,
+                    onClick = {
+                        // TODO: 삭제 처리
+                        isMenuBottomSheetVisible = false
+                    }
+                )
+            )
+        } else {
+            listOf(
+                MenuBottomSheetItem(
+                    text = stringResource(R.string.report),
+                    color = colors.Red,
+                    onClick = {
+                        // TODO: 신고 처리
+                        isMenuBottomSheetVisible = false
+                    }
+                )
+            )
+        }
+
+        MenuBottomSheet(
+            items = menuItems,
+            onDismiss = { isMenuBottomSheetVisible = false }
+        )
+    }
 }
 
 @Preview

From afdad737b09737ab2d28ef8bba02c1f285973824 Mon Sep 17 00:00:00 2001
From: Naeun Kim <102296721+Nico1eKim@users.noreply.github.com>
Date: Wed, 23 Jul 2025 02:02:06 +0900
Subject: [PATCH 08/25] =?UTF-8?q?[refactor]:=20lock=EC=83=81=ED=83=9C?=
 =?UTF-8?q?=EC=9D=BC=20=EB=95=8C=20=ED=81=B4=EB=A6=AD=20=EB=A7=89=EA=B8=B0?=
 =?UTF-8?q?=20(#50)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../group/note/component/TextCommentCard.kt   | 16 ++++----
 .../group/note/component/VoteCommentCard.kt   | 37 ++++++++++---------
 2 files changed, 29 insertions(+), 24 deletions(-)

diff --git a/app/src/main/java/com/texthip/thip/ui/group/note/component/TextCommentCard.kt b/app/src/main/java/com/texthip/thip/ui/group/note/component/TextCommentCard.kt
index 97179f05..809deba3 100644
--- a/app/src/main/java/com/texthip/thip/ui/group/note/component/TextCommentCard.kt
+++ b/app/src/main/java/com/texthip/thip/ui/group/note/component/TextCommentCard.kt
@@ -32,21 +32,21 @@ fun TextCommentCard(
     onLongPress: () -> Unit = {}
 ) {
     var isLiked by remember { mutableStateOf(data.isLiked) }
+    val isLocked = data.isLocked
 
     Column(
         modifier = modifier
-            .blur(if (data.isLocked) 5.dp else 0.dp)
+            .blur(if (isLocked) 5.dp else 0.dp)
             .pointerInput(Unit) {
-                detectTapGestures(
-                    onLongPress = { onLongPress() }
-                )
+                if (!isLocked) {
+                    detectTapGestures(onLongPress = { onLongPress() })
+                }
             }
             .padding(vertical = 16.dp, horizontal = 20.dp),
         verticalArrangement = Arrangement.spacedBy(8.dp)
     ) {
         ProfileBar(
             modifier = Modifier.padding(0.dp),
-//            profileImage = data.profileImageUrl,
             profileImage = painterResource(R.drawable.character_literature),
             topText = data.nickName,
             bottomText = data.page.toString() + stringResource(R.string.page),
@@ -66,9 +66,11 @@ fun TextCommentCard(
             likeCount = data.likeCount,
             commentCount = data.commentCount,
             onLikeClick = {
-                isLiked = !isLiked
+                if (!isLocked) isLiked = !isLiked
+            },
+            onCommentClick = {
+                if (!isLocked) onCommentClick()
             },
-            onCommentClick = { onCommentClick() },
         )
     }
 }
diff --git a/app/src/main/java/com/texthip/thip/ui/group/note/component/VoteCommentCard.kt b/app/src/main/java/com/texthip/thip/ui/group/note/component/VoteCommentCard.kt
index 47ce8bc8..75d8507d 100644
--- a/app/src/main/java/com/texthip/thip/ui/group/note/component/VoteCommentCard.kt
+++ b/app/src/main/java/com/texthip/thip/ui/group/note/component/VoteCommentCard.kt
@@ -38,19 +38,20 @@ fun VoteCommentCard(
     var voteItems by remember { mutableStateOf(data.voteItems) }
     val hasVoted = voteItems.any { it.isVoted }
 
+    val isLocked = data.isLocked
+
     Column(
         modifier = modifier
-            .blur(if (data.isLocked) 5.dp else 0.dp)
+            .blur(if (isLocked) 5.dp else 0.dp)
             .pointerInput(Unit) {
-                detectTapGestures(
-                    onLongPress = { onLongPress() }
-                )
+                if (!isLocked) {
+                    detectTapGestures(onLongPress = { onLongPress() })
+                }
             }
             .padding(vertical = 16.dp, horizontal = 20.dp),
         verticalArrangement = Arrangement.spacedBy(8.dp)
     ) {
         ProfileBar(
-//            profileImage = data.profileImageUrl,
             profileImage = painterResource(R.drawable.character_literature),
             topText = data.nickName,
             bottomText = data.page.toString() + stringResource(R.string.page),
@@ -59,9 +60,7 @@ fun VoteCommentCard(
             hoursAgo = data.postDate
         )
 
-        Column(
-            verticalArrangement = Arrangement.spacedBy(8.dp)
-        ) {
+        Column(verticalArrangement = Arrangement.spacedBy(8.dp)) {
             Text(
                 text = data.content,
                 style = typography.feedcopy_r400_s14_h20,
@@ -73,13 +72,15 @@ fun VoteCommentCard(
                 selectedIndex = selected,
                 hasVoted = hasVoted,
                 onOptionSelected = {
-                    if (selected == it) {
-                        selected = null
-                        voteItems = voteItems.map { it.copy(isVoted = false) }
-                    } else {
-                        selected = it
-                        voteItems = voteItems.mapIndexed { index, item ->
-                            item.copy(isVoted = index == it)
+                    if (!isLocked) {
+                        if (selected == it) {
+                            selected = null
+                            voteItems = voteItems.map { it.copy(isVoted = false) }
+                        } else {
+                            selected = it
+                            voteItems = voteItems.mapIndexed { index, item ->
+                                item.copy(isVoted = index == it)
+                            }
                         }
                     }
                 }
@@ -91,9 +92,11 @@ fun VoteCommentCard(
             likeCount = data.likeCount,
             commentCount = data.commentCount,
             onLikeClick = {
-                isLiked = !isLiked
+                if (!isLocked) isLiked = !isLiked
+            },
+            onCommentClick = {
+                if (!isLocked) onCommentClick()
             },
-            onCommentClick = { onCommentClick() },
         )
     }
 }

From 2acba9377dd25eef1f9fd440e8d4afbc6a64d6c6 Mon Sep 17 00:00:00 2001
From: Naeun Kim <102296721+Nico1eKim@users.noreply.github.com>
Date: Wed, 23 Jul 2025 15:20:50 +0900
Subject: [PATCH 09/25] =?UTF-8?q?[fix]:=20=EC=98=A4=EB=8A=98=EC=9D=98=20?=
 =?UTF-8?q?=ED=95=9C=EB=A7=88=EB=94=94=20=EB=9C=A8=EB=8A=94=20=EC=88=9C?=
 =?UTF-8?q?=EC=84=9C=20=EC=88=98=EC=A0=95=20(#50)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../group/room/screen/GroupRoomChatScreen.kt  | 57 ++++++++++++-------
 1 file changed, 38 insertions(+), 19 deletions(-)

diff --git a/app/src/main/java/com/texthip/thip/ui/group/room/screen/GroupRoomChatScreen.kt b/app/src/main/java/com/texthip/thip/ui/group/room/screen/GroupRoomChatScreen.kt
index 72ee598f..896769d5 100644
--- a/app/src/main/java/com/texthip/thip/ui/group/room/screen/GroupRoomChatScreen.kt
+++ b/app/src/main/java/com/texthip/thip/ui/group/room/screen/GroupRoomChatScreen.kt
@@ -64,7 +64,22 @@ fun GroupRoomChatScreen() {
             "공백 포함 글자 입력입니다. 공백 포함 글자 입력입니다. 공백 포함 글자 입력입니다. 공백 포함 글자 입력입니다. 공백 포함 글자 입력입니다.",
             isMine = false
         ),
+        GroupRoomChatData(
+            null,
+            "user.01",
+            "2024.04.27",
+            "공백 포함 글자 입력입니다. 공백 포함 글자 입력입니다. 공백 포함 글자 입력입니다. 공백 포함 글자 입력입니다. 공백 포함 글자 입력입니다.",
+            isMine = true
+        ),
+        GroupRoomChatData(
+            null,
+            "user.01",
+            "2024.04.27",
+            "공백 포함 글자 입력입니다. 공백 포함 글자 입력입니다. 공백 포함 글자 입력입니다. 공백 포함 글자 입력입니다. 공백 포함 글자 입력입니다.",
+            isMine = true
+        ),
     ).sortedByDescending { it.date }
+//    val messages = emptyList<GroupRoomChatData>()
 
     var input by remember { mutableStateOf("") }
     var replyTo by remember { mutableStateOf<String?>(null) }
@@ -91,23 +106,26 @@ fun GroupRoomChatScreen() {
             )
 
             if (messages.isEmpty()) {
-                    Column(
-                        modifier = Modifier
-                            .fillMaxSize(),
-                        horizontalAlignment = Alignment.CenterHorizontally,
-                        verticalArrangement = Arrangement.Center
-                    ) {
-                        Text(
-                            text = stringResource(R.string.group_room_no_chat_title),
-                            style = typography.smalltitle_sb600_s18_h24,
-                            color = colors.White
-                        )
-                        Text(
-                            text = stringResource(R.string.group_room_no_chat_content),
-                            style = typography.copy_r400_s14,
-                            color = colors.Grey
-                        )
-                    }
+                Column(
+                    modifier = Modifier
+                        .fillMaxSize(),
+                    horizontalAlignment = Alignment.CenterHorizontally,
+                    verticalArrangement = Arrangement.spacedBy(
+                        8.dp,
+                        alignment = Alignment.CenterVertically
+                    )
+                ) {
+                    Text(
+                        text = stringResource(R.string.group_room_no_chat_title),
+                        style = typography.smalltitle_sb600_s18_h24,
+                        color = colors.White
+                    )
+                    Text(
+                        text = stringResource(R.string.group_room_no_chat_content),
+                        style = typography.copy_r400_s14,
+                        color = colors.Grey
+                    )
+                }
             } else {
                 LazyColumn(
                     reverseLayout = true,
@@ -116,8 +134,8 @@ fun GroupRoomChatScreen() {
                 ) {
                     itemsIndexed(messages) { index, message ->
                         val isNewDate = when {
-                            index == 0 -> true
-                            messages[index - 1].date != message.date -> true
+                            index == messages.lastIndex -> true
+                            messages[index + 1].date != message.date -> true
                             else -> false
                         }
                         val isBottomItem = index == 0
@@ -148,6 +166,7 @@ fun GroupRoomChatScreen() {
                     }
                 }
             }
+
             CommentTextField(
                 input = input,
                 hint = stringResource(R.string.group_room_chat_hint),

From 6d415c827ddc10188001779bee0ed1de67b9d599 Mon Sep 17 00:00:00 2001
From: Naeun Kim <102296721+Nico1eKim@users.noreply.github.com>
Date: Wed, 23 Jul 2025 15:39:21 +0900
Subject: [PATCH 10/25] =?UTF-8?q?[ui]:=20=EB=A9=94=EC=8B=9C=EC=A7=80=20?=
 =?UTF-8?q?=ED=95=98=EB=8B=A8=EC=97=90=20=EA=B3=A0=EC=A0=95=EB=90=98?=
 =?UTF-8?q?=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95=20(#50)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../group/room/screen/GroupRoomChatScreen.kt  | 36 ++++++++++---------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/app/src/main/java/com/texthip/thip/ui/group/room/screen/GroupRoomChatScreen.kt b/app/src/main/java/com/texthip/thip/ui/group/room/screen/GroupRoomChatScreen.kt
index 896769d5..5e0e2c9a 100644
--- a/app/src/main/java/com/texthip/thip/ui/group/room/screen/GroupRoomChatScreen.kt
+++ b/app/src/main/java/com/texthip/thip/ui/group/room/screen/GroupRoomChatScreen.kt
@@ -106,31 +106,33 @@ fun GroupRoomChatScreen() {
             )
 
             if (messages.isEmpty()) {
-                Column(
+                Box(
                     modifier = Modifier
+                        .weight(1f)
                         .fillMaxSize(),
-                    horizontalAlignment = Alignment.CenterHorizontally,
-                    verticalArrangement = Arrangement.spacedBy(
-                        8.dp,
-                        alignment = Alignment.CenterVertically
-                    )
+                    contentAlignment = Alignment.Center
                 ) {
-                    Text(
-                        text = stringResource(R.string.group_room_no_chat_title),
-                        style = typography.smalltitle_sb600_s18_h24,
-                        color = colors.White
-                    )
-                    Text(
-                        text = stringResource(R.string.group_room_no_chat_content),
-                        style = typography.copy_r400_s14,
-                        color = colors.Grey
-                    )
+                    Column(
+                        horizontalAlignment = Alignment.CenterHorizontally,
+                        verticalArrangement = Arrangement.spacedBy(8.dp)
+                    ) {
+                        Text(
+                            text = stringResource(R.string.group_room_no_chat_title),
+                            style = typography.smalltitle_sb600_s18_h24,
+                            color = colors.White
+                        )
+                        Text(
+                            text = stringResource(R.string.group_room_no_chat_content),
+                            style = typography.copy_r400_s14,
+                            color = colors.Grey
+                        )
+                    }
                 }
             } else {
                 LazyColumn(
                     reverseLayout = true,
                     modifier = Modifier.weight(1f),
-                    verticalArrangement = Arrangement.spacedBy(20.dp)
+                    verticalArrangement = Arrangement.spacedBy(20.dp, Alignment.Bottom)
                 ) {
                     itemsIndexed(messages) { index, message ->
                         val isNewDate = when {

From 6573df64dfec1e8916df768f84f1b91a107c7ed2 Mon Sep 17 00:00:00 2001
From: Naeun Kim <102296721+Nico1eKim@users.noreply.github.com>
Date: Wed, 23 Jul 2025 16:05:59 +0900
Subject: [PATCH 11/25] =?UTF-8?q?[refactor]:=20=EA=B7=B8=EB=A3=B9=20?=
 =?UTF-8?q?=EA=B8=B0=EB=A1=9D=EC=97=90=20=EB=AA=A8=EB=93=A0=20=EA=B8=B0?=
 =?UTF-8?q?=EB=A1=9D=20=EB=8B=A4=20=EB=B3=B4=EC=9D=B4=EA=B2=8C=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95=ED=95=98=EA=B3=A0=20=EA=B8=B0=EB=A1=9D=20=EC=97=86?=
 =?UTF-8?q?=EC=9D=84=20=EB=95=8C=20=ED=99=94=EB=A9=B4=20=EC=B6=94=EA=B0=80?=
 =?UTF-8?q?=20(#50)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ui/group/note/screen/GroupNoteScreen.kt   | 204 +++++++++++-------
 app/src/main/res/values/strings.xml           |   3 +
 2 files changed, 128 insertions(+), 79 deletions(-)

diff --git a/app/src/main/java/com/texthip/thip/ui/group/note/screen/GroupNoteScreen.kt b/app/src/main/java/com/texthip/thip/ui/group/note/screen/GroupNoteScreen.kt
index 0d17c537..8bc81caa 100644
--- a/app/src/main/java/com/texthip/thip/ui/group/note/screen/GroupNoteScreen.kt
+++ b/app/src/main/java/com/texthip/thip/ui/group/note/screen/GroupNoteScreen.kt
@@ -63,14 +63,15 @@ fun GroupNoteScreen() {
     val filters = listOf("최신순", "인기순", "댓글 많은 순")
 
     val filteredItems = when (selectedTabIndex) {
-        0 -> mockGroupNoteItems.filter { !it.isWriter } // 다른 사람 기록
-        1 -> mockGroupNoteItems.filter { it.isWriter } // 내 기록
+        0 -> mockGroupNoteItems // 전체 기록
+        1 -> mockGroupNoteItems.filter { it.isWriter } // 내 기록만
         else -> emptyList()
     }
 
     var isCommentBottomSheetVisible by rememberSaveable { mutableStateOf(false) }
     var selectedNoteRecord by remember { mutableStateOf<GroupNoteRecord?>(null) }
     var selectedNoteVote by remember { mutableStateOf<GroupNoteVote?>(null) }
+    var selectedItemForMenu by remember { mutableStateOf<Any?>(null) }
 
     var isMenuBottomSheetVisible by rememberSaveable { mutableStateOf(false) }
 
@@ -117,92 +118,128 @@ fun GroupNoteScreen() {
                     onTabSelected = { selectedTabIndex = it },
                     modifier = Modifier
                         .fillMaxWidth()
-                        .padding(top = 20.dp, bottom = 56.dp)
+                        .padding(top = 20.dp)
+                        .padding(bottom = if (selectedTabIndex == 0) 0.dp else 20.dp),
                 )
 
-
-                // 피드 리스트 영역
-                LazyColumn(
-                    modifier = Modifier
-                        .fillMaxSize()
-                        .padding(bottom = 82.dp),
-                ) {
-                    item {
-                        Row(
-                            modifier = Modifier.padding(
-                                start = 20.dp,
-                                end = 20.dp,
-                                bottom = 16.dp,
-                                top = 20.dp
-                            ),
-                            verticalAlignment = Alignment.CenterVertically,
-                            horizontalArrangement = Arrangement.spacedBy(4.dp),
-                        ) {
-                            Icon(
-                                painterResource(R.drawable.ic_information),
-                                contentDescription = null,
-                                tint = colors.White,
-                            )
-                            Text(
-                                text = stringResource(R.string.group_note_info),
-                                modifier = Modifier.padding(start = 8.dp),
-                                color = colors.Grey01,
-                                style = typography.info_r400_s12
-                            )
-                        }
+                if (filteredItems.isEmpty()) {
+                    // 기록이 없을 때 중앙에 메시지
+                    Column(
+                        modifier = Modifier
+                            .fillMaxSize()
+                            .padding(bottom = 102.dp),
+                        horizontalAlignment = Alignment.CenterHorizontally,
+                        verticalArrangement = Arrangement.spacedBy(
+                            8.dp,
+                            alignment = Alignment.CenterVertically
+                        )
+                    ) {
+                        Text(
+                            text = stringResource(R.string.no_records_yet),
+                            style = typography.smalltitle_sb600_s18_h24,
+                            color = colors.White
+                        )
+                        Text(
+                            text = when (selectedTabIndex) {
+                                0 -> stringResource(R.string.no_group_record_subtext)
+                                1 -> stringResource(R.string.no_my_record_subtext)
+                                else -> ""
+                            },
+                            style = typography.copy_r400_s14,
+                            color = colors.Grey
+                        )
                     }
-                    items(filteredItems) { item ->
-                        when (item) {
-                            is GroupNoteRecord -> TextCommentCard(
-                                data = item,
-                                onCommentClick = {
-                                    selectedNoteRecord = item
-                                    isCommentBottomSheetVisible = true
-                                },
-                                onLongPress = {
-                                    isMenuBottomSheetVisible = true
+                } else {
+                    // 피드 리스트 영역
+                    LazyColumn(
+                        modifier = Modifier
+                            .fillMaxSize()
+                            .padding(bottom = 82.dp)
+                            .padding(top = if (selectedTabIndex == 0) 56.dp else 0.dp),
+                    ) {
+                        if (selectedTabIndex == 0) {
+                            item {
+                                Row(
+                                    modifier = Modifier.padding(
+                                        start = 20.dp,
+                                        end = 20.dp,
+                                        bottom = 16.dp,
+                                        top = 20.dp
+                                    ),
+                                    verticalAlignment = Alignment.CenterVertically,
+                                    horizontalArrangement = Arrangement.spacedBy(4.dp),
+                                ) {
+                                    Icon(
+                                        painterResource(R.drawable.ic_information),
+                                        contentDescription = null,
+                                        tint = colors.White,
+                                    )
+                                    Text(
+                                        text = stringResource(R.string.group_note_info),
+                                        modifier = Modifier.padding(start = 8.dp),
+                                        color = colors.Grey01,
+                                        style = typography.info_r400_s12
+                                    )
                                 }
-                            )
+                            }
+                        }
+                        items(filteredItems) { item ->
+                            when (item) {
+                                is GroupNoteRecord -> TextCommentCard(
+                                    data = item,
+                                    onCommentClick = {
+                                        selectedNoteRecord = item
+                                        isCommentBottomSheetVisible = true
+                                    },
+                                    onLongPress = {
+                                        selectedItemForMenu = item
+                                        isMenuBottomSheetVisible = true
+                                    }
+                                )
 
-                            is GroupNoteVote -> VoteCommentCard(
-                                data = item,
-                                onCommentClick = {
-                                    selectedNoteVote = item
-                                    isCommentBottomSheetVisible = true
-                                },
-                                onLongPress = {
-                                    isMenuBottomSheetVisible = true
-                                }
-                            )
+                                is GroupNoteVote -> VoteCommentCard(
+                                    data = item,
+                                    onCommentClick = {
+                                        selectedNoteVote = item
+                                        isCommentBottomSheetVisible = true
+                                    },
+                                    onLongPress = {
+                                        selectedItemForMenu = item
+                                        isMenuBottomSheetVisible = true
+                                    }
+                                )
+                            }
                         }
                     }
                 }
             }
 
-            Box(
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .padding(top = 136.dp),
-            ) {
-                FilterButton(
+            if (selectedTabIndex == 0) {
+                Box(
                     modifier = Modifier
-                        .align(Alignment.CenterEnd)
-                        .padding(end = 20.dp),
-                    selectedOption = selectedFilter,
-                    options = filters,
-                    onOptionSelected = { selectedFilter = it }
-                )
+                        .fillMaxWidth()
+                        .padding(top = 136.dp),
+                ) {
+                    FilterButton(
+                        modifier = Modifier
+                            .align(Alignment.CenterEnd)
+                            .padding(end = 20.dp),
+                        selectedOption = selectedFilter,
+                        options = filters,
+                        onOptionSelected = { selectedFilter = it }
+                    )
 
-                FilterHeaderSection(
-                    firstPage = firstPage,
-                    lastPage = lastPage,
-                    isTotalSelected = isTotalSelected,
-                    totalEnabled = totalEnabled,
-                    onFirstPageChange = { firstPage = it },
-                    onLastPageChange = { lastPage = it },
-                    onTotalToggle = { isTotalSelected = !isTotalSelected },
-                    onDisabledClick = { showToast = true }
-                )
+                    FilterHeaderSection(
+                        firstPage = firstPage,
+                        lastPage = lastPage,
+                        isTotalSelected = isTotalSelected,
+                        totalEnabled = totalEnabled,
+                        onFirstPageChange = { firstPage = it },
+                        onLastPageChange = { lastPage = it },
+                        onTotalToggle = { isTotalSelected = !isTotalSelected },
+                        onDisabledClick = { showToast = true }
+                    )
+                }
             }
 
             ExpandableFloatingButton(
@@ -236,8 +273,12 @@ fun GroupNoteScreen() {
         }
     }
 
-    if (isMenuBottomSheetVisible) {
-        val isWriter = selectedTabIndex == 1
+    if (isMenuBottomSheetVisible && selectedItemForMenu != null) {
+        val isWriter = when (val item = selectedItemForMenu) {
+            is GroupNoteRecord -> item.isWriter
+            is GroupNoteVote -> item.isWriter
+            else -> false
+        }
 
         val menuItems = if (isWriter) {
             listOf(
@@ -247,6 +288,7 @@ fun GroupNoteScreen() {
                     onClick = {
                         // TODO: 삭제 처리
                         isMenuBottomSheetVisible = false
+                        selectedItemForMenu = null
                     }
                 )
             )
@@ -258,6 +300,7 @@ fun GroupNoteScreen() {
                     onClick = {
                         // TODO: 신고 처리
                         isMenuBottomSheetVisible = false
+                        selectedItemForMenu = null
                     }
                 )
             )
@@ -265,7 +308,10 @@ fun GroupNoteScreen() {
 
         MenuBottomSheet(
             items = menuItems,
-            onDismiss = { isMenuBottomSheetVisible = false }
+            onDismiss = {
+                isMenuBottomSheetVisible = false
+                selectedItemForMenu = null
+            }
         )
     }
 }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b771bdb5..eb1b9b57 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -198,6 +198,9 @@
     <string name="vote_content_placeholder">항목을 20자 이내로 입력</string>
     <string name="add_content">항목 추가</string>
     <string name="condition_of_view_general_review">독서 진행도 80% 이상부터 총평을 볼 수 있어요.</string>
+    <string name="no_records_yet">아직 기록이 없어요.</string>
+    <string name="no_group_record_subtext">우리 모임의 첫번째 기록을 남겨보세요</string>
+    <string name="no_my_record_subtext">나의 첫번째 기록을 남겨보세요</string>
 
     <!--    alarm    -->
     <string name="alarm_feed">피드</string>

From 9503ef8232281e1960d963babbde626e8860d2d1 Mon Sep 17 00:00:00 2001
From: Naeun Kim <102296721+Nico1eKim@users.noreply.github.com>
Date: Wed, 23 Jul 2025 16:12:20 +0900
Subject: [PATCH 12/25] =?UTF-8?q?[fix]:=20conflict=20=ED=95=B4=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/misc.xml                                |   2 +-
 .../booksearch/component/BookEmptyResult.kt   |  55 +++
 .../component/BookFilteredSearchResult.kt     | 102 ++++++
 .../component/BookLiveSearchResult.kt         |  43 +++
 .../booksearch/component/BookRecentSearch.kt  | 187 ++++++++++
 .../thip/ui/booksearch/mock/BookData.kt       |  10 +
 .../thip/ui/booksearch/mock/DetailBookData.kt |  13 +
 .../ui/booksearch/screen/BookDetailScreen.kt  | 345 ++++++++++++++++++
 .../booksearch/screen/BookRecruitingScreen.kt | 227 ++++++++++++
 .../ui/booksearch/screen/BookSearchScreen.kt  | 202 +++++++++-
 .../ui/common/buttons/ActionMediumButton.kt   |   3 +-
 .../thip/ui/common/cards/CardBookList.kt      |   5 +-
 .../thip/ui/common/cards/CardBookSearch.kt    |  11 +
 .../texthip/thip/ui/common/modal/InfoPopup.kt |  93 +++--
 .../screen/GroupRegisterBookScreen.kt         |  66 ----
 .../room/screen/GroupRoomRecruitScreen.kt     |   8 +-
 .../room/screen/GroupRoomUnlockScreen.kt      |   3 -
 .../thip/ui/group/screen/GroupScreen.kt       |   3 -
 .../search/component/GroupEmptyResult.kt      |   6 +-
 .../component/GroupFilteredSearchResult.kt    |  36 +-
 .../search/component/GroupLiveSearchResult.kt |  22 +-
 .../search/component/GroupRecentSearch.kt     |  14 +-
 .../group/search/screen/GroupSearchScreen.kt  |  68 ++--
 .../texthip/thip/ui/navigator/MainNavHost.kt  |   2 +-
 app/src/main/res/values/strings.xml           |  25 ++
 25 files changed, 1377 insertions(+), 174 deletions(-)
 create mode 100644 app/src/main/java/com/texthip/thip/ui/booksearch/component/BookEmptyResult.kt
 create mode 100644 app/src/main/java/com/texthip/thip/ui/booksearch/component/BookFilteredSearchResult.kt
 create mode 100644 app/src/main/java/com/texthip/thip/ui/booksearch/component/BookLiveSearchResult.kt
 create mode 100644 app/src/main/java/com/texthip/thip/ui/booksearch/component/BookRecentSearch.kt
 create mode 100644 app/src/main/java/com/texthip/thip/ui/booksearch/mock/BookData.kt
 create mode 100644 app/src/main/java/com/texthip/thip/ui/booksearch/mock/DetailBookData.kt
 create mode 100644 app/src/main/java/com/texthip/thip/ui/booksearch/screen/BookDetailScreen.kt
 create mode 100644 app/src/main/java/com/texthip/thip/ui/booksearch/screen/BookRecruitingScreen.kt
 delete mode 100644 app/src/main/java/com/texthip/thip/ui/group/makeroom/screen/GroupRegisterBookScreen.kt

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 5e471df0..38860e7c 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -4,5 +4,5 @@
     <option name="optimizeImportsOnTheFly" value="true" />
   </component>
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" project-jdk-name="jbr-21" project-jdk-type="JavaSDK" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="jbr-21" project-jdk-type="JavaSDK" />
 </project>
\ No newline at end of file
diff --git a/app/src/main/java/com/texthip/thip/ui/booksearch/component/BookEmptyResult.kt b/app/src/main/java/com/texthip/thip/ui/booksearch/component/BookEmptyResult.kt
new file mode 100644
index 00000000..4d65d476
--- /dev/null
+++ b/app/src/main/java/com/texthip/thip/ui/booksearch/component/BookEmptyResult.kt
@@ -0,0 +1,55 @@
+package com.texthip.thip.ui.booksearch.component
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.width
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import com.texthip.thip.R
+import com.texthip.thip.ui.common.buttons.ActionMediumButton
+import com.texthip.thip.ui.theme.ThipTheme.colors
+import com.texthip.thip.ui.theme.ThipTheme.typography
+
+@Composable
+fun BookEmptyResult(
+    mainText: String,
+    subText: String,
+    onRequestBook: () -> Unit
+) {
+    Column(
+        modifier = Modifier.fillMaxSize(),
+        verticalArrangement = Arrangement.Center,
+        horizontalAlignment = Alignment.CenterHorizontally
+    ) {
+        Text(
+            text = mainText,
+            color = colors.White,
+            style = typography.smalltitle_sb600_s18_h24
+        )
+        Text(
+            text = subText,
+            modifier = Modifier.padding(top = 8.dp),
+            color = colors.Grey,
+            style = typography.copy_r400_s14
+        )
+        Spacer(Modifier.height(20.dp))
+
+        ActionMediumButton(
+            text = stringResource(R.string.group_register_book),
+            contentColor = colors.White,
+            backgroundColor = colors.Purple,
+            modifier = Modifier
+                .width(97.dp)
+                .height(44.dp),
+            onClick = { onRequestBook() },
+        )
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/texthip/thip/ui/booksearch/component/BookFilteredSearchResult.kt b/app/src/main/java/com/texthip/thip/ui/booksearch/component/BookFilteredSearchResult.kt
new file mode 100644
index 00000000..da4743ef
--- /dev/null
+++ b/app/src/main/java/com/texthip/thip/ui/booksearch/component/BookFilteredSearchResult.kt
@@ -0,0 +1,102 @@
+package com.texthip.thip.ui.booksearch.component
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.itemsIndexed
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import com.texthip.thip.R
+import com.texthip.thip.ui.booksearch.mock.BookData
+import com.texthip.thip.ui.common.cards.CardBookList
+import com.texthip.thip.ui.theme.ThipTheme
+import com.texthip.thip.ui.theme.ThipTheme.colors
+import com.texthip.thip.ui.theme.ThipTheme.typography
+
+@Composable
+fun BookFilteredSearchResult(
+    resultCount: Int,
+    bookList: List<BookData>
+) {
+    Column {
+        Row(
+            modifier = Modifier.fillMaxWidth(),
+            verticalAlignment = Alignment.CenterVertically
+        ) {
+            Text(
+                text = stringResource(R.string.group_searched_room_size, resultCount),
+                color = colors.Grey,
+                style = typography.menu_m500_s14_h24
+            )
+        }
+        Spacer(
+            modifier = Modifier
+                .padding(top = 4.dp, bottom = 20.dp)
+                .fillMaxWidth()
+                .height(1.dp)
+                .background(colors.DarkGrey02)
+        )
+
+        if (bookList.isEmpty()) {
+            BookEmptyResult(
+                mainText = stringResource(R.string.book_no_search_result1),
+                subText = stringResource(R.string.book_no_search_result2),
+                onRequestBook = { /*책 요청 처리*/ }
+            )
+        } else {
+            LazyColumn(
+                verticalArrangement = Arrangement.Center
+            ) {
+                itemsIndexed(bookList) { index, book ->
+                    CardBookList(
+                        title = book.title,
+                        author = book.author,
+                        publisher = book.publisher,
+                        imageRes = book.imageRes
+                    )
+                    if (index < bookList.size - 1) {
+                        Spacer(
+                            modifier = Modifier
+                                .padding(top = 12.dp, bottom = 12.dp)
+                                .fillMaxWidth()
+                                .height(1.dp)
+                                .background(colors.DarkGrey02)
+                        )
+                    }
+                }
+            }
+        }
+    }
+}
+
+@Preview
+@Composable
+fun PreviewBookFilteredSearchResult() {
+    ThipTheme {
+        BookFilteredSearchResult(
+            resultCount = 3,
+            bookList = listOf(
+                BookData(
+                    title = "이기적 유전자",
+                    author = "리처드 도킨스",
+                    publisher = "을유문화사"
+                ),
+                BookData(
+                    title = "총, 균, 쇠",
+                    author = "재레드 다이아몬드",
+                    publisher = "문학사상사"
+                ),
+                BookData(
+                    title = "코스모스",
+                    author = "칼 세이건",
+                    publisher = "사이언스북스"
+                )
+            )
+        )
+    }
+}
diff --git a/app/src/main/java/com/texthip/thip/ui/booksearch/component/BookLiveSearchResult.kt b/app/src/main/java/com/texthip/thip/ui/booksearch/component/BookLiveSearchResult.kt
new file mode 100644
index 00000000..06213f48
--- /dev/null
+++ b/app/src/main/java/com/texthip/thip/ui/booksearch/component/BookLiveSearchResult.kt
@@ -0,0 +1,43 @@
+package com.texthip.thip.ui.booksearch.component
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.itemsIndexed
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
+import com.texthip.thip.ui.booksearch.mock.BookData
+import com.texthip.thip.ui.common.cards.CardBookList
+import com.texthip.thip.ui.theme.ThipTheme.colors
+
+@Composable
+fun BookLiveSearchResult(
+    bookList: List<BookData>
+) {
+    LazyColumn(
+        verticalArrangement = Arrangement.Center
+    ) {
+        itemsIndexed(bookList) { index, book ->
+            CardBookList(
+                title = book.title,
+                author = book.author,
+                publisher = book.publisher,
+                imageRes = book.imageRes
+            )
+            if (index < bookList.size - 1) {
+                Spacer(
+                    modifier = Modifier
+                        .padding(top = 12.dp, bottom = 12.dp)
+                        .fillMaxWidth()
+                        .height(1.dp)
+                        .background(colors.DarkGrey02)
+                )
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/texthip/thip/ui/booksearch/component/BookRecentSearch.kt b/app/src/main/java/com/texthip/thip/ui/booksearch/component/BookRecentSearch.kt
new file mode 100644
index 00000000..27743bc9
--- /dev/null
+++ b/app/src/main/java/com/texthip/thip/ui/booksearch/component/BookRecentSearch.kt
@@ -0,0 +1,187 @@
+package com.texthip.thip.ui.booksearch.component
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.FlowRow
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import com.texthip.thip.R
+import com.texthip.thip.ui.booksearch.mock.BookData
+import com.texthip.thip.ui.common.buttons.GenreChipButton
+import com.texthip.thip.ui.common.cards.CardBookSearch
+import com.texthip.thip.ui.theme.ThipTheme
+import com.texthip.thip.ui.theme.ThipTheme.colors
+import com.texthip.thip.ui.theme.ThipTheme.typography
+
+@Composable
+fun BookRecentSearch(
+    recentSearches: List<String>,
+    popularBooks: List<BookData>,
+    popularBookDate: String,
+    onSearchClick: (String) -> Unit,
+    onRemove: (String) -> Unit,
+    onBookClick: (BookData) -> Unit
+) {
+    Column(modifier = Modifier.fillMaxSize()) {
+        Text(
+            text = stringResource(R.string.group_recent_search),
+            color = colors.White,
+            style = typography.menu_r400_s14_h24
+        )
+        Spacer(modifier = Modifier.height(16.dp))
+
+        if (recentSearches.isEmpty()) {
+            Text(
+                text = stringResource(R.string.group_no_recent_search),
+                color = colors.Grey01,
+                style = typography.menu_r400_s14_h24
+            )
+        } else {
+            FlowRow(
+                verticalArrangement = Arrangement.spacedBy(12.dp),
+                horizontalArrangement = Arrangement.spacedBy(16.dp),
+                maxLines = 2,
+            ) {
+                recentSearches.take(9).forEach { keyword ->
+                    GenreChipButton(
+                        text = keyword,
+                        onClick = { onSearchClick(keyword) },
+                        onCloseClick = { onRemove(keyword) }
+                    )
+                }
+            }
+        }
+        Spacer(modifier = Modifier.height(32.dp))
+
+        Row(
+            modifier = Modifier.fillMaxWidth(),
+            verticalAlignment = Alignment.CenterVertically,
+            horizontalArrangement = Arrangement.SpaceBetween
+        ) {
+            Text(
+                text = stringResource(R.string.book_popular_search),
+                color = colors.White,
+                style = typography.menu_r400_s14_h24
+            )
+            Text(
+                text = stringResource(R.string.book_search_date, popularBookDate),
+                color = colors.Grey02,
+                style = typography.timedate_r400_s11
+            )
+        }
+        Spacer(modifier = Modifier.height(16.dp))
+
+        Box(modifier = Modifier
+            .fillMaxWidth()
+            .weight(1f, fill = true)
+        ) {
+            if (popularBooks.isEmpty()) {
+                Column(
+                    modifier = Modifier
+                        .fillMaxSize(),
+                    horizontalAlignment = Alignment.CenterHorizontally,
+                    verticalArrangement = Arrangement.Center
+                ) {
+                    Text(
+                        text = stringResource(R.string.book_no_most_search_result_comment_1),
+                        style = typography.smalltitle_sb600_s18_h24,
+                        color = colors.White
+                    )
+                    Spacer(modifier = Modifier.height(8.dp))
+                    Text(
+                        text = stringResource(R.string.book_no_most_search_result_comment_2),
+                        style = typography.copy_r400_s14,
+                        color = colors.Grey
+                    )
+                }
+            } else {
+                LazyColumn(
+                    modifier = Modifier.fillMaxSize()
+                ) {
+                    items(popularBooks.size) { index ->
+                        val book = popularBooks[index]
+                        CardBookSearch(
+                            number = index + 1,
+                            title = book.title,
+                            imageRes = book.imageRes,
+                            onClick = { onBookClick(book) }
+                        )
+                        if (index < popularBooks.size - 1) {
+                            Spacer(
+                                modifier = Modifier
+                                    .padding(top = 12.dp, bottom = 12.dp)
+                                    .fillMaxWidth()
+                                    .height(1.dp)
+                                    .background(colors.DarkGrey02)
+                            )
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+
+
+@Preview
+@Composable
+fun PreviewBookRecentSearch() {
+    ThipTheme {
+        BookRecentSearch(
+            recentSearches = listOf("소설", "심리학", "철학", "역사", "과학", "에세이"),
+            popularBooks = listOf(
+                BookData(
+                    title = "이기적 유전자",
+                    author = "리처드 도킨스",
+                    publisher = "을유문화사",
+                    imageRes = R.drawable.bookcover_sample
+                ),
+                BookData(
+                    title = "코스모스",
+                    author = "칼 세이건",
+                    publisher = "사이언스북스",
+                    imageRes = R.drawable.bookcover_sample
+                ),
+                BookData(
+                    title = "총, 균, 쇠",
+                    author = "재레드 다이아몬드",
+                    publisher = "문학사상사",
+                    imageRes = R.drawable.bookcover_sample
+                )
+            ),
+            popularBookDate = "01.12",
+            onSearchClick = {},
+            onRemove = {},
+            onBookClick = {}
+        )
+    }
+}
+
+@Preview(showBackground = true)
+@Composable
+fun PreviewBookRecentSearch_EmptyPopular() {
+    ThipTheme {
+        BookRecentSearch(
+            recentSearches = emptyList(),
+            popularBooks = emptyList(),
+            popularBookDate = "01.12.",
+            onSearchClick = {},
+            onRemove = {},
+            onBookClick = {}
+        )
+    }
+}
diff --git a/app/src/main/java/com/texthip/thip/ui/booksearch/mock/BookData.kt b/app/src/main/java/com/texthip/thip/ui/booksearch/mock/BookData.kt
new file mode 100644
index 00000000..ae839da1
--- /dev/null
+++ b/app/src/main/java/com/texthip/thip/ui/booksearch/mock/BookData.kt
@@ -0,0 +1,10 @@
+package com.texthip.thip.ui.booksearch.mock
+
+import com.texthip.thip.R
+
+data class BookData(
+    val title: String,
+    val author: String = "",
+    val publisher: String = "",
+    val imageRes: Int = R.drawable.bookcover_sample
+)
diff --git a/app/src/main/java/com/texthip/thip/ui/booksearch/mock/DetailBookData.kt b/app/src/main/java/com/texthip/thip/ui/booksearch/mock/DetailBookData.kt
new file mode 100644
index 00000000..1de6ad7b
--- /dev/null
+++ b/app/src/main/java/com/texthip/thip/ui/booksearch/mock/DetailBookData.kt
@@ -0,0 +1,13 @@
+package com.texthip.thip.ui.booksearch.mock
+
+import com.texthip.thip.R
+
+data class DetailBookData(
+    val title: String,
+    val author: String,
+    val publisher: String,
+    val description: String,
+    val coverImageRes: Int? = R.drawable.bookcover_sample,
+    val participantsCount: Int = 0,
+    val recruitingRoomCount: Int = 0
+)
diff --git a/app/src/main/java/com/texthip/thip/ui/booksearch/screen/BookDetailScreen.kt b/app/src/main/java/com/texthip/thip/ui/booksearch/screen/BookDetailScreen.kt
new file mode 100644
index 00000000..142c447c
--- /dev/null
+++ b/app/src/main/java/com/texthip/thip/ui/booksearch/screen/BookDetailScreen.kt
@@ -0,0 +1,345 @@
+package com.texthip.thip.ui.booksearch.screen
+
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.background
+import androidx.compose.foundation.border
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+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.shape.RoundedCornerShape
+import androidx.compose.material3.Icon
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableIntStateOf
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.blur
+import androidx.compose.ui.graphics.Brush
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import com.texthip.thip.R
+import com.texthip.thip.ui.booksearch.mock.DetailBookData
+import com.texthip.thip.ui.common.buttons.ActionMediumButton
+import com.texthip.thip.ui.common.buttons.FilterButton
+import com.texthip.thip.ui.common.modal.InfoPopup
+import com.texthip.thip.ui.common.topappbar.DefaultTopAppBar
+import com.texthip.thip.ui.common.topappbar.GradationTopAppBar
+import com.texthip.thip.ui.theme.ThipTheme
+import com.texthip.thip.ui.theme.ThipTheme.colors
+import com.texthip.thip.ui.theme.ThipTheme.typography
+import kotlinx.coroutines.delay
+
+@Composable
+fun BookDetailScreen(
+    modifier: Modifier = Modifier,
+    book: DetailBookData,
+    feedList: List<String> = emptyList(),
+    onLeftClick: () -> Unit = {},
+    onRightClick: () -> Unit = {},
+    onRecruitingGroupClick: () -> Unit = {},
+    onBookMarkClick: (Boolean) -> Unit = {},
+    onWriteFeedClick: () -> Unit = {}
+) {
+    var isAlarmVisible by remember { mutableStateOf(true) }
+    var isIntroductionPopupVisible by remember { mutableStateOf(false) }
+    var isBookmarked by remember { mutableStateOf(false) }
+    var selectedFilterOption by remember { mutableIntStateOf(0) }
+
+    val filterOptions = listOf(
+        stringResource(R.string.search_filter_popular),
+        stringResource(R.string.search_filter_latest)
+    )
+
+    // 알림 5초간 노출
+    LaunchedEffect(Unit) {
+        isAlarmVisible = true
+        delay(5000)
+        isAlarmVisible = false
+    }
+
+    Box(modifier = modifier.fillMaxSize()) {
+        // 메인 컨텐츠
+        Box(
+            modifier = Modifier
+                .fillMaxSize()
+                .then(
+                    if (isIntroductionPopupVisible) {
+                        Modifier.blur(4.dp)
+                    } else {
+                        Modifier
+                    }
+                )
+        ) {
+            if (book.coverImageRes != null) {
+                Box(modifier = Modifier
+                    .height(420.dp)
+                    .fillMaxWidth()) {
+                    Image(
+                        painter = painterResource(book.coverImageRes),
+                        contentDescription = null,
+                        modifier = Modifier
+                            .matchParentSize()
+                            .blur(4.dp),
+                        contentScale = ContentScale.Crop
+                    )
+                    Box(
+                        modifier = Modifier
+                            .matchParentSize()
+                            .background(
+                                brush = Brush.verticalGradient(
+                                    colors = listOf(
+                                        Color.Transparent,
+                                        colors.Black.copy(alpha = 0.3f),
+                                        colors.Black.copy(alpha = 0.6f),
+                                        colors.Black.copy(alpha = 0.9f),
+                                        colors.Black
+                                    ),
+                                    startY = 0f,
+                                    endY = Float.POSITIVE_INFINITY
+                                )
+                            )
+                    )
+                }
+            }
+
+            Column(modifier = Modifier.fillMaxSize()) {
+                AnimatedVisibility(visible = isAlarmVisible) {
+                    GradationTopAppBar(
+                        isImageVisible = true,
+                        count = book.participantsCount,
+                        onLeftClick = {},
+                        onRightClick = {}
+                    )
+                }
+                AnimatedVisibility(visible = !isAlarmVisible) {
+                    DefaultTopAppBar(
+                        isRightIconVisible = true,
+                        isTitleVisible = false,
+                        onLeftClick = onLeftClick,
+                        onRightClick = onRightClick
+                    )
+                }
+
+                Spacer(modifier = Modifier.height(8.dp))
+
+                // 상세 정보 영역
+                Column(
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .padding(horizontal = 20.dp)
+                ) {
+                    Text(
+                        modifier = Modifier.padding(top = 40.dp),
+                        text = book.title,
+                        color = colors.White,
+                        style = typography.bigtitle_b700_s22
+                    )
+                    Spacer(modifier = Modifier.height(8.dp))
+
+                    Text(
+                        text = stringResource(
+                            R.string.search_book_author,
+                            book.author,
+                            book.publisher
+                        ),
+                        color = colors.Grey,
+                        style = typography.copy_r400_s12_h20
+                    )
+                    Spacer(modifier = Modifier.height(32.dp))
+
+                    Column(
+                        modifier = Modifier
+                            .fillMaxWidth()
+                            .clickable { isIntroductionPopupVisible = true }
+                    ) {
+                        Text(
+                            text = stringResource(R.string.search_book_comment),
+                            color = colors.White,
+                            style = typography.menu_r400_s14_h24,
+                        )
+                        Spacer(modifier = Modifier.height(4.dp))
+
+                        Text(
+                            text = book.description,
+                            color = colors.Grey,
+                            style = typography.copy_r400_s12_h20,
+                            maxLines = 2,
+                            overflow = TextOverflow.Ellipsis
+                        )
+                    }
+
+                    Spacer(modifier = Modifier.height(40.dp))
+                    Column(
+                        modifier = Modifier.fillMaxWidth(),
+                        verticalArrangement = Arrangement.spacedBy(12.dp)
+                    ) {
+                        ActionMediumButton(
+                            text = stringResource(
+                                R.string.search_recruiting_group_count,
+                                book.recruitingRoomCount
+                            ),
+                            contentColor = colors.Grey,
+                            backgroundColor = Color.Transparent,
+                            hasRightIcon = true,
+                            modifier = Modifier
+                                .fillMaxWidth()
+                                .border(
+                                    width = 1.dp,
+                                    color = colors.Grey,
+                                    shape = RoundedCornerShape(12.dp)
+                                ),
+                            onClick = onRecruitingGroupClick,
+                        )
+                        Row {
+                            ActionMediumButton(
+                                text = stringResource(R.string.search_write_feed_comment),
+                                contentColor = colors.White,
+                                backgroundColor = colors.Purple,
+                                hasRightIcon = true,
+                                hasRightPlusIcon = true,
+                                modifier = Modifier.weight(1f),
+                                onClick = onWriteFeedClick
+                            )
+                            Box(
+                                modifier = modifier
+                                    .padding(start = 12.dp)
+                                    .size(44.dp)
+                                    .border(
+                                        width = 1.dp,
+                                        color = colors.Grey02,
+                                        shape = RoundedCornerShape(12.dp)
+                                    )
+                                    .background(
+                                        color = Color.Transparent,
+                                        shape = RoundedCornerShape(12.dp)
+                                    )
+                                    .clickable {
+                                        isBookmarked = !isBookmarked
+                                        onBookMarkClick(isBookmarked)
+                                    },
+                                contentAlignment = Alignment.Center,
+                            ) {
+                                Icon(
+                                    painter = painterResource(
+                                        if (isBookmarked)
+                                            R.drawable.ic_save_filled
+                                        else
+                                            R.drawable.ic_save
+                                    ),
+                                    contentDescription = null,
+                                    tint = Color.Unspecified,
+                                    modifier = Modifier.size(24.dp)
+                                )
+                            }
+                        }
+                    }
+                    Spacer(modifier = Modifier.height(44.dp))
+
+                    Text(
+                        text = stringResource(R.string.search_watch_feed),
+                        color = colors.Grey,
+                        style = typography.smalltitle_sb600_s18_h24,
+                        modifier = Modifier.padding(bottom = 33.dp)
+                    )
+
+                    // 피드 리스트
+                    Spacer(
+                        modifier = Modifier
+                            .fillMaxWidth()
+                            .height(1.dp)
+                            .background(colors.DarkGrey02)
+                    )
+                    if (feedList.isEmpty()) {
+                        Box(
+                            modifier = Modifier
+                                .fillMaxWidth()
+                                .weight(1f),
+                            contentAlignment = Alignment.Center
+                        ) {
+                            Column(horizontalAlignment = Alignment.CenterHorizontally) {
+                                Text(
+                                    text = stringResource(R.string.search_no_feed_comment_1),
+                                    color = colors.White,
+                                    style = typography.smalltitle_sb600_s18_h24
+                                )
+                                Spacer(modifier = Modifier.height(6.dp))
+                                Text(
+                                    text = stringResource(R.string.search_no_feed_comment_2),
+                                    color = colors.Grey01,
+                                    style = typography.feedcopy_r400_s14_h20
+                                )
+                            }
+                        }
+                    } else {
+                        // TODO: 피드 UI 구현 되면 수정
+                    }
+                }
+            }
+
+            FilterButton(
+                modifier = Modifier
+                    .align(Alignment.TopEnd)
+                    .padding(top = 462.dp, start = 20.dp, end = 20.dp),
+                selectedOption = filterOptions[selectedFilterOption],
+                options = filterOptions,
+                onOptionSelected = { option ->
+                    selectedFilterOption = filterOptions.indexOf(option)
+                }
+            )
+        }
+
+        if (isIntroductionPopupVisible) {
+            Box(
+                modifier = Modifier
+                    .align(Alignment.Center)
+                    .padding(horizontal = 20.dp)
+            ) {
+                InfoPopup(
+                    title = stringResource(R.string.introduction),
+                    content = book.description,
+                    onDismiss = { isIntroductionPopupVisible = false }
+                )
+            }
+        }
+    }
+}
+
+@Preview
+@Composable
+fun PreviewBookDetailScreen() {
+    ThipTheme {
+        BookDetailScreen(
+            book = DetailBookData(
+                title = "채식주의자",
+                author = "한강",
+                publisher = "창비",
+                description =
+                    "인터내셔널 북커상, 산클레멘테 문학상 수상작. 전세계가 주목한 인간의 역작을 다시 만나다.2016년 인터내셔널 북커상을 수상하며 한국문학의 입지를 한단계 확장시킨 한강의 명단소설 『채식주의자』. 15년 만에 새로운 장정과 판형으로 출간된다. 식물화로 건설해온 극단적이며 실재적인 상상력의 강렬한 결실로 고통과 구속의 피안에 존재하는 인간의 본성에 다가간 작품." +
+                            "인터내셔널 북커상, 산클레멘테 문학상 수상작. 전세계가 주목한 인간의 역작을 다시 만나다. \n\n2016년 인터내셔널 북커상을 수상하며 한국문학의 입지를 한단계 확장시킨 한강의 명단소설 『채식주의자』. 15년 만에 새로운 장정과 판형으로 출간된다. 식물화로 건설해온 극단적이며 실재적인 상상력의 강렬한 결실로 고통과 구속의 피안에 존재하는 인간의 본성에 다가간 작품.",
+                coverImageRes = R.drawable.bookcover_sample,
+                participantsCount = 210,
+                recruitingRoomCount = 4
+            ),
+            feedList = emptyList()
+        )
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/texthip/thip/ui/booksearch/screen/BookRecruitingScreen.kt b/app/src/main/java/com/texthip/thip/ui/booksearch/screen/BookRecruitingScreen.kt
new file mode 100644
index 00000000..9a2afca7
--- /dev/null
+++ b/app/src/main/java/com/texthip/thip/ui/booksearch/screen/BookRecruitingScreen.kt
@@ -0,0 +1,227 @@
+package com.texthip.thip.ui.booksearch.screen
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.Button
+import androidx.compose.material3.ButtonDefaults
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import com.texthip.thip.R
+import com.texthip.thip.ui.common.cards.CardItemRoom
+import com.texthip.thip.ui.common.topappbar.DefaultTopAppBar
+import com.texthip.thip.ui.group.myroom.mock.GroupCardItemRoomData
+import com.texthip.thip.ui.theme.ThipTheme
+import com.texthip.thip.ui.theme.ThipTheme.colors
+import com.texthip.thip.ui.theme.ThipTheme.typography
+
+@Composable
+fun BookRecruitingScreen(
+    recruitingList: List<GroupCardItemRoomData>,
+    onCardClick: (GroupCardItemRoomData) -> Unit = {},
+    onCreateRoomClick: () -> Unit = {}
+) {
+    Box(
+        modifier = Modifier.fillMaxSize()
+    ) {
+        Column(
+            Modifier.fillMaxSize()
+        ) {
+            DefaultTopAppBar(
+                title = stringResource(R.string.group_recruiting_title),
+                onLeftClick = {},
+            )
+
+            Column(
+                Modifier
+                    .background(colors.Black)
+                    .fillMaxSize()
+                    .padding(horizontal = 20.dp)
+            ) {
+                Row(
+                    modifier = Modifier.fillMaxWidth(),
+                    verticalAlignment = Alignment.CenterVertically
+                ) {
+                    Text(
+                        text = stringResource(R.string.group_searched_room_size, recruitingList.size),
+                        color = colors.Grey,
+                        style = typography.menu_m500_s14_h24
+                    )
+                }
+                Spacer(
+                    modifier = Modifier
+                        .padding(top = 4.dp, bottom = 20.dp)
+                        .fillMaxWidth()
+                        .height(1.dp)
+                        .background(colors.DarkGrey02)
+                )
+
+                if (recruitingList.isEmpty()) {
+                    Column(
+                        modifier = Modifier
+                            .fillMaxSize()
+                            .padding(bottom = 50.dp),
+                        horizontalAlignment = Alignment.CenterHorizontally,
+                        verticalArrangement = Arrangement.Center
+                    ) {
+                        Text(
+                            text = stringResource(R.string.book_recruiting_empty_message),
+                            color = colors.White,
+                            style = typography.smalltitle_sb600_s18_h24,
+                            textAlign = TextAlign.Center
+                        )
+                        Text(
+                            text = stringResource(R.string.book_recruiting_empty_sub_message),
+                            color = colors.Grey,
+                            style = typography.feedcopy_r400_s14_h20,
+                            textAlign = TextAlign.Center,
+                            modifier = Modifier.padding(top = 8.dp)
+                        )
+                    }
+                } else {
+                    LazyColumn(
+                        verticalArrangement = Arrangement.spacedBy(20.dp),
+                        contentPadding = PaddingValues(bottom = 70.dp),
+                        modifier = Modifier.fillMaxSize()
+                    ) {
+                        items(recruitingList) { item ->
+                            CardItemRoom(
+                                title = item.title,
+                                participants = item.participants,
+                                maxParticipants = item.maxParticipants,
+                                isRecruiting = item.isRecruiting,
+                                endDate = item.endDate,
+                                imageRes = item.imageRes,
+                                onClick = { onCardClick(item) }
+                            )
+                        }
+                    }
+                }
+            }
+        }
+
+        // 하단 버튼
+        Button(
+            colors = ButtonDefaults.buttonColors(
+                containerColor = colors.Purple
+            ),
+            modifier = Modifier
+                .align(Alignment.BottomCenter)
+                .fillMaxWidth()
+                .height(50.dp),
+            shape = RoundedCornerShape(0.dp),
+            onClick = onCreateRoomClick
+        ) {
+            Text(
+                text = stringResource(R.string.group_recruiting_create_button),
+                style = typography.smalltitle_sb600_s18_h24,
+                color = colors.White
+            )
+        }
+    }
+}
+
+@Preview()
+@Composable
+fun GroupRecruitingScreenPreview() {
+    ThipTheme {
+        val dataList = listOf(
+            GroupCardItemRoomData(
+                title = "모임방 이름입니다. 모임방...",
+                participants = 22,
+                maxParticipants = 30,
+                endDate = 3,
+                isRecruiting = true,
+                genreIndex = 0
+            ),
+            GroupCardItemRoomData(
+                title = "모임방 이름입니다. 모임방...",
+                participants = 22,
+                maxParticipants = 30,
+                endDate = 3,
+                isRecruiting = true,
+                genreIndex = 0
+            ),
+            GroupCardItemRoomData(
+                title = "모임방 이름입니다. 모임방...",
+                participants = 22,
+                maxParticipants = 30,
+                endDate = 3,
+                isRecruiting = true,
+                genreIndex = 0
+            ),
+            GroupCardItemRoomData(
+                title = "모임방 이름입니다. 모임방...",
+                participants = 22,
+                maxParticipants = 30,
+                endDate = 3,
+                isRecruiting = true,
+                genreIndex = 0
+            ),
+            GroupCardItemRoomData(
+                title = "모임방 이름입니다. 모임방...",
+                participants = 22,
+                maxParticipants = 30,
+                endDate = 3,
+                isRecruiting = true,
+                genreIndex = 0
+            ),
+            GroupCardItemRoomData(
+                title = "모임방 이름입니다. 모임방...",
+                participants = 22,
+                maxParticipants = 30,
+                endDate = 3,
+                isRecruiting = true,
+                genreIndex = 0
+            ),
+            GroupCardItemRoomData(
+                title = "모임방 이름입니다. 모임방...",
+                participants = 22,
+                maxParticipants = 30,
+                endDate = 3,
+                isRecruiting = true,
+                genreIndex = 0
+            ),
+            GroupCardItemRoomData(
+                title = "모임방 이름입니다. 모임방...",
+                participants = 22,
+                maxParticipants = 30,
+                endDate = 3,
+                isRecruiting = true,
+                genreIndex = 0
+            )
+        )
+
+        BookRecruitingScreen(
+            recruitingList = dataList
+        )
+    }
+}
+
+@Preview()
+@Composable
+fun GroupRecruitingScreenEmptyPreview() {
+    ThipTheme {
+        BookRecruitingScreen(
+            recruitingList = emptyList()
+        )
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/texthip/thip/ui/booksearch/screen/BookSearchScreen.kt b/app/src/main/java/com/texthip/thip/ui/booksearch/screen/BookSearchScreen.kt
index 9411645c..80923550 100644
--- a/app/src/main/java/com/texthip/thip/ui/booksearch/screen/BookSearchScreen.kt
+++ b/app/src/main/java/com/texthip/thip/ui/booksearch/screen/BookSearchScreen.kt
@@ -1,19 +1,205 @@
 package com.texthip.thip.ui.booksearch.screen
 
 import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.material3.Text
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
 import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.derivedStateOf
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
-import androidx.navigation.NavController
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.focus.focusRequester
+import androidx.compose.ui.platform.LocalFocusManager
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import androidx.navigation.NavHostController
+import com.texthip.thip.R
+import com.texthip.thip.ui.booksearch.component.BookEmptyResult
+import com.texthip.thip.ui.booksearch.component.BookFilteredSearchResult
+import com.texthip.thip.ui.booksearch.component.BookLiveSearchResult
+import com.texthip.thip.ui.booksearch.component.BookRecentSearch
+import com.texthip.thip.ui.booksearch.mock.BookData
+import com.texthip.thip.ui.common.forms.SearchBookTextField
+import com.texthip.thip.ui.common.topappbar.LeftNameTopAppBar
+import com.texthip.thip.ui.theme.ThipTheme
 
 @Composable
-fun BookSearchScreen(navController: NavController) {
+fun BookSearchScreen(
+    modifier: Modifier = Modifier,
+    navController: NavHostController? = null,
+    bookList: List<BookData> = emptyList(),
+    popularBooks: List<BookData> = emptyList()
+) {
+    var recentSearches by rememberSaveable {
+        mutableStateOf(listOf("asd", "qwe", "xcv", "dfggfd", "asdasd", "gfhjghj"))
+    }
+    var searchText by rememberSaveable { mutableStateOf("") }
+    var isSearched by rememberSaveable { mutableStateOf(false) }
+    val focusRequester = remember { FocusRequester() }
+    val focusManager = LocalFocusManager.current
+
+    val liveFilteredBookList by remember(searchText) {
+        derivedStateOf {
+            if (searchText.isBlank()) emptyList() else
+                bookList.filter { book ->
+                    book.title.contains(searchText, ignoreCase = true) ||
+                            book.author.contains(searchText, ignoreCase = true) ||
+                            book.publisher.contains(searchText, ignoreCase = true)
+                }
+        }
+    }
+
+    val filteredBookList by remember(searchText, isSearched) {
+        derivedStateOf {
+            if (!isSearched) emptyList()
+            else {
+                bookList.filter { book ->
+                    searchText.isBlank() ||
+                            book.title.contains(searchText, ignoreCase = true) ||
+                            book.author.contains(searchText, ignoreCase = true) ||
+                            book.publisher.contains(searchText, ignoreCase = true)
+                }
+            }
+        }
+    }
+
+    LaunchedEffect(isSearched) {
+        if (isSearched) {
+            focusManager.clearFocus()
+        }
+    }
+
     Box(
-        modifier = Modifier.fillMaxSize(),
-        contentAlignment = Alignment.Center
+        modifier = modifier.fillMaxSize()
     ) {
-        Text(text = "Book Search Screen")
+        Column(
+            modifier = Modifier.fillMaxSize()
+        ) {
+            LeftNameTopAppBar(
+                title = stringResource(R.string.book_search_topappbar)
+            )
+            Column(
+                modifier = Modifier
+                    .fillMaxSize()
+                    .padding(horizontal = 20.dp)
+            ) {
+                Spacer(modifier = Modifier.height(16.dp))
+
+                SearchBookTextField(
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .focusRequester(focusRequester),
+                    hint = stringResource(R.string.book_search_hint),
+                    text = searchText,
+                    onValueChange = {
+                        searchText = it
+                        isSearched = false
+                    },
+                    onSearch = { query ->
+                        if (query.isNotBlank() && !recentSearches.contains(query)) {
+                            recentSearches = listOf(query) + recentSearches
+                        }
+                        isSearched = true
+                    }
+                )
+                Spacer(modifier = Modifier.height(16.dp))
+
+                when {
+                    searchText.isBlank() && !isSearched -> {
+                        BookRecentSearch(
+                            recentSearches = recentSearches,
+                            popularBooks = popularBooks,
+                            popularBookDate = "01.12", // TODO: 서버로 날짜를 받아 오게 수정
+                            onSearchClick = { keyword ->
+                                searchText = keyword
+                                isSearched = true
+                            },
+                            onRemove = { keyword ->
+                                recentSearches = recentSearches.filterNot { it == keyword }
+                            },
+                            onBookClick = { book ->
+                                // 책 클릭 시 처리
+                            }
+                        )
+                    }
+
+                    searchText.isNotBlank() && !isSearched -> {
+                        if (liveFilteredBookList.isEmpty()) {
+                            BookEmptyResult(
+                                mainText = stringResource(R.string.book_no_search_result1),
+                                subText = stringResource(R.string.book_no_search_result2),
+                                onRequestBook = { /*책 요청 처리*/ }
+                            )
+                        } else {
+                            BookLiveSearchResult(
+                                bookList = liveFilteredBookList
+                            )
+                        }
+                    }
+
+                    isSearched -> {
+                        BookFilteredSearchResult(
+                            resultCount = filteredBookList.size,
+                            bookList = filteredBookList,
+                        )
+                    }
+                }
+            }
+        }
+    }
+}
+
+
+@Preview(showBackground = true)
+@Composable
+fun PreviewBookSearchScreen_Default() {
+    ThipTheme {
+        BookSearchScreen(
+            bookList = listOf(
+                BookData("aaa", "리처드 도킨스", "을유문화사", R.drawable.bookcover_sample),
+                BookData("abc", "마틴 셀리그만", "물푸레", R.drawable.bookcover_sample),
+                BookData("abcd", "빅터 프랭클", "청림출판", R.drawable.bookcover_sample),
+                BookData("abcde", "칼 융", "문학과지성사", R.drawable.bookcover_sample),
+                BookData("abcdef", "에릭 프롬", "까치글방", R.drawable.bookcover_sample),
+                BookData("abcedfg", "알베르 카뮈", "민음사", R.drawable.bookcover_sample),
+                BookData("abcdefgh", "장 폴 사르트르", "문학동네", R.drawable.bookcover_sample),
+            ),
+            popularBooks = listOf(
+                BookData("단 한번의 삶", "리처드 도킨스", "을유문화사", R.drawable.bookcover_sample),
+                BookData("사랑", "마틴 셀리그만", "물푸레", R.drawable.bookcover_sample),
+                BookData("호모 사피엔스", "빅터 프랭클", "청림출판", R.drawable.bookcover_sample),
+                BookData("코스모스 실버", "칼 융", "문학과지성사", R.drawable.bookcover_sample),
+                BookData("오만과 편견", "에릭 프롬", "까치글방", R.drawable.bookcover_sample),
+            )
+        )
+    }
+}
+
+@Preview
+@Composable
+fun PreviewBookSearchScreen_EmptyPopular() {
+    ThipTheme {
+        BookSearchScreen(
+            bookList = listOf(
+                BookData("aaa", "리처드 도킨스", "을유문화사", R.drawable.bookcover_sample),
+                BookData("abc", "마틴 셀리그만", "물푸레", R.drawable.bookcover_sample),
+                BookData("abcd", "빅터 프랭클", "청림출판", R.drawable.bookcover_sample),
+                BookData("abcde", "칼 융", "문학과지성사", R.drawable.bookcover_sample),
+                BookData("abcdef", "에릭 프롬", "까치글방", R.drawable.bookcover_sample),
+                BookData("abcedfg", "알베르 카뮈", "민음사", R.drawable.bookcover_sample),
+                BookData("abcdefgh", "장 폴 사르트르", "문학동네", R.drawable.bookcover_sample),
+            ),
+            popularBooks = emptyList()
+        )
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/texthip/thip/ui/common/buttons/ActionMediumButton.kt b/app/src/main/java/com/texthip/thip/ui/common/buttons/ActionMediumButton.kt
index 2ca68de2..9bcf0811 100644
--- a/app/src/main/java/com/texthip/thip/ui/common/buttons/ActionMediumButton.kt
+++ b/app/src/main/java/com/texthip/thip/ui/common/buttons/ActionMediumButton.kt
@@ -37,6 +37,7 @@ fun ActionMediumButton(
     contentColor: Color,
     backgroundColor: Color,
     hasRightIcon: Boolean = false,
+    hasRightPlusIcon: Boolean = false,
     modifier: Modifier = Modifier,
     onClick: () -> Unit = {},
 ) {
@@ -70,7 +71,7 @@ fun ActionMediumButton(
 
         if (hasRightIcon) {
             Icon(
-                painter = painterResource(R.drawable.ic_chevron),
+                painter = if (hasRightPlusIcon) painterResource(R.drawable.ic_plus) else painterResource(R.drawable.ic_chevron),
                 contentDescription = null,
                 tint = contentColor,
             )
diff --git a/app/src/main/java/com/texthip/thip/ui/common/cards/CardBookList.kt b/app/src/main/java/com/texthip/thip/ui/common/cards/CardBookList.kt
index 544a6555..864ca8ef 100644
--- a/app/src/main/java/com/texthip/thip/ui/common/cards/CardBookList.kt
+++ b/app/src/main/java/com/texthip/thip/ui/common/cards/CardBookList.kt
@@ -89,7 +89,8 @@ fun CardBookList(
 
         Spacer(modifier = Modifier.width(12.dp))
 
-        IconButton(
+        // 북마크 아이콘 제거(쓰는 화면이 안보임)
+        /*IconButton(
             onClick = onBookmarkClick,
             modifier = Modifier.size(24.dp)
         ) {
@@ -98,7 +99,7 @@ fun CardBookList(
                 contentDescription = "북마크",
                 tint = if (isBookmarked) colors.Purple else colors.Grey01
             )
-        }
+        }*/
     }
 }
 
diff --git a/app/src/main/java/com/texthip/thip/ui/common/cards/CardBookSearch.kt b/app/src/main/java/com/texthip/thip/ui/common/cards/CardBookSearch.kt
index e9cdb408..3f66b388 100644
--- a/app/src/main/java/com/texthip/thip/ui/common/cards/CardBookSearch.kt
+++ b/app/src/main/java/com/texthip/thip/ui/common/cards/CardBookSearch.kt
@@ -28,6 +28,7 @@ import com.texthip.thip.ui.theme.ThipTheme.typography
 @Composable
 fun CardBookSearch(
     modifier: Modifier = Modifier,
+    number: Int? = null,
     title: String,
     imageRes: Int? = R.drawable.bookcover_sample, // 기본 이미지 리소스
     onClick: () -> Unit = {}
@@ -38,6 +39,15 @@ fun CardBookSearch(
             .clickable { onClick() },
         verticalAlignment = Alignment.CenterVertically
     ) {
+        number?.let {
+            Text(
+                text = "$it. ",
+                style = typography.menu_m500_s16_h24,
+                color = colors.White,
+                modifier = Modifier.padding(end = 4.dp)
+            )
+        }
+
         // 이미지
         Box(
             modifier = Modifier
@@ -74,6 +84,7 @@ fun CardBookSearchPreview() {
         verticalArrangement = Arrangement.spacedBy(8.dp)
     ) {
         CardBookSearch(
+            number = 1,
             title = "단 한번의 삶"
         )
     }
diff --git a/app/src/main/java/com/texthip/thip/ui/common/modal/InfoPopup.kt b/app/src/main/java/com/texthip/thip/ui/common/modal/InfoPopup.kt
index 8cc0290a..652f7642 100644
--- a/app/src/main/java/com/texthip/thip/ui/common/modal/InfoPopup.kt
+++ b/app/src/main/java/com/texthip/thip/ui/common/modal/InfoPopup.kt
@@ -1,6 +1,8 @@
 package com.texthip.thip.ui.common.modal
 
 import androidx.compose.foundation.background
+import androidx.compose.foundation.border
+import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
@@ -8,13 +10,17 @@ import androidx.compose.foundation.layout.Spacer
 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.rememberScrollState
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.verticalScroll
+import androidx.compose.material3.Icon
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
@@ -31,42 +37,73 @@ fun InfoPopup(
 ) {
     val scrollState = rememberScrollState()
 
-    Box(
-        modifier = modifier
-            .fillMaxWidth()
-            .background(colors.DarkGrey, shape = RoundedCornerShape(12.dp))
-            .padding(20.dp)
+    Column(
+        horizontalAlignment = Alignment.CenterHorizontally,
+        modifier = Modifier.background(Color.Transparent)
     ) {
-        Column {
-            Row(
-                verticalAlignment = Alignment.CenterVertically,
-                modifier = Modifier.fillMaxWidth()
+        Box(
+            modifier = modifier
+                .fillMaxWidth()
+                .background(colors.DarkGrey, shape = RoundedCornerShape(12.dp))
+                .padding(20.dp)
+        ) {
+            Column(
+                horizontalAlignment = Alignment.CenterHorizontally
             ) {
-                Text(
-                    text = title,
-                    color = colors.White,
-                    style = typography.smalltitle_sb600_s16_h24
-                )
+                Row(
+                    verticalAlignment = Alignment.CenterVertically,
+                    modifier = Modifier.fillMaxWidth()
+                ) {
+                    Text(
+                        text = title,
+                        color = colors.White,
+                        style = typography.smalltitle_sb600_s16_h24
+                    )
+                }
+                Spacer(modifier = Modifier.height(12.dp))
+                Box(
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .height(284.dp)
+                        .verticalScroll(scrollState)
+                        .drawVerticalScrollbar(scrollState)
+                ) {
+                    Text(
+                        modifier = Modifier.padding(end = 8.dp),
+                        text = content,
+                        color = colors.White,
+                        style = typography.copy_r400_s12_h20
+                    )
+                }
             }
-            Spacer(modifier = Modifier.height(12.dp))
-            Box(
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .height(284.dp)
-                    .verticalScroll(scrollState)
-                    .drawVerticalScrollbar(scrollState)
-            ) {
-                Text(
-                    text = content,
-                    color = colors.White,
-                    style = typography.copy_r400_s12_h20
+        }
+
+        // 아래쪽 X버튼 (원형)
+        Box(
+            modifier = Modifier
+                .padding(top = 20.dp)
+                .size(50.dp)
+                .background(Color.Transparent, shape = RoundedCornerShape(24.dp))
+                .border(
+                    width = 2.dp,
+                    color = colors.Grey02,
+                    shape = RoundedCornerShape(24.dp)
                 )
-            }
+                .clickable { onDismiss() },
+            contentAlignment = Alignment.Center
+        ) {
+            Icon(
+                painter = painterResource(R.drawable.ic_x_20),
+                contentDescription = "닫기",
+                tint = colors.White,
+                modifier = Modifier.size(24.dp)
+            )
         }
     }
 }
 
-@Preview(showBackground = true)
+
+@Preview()
 @Composable
 fun PreviewInfoPopup() {
     val dummyText = """
diff --git a/app/src/main/java/com/texthip/thip/ui/group/makeroom/screen/GroupRegisterBookScreen.kt b/app/src/main/java/com/texthip/thip/ui/group/makeroom/screen/GroupRegisterBookScreen.kt
deleted file mode 100644
index f9ec8805..00000000
--- a/app/src/main/java/com/texthip/thip/ui/group/makeroom/screen/GroupRegisterBookScreen.kt
+++ /dev/null
@@ -1,66 +0,0 @@
-package com.texthip.thip.ui.group.makeroom.screen
-
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.padding
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.dp
-import com.texthip.thip.R
-import com.texthip.thip.ui.common.topappbar.DefaultTopAppBar
-import com.texthip.thip.ui.theme.ThipTheme
-import com.texthip.thip.ui.theme.ThipTheme.colors
-import com.texthip.thip.ui.theme.ThipTheme.typography
-
-@Composable
-fun GroupRegisterBookScreen(modifier: Modifier = Modifier) {
-    Column(
-        modifier = modifier
-            .fillMaxSize(),
-        verticalArrangement = Arrangement.Top,
-        horizontalAlignment = Alignment.CenterHorizontally
-    ) {
-        DefaultTopAppBar(
-            title = stringResource(R.string.group_request_book),
-            onLeftClick = {},
-        )
-        Column (
-            modifier = Modifier
-                .fillMaxSize(),
-            verticalArrangement = Arrangement.Center,
-            horizontalAlignment = Alignment.CenterHorizontally
-        ) {
-            Text(
-                text = stringResource(R.string.customer_center_email),
-                style = typography.smalltitle_sb600_s18_h24,
-                color = colors.White
-            )
-            Spacer(modifier = Modifier.padding(top = 8.dp))
-
-            Text(
-                text = stringResource(R.string.group_request_book_comment_1),
-                style = typography.copy_r400_s14,
-                color = colors.White
-            )
-            Text(
-                text = stringResource(R.string.group_request_book_comment_2),
-                style = typography.copy_r400_s14,
-                color = colors.White
-            )
-        }
-    }
-}
-
-@Preview
-@Composable
-private fun GroupRegisterBookPreview() {
-    ThipTheme {
-        GroupRegisterBookScreen()
-    }
-}
diff --git a/app/src/main/java/com/texthip/thip/ui/group/room/screen/GroupRoomRecruitScreen.kt b/app/src/main/java/com/texthip/thip/ui/group/room/screen/GroupRoomRecruitScreen.kt
index e9614956..fa54e771 100644
--- a/app/src/main/java/com/texthip/thip/ui/group/room/screen/GroupRoomRecruitScreen.kt
+++ b/app/src/main/java/com/texthip/thip/ui/group/room/screen/GroupRoomRecruitScreen.kt
@@ -331,11 +331,6 @@ fun GroupRoomRecruitScreen(
             GroupBottomButtonType.CANCEL -> stringResource(R.string.group_room_screen_cancel)
             GroupBottomButtonType.CLOSE -> stringResource(R.string.group_room_screen_end)
         }
-        val buttonColor = when (currentButtonType) {
-            GroupBottomButtonType.JOIN -> colors.Purple
-            GroupBottomButtonType.CANCEL -> colors.Purple
-            GroupBottomButtonType.CLOSE -> colors.Purple
-        }
 
         Button(
             onClick = {
@@ -375,7 +370,7 @@ fun GroupRoomRecruitScreen(
                 }
             },
             colors = ButtonDefaults.buttonColors(
-                containerColor = buttonColor
+                containerColor = colors.Purple
             ),
             modifier = Modifier
                 .align(Alignment.BottomCenter)
@@ -401,7 +396,6 @@ fun GroupRoomRecruitScreen(
             )
         }
 
-        // 다이얼로그 팝업
         if (showDialog) {
             Box(
                 modifier = Modifier
diff --git a/app/src/main/java/com/texthip/thip/ui/group/room/screen/GroupRoomUnlockScreen.kt b/app/src/main/java/com/texthip/thip/ui/group/room/screen/GroupRoomUnlockScreen.kt
index 52a36a10..e504b58b 100644
--- a/app/src/main/java/com/texthip/thip/ui/group/room/screen/GroupRoomUnlockScreen.kt
+++ b/app/src/main/java/com/texthip/thip/ui/group/room/screen/GroupRoomUnlockScreen.kt
@@ -45,7 +45,6 @@ fun GroupRoomUnlockScreen(
     val focusRequesters = remember { List(4) { FocusRequester() } }
     val keyboardController = LocalSoftwareKeyboardController.current
 
-    // 비밀번호가 4자리 완성되면 자동으로 검증
     LaunchedEffect(password.toList()) {
         val fullPassword = password.joinToString("")
         if (fullPassword.length == 4 && password.all { it.length == 1 }) {
@@ -64,7 +63,6 @@ fun GroupRoomUnlockScreen(
         }
     }
 
-    // 화면 진입 시 키보드 자동 포커스
     LaunchedEffect(Unit) {
         focusRequesters[0].requestFocus()
         keyboardController?.show()
@@ -77,7 +75,6 @@ fun GroupRoomUnlockScreen(
         Column(
             modifier = Modifier.fillMaxSize()
         ) {
-            // 상단 앱바
             DefaultTopAppBar(
                 isRightIconVisible = false,
                 isTitleVisible = false,
diff --git a/app/src/main/java/com/texthip/thip/ui/group/screen/GroupScreen.kt b/app/src/main/java/com/texthip/thip/ui/group/screen/GroupScreen.kt
index ca393b6e..a7a97c9f 100644
--- a/app/src/main/java/com/texthip/thip/ui/group/screen/GroupScreen.kt
+++ b/app/src/main/java/com/texthip/thip/ui/group/screen/GroupScreen.kt
@@ -1,14 +1,12 @@
 package com.texthip.thip.ui.group.screen
 
 import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.runtime.Composable
@@ -34,7 +32,6 @@ import com.texthip.thip.ui.group.myroom.mock.GroupViewModel
 import com.texthip.thip.ui.theme.ThipTheme
 import com.texthip.thip.ui.theme.ThipTheme.colors
 
-
 @Composable
 fun GroupScreen(
     navController: NavHostController? = null,
diff --git a/app/src/main/java/com/texthip/thip/ui/group/search/component/GroupEmptyResult.kt b/app/src/main/java/com/texthip/thip/ui/group/search/component/GroupEmptyResult.kt
index 2ecaca4a..8e07a65e 100644
--- a/app/src/main/java/com/texthip/thip/ui/group/search/component/GroupEmptyResult.kt
+++ b/app/src/main/java/com/texthip/thip/ui/group/search/component/GroupEmptyResult.kt
@@ -9,15 +9,14 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
-import com.texthip.thip.ui.theme.ThipTheme
+import com.texthip.thip.ui.theme.ThipTheme.colors
+import com.texthip.thip.ui.theme.ThipTheme.typography
 
 @Composable
 fun GroupEmptyResult(
     mainText: String,
     subText: String
 ) {
-    val colors = ThipTheme.colors
-    val typography = ThipTheme.typography
     Column(
         modifier = Modifier.fillMaxSize(),
         verticalArrangement = Arrangement.Center,
@@ -25,7 +24,6 @@ fun GroupEmptyResult(
     ) {
         Text(
             text = mainText,
-            modifier = Modifier.padding(top = 20.dp),
             color = colors.White,
             style = typography.smalltitle_sb600_s18_h24
         )
diff --git a/app/src/main/java/com/texthip/thip/ui/group/search/component/GroupFilteredSearchResult.kt b/app/src/main/java/com/texthip/thip/ui/group/search/component/GroupFilteredSearchResult.kt
index 9d688020..39ff4431 100644
--- a/app/src/main/java/com/texthip/thip/ui/group/search/component/GroupFilteredSearchResult.kt
+++ b/app/src/main/java/com/texthip/thip/ui/group/search/component/GroupFilteredSearchResult.kt
@@ -1,15 +1,13 @@
+<<<<<<<< HEAD:app/src/main/java/com/texthip/thip/ui/group/search/component/GroupFilteredSearchResult.kt
 package com.texthip.thip.ui.group.search.component
+========
+package com.texthip.thip.ui.group.myroom.component
+>>>>>>>> 1d57638dfea70853ea5744e306675cd321e496c4:app/src/main/java/com/texthip/thip/ui/group/myroom/component/GroupFilteredSearchResult.kt
 
 import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
@@ -21,6 +19,8 @@ import com.texthip.thip.ui.common.buttons.GenreChipRow
 import com.texthip.thip.ui.common.cards.CardItemRoomSmall
 import com.texthip.thip.ui.group.myroom.mock.GroupCardItemRoomData
 import com.texthip.thip.ui.theme.ThipTheme
+import com.texthip.thip.ui.theme.ThipTheme.colors
+import com.texthip.thip.ui.theme.ThipTheme.typography
 
 @Composable
 fun GroupFilteredSearchResult(
@@ -30,8 +30,6 @@ fun GroupFilteredSearchResult(
     resultCount: Int,
     roomList: List<GroupCardItemRoomData>
 ) {
-    val colors = ThipTheme.colors
-    val typography = ThipTheme.typography
     GenreChipRow(
         modifier = Modifier.width(20.dp),
         genres = genres,
@@ -57,6 +55,7 @@ fun GroupFilteredSearchResult(
             .height(1.dp)
             .background(colors.DarkGrey02)
     )
+
     if (roomList.isEmpty()) {
         GroupEmptyResult(
             mainText = stringResource(R.string.group_no_search_result1),
@@ -66,7 +65,7 @@ fun GroupFilteredSearchResult(
         LazyColumn(
             verticalArrangement = Arrangement.spacedBy(16.dp)
         ) {
-            items(roomList) { room ->
+            itemsIndexed(roomList) { index, room ->
                 CardItemRoomSmall(
                     title = room.title,
                     participants = room.participants,
@@ -76,13 +75,16 @@ fun GroupFilteredSearchResult(
                     isWide = true,
                     isSecret = room.isSecret
                 )
-                Spacer(
-                    modifier = Modifier
-                        .fillMaxWidth()
-                        .height(1.dp)
-                        .background(colors.DarkGrey02)
-                )
+                if (index < roomList.size - 1) {
+                    Spacer(
+                        modifier = Modifier
+                            .fillMaxWidth()
+                            .height(1.dp)
+                            .background(colors.DarkGrey02)
+                    )
+                }
             }
         }
     }
 }
+
diff --git a/app/src/main/java/com/texthip/thip/ui/group/search/component/GroupLiveSearchResult.kt b/app/src/main/java/com/texthip/thip/ui/group/search/component/GroupLiveSearchResult.kt
index b5244d7b..267772fb 100644
--- a/app/src/main/java/com/texthip/thip/ui/group/search/component/GroupLiveSearchResult.kt
+++ b/app/src/main/java/com/texthip/thip/ui/group/search/component/GroupLiveSearchResult.kt
@@ -1,4 +1,8 @@
+<<<<<<<< HEAD:app/src/main/java/com/texthip/thip/ui/group/search/component/GroupLiveSearchResult.kt
 package com.texthip.thip.ui.group.search.component
+========
+package com.texthip.thip.ui.group.myroom.component
+>>>>>>>> 1d57638dfea70853ea5744e306675cd321e496c4:app/src/main/java/com/texthip/thip/ui/group/myroom/component/GroupLiveSearchResult.kt
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
@@ -6,7 +10,7 @@ import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
@@ -21,7 +25,7 @@ fun GroupLiveSearchResult(
     LazyColumn(
         verticalArrangement = Arrangement.spacedBy(16.dp)
     ) {
-        items(roomList) { room ->
+        itemsIndexed(roomList) { index, room ->
             CardItemRoomSmall(
                 title = room.title,
                 participants = room.participants,
@@ -31,12 +35,14 @@ fun GroupLiveSearchResult(
                 isWide = true,
                 isSecret = room.isSecret
             )
-            Spacer(
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .height(1.dp)
-                    .background(colors.DarkGrey02)
-            )
+            if (index < roomList.size - 1) {
+                Spacer(
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .height(1.dp)
+                        .background(colors.DarkGrey02)
+                )
+            }
         }
     }
 }
diff --git a/app/src/main/java/com/texthip/thip/ui/group/search/component/GroupRecentSearch.kt b/app/src/main/java/com/texthip/thip/ui/group/search/component/GroupRecentSearch.kt
index 23f5f0df..a018e94c 100644
--- a/app/src/main/java/com/texthip/thip/ui/group/search/component/GroupRecentSearch.kt
+++ b/app/src/main/java/com/texthip/thip/ui/group/search/component/GroupRecentSearch.kt
@@ -1,4 +1,8 @@
+<<<<<<<< HEAD:app/src/main/java/com/texthip/thip/ui/group/search/component/GroupRecentSearch.kt
 package com.texthip.thip.ui.group.search.component
+========
+package com.texthip.thip.ui.group.myroom.component
+>>>>>>>> 1d57638dfea70853ea5744e306675cd321e496c4:app/src/main/java/com/texthip/thip/ui/group/myroom/component/GroupRecentSearch.kt
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.FlowRow
@@ -12,6 +16,14 @@ import androidx.compose.ui.unit.dp
 import com.texthip.thip.R
 import com.texthip.thip.ui.common.buttons.GenreChipButton
 import com.texthip.thip.ui.theme.ThipTheme
+<<<<<<<< HEAD:app/src/main/java/com/texthip/thip/ui/group/search/component/GroupRecentSearch.kt
+========
+import androidx.compose.foundation.layout.FlowRow
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.height
+import com.texthip.thip.ui.theme.ThipTheme.colors
+import com.texthip.thip.ui.theme.ThipTheme.typography
+>>>>>>>> 1d57638dfea70853ea5744e306675cd321e496c4:app/src/main/java/com/texthip/thip/ui/group/myroom/component/GroupRecentSearch.kt
 
 @Composable
 fun GroupRecentSearch(
@@ -19,8 +31,6 @@ fun GroupRecentSearch(
     onSearchClick: (String) -> Unit,
     onRemove: (String) -> Unit
 ) {
-    val colors = ThipTheme.colors
-    val typography = ThipTheme.typography
     Text(
         text = stringResource(R.string.group_recent_search),
         color = colors.White,
diff --git a/app/src/main/java/com/texthip/thip/ui/group/search/screen/GroupSearchScreen.kt b/app/src/main/java/com/texthip/thip/ui/group/search/screen/GroupSearchScreen.kt
index 76bd00c9..81a7e8fe 100644
--- a/app/src/main/java/com/texthip/thip/ui/group/search/screen/GroupSearchScreen.kt
+++ b/app/src/main/java/com/texthip/thip/ui/group/search/screen/GroupSearchScreen.kt
@@ -28,6 +28,10 @@ import com.texthip.thip.R
 import com.texthip.thip.ui.common.buttons.FilterButton
 import com.texthip.thip.ui.common.forms.SearchBookTextField
 import com.texthip.thip.ui.common.topappbar.DefaultTopAppBar
+import com.texthip.thip.ui.group.myroom.component.GroupEmptyResult
+import com.texthip.thip.ui.group.myroom.component.GroupFilteredSearchResult
+import com.texthip.thip.ui.group.myroom.component.GroupLiveSearchResult
+import com.texthip.thip.ui.group.myroom.component.GroupRecentSearch
 import com.texthip.thip.ui.group.myroom.mock.GroupCardItemRoomData
 import com.texthip.thip.ui.group.search.component.GroupEmptyResult
 import com.texthip.thip.ui.group.search.component.GroupLiveSearchResult
@@ -37,7 +41,8 @@ import com.texthip.thip.ui.theme.ThipTheme
 
 @Composable
 fun GroupSearchScreen(
-    modifier: Modifier = Modifier
+    modifier: Modifier = Modifier,
+    roomList: List<GroupCardItemRoomData>
 ) {
     var recentSearches by rememberSaveable {
         mutableStateOf(listOf("user.02", "ㅇㅇ", "훽후ㅣㅣ", "검색4", "검색5", "검색6"))
@@ -45,23 +50,20 @@ fun GroupSearchScreen(
     var searchText by rememberSaveable { mutableStateOf("") }
     var isSearched by rememberSaveable { mutableStateOf(false) }
     var selectedGenreIndex by rememberSaveable { mutableIntStateOf(-1) }
-    var selectedSortOption by rememberSaveable { mutableStateOf("마감임박순") }
+    var selectedSortOptionIndex by rememberSaveable { mutableIntStateOf(0) }
     val focusRequester = remember { FocusRequester() }
     val focusManager = LocalFocusManager.current
 
-    // 샘플 장르, 정렬 옵션
-    val genres = listOf("문학", "과학·IT", "사회과학", "인문학", "예술")
-    val sortOptions = listOf("마감임박순", "최신순", "참여많은순")
-
-    // 샘플 모임방 리스트
-    val roomList = listOf(
-        GroupCardItemRoomData("aaa", 22, 30, true, 3, R.drawable.bookcover_sample, 0),
-        GroupCardItemRoomData("bbb", 15, 20, true, 7, R.drawable.bookcover_sample, 1, true),
-        GroupCardItemRoomData("ccc", 10, 15, true, 5, R.drawable.bookcover_sample, 2, true),
-        GroupCardItemRoomData("ddd", 8, 12, false, 2, R.drawable.bookcover_sample, 3, true),
-        GroupCardItemRoomData("eee", 18, 25, true, 4, R.drawable.bookcover_sample, 4),
-        GroupCardItemRoomData("fff", 12, 20, true, 1, R.drawable.bookcover_sample, 0),
-        GroupCardItemRoomData("ggg", 10, 14, true, 6, R.drawable.bookcover_sample, 1),
+    val genres = listOf(
+        stringResource(R.string.literature),
+        stringResource(R.string.science_it),
+        stringResource(R.string.social_science),
+        stringResource(R.string.humanities),
+        stringResource(R.string.art)
+    )
+    val sortOptions = listOf(
+        stringResource(R.string.group_filter_deadline),
+        stringResource(R.string.group_filter_popular)
     )
 
     val liveFilteredRoomList by remember(searchText) {
@@ -73,7 +75,12 @@ fun GroupSearchScreen(
         }
     }
 
-    val filteredRoomList by remember(searchText, selectedGenreIndex, selectedSortOption, isSearched) {
+    val filteredRoomList by remember(
+        searchText,
+        selectedGenreIndex,
+        selectedSortOptionIndex,
+        isSearched
+    ) {
         derivedStateOf {
             if (!isSearched) emptyList()
             else {
@@ -81,10 +88,9 @@ fun GroupSearchScreen(
                     (searchText.isBlank() || room.title.contains(searchText, ignoreCase = true)) &&
                             (selectedGenreIndex == -1 || room.genreIndex == selectedGenreIndex)
                 }
-                when (selectedSortOption) {
-                    "마감임박순" -> filtered.sortedBy { it.endDate }
-                    "최신순" -> filtered // TODO: 생성일 기준 정렬 필요
-                    "참여많은순" -> filtered.sortedByDescending { it.participants }
+                when (selectedSortOptionIndex) {
+                    0 -> filtered.sortedBy { it.endDate }             // 마감임박순
+                    1 -> filtered.sortedByDescending { it.participants } // 인기순
                     else -> filtered
                 }
             }
@@ -142,6 +148,7 @@ fun GroupSearchScreen(
                             onRemove = {}
                         )
                     }
+
                     searchText.isBlank() && !isSearched && recentSearches.isNotEmpty() -> {
                         GroupRecentSearch(
                             recentSearches = recentSearches,
@@ -154,6 +161,7 @@ fun GroupSearchScreen(
                             }
                         )
                     }
+
                     searchText.isNotBlank() && !isSearched -> {
                         if (liveFilteredRoomList.isEmpty()) {
                             GroupEmptyResult(
@@ -166,6 +174,7 @@ fun GroupSearchScreen(
                             )
                         }
                     }
+
                     isSearched -> {
                         GroupFilteredSearchResult(
                             genres = genres,
@@ -184,18 +193,31 @@ fun GroupSearchScreen(
                 modifier = Modifier
                     .align(Alignment.TopEnd)
                     .padding(top = 176.dp, end = 20.dp),
-                selectedOption = selectedSortOption,
+                selectedOption = sortOptions[selectedSortOptionIndex],
                 options = sortOptions,
-                onOptionSelected = { selectedSortOption = it }
+                onOptionSelected = { selected ->
+                    selectedSortOptionIndex = sortOptions.indexOf(selected)
+                }
             )
         }
     }
 }
 
+
 @Preview
 @Composable
 fun PreviewGroupSearchScreen() {
     ThipTheme {
-        GroupSearchScreen()
+        GroupSearchScreen(
+            roomList = listOf(
+                GroupCardItemRoomData("aaa", 22, 30, true, 3, R.drawable.bookcover_sample, 0),
+                GroupCardItemRoomData("abc", 15, 20, true, 7, R.drawable.bookcover_sample, 1, true),
+                GroupCardItemRoomData("abcd", 10, 15, true, 5, R.drawable.bookcover_sample, 2, true),
+                GroupCardItemRoomData("abcde", 8, 12, false, 2, R.drawable.bookcover_sample, 3, true),
+                GroupCardItemRoomData("abcdef", 18, 25, true, 4, R.drawable.bookcover_sample, 4),
+                GroupCardItemRoomData("abcdefg", 12, 20, true, 1, R.drawable.bookcover_sample, 0),
+                GroupCardItemRoomData("abcdefgh", 10, 14, true, 6, R.drawable.bookcover_sample, 1)
+            )
+        )
     }
 }
diff --git a/app/src/main/java/com/texthip/thip/ui/navigator/MainNavHost.kt b/app/src/main/java/com/texthip/thip/ui/navigator/MainNavHost.kt
index c3b8701d..c2eed097 100644
--- a/app/src/main/java/com/texthip/thip/ui/navigator/MainNavHost.kt
+++ b/app/src/main/java/com/texthip/thip/ui/navigator/MainNavHost.kt
@@ -14,7 +14,7 @@ fun MainNavHost(navController: NavHostController) {
     NavHost(navController = navController, startDestination = Routes.Feed.route) {
         composable(Routes.Feed.route) { FeedScreen(navController) }
         composable(Routes.Group.route) { GroupScreen(navController) }
-        composable(Routes.BookSearch.route) { BookSearchScreen(navController) }
+        composable(Routes.BookSearch.route) { BookSearchScreen(navController = navController) }
         composable(Routes.MyPage.route) {
             MyPageScreen(
                 navController,
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index eb1b9b57..0fc7e74a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -277,4 +277,29 @@
     <string name="group_myroom_error_comment1">참여 중인 모임방이 없어요</string>
     <string name="group_myroom_error_comment2">첫번째 모임방에 참여해보세요</string>
 
+    <!--    book search   -->
+    <string name="book_popular_search">가장 많이 검색된 책</string>
+    <string name="book_search_topappbar">검색</string>
+    <string name="book_search_hint">책 제목, 작가명을 검색해보세요.</string>
+    <string name="book_no_search_result1">현재 등록된 책이 없어요.</string>
+    <string name="book_no_search_result2">원하는 책을 신청해주세요!</string>
+    <string name="book_search_date">%1$s. 기준</string>
+    <string name="book_no_most_search_result_comment_1">아직 순위가 집계되지 않았어요.</string>
+    <string name="book_no_most_search_result_comment_2">조금만 기다려주세요!</string>
+    <string name="search_recruiting_group_count">모집중인 모임방 %1$d개</string>
+    <string name="search_write_feed_comment">피드에 글 쓰기</string>
+    <string name="search_watch_feed">피드 글 둘러보기</string>
+    <string name="search_no_feed_comment_1">이 책으로 작성된 피드가 없어요.</string>
+    <string name="search_no_feed_comment_2">첫번째 피드를 작성해보세요!</string>
+    <string name="search_filter_popular">인기순</string>
+    <string name="search_filter_latest">최신순</string>
+    <string name="search_book_comment">소개</string>
+    <string name="search_book_author">%1$s 저 · %2$s</string>
+    <string name="group_filter_popular">인기순</string>
+    <string name="group_filter_deadline">마감임박순</string>
+    <string name="group_recruiting_title">모집중인 모임방</string>
+    <string name="book_recruiting_empty_message">이 책으로 모집중인 모임방이 없어요.</string>
+    <string name="book_recruiting_empty_sub_message">직접 모임방을 만들어보세요!</string>
+    <string name="group_recruiting_create_button">모임방 만들기</string>
+
 </resources>
\ No newline at end of file

From 6ae3496d22fa832be43ca6ede766ca0e9c652221 Mon Sep 17 00:00:00 2001
From: Naeun Kim <102296721+Nico1eKim@users.noreply.github.com>
Date: Wed, 23 Jul 2025 16:19:30 +0900
Subject: [PATCH 13/25] =?UTF-8?q?[fix]:=20conflict=20=ED=95=B4=EA=B2=B0?=
 =?UTF-8?q?=EC=A4=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ui/common/screen/RegisterBookScreen.kt    | 66 +++++++++++++
 .../myroom/component/GroupEmptyResult.kt      | 45 +++++++++
 .../component/GroupFilteredSearchResult.kt    | 94 +++++++++++++++++++
 .../myroom/component/GroupLiveSearchResult.kt | 52 ++++++++++
 .../myroom/component/GroupRecentSearch.kt     | 68 ++++++++++++++
 .../search/component/GroupEmptyResult.kt      |  8 ++
 .../component/GroupFilteredSearchResult.kt    |  4 +
 .../search/component/GroupLiveSearchResult.kt |  4 +
 .../search/component/GroupRecentSearch.kt     |  7 ++
 9 files changed, 348 insertions(+)
 create mode 100644 app/src/main/java/com/texthip/thip/ui/common/screen/RegisterBookScreen.kt
 create mode 100644 app/src/main/java/com/texthip/thip/ui/group/myroom/component/GroupEmptyResult.kt
 create mode 100644 app/src/main/java/com/texthip/thip/ui/group/myroom/component/GroupFilteredSearchResult.kt
 create mode 100644 app/src/main/java/com/texthip/thip/ui/group/myroom/component/GroupLiveSearchResult.kt
 create mode 100644 app/src/main/java/com/texthip/thip/ui/group/myroom/component/GroupRecentSearch.kt

diff --git a/app/src/main/java/com/texthip/thip/ui/common/screen/RegisterBookScreen.kt b/app/src/main/java/com/texthip/thip/ui/common/screen/RegisterBookScreen.kt
new file mode 100644
index 00000000..819328e2
--- /dev/null
+++ b/app/src/main/java/com/texthip/thip/ui/common/screen/RegisterBookScreen.kt
@@ -0,0 +1,66 @@
+package com.texthip.thip.ui.common.screen
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import com.texthip.thip.R
+import com.texthip.thip.ui.common.topappbar.DefaultTopAppBar
+import com.texthip.thip.ui.theme.ThipTheme
+import com.texthip.thip.ui.theme.ThipTheme.colors
+import com.texthip.thip.ui.theme.ThipTheme.typography
+
+@Composable
+fun RegisterBookScreen(modifier: Modifier = Modifier) {
+    Column(
+        modifier = modifier
+            .fillMaxSize(),
+        verticalArrangement = Arrangement.Top,
+        horizontalAlignment = Alignment.CenterHorizontally
+    ) {
+        DefaultTopAppBar(
+            title = stringResource(R.string.group_request_book),
+            onLeftClick = {},
+        )
+        Column (
+            modifier = Modifier
+                .fillMaxSize(),
+            verticalArrangement = Arrangement.Center,
+            horizontalAlignment = Alignment.CenterHorizontally
+        ) {
+            Text(
+                text = stringResource(R.string.customer_center_email),
+                style = typography.smalltitle_sb600_s18_h24,
+                color = colors.White
+            )
+            Spacer(modifier = Modifier.padding(top = 8.dp))
+
+            Text(
+                text = stringResource(R.string.group_request_book_comment_1),
+                style = typography.copy_r400_s14,
+                color = colors.White
+            )
+            Text(
+                text = stringResource(R.string.group_request_book_comment_2),
+                style = typography.copy_r400_s14,
+                color = colors.White
+            )
+        }
+    }
+}
+
+@Preview
+@Composable
+private fun GroupRegisterBookPreview() {
+    ThipTheme {
+        RegisterBookScreen()
+    }
+}
diff --git a/app/src/main/java/com/texthip/thip/ui/group/myroom/component/GroupEmptyResult.kt b/app/src/main/java/com/texthip/thip/ui/group/myroom/component/GroupEmptyResult.kt
new file mode 100644
index 00000000..9da64984
--- /dev/null
+++ b/app/src/main/java/com/texthip/thip/ui/group/myroom/component/GroupEmptyResult.kt
@@ -0,0 +1,45 @@
+<<<<<<<< HEAD:app/src/main/java/com/texthip/thip/ui/group/search/component/GroupEmptyResult.kt
+package com.texthip.thip.ui.group.search.component
+========
+package com.texthip.thip.ui.group.myroom.component
+>>>>>>>> 1d57638dfea70853ea5744e306675cd321e496c4:app/src/main/java/com/texthip/thip/ui/group/myroom/component/GroupEmptyResult.kt
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
+<<<<<<<< HEAD:app/src/main/java/com/texthip/thip/ui/group/search/component/GroupEmptyResult.kt
+========
+import com.texthip.thip.ui.theme.ThipTheme
+>>>>>>>> 1d57638dfea70853ea5744e306675cd321e496c4:app/src/main/java/com/texthip/thip/ui/group/myroom/component/GroupEmptyResult.kt
+import com.texthip.thip.ui.theme.ThipTheme.colors
+import com.texthip.thip.ui.theme.ThipTheme.typography
+
+@Composable
+fun GroupEmptyResult(
+    mainText: String,
+    subText: String
+) {
+    Column(
+        modifier = Modifier.fillMaxSize(),
+        verticalArrangement = Arrangement.Center,
+        horizontalAlignment = Alignment.CenterHorizontally
+    ) {
+        Text(
+            text = mainText,
+            color = colors.White,
+            style = typography.smalltitle_sb600_s18_h24
+        )
+        Text(
+            text = subText,
+            modifier = Modifier.padding(top = 8.dp),
+            color = colors.Grey,
+            style = typography.copy_r400_s14
+        )
+    }
+}
diff --git a/app/src/main/java/com/texthip/thip/ui/group/myroom/component/GroupFilteredSearchResult.kt b/app/src/main/java/com/texthip/thip/ui/group/myroom/component/GroupFilteredSearchResult.kt
new file mode 100644
index 00000000..c87017f5
--- /dev/null
+++ b/app/src/main/java/com/texthip/thip/ui/group/myroom/component/GroupFilteredSearchResult.kt
@@ -0,0 +1,94 @@
+<<<<<<<< HEAD:app/src/main/java/com/texthip/thip/ui/group/search/component/GroupFilteredSearchResult.kt
+<<<<<<<< HEAD:app/src/main/java/com/texthip/thip/ui/group/search/component/GroupFilteredSearchResult.kt
+package com.texthip.thip.ui.group.search.component
+========
+package com.texthip.thip.ui.group.myroom.component
+>>>>>>>> 1d57638dfea70853ea5744e306675cd321e496c4:app/src/main/java/com/texthip/thip/ui/group/myroom/component/GroupFilteredSearchResult.kt
+========
+package com.texthip.thip.ui.group.myroom.component
+>>>>>>>> 1d57638dfea70853ea5744e306675cd321e496c4:app/src/main/java/com/texthip/thip/ui/group/myroom/component/GroupFilteredSearchResult.kt
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.itemsIndexed
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import com.texthip.thip.R
+import com.texthip.thip.ui.common.buttons.GenreChipRow
+import com.texthip.thip.ui.common.cards.CardItemRoomSmall
+import com.texthip.thip.ui.group.myroom.mock.GroupCardItemRoomData
+import com.texthip.thip.ui.theme.ThipTheme
+import com.texthip.thip.ui.theme.ThipTheme.colors
+import com.texthip.thip.ui.theme.ThipTheme.typography
+
+@Composable
+fun GroupFilteredSearchResult(
+    genres: List<String>,
+    selectedGenreIndex: Int,
+    onGenreSelect: (Int) -> Unit,
+    resultCount: Int,
+    roomList: List<GroupCardItemRoomData>
+) {
+    GenreChipRow(
+        modifier = Modifier.width(20.dp),
+        genres = genres,
+        selectedIndex = selectedGenreIndex,
+        onSelect = onGenreSelect
+    )
+    Spacer(modifier = Modifier.height(20.dp))
+
+    Row(
+        modifier = Modifier.fillMaxWidth(),
+        verticalAlignment = Alignment.CenterVertically
+    ) {
+        Text(
+            text = stringResource(R.string.group_searched_room_size, resultCount),
+            color = colors.Grey,
+            style = typography.menu_m500_s14_h24
+        )
+    }
+    Spacer(
+        modifier = Modifier
+            .padding(top = 4.dp, bottom = 8.dp)
+            .fillMaxWidth()
+            .height(1.dp)
+            .background(colors.DarkGrey02)
+    )
+
+    if (roomList.isEmpty()) {
+        GroupEmptyResult(
+            mainText = stringResource(R.string.group_no_search_result1),
+            subText = stringResource(R.string.group_no_search_result2)
+        )
+    } else {
+        LazyColumn(
+            verticalArrangement = Arrangement.spacedBy(16.dp)
+        ) {
+            itemsIndexed(roomList) { index, room ->
+                CardItemRoomSmall(
+                    title = room.title,
+                    participants = room.participants,
+                    maxParticipants = room.maxParticipants,
+                    endDate = room.endDate,
+                    imageRes = room.imageRes,
+                    isWide = true,
+                    isSecret = room.isSecret
+                )
+                if (index < roomList.size - 1) {
+                    Spacer(
+                        modifier = Modifier
+                            .fillMaxWidth()
+                            .height(1.dp)
+                            .background(colors.DarkGrey02)
+                    )
+                }
+            }
+        }
+    }
+}
+
diff --git a/app/src/main/java/com/texthip/thip/ui/group/myroom/component/GroupLiveSearchResult.kt b/app/src/main/java/com/texthip/thip/ui/group/myroom/component/GroupLiveSearchResult.kt
new file mode 100644
index 00000000..1ea086f5
--- /dev/null
+++ b/app/src/main/java/com/texthip/thip/ui/group/myroom/component/GroupLiveSearchResult.kt
@@ -0,0 +1,52 @@
+<<<<<<<< HEAD:app/src/main/java/com/texthip/thip/ui/group/search/component/GroupLiveSearchResult.kt
+<<<<<<<< HEAD:app/src/main/java/com/texthip/thip/ui/group/search/component/GroupLiveSearchResult.kt
+package com.texthip.thip.ui.group.search.component
+========
+package com.texthip.thip.ui.group.myroom.component
+>>>>>>>> 1d57638dfea70853ea5744e306675cd321e496c4:app/src/main/java/com/texthip/thip/ui/group/myroom/component/GroupLiveSearchResult.kt
+========
+package com.texthip.thip.ui.group.myroom.component
+>>>>>>>> 1d57638dfea70853ea5744e306675cd321e496c4:app/src/main/java/com/texthip/thip/ui/group/myroom/component/GroupLiveSearchResult.kt
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.itemsIndexed
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
+import com.texthip.thip.ui.common.cards.CardItemRoomSmall
+import com.texthip.thip.ui.group.myroom.mock.GroupCardItemRoomData
+import com.texthip.thip.ui.theme.ThipTheme.colors
+
+@Composable
+fun GroupLiveSearchResult(
+    roomList: List<GroupCardItemRoomData>
+) {
+    LazyColumn(
+        verticalArrangement = Arrangement.spacedBy(16.dp)
+    ) {
+        itemsIndexed(roomList) { index, room ->
+            CardItemRoomSmall(
+                title = room.title,
+                participants = room.participants,
+                maxParticipants = room.maxParticipants,
+                endDate = room.endDate,
+                imageRes = room.imageRes,
+                isWide = true,
+                isSecret = room.isSecret
+            )
+            if (index < roomList.size - 1) {
+                Spacer(
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .height(1.dp)
+                        .background(colors.DarkGrey02)
+                )
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/com/texthip/thip/ui/group/myroom/component/GroupRecentSearch.kt b/app/src/main/java/com/texthip/thip/ui/group/myroom/component/GroupRecentSearch.kt
new file mode 100644
index 00000000..6a450b75
--- /dev/null
+++ b/app/src/main/java/com/texthip/thip/ui/group/myroom/component/GroupRecentSearch.kt
@@ -0,0 +1,68 @@
+<<<<<<<< HEAD:app/src/main/java/com/texthip/thip/ui/group/search/component/GroupRecentSearch.kt
+<<<<<<<< HEAD:app/src/main/java/com/texthip/thip/ui/group/search/component/GroupRecentSearch.kt
+package com.texthip.thip.ui.group.search.component
+========
+package com.texthip.thip.ui.group.myroom.component
+>>>>>>>> 1d57638dfea70853ea5744e306675cd321e496c4:app/src/main/java/com/texthip/thip/ui/group/myroom/component/GroupRecentSearch.kt
+========
+package com.texthip.thip.ui.group.myroom.component
+>>>>>>>> 1d57638dfea70853ea5744e306675cd321e496c4:app/src/main/java/com/texthip/thip/ui/group/myroom/component/GroupRecentSearch.kt
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.FlowRow
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.height
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import com.texthip.thip.R
+import com.texthip.thip.ui.common.buttons.GenreChipButton
+import com.texthip.thip.ui.theme.ThipTheme
+<<<<<<<< HEAD:app/src/main/java/com/texthip/thip/ui/group/search/component/GroupRecentSearch.kt
+========
+import androidx.compose.foundation.layout.FlowRow
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.height
+import com.texthip.thip.ui.theme.ThipTheme.colors
+import com.texthip.thip.ui.theme.ThipTheme.typography
+<<<<<<<< HEAD:app/src/main/java/com/texthip/thip/ui/group/search/component/GroupRecentSearch.kt
+>>>>>>>> 1d57638dfea70853ea5744e306675cd321e496c4:app/src/main/java/com/texthip/thip/ui/group/myroom/component/GroupRecentSearch.kt
+========
+>>>>>>>> 1d57638dfea70853ea5744e306675cd321e496c4:app/src/main/java/com/texthip/thip/ui/group/myroom/component/GroupRecentSearch.kt
+
+@Composable
+fun GroupRecentSearch(
+    recentSearches: List<String>,
+    onSearchClick: (String) -> Unit,
+    onRemove: (String) -> Unit
+) {
+    Text(
+        text = stringResource(R.string.group_recent_search),
+        color = colors.White,
+        style = typography.menu_r400_s14_h24
+    )
+    Spacer(modifier = Modifier.height(16.dp))
+    if (recentSearches.isEmpty()) {
+        Text(
+            text = stringResource(R.string.group_no_recent_search),
+            color = colors.Grey01,
+            style = typography.menu_r400_s14_h24
+        )
+    } else {
+        FlowRow(
+            verticalArrangement = Arrangement.spacedBy(12.dp),
+            horizontalArrangement = Arrangement.spacedBy(16.dp),
+            maxLines = 2,
+        ) {
+            recentSearches.take(9).forEach { keyword ->
+                GenreChipButton(
+                    text = keyword,
+                    onClick = { onSearchClick(keyword) },
+                    onCloseClick = { onRemove(keyword) }
+                )
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/com/texthip/thip/ui/group/search/component/GroupEmptyResult.kt b/app/src/main/java/com/texthip/thip/ui/group/search/component/GroupEmptyResult.kt
index 8e07a65e..9da64984 100644
--- a/app/src/main/java/com/texthip/thip/ui/group/search/component/GroupEmptyResult.kt
+++ b/app/src/main/java/com/texthip/thip/ui/group/search/component/GroupEmptyResult.kt
@@ -1,4 +1,8 @@
+<<<<<<<< HEAD:app/src/main/java/com/texthip/thip/ui/group/search/component/GroupEmptyResult.kt
 package com.texthip.thip.ui.group.search.component
+========
+package com.texthip.thip.ui.group.myroom.component
+>>>>>>>> 1d57638dfea70853ea5744e306675cd321e496c4:app/src/main/java/com/texthip/thip/ui/group/myroom/component/GroupEmptyResult.kt
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -9,6 +13,10 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
+<<<<<<<< HEAD:app/src/main/java/com/texthip/thip/ui/group/search/component/GroupEmptyResult.kt
+========
+import com.texthip.thip.ui.theme.ThipTheme
+>>>>>>>> 1d57638dfea70853ea5744e306675cd321e496c4:app/src/main/java/com/texthip/thip/ui/group/myroom/component/GroupEmptyResult.kt
 import com.texthip.thip.ui.theme.ThipTheme.colors
 import com.texthip.thip.ui.theme.ThipTheme.typography
 
diff --git a/app/src/main/java/com/texthip/thip/ui/group/search/component/GroupFilteredSearchResult.kt b/app/src/main/java/com/texthip/thip/ui/group/search/component/GroupFilteredSearchResult.kt
index 39ff4431..c87017f5 100644
--- a/app/src/main/java/com/texthip/thip/ui/group/search/component/GroupFilteredSearchResult.kt
+++ b/app/src/main/java/com/texthip/thip/ui/group/search/component/GroupFilteredSearchResult.kt
@@ -1,8 +1,12 @@
 <<<<<<<< HEAD:app/src/main/java/com/texthip/thip/ui/group/search/component/GroupFilteredSearchResult.kt
+<<<<<<<< HEAD:app/src/main/java/com/texthip/thip/ui/group/search/component/GroupFilteredSearchResult.kt
 package com.texthip.thip.ui.group.search.component
 ========
 package com.texthip.thip.ui.group.myroom.component
 >>>>>>>> 1d57638dfea70853ea5744e306675cd321e496c4:app/src/main/java/com/texthip/thip/ui/group/myroom/component/GroupFilteredSearchResult.kt
+========
+package com.texthip.thip.ui.group.myroom.component
+>>>>>>>> 1d57638dfea70853ea5744e306675cd321e496c4:app/src/main/java/com/texthip/thip/ui/group/myroom/component/GroupFilteredSearchResult.kt
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.*
diff --git a/app/src/main/java/com/texthip/thip/ui/group/search/component/GroupLiveSearchResult.kt b/app/src/main/java/com/texthip/thip/ui/group/search/component/GroupLiveSearchResult.kt
index 267772fb..1ea086f5 100644
--- a/app/src/main/java/com/texthip/thip/ui/group/search/component/GroupLiveSearchResult.kt
+++ b/app/src/main/java/com/texthip/thip/ui/group/search/component/GroupLiveSearchResult.kt
@@ -1,8 +1,12 @@
 <<<<<<<< HEAD:app/src/main/java/com/texthip/thip/ui/group/search/component/GroupLiveSearchResult.kt
+<<<<<<<< HEAD:app/src/main/java/com/texthip/thip/ui/group/search/component/GroupLiveSearchResult.kt
 package com.texthip.thip.ui.group.search.component
 ========
 package com.texthip.thip.ui.group.myroom.component
 >>>>>>>> 1d57638dfea70853ea5744e306675cd321e496c4:app/src/main/java/com/texthip/thip/ui/group/myroom/component/GroupLiveSearchResult.kt
+========
+package com.texthip.thip.ui.group.myroom.component
+>>>>>>>> 1d57638dfea70853ea5744e306675cd321e496c4:app/src/main/java/com/texthip/thip/ui/group/myroom/component/GroupLiveSearchResult.kt
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
diff --git a/app/src/main/java/com/texthip/thip/ui/group/search/component/GroupRecentSearch.kt b/app/src/main/java/com/texthip/thip/ui/group/search/component/GroupRecentSearch.kt
index a018e94c..6a450b75 100644
--- a/app/src/main/java/com/texthip/thip/ui/group/search/component/GroupRecentSearch.kt
+++ b/app/src/main/java/com/texthip/thip/ui/group/search/component/GroupRecentSearch.kt
@@ -1,8 +1,12 @@
 <<<<<<<< HEAD:app/src/main/java/com/texthip/thip/ui/group/search/component/GroupRecentSearch.kt
+<<<<<<<< HEAD:app/src/main/java/com/texthip/thip/ui/group/search/component/GroupRecentSearch.kt
 package com.texthip.thip.ui.group.search.component
 ========
 package com.texthip.thip.ui.group.myroom.component
 >>>>>>>> 1d57638dfea70853ea5744e306675cd321e496c4:app/src/main/java/com/texthip/thip/ui/group/myroom/component/GroupRecentSearch.kt
+========
+package com.texthip.thip.ui.group.myroom.component
+>>>>>>>> 1d57638dfea70853ea5744e306675cd321e496c4:app/src/main/java/com/texthip/thip/ui/group/myroom/component/GroupRecentSearch.kt
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.FlowRow
@@ -23,6 +27,9 @@ import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.height
 import com.texthip.thip.ui.theme.ThipTheme.colors
 import com.texthip.thip.ui.theme.ThipTheme.typography
+<<<<<<<< HEAD:app/src/main/java/com/texthip/thip/ui/group/search/component/GroupRecentSearch.kt
+>>>>>>>> 1d57638dfea70853ea5744e306675cd321e496c4:app/src/main/java/com/texthip/thip/ui/group/myroom/component/GroupRecentSearch.kt
+========
 >>>>>>>> 1d57638dfea70853ea5744e306675cd321e496c4:app/src/main/java/com/texthip/thip/ui/group/myroom/component/GroupRecentSearch.kt
 
 @Composable

From 3e3ab2d4dca219ab3bb0a8f1ea4f663024ff0ac9 Mon Sep 17 00:00:00 2001
From: Naeun Kim <102296721+Nico1eKim@users.noreply.github.com>
Date: Wed, 23 Jul 2025 16:20:44 +0900
Subject: [PATCH 14/25] =?UTF-8?q?[fix]:=20conflict=20=ED=95=B4=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../myroom/component/GroupEmptyResult.kt      | 45 ---------
 .../component/GroupFilteredSearchResult.kt    | 94 -------------------
 .../myroom/component/GroupLiveSearchResult.kt | 52 ----------
 .../myroom/component/GroupRecentSearch.kt     | 68 --------------
 .../search/component/GroupEmptyResult.kt      |  8 --
 .../component/GroupFilteredSearchResult.kt    |  9 --
 .../search/component/GroupLiveSearchResult.kt |  8 --
 .../search/component/GroupRecentSearch.kt     | 18 ----
 8 files changed, 302 deletions(-)
 delete mode 100644 app/src/main/java/com/texthip/thip/ui/group/myroom/component/GroupEmptyResult.kt
 delete mode 100644 app/src/main/java/com/texthip/thip/ui/group/myroom/component/GroupFilteredSearchResult.kt
 delete mode 100644 app/src/main/java/com/texthip/thip/ui/group/myroom/component/GroupLiveSearchResult.kt
 delete mode 100644 app/src/main/java/com/texthip/thip/ui/group/myroom/component/GroupRecentSearch.kt

diff --git a/app/src/main/java/com/texthip/thip/ui/group/myroom/component/GroupEmptyResult.kt b/app/src/main/java/com/texthip/thip/ui/group/myroom/component/GroupEmptyResult.kt
deleted file mode 100644
index 9da64984..00000000
--- a/app/src/main/java/com/texthip/thip/ui/group/myroom/component/GroupEmptyResult.kt
+++ /dev/null
@@ -1,45 +0,0 @@
-<<<<<<<< HEAD:app/src/main/java/com/texthip/thip/ui/group/search/component/GroupEmptyResult.kt
-package com.texthip.thip.ui.group.search.component
-========
-package com.texthip.thip.ui.group.myroom.component
->>>>>>>> 1d57638dfea70853ea5744e306675cd321e496c4:app/src/main/java/com/texthip/thip/ui/group/myroom/component/GroupEmptyResult.kt
-
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.padding
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.unit.dp
-<<<<<<<< HEAD:app/src/main/java/com/texthip/thip/ui/group/search/component/GroupEmptyResult.kt
-========
-import com.texthip.thip.ui.theme.ThipTheme
->>>>>>>> 1d57638dfea70853ea5744e306675cd321e496c4:app/src/main/java/com/texthip/thip/ui/group/myroom/component/GroupEmptyResult.kt
-import com.texthip.thip.ui.theme.ThipTheme.colors
-import com.texthip.thip.ui.theme.ThipTheme.typography
-
-@Composable
-fun GroupEmptyResult(
-    mainText: String,
-    subText: String
-) {
-    Column(
-        modifier = Modifier.fillMaxSize(),
-        verticalArrangement = Arrangement.Center,
-        horizontalAlignment = Alignment.CenterHorizontally
-    ) {
-        Text(
-            text = mainText,
-            color = colors.White,
-            style = typography.smalltitle_sb600_s18_h24
-        )
-        Text(
-            text = subText,
-            modifier = Modifier.padding(top = 8.dp),
-            color = colors.Grey,
-            style = typography.copy_r400_s14
-        )
-    }
-}
diff --git a/app/src/main/java/com/texthip/thip/ui/group/myroom/component/GroupFilteredSearchResult.kt b/app/src/main/java/com/texthip/thip/ui/group/myroom/component/GroupFilteredSearchResult.kt
deleted file mode 100644
index c87017f5..00000000
--- a/app/src/main/java/com/texthip/thip/ui/group/myroom/component/GroupFilteredSearchResult.kt
+++ /dev/null
@@ -1,94 +0,0 @@
-<<<<<<<< HEAD:app/src/main/java/com/texthip/thip/ui/group/search/component/GroupFilteredSearchResult.kt
-<<<<<<<< HEAD:app/src/main/java/com/texthip/thip/ui/group/search/component/GroupFilteredSearchResult.kt
-package com.texthip.thip.ui.group.search.component
-========
-package com.texthip.thip.ui.group.myroom.component
->>>>>>>> 1d57638dfea70853ea5744e306675cd321e496c4:app/src/main/java/com/texthip/thip/ui/group/myroom/component/GroupFilteredSearchResult.kt
-========
-package com.texthip.thip.ui.group.myroom.component
->>>>>>>> 1d57638dfea70853ea5744e306675cd321e496c4:app/src/main/java/com/texthip/thip/ui/group/myroom/component/GroupFilteredSearchResult.kt
-
-import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.itemsIndexed
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.unit.dp
-import com.texthip.thip.R
-import com.texthip.thip.ui.common.buttons.GenreChipRow
-import com.texthip.thip.ui.common.cards.CardItemRoomSmall
-import com.texthip.thip.ui.group.myroom.mock.GroupCardItemRoomData
-import com.texthip.thip.ui.theme.ThipTheme
-import com.texthip.thip.ui.theme.ThipTheme.colors
-import com.texthip.thip.ui.theme.ThipTheme.typography
-
-@Composable
-fun GroupFilteredSearchResult(
-    genres: List<String>,
-    selectedGenreIndex: Int,
-    onGenreSelect: (Int) -> Unit,
-    resultCount: Int,
-    roomList: List<GroupCardItemRoomData>
-) {
-    GenreChipRow(
-        modifier = Modifier.width(20.dp),
-        genres = genres,
-        selectedIndex = selectedGenreIndex,
-        onSelect = onGenreSelect
-    )
-    Spacer(modifier = Modifier.height(20.dp))
-
-    Row(
-        modifier = Modifier.fillMaxWidth(),
-        verticalAlignment = Alignment.CenterVertically
-    ) {
-        Text(
-            text = stringResource(R.string.group_searched_room_size, resultCount),
-            color = colors.Grey,
-            style = typography.menu_m500_s14_h24
-        )
-    }
-    Spacer(
-        modifier = Modifier
-            .padding(top = 4.dp, bottom = 8.dp)
-            .fillMaxWidth()
-            .height(1.dp)
-            .background(colors.DarkGrey02)
-    )
-
-    if (roomList.isEmpty()) {
-        GroupEmptyResult(
-            mainText = stringResource(R.string.group_no_search_result1),
-            subText = stringResource(R.string.group_no_search_result2)
-        )
-    } else {
-        LazyColumn(
-            verticalArrangement = Arrangement.spacedBy(16.dp)
-        ) {
-            itemsIndexed(roomList) { index, room ->
-                CardItemRoomSmall(
-                    title = room.title,
-                    participants = room.participants,
-                    maxParticipants = room.maxParticipants,
-                    endDate = room.endDate,
-                    imageRes = room.imageRes,
-                    isWide = true,
-                    isSecret = room.isSecret
-                )
-                if (index < roomList.size - 1) {
-                    Spacer(
-                        modifier = Modifier
-                            .fillMaxWidth()
-                            .height(1.dp)
-                            .background(colors.DarkGrey02)
-                    )
-                }
-            }
-        }
-    }
-}
-
diff --git a/app/src/main/java/com/texthip/thip/ui/group/myroom/component/GroupLiveSearchResult.kt b/app/src/main/java/com/texthip/thip/ui/group/myroom/component/GroupLiveSearchResult.kt
deleted file mode 100644
index 1ea086f5..00000000
--- a/app/src/main/java/com/texthip/thip/ui/group/myroom/component/GroupLiveSearchResult.kt
+++ /dev/null
@@ -1,52 +0,0 @@
-<<<<<<<< HEAD:app/src/main/java/com/texthip/thip/ui/group/search/component/GroupLiveSearchResult.kt
-<<<<<<<< HEAD:app/src/main/java/com/texthip/thip/ui/group/search/component/GroupLiveSearchResult.kt
-package com.texthip.thip.ui.group.search.component
-========
-package com.texthip.thip.ui.group.myroom.component
->>>>>>>> 1d57638dfea70853ea5744e306675cd321e496c4:app/src/main/java/com/texthip/thip/ui/group/myroom/component/GroupLiveSearchResult.kt
-========
-package com.texthip.thip.ui.group.myroom.component
->>>>>>>> 1d57638dfea70853ea5744e306675cd321e496c4:app/src/main/java/com/texthip/thip/ui/group/myroom/component/GroupLiveSearchResult.kt
-
-import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.itemsIndexed
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.unit.dp
-import com.texthip.thip.ui.common.cards.CardItemRoomSmall
-import com.texthip.thip.ui.group.myroom.mock.GroupCardItemRoomData
-import com.texthip.thip.ui.theme.ThipTheme.colors
-
-@Composable
-fun GroupLiveSearchResult(
-    roomList: List<GroupCardItemRoomData>
-) {
-    LazyColumn(
-        verticalArrangement = Arrangement.spacedBy(16.dp)
-    ) {
-        itemsIndexed(roomList) { index, room ->
-            CardItemRoomSmall(
-                title = room.title,
-                participants = room.participants,
-                maxParticipants = room.maxParticipants,
-                endDate = room.endDate,
-                imageRes = room.imageRes,
-                isWide = true,
-                isSecret = room.isSecret
-            )
-            if (index < roomList.size - 1) {
-                Spacer(
-                    modifier = Modifier
-                        .fillMaxWidth()
-                        .height(1.dp)
-                        .background(colors.DarkGrey02)
-                )
-            }
-        }
-    }
-}
diff --git a/app/src/main/java/com/texthip/thip/ui/group/myroom/component/GroupRecentSearch.kt b/app/src/main/java/com/texthip/thip/ui/group/myroom/component/GroupRecentSearch.kt
deleted file mode 100644
index 6a450b75..00000000
--- a/app/src/main/java/com/texthip/thip/ui/group/myroom/component/GroupRecentSearch.kt
+++ /dev/null
@@ -1,68 +0,0 @@
-<<<<<<<< HEAD:app/src/main/java/com/texthip/thip/ui/group/search/component/GroupRecentSearch.kt
-<<<<<<<< HEAD:app/src/main/java/com/texthip/thip/ui/group/search/component/GroupRecentSearch.kt
-package com.texthip.thip.ui.group.search.component
-========
-package com.texthip.thip.ui.group.myroom.component
->>>>>>>> 1d57638dfea70853ea5744e306675cd321e496c4:app/src/main/java/com/texthip/thip/ui/group/myroom/component/GroupRecentSearch.kt
-========
-package com.texthip.thip.ui.group.myroom.component
->>>>>>>> 1d57638dfea70853ea5744e306675cd321e496c4:app/src/main/java/com/texthip/thip/ui/group/myroom/component/GroupRecentSearch.kt
-
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.FlowRow
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.height
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.unit.dp
-import com.texthip.thip.R
-import com.texthip.thip.ui.common.buttons.GenreChipButton
-import com.texthip.thip.ui.theme.ThipTheme
-<<<<<<<< HEAD:app/src/main/java/com/texthip/thip/ui/group/search/component/GroupRecentSearch.kt
-========
-import androidx.compose.foundation.layout.FlowRow
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.height
-import com.texthip.thip.ui.theme.ThipTheme.colors
-import com.texthip.thip.ui.theme.ThipTheme.typography
-<<<<<<<< HEAD:app/src/main/java/com/texthip/thip/ui/group/search/component/GroupRecentSearch.kt
->>>>>>>> 1d57638dfea70853ea5744e306675cd321e496c4:app/src/main/java/com/texthip/thip/ui/group/myroom/component/GroupRecentSearch.kt
-========
->>>>>>>> 1d57638dfea70853ea5744e306675cd321e496c4:app/src/main/java/com/texthip/thip/ui/group/myroom/component/GroupRecentSearch.kt
-
-@Composable
-fun GroupRecentSearch(
-    recentSearches: List<String>,
-    onSearchClick: (String) -> Unit,
-    onRemove: (String) -> Unit
-) {
-    Text(
-        text = stringResource(R.string.group_recent_search),
-        color = colors.White,
-        style = typography.menu_r400_s14_h24
-    )
-    Spacer(modifier = Modifier.height(16.dp))
-    if (recentSearches.isEmpty()) {
-        Text(
-            text = stringResource(R.string.group_no_recent_search),
-            color = colors.Grey01,
-            style = typography.menu_r400_s14_h24
-        )
-    } else {
-        FlowRow(
-            verticalArrangement = Arrangement.spacedBy(12.dp),
-            horizontalArrangement = Arrangement.spacedBy(16.dp),
-            maxLines = 2,
-        ) {
-            recentSearches.take(9).forEach { keyword ->
-                GenreChipButton(
-                    text = keyword,
-                    onClick = { onSearchClick(keyword) },
-                    onCloseClick = { onRemove(keyword) }
-                )
-            }
-        }
-    }
-}
diff --git a/app/src/main/java/com/texthip/thip/ui/group/search/component/GroupEmptyResult.kt b/app/src/main/java/com/texthip/thip/ui/group/search/component/GroupEmptyResult.kt
index 9da64984..8e07a65e 100644
--- a/app/src/main/java/com/texthip/thip/ui/group/search/component/GroupEmptyResult.kt
+++ b/app/src/main/java/com/texthip/thip/ui/group/search/component/GroupEmptyResult.kt
@@ -1,8 +1,4 @@
-<<<<<<<< HEAD:app/src/main/java/com/texthip/thip/ui/group/search/component/GroupEmptyResult.kt
 package com.texthip.thip.ui.group.search.component
-========
-package com.texthip.thip.ui.group.myroom.component
->>>>>>>> 1d57638dfea70853ea5744e306675cd321e496c4:app/src/main/java/com/texthip/thip/ui/group/myroom/component/GroupEmptyResult.kt
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -13,10 +9,6 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
-<<<<<<<< HEAD:app/src/main/java/com/texthip/thip/ui/group/search/component/GroupEmptyResult.kt
-========
-import com.texthip.thip.ui.theme.ThipTheme
->>>>>>>> 1d57638dfea70853ea5744e306675cd321e496c4:app/src/main/java/com/texthip/thip/ui/group/myroom/component/GroupEmptyResult.kt
 import com.texthip.thip.ui.theme.ThipTheme.colors
 import com.texthip.thip.ui.theme.ThipTheme.typography
 
diff --git a/app/src/main/java/com/texthip/thip/ui/group/search/component/GroupFilteredSearchResult.kt b/app/src/main/java/com/texthip/thip/ui/group/search/component/GroupFilteredSearchResult.kt
index c87017f5..f27a49da 100644
--- a/app/src/main/java/com/texthip/thip/ui/group/search/component/GroupFilteredSearchResult.kt
+++ b/app/src/main/java/com/texthip/thip/ui/group/search/component/GroupFilteredSearchResult.kt
@@ -1,12 +1,4 @@
-<<<<<<<< HEAD:app/src/main/java/com/texthip/thip/ui/group/search/component/GroupFilteredSearchResult.kt
-<<<<<<<< HEAD:app/src/main/java/com/texthip/thip/ui/group/search/component/GroupFilteredSearchResult.kt
 package com.texthip.thip.ui.group.search.component
-========
-package com.texthip.thip.ui.group.myroom.component
->>>>>>>> 1d57638dfea70853ea5744e306675cd321e496c4:app/src/main/java/com/texthip/thip/ui/group/myroom/component/GroupFilteredSearchResult.kt
-========
-package com.texthip.thip.ui.group.myroom.component
->>>>>>>> 1d57638dfea70853ea5744e306675cd321e496c4:app/src/main/java/com/texthip/thip/ui/group/myroom/component/GroupFilteredSearchResult.kt
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.*
@@ -22,7 +14,6 @@ import com.texthip.thip.R
 import com.texthip.thip.ui.common.buttons.GenreChipRow
 import com.texthip.thip.ui.common.cards.CardItemRoomSmall
 import com.texthip.thip.ui.group.myroom.mock.GroupCardItemRoomData
-import com.texthip.thip.ui.theme.ThipTheme
 import com.texthip.thip.ui.theme.ThipTheme.colors
 import com.texthip.thip.ui.theme.ThipTheme.typography
 
diff --git a/app/src/main/java/com/texthip/thip/ui/group/search/component/GroupLiveSearchResult.kt b/app/src/main/java/com/texthip/thip/ui/group/search/component/GroupLiveSearchResult.kt
index 1ea086f5..97d1e390 100644
--- a/app/src/main/java/com/texthip/thip/ui/group/search/component/GroupLiveSearchResult.kt
+++ b/app/src/main/java/com/texthip/thip/ui/group/search/component/GroupLiveSearchResult.kt
@@ -1,12 +1,4 @@
-<<<<<<<< HEAD:app/src/main/java/com/texthip/thip/ui/group/search/component/GroupLiveSearchResult.kt
-<<<<<<<< HEAD:app/src/main/java/com/texthip/thip/ui/group/search/component/GroupLiveSearchResult.kt
 package com.texthip.thip.ui.group.search.component
-========
-package com.texthip.thip.ui.group.myroom.component
->>>>>>>> 1d57638dfea70853ea5744e306675cd321e496c4:app/src/main/java/com/texthip/thip/ui/group/myroom/component/GroupLiveSearchResult.kt
-========
-package com.texthip.thip.ui.group.myroom.component
->>>>>>>> 1d57638dfea70853ea5744e306675cd321e496c4:app/src/main/java/com/texthip/thip/ui/group/myroom/component/GroupLiveSearchResult.kt
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
diff --git a/app/src/main/java/com/texthip/thip/ui/group/search/component/GroupRecentSearch.kt b/app/src/main/java/com/texthip/thip/ui/group/search/component/GroupRecentSearch.kt
index 6a450b75..c5607e2d 100644
--- a/app/src/main/java/com/texthip/thip/ui/group/search/component/GroupRecentSearch.kt
+++ b/app/src/main/java/com/texthip/thip/ui/group/search/component/GroupRecentSearch.kt
@@ -1,12 +1,4 @@
-<<<<<<<< HEAD:app/src/main/java/com/texthip/thip/ui/group/search/component/GroupRecentSearch.kt
-<<<<<<<< HEAD:app/src/main/java/com/texthip/thip/ui/group/search/component/GroupRecentSearch.kt
 package com.texthip.thip.ui.group.search.component
-========
-package com.texthip.thip.ui.group.myroom.component
->>>>>>>> 1d57638dfea70853ea5744e306675cd321e496c4:app/src/main/java/com/texthip/thip/ui/group/myroom/component/GroupRecentSearch.kt
-========
-package com.texthip.thip.ui.group.myroom.component
->>>>>>>> 1d57638dfea70853ea5744e306675cd321e496c4:app/src/main/java/com/texthip/thip/ui/group/myroom/component/GroupRecentSearch.kt
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.FlowRow
@@ -19,18 +11,8 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import com.texthip.thip.R
 import com.texthip.thip.ui.common.buttons.GenreChipButton
-import com.texthip.thip.ui.theme.ThipTheme
-<<<<<<<< HEAD:app/src/main/java/com/texthip/thip/ui/group/search/component/GroupRecentSearch.kt
-========
-import androidx.compose.foundation.layout.FlowRow
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.height
 import com.texthip.thip.ui.theme.ThipTheme.colors
 import com.texthip.thip.ui.theme.ThipTheme.typography
-<<<<<<<< HEAD:app/src/main/java/com/texthip/thip/ui/group/search/component/GroupRecentSearch.kt
->>>>>>>> 1d57638dfea70853ea5744e306675cd321e496c4:app/src/main/java/com/texthip/thip/ui/group/myroom/component/GroupRecentSearch.kt
-========
->>>>>>>> 1d57638dfea70853ea5744e306675cd321e496c4:app/src/main/java/com/texthip/thip/ui/group/myroom/component/GroupRecentSearch.kt
 
 @Composable
 fun GroupRecentSearch(

From a3c8b7c50ea5b07eed26e2ab2f8d37e2bb9041cc Mon Sep 17 00:00:00 2001
From: Naeun Kim <102296721+Nico1eKim@users.noreply.github.com>
Date: Wed, 23 Jul 2025 16:25:01 +0900
Subject: [PATCH 15/25] =?UTF-8?q?[fix]:=20conflict=20=ED=95=B4=EA=B2=B0?=
 =?UTF-8?q?=EC=8B=9C=20=EC=83=9D=EA=B8=B4=20import=20=EB=AC=B8=EC=A0=9C=20?=
 =?UTF-8?q?=ED=95=B4=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../texthip/thip/ui/group/search/screen/GroupSearchScreen.kt  | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/app/src/main/java/com/texthip/thip/ui/group/search/screen/GroupSearchScreen.kt b/app/src/main/java/com/texthip/thip/ui/group/search/screen/GroupSearchScreen.kt
index 81a7e8fe..e2da08af 100644
--- a/app/src/main/java/com/texthip/thip/ui/group/search/screen/GroupSearchScreen.kt
+++ b/app/src/main/java/com/texthip/thip/ui/group/search/screen/GroupSearchScreen.kt
@@ -28,10 +28,6 @@ import com.texthip.thip.R
 import com.texthip.thip.ui.common.buttons.FilterButton
 import com.texthip.thip.ui.common.forms.SearchBookTextField
 import com.texthip.thip.ui.common.topappbar.DefaultTopAppBar
-import com.texthip.thip.ui.group.myroom.component.GroupEmptyResult
-import com.texthip.thip.ui.group.myroom.component.GroupFilteredSearchResult
-import com.texthip.thip.ui.group.myroom.component.GroupLiveSearchResult
-import com.texthip.thip.ui.group.myroom.component.GroupRecentSearch
 import com.texthip.thip.ui.group.myroom.mock.GroupCardItemRoomData
 import com.texthip.thip.ui.group.search.component.GroupEmptyResult
 import com.texthip.thip.ui.group.search.component.GroupLiveSearchResult

From 12c04128f258a5173d898ead55450890b010a73b Mon Sep 17 00:00:00 2001
From: Naeun Kim <102296721+Nico1eKim@users.noreply.github.com>
Date: Thu, 24 Jul 2025 17:39:51 +0900
Subject: [PATCH 16/25] =?UTF-8?q?[ui]:=20=EA=B8=B0=EB=A1=9D=EC=9E=A5=20?=
 =?UTF-8?q?=ED=99=94=EB=A9=B4=20ui=20=EC=88=98=EC=A0=95=20(#50)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ui/common/topappbar/DefaultTopAppBar.kt   |  4 +--
 .../group/note/component/TextCommentCard.kt   |  4 +--
 .../group/note/component/VoteCommentCard.kt   |  5 ++--
 .../ui/group/note/screen/GroupNoteScreen.kt   | 30 ++++++++++++-------
 4 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/app/src/main/java/com/texthip/thip/ui/common/topappbar/DefaultTopAppBar.kt b/app/src/main/java/com/texthip/thip/ui/common/topappbar/DefaultTopAppBar.kt
index 9c762d0e..f5c60751 100644
--- a/app/src/main/java/com/texthip/thip/ui/common/topappbar/DefaultTopAppBar.kt
+++ b/app/src/main/java/com/texthip/thip/ui/common/topappbar/DefaultTopAppBar.kt
@@ -1,6 +1,5 @@
 package com.texthip.thip.ui.common.topappbar
 
-import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
@@ -22,6 +21,7 @@ import com.texthip.thip.ui.theme.ThipTheme.typography
 
 @Composable
 fun DefaultTopAppBar(
+    modifier: Modifier = Modifier,
     title: String = stringResource(R.string.page_name),
     isTitleVisible: Boolean = true,
     isRightIconVisible: Boolean = false,
@@ -29,7 +29,7 @@ fun DefaultTopAppBar(
     onRightClick: () -> Unit = {},
 ) {
     Box(
-        modifier = Modifier
+        modifier = modifier
             .fillMaxWidth()
             .padding(horizontal = 20.dp, vertical = 16.dp)
     ) {
diff --git a/app/src/main/java/com/texthip/thip/ui/group/note/component/TextCommentCard.kt b/app/src/main/java/com/texthip/thip/ui/group/note/component/TextCommentCard.kt
index 809deba3..8ef58d01 100644
--- a/app/src/main/java/com/texthip/thip/ui/group/note/component/TextCommentCard.kt
+++ b/app/src/main/java/com/texthip/thip/ui/group/note/component/TextCommentCard.kt
@@ -41,8 +41,8 @@ fun TextCommentCard(
                 if (!isLocked) {
                     detectTapGestures(onLongPress = { onLongPress() })
                 }
-            }
-            .padding(vertical = 16.dp, horizontal = 20.dp),
+            },
+//            .padding(vertical = 16.dp, horizontal = 20.dp),
         verticalArrangement = Arrangement.spacedBy(8.dp)
     ) {
         ProfileBar(
diff --git a/app/src/main/java/com/texthip/thip/ui/group/note/component/VoteCommentCard.kt b/app/src/main/java/com/texthip/thip/ui/group/note/component/VoteCommentCard.kt
index 75d8507d..eca34740 100644
--- a/app/src/main/java/com/texthip/thip/ui/group/note/component/VoteCommentCard.kt
+++ b/app/src/main/java/com/texthip/thip/ui/group/note/component/VoteCommentCard.kt
@@ -3,7 +3,6 @@ package com.texthip.thip.ui.group.note.component
 import androidx.compose.foundation.gestures.detectTapGestures
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
@@ -47,8 +46,8 @@ fun VoteCommentCard(
                 if (!isLocked) {
                     detectTapGestures(onLongPress = { onLongPress() })
                 }
-            }
-            .padding(vertical = 16.dp, horizontal = 20.dp),
+            },
+//            .padding(vertical = 16.dp, horizontal = 20.dp),
         verticalArrangement = Arrangement.spacedBy(8.dp)
     ) {
         ProfileBar(
diff --git a/app/src/main/java/com/texthip/thip/ui/group/note/screen/GroupNoteScreen.kt b/app/src/main/java/com/texthip/thip/ui/group/note/screen/GroupNoteScreen.kt
index 8bc81caa..75df7de3 100644
--- a/app/src/main/java/com/texthip/thip/ui/group/note/screen/GroupNoteScreen.kt
+++ b/app/src/main/java/com/texthip/thip/ui/group/note/screen/GroupNoteScreen.kt
@@ -1,5 +1,6 @@
 package com.texthip.thip.ui.group.note.screen
 
+import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
@@ -8,7 +9,7 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.material3.Icon
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
@@ -154,18 +155,13 @@ fun GroupNoteScreen() {
                     LazyColumn(
                         modifier = Modifier
                             .fillMaxSize()
-                            .padding(bottom = 82.dp)
-                            .padding(top = if (selectedTabIndex == 0) 56.dp else 0.dp),
+                            .padding(horizontal = 20.dp),
+                        verticalArrangement = Arrangement.spacedBy(32.dp)
                     ) {
                         if (selectedTabIndex == 0) {
                             item {
                                 Row(
-                                    modifier = Modifier.padding(
-                                        start = 20.dp,
-                                        end = 20.dp,
-                                        bottom = 16.dp,
-                                        top = 20.dp
-                                    ),
+                                    modifier = Modifier.padding(top = 76.dp),
                                     verticalAlignment = Alignment.CenterVertically,
                                     horizontalArrangement = Arrangement.spacedBy(4.dp),
                                 ) {
@@ -183,10 +179,19 @@ fun GroupNoteScreen() {
                                 }
                             }
                         }
-                        items(filteredItems) { item ->
+                        itemsIndexed(filteredItems) { index, item ->
+                            val isLast = index == filteredItems.lastIndex
+
+                            val itemModifier = if (isLast) {
+                                Modifier.padding(bottom = 20.dp)
+                            } else {
+                                Modifier
+                            }
+
                             when (item) {
                                 is GroupNoteRecord -> TextCommentCard(
                                     data = item,
+                                    modifier = itemModifier,
                                     onCommentClick = {
                                         selectedNoteRecord = item
                                         isCommentBottomSheetVisible = true
@@ -199,6 +204,7 @@ fun GroupNoteScreen() {
 
                                 is GroupNoteVote -> VoteCommentCard(
                                     data = item,
+                                    modifier = itemModifier,
                                     onCommentClick = {
                                         selectedNoteVote = item
                                         isCommentBottomSheetVisible = true
@@ -218,7 +224,9 @@ fun GroupNoteScreen() {
                 Box(
                     modifier = Modifier
                         .fillMaxWidth()
-                        .padding(top = 136.dp),
+                        .padding(top = 119.dp)
+                        .background(color = colors.Black)
+                        .padding(top = 20.dp)
                 ) {
                     FilterButton(
                         modifier = Modifier

From a3cca1b8934aef9c26367cec05d42f98b3b6d0e9 Mon Sep 17 00:00:00 2001
From: Naeun Kim <102296721+Nico1eKim@users.noreply.github.com>
Date: Thu, 24 Jul 2025 17:46:34 +0900
Subject: [PATCH 17/25] =?UTF-8?q?[refactor]:=20=EA=B8=B0=EB=A1=9D=EC=9E=A5?=
 =?UTF-8?q?=20toast=20message=20=EC=95=A0=EB=8B=88=EB=A9=94=EC=9D=B4?=
 =?UTF-8?q?=EC=85=98=20=EC=88=98=EC=A0=95=20(#50)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ui/group/note/screen/GroupNoteScreen.kt   | 29 ++++++++++++++-----
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/com/texthip/thip/ui/group/note/screen/GroupNoteScreen.kt b/app/src/main/java/com/texthip/thip/ui/group/note/screen/GroupNoteScreen.kt
index 75df7de3..3b804550 100644
--- a/app/src/main/java/com/texthip/thip/ui/group/note/screen/GroupNoteScreen.kt
+++ b/app/src/main/java/com/texthip/thip/ui/group/note/screen/GroupNoteScreen.kt
@@ -1,5 +1,9 @@
 package com.texthip.thip.ui.group.note.screen
 
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.core.tween
+import androidx.compose.animation.slideInVertically
+import androidx.compose.animation.slideOutVertically
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
@@ -81,8 +85,8 @@ fun GroupNoteScreen() {
     // 토스트 3초
     LaunchedEffect(showToast) {
         if (showToast) {
-            delay(3000) // TODO: 수정 가능
-            showToast = false
+            delay(6000) // 2초 등장, 4초 노출
+            showToast = false // exit 에니메이션 2초
         }
     }
 
@@ -96,14 +100,23 @@ fun GroupNoteScreen() {
         }
     ) {
         Box {
-            // 토스트 팝업
-            if (showToast) {
+            AnimatedVisibility(
+                visible = showToast,
+                enter = slideInVertically(
+                    initialOffsetY = { -it }, // 위에서 아래로
+                    animationSpec = tween(durationMillis = 2000)
+                ),
+                exit = slideOutVertically(
+                    targetOffsetY = { -it }, // 위로 사라짐
+                    animationSpec = tween(durationMillis = 2000)
+                ),
+                modifier = Modifier
+                    .align(Alignment.TopCenter)
+                    .padding(horizontal = 20.dp, vertical = 16.dp)
+                    .zIndex(3f)
+            ) {
                 ToastWithDate(
                     message = stringResource(R.string.condition_of_view_general_review),
-                    modifier = Modifier
-                        .align(Alignment.TopCenter)
-                        .padding(horizontal = 20.dp, vertical = 16.dp)
-                        .zIndex(2f)
                 )
             }
 

From 308ac20ebb693a2c45c8f879e3c6e5ddd31b06f7 Mon Sep 17 00:00:00 2001
From: Naeun Kim <102296721+Nico1eKim@users.noreply.github.com>
Date: Thu, 24 Jul 2025 18:18:09 +0900
Subject: [PATCH 18/25] =?UTF-8?q?[ui]:=20=EB=8C=93=EA=B8=80=20=EC=97=86?=
 =?UTF-8?q?=EC=9D=84=20=EB=95=8C=20=ED=99=94=EB=A9=B4=20=EC=B6=94=EA=B0=80?=
 =?UTF-8?q?=20(#50)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../note/component/CommentBottomSheet.kt      | 45 +++++++++++++++----
 .../ui/group/note/screen/GroupNoteScreen.kt   | 28 ++++++------
 app/src/main/res/values/strings.xml           |  2 +
 3 files changed, 52 insertions(+), 23 deletions(-)

diff --git a/app/src/main/java/com/texthip/thip/ui/group/note/component/CommentBottomSheet.kt b/app/src/main/java/com/texthip/thip/ui/group/note/component/CommentBottomSheet.kt
index b67589c5..f4db09a2 100644
--- a/app/src/main/java/com/texthip/thip/ui/group/note/component/CommentBottomSheet.kt
+++ b/app/src/main/java/com/texthip/thip/ui/group/note/component/CommentBottomSheet.kt
@@ -1,5 +1,9 @@
 package com.texthip.thip.ui.group.note.component
 
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
@@ -7,6 +11,7 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
@@ -38,16 +43,38 @@ fun CommentBottomSheet(
             modifier = Modifier.padding(start = 20.dp, top = 20.dp, end = 20.dp)
         )
 
-        CommentList(
-            commentList = commentResponse,
-            onSendReply = { replyText, commentId, replyTo ->
-                onSendReply(replyText, commentId, replyTo)
-                inputText = ""
-            },
-            onReplyClick = { replyItem ->
-                replyingTo = replyItem
+        if (commentResponse.isEmpty()) {
+            Column(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .height(502.dp),
+                horizontalAlignment = Alignment.CenterHorizontally,
+                verticalArrangement = Arrangement.spacedBy(8.dp, Alignment.CenterVertically)
+            ) {
+                Text(
+                    text = stringResource(R.string.no_comments_yet),
+                    style = typography.smalltitle_sb600_s18_h24,
+                    color = colors.White
+                )
+                Text(
+                    text = stringResource(R.string.no_comment_subtext),
+                    style = typography.copy_r400_s14,
+                    color = colors.Grey,
+                    modifier = Modifier.padding(top = 4.dp)
+                )
             }
-        )
+        } else {
+            CommentList(
+                commentList = commentResponse,
+                onSendReply = { replyText, commentId, replyTo ->
+                    onSendReply(replyText, commentId, replyTo)
+                    inputText = ""
+                },
+                onReplyClick = { replyItem ->
+                    replyingTo = replyItem
+                }
+            )
+        }
 
         // 입력창
         CommentTextField(
diff --git a/app/src/main/java/com/texthip/thip/ui/group/note/screen/GroupNoteScreen.kt b/app/src/main/java/com/texthip/thip/ui/group/note/screen/GroupNoteScreen.kt
index 3b804550..efc7363d 100644
--- a/app/src/main/java/com/texthip/thip/ui/group/note/screen/GroupNoteScreen.kt
+++ b/app/src/main/java/com/texthip/thip/ui/group/note/screen/GroupNoteScreen.kt
@@ -46,7 +46,6 @@ import com.texthip.thip.ui.group.note.component.TextCommentCard
 import com.texthip.thip.ui.group.note.component.VoteCommentCard
 import com.texthip.thip.ui.group.note.mock.GroupNoteRecord
 import com.texthip.thip.ui.group.note.mock.GroupNoteVote
-import com.texthip.thip.ui.group.note.mock.mockComment
 import com.texthip.thip.ui.group.note.mock.mockGroupNoteItems
 import com.texthip.thip.ui.group.room.mock.MenuBottomSheetItem
 import com.texthip.thip.ui.theme.ThipTheme
@@ -278,20 +277,21 @@ fun GroupNoteScreen() {
                 )
             )
         }
+    }
 
-        if (isCommentBottomSheetVisible && (selectedNoteRecord != null || selectedNoteVote != null)) {
-            CommentBottomSheet(
-                commentResponse = listOf(mockComment, mockComment, mockComment),
-                onDismiss = {
-                    isCommentBottomSheetVisible = false
-                    selectedNoteRecord = null
-                    selectedNoteVote = null
-                },
-                onSendReply = { replyText, commentId, replyTo ->
-                    // 댓글 전송 로직 구현
-                }
-            )
-        }
+    if (isCommentBottomSheetVisible && (selectedNoteRecord != null || selectedNoteVote != null)) {
+        CommentBottomSheet(
+//            commentResponse = listOf(mockComment, mockComment, mockComment),
+            commentResponse = emptyList(),
+            onDismiss = {
+                isCommentBottomSheetVisible = false
+                selectedNoteRecord = null
+                selectedNoteVote = null
+            },
+            onSendReply = { replyText, commentId, replyTo ->
+                // 댓글 전송 로직 구현
+            }
+        )
     }
 
     if (isMenuBottomSheetVisible && selectedItemForMenu != null) {
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0fc7e74a..474e7d7f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -201,6 +201,8 @@
     <string name="no_records_yet">아직 기록이 없어요.</string>
     <string name="no_group_record_subtext">우리 모임의 첫번째 기록을 남겨보세요</string>
     <string name="no_my_record_subtext">나의 첫번째 기록을 남겨보세요</string>
+    <string name="no_comments_yet">아직 댓글이 없어요.</string>
+    <string name="no_comment_subtext">첫번째 댓글을 남겨보세요</string>
 
     <!--    alarm    -->
     <string name="alarm_feed">피드</string>

From 6791bbda59fe66baae1cc0fdc7f3b2c4ba30ff2a Mon Sep 17 00:00:00 2001
From: Naeun Kim <102296721+Nico1eKim@users.noreply.github.com>
Date: Thu, 24 Jul 2025 18:32:07 +0900
Subject: [PATCH 19/25] =?UTF-8?q?[refactor]:=20=EA=B8=B0=EB=A1=9D=EC=9E=A5?=
 =?UTF-8?q?=20ui=20=EC=88=98=EC=A0=95=20(#50)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../thip/ui/group/note/component/TextCommentCard.kt    |  4 ++--
 .../thip/ui/group/note/component/VoteCommentCard.kt    |  5 +++--
 .../thip/ui/group/note/screen/GroupNoteScreen.kt       | 10 ++--------
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/com/texthip/thip/ui/group/note/component/TextCommentCard.kt b/app/src/main/java/com/texthip/thip/ui/group/note/component/TextCommentCard.kt
index 8ef58d01..3fcf0d1e 100644
--- a/app/src/main/java/com/texthip/thip/ui/group/note/component/TextCommentCard.kt
+++ b/app/src/main/java/com/texthip/thip/ui/group/note/component/TextCommentCard.kt
@@ -41,8 +41,8 @@ fun TextCommentCard(
                 if (!isLocked) {
                     detectTapGestures(onLongPress = { onLongPress() })
                 }
-            },
-//            .padding(vertical = 16.dp, horizontal = 20.dp),
+            }
+            .padding(start = 20.dp, end = 20.dp, top = 32.dp),
         verticalArrangement = Arrangement.spacedBy(8.dp)
     ) {
         ProfileBar(
diff --git a/app/src/main/java/com/texthip/thip/ui/group/note/component/VoteCommentCard.kt b/app/src/main/java/com/texthip/thip/ui/group/note/component/VoteCommentCard.kt
index eca34740..6276138e 100644
--- a/app/src/main/java/com/texthip/thip/ui/group/note/component/VoteCommentCard.kt
+++ b/app/src/main/java/com/texthip/thip/ui/group/note/component/VoteCommentCard.kt
@@ -3,6 +3,7 @@ package com.texthip.thip.ui.group.note.component
 import androidx.compose.foundation.gestures.detectTapGestures
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
@@ -46,8 +47,8 @@ fun VoteCommentCard(
                 if (!isLocked) {
                     detectTapGestures(onLongPress = { onLongPress() })
                 }
-            },
-//            .padding(vertical = 16.dp, horizontal = 20.dp),
+            }
+            .padding(start = 20.dp, end = 20.dp, top = 32.dp),
         verticalArrangement = Arrangement.spacedBy(8.dp)
     ) {
         ProfileBar(
diff --git a/app/src/main/java/com/texthip/thip/ui/group/note/screen/GroupNoteScreen.kt b/app/src/main/java/com/texthip/thip/ui/group/note/screen/GroupNoteScreen.kt
index efc7363d..baa6e033 100644
--- a/app/src/main/java/com/texthip/thip/ui/group/note/screen/GroupNoteScreen.kt
+++ b/app/src/main/java/com/texthip/thip/ui/group/note/screen/GroupNoteScreen.kt
@@ -132,7 +132,6 @@ fun GroupNoteScreen() {
                     modifier = Modifier
                         .fillMaxWidth()
                         .padding(top = 20.dp)
-                        .padding(bottom = if (selectedTabIndex == 0) 0.dp else 20.dp),
                 )
 
                 if (filteredItems.isEmpty()) {
@@ -164,16 +163,11 @@ fun GroupNoteScreen() {
                     }
                 } else {
                     // 피드 리스트 영역
-                    LazyColumn(
-                        modifier = Modifier
-                            .fillMaxSize()
-                            .padding(horizontal = 20.dp),
-                        verticalArrangement = Arrangement.spacedBy(32.dp)
-                    ) {
+                    LazyColumn(modifier = Modifier.fillMaxSize()) {
                         if (selectedTabIndex == 0) {
                             item {
                                 Row(
-                                    modifier = Modifier.padding(top = 76.dp),
+                                    modifier = Modifier.padding(top = 76.dp, start = 20.dp, end = 20.dp),
                                     verticalAlignment = Alignment.CenterVertically,
                                     horizontalArrangement = Arrangement.spacedBy(4.dp),
                                 ) {

From b108b3ff8cb022b1a819d84d9bfbc3df8b73b811 Mon Sep 17 00:00:00 2001
From: Naeun Kim <102296721+Nico1eKim@users.noreply.github.com>
Date: Thu, 24 Jul 2025 18:44:31 +0900
Subject: [PATCH 20/25] =?UTF-8?q?[refactor]:=20=20=EB=8C=93=EA=B8=80=20tex?=
 =?UTF-8?q?tfield=205=EC=A4=84=EA=B9=8C=EC=A7=80=20=EB=8A=98=EC=96=B4?=
 =?UTF-8?q?=EB=82=98=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95=20(#50)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../thip/ui/common/forms/CommentTextField.kt  | 28 +++++++++++--------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/com/texthip/thip/ui/common/forms/CommentTextField.kt b/app/src/main/java/com/texthip/thip/ui/common/forms/CommentTextField.kt
index 851afb5a..220dc637 100644
--- a/app/src/main/java/com/texthip/thip/ui/common/forms/CommentTextField.kt
+++ b/app/src/main/java/com/texthip/thip/ui/common/forms/CommentTextField.kt
@@ -6,11 +6,13 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.defaultMinSize
 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.foundation.layout.wrapContentHeight
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.text.BasicTextField
 import androidx.compose.material3.Icon
@@ -93,28 +95,31 @@ fun CommentTextField(
             modifier = Modifier
                 .fillMaxWidth()
                 .padding(horizontal = 20.dp, vertical = 10.dp)
-                .height(36.dp)
                 .background(colors.DarkGrey, shape = RoundedCornerShape(20.dp)),
             verticalAlignment = Alignment.CenterVertically
         ) {
             BasicTextField(
                 value = input,
                 onValueChange = onInputChange,
-                singleLine = true,
+                maxLines = 5,
                 textStyle = typography.menu_r400_s14_h24.copy(color = colors.White),
                 modifier = Modifier
                     .weight(1f)
-                    .padding(start = 12.dp),
+                    .padding(start = 12.dp, top = 4.dp, bottom = 4.dp, end = 12.dp)
+                    .defaultMinSize(minHeight = 36.dp)
+                    .wrapContentHeight(),  // 높이 자동 확장
                 cursorBrush = SolidColor(colors.NeonGreen),
                 decorationBox = { innerTextField ->
-                    if (input.isEmpty()) {
-                        Text(
-                            text = hint,
-                            color = colors.Grey02,
-                            style = typography.menu_r400_s14_h24
-                        )
+                    Box {
+                        if (input.isEmpty()) {
+                            Text(
+                                text = hint,
+                                color = colors.Grey02,
+                                style = typography.menu_r400_s14_h24
+                            )
+                        }
+                        innerTextField()
                     }
-                    innerTextField()
                 }
             )
 
@@ -122,8 +127,9 @@ fun CommentTextField(
             val isEnabled = input.isNotBlank()
             Box(
                 modifier = Modifier
-                    .padding(end = 4.dp)
+                    .padding(end = 8.dp, bottom = 8.dp)
                     .size(width = 42.dp, height = 28.dp)
+                    .align(Alignment.Bottom)
                     .background(
                         color = if (isEnabled) colors.Purple else colors.Grey02,
                         shape = RoundedCornerShape(20.dp)

From e9267f03617ccc4602c8acdafb031c45d0ddb82c Mon Sep 17 00:00:00 2001
From: Naeun Kim <102296721+Nico1eKim@users.noreply.github.com>
Date: Thu, 24 Jul 2025 21:06:02 +0900
Subject: [PATCH 21/25] =?UTF-8?q?[refactor]:=20=EB=8C=93=EA=B8=80=20bottom?=
 =?UTF-8?q?sheet=20=EB=86=92=EC=9D=B4=20=EB=AC=B8=EC=A0=9C=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95=20(#50)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../note/component/CommentBottomSheet.kt      | 107 ++++++++++--------
 .../ui/group/note/component/CommentSection.kt |   3 +-
 .../ui/group/note/screen/GroupNoteScreen.kt   |   5 +-
 3 files changed, 65 insertions(+), 50 deletions(-)

diff --git a/app/src/main/java/com/texthip/thip/ui/group/note/component/CommentBottomSheet.kt b/app/src/main/java/com/texthip/thip/ui/group/note/component/CommentBottomSheet.kt
index f4db09a2..4bd21837 100644
--- a/app/src/main/java/com/texthip/thip/ui/group/note/component/CommentBottomSheet.kt
+++ b/app/src/main/java/com/texthip/thip/ui/group/note/component/CommentBottomSheet.kt
@@ -2,6 +2,7 @@ package com.texthip.thip.ui.group.note.component
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
@@ -36,63 +37,75 @@ fun CommentBottomSheet(
     var replyingTo by remember { mutableStateOf<ReplyItem?>(null) }
 
     CustomBottomSheet(onDismiss = onDismiss) {
-        Text(
-            text = stringResource(R.string.comments),
-            style = typography.title_b700_s20_h24,
-            color = colors.White,
-            modifier = Modifier.padding(start = 20.dp, top = 20.dp, end = 20.dp)
-        )
-
-        if (commentResponse.isEmpty()) {
+        Column(
+            modifier = Modifier
+                .fillMaxWidth()
+                .height(600.dp)
+        ) {
             Column(
                 modifier = Modifier
-                    .fillMaxWidth()
-                    .height(502.dp),
-                horizontalAlignment = Alignment.CenterHorizontally,
-                verticalArrangement = Arrangement.spacedBy(8.dp, Alignment.CenterVertically)
+                    .weight(1f)
+                    .fillMaxHeight(0.8f)
             ) {
                 Text(
-                    text = stringResource(R.string.no_comments_yet),
-                    style = typography.smalltitle_sb600_s18_h24,
-                    color = colors.White
-                )
-                Text(
-                    text = stringResource(R.string.no_comment_subtext),
-                    style = typography.copy_r400_s14,
-                    color = colors.Grey,
-                    modifier = Modifier.padding(top = 4.dp)
+                    text = stringResource(R.string.comments),
+                    style = typography.title_b700_s20_h24,
+                    color = colors.White,
+                    modifier = Modifier.padding(start = 20.dp, top = 20.dp, end = 20.dp)
                 )
+
+                if (commentResponse.isEmpty()) {
+                    Column(
+                        modifier = Modifier
+                            .fillMaxWidth()
+                            .padding(top = 210.dp), // TODO: 유동적으로 수정 가능할수도
+                        horizontalAlignment = Alignment.CenterHorizontally,
+                        verticalArrangement = Arrangement.spacedBy(8.dp, Alignment.CenterVertically)
+                    ) {
+                        Text(
+                            text = stringResource(R.string.no_comments_yet),
+                            style = typography.smalltitle_sb600_s18_h24,
+                            color = colors.White
+                        )
+                        Text(
+                            text = stringResource(R.string.no_comment_subtext),
+                            style = typography.copy_r400_s14,
+                            color = colors.Grey,
+                            modifier = Modifier.padding(top = 4.dp)
+                        )
+                    }
+                } else {
+                    CommentList(
+                        commentList = commentResponse,
+                        onSendReply = { replyText, commentId, replyTo ->
+                            onSendReply(replyText, commentId, replyTo)
+                            inputText = ""
+                        },
+                        onReplyClick = { replyItem ->
+                            replyingTo = replyItem
+                        }
+                    )
+                }
             }
-        } else {
-            CommentList(
-                commentList = commentResponse,
-                onSendReply = { replyText, commentId, replyTo ->
-                    onSendReply(replyText, commentId, replyTo)
+
+            CommentTextField(
+                modifier = Modifier.fillMaxWidth(),
+                hint = stringResource(R.string.reply_to),
+                input = inputText,
+                onInputChange = { inputText = it },
+                onSendClick = {
+                    onSendReply(
+                        inputText,
+                        replyingTo?.replyId,
+                        replyingTo?.nickName
+                    )
                     inputText = ""
+                    replyingTo = null
                 },
-                onReplyClick = { replyItem ->
-                    replyingTo = replyItem
-                }
+                replyTo = replyingTo?.nickName,
+                onCancelReply = { replyingTo = null }
             )
         }
-
-        // 입력창
-        CommentTextField(
-            hint = stringResource(R.string.reply_to),
-            input = inputText,
-            onInputChange = { inputText = it },
-            onSendClick = {
-                onSendReply(
-                    inputText,
-                    replyingTo?.replyId,
-                    replyingTo?.nickName
-                )
-                inputText = ""
-                replyingTo = null
-            },
-            replyTo = replyingTo?.nickName,
-            onCancelReply = { replyingTo = null }
-        )
     }
 }
 
diff --git a/app/src/main/java/com/texthip/thip/ui/group/note/component/CommentSection.kt b/app/src/main/java/com/texthip/thip/ui/group/note/component/CommentSection.kt
index f7af2ee9..273b8530 100644
--- a/app/src/main/java/com/texthip/thip/ui/group/note/component/CommentSection.kt
+++ b/app/src/main/java/com/texthip/thip/ui/group/note/component/CommentSection.kt
@@ -22,6 +22,7 @@ import com.texthip.thip.ui.theme.ThipTheme
 
 @Composable
 fun CommentList(
+    modifier: Modifier = Modifier,
     commentList: List<CommentItem>,
     onSendReply: (String, Int?, String?) -> Unit,
     onReplyClick: (ReplyItem) -> Unit
@@ -29,7 +30,7 @@ fun CommentList(
     val scrollState = rememberScrollState()
 
     Box(
-        modifier = Modifier
+        modifier = modifier
             .fillMaxWidth()
             .height(482.dp)
     ) {
diff --git a/app/src/main/java/com/texthip/thip/ui/group/note/screen/GroupNoteScreen.kt b/app/src/main/java/com/texthip/thip/ui/group/note/screen/GroupNoteScreen.kt
index baa6e033..c997a293 100644
--- a/app/src/main/java/com/texthip/thip/ui/group/note/screen/GroupNoteScreen.kt
+++ b/app/src/main/java/com/texthip/thip/ui/group/note/screen/GroupNoteScreen.kt
@@ -46,6 +46,7 @@ import com.texthip.thip.ui.group.note.component.TextCommentCard
 import com.texthip.thip.ui.group.note.component.VoteCommentCard
 import com.texthip.thip.ui.group.note.mock.GroupNoteRecord
 import com.texthip.thip.ui.group.note.mock.GroupNoteVote
+import com.texthip.thip.ui.group.note.mock.mockComment
 import com.texthip.thip.ui.group.note.mock.mockGroupNoteItems
 import com.texthip.thip.ui.group.room.mock.MenuBottomSheetItem
 import com.texthip.thip.ui.theme.ThipTheme
@@ -275,8 +276,8 @@ fun GroupNoteScreen() {
 
     if (isCommentBottomSheetVisible && (selectedNoteRecord != null || selectedNoteVote != null)) {
         CommentBottomSheet(
-//            commentResponse = listOf(mockComment, mockComment, mockComment),
-            commentResponse = emptyList(),
+            commentResponse = listOf(mockComment, mockComment, mockComment),
+//            commentResponse = emptyList(),
             onDismiss = {
                 isCommentBottomSheetVisible = false
                 selectedNoteRecord = null

From a68ceafdfd26c24fdcffced5057ecc40d0463988 Mon Sep 17 00:00:00 2001
From: Naeun Kim <102296721+Nico1eKim@users.noreply.github.com>
Date: Thu, 24 Jul 2025 22:02:16 +0900
Subject: [PATCH 22/25] =?UTF-8?q?[chore]:=20=EC=98=A4=EB=8A=98=EC=9D=98=20?=
 =?UTF-8?q?=ED=95=9C=EB=A7=88=EB=94=94=20mockup=20=EB=B6=84=EB=A6=AC=20(#5?=
 =?UTF-8?q?0)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ui/group/room/mock/GroupRoomChatData.kt   | 46 +++++++++++++++
 .../group/room/screen/GroupRoomChatScreen.kt  | 56 ++-----------------
 2 files changed, 52 insertions(+), 50 deletions(-)

diff --git a/app/src/main/java/com/texthip/thip/ui/group/room/mock/GroupRoomChatData.kt b/app/src/main/java/com/texthip/thip/ui/group/room/mock/GroupRoomChatData.kt
index 05324dbf..84b22e23 100644
--- a/app/src/main/java/com/texthip/thip/ui/group/room/mock/GroupRoomChatData.kt
+++ b/app/src/main/java/com/texthip/thip/ui/group/room/mock/GroupRoomChatData.kt
@@ -9,3 +9,49 @@ data class GroupRoomChatData(
     val content: String,
     val isMine: Boolean
 )
+
+val mockMessages = listOf(
+    GroupRoomChatData(
+        null,
+        "user.01",
+        "2024.04.29",
+        "공백 포함 글자 입력입니다. 공백 포함 글자 입력입니다. 공백 포함 글자 입력입니다. 공백 포함 글자 입력입니다. 공백 포함 글자 입력입니다.",
+        isMine = true
+    ),
+    GroupRoomChatData(
+        null,
+        "user.01",
+        "2024.04.28",
+        "공백 포함 글자 입력입니다. 공백 포함 글자 입력입니다. 공백 포함 글자 입력입니다. 공백 포함 글자 입력입니다. 공백 포함 글자 입력입니다.",
+        isMine = true
+    ),
+    GroupRoomChatData(null, "user.01", "2024.04.30", "공백 포함 글자 입력입니다.", isMine = false),
+    GroupRoomChatData(
+        null,
+        "user.01",
+        "2024.04.30",
+        "공백 포함 글자 입력입니다. 공백 포함 글자 입력입니다.",
+        isMine = true
+    ),
+    GroupRoomChatData(
+        null,
+        "user.01",
+        "2024.04.30",
+        "공백 포함 글자 입력입니다. 공백 포함 글자 입력입니다. 공백 포함 글자 입력입니다. 공백 포함 글자 입력입니다. 공백 포함 글자 입력입니다.",
+        isMine = false
+    ),
+    GroupRoomChatData(
+        null,
+        "user.01",
+        "2024.04.27",
+        "공백 포함 글자 입력입니다. 공백 포함 글자 입력입니다. 공백 포함 글자 입력입니다. 공백 포함 글자 입력입니다. 공백 포함 글자 입력입니다.",
+        isMine = true
+    ),
+    GroupRoomChatData(
+        null,
+        "user.01",
+        "2024.04.27",
+        "공백 포함 글자 입력입니다. 공백 포함 글자 입력입니다. 공백 포함 글자 입력입니다. 공백 포함 글자 입력입니다. 공백 포함 글자 입력입니다.",
+        isMine = true
+    ),
+).sortedByDescending { it.date }
\ No newline at end of file
diff --git a/app/src/main/java/com/texthip/thip/ui/group/room/screen/GroupRoomChatScreen.kt b/app/src/main/java/com/texthip/thip/ui/group/room/screen/GroupRoomChatScreen.kt
index 5e0e2c9a..693aa802 100644
--- a/app/src/main/java/com/texthip/thip/ui/group/room/screen/GroupRoomChatScreen.kt
+++ b/app/src/main/java/com/texthip/thip/ui/group/room/screen/GroupRoomChatScreen.kt
@@ -28,58 +28,14 @@ import com.texthip.thip.ui.common.topappbar.DefaultTopAppBar
 import com.texthip.thip.ui.common.view.CountingBar
 import com.texthip.thip.ui.group.room.mock.GroupRoomChatData
 import com.texthip.thip.ui.group.room.mock.MenuBottomSheetItem
+import com.texthip.thip.ui.group.room.mock.mockMessages
 import com.texthip.thip.ui.theme.ThipTheme
 import com.texthip.thip.ui.theme.ThipTheme.colors
 import com.texthip.thip.ui.theme.ThipTheme.typography
 
 @Composable
 fun GroupRoomChatScreen() {
-    val messages = listOf(
-        GroupRoomChatData(
-            null,
-            "user.01",
-            "2024.04.29",
-            "공백 포함 글자 입력입니다. 공백 포함 글자 입력입니다. 공백 포함 글자 입력입니다. 공백 포함 글자 입력입니다. 공백 포함 글자 입력입니다.",
-            isMine = true
-        ),
-        GroupRoomChatData(
-            null,
-            "user.01",
-            "2024.04.28",
-            "공백 포함 글자 입력입니다. 공백 포함 글자 입력입니다. 공백 포함 글자 입력입니다. 공백 포함 글자 입력입니다. 공백 포함 글자 입력입니다.",
-            isMine = true
-        ),
-        GroupRoomChatData(null, "user.01", "2024.04.30", "공백 포함 글자 입력입니다.", isMine = false),
-        GroupRoomChatData(
-            null,
-            "user.01",
-            "2024.04.30",
-            "공백 포함 글자 입력입니다. 공백 포함 글자 입력입니다.",
-            isMine = true
-        ),
-        GroupRoomChatData(
-            null,
-            "user.01",
-            "2024.04.30",
-            "공백 포함 글자 입력입니다. 공백 포함 글자 입력입니다. 공백 포함 글자 입력입니다. 공백 포함 글자 입력입니다. 공백 포함 글자 입력입니다.",
-            isMine = false
-        ),
-        GroupRoomChatData(
-            null,
-            "user.01",
-            "2024.04.27",
-            "공백 포함 글자 입력입니다. 공백 포함 글자 입력입니다. 공백 포함 글자 입력입니다. 공백 포함 글자 입력입니다. 공백 포함 글자 입력입니다.",
-            isMine = true
-        ),
-        GroupRoomChatData(
-            null,
-            "user.01",
-            "2024.04.27",
-            "공백 포함 글자 입력입니다. 공백 포함 글자 입력입니다. 공백 포함 글자 입력입니다. 공백 포함 글자 입력입니다. 공백 포함 글자 입력입니다.",
-            isMine = true
-        ),
-    ).sortedByDescending { it.date }
-//    val messages = emptyList<GroupRoomChatData>()
+//    val mockMessages = emptyList<GroupRoomChatData>()
 
     var input by remember { mutableStateOf("") }
     var replyTo by remember { mutableStateOf<String?>(null) }
@@ -105,7 +61,7 @@ fun GroupRoomChatScreen() {
                 onLeftClick = {},
             )
 
-            if (messages.isEmpty()) {
+            if (mockMessages.isEmpty()) {
                 Box(
                     modifier = Modifier
                         .weight(1f)
@@ -134,10 +90,10 @@ fun GroupRoomChatScreen() {
                     modifier = Modifier.weight(1f),
                     verticalArrangement = Arrangement.spacedBy(20.dp, Alignment.Bottom)
                 ) {
-                    itemsIndexed(messages) { index, message ->
+                    itemsIndexed(mockMessages) { index, message ->
                         val isNewDate = when {
-                            index == messages.lastIndex -> true
-                            messages[index + 1].date != message.date -> true
+                            index == mockMessages.lastIndex -> true
+                            mockMessages[index + 1].date != message.date -> true
                             else -> false
                         }
                         val isBottomItem = index == 0

From 14bb55e76bd2bac5a914c48551d919c42ac9fe94 Mon Sep 17 00:00:00 2001
From: Naeun Kim <102296721+Nico1eKim@users.noreply.github.com>
Date: Thu, 24 Jul 2025 22:25:03 +0900
Subject: [PATCH 23/25] =?UTF-8?q?[chore]:=20import=20=EB=B9=A0=EC=A7=84?=
 =?UTF-8?q?=EA=B1=B0=20=EC=88=98=EC=A0=95=20(#50)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../texthip/thip/ui/group/search/component/GroupEmptyResult.kt  | 2 +-
 .../thip/ui/group/search/component/GroupFilteredSearchResult.kt | 2 +-
 .../texthip/thip/ui/group/search/screen/GroupSearchScreen.kt    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/texthip/thip/ui/group/search/component/GroupEmptyResult.kt b/app/src/main/java/com/texthip/thip/ui/group/search/component/GroupEmptyResult.kt
index 268ca729..09ab53ba 100644
--- a/app/src/main/java/com/texthip/thip/ui/group/search/component/GroupEmptyResult.kt
+++ b/app/src/main/java/com/texthip/thip/ui/group/search/component/GroupEmptyResult.kt
@@ -1,6 +1,5 @@
 package com.texthip.thip.ui.group.search.component
 
-import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
@@ -12,6 +11,7 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import com.texthip.thip.ui.theme.ThipTheme
 import com.texthip.thip.ui.theme.ThipTheme.colors
 import com.texthip.thip.ui.theme.ThipTheme.typography
 
diff --git a/app/src/main/java/com/texthip/thip/ui/group/search/component/GroupFilteredSearchResult.kt b/app/src/main/java/com/texthip/thip/ui/group/search/component/GroupFilteredSearchResult.kt
index bbedb223..554e9482 100644
--- a/app/src/main/java/com/texthip/thip/ui/group/search/component/GroupFilteredSearchResult.kt
+++ b/app/src/main/java/com/texthip/thip/ui/group/search/component/GroupFilteredSearchResult.kt
@@ -1,7 +1,6 @@
 package com.texthip.thip.ui.group.search.component
 
 import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
@@ -27,6 +26,7 @@ import com.texthip.thip.R
 import com.texthip.thip.ui.common.buttons.GenreChipRow
 import com.texthip.thip.ui.common.cards.CardItemRoomSmall
 import com.texthip.thip.ui.group.myroom.mock.GroupCardItemRoomData
+import com.texthip.thip.ui.theme.ThipTheme
 import com.texthip.thip.ui.theme.ThipTheme.colors
 import com.texthip.thip.ui.theme.ThipTheme.typography
 
diff --git a/app/src/main/java/com/texthip/thip/ui/group/search/screen/GroupSearchScreen.kt b/app/src/main/java/com/texthip/thip/ui/group/search/screen/GroupSearchScreen.kt
index e2da08af..00691975 100644
--- a/app/src/main/java/com/texthip/thip/ui/group/search/screen/GroupSearchScreen.kt
+++ b/app/src/main/java/com/texthip/thip/ui/group/search/screen/GroupSearchScreen.kt
@@ -28,10 +28,10 @@ import com.texthip.thip.R
 import com.texthip.thip.ui.common.buttons.FilterButton
 import com.texthip.thip.ui.common.forms.SearchBookTextField
 import com.texthip.thip.ui.common.topappbar.DefaultTopAppBar
+import com.texthip.thip.ui.group.myroom.component.GroupRecentSearch
 import com.texthip.thip.ui.group.myroom.mock.GroupCardItemRoomData
 import com.texthip.thip.ui.group.search.component.GroupEmptyResult
 import com.texthip.thip.ui.group.search.component.GroupLiveSearchResult
-import com.texthip.thip.ui.group.search.component.GroupRecentSearch
 import com.texthip.thip.ui.group.search.component.GroupFilteredSearchResult
 import com.texthip.thip.ui.theme.ThipTheme
 

From d4107eb9df60c30c8d7bf14dac30ee879c129523 Mon Sep 17 00:00:00 2001
From: Naeun Kim <102296721+Nico1eKim@users.noreply.github.com>
Date: Thu, 24 Jul 2025 22:36:11 +0900
Subject: [PATCH 24/25] =?UTF-8?q?[ui]:=20dialog=20popup=20=EB=94=94?=
 =?UTF-8?q?=EC=9E=90=EC=9D=B8=20=EC=88=98=EC=A0=95=20(#50)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../thip/ui/common/modal/DialogPopup.kt       | 79 ++++++++-----------
 1 file changed, 33 insertions(+), 46 deletions(-)

diff --git a/app/src/main/java/com/texthip/thip/ui/common/modal/DialogPopup.kt b/app/src/main/java/com/texthip/thip/ui/common/modal/DialogPopup.kt
index 857948fa..37229e1d 100644
--- a/app/src/main/java/com/texthip/thip/ui/common/modal/DialogPopup.kt
+++ b/app/src/main/java/com/texthip/thip/ui/common/modal/DialogPopup.kt
@@ -2,15 +2,11 @@ package com.texthip.thip.ui.common.modal
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
@@ -31,54 +27,45 @@ fun DialogPopup(
     onConfirm: () -> Unit,
     onCancel: () -> Unit
 ) {
-    Box(
+    Column(
         modifier = modifier
-            .width(320.dp)
-            .height(182.dp)
+            .size(width = 320.dp, height = 182.dp)
             .background(
                 color = colors.DarkGrey,
                 shape = RoundedCornerShape(12.dp)
             )
-            .padding(20.dp)
+            .padding(20.dp),
+        verticalArrangement = Arrangement.SpaceBetween,
     ) {
-        Column(
-            verticalArrangement = Arrangement.SpaceBetween,
-            modifier = Modifier.fillMaxSize()
-        ) {
-            Column (){
-                Text(
-                    text = title,
-                    color = colors.White,
-                    style = typography.smalltitle_m500_s18_h24,
-                )
-                Spacer(modifier = Modifier.height(12.dp))
-                Text(
-                    text = description,
-                    color = colors.White,
-                    style = typography.copy_r400_s14,
-                )
-            }
-
-            Row(
-                horizontalArrangement = Arrangement.spacedBy(20.dp),
-                modifier = Modifier.fillMaxWidth()
-            ) {
-                ActionMediumButton(
-                    text = stringResource(R.string.no),
-                    contentColor = colors.White,
-                    backgroundColor = colors.Grey02,
-                    modifier = Modifier.weight(1f),
-                    onClick = onCancel,
-                )
-                ActionMediumButton(
-                    text = stringResource(R.string.yes),
-                    contentColor = colors.White,
-                    backgroundColor = colors.Purple,
-                    modifier = Modifier.weight(1f),
-                    onClick = onConfirm,
-                )
-            }
+        Text(
+            text = title,
+            color = colors.White,
+            style = typography.smalltitle_m500_s18_h24,
+        )
+        Text(
+            text = description,
+            color = colors.White,
+            style = typography.copy_r400_s14,
+        )
 
+        Row(
+            horizontalArrangement = Arrangement.spacedBy(20.dp),
+            modifier = Modifier.fillMaxWidth()
+        ) {
+            ActionMediumButton(
+                text = stringResource(R.string.no),
+                contentColor = colors.White,
+                backgroundColor = colors.Grey02,
+                modifier = Modifier.weight(1f),
+                onClick = onCancel,
+            )
+            ActionMediumButton(
+                text = stringResource(R.string.yes),
+                contentColor = colors.White,
+                backgroundColor = colors.Purple,
+                modifier = Modifier.weight(1f),
+                onClick = onConfirm,
+            )
         }
     }
 }

From 29c3ed7bad0eab1c6bf97853beb0390d8be745d3 Mon Sep 17 00:00:00 2001
From: Naeun Kim <102296721+Nico1eKim@users.noreply.github.com>
Date: Thu, 24 Jul 2025 22:39:17 +0900
Subject: [PATCH 25/25] =?UTF-8?q?[refactor]:=20=EB=82=B4=20=EA=B8=B0?=
 =?UTF-8?q?=EB=A1=9D=EC=9D=80=20pin=ED=95=A0=20=EC=88=98=20=EC=9E=88?=
 =?UTF-8?q?=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95=20(#50)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../group/note/component/TextCommentCard.kt   |  8 ++++-
 .../group/note/component/VoteCommentCard.kt   |  8 ++++-
 .../ui/group/note/screen/GroupNoteScreen.kt   | 31 ++++++++++++++++++-
 app/src/main/res/values/strings.xml           |  2 ++
 4 files changed, 46 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/texthip/thip/ui/group/note/component/TextCommentCard.kt b/app/src/main/java/com/texthip/thip/ui/group/note/component/TextCommentCard.kt
index 3fcf0d1e..85e2b952 100644
--- a/app/src/main/java/com/texthip/thip/ui/group/note/component/TextCommentCard.kt
+++ b/app/src/main/java/com/texthip/thip/ui/group/note/component/TextCommentCard.kt
@@ -29,10 +29,12 @@ fun TextCommentCard(
     modifier: Modifier = Modifier,
     data: GroupNoteRecord,
     onCommentClick: () -> Unit = {},
-    onLongPress: () -> Unit = {}
+    onLongPress: () -> Unit = {},
+    onPinClick: () -> Unit = {}
 ) {
     var isLiked by remember { mutableStateOf(data.isLiked) }
     val isLocked = data.isLocked
+    val isWriter = data.isWriter
 
     Column(
         modifier = modifier
@@ -65,12 +67,16 @@ fun TextCommentCard(
             isLiked = isLiked,
             likeCount = data.likeCount,
             commentCount = data.commentCount,
+            isPinVisible = isWriter,
             onLikeClick = {
                 if (!isLocked) isLiked = !isLiked
             },
             onCommentClick = {
                 if (!isLocked) onCommentClick()
             },
+            onPinClick = {
+                if (!isLocked) onPinClick()
+            }
         )
     }
 }
diff --git a/app/src/main/java/com/texthip/thip/ui/group/note/component/VoteCommentCard.kt b/app/src/main/java/com/texthip/thip/ui/group/note/component/VoteCommentCard.kt
index 6276138e..60def258 100644
--- a/app/src/main/java/com/texthip/thip/ui/group/note/component/VoteCommentCard.kt
+++ b/app/src/main/java/com/texthip/thip/ui/group/note/component/VoteCommentCard.kt
@@ -31,7 +31,8 @@ fun VoteCommentCard(
     modifier: Modifier = Modifier,
     data: GroupNoteVote,
     onCommentClick: () -> Unit = {},
-    onLongPress: () -> Unit = {}
+    onLongPress: () -> Unit = {},
+    onPinClick: () -> Unit = {}
 ) {
     var isLiked by remember { mutableStateOf(data.isLiked) }
     var selected by remember { mutableStateOf<Int?>(null) }
@@ -39,6 +40,7 @@ fun VoteCommentCard(
     val hasVoted = voteItems.any { it.isVoted }
 
     val isLocked = data.isLocked
+    val isWriter = data.isWriter
 
     Column(
         modifier = modifier
@@ -91,12 +93,16 @@ fun VoteCommentCard(
             isLiked = isLiked,
             likeCount = data.likeCount,
             commentCount = data.commentCount,
+            isPinVisible = isWriter,
             onLikeClick = {
                 if (!isLocked) isLiked = !isLiked
             },
             onCommentClick = {
                 if (!isLocked) onCommentClick()
             },
+            onPinClick = {
+                if (!isLocked) onPinClick()
+            }
         )
     }
 }
diff --git a/app/src/main/java/com/texthip/thip/ui/group/note/screen/GroupNoteScreen.kt b/app/src/main/java/com/texthip/thip/ui/group/note/screen/GroupNoteScreen.kt
index c997a293..3e24b774 100644
--- a/app/src/main/java/com/texthip/thip/ui/group/note/screen/GroupNoteScreen.kt
+++ b/app/src/main/java/com/texthip/thip/ui/group/note/screen/GroupNoteScreen.kt
@@ -38,6 +38,7 @@ import com.texthip.thip.ui.common.buttons.ExpandableFloatingButton
 import com.texthip.thip.ui.common.buttons.FabMenuItem
 import com.texthip.thip.ui.common.buttons.FilterButton
 import com.texthip.thip.ui.common.header.HeaderMenuBarTab
+import com.texthip.thip.ui.common.modal.DialogPopup
 import com.texthip.thip.ui.common.modal.ToastWithDate
 import com.texthip.thip.ui.common.topappbar.DefaultTopAppBar
 import com.texthip.thip.ui.group.note.component.CommentBottomSheet
@@ -80,6 +81,8 @@ fun GroupNoteScreen() {
 
     var isMenuBottomSheetVisible by rememberSaveable { mutableStateOf(false) }
 
+    var isPinDialogVisible by remember { mutableStateOf(false) }
+
     var showToast by remember { mutableStateOf(false) }
 
     // 토스트 3초
@@ -91,7 +94,7 @@ fun GroupNoteScreen() {
     }
 
     Box(
-        if (isCommentBottomSheetVisible || isMenuBottomSheetVisible) {
+        if (isCommentBottomSheetVisible || isMenuBottomSheetVisible || isPinDialogVisible) {
             Modifier
                 .fillMaxSize()
                 .blur(5.dp)
@@ -206,6 +209,9 @@ fun GroupNoteScreen() {
                                     onLongPress = {
                                         selectedItemForMenu = item
                                         isMenuBottomSheetVisible = true
+                                    },
+                                    onPinClick = {
+                                        isPinDialogVisible = true
                                     }
                                 )
 
@@ -219,6 +225,9 @@ fun GroupNoteScreen() {
                                     onLongPress = {
                                         selectedItemForMenu = item
                                         isMenuBottomSheetVisible = true
+                                    },
+                                    onPinClick = {
+                                        isPinDialogVisible = true
                                     }
                                 )
                             }
@@ -330,6 +339,26 @@ fun GroupNoteScreen() {
             }
         )
     }
+
+    if (isPinDialogVisible) {
+        Box(
+            modifier = Modifier
+                .fillMaxSize(),
+            contentAlignment = Alignment.Center
+        ) {
+            DialogPopup(
+                title = stringResource(R.string.pin_modal_title),
+                description = stringResource(R.string.pin_modal_content),
+                onConfirm = {
+                    // 핀하기 로직
+                    isPinDialogVisible = false
+                },
+                onCancel = {
+                    isPinDialogVisible = false
+                }
+            )
+        }
+    }
 }
 
 @Preview
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 62c94088..fb8797e9 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -203,6 +203,8 @@
     <string name="no_my_record_subtext">나의 첫번째 기록을 남겨보세요</string>
     <string name="no_comments_yet">아직 댓글이 없어요.</string>
     <string name="no_comment_subtext">첫번째 댓글을 남겨보세요</string>
+    <string name="pin_modal_title">이 기록을 피드에 핀할까요?</string>
+    <string name="pin_modal_content">핀하면 내 피드에 글을 옮길 수 있어요.</string>
 
     <!--    alarm    -->
     <string name="alarm_feed">피드</string>