首页UI调整

2025-08-29 18:39:59 +08:00
parent 7c0d35ec8c
commit a79628026c
5 changed files with 106 additions and 47 deletions
--- a/app/src/main/java/com/aiosman/ravenow/ui/index/tabs/message/tab/GroupChatListScreen.kt
+++ b/app/src/main/java/com/aiosman/ravenow/ui/index/tabs/message/tab/GroupChatListScreen.kt
@@ -1,5 +1,6 @@
 package com.aiosman.ravenow.ui.index.tabs.message.tab

+import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.lazy.LazyColumn
@@ -19,6 +20,7 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextOverflow
@@ -66,17 +68,24 @@ fun GroupChatListScreen() {
                        .fillMaxSize()
                        .padding(16.dp),
                    horizontalAlignment = Alignment.CenterHorizontally,
-                    verticalArrangement = Arrangement.Center
                ) {
+                    Spacer(modifier = Modifier.height(80.dp))
+                    Image(
+                        painter = painterResource(id = R.mipmap.icon_friend_chat_empty),
+                        contentDescription = "null data",
+                        modifier = Modifier
+                            .size(140.dp)
+                    )
+                    Spacer(modifier = Modifier.height(24.dp))
                    Text(
-                        text = "暂无群聊",
+                        text = stringResource(R.string.group_chat_empty),
                        color = AppColors.text,
                        fontSize = 16.sp,
                        fontWeight = FontWeight.W600
                    )
                    Spacer(modifier = Modifier.height(8.dp))
                    Text(
-                        text = "您还没有加入任何群聊",
+                        text = stringResource(R.string.group_chat_empty_join),
                        color = AppColors.secondaryText,
                        fontSize = 14.sp
                    )
--- a/app/src/main/java/com/aiosman/ravenow/ui/index/tabs/moment/Moment.kt
+++ b/app/src/main/java/com/aiosman/ravenow/ui/index/tabs/moment/Moment.kt
@@ -141,6 +141,7 @@ fun MomentsList() {
                )

            }
+            //关注tab
            Spacer(modifier = Modifier.width(16.dp))
            Column(
                modifier = Modifier
--- a/app/src/main/java/com/aiosman/ravenow/ui/index/tabs/moment/tabs/timeline/Moment.kt
+++ b/app/src/main/java/com/aiosman/ravenow/ui/index/tabs/moment/tabs/timeline/Moment.kt
@@ -1,14 +1,21 @@
 package com.aiosman.ravenow.ui.index.tabs.moment.tabs.timeline

+import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.material.ExperimentalMaterialApi
 import androidx.compose.material.pullrefresh.PullRefreshIndicator
 import androidx.compose.material.pullrefresh.pullRefresh
 import androidx.compose.material.pullrefresh.rememberPullRefreshState
+import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.derivedStateOf
@@ -17,7 +24,13 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
 import androidx.paging.compose.collectAsLazyPagingItems
+import com.aiosman.ravenow.R
 import com.aiosman.ravenow.ui.composables.MomentCard
 import kotlinx.coroutines.launch

@@ -52,54 +65,88 @@ fun TimelineMomentsList() {
            model.loadMore()
        }
    }
-    Column(
-        modifier = Modifier
-            .fillMaxSize()
-    ) {
-        Box(Modifier.pullRefresh(state)) {
-            LazyColumn(
-                modifier = Modifier.fillMaxSize(),
-                state = listState
+    if (moments.isEmpty()) {
+        Box(
+            modifier = Modifier
+                .fillMaxSize()
+                .padding(top = 188.dp),
+            contentAlignment = Alignment.TopCenter
+        ) {
+            Column(
+                horizontalAlignment = Alignment.CenterHorizontally,
+                modifier = Modifier.fillMaxWidth()
            ) {
-                items(
-                    moments.size,
-                    key = { idx -> moments.getOrNull(idx)?.id ?: idx }
-                ) { idx ->
-                    moments.getOrNull(idx)?.let { momentItem ->
-                        MomentCard(
-                            momentEntity = momentItem,
-                            onAddComment = {
-                                scope.launch {
-                                    model.onAddComment(momentItem.id)
-                                }
-                            },
-                            onLikeClick = {
-                                scope.launch {
-                                    if (momentItem.liked) {
-                                        model.dislikeMoment(momentItem.id)
-                                    } else {
-                                        model.likeMoment(momentItem.id)
+                Image(
+                    painter = painterResource(id = R.mipmap.rider_pro_following_empty),
+                    contentDescription = null,
+                    modifier = Modifier.size(140.dp)
+                )
+                Spacer(modifier = Modifier.size(24.dp))
+                Text(
+                    text = "You haven't followed anyone yet",
+                    color = androidx.compose.material.MaterialTheme.colors.onBackground,
+                    fontSize = 16.sp,
+                    fontWeight = FontWeight.W600
+                )
+                Spacer(modifier = Modifier.size(8.dp))
+                Text(
+                    text = "Click start your social journey.",
+                    color = androidx.compose.material.MaterialTheme.colors.onBackground,
+                    fontSize = 16.sp,
+                    fontWeight = FontWeight.W400
+                )
+            }
+        }
+    } else {
+        Column(
+            modifier = Modifier
+                .fillMaxSize()
+        ) {
+            Box(Modifier.pullRefresh(state)) {
+                LazyColumn(
+                    modifier = Modifier.fillMaxSize(),
+                    state = listState
+                ) {
+                    items(
+                        moments.size,
+                        key = { idx -> moments.getOrNull(idx)?.id ?: idx }
+                    ) { idx ->
+                        moments.getOrNull(idx)?.let { momentItem ->
+                            MomentCard(
+                                momentEntity = momentItem,
+                                onAddComment = {
+                                    scope.launch {
+                                        model.onAddComment(momentItem.id)
                                    }
-                                }
-                            },
-                            onFavoriteClick = {
-                                scope.launch {
-                                    if (momentItem.isFavorite) {
-                                        model.unfavoriteMoment(momentItem.id)
-                                    } else {
-                                        model.favoriteMoment(momentItem.id)
+                                },
+                                onLikeClick = {
+                                    scope.launch {
+                                        if (momentItem.liked) {
+                                            model.dislikeMoment(momentItem.id)
+                                        } else {
+                                            model.likeMoment(momentItem.id)
+                                        }
                                    }
-                                }
-                            },
-                            onFollowClick = {
-                                model.followAction(momentItem)
-                            },
-                            showFollowButton = false
-                        )
+                                },
+                                onFavoriteClick = {
+                                    scope.launch {
+                                        if (momentItem.isFavorite) {
+                                            model.unfavoriteMoment(momentItem.id)
+                                        } else {
+                                            model.favoriteMoment(momentItem.id)
+                                        }
+                                    }
+                                },
+                                onFollowClick = {
+                                    model.followAction(momentItem)
+                                },
+                                showFollowButton = false
+                            )
+                        }
                    }
                }
+                PullRefreshIndicator(model.refreshing, state, Modifier.align(Alignment.TopCenter))
            }
-            PullRefreshIndicator(model.refreshing, state, Modifier.align(Alignment.TopCenter))
        }
    }
 }
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -158,10 +158,10 @@
    <string name="agent_chat_load_failed">加载失败</string>
    <string name="agent_chat_load_more_failed">加载更多失败</string>
    <string name="agent_chat_user_info_failed">获取用户信息失败: %s</string>
-
+    <string name="group_chat_empty">暂无群聊</string>
    <string name="group_chat_empty_title">没有群聊消息的宇宙太安静了</string>
    <string name="group_chat_empty_subtitle">在首页探索感兴趣的主题房间</string>
-
+    <string name="group_chat_empty_join">您还没有加入任何群聊</string>
    <string name="friend_chat_empty_title">暂无朋友聊天</string>
    <string name="friend_chat_empty_subtitle">开始与朋友对话吧</string>
    <string name="friend_chat_me_prefix">我: </string>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -155,6 +155,8 @@
    <string name="agent_chat_load_failed">加载失败</string>
    <string name="agent_chat_load_more_failed">加载更多失败</string>
    <string name="agent_chat_user_info_failed">获取用户信息失败: %s</string>
+    <string name="group_chat_empty">No group chats</string>
+    <string name="group_chat_empty_join">You have not joined any group chats yet</string>
    <string name="group_chat_empty_title">没有群聊消息的宇宙太安静了</string>
    <string name="group_chat_empty_subtitle">在首页探索感兴趣的主题房间</string>
    <string name="friend_chat_empty_title">暂无朋友聊天</string>