Merge pull request #16 from Zhong202501/main

粉丝 关注 评论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()
@@ -90,4 +130,5 @@ 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/Moment.kt

@@ -79,7 +79,7 @@ fun MomentsList() {
             // center the tabs
             horizontalArrangement = Arrangement.Start,
             verticalAlignment = Alignment.CenterVertically
-        ) {
+        ) {//探索tab
             Column(
                 modifier = Modifier
                     .noRippleClickable {
@@ -108,38 +108,8 @@ fun MomentsList() {
                         .width(34.dp)
                         .height(4.dp)
                 )
-
-            }
-            Spacer(modifier = Modifier.width(16.dp))
-            Column(
-                modifier = Modifier
-                    .noRippleClickable {
-                        scope.launch {
-                            pagerState.animateScrollToPage(1)
-                        }
-                    },
-                verticalArrangement = Arrangement.Center,
-                horizontalAlignment = Alignment.CenterHorizontally
-            ) {
-                Text(
-                    text = stringResource(R.string.index_dynamic),
-                    fontSize = 16.sp,
-                    color = if (pagerState.currentPage == 1) AppColors.text else AppColors.nonActiveText,
-                    fontWeight = FontWeight.W600)
-                Spacer(modifier = Modifier.height(4.dp))
-
-                Image(
-                    painter = painterResource(
-                        if (pagerState.currentPage == 1) R.mipmap.tab_indicator_selected
-                        else R.drawable.tab_indicator_unselected
-                    ),
-                    contentDescription = "tab indicator",
-                    modifier = Modifier
-                        .width(34.dp)
-                        .height(4.dp)
-                )
-
             }
+            //“关注”tab
             Spacer(modifier = Modifier.width(16.dp))
             Column(
                 modifier = Modifier

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

@@ -746,9 +746,9 @@ fun Explore() {
                 }
             }
 
-            @OptIn(ExperimentalFoundationApi::class)
+@OptIn(ExperimentalFoundationApi::class)
-            @Composable
+@Composable
-            fun BannerSection(bannerItems: List<BannerItem>) {
+fun BannerSection(bannerItems: List<BannerItem>) {
     val AppColors = LocalAppTheme.current
     val context = LocalContext.current
     val scope = rememberCoroutineScope()
@@ -835,7 +835,7 @@ fun Explore() {
             }
         }
     }
-            }
+}
 
 
             // 第二块区域：Banner

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

@@ -112,7 +112,7 @@
     <string name="close">Close</string>
     <string name="blocked">Blocked</string>
     <string name="feedback">Feedback</string>
-    <string name="about_rave_now">About Rave Now</string>
+    <string name="about_rave_now">About Rave Now </string>
     <string name="account_and_security">Account and security</string>
     <string name="remove_account">Remove Account</string>
     <string name="remove_account_desc">Are you sure you want to remove your account? This action cannot be undone.</string>