커뮤니티 페이지 게시글 댓글 ui 변경 (#83)

Team-Walkie · Aug 15, 2024 · 3de6c5d · 3de6c5d
1 parent 824a8d5
commit 3de6c5d
Show file tree

Hide file tree

Showing 8 changed files with 47 additions and 22 deletions.
diff --git a/data/src/main/java/com/whyranoid/data/model/post/PostResponse.kt b/data/src/main/java/com/whyranoid/data/model/post/PostResponse.kt
@@ -18,6 +18,7 @@ data class PostResponse(
     @SerializedName("date") val date: String,
     @SerializedName("colorMode") val colorMode: Long,
     @SerializedName("historyContent") val historyContent: String,
+    @SerializedName("commentCount") val commentCount: Long,
 ) {
     fun toPostPreview(): PostPreview {
         val destructedHistoryContent = historyContent.split('_')
@@ -33,6 +34,7 @@ data class PostResponse(
             timeText = destructedHistoryContent[3],
             paceText = destructedHistoryContent[4],
             address = destructedHistoryContent[1],
+            commentCount = commentCount,
         )
     }
 
@@ -52,6 +54,7 @@ data class PostResponse(
             timeText = destructedHistoryContent[3],
             paceText = destructedHistoryContent[4],
             address = destructedHistoryContent[1],
+            commentCount = commentCount,
         )
     }
 

diff --git a/domain/src/main/java/com/whyranoid/domain/model/post/Post.kt b/domain/src/main/java/com/whyranoid/domain/model/post/Post.kt
@@ -18,6 +18,7 @@ data class Post(
     val timeText: String = "",
     val paceText: String = "",
     val address: String = "",
+    val commentCount: Long = 0,
 ) : Serializable {
     companion object {
         val DUMMY =

diff --git a/domain/src/main/java/com/whyranoid/domain/model/post/PostPreview.kt b/domain/src/main/java/com/whyranoid/domain/model/post/PostPreview.kt
@@ -14,6 +14,7 @@ data class PostPreview(
     val timeText: String = "",
     val paceText: String = "",
     val address: String = "",
+    val commentCount: Long = 0,
 ) {
     companion object {
         val DUMMY_LIST = listOf(

diff --git a/presentation/src/main/java/com/whyranoid/presentation/component/community/PostContentItem.kt b/presentation/src/main/java/com/whyranoid/presentation/component/community/PostContentItem.kt
@@ -78,14 +78,13 @@ fun PostContentItem(
 
                 Icon(
                     modifier = Modifier
-                        .graphicsLayer(scaleX = -1f)
                         .size(28.dp)
                         .clip(CircleShape)
                         .clickable {
                             onCommentClicked(post)
                         }
                         .padding(3.dp),
-                    painter = painterResource(id = R.drawable.ic_comment_outlined_button),
+                    painter = painterResource(id = R.drawable.ic_comment_button),
                     contentDescription = "댓글 버튼",
                     tint = WalkieColor.GrayBorder
                 )
@@ -94,7 +93,7 @@ fun PostContentItem(
 
                 Text(
                     modifier = Modifier.align(Alignment.CenterVertically),
-                    text = "?", // todo replace real count
+                    text = post.commentCount.toString(),
                     style = WalkieTypography.Body1_Normal,
                     color = WalkieColor.GrayBorder
                 )

diff --git a/presentation/src/main/java/com/whyranoid/presentation/screens/CommunityScreen.kt b/presentation/src/main/java/com/whyranoid/presentation/screens/CommunityScreen.kt
@@ -61,6 +61,7 @@ fun CommunityScreen(navController: NavController) {
                             modifier =
                                 Modifier
                                     .clickable {
+                                        navController.navigate(Screen.AddPostScreen.route)
                                     },
                             imageVector = Icons.Filled.Add,
                             contentDescription = "추가 버튼",

diff --git a/presentation/src/main/java/com/whyranoid/presentation/screens/mypage/MyPageScreen.kt b/presentation/src/main/java/com/whyranoid/presentation/screens/mypage/MyPageScreen.kt
@@ -20,8 +20,10 @@ import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.layout.wrapContentHeight
 import androidx.compose.foundation.pager.HorizontalPager
 import androidx.compose.foundation.pager.rememberPagerState
+import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.Scaffold
 import androidx.compose.material.Tab
 import androidx.compose.material.TabRow
@@ -377,17 +379,25 @@ fun UserPageContent(
                 verticalAlignment = Alignment.Top,
             ) { pagerNum ->
                 when (pagerNum) {
-                    0 -> state.userPostPreviewsState.getDataOrNull()?.let { postPreviews ->
-                        PostPage(
-                            nickname == null,
-                            postPreviews,
-                            onPostPreviewClicked,
-                            onPostCreateClicked,
-                        )
+                    0 -> {
+                        Column(
+                            modifier = Modifier.verticalScroll(rememberScrollState())
+                        ) {
+                            state.userPostPreviewsState.getDataOrNull()?.let { postPreviews ->
+                                PostPage(
+                                    nickname == null,
+                                    postPreviews,
+                                    onPostPreviewClicked,
+                                    onPostCreateClicked,
+                                )
+                            }
+                        }
                     }
 
                     1 -> {
-                        Column {
+                        Column(
+                            modifier = Modifier.verticalScroll(rememberScrollState())
+                        ) {
                             HistoryPage(onDayClicked = onDateClicked)
                             state.calendarPreviewsState.getDataOrNull()
                                 ?.let { postPreviews ->
@@ -407,12 +417,16 @@ fun UserPageContent(
                     2 -> {
                         val itemList = state.challengingPreviewsState.getDataOrNull()
                         if (itemList != null) {
-                            ChallengePage(
-                                itemList,
-                                onChallengePreviewClicked,
-                                goChallengeMainScreen,
-                                nickname == null
-                            )
+                            Column(
+                                modifier = Modifier.verticalScroll(rememberScrollState())
+                            ) {
+                                ChallengePage(
+                                    itemList,
+                                    onChallengePreviewClicked,
+                                    goChallengeMainScreen,
+                                    nickname == null
+                                )
+                            }
                         } else {
                             Box(Modifier.fillMaxSize()) {
                                 CircularProgressIndicator(Modifier.align(Alignment.Center))

diff --git a/presentation/src/main/res/drawable/ic_comment_button.xml b/presentation/src/main/res/drawable/ic_comment_button.xml
@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="18dp"
+    android:viewportWidth="20"
+    android:viewportHeight="18">
+  <path
+      android:pathData="M12.823,16.362L13.204,16.234L13.575,16.388C15.627,17.239 17.01,16.928 17.855,16.506C17.957,16.454 18.053,16.401 18.143,16.346C18.102,16.313 18.061,16.279 18.021,16.244C17.493,15.796 16.765,14.984 16.765,13.951V13.505L17.082,13.19C17.886,12.391 18.386,11.196 18.386,8.97C18.386,4.689 14.574,1.073 9.73,1.073C4.885,1.073 1.073,4.689 1.073,8.97C1.073,13.251 4.885,16.867 9.73,16.867C10.816,16.867 11.859,16.685 12.823,16.362Z"
+      android:strokeWidth="2.14639"
+      android:fillColor="#00000000"
+      android:strokeColor="#E4E4E4"/>
+</vector>
diff --git a/presentation/src/main/res/drawable/ic_comment_outlined_button.xml b/presentation/src/main/res/drawable/ic_comment_outlined_button.xml