admin/rider-pro-android-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改背景细节

Browse Source
This commit is contained in:
Kevinlinpr
2024-10-13 05:57:25 +08:00
parent 20a34b569a
commit fab1e0206d
17 changed files with 70 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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 {

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

@@ -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,

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

@@ -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

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

@@ -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()

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

@@ -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 ->

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

@@ -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) {
FollowButton(
isFollowing = isFollowing,
onFollowClick = onFollow,
fontSize = 14.sp,
imageModifier = Modifier
.width(100.dp)
.height(24.dp)
)
}
// if (userId != AppState.UserId) {
// FollowButton(
// isFollowing = isFollowing,
// onFollowClick = onFollow,
// fontSize = 14.sp,
// imageModifier = Modifier
// .width(100.dp)
// .height(24.dp)
// )
// }
// Box(
// modifier = Modifier.noRippleClickable {

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

@@ -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()

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

@@ -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)
)

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

@@ -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

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

@@ -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)
}

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

@@ -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
)
}

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

@@ -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)
)

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

@@ -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 {

1
app/src/main/res/values/colors.xml
View File

@@ -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>

4
app/src/main/res/values/themes.xml
View File

@@ -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>