diff --git a/app/src/main/java/com/aiosman/riderpro/Const.kt b/app/src/main/java/com/aiosman/riderpro/Const.kt index 39a3d8f..1852e4d 100644 --- a/app/src/main/java/com/aiosman/riderpro/Const.kt +++ b/app/src/main/java/com/aiosman/riderpro/Const.kt @@ -5,7 +5,7 @@ import android.content.Context object ConstVars { // api 地址 // const val BASE_SERVER = "http://192.168.31.190:8088" const val BASE_SERVER = "https://8.137.22.101:8088" -// const val BASE_SERVER = "http://192.168.31.36:8088" + const val BASE_SERVER = "https://8.137.22.101:8088" const val MOMENT_LIKE_CHANNEL_ID = "moment_like" const val MOMENT_LIKE_CHANNEL_NAME = "Moment Like" diff --git a/app/src/main/java/com/aiosman/riderpro/ui/index/tabs/moment/Moment.kt b/app/src/main/java/com/aiosman/riderpro/ui/index/tabs/moment/Moment.kt index c27faa5..4932d3f 100644 --- a/app/src/main/java/com/aiosman/riderpro/ui/index/tabs/moment/Moment.kt +++ b/app/src/main/java/com/aiosman/riderpro/ui/index/tabs/moment/Moment.kt @@ -101,7 +101,6 @@ fun MomentsList() { Column( modifier = Modifier .fillMaxSize() - .padding( top = statusBarPaddingValues.calculateTopPadding(), bottom = navigationBarPaddings @@ -143,7 +142,7 @@ fun MomentsList() { ) Box( modifier = Modifier - .height(16.dp) + .height(4.dp) .fillMaxWidth() .background(Color(0xFFF0F2F5)) ) diff --git a/app/src/main/java/com/aiosman/riderpro/ui/index/tabs/profile/Profile.kt b/app/src/main/java/com/aiosman/riderpro/ui/index/tabs/profile/Profile.kt index b2ab971..076d1cd 100644 --- a/app/src/main/java/com/aiosman/riderpro/ui/index/tabs/profile/Profile.kt +++ b/app/src/main/java/com/aiosman/riderpro/ui/index/tabs/profile/Profile.kt @@ -390,6 +390,7 @@ fun UserInformationFollowers(modifier: Modifier, accountProfileEntity: AccountPr text = stringResource(R.string.followers_upper), fontSize = 12.sp, color = Color.Black, + style = TextStyle(fontWeight = FontWeight.Bold) ) } } @@ -802,7 +803,7 @@ fun MomentCardTopContent(content: String) { verticalAlignment = Alignment.CenterVertically ) { Text( - modifier = Modifier.padding(16.dp), + modifier = Modifier.padding(top = 16.dp, bottom = 0.dp, start = 16.dp, end = 16.dp), text = content, fontSize = 16.sp, color = Color.Black ) } @@ -818,7 +819,7 @@ fun MomentCardPicture(imageUrl: String, momentEntity: MomentEntity) { modifier = Modifier .fillMaxSize() .aspectRatio(3f / 2f) - .padding(16.dp) + .padding(top = 16.dp) .noRippleClickable { // PostViewModel.preTransit(momentEntity) navController.navigate( @@ -840,20 +841,20 @@ fun MomentCardOperation(like: String, comment: String) { Row( modifier = Modifier .fillMaxWidth() - .height(56.dp), - horizontalArrangement = Arrangement.Start, + .height(48.dp), + horizontalArrangement = Arrangement.End, verticalAlignment = Alignment.CenterVertically ) { - Spacer(modifier = Modifier.weight(1f)) +// Spacer(modifier = Modifier.weight(1f)) MomentCardOperationItem( drawable = R.drawable.rider_pro_like, number = like, - modifier = Modifier.weight(1f) + modifier = Modifier.padding(end = 32.dp) ) MomentCardOperationItem( drawable = R.drawable.rider_pro_moment_comment, number = comment, - modifier = Modifier.weight(1f) + modifier = Modifier.padding(end = 32.dp) ) } } diff --git a/app/src/main/java/com/aiosman/riderpro/ui/post/Post.kt b/app/src/main/java/com/aiosman/riderpro/ui/post/Post.kt index e999cd9..2607530 100644 --- a/app/src/main/java/com/aiosman/riderpro/ui/post/Post.kt +++ b/app/src/main/java/com/aiosman/riderpro/ui/post/Post.kt @@ -31,7 +31,10 @@ import androidx.compose.foundation.pager.rememberPagerState import androidx.compose.foundation.shape.CircleShape import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.foundation.text.ClickableText +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Delete import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.Icon import androidx.compose.material3.ModalBottomSheet import androidx.compose.material3.Scaffold import androidx.compose.material3.Text @@ -930,12 +933,8 @@ fun PostMenuModal( onDeleteClick() } ) { - Image( - painter = painterResource(id = R.drawable.rider_pro_delete), - contentDescription = "Delete", - modifier = Modifier.size(24.dp), - colorFilter = ColorFilter.tint(Color.Black) - ) + Icon(imageVector = Icons.Default.Delete, contentDescription = "Delete", + modifier = Modifier.size(24.dp)) } Spacer(modifier = Modifier.height(8.dp)) @@ -977,12 +976,8 @@ fun CommentMenuModal( onDeleteClick() } ) { - Image( - painter = painterResource(id = R.drawable.rider_pro_delete), - contentDescription = "Delete", - modifier = Modifier.size(24.dp), - colorFilter = ColorFilter.tint(Color.Black) - ) + Icon(imageVector = Icons.Default.Delete, contentDescription = "Delete", + modifier = Modifier.size(24.dp)) } Spacer(modifier = Modifier.height(8.dp))