修改背景细节

app/build.gradle.kts

@@ -84,6 +84,7 @@ dependencies {
     implementation(libs.googleid)
     implementation(libs.identity.credential)
     implementation(libs.androidx.lifecycle.process)
+    implementation(libs.rendering)
     testImplementation(libs.junit)
     androidTestImplementation(libs.androidx.junit)
     androidTestImplementation(libs.androidx.espresso.core)

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

@@ -170,7 +170,7 @@ fun ChatScreen(userId: String) {
                     verticalAlignment = Alignment.CenterVertically
                 ) {
                     Image(
-                        painter = painterResource(R.drawable.rider_pro_nav_back),
+                        painter = painterResource(R.drawable.rider_pro_back_icon),
                         modifier = Modifier
                             .size(28.dp)
                             .noRippleClickable {

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

@@ -72,7 +72,7 @@ fun NoticeScreenHeader(
         verticalAlignment = Alignment.CenterVertically,
     ) {
         Image(
-            painter = painterResource(id = R.drawable.rider_pro_nav_back),
+            painter = painterResource(id = R.drawable.rider_pro_back_icon),
             contentDescription = title,
             modifier = Modifier.size(16.dp).clickable(
                 indication = null,

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

@@ -13,6 +13,7 @@ import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.LinearProgressIndicator
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
@@ -62,7 +63,7 @@ fun CommentNoticeScreen() {
     var comments = dataFlow.collectAsLazyPagingItems()
     val navController = LocalNavController.current
     Column(
-        modifier = Modifier.fillMaxSize()
+        modifier = Modifier.fillMaxSize().background(color = Color(0xFFFFFFFF))
     ) {
         StatusBarSpacer()
         Box(
@@ -218,7 +219,7 @@ fun CommentNoticeItem(
                             imageUrl = it.images[0].thumbnail,
                             contentDescription = "Post Image",
                             modifier = Modifier
-                                .size(48.dp)
+                                .size(48.dp).clip(RoundedCornerShape(8.dp))
                         )
                         // unread indicator
 

app/src/main/java/com/aiosman/riderpro/ui/crop/ImageCropScreen.kt

@@ -94,7 +94,7 @@ fun ImageCropScreen() {
                 .padding(vertical = 8.dp, horizontal = 16.dp)
         ) {
             Image(
-                painter = painterResource(R.drawable.rider_pro_nav_back),
+                painter = painterResource(R.drawable.rider_pro_back_icon),
                 contentDescription = null,
                 modifier = Modifier.clickable {
                     navController.popBackStack()

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

@@ -1,5 +1,6 @@
 package com.aiosman.riderpro.ui.follower
 
+import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -11,16 +12,20 @@ import androidx.compose.material.pullrefresh.pullRefresh
 import androidx.compose.material.pullrefresh.rememberPullRefreshState
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.UiMode
 import androidx.compose.ui.unit.dp
 import androidx.paging.compose.collectAsLazyPagingItems
 import com.aiosman.riderpro.R
 import com.aiosman.riderpro.ui.comment.NoticeScreenHeader
 import com.aiosman.riderpro.ui.composables.StatusBarMaskLayout
+import com.google.ar.sceneform.rendering.Light
 import kotlinx.coroutines.launch
 
 @OptIn(ExperimentalMaterialApi::class)
@@ -34,16 +39,18 @@ fun FollowerListScreen(userId: Int) {
     LaunchedEffect(Unit) {
         model.loadData(userId)
     }
-
     StatusBarMaskLayout(
         modifier = Modifier
-            .padding(horizontal = 16.dp)
+            .background(color = Color(0xFFFFFFFF))
+            .padding(horizontal = 16.dp),
+        maskBoxBackgroundColor = Color(0xFFFFFFFF)
     ) {
         var dataFlow = model.usersFlow
         var users = dataFlow.collectAsLazyPagingItems()
         Box(
             modifier = Modifier
                 .fillMaxWidth()
+                .background(color = Color(0xFFFFFFFF))
                 .padding(vertical = 16.dp)
         ) {
             NoticeScreenHeader(stringResource(R.string.followers_upper), moreIcon = false)
@@ -52,10 +59,12 @@ fun FollowerListScreen(userId: Int) {
             modifier = Modifier
                 .fillMaxWidth()
                 .weight(1f)
+                .background(color = Color(0xFFFFFFFF))
                 .pullRefresh(refreshState)
         ) {
             LazyColumn(
                 modifier = Modifier.fillMaxSize()
+                    .background(color = Color(0xFFFFFFFF))
             ) {
                 items(users.itemCount) { index ->
                     users[index]?.let { user ->

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

@@ -1,6 +1,7 @@
 package com.aiosman.riderpro.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.Row
@@ -11,12 +12,14 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.rememberCoroutineScope
 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
@@ -43,7 +46,9 @@ import kotlinx.coroutines.launch
 fun FollowerNoticeScreen() {
     val scope = rememberCoroutineScope()
     StatusBarMaskLayout(
-        modifier = Modifier.padding(horizontal = 16.dp)
+        modifier = Modifier.background(color = Color(0xFFFFFFFF)).padding(horizontal = 16.dp),
+        darkIcons = true,
+        maskBoxBackgroundColor = Color(0xFFFFFFFF)
     ) {
         val model = FollowerNoticeViewModel
         var dataFlow = model.followerItemsFlow
@@ -52,6 +57,7 @@ fun FollowerNoticeScreen() {
             modifier = Modifier
                 .fillMaxWidth()
                 .padding(vertical = 16.dp)
+                .background(color = Color(0xFFFFFFFF))
         ) {
             NoticeScreenHeader(stringResource(R.string.followers_upper), moreIcon = false)
         }
@@ -61,6 +67,7 @@ fun FollowerNoticeScreen() {
         }
         LazyColumn(
             modifier = Modifier.weight(1f)
+                .background(color = Color(0xFFFFFFFF))
         ) {
             items(followers.itemCount) { index ->
                 followers[index]?.let { follower ->
@@ -92,7 +99,7 @@ fun FollowItem(
     val context = LocalContext.current
     val navController = LocalNavController.current
     Box(
-        modifier = Modifier.padding(horizontal = 24.dp, vertical = 16.dp)
+        modifier = Modifier.padding(vertical = 16.dp)
     ) {
         Row(
             modifier = Modifier.fillMaxWidth(),
@@ -104,6 +111,7 @@ fun FollowItem(
                 contentDescription = nickname,
                 modifier = Modifier
                     .size(40.dp)
+                    .clip(CircleShape)
                     .noRippleClickable {
                         navController.navigate(
                             NavigationRoute.AccountProfile.route.replace(
@@ -119,16 +127,16 @@ fun FollowItem(
             ) {
                 Text(nickname, fontWeight = FontWeight.Bold, fontSize = 16.sp)
             }
-            if (userId != AppState.UserId) {
+//            if (userId != AppState.UserId) {
-                FollowButton(
+//                FollowButton(
-                    isFollowing = isFollowing,
+//                    isFollowing = isFollowing,
-                    onFollowClick = onFollow,
+//                    onFollowClick = onFollow,
-                    fontSize = 14.sp,
+//                    fontSize = 14.sp,
-                    imageModifier = Modifier
+//                    imageModifier = Modifier
-                        .width(100.dp)
+//                        .width(100.dp)
-                        .height(24.dp)
+//                        .height(24.dp)
-                )
+//                )
-            }
+//            }
 
 //            Box(
 //                modifier = Modifier.noRippleClickable {

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

@@ -1,5 +1,6 @@
 package com.aiosman.riderpro.ui.follower
 
+import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -14,6 +15,7 @@ import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.paging.compose.collectAsLazyPagingItems
@@ -34,7 +36,10 @@ fun FollowingListScreen(userId: Int) {
         model.loadData(userId)
     }
     StatusBarMaskLayout(
-        modifier = Modifier.padding(horizontal = 16.dp)
+        modifier = Modifier
+            .background(color = Color(0xFFFFFFFF))
+            .padding(horizontal = 16.dp),
+        maskBoxBackgroundColor = Color(0xFFFFFFFF)
     ) {
         var dataFlow = model.usersFlow
         var users = dataFlow.collectAsLazyPagingItems()

app/src/main/java/com/aiosman/riderpro/ui/gallery/OfficialGallery.kt

@@ -62,7 +62,7 @@ fun OfficialGalleryPageHeader() {
         verticalAlignment = Alignment.CenterVertically
     ) {
         Icon(
-            painter = painterResource(id = R.drawable.rider_pro_nav_back), // Replace with your logo resource
+            painter = painterResource(id = R.drawable.rider_pro_back_icon), // Replace with your logo resource
             contentDescription = "Logo",
             modifier = Modifier.size(24.dp)
         )

app/src/main/java/com/aiosman/riderpro/ui/gallery/OfficialPhotographer.kt

@@ -263,7 +263,7 @@ fun OfficialPhotographerScreen() {
                         verticalAlignment = Alignment.CenterVertically,
                     ) {
                         Image(
-                            painter = painterResource(id = R.drawable.rider_pro_nav_back),
+                            painter = painterResource(id = R.drawable.rider_pro_back_icon),
                             colorFilter = ColorFilter.tint(Color.White),
                             contentDescription = "",
                             modifier = Modifier

app/src/main/java/com/aiosman/riderpro/ui/index/tabs/message/MessageList.kt

@@ -26,6 +26,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 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
@@ -274,6 +275,7 @@ fun ChatMessageList(
                         contentDescription = item.nickname,
                         modifier = Modifier
                             .size(48.dp)
+                            .clip(RoundedCornerShape(48.dp))
                             .noRippleClickable {
                                 onUserAvatarClick(item)
                             }

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

@@ -13,6 +13,7 @@ import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.text.ClickableText
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
@@ -175,7 +176,9 @@ fun ActionPostNoticeItem(
             CustomAsyncImage(
                 context,
                 imageUrl = thumbnail,
-                modifier = Modifier.size(48.dp),
+                modifier = Modifier
+                    .size(48.dp)
+                    .clip(RoundedCornerShape(8.dp)),
                 contentDescription = action,
             )
         }
@@ -247,7 +250,9 @@ fun LikeCommentNoticeItem(
                             context = context,
                             imageUrl = MyProfileViewModel.avatar,
                             contentDescription = "Comment Profile Picture",
-                            modifier = Modifier.size(24.dp),
+                            modifier = Modifier
+                                .size(24.dp)
+                                .clip(RoundedCornerShape(24.dp)),
                             contentScale = ContentScale.Crop
                         )
                     }
@@ -276,7 +281,9 @@ fun LikeCommentNoticeItem(
                         context = context,
                         imageUrl = it.images[0].thumbnail,
                         contentDescription = "Post Thumbnail",
-                        modifier = Modifier.size(48.dp),
+                        modifier = Modifier
+                            .size(48.dp)
+                            .clip(RoundedCornerShape(8.dp)),
                         contentScale = ContentScale.Crop
                     )
                 }
@@ -286,7 +293,9 @@ fun LikeCommentNoticeItem(
                         context = context,
                         imageUrl = it.images[0].thumbnail,
                         contentDescription = "Post Thumbnail",
-                        modifier = Modifier.size(48.dp),
+                        modifier = Modifier
+                            .size(48.dp)
+                            .clip(RoundedCornerShape(8.dp)),
                         contentScale = ContentScale.Crop
                     )
                 }

app/src/main/java/com/aiosman/riderpro/ui/login/signup.kt

@@ -234,7 +234,7 @@ fun SignupScreen() {
                         }
                     ) {
                         Image(
-                            painter = painterResource(id = R.drawable.rider_pro_nav_back),
+                            painter = painterResource(id = R.drawable.rider_pro_back_icon),
                             contentDescription = "Back",
                             modifier = Modifier.size(24.dp)
                         )

app/src/main/java/com/aiosman/riderpro/ui/post/Post.kt

@@ -650,7 +650,7 @@ fun Header(
         verticalAlignment = Alignment.CenterVertically
     ) {
         Image(
-            painter = painterResource(id = R.drawable.rider_pro_nav_back), // Replace with your image resource
+            painter = painterResource(id = R.drawable.rider_pro_back_icon), // Replace with your image resource
             contentDescription = "Back",
             modifier = Modifier
                 .noRippleClickable {

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

@@ -7,5 +7,6 @@
     <color name="teal_700">#FF018786</color>
     <color name="black">#FF000000</color>
     <color name="white">#FFFFFFFF</color>
+    <color name="activity_background">#FFFFFFFF</color>
     <color name="splash_background">#ED1C24</color>
 </resources>

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

@@ -2,11 +2,15 @@
 <resources>
     <style name="Theme.RiderPro" parent="android:Theme.Material.Light.NoActionBar" >
         <item name="android:windowNoTitle">true</item>
+        <item name="android:windowIsTranslucent">true</item>
+        <item name="android:windowBackground">@color/activity_background</item>
     </style>
     <style name="Theme.App.Starting" parent="Theme.SplashScreen">
+        <item name="android:windowIsTranslucent">true</item>
         <item name="android:windowNoTitle">true</item>
         <item name="windowSplashScreenBackground">@color/splash_background</item>
         <item name="windowSplashScreenAnimatedIcon">@mipmap/rider_pro_logo_red_round</item>
         <item name="postSplashScreenTheme">@style/Theme.RiderPro</item>
+        <item name="android:windowBackground">@color/activity_background</item>
     </style>
 </resources>

gradle/libs.versions.toml

@@ -22,6 +22,7 @@ places = "3.3.0"
 googleid = "1.1.1"
 identityCredential = "20231002"
 lifecycleProcess = "2.8.4"
+rendering = "1.17.1"
 
 [libraries]
 accompanist-systemuicontroller = { module = "com.google.accompanist:accompanist-systemuicontroller", version.ref = "accompanistSystemuicontroller" }
@@ -55,6 +56,7 @@ places = { module = "com.google.android.libraries.places:places", version.ref =
 googleid = { group = "com.google.android.libraries.identity.googleid", name = "googleid", version.ref = "googleid" }
 identity-credential = { group = "com.android.identity", name = "identity-credential", version.ref = "identityCredential" }
 androidx-lifecycle-process = { group = "androidx.lifecycle", name = "lifecycle-process", version.ref = "lifecycleProcess" }
+rendering = { group = "com.google.ar.sceneform", name = "rendering", version.ref = "rendering" }
 [plugins]
 android-application = { id = "com.android.application", version.ref = "agp" }
 jetbrains-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }