更新消息功能

2024-08-20 19:48:12 +08:00
parent 6137e1c3b5
commit 5228fde035
18 changed files with 1077 additions and 259 deletions
--- a/app/src/main/java/com/aiosman/riderpro/ui/message/MessageList.kt
+++ b/app/src/main/java/com/aiosman/riderpro/ui/message/MessageList.kt
@@ -2,7 +2,6 @@ package com.aiosman.riderpro.ui.message

 import androidx.compose.foundation.Image
 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
@@ -24,29 +23,43 @@ 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.platform.LocalContext
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import androidx.paging.compose.collectAsLazyPagingItems
 import com.aiosman.riderpro.LocalNavController
 import com.aiosman.riderpro.R
+import com.aiosman.riderpro.data.Comment
+import com.aiosman.riderpro.data.CommentEntity
+import com.aiosman.riderpro.exp.timeAgo
+import com.aiosman.riderpro.ui.NavigationRoute
 import com.aiosman.riderpro.ui.composables.StatusBarMaskLayout
 import com.aiosman.riderpro.ui.composables.BottomNavigationPlaceholder
+import com.aiosman.riderpro.ui.composables.CustomAsyncImage
+import com.aiosman.riderpro.ui.modifiers.noRippleClickable
 import com.google.accompanist.systemuicontroller.rememberSystemUiController


@Preview(showBackground = true)
@Composable
 fun NotificationsScreen() {
+    val model = MessageListViewModel
    val navController = LocalNavController.current
    val systemUiController = rememberSystemUiController()
+    var dataFlow = model.commentItemsFlow
+    var comments = dataFlow.collectAsLazyPagingItems()
    LaunchedEffect(Unit) {
        systemUiController.setNavigationBarColor(Color.Transparent)
+        model.initData()
    }
    StatusBarMaskLayout(darkIcons = true) {
        Column(
-            modifier = Modifier.fillMaxWidth().weight(1f)
+            modifier = Modifier
+                .fillMaxWidth()
+                .weight(1f)
        ) {
            Box(
                modifier = Modifier
@@ -65,42 +78,47 @@ fun NotificationsScreen() {
                    .padding(horizontal = 16.dp),
                horizontalArrangement = Arrangement.SpaceBetween,
            ) {
-                NotificationIndicator(10, R.drawable.rider_pro_like, "LIKE") {
-                    navController.navigate("Likes")
+                NotificationIndicator(model.likeNoticeCount, R.drawable.rider_pro_like, "LIKE") {
+                    navController.navigate(NavigationRoute.Likes.route)
                }
-                NotificationIndicator(10, R.drawable.rider_pro_followers, "FOLLOWERS"){
-                    navController.navigate("Followers")
+                NotificationIndicator(
+                    model.followNoticeCount,
+                    R.drawable.rider_pro_followers,
+                    "FOLLOWERS"
+                ) {
+                    navController.navigate(NavigationRoute.Followers.route)
                }
-                NotificationIndicator(10, R.drawable.rider_pro_comments, "COMMENTS"){
-                    navController.navigate("Comments")
-
+                NotificationIndicator(
+                    model.favouriteNoticeCount,
+                    R.drawable.rider_pro_favoriate,
+                    "Favourites"
+                ) {
+                    navController.navigate(NavigationRoute.FavouritesScreen.route)
                }
            }
            HorizontalDivider(color = Color(0xFFEbEbEb), modifier = Modifier.padding(16.dp))
-            NotificationCounterItem(24)
+            NotificationCounterItem(model.commentNoticeCount)
            LazyColumn(
                modifier = Modifier
                    .weight(1f)
                    .fillMaxSize()
            ) {
-                item {
-                    repeat(20) {
-                        MessageItem(
-                            MessageItemData(
-                                userName = "Onyama Limba",
-                                message = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.",
-                                timeAgo = "3 days ago",
-                                profileImage = R.drawable.default_avatar
+                items(comments.itemCount) { index ->
+                    comments[index]?.let { comment ->
+                        CommentItem(comment) {
+                            model.updateReadStatus(comment.id)
+                            navController.navigate(
+                                NavigationRoute.Post.route.replace(
+                                    "{id}",
+                                    comment.postId.toString()
+                                )
                            )
-                        )
-
+                        }
                    }
-                    BottomNavigationPlaceholder()
-
-
                }
-
-
+                item {
+                    BottomNavigationPlaceholder()
+                }
            }
        }
    }
@@ -121,7 +139,7 @@ fun NotificationIndicator(
            modifier = Modifier
                .padding(16.dp)
                .align(Alignment.TopCenter)
-                .clickable {
+                .noRippleClickable {
                    onClick()
                }
        ) {
@@ -204,68 +222,101 @@ fun NotificationCounterItem(count: Int) {
    }
 }

-data class MessageItemData(
-    val userName: String,
-    val message: String,
-    val timeAgo: String,
-    val profileImage: Int
-)

@Composable
-fun MessageItem(messageItemData: MessageItemData) {
+fun CommentItem(
+    commentItem: CommentEntity,
+    onPostClick: () -> Unit = {},
+) {
+    val navController = LocalNavController.current
+    val context = LocalContext.current
    Row(
        modifier = Modifier.padding(16.dp)
    ) {
-        Box() {
-            Image(
-                painter = painterResource(id = R.drawable.default_avatar),
-                contentDescription = "",
+        Box {
+            CustomAsyncImage(
+                context = context,
+                imageUrl = commentItem.avatar,
+                contentDescription = commentItem.name,
                modifier = Modifier
                    .size(48.dp)
                    .clip(RoundedCornerShape(4.dp))
+                    .noRippleClickable {
+                        navController.navigate(
+                            NavigationRoute.AccountProfile.route.replace(
+                                "{id}",
+                                commentItem.author.toString()
+                            )
+                        )
+                    }
            )
        }
-        Column(
-            modifier = Modifier.weight(1f)
+        Row(
+            modifier = Modifier
+                .weight(1f)
+                .padding(start = 16.dp)
+                .noRippleClickable {
+                    onPostClick()
+                }
        ) {
-            Text(
-                text = "Onyama Limba",
-                fontSize = 16.sp,
-                modifier = Modifier.padding(start = 16.dp)
-            )
-            Spacer(modifier = Modifier.height(8.dp))
-            Text(
-                text = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.",
-                fontSize = 14.sp,
-                modifier = Modifier.padding(start = 16.dp),
-                maxLines = 1,
-                color = Color(0x99000000)
-            )
-        }
-//        Spacer(modifier = Modifier.weight(1f))
-        Column(
-            horizontalAlignment = Alignment.End
-        ) {
-            Text(
-                text = "3 days ago",
-                fontSize = 14.sp,
-                color = Color(0x66000000)
-            )
-            Spacer(modifier = Modifier.height(6.dp))
-            Box(
-                modifier = Modifier
-                    .clip(RoundedCornerShape(12.dp))
-                    .background(Color(0xFFE53935))
-                    .padding(4.dp)
+            Column(
+                modifier = Modifier.weight(1f)
            ) {
                Text(
-                    text = "24",
-                    color = Color.White,
-                    fontSize = 12.sp,
-                    fontWeight = FontWeight.Bold,
-                    modifier = Modifier.align(Alignment.Center)
+                    text = commentItem.name,
+                    fontSize = 16.sp,
+                    modifier = Modifier.padding(start = 16.dp)
+                )
+                Spacer(modifier = Modifier.height(8.dp))
+                Text(
+                    text = commentItem.comment,
+                    fontSize = 14.sp,
+                    modifier = Modifier.padding(start = 16.dp),
+                    maxLines = 1,
+                    color = Color(0x99000000)
                )
            }
+//        Spacer(modifier = Modifier.weight(1f))
+            Column(
+                horizontalAlignment = Alignment.End
+            ) {
+                Row {
+                    if (commentItem.unread) {
+                        Box(
+                            modifier = Modifier
+                                .clip(RoundedCornerShape(12.dp))
+                                .background(Color(0xFFE53935))
+                                .padding(4.dp)
+                        ) {
+                            Text(
+                                text = "new",
+                                color = Color.White,
+                                fontSize = 12.sp,
+                                fontWeight = FontWeight.Bold,
+                                modifier = Modifier.align(Alignment.Center)
+                            )
+                        }
+                        Spacer(modifier = Modifier.width(8.dp))
+                    }
+                    Text(
+                        text = commentItem.date.timeAgo(),
+                        fontSize = 14.sp,
+                        color = Color(0x66000000)
+                    )
+                }
+                Spacer(modifier = Modifier.height(4.dp))
+                commentItem.post?.let {
+                    CustomAsyncImage(
+                        context = context,
+                        imageUrl = it.images[0].thumbnail,
+                        contentDescription = "Post Image",
+                        modifier = Modifier
+                            .size(32.dp)
+                            .clip(RoundedCornerShape(4.dp)),
+                    )
+                }
+            }
        }
+
    }
 }
--- a/app/src/main/java/com/aiosman/riderpro/ui/message/MessageListViewModel.kt
+++ b/app/src/main/java/com/aiosman/riderpro/ui/message/MessageListViewModel.kt
@@ -0,0 +1,82 @@
+package com.aiosman.riderpro.ui.message
+
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.setValue
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import androidx.paging.Pager
+import androidx.paging.PagingConfig
+import androidx.paging.PagingData
+import androidx.paging.cachedIn
+import androidx.paging.map
+import com.aiosman.riderpro.data.AccountNotice
+import com.aiosman.riderpro.data.AccountService
+import com.aiosman.riderpro.data.CommentEntity
+import com.aiosman.riderpro.data.CommentPagingSource
+import com.aiosman.riderpro.data.CommentRemoteDataSource
+import com.aiosman.riderpro.data.CommentService
+import com.aiosman.riderpro.data.TestAccountServiceImpl
+import com.aiosman.riderpro.data.TestCommentServiceImpl
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.launch
+
+object MessageListViewModel : ViewModel() {
+    val accountService: AccountService = TestAccountServiceImpl()
+    var noticeInfo by mutableStateOf<AccountNotice?>(null)
+
+    private val commentService: CommentService = TestCommentServiceImpl()
+    private val _commentItemsFlow = MutableStateFlow<PagingData<CommentEntity>>(PagingData.empty())
+    val commentItemsFlow = _commentItemsFlow.asStateFlow()
+
+    suspend fun initData() {
+        val info = accountService.getMyNoticeInfo()
+        noticeInfo = info
+    }
+
+    val likeNoticeCount
+        get() = noticeInfo?.likeCount ?: 0
+    val followNoticeCount
+        get() = noticeInfo?.followCount ?: 0
+    val favouriteNoticeCount
+        get() = noticeInfo?.favoriteCount ?: 0
+    val commentNoticeCount
+        get() = noticeInfo?.commentCount ?: 0
+
+    init {
+        viewModelScope.launch {
+            Pager(
+                config = PagingConfig(pageSize = 5, enablePlaceholders = false),
+                pagingSourceFactory = {
+                    CommentPagingSource(
+                        CommentRemoteDataSource(commentService),
+                        selfNotice = true
+                    )
+                }
+            ).flow.cachedIn(viewModelScope).collectLatest {
+                _commentItemsFlow.value = it
+            }
+        }
+    }
+
+    private fun updateIsRead(id: Int) {
+        val currentPagingData = _commentItemsFlow.value
+        val updatedPagingData = currentPagingData.map { commentEntity ->
+            if (commentEntity.id == id) {
+                commentEntity.copy(unread = false)
+            } else {
+                commentEntity
+            }
+        }
+        _commentItemsFlow.value = updatedPagingData
+    }
+
+    fun updateReadStatus(id: Int) {
+        viewModelScope.launch {
+            commentService.updateReadStatus(id)
+            updateIsRead(id)
+        }
+    }
+}