THIP-TextHip · Nico1eKim · Aug 20, 2025 · Aug 20, 2025 · Aug 20, 2025 · Aug 20, 2025
diff --git a/.gitignore b/.gitignore
@@ -15,4 +15,5 @@
 local.properties
 .idea/deploymentTargetSelector.xml
 .idea/misc.xml
-.idea/gradle.xml
+.idea/gradle.xml
+.idea/appInsightsSettings.xml
diff --git a/.idea/appInsightsSettings.xml b/.idea/appInsightsSettings.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/src/main/java/com/texthip/thip/data/model/book/response/BookUserSaveResponse.kt b/app/src/main/java/com/texthip/thip/data/model/book/response/BookUserSaveResponse.kt
@@ -0,0 +1,19 @@
+package com.texthip.thip.data.model.book.response
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class BookUserSaveResponse(
+    val bookList: List<BookUserSaveList>
+)
+
+@Serializable
+data class BookUserSaveList(
+    val bookId: Int,
+    val bookTitle: String,
+    val authorName: String,
+    val publisher: String,
+    val bookImageUrl: String? = null,
+    val isbn: String = "",
+    val isSaved: Boolean = true
+)
diff --git a/app/src/main/java/com/texthip/thip/data/repository/BookRepository.kt b/app/src/main/java/com/texthip/thip/data/repository/BookRepository.kt
@@ -6,6 +6,7 @@ import com.texthip.thip.data.model.book.response.BookDetailResponse
 import com.texthip.thip.data.model.book.response.BookListResponse
 import com.texthip.thip.data.model.book.response.BookSaveResponse
 import com.texthip.thip.data.model.book.response.BookSearchResponse
+import com.texthip.thip.data.model.book.response.BookUserSaveResponse
 import com.texthip.thip.data.model.book.response.MostSearchedBooksResponse
 import com.texthip.thip.data.model.book.response.RecruitingRoomsResponse
 import com.texthip.thip.data.service.BookService
@@ -25,7 +26,11 @@ class BookRepository @Inject constructor(
     }
 
     /** 책 검색 */
-    suspend fun searchBooks(keyword: String, page: Int = 1, isFinalized: Boolean = false): Result<BookSearchResponse?> = runCatching {
+    suspend fun searchBooks(
+        keyword: String,
+        page: Int = 1,
+        isFinalized: Boolean = false
+    ): Result<BookSearchResponse?> = runCatching {
         bookService.searchBooks(keyword, page, isFinalized)
             .handleBaseResponse()
             .getOrThrow()
@@ -53,9 +58,18 @@ class BookRepository @Inject constructor(
     }
 
     /** 모집중인 방 조회 */
-    suspend fun getRecruitingRooms(isbn: String, cursor: String? = null): Result<RecruitingRoomsResponse?> = runCatching {
+    suspend fun getRecruitingRooms(
+        isbn: String,
+        cursor: String? = null
+    ): Result<RecruitingRoomsResponse?> = runCatching {
         bookService.getRecruitingRooms(isbn, cursor)
             .handleBaseResponse()
             .getOrThrow()
     }
+
+    suspend fun getSavedBooks(): Result<BookUserSaveResponse?> = runCatching {
+        bookService.getSavedBooks()
+            .handleBaseResponse()
+            .getOrThrow()
+    }
 }
diff --git a/app/src/main/java/com/texthip/thip/data/repository/FeedRepository.kt b/app/src/main/java/com/texthip/thip/data/repository/FeedRepository.kt
@@ -293,4 +293,9 @@ class FeedRepository @Inject constructor(
             }
         }
 
+    suspend fun getSavedFeeds(cursor: String? = null): Result<AllFeedResponse?> = runCatching {
+        feedService.getSavedFeeds(cursor)
+            .handleBaseResponse()
+            .getOrThrow()
+    }
 }
diff --git a/app/src/main/java/com/texthip/thip/data/service/BookService.kt b/app/src/main/java/com/texthip/thip/data/service/BookService.kt
@@ -6,6 +6,7 @@ import com.texthip.thip.data.model.book.response.BookDetailResponse
 import com.texthip.thip.data.model.book.response.BookListResponse
 import com.texthip.thip.data.model.book.response.BookSaveResponse
 import com.texthip.thip.data.model.book.response.BookSearchResponse
+import com.texthip.thip.data.model.book.response.BookUserSaveResponse
 import com.texthip.thip.data.model.book.response.MostSearchedBooksResponse
 import com.texthip.thip.data.model.book.response.RecruitingRoomsResponse
 import retrofit2.http.Body
@@ -53,4 +54,7 @@ interface BookService {
         @Path("isbn") isbn: String,
         @Query("cursor") cursor: String? = null
     ): BaseResponse<RecruitingRoomsResponse>
+
+    @GET("books/saved")
+    suspend fun getSavedBooks(): BaseResponse<BookUserSaveResponse>
 }
diff --git a/app/src/main/java/com/texthip/thip/data/service/FeedService.kt b/app/src/main/java/com/texthip/thip/data/service/FeedService.kt
@@ -108,4 +108,9 @@ interface FeedService {
         @Path("feedId") feedId: Long,
         @Body request: FeedSaveRequest
     ): BaseResponse<FeedSaveResponse>
+
+    @GET("feeds/saved")
+    suspend fun getSavedFeeds(
+        @Query("cursor") cursor: String? = null
+    ): BaseResponse<AllFeedResponse>
 }
diff --git a/app/src/main/java/com/texthip/thip/ui/common/cards/CardItemRoomSmall.kt b/app/src/main/java/com/texthip/thip/ui/common/cards/CardItemRoomSmall.kt
@@ -61,7 +61,6 @@ fun CardItemRoomSmall(
         colors = CardDefaults.cardColors(
             containerColor = bgColor
         ),
-        elevation = CardDefaults.cardElevation(defaultElevation = 4.dp),
         shape = RoundedCornerShape(12.dp)
     ) {
         Column(

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
@@ -1,13 +1,15 @@
 package com.texthip.thip.ui.common.topappbar
 
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.Icon
-import androidx.compose.material3.IconButton
 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.graphics.Color
@@ -33,16 +35,18 @@ fun DefaultTopAppBar(
             .fillMaxWidth()
             .padding(horizontal = 20.dp, vertical = 16.dp)
     ) {
-        IconButton(
-            onClick = onLeftClick,
-            modifier = Modifier.align(Alignment.CenterStart)
-        ) {
-            Icon(
-                painter = painterResource(R.drawable.ic_arrow_back),
-                contentDescription = "Back Button",
-                tint = Color.Unspecified
-            )
-        }
+        Icon(
+            painter = painterResource(R.drawable.ic_arrow_back),
+            contentDescription = "Back Button",
+            tint = Color.Unspecified,
+            modifier = Modifier
+                .align(Alignment.CenterStart)
+                .clickable(
+                    interactionSource = remember { MutableInteractionSource() },
+                    indication = null,
+                    onClick = onLeftClick
+                )
+        )
 
         if (isTitleVisible) {
             Text(
@@ -54,16 +58,18 @@ fun DefaultTopAppBar(
         }
 
         if (isRightIconVisible) {
-            IconButton(
-                onClick = onRightClick,
-                modifier = Modifier.align(Alignment.CenterEnd)
-            ) {
-                Icon(
-                    painter = painterResource(R.drawable.ic_more),
-                    contentDescription = "More Options",
-                    tint = Color.Unspecified
-                )
-            }
+            Icon(
+                painter = painterResource(R.drawable.ic_more),
+                contentDescription = "More Options",
+                tint = Color.Unspecified,
+                modifier = Modifier
+                    .align(Alignment.CenterEnd)
+                    .clickable(
+                        interactionSource = remember { MutableInteractionSource() },
+                        indication = null,
+                        onClick = onRightClick
+                    )
+            )
         }
     }
 }

diff --git a/app/src/main/java/com/texthip/thip/ui/common/topappbar/GradationTopAppBar.kt b/app/src/main/java/com/texthip/thip/ui/common/topappbar/GradationTopAppBar.kt
@@ -2,13 +2,14 @@ package com.texthip.thip.ui.common.topappbar
 
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.Box
 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.Icon
-import androidx.compose.material3.IconButton
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
@@ -35,6 +36,7 @@ fun GradationTopAppBar(
     autoHideCount: Boolean? = null,
     countDisplayDurationMs: Long = 5000L,
     onLeftClick: () -> Unit,
+    isRightIconVisible: Boolean = false,
     onRightClick: () -> Unit = {},
 ) {
     var isCountVisible by remember { mutableStateOf(isImageVisible) }
@@ -49,9 +51,11 @@ fun GradationTopAppBar(
                     isCountVisible = false
                 }
             }
+
             false -> {
                 isCountVisible = true
             }
+
             null -> {
                 // 기존 동작 유지: isImageVisible 파라미터 사용
                 isCountVisible = isImageVisible
@@ -74,16 +78,18 @@ fun GradationTopAppBar(
             .height(56.dp),
         contentAlignment = Alignment.Center,
     ) {
-        IconButton(
-            onClick = onLeftClick,
-            modifier = Modifier.align(Alignment.CenterStart)
-        ) {
-            Icon(
-                painter = painterResource(R.drawable.ic_arrow_back),
-                contentDescription = "Back Button",
-                tint = Color.Unspecified
-            )
-        }
+        Icon(
+            painter = painterResource(R.drawable.ic_arrow_back),
+            contentDescription = "Back Button",
+            tint = Color.Unspecified,
+            modifier = Modifier
+                .align(Alignment.CenterStart)
+                .clickable(
+                    interactionSource = remember { MutableInteractionSource() },
+                    indication = null,
+                    onClick = onLeftClick
+                )
+        )
 
         Column {
             AnimatedVisibility(
@@ -95,16 +101,20 @@ fun GradationTopAppBar(
             }
         }
 
-        /*IconButton(
-            onClick = onRightClick,
-            modifier = Modifier.align(Alignment.CenterEnd)
-        ) {
+        if (isRightIconVisible) {
             Icon(
                 painter = painterResource(R.drawable.ic_more),
                 contentDescription = "More Options",
-                tint = Color.Unspecified
+                tint = Color.Unspecified,
+                modifier = Modifier
+                    .align(Alignment.CenterEnd)
+                    .clickable(
+                        interactionSource = remember { MutableInteractionSource() },
+                        indication = null,
+                        onClick = onRightClick
+                    )
             )
-        }*/
+        }
     }
 }
 

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
@@ -201,10 +201,10 @@ fun GroupRoomRecruitContent(
                 Column(
                     Modifier
                         .fillMaxSize()
-                        .padding(start = 20.dp, end = 20.dp, bottom = 20.dp)
-                        .verticalScroll(scrollState)
+                        .verticalScroll(scrollState),
                 ) {
                     Row(
+                        modifier = Modifier.padding(horizontal = 20.dp).padding(top = 20.dp),
                         verticalAlignment = Alignment.CenterVertically
                     ) {
                         Text(
@@ -230,7 +230,9 @@ fun GroupRoomRecruitContent(
                     }
 
                     Text(
-                        modifier = Modifier.padding(top = 40.dp),
+                        modifier = Modifier
+                            .padding(horizontal = 20.dp)
+                            .padding(top = 40.dp),
                         text = stringResource(R.string.group_room_desc),
                         style = typography.menu_sb600_s14_h24,
                         color = colors.White,
@@ -241,11 +243,14 @@ fun GroupRoomRecruitContent(
                         style = typography.copy_r400_s12_h20,
                         color = colors.Grey,
                         modifier = Modifier
+                            .padding(horizontal = 20.dp)
                             .padding(top = 5.dp, bottom = 20.dp)
                     )
 
                     Row(
-                        Modifier.fillMaxWidth(),
+                        Modifier
+                            .fillMaxWidth()
+                            .padding(horizontal = 20.dp),
                         verticalAlignment = Alignment.CenterVertically
                     ) {
                         //모집 기간
@@ -327,6 +332,7 @@ fun GroupRoomRecruitContent(
                     Row(
                         Modifier
                             .fillMaxWidth()
+                            .padding(horizontal = 20.dp)
                             .padding(top = 22.dp, bottom = 30.dp),
                         verticalAlignment = Alignment.CenterVertically
                     ) {
@@ -373,6 +379,7 @@ fun GroupRoomRecruitContent(
 
                     //읽을 책 정보
                     CardRoomBook(
+                        modifier = Modifier.padding(horizontal = 20.dp),
                         title = detail.bookTitle,
                         author = detail.authorName,
                         publisher = detail.publisher,
@@ -384,7 +391,7 @@ fun GroupRoomRecruitContent(
                     // 추천 모임방이 있을 때만 표시
                     if (detail.recommendRooms.isNotEmpty()) {
                         Text(
-                            modifier = Modifier.padding(top = 40.dp),
+                            modifier = Modifier.padding(top = 40.dp, start = 20.dp),
                             text = stringResource(R.string.group_recommend),
                             style = typography.smalltitle_sb600_s18_h24,
                             color = colors.White
@@ -393,7 +400,7 @@ fun GroupRoomRecruitContent(
                         //추천 모임방
                         LazyRow(
                             modifier = Modifier
-                                .padding(top = 24.dp)
+                                .padding(top = 24.dp, start = 20.dp)
                                 .fillMaxWidth(),
                             horizontalArrangement = Arrangement.spacedBy(20.dp)
                         ) {
@@ -409,6 +416,8 @@ fun GroupRoomRecruitContent(
                             }
                         }
                     }
+
+                    Spacer(Modifier.height(70.dp))
                 }
             }
         }

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
@@ -201,6 +201,7 @@ fun GroupRoomContent(
 
         GradationTopAppBar(
             onLeftClick = onBackClick,
+            isRightIconVisible = true,
             onRightClick = { isBottomSheetVisible = true },
         )
     }