粉丝 关注 评论UI调整

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

@@ -76,6 +76,7 @@ fun NoticeScreenHeader(
         modifier = Modifier.fillMaxWidth(),
         verticalAlignment = Alignment.CenterVertically,
     ) {
+        //返回tab
         Image(
             painter = painterResource(id = R.drawable.rider_pro_back_icon,),
             contentDescription = title,
@@ -88,6 +89,7 @@ fun NoticeScreenHeader(
             colorFilter = ColorFilter.tint(AppColors.text)
         )
         Spacer(modifier = Modifier.size(12.dp))
+        Spacer(modifier = Modifier.width(110.dp))
         Text(title, fontWeight = FontWeight.W800, fontSize = 17.sp, color = AppColors.text)
         if (moreIcon) {
             Spacer(modifier = Modifier.weight(1f))

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

@@ -22,7 +22,9 @@ 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
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
@@ -75,7 +77,39 @@ fun CommentNoticeScreen() {
         ) {
             NoticeScreenHeader(stringResource(R.string.comment), moreIcon = false)
         }
-
+        if (comments.itemCount == 0 && comments.loadState.refresh is LoadState.NotLoading) {
+            Box(
+                modifier = Modifier
+                    .fillMaxSize()
+                    .padding(top = 188.dp),
+                contentAlignment = Alignment.TopCenter
+            ) {
+                Column(
+                    horizontalAlignment = Alignment.CenterHorizontally,
+                    modifier = Modifier.fillMaxWidth()
+                ) {
+                    androidx.compose.foundation.Image(
+                        painter = painterResource(id = R.mipmap.rider_pro_followers_empty),
+                        contentDescription = null,
+                        modifier = Modifier.size(140.dp)
+                    )
+                    Spacer(modifier = Modifier.size(24.dp))
+                    Text(
+                        text = "Wait for the first traveler to appear~",
+                        color = AppColors.text,
+                        fontSize = 16.sp,
+                        fontWeight = FontWeight.W600
+                    )
+                    Spacer(modifier = Modifier.size(8.dp))
+                    Text(
+                        text = "Post to connect.",
+                        color = AppColors.text,
+                        fontSize = 16.sp,
+                        fontWeight = FontWeight.W400
+                    )
+                }
+            }
+        } else {
             LazyColumn(
                 modifier = Modifier
                     .fillMaxSize().padding(horizontal = 16.dp)
@@ -141,7 +175,7 @@ fun CommentNoticeScreen() {
                 }
             }
         }
-
+    }
 }
 
 @Composable

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

@@ -1,10 +1,14 @@
 package com.aiosman.ravenow.ui.follower
 
+import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 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.padding
+import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.material.ExperimentalMaterialApi
 import androidx.compose.material.pullrefresh.PullRefreshIndicator
@@ -15,8 +19,11 @@ import androidx.compose.runtime.LaunchedEffect
 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.lifecycle.viewmodel.compose.viewModel
 import androidx.paging.compose.collectAsLazyPagingItems
 import com.aiosman.ravenow.AppState
@@ -55,6 +62,39 @@ fun FollowerListScreen(userId: Int) {
         ) {
             NoticeScreenHeader(stringResource(R.string.followers_upper), moreIcon = false)
         }
+        if (users.itemCount == 0) {
+            Box(
+                modifier = Modifier
+                    .fillMaxSize()
+                    .padding(top = 188.dp),
+                contentAlignment = Alignment.TopCenter
+            ) {
+                Column(
+                    horizontalAlignment = Alignment.CenterHorizontally,
+                    modifier = Modifier.fillMaxWidth()
+                ) {
+                    Image(
+                        painter = painterResource(id = R.mipmap.rider_pro_followers_empty),
+                        contentDescription = null,
+                        modifier = Modifier.size(140.dp)
+                    )
+                    Spacer(modifier = Modifier.size(24.dp))
+                    androidx.compose.material.Text(
+                        text = "No one's paying attention to you yet",
+                        color = appColors.text,
+                        fontSize = 16.sp,
+                        fontWeight = FontWeight.W600
+                    )
+                    Spacer(modifier = Modifier.size(8.dp))
+                    androidx.compose.material.Text(
+                        text = "Your vibe attracts your tribe.",
+                        color = appColors.text,
+                        fontSize = 16.sp,
+                        fontWeight = FontWeight.W400
+                    )
+                }
+            }
+        } else {
             Box(
                 modifier = Modifier
                     .fillMaxWidth()
@@ -91,3 +131,4 @@ fun FollowerListScreen(userId: Int) {
             }
         }
     }
+}

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

@@ -7,6 +7,7 @@ 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
@@ -61,12 +62,14 @@ fun FollowingListScreen(userId: Int) {
                 .padding(vertical = 16.dp)
         ) {
             NoticeScreenHeader(stringResource(R.string.following_upper), moreIcon = false)
+
         }
         if(users.itemCount == 0) {
             Box(
                 modifier = Modifier
-                    .fillMaxSize(),
+                    .fillMaxSize()
-                contentAlignment = Alignment.Center
+                    .padding(top=188.dp),
+                contentAlignment = Alignment.TopCenter
             ) {
                 Column(
                     horizontalAlignment = Alignment.CenterHorizontally,
@@ -77,14 +80,14 @@ fun FollowingListScreen(userId: Int) {
                         contentDescription = null,
                         modifier = Modifier.size(140.dp)
                     )
-                    Spacer(modifier = Modifier.size(32.dp))
+                    Spacer(modifier = Modifier.size(24.dp))
                     androidx.compose.material.Text(
                         text = "You haven't followed anyone yet",
                         color = appColors.text,
                         fontSize = 16.sp,
                         fontWeight = FontWeight.W600
                     )
-                    Spacer(modifier = Modifier.size(16.dp))
+                    Spacer(modifier = Modifier.size(8.dp))
                     androidx.compose.material.Text(
                         text = "Click start your social journey.",
                         color = appColors.text,
@@ -129,6 +132,5 @@ fun FollowingListScreen(userId: Int) {
                 )
             }
         }
-
     }
 }

app/src/main/java/com/aiosman/ravenow/ui/index/tabs/moment/tabs/expolre/Explore.kt

@@ -48,6 +48,7 @@ import androidx.compose.ui.unit.sp
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.draw.blur
+import androidx.compose.ui.graphics.graphicsLayer
 import com.aiosman.ravenow.ui.composables.CustomAsyncImage
 import androidx.lifecycle.viewmodel.compose.viewModel
 import com.aiosman.ravenow.AppStore
@@ -232,9 +233,9 @@ fun Explore() {
     }
 
     @Composable
-    fun AgentPage(agentItems: List<AgentItem>, page: Int) {
+    fun AgentPage(agentItems: List<AgentItem>, page: Int, modifier: Modifier = Modifier) {
         Column(
-            modifier = Modifier
+            modifier = modifier
                 .fillMaxSize()
                 .padding(horizontal = 0.dp)
         ) {
@@ -268,7 +269,9 @@ fun Explore() {
                 ) {
                     HorizontalPager(
                         state = pagerState,
-                        modifier = Modifier.fillMaxSize()
+                        modifier = Modifier.fillMaxSize(),
+                        contentPadding = androidx.compose.foundation.layout.PaddingValues(horizontal = 4.dp),
+                        pageSpacing = 0.dp
                     ) { page ->
                         // 计算当前页面的偏移量
                         val pageOffset = (
@@ -281,7 +284,12 @@ fun Explore() {
 
                         AgentPage(
                             agentItems = agentItems.drop(page * itemsPerPage).take(itemsPerPage),
-                            page = page
+                            page = page,
+                            modifier = Modifier
+                                .graphicsLayer {
+                                    scaleX = scale
+                                    scaleY = scale
+                                }
                         )
                     }
                 }
@@ -419,12 +427,12 @@ fun Explore() {
 
 
     @Composable
-    fun BannerCard(bannerItem: BannerItem) {
+    fun BannerCard(bannerItem: BannerItem, modifier: Modifier = Modifier) {
         val AppColors = LocalAppTheme.current
         val context = LocalContext.current
 
         Card(
-            modifier = Modifier
+            modifier = modifier
                 .fillMaxSize()
                 .padding(horizontal = 0.dp),
             shape = RoundedCornerShape(20.dp),
@@ -604,15 +612,15 @@ fun Explore() {
         ) {
 
 
-            // 可以添加更多不同高度的内容项
+            // 第一块区域
             item {
                 Row(
                     modifier = Modifier
                         .fillMaxWidth()
                         .padding(vertical = 6.dp),
-                    horizontalArrangement = androidx.compose.foundation.layout.Arrangement.SpaceEvenly
+                    horizontalArrangement = androidx.compose.foundation.layout.Arrangement.SpaceBetween
                 ) {
-                    // 第一个
+                    // 第一个 - 靠左显示
                     Column(
                         modifier = Modifier
                             .clickable {
@@ -642,6 +650,11 @@ fun Explore() {
                         )
                     }
 
+                    // 中间两个 - 平均分布
+                    Row(
+                        modifier = Modifier.weight(1f),
+                        horizontalArrangement = androidx.compose.foundation.layout.Arrangement.SpaceEvenly
+                    ) {
                         // 第二个
                         Column(
                             modifier = Modifier
@@ -662,19 +675,7 @@ fun Explore() {
                                     contentDescription = "创建智能体",
                                     modifier = Modifier.size(24.dp),
 
-<<<<<<< HEAD
                                     )
-=======
-                                    )
-                            }
-                            Spacer(modifier = Modifier.size(8.dp))
-                            Text(
-                                text = "发布动态",
-                                fontSize = 12.sp,
-                                color = AppColors.text,
-                                fontWeight = androidx.compose.ui.text.font.FontWeight.W500
-                            )
->>>>>>> upstream/main
                             }
                             Spacer(modifier = Modifier.size(8.dp))
                             Text(
@@ -715,8 +716,9 @@ fun Explore() {
                                 fontWeight = androidx.compose.ui.text.font.FontWeight.W500
                             )
                         }
+                    }
 
-                    // 第四个
+                    // 第四个 - 靠右显示
                     Column(
                         horizontalAlignment = Alignment.CenterHorizontally
                     ) {
@@ -788,12 +790,6 @@ fun Explore() {
         ) {
             HorizontalPager(
                 state = pagerState,
-<<<<<<< HEAD
-                            modifier = Modifier.fillMaxSize()
-                        ) { page ->
-                            val bannerItem = bannerItems[page]
-                            BannerCard(bannerItem = bannerItem)
-=======
                 modifier = Modifier.fillMaxSize(),
                 contentPadding = androidx.compose.foundation.layout.PaddingValues(horizontal = 4.dp),
             ) { page ->
@@ -816,7 +812,6 @@ fun Explore() {
                             scaleY = scale
                         }
                 )
->>>>>>> upstream/main
             }
         }
 
@@ -853,7 +848,7 @@ fun Explore() {
                     // 标题
                     Row(
                         verticalAlignment = Alignment.CenterVertically,
-                        modifier = Modifier.padding(bottom = 30.dp)
+                        modifier = Modifier.padding(bottom = 12.dp)
                     ) {
                         Image(
                             painter = painterResource(R.mipmap.rider_pro_fire2),
@@ -894,9 +889,9 @@ fun Explore() {
                         )
                         Spacer(modifier = Modifier.width(4.dp))
                         Text(
-                            text = "推荐给你的Agent",
+                            text = "推荐给你的智能体",
-                            fontSize = 20.sp,
+                            fontSize = 16.sp,
-                            fontWeight = androidx.compose.ui.text.font.FontWeight.W900,
+                            fontWeight = androidx.compose.ui.text.font.FontWeight.W600,
                             color = AppColors.text
                         )
                     }
@@ -921,7 +916,7 @@ fun Explore() {
                         Image(
                             painter = painterResource(R.mipmap.rider_pro_hot_room),
                             contentDescription = "chat room",
-                            modifier = Modifier.size(28.dp),
+                            modifier = Modifier.size(24.dp),
                         )
                         Spacer(modifier = Modifier.width(4.dp))
                         Text(