[refactor]: SavedScreen, SavedFeedCard -> feedItem 적용(#26)

Author: JJUYAAA

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

@@ -123,18 +123,9 @@ fun FeedContent(viewModel: SavedFeedViewModel = viewModel()) {
             val profileImagePainter = feed.userProfileImage?.let { painterResource(it) }
 
             SavedFeedCard(
-                user_name = feed.userName,
-                user_role = feed.userRole,
-                user_profile_image = profileImagePainter,
-                book_title = feed.bookTitle,
-                auth_name = feed.authName,
-                time_ago = feed.timeAgo,
-                content = feed.content,
-                like_count = feed.likeCount,
-                comment_count = feed.commentCount,
-                is_like = feed.isLiked,
-                is_saved = feed.isSaved,
-                imageRes = bookImagePainter,
+                feedItem = feed,
+                bookImage = bookImagePainter,
+                profileImage = profileImagePainter,
                 onBookmarkClick = { viewModel.toggleBookmark(feed.id) },
                 onLikeClick = { viewModel.toggleLike(feed.id) }
             )

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

@@ -24,6 +24,7 @@ import androidx.compose.ui.unit.dp
 import com.texthip.thip.R
 import com.texthip.thip.ui.common.buttons.ActionBookButton
 import com.texthip.thip.ui.common.header.ProfileBar
+import com.texthip.thip.ui.myPage.mock.FeedItem
 import com.texthip.thip.ui.theme.Red
 import com.texthip.thip.ui.theme.ThipTheme.colors
 import com.texthip.thip.ui.theme.ThipTheme.typography
@@ -32,18 +33,9 @@ import com.texthip.thip.ui.theme.White
 @Composable
 fun SavedFeedCard(
     modifier: Modifier = Modifier,
-    user_name: String,
-    user_role: String,
-    user_profile_image: Painter? = null,
-    book_title: String,
-    auth_name: String,
-    imageRes: Painter? = null,
-    time_ago: Int,
-    content: String,
-    like_count: Int,
-    comment_count: Int,
-    is_like: Boolean,
-    is_saved: Boolean = true,
+    feedItem: FeedItem,
+    bookImage: Painter? = null,
+    profileImage: Painter? = null,
     onBookmarkClick: () -> Unit = {},
     onLikeClick: () -> Unit = {}
 ) {
@@ -53,25 +45,26 @@ fun SavedFeedCard(
             .padding(20.dp)
     ) {
         ProfileBar(
-            profileImage = user_profile_image,
-            topText = user_name,
-            bottomText = user_role,
+            profileImage = profileImage,
+            topText = feedItem.userName,
+            bottomText = feedItem.userRole,
             showSubscriberInfo = false,
-            hoursAgo = time_ago
+            hoursAgo = feedItem.timeAgo
         )
         Column(
             modifier = Modifier
                 .fillMaxWidth()
                 .padding(top = 16.dp, bottom = 16.dp)
         ) {
             ActionBookButton(
-                bookTitle = book_title,
-                bookAuthor = auth_name,
-                onClick = {})
+                bookTitle = feedItem.bookTitle,
+                bookAuthor = feedItem.authName,
+                onClick = {}
+            )
         }
-        if (imageRes != null) {
+        if (bookImage  != null) {
             Image(
-                painter = imageRes,
+                painter = bookImage ,
                 contentDescription = null,
                 modifier = Modifier
                     .fillMaxWidth()
@@ -81,7 +74,7 @@ fun SavedFeedCard(
         }
 
         Text(
-            text = content,
+            text = feedItem.content,
             style = typography.feedcopy_r400_s14_h20,
             color = White,
             modifier = Modifier
@@ -95,10 +88,10 @@ fun SavedFeedCard(
                 modifier = Modifier.clickable { onLikeClick() },
                 painter = painterResource(R.drawable.ic_heart),
                 contentDescription = null,
-                tint = if (is_like) Red else colors.White
+                tint = if (feedItem.isLiked) Red else colors.White
             )
             Text(
-                text = like_count.toString(),
+                text = feedItem.likeCount.toString(),
                 style = typography.feedcopy_r400_s14_h20,
                 color = White,
                 modifier = Modifier.padding(start = 5.dp, end = 12.dp)
@@ -109,15 +102,15 @@ fun SavedFeedCard(
                 tint = colors.White
             )
             Text(
-                text = comment_count.toString(),
+                text = feedItem.commentCount.toString(),
                 style = typography.feedcopy_r400_s14_h20,
                 color = White,
                 modifier = Modifier.padding(start = 5.dp, end = 12.dp)
             )
             Spacer(modifier = Modifier.weight(1f))
             Icon(
                 modifier = Modifier.clickable { onBookmarkClick() },
-                painter = painterResource(if (is_saved) R.drawable.ic_save_filled else R.drawable.ic_save),
+                painter = painterResource(if (feedItem.isSaved) R.drawable.ic_save_filled else R.drawable.ic_save),
                 contentDescription = null,
                 tint = colors.White
             )
@@ -129,32 +122,50 @@ fun SavedFeedCard(
 @Preview
 @Composable
 private fun SavedFeedCardPrev() {
+    val feed1 = FeedItem(
+        id = 1,
+        userProfileImage = R.drawable.character_literature,
+        userName = "user.01",
+        userRole = stringResource(R.string.influencer),
+        bookTitle = "책 제목",
+        authName = "한강",
+        timeAgo = 3,
+        content = "무한대로입력가능합니닷무한대로입력가능합니닷무한대로입력가능합니닷무한대로입력가능합니닷무한대로입력가능합니닷무한대로입력가능합니닷무한대로입력가능합니닷무한대로입력가능합니닷",
+        likeCount = 10,
+        commentCount = 5,
+        isLiked = false,
+        isSaved = true,
+        imageUrl = null
+    )
+
+    val feed2 = FeedItem(
+        id = 2,
+        userProfileImage = R.drawable.character_art,
+        userName = "user.01",
+        userRole = stringResource(R.string.influencer),
+        bookTitle = "책 제목",
+        authName = "한강",
+        timeAgo = 3,
+        content = "한줄만 입력 가능",
+        likeCount = 10,
+        commentCount = 5,
+        isLiked = false,
+        isSaved = true,
+        imageUrl = R.drawable.bookcover_sample
+    )
+
     Column {
         SavedFeedCard(
-            user_name = "user.01",
-            user_role = stringResource(R.string.influencer),
-            book_title = "책 제목",
-            auth_name = "한강",
-            time_ago = 3,
-            content = "무한대로입력가능합니닷무한대로입력가능합니닷무한대로입력가능합니닷무한대로입력가능합니닷무한대로입력가능합니닷무한대로입력가능합니닷무한대로입력가능합니닷무한대로입력가능합니닷",
-            like_count = 10,
-            comment_count = 5,
-            is_like = false,
-            user_profile_image = R.drawable.character_literature.let { painterResource(it) }
+            feedItem = feed1,
+            profileImage = painterResource(feed1.userProfileImage!!),
+            bookImage = null
         )
         SavedFeedCard(
-            user_name = "user.01",
-            user_role = stringResource(R.string.influencer),
-            book_title = "책 제목",
-            auth_name = "한강",
-            time_ago = 3,
-            content = "한줄만 입력 가능",
-            like_count = 10,
-            comment_count = 5,
-            is_like = false,
-            imageRes = R.drawable.bookcover_sample.let { painterResource(it) },
-            user_profile_image = R.drawable.character_art.let { painterResource(it) }
+            feedItem = feed2,
+            profileImage = painterResource(feed2.userProfileImage!!),
+            bookImage = painterResource(feed2.imageUrl!!)
         )
     }
 
+
 }