[refactor]: SavedScreen content들 component로 분리(#26)

Author: JJUYAAA

app/src/main/java/com/texthip/thip/ui/myPage/SavedScreen.kt

@@ -8,16 +8,13 @@ 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.lazy.LazyColumn
-import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Tab
 import androidx.compose.material3.TabRow
 import androidx.compose.material3.TabRowDefaults.tabIndicatorOffset
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.saveable.rememberSaveable
@@ -26,20 +23,15 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import androidx.lifecycle.viewmodel.compose.viewModel
 import com.texthip.thip.R
-import com.texthip.thip.ui.common.cards.CardBookList
 import com.texthip.thip.ui.common.topappbar.DefaultTopAppBar
-import com.texthip.thip.ui.myPage.component.SavedFeedCard
-import com.texthip.thip.ui.myPage.viewmodel.SavedBookViewModel
-import com.texthip.thip.ui.myPage.viewmodel.SavedFeedViewModel
+import com.texthip.thip.ui.myPage.component.BookContent
+import com.texthip.thip.ui.myPage.component.FeedContent
 import com.texthip.thip.ui.theme.Black
-import com.texthip.thip.ui.theme.Grey02
 import com.texthip.thip.ui.theme.ThipTheme.colors
 import com.texthip.thip.ui.theme.ThipTheme.typography
 import com.texthip.thip.ui.theme.White
@@ -112,43 +104,6 @@ fun SavedScreen() {
     }
 }
 
-@Composable
-fun FeedContent(viewModel: SavedFeedViewModel = viewModel()) {
-    val feedList by viewModel.feeds.collectAsState()
-
-    LazyColumn {
-        items(feedList, key = { it.id }) { feed ->
-            val bookImagePainter = feed.imageUrl?.let { painterResource(it) }
-            val profileImagePainter = feed.userProfileImage?.let { painterResource(it) }
-
-            SavedFeedCard(
-                feedItem = feed,
-                bookImage = bookImagePainter,
-                profileImage = profileImagePainter,
-                onBookmarkClick = { viewModel.toggleBookmark(feed.id) },
-                onLikeClick = { viewModel.toggleLike(feed.id) }
-            )
-        }
-    }
-}
-
-@Composable
-fun BookContent(viewModel: SavedBookViewModel = viewModel()) {
-    val books by viewModel.bookList.collectAsState()
-
-    LazyColumn {
-        items(items = books, key = { it.id }) { book ->
-            CardBookList(
-                title = book.title,
-                author = book.author,
-                imageRes = null,
-                publisher = book.publisher,
-                isBookmarked = book.isSaved,
-                onBookmarkClick = { viewModel.toggleBookmark(book.id) }
-            )
-        }
-    }
-}
 
 @Preview
 @Composable

app/src/main/java/com/texthip/thip/ui/myPage/component/BookContent.kt

@@ -0,0 +1,28 @@
+package com.texthip.thip.ui.myPage.component
+
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import androidx.lifecycle.viewmodel.compose.viewModel
+import com.texthip.thip.ui.common.cards.CardBookList
+import com.texthip.thip.ui.myPage.viewmodel.SavedBookViewModel
+
+@Composable
+fun BookContent(viewModel: SavedBookViewModel = viewModel()) {
+    val books by viewModel.bookList.collectAsState()
+
+    LazyColumn {
+        items(items = books, key = { it.id }) { book ->
+            CardBookList(
+                title = book.title,
+                author = book.author,
+                imageRes = null,
+                publisher = book.publisher,
+                isBookmarked = book.isSaved,
+                onBookmarkClick = { viewModel.toggleBookmark(book.id) }
+            )
+        }
+    }
+}

app/src/main/java/com/texthip/thip/ui/myPage/component/FeedContent.kt

@@ -0,0 +1,30 @@
+package com.texthip.thip.ui.myPage.component
+
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import androidx.compose.ui.res.painterResource
+import androidx.lifecycle.viewmodel.compose.viewModel
+import com.texthip.thip.ui.myPage.viewmodel.SavedFeedViewModel
+
+@Composable
+fun FeedContent(viewModel: SavedFeedViewModel = viewModel()) {
+    val feedList by viewModel.feeds.collectAsState()
+
+    LazyColumn {
+        items(feedList, key = { it.id }) { feed ->
+            val bookImagePainter = feed.imageUrl?.let { painterResource(it) }
+            val profileImagePainter = feed.userProfileImage?.let { painterResource(it) }
+
+            SavedFeedCard(
+                feedItem = feed,
+                bookImage = bookImagePainter,
+                profileImage = profileImagePainter,
+                onBookmarkClick = { viewModel.toggleBookmark(feed.id) },
+                onLikeClick = { viewModel.toggleLike(feed.id) }
+            )
+        }
+    }
+}

app/src/main/res/values/strings.xml

@@ -74,6 +74,8 @@
     <string name="menu">메뉴</string>
     <string name="likes">좋아요</string>
     <string name="comments">댓글</string>
+    <string name="feed">피드</string>
+    <string name="book">책</string>
     <string name="edit_profile">프로필 편집</string>
     <string name="change_nickname">닉네임 변경</string>
     <string name="edit_role">칭호 편집</string>
@@ -83,7 +85,6 @@
     <string name="ask_account_deletion">정말로 탈퇴하시겠어요?</string>
     <string name="delete_account_description">\'예\'를 누르면 모든 기록이 사라져요.</string>
 
-
     <string name="literature">문학</string>
     <string name="literary_person">문학가</string>
     <string name="science_it">과학·IT</string>