Merge branch 'main' into nagisa

app/src/main/java/com/aiosman/ravenow/ui/chat/ChatAiScreen.kt

@@ -617,7 +617,7 @@ fun ChatAiInput(
                     animationSpec = tween(300)
                 )
                 Image(
-                    painter = painterResource(R.mipmap.rider_pro_im_send),
+                    painter = painterResource(R.mipmap.btn),
                     modifier = Modifier
                         .size(24.dp)
                         .alpha(alpha)

app/src/main/java/com/aiosman/ravenow/ui/chat/ChatScreen.kt

@@ -650,7 +650,7 @@ fun ChatInput(
                     animationSpec = tween(300)
                 )
                             Image(
-                painter = painterResource(R.mipmap.rider_pro_im_send),
+                painter = painterResource(R.mipmap.btn),
                 modifier = Modifier
                     .size(24.dp)
                     .alpha(alpha)

app/src/main/java/com/aiosman/ravenow/ui/chat/GroupChatScreen.kt

@@ -183,45 +183,21 @@ fun GroupChatScreen(groupId: String,name: String,avatar: String,) {
                     )
                     Spacer(modifier = Modifier.width(16.dp))
 
-                    if (viewModel.groupAvatar.isNotEmpty()) {
+                    if (viewModel.groupInfo?.groupAvatar?.isNotEmpty() == true) {
                         CustomAsyncImage(
-                            imageUrl = viewModel.groupAvatar,
+                            imageUrl = viewModel.groupInfo!!.groupAvatar,
                             modifier = Modifier
-                                .size(32.dp)
+                                .size(35.dp)
-                                .clip(RoundedCornerShape(8.dp))
+                                .clip(RoundedCornerShape(15.dp)),
-                                .noRippleClickable {
-                                    navController.navigateToGroupInfo(groupId)
-                                },
                             contentDescription = "群聊头像"
                         )
-                    } else {
-                        Box(
-                            modifier = Modifier
-                                .size(24.dp)
-                                .clip(RoundedCornerShape(8.dp))
-                                .background(AppColors.decentBackground)
-                                .noRippleClickable {
-                                    navController.navigateToGroupInfo(groupId)
-                                },
-                            contentAlignment = Alignment.Center
-                        ) {
-                            Text(
-                                text = viewModel.groupName,
-                                style = TextStyle(
-                                    color = AppColors.text,
-                                    fontSize = 18.sp,
-
-                                    fontWeight = androidx.compose.ui.text.font.FontWeight.W700
-                                ),
-                                maxLines = 1,
-                                overflow =TextOverflow.Ellipsis,
-
-                            )
-                        }
                     }
                     
                     Spacer(modifier = Modifier.width(8.dp))
-                    Column {
+                    Column(
+                        modifier = Modifier.weight(1f),
+                        horizontalAlignment = Alignment.Start
+                    ) {
                         Text(
                             text = viewModel.groupName,
                             style = TextStyle(
@@ -229,24 +205,21 @@ fun GroupChatScreen(groupId: String,name: String,avatar: String,) {
                                 fontSize = 18.sp,
                                 fontWeight = androidx.compose.ui.text.font.FontWeight.Bold
                             ),
-                               maxLines = 1,
+                            maxLines = 1,
-                            overflow =TextOverflow.Ellipsis,
+                            overflow = TextOverflow.Ellipsis
                         )
                     }
                     
-                    Spacer(modifier = Modifier.weight(1f))
+                    Image(
-                    Box {
+                        painter = painterResource(R.drawable.rider_pro_more_horizon),
-                        Image(
+                        modifier = Modifier
-                            painter = painterResource(R.drawable.rider_pro_more_horizon),
+                            .size(28.dp)
-                            modifier = Modifier
+                            .noRippleClickable {
-                                .size(28.dp)
+                                navController.navigateToGroupInfo(groupId)
-                                .noRippleClickable {
+                            },
-                                    navController.navigateToGroupInfo(groupId)
+                        contentDescription = "更多",
-                                },
+                        colorFilter = ColorFilter.tint(AppColors.text)
-                            contentDescription = null,
+                    )
-                            colorFilter = ColorFilter.tint(AppColors.text)
-                        )
-                    }
                 }
             }
         },
@@ -677,7 +650,7 @@ fun GroupChatInput(
                 animationSpec = tween(300)
             )
             Image(
-                painter = painterResource(R.mipmap.rider_pro_im_send),
+                painter = painterResource(R.mipmap.btn),
                 modifier = Modifier
                     .size(24.dp)
                     .alpha(alpha)

app/src/main/java/com/aiosman/ravenow/ui/chat/GroupChatViewModel.kt

@@ -1,11 +1,13 @@
 package com.aiosman.ravenow.ui.chat
 
 import android.content.Context
+import android.util.Base64
 import android.util.Log
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
 import androidx.lifecycle.viewModelScope
+import com.aiosman.ravenow.AppStore
 import com.aiosman.ravenow.data.api.ApiClient
 import com.aiosman.ravenow.data.api.SendChatAiRequestBody
 import io.openim.android.sdk.enums.ConversationType
@@ -50,17 +52,46 @@ class GroupChatViewModel(
     }
     
     private suspend fun getGroupInfo() {
-        // 简化群组信息获取，使用默认信息
+        try {
-        groupInfo = GroupInfo(
+            val response = ApiClient.api.getRoomDetail(trtcId = groupId)
-            groupId = groupId,
+            val room = response.body()?.data
-            groupName = name,
+            groupInfo = room?.let {
-            groupAvatar = avatar,
+                GroupInfo(
-            memberCount = 0,
+                    groupId = groupId,
-            ownerId = ""
+                    groupName = it.name,
-        )
+                    groupAvatar = if (it.avatar.isNullOrEmpty()) {
-        groupName = groupInfo?.groupName ?: ""
+                        val groupIdBase64 = Base64.encodeToString(
-        groupAvatar = groupInfo?.groupAvatar ?: ""
+                            groupId.toByteArray(),
-        memberCount = groupInfo?.memberCount ?: 0
+                            Base64.NO_WRAP
+                        )
+                        "${ApiClient.RETROFIT_URL}group/avatar?groupIdBase64=$groupIdBase64&token=${AppStore.token}"
+                    } else {
+                        "${ApiClient.BASE_API_URL}/outside${it.avatar}?token=${AppStore.token}"
+                    },
+                    memberCount = it.userCount,
+                    ownerId = it.creator.userId
+                )
+            } ?: GroupInfo(
+                groupId = groupId,
+                groupName = name,
+                groupAvatar = avatar,
+                memberCount = 0,
+                ownerId = ""
+            )
+        } catch (e: Exception) {
+            Log.e("GroupChatViewModel", "加载群信息失败: ${e.message}", e)
+            groupInfo = GroupInfo(
+                groupId = groupId,
+                groupName = name,
+                groupAvatar = avatar,
+                memberCount = 0,
+                ownerId = ""
+            )
+        } finally {
+            groupName = groupInfo?.groupName ?: ""
+            groupAvatar = groupInfo?.groupAvatar ?: ""
+            memberCount = groupInfo?.memberCount ?: 0
+        }
     }
 
     override fun getConversationParams(): Triple<String, Int, Boolean> {

app/src/main/java/com/aiosman/ravenow/ui/comment/notice/CommentNotice.kt

@@ -41,9 +41,8 @@ import com.aiosman.ravenow.R
 import com.aiosman.ravenow.entity.CommentEntity
 import com.aiosman.ravenow.exp.timeAgo
 import com.aiosman.ravenow.ui.NavigationRoute
-import com.aiosman.ravenow.ui.comment.NoticeScreenHeader
 import com.aiosman.ravenow.ui.composables.CustomAsyncImage
-import com.aiosman.ravenow.ui.composables.StatusBarSpacer
+import com.aiosman.ravenow.ui.composables.StatusBarMaskLayout
 import com.aiosman.ravenow.ui.modifiers.noRippleClickable
 import com.aiosman.ravenow.ui.navigateToPost
 import kotlinx.coroutines.launch
@@ -68,10 +67,14 @@ fun CommentNoticeScreen(includeStatusBarPadding: Boolean = true){
     val navController = LocalNavController.current
     val AppColors = LocalAppTheme.current
 
-    Column(
+    StatusBarMaskLayout(
-        modifier = Modifier.fillMaxSize().background(color = AppColors.background)
+        modifier = Modifier
+            .background(color = AppColors.background)
+            .padding(horizontal = 16.dp),
+        darkIcons = !AppState.darkMode,
+        maskBoxBackgroundColor = AppColors.background,
+        includeStatusBarPadding = includeStatusBarPadding
     ) {
-        StatusBarSpacer()
         val isNetworkAvailable = NetworkUtils.isNetworkAvailable(LocalContext.current)
 
         if (!isNetworkAvailable) {
@@ -109,7 +112,8 @@ fun CommentNoticeScreen(includeStatusBarPadding: Boolean = true){
         } else {
             LazyColumn(
                 modifier = Modifier
-                    .fillMaxSize().padding(horizontal = 16.dp)
+                    .weight(1f)
+                    .background(color = AppColors.background)
             ) {
                 items(comments.itemCount) { index ->
                     comments[index]?.let { comment ->
@@ -183,55 +187,58 @@ fun CommentNoticeItem(
     val navController = LocalNavController.current
     val context = LocalContext.current
     val AppColors = LocalAppTheme.current
+    val commentPrefix = stringResource(R.string.comment_notice)
 
     Row(
-        modifier = Modifier.padding(vertical = 20.dp, horizontal = 16.dp)
+        modifier = Modifier.padding(vertical = 12.dp)
     ) {
-        Box {
+        // 左侧头像区域
-            CustomAsyncImage(
+        CustomAsyncImage(
-                context = context,
+            context = context,
-                imageUrl = commentItem.avatar,
+            imageUrl = commentItem.avatar,
-                contentDescription = commentItem.name,
+            contentDescription = commentItem.name,
-                modifier = Modifier
+            modifier = Modifier
-                    .size(48.dp)
+                .size(40.dp)
-                    .clip(CircleShape)
+                .clip(CircleShape)
-                    .noRippleClickable {
+                .noRippleClickable {
-                        navController.navigate(
+                    navController.navigate(
-                            NavigationRoute.AccountProfile.route.replace(
+                        NavigationRoute.AccountProfile.route.replace(
-                                "{id}",
+                            "{id}",
-                                commentItem.author.toString()
+                            commentItem.author.toString()
-                            )
                         )
-                    }
+                    )
-            )
+                }
-        }
+        )
+        
+        // 右侧内容区域
         Row(
             modifier = Modifier
                 .weight(1f)
-                .padding(start = 12.dp)
+                .padding(start = 8.dp)
                 .noRippleClickable {
                     onPostClick()
                 }
         ) {
+            // 主要信息列
             Column(
                 modifier = Modifier.weight(1f)
             ) {
                 Text(
                     text = commentItem.name,
-                    fontSize = 18.sp,
+                    fontSize = 14.sp,
-                    modifier = Modifier,
                     color = AppColors.text,
                     maxLines = 1,
                     overflow = TextOverflow.Ellipsis
                 )
                 Spacer(modifier = Modifier.height(4.dp))
+                // 评论内容行
                 Row {
                     var text = commentItem.comment
                     if (commentItem.parentCommentId != null) {
                         text = "Reply you: $text"
                     }
                     Text(
-                        text = text,
+                        text = "$commentPrefix $text",
                         fontSize = 14.sp,
                         maxLines = 1,
                         color = AppColors.secondaryText,
@@ -245,25 +252,20 @@ fun CommentNoticeItem(
                         color = AppColors.secondaryText,
                     )
                 }
-
             }
-            Spacer(modifier = Modifier.width(24.dp))
+            Spacer(modifier = Modifier.width(4.dp))
+            // 右侧帖子图片
             commentItem.post?.let {
                 Box {
-                    Box(
+                    CustomAsyncImage(
-                        modifier = Modifier.padding(4.dp)
+                        context = context,
-                    ) {
+                        imageUrl = it.images[0].thumbnail,
-                        CustomAsyncImage(
+                        contentDescription = "Post Image",
-                            context = context,
+                        modifier = Modifier
-                            imageUrl = it.images[0].thumbnail,
+                            .size(40.dp)
-                            contentDescription = "Post Image",
+                            .clip(RoundedCornerShape(8.dp))
-                            modifier = Modifier
+                    )
-                                .size(48.dp).clip(RoundedCornerShape(8.dp))
+                    // 未读指示器
-                        )
-                        // unread indicator
-
-                    }
-
                     if (commentItem.unread) {
                         Box(
                             modifier = Modifier
@@ -273,11 +275,7 @@ fun CommentNoticeItem(
                         )
                     }
                 }
-
-
             }
         }
-
-
     }
 }

app/src/main/java/com/aiosman/ravenow/ui/follower/FollowerNotice.kt

@@ -141,42 +141,57 @@ fun FollowItem(
     val AppColors = LocalAppTheme.current
     val context = LocalContext.current
     val navController = LocalNavController.current
-    Box(
+    val followText = stringResource(R.string.followed_you)
+
+    Row(
         modifier = Modifier
-            .padding(vertical = 16.dp)
+            .fillMaxWidth()
-            .noRippleClickable {
+            .padding(vertical = 12.dp),
-                navController.navigate(
+        verticalAlignment = Alignment.CenterVertically
-                    NavigationRoute.AccountProfile.route.replace(
-                        "{id}",
-                        userId.toString()
-                    )
-                )
-            }
     ) {
+        // 左侧头像区域
+        CustomAsyncImage(
+            context = context,
+            imageUrl = avatar,
+            contentDescription = nickname,
+            modifier = Modifier
+                .size(40.dp)
+                .clip(CircleShape)
+                .noRippleClickable {
+                    navController.navigate(
+                        NavigationRoute.AccountProfile.route.replace(
+                            "{id}",
+                            userId.toString()
+                        )
+                    )
+                }
+        )
+        // 右侧内容区域
         Row(
-            modifier = Modifier.fillMaxWidth(),
+            modifier = Modifier
-            verticalAlignment = Alignment.CenterVertically,
+                .weight(1f)
+                .padding(start = 8.dp),
+            verticalAlignment = Alignment.CenterVertically
         ) {
-            CustomAsyncImage(
-                context = context,
-                imageUrl = avatar,
-                contentDescription = nickname,
-                modifier = Modifier
-                    .size(40.dp)
-                    .clip(CircleShape)
-            )
-            Spacer(modifier = Modifier.width(12.dp))
             Column(
                 modifier = Modifier.weight(1f)
             ) {
                 Text(
                     text = nickname,
                     fontWeight = FontWeight.Bold,
-                    fontSize = 16.sp,
+                    fontSize = 14.sp,
                     color = AppColors.text,
                     maxLines = 1,
                     overflow = TextOverflow.Ellipsis
                 )
+                Spacer(modifier = Modifier.height(4.dp))
+                Text(
+                    text = followText,
+                    fontSize = 14.sp,
+                    color = AppColors.secondaryText,
+                    maxLines = 1,
+                    overflow = TextOverflow.Ellipsis
+                )
             }
             if (!isFollowing && userId != AppState.UserId) {
                 FollowButton(

app/src/main/java/com/aiosman/ravenow/ui/group/GroupChatInfoScreen.kt

@@ -2,6 +2,7 @@ package com.aiosman.ravenow.ui.group
 
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
+import androidx.compose.foundation.border
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
@@ -302,8 +303,9 @@ fun GroupChatInfoScreen(groupId: String) {
                 Column(
                     modifier = Modifier
                         .fillMaxWidth()
+                        .border(1.dp, AppColors.decentBackground, RoundedCornerShape(12.dp))
                         .clip(RoundedCornerShape(12.dp))
-                        .background(AppColors.decentBackground.copy(alpha = 0.28f))
+                        .background(AppColors.background)
                         .padding(12.dp)
                 ) {
                     Row(verticalAlignment = Alignment.CenterVertically) {
@@ -340,7 +342,7 @@ fun GroupChatInfoScreen(groupId: String) {
                             modifier = Modifier
                                 .weight(1f)
                                 .clip(RoundedCornerShape(20.dp))
-                                .background(AppColors.background)
+                                .background(AppColors.decentBackground)
                                 .padding(vertical = 8.dp)
                                 .noRippleClickable {
                                     showAddMemoryDialog = true
@@ -359,7 +361,7 @@ fun GroupChatInfoScreen(groupId: String) {
                             modifier = Modifier
                                 .weight(1f)
                                 .clip(RoundedCornerShape(20.dp))
-                                .background(AppColors.background)
+                                .background(AppColors.decentBackground)
                                 .padding(vertical = 8.dp)
                                 .noRippleClickable {
                                     showMemoryManageDialog = true

app/src/main/java/com/aiosman/ravenow/ui/like/LikePage.kt

@@ -155,64 +155,83 @@ fun ActionPostNoticeItem(
     val navController = LocalNavController.current
     val AppColors = LocalAppTheme.current
 
-    Box(
+    val actionLabel = when (action) {
-        modifier = Modifier.padding(vertical = 16.dp)
+        "favourite" -> stringResource(R.string.favourite_your_post)
+        else -> stringResource(R.string.like_your_post)
+    }
+
+    Row(
+        modifier = Modifier
+            .fillMaxWidth()
+            .padding(vertical = 12.dp, horizontal = 0.dp),
+        verticalAlignment = Alignment.CenterVertically
     ) {
+        CustomAsyncImage(
+            context = context,
+            imageUrl = avatar,
+            modifier = Modifier
+                .size(40.dp)
+                .clip(CircleShape)
+                .noRippleClickable {
+                    navController.navigate(
+                        NavigationRoute.AccountProfile.route.replace(
+                            "{id}",
+                            userId.toString()
+                        )
+                    )
+                },
+            contentDescription = action,
+        )
         Row(
-            modifier = Modifier.fillMaxWidth(),
+            modifier = Modifier
-            verticalAlignment = Alignment.Top,
+                .weight(1f)
+                .padding(start = 8.dp)
+                .noRippleClickable {
+                    navController.navigateToPost(
+                        id = postId,
+                        highlightCommentId = 0,
+                        initImagePagerIndex = 0
+                    )
+                },
+            verticalAlignment = Alignment.CenterVertically
         ) {
-            CustomAsyncImage(
-                context,
-                imageUrl = avatar,
-                modifier = Modifier
-                    .size(48.dp)
-                    .clip(CircleShape)
-                    .noRippleClickable {
-                        navController.navigate(
-                            NavigationRoute.AccountProfile.route.replace(
-                                "{id}",
-                                userId.toString()
-                            )
-                        )
-                    },
-                contentDescription = action,
-            )
-            Spacer(modifier = Modifier.width(12.dp))
             Column(
-                modifier = Modifier
+                modifier = Modifier.weight(1f)
-                    .weight(1f)
-                    .noRippleClickable {
-                        navController.navigateToPost(
-                            id = postId,
-                            highlightCommentId = 0,
-                            initImagePagerIndex = 0
-                        )
-                    }
             ) {
                 Text(
                     text = nickName,
                     fontWeight = FontWeight.Bold,
-                    fontSize = 16.sp,
+                    fontSize = 14.sp,
                     color = AppColors.text,
                     maxLines = 1,
                     overflow = TextOverflow.Ellipsis
                 )
-                Spacer(modifier = Modifier.height(2.dp))
+                Spacer(modifier = Modifier.height(4.dp))
-                when (action) {
+                Row(
-                    "like" -> Text(stringResource(R.string.like_your_post), color = AppColors.text)
+                    verticalAlignment = Alignment.CenterVertically
-                    "favourite" -> Text(stringResource(R.string.favourite_your_post), color = AppColors.text)
+                ) {
-                }
+                    Text(
-                Spacer(modifier = Modifier.height(2.dp))
+                        text = actionLabel,
-                Row {
+                        fontSize = 14.sp,
-                    Text(likeTime.timeAgo(context), fontSize = 12.sp, color = AppColors.secondaryText)
+                        color = AppColors.secondaryText,
+                        modifier = Modifier.weight(1f),
+                        maxLines = 1,
+                        overflow = TextOverflow.Ellipsis
+                    )
+                    Spacer(modifier = Modifier.width(4.dp))
+                    Text(
+                        text = likeTime.timeAgo(context),
+                        fontSize = 14.sp,
+                        color = AppColors.secondaryText
+                    )
                 }
             }
+            Spacer(modifier = Modifier.width(4.dp))
             CustomAsyncImage(
-                context,
+                context = context,
                 imageUrl = thumbnail,
                 modifier = Modifier
-                    .size(48.dp)
+                    .size(40.dp)
                     .clip(RoundedCornerShape(8.dp)),
                 contentDescription = action,
             )
@@ -227,10 +246,11 @@ fun LikeCommentNoticeItem(
     val navController = LocalNavController.current
     val context = LocalContext.current
     val AppColors = LocalAppTheme.current
+    val previewPost = item.comment?.replyComment?.post ?: item.comment?.post
 
-    Box(
+    Column(
         modifier = Modifier
-            .padding(vertical = 16.dp)
+            .padding(vertical = 12.dp)
             .noRippleClickable {
                 item.comment?.postId.let {
                     navController.navigateToPost(
@@ -241,112 +261,103 @@ fun LikeCommentNoticeItem(
                 }
             }
     ) {
-        Row {
+        Row(
-            Column(
+            verticalAlignment = Alignment.CenterVertically
-                modifier = Modifier.weight(1f)
+        ) {
+            CustomAsyncImage(
+                imageUrl = item.user.avatar,
+                modifier = Modifier
+                    .size(40.dp)
+                    .clip(CircleShape),
+                contentDescription = stringResource(R.string.like_your_comment)
+            )
+            Row(
+                modifier = Modifier
+                    .weight(1f)
+                    .padding(start = 8.dp),
+                verticalAlignment = Alignment.CenterVertically
             ) {
-                Row(
+                Column(
-                    modifier = Modifier.fillMaxWidth(),
+                    modifier = Modifier.weight(1f)
-                    verticalAlignment = Alignment.Top,
                 ) {
-                    CustomAsyncImage(
+                    Text(
-                        imageUrl = item.user.avatar,
+                        text = item.user.nickName,
-                        modifier = Modifier
+                        fontWeight = FontWeight.Bold,
-                            .size(48.dp)
+                        fontSize = 14.sp,
-                            .clip(CircleShape),
+                        color = AppColors.text,
-                        contentDescription = stringResource(R.string.like_your_comment)
+                        maxLines = 1,
+                        overflow = TextOverflow.Ellipsis
                     )
-                    Spacer(modifier = Modifier.width(12.dp))
+                    Spacer(modifier = Modifier.height(4.dp))
-                    Column(
+                    Row(
-                        modifier = Modifier
+                        verticalAlignment = Alignment.CenterVertically
-                            .weight(1f)
                     ) {
                         Text(
-                            text = item.user.nickName,
+                            text = stringResource(R.string.like_your_comment),
-                            fontWeight = FontWeight.Bold,
+                            fontSize = 14.sp,
-                            fontSize = 16.sp,
+                            color = AppColors.secondaryText,
-                            color = AppColors.text,
+                            modifier = Modifier.weight(1f),
                             maxLines = 1,
                             overflow = TextOverflow.Ellipsis
                         )
-                        Spacer(modifier = Modifier.height(2.dp))
+                        Spacer(modifier = Modifier.width(4.dp))
-                        Text(stringResource(R.string.like_your_comment), color = AppColors.text)
-                        Spacer(modifier = Modifier.height(2.dp))
-                        Row {
-                            Text(
-                                item.likeTime.timeAgo(context),
-                                fontSize = 12.sp,
-                                color = AppColors.secondaryText
-                            )
-                        }
-                    }
-                }
-                Spacer(modifier = Modifier.height(12.dp))
-                Row(
-                    modifier = Modifier.padding(start = 48.dp)
-                ) {
-                    Box(
-                        modifier = Modifier
-                            .size(24.dp)
-                            .background(Color.Gray.copy(alpha = 0.1f))
-                    ) {
-                        CustomAsyncImage(
-                            context = context,
-                            imageUrl = AppState.profile?.avatar ?: "",
-                            contentDescription = "Comment Profile Picture",
-                            modifier = Modifier
-                                .size(24.dp)
-                                .clip(RoundedCornerShape(24.dp)),
-                            contentScale = ContentScale.Crop
-                        )
-                    }
-                    Spacer(modifier = Modifier.width(8.dp))
-                    Column(
-                        modifier = Modifier.weight(1f)
-                    ) {
                         Text(
-                            text = AppState.profile?.nickName ?: "",
+                            text = item.likeTime.timeAgo(context),
-                            fontWeight = FontWeight.W600,
                             fontSize = 14.sp,
-                            color = AppColors.text
+                            color = AppColors.secondaryText
-                        )
-                        Text(
-                            text = item.comment?.content ?: "",
-                            fontSize = 12.sp,
-                            color = AppColors.secondaryText,
-                            maxLines = 2
                         )
                     }
                 }
-            }
+                Spacer(modifier = Modifier.width(4.dp))
-            Spacer(modifier = Modifier.width(16.dp))
+                previewPost?.let {
-            if (item.comment?.replyComment?.post != null) {
-                item.comment.replyComment.post.let {
                     CustomAsyncImage(
                         context = context,
                         imageUrl = it.images[0].thumbnail,
                         contentDescription = "Post Thumbnail",
                         modifier = Modifier
-                            .size(48.dp)
+                            .size(40.dp)
-                            .clip(RoundedCornerShape(8.dp)),
-                        contentScale = ContentScale.Crop
-                    )
-                }
-            } else {
-                item.comment?.post?.let {
-                    CustomAsyncImage(
-                        context = context,
-                        imageUrl = it.images[0].thumbnail,
-                        contentDescription = "Post Thumbnail",
-                        modifier = Modifier
-                            .size(48.dp)
                             .clip(RoundedCornerShape(8.dp)),
                         contentScale = ContentScale.Crop
                     )
                 }
             }
-
+        }
-
+        Spacer(modifier = Modifier.height(8.dp))
+        Row(
+            modifier = Modifier.padding(start = 48.dp)
+        ) {
+            Box(
+                modifier = Modifier
+                    .size(24.dp)
+                    .background(Color.Gray.copy(alpha = 0.1f))
+            ) {
+                CustomAsyncImage(
+                    context = context,
+                    imageUrl = AppState.profile?.avatar ?: "",
+                    contentDescription = "Comment Profile Picture",
+                    modifier = Modifier
+                        .size(24.dp)
+                        .clip(RoundedCornerShape(24.dp)),
+                    contentScale = ContentScale.Crop
+                )
+            }
+            Spacer(modifier = Modifier.width(8.dp))
+            Column(
+                modifier = Modifier.weight(1f)
+            ) {
+                Text(
+                    text = AppState.profile?.nickName ?: "",
+                    fontWeight = FontWeight.W600,
+                    fontSize = 14.sp,
+                    color = AppColors.text
+                )
+                Text(
+                    text = item.comment?.content ?: "",
+                    fontSize = 12.sp,
+                    color = AppColors.secondaryText,
+                    maxLines = 2
+                )
+            }
         }
     }
 }

app/src/main/java/com/aiosman/ravenow/ui/notification/Notification.kt

@@ -107,7 +107,7 @@ fun NotificationScreen() {
             TabSpacer()
 
             TabItem(
-                text = stringResource(R.string.followers_upper),
+                text = stringResource(R.string.follow_upper),
                 isSelected = pagerState.currentPage == 1,
                 onClick = {
                     scope.launch {

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

@@ -76,6 +76,8 @@
     <string name="nickname">名前</string>
     <string name="comment">コメント</string>
     <string name="order_comment_default">すべて</string>
+    <string name="comment_notice">コメント:</string>
+    <string name="order_comment_default">デフォルト</string>
     <string name="order_comment_latest">最新</string>
     <string name="order_comment_hot">人気</string>
     <string name="download">ダウンロード</string>
@@ -102,6 +104,7 @@
     <string name="private_policy_keyword">Rave Nowのプライバシーポリシー</string>
     <string name="gallery">ギャラリー</string>
     <string name="chat_upper">チャット</string>
+    <string name="followed_you">フォローしました</string>
     <string name="like_your_post">あなたの投稿にいいねしました</string>
     <string name="favourite_your_post">あなたの投稿をお気に入りにしました</string>
     <string name="like_your_comment">あなたのコメントにいいねしました</string>

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

@@ -81,6 +81,8 @@
     <string name="nickname">昵称</string>
     <string name="comment">评论</string>
     <string name="order_comment_default">全部</string>
+    <string name="comment_notice">评论:</string>
+    <string name="order_comment_default">默认</string>
     <string name="order_comment_latest">最新</string>
     <string name="order_comment_hot">热门</string>
     <string name="download">下载</string>
@@ -107,6 +109,7 @@
     <string name="private_policy_keyword">用户协议</string>
     <string name="gallery">图片</string>
     <string name="chat_upper">私信</string>
+    <string name="followed_you">关注了你</string>
     <string name="like_your_post">喜欢了你的动态</string>
     <string name="favourite_your_post">收藏了你的动态</string>
     <string name="like_your_comment">喜欢了你的评论</string>

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

@@ -75,6 +75,8 @@
     <string name="nickname">Name</string>
     <string name="comment">COMMENTS</string>
     <string name="order_comment_default">All</string>
+    <string name="comment_notice">commented:</string>
+    <string name="order_comment_default">Default</string>
     <string name="order_comment_latest">Latest</string>
     <string name="order_comment_hot">Hot</string>
     <string name="download">Download</string>
@@ -101,6 +103,7 @@
     <string name="private_policy_keyword">Rave Now’s Privacy Policy</string>
     <string name="gallery">Gallery</string>
     <string name="chat_upper">CHAT</string>
+    <string name="followed_you">followed you</string>
     <string name="like_your_post">Like your post</string>
     <string name="favourite_your_post">Favourite your post</string>
     <string name="like_your_comment">Like your comment</string>