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 02:44:22 +08:00
parent 7ec5abe362
commit f6e763cb3f
11 changed files with 121 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/com/aiosman/riderpro/Const.kt
View File

@@ -5,9 +5,9 @@ import android.content.Context
object ConstVars {
// api 地址
// const val BASE_SERVER = "http://192.168.31.130:8088"
const val BASE_SERVER = "http://192.168.142.140:8088"
// const val BASE_SERVER = "http://192.168.142.140:8088"
// const val BASE_SERVER = "https://8.137.22.101:8088"
// const val BASE_SERVER = "https://rider-pro.aiosman.com/beta_api"
const val BASE_SERVER = "https://rider-pro.aiosman.com/beta_api"
const val MOMENT_LIKE_CHANNEL_ID = "moment_like"
const val MOMENT_LIKE_CHANNEL_NAME = "Moment Like"

10
app/src/main/java/com/aiosman/riderpro/ui/account/edit2.kt
View File

@@ -109,17 +109,17 @@ fun AccountEditScreen2() {
)
}
}
Spacer(modifier = Modifier.height(32.dp))
Spacer(modifier = Modifier.height(44.dp))
model.profile?.let {
Box(
modifier = Modifier.size(112.dp),
modifier = Modifier.size(88.dp),
contentAlignment = Alignment.Center
) {
CustomAsyncImage(
context,
model.croppedBitmap ?: it.avatar,
modifier = Modifier
.size(112.dp)
.size(88.dp)
.clip(
RoundedCornerShape(88.dp)
),
@@ -145,7 +145,7 @@ fun AccountEditScreen2() {
}
}
Spacer(modifier = Modifier.height(46.dp))
Spacer(modifier = Modifier.height(58.dp))
Column(
modifier = Modifier
.weight(1f)
@@ -160,7 +160,7 @@ fun AccountEditScreen2() {
) { value ->
onNicknameChange(value)
}
Spacer(modifier = Modifier.height(16.dp))
// Spacer(modifier = Modifier.height(16.dp))
FormTextInput(
value = model.bio,
label = stringResource(R.string.bio),

4
app/src/main/java/com/aiosman/riderpro/ui/composables/form/FormTextInput.kt
View File

@@ -45,7 +45,7 @@ fun FormTextInput(
) {
Row(
modifier = Modifier.fillMaxWidth()
.clip(RoundedCornerShape(24.dp))
.clip(RoundedCornerShape(16.dp))
.background(Color(0xfff8f8f8))
.let {
if (error != null) {
@@ -54,7 +54,7 @@ fun FormTextInput(
it
}
}
.padding(16.dp),
.padding(17.dp),
verticalAlignment = Alignment.CenterVertically
) {
label?.let {

54
app/src/main/java/com/aiosman/riderpro/ui/imageviewer/imageviewer.kt
View File

@@ -1,5 +1,6 @@
import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.background
import androidx.compose.foundation.border
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
@@ -73,14 +74,17 @@ fun ImageViewer() {
StatusBarMaskLayout(
modifier = Modifier.background(Color.Black),
) {
Box(
Column(
modifier = Modifier
.fillMaxSize()
.background(Color.Black)
.background(Color.Black),
horizontalAlignment = Alignment.CenterHorizontally
) {
HorizontalPager(
state = pagerState,
modifier = Modifier.fillMaxSize(),
modifier = Modifier
.fillMaxWidth()
.weight(0.8f),
) { page ->
val zoomState = rememberZoomState()
CustomAsyncImage(
@@ -94,32 +98,30 @@ fun ImageViewer() {
onTap = {
navController.popBackStack()
}
),
)
,
contentScale = ContentScale.Fit,
)
}
if (images.size > 1) {
Box(
modifier = Modifier
.align(Alignment.TopCenter)
.clip(RoundedCornerShape(16.dp))
.background(Color(0xff333333).copy(alpha = 0.6f))
.padding(vertical = 4.dp, horizontal = 24.dp)
) {
Text(
text = "${pagerState.currentPage + 1}/${images.size}",
color = Color.White,
Box(modifier = Modifier.padding(top = 10.dp, bottom = 10.dp)){
if (images.size > 1) {
Box(
modifier = Modifier
.clip(RoundedCornerShape(16.dp))
.background(Color(0xff333333).copy(alpha = 0.6f))
.padding(vertical = 4.dp, horizontal = 24.dp)
) {
Text(
text = "${pagerState.currentPage + 1}/${images.size}",
color = Color.White,
)
}
}
}
Box(
modifier = Modifier
.fillMaxWidth()
.align(Alignment.BottomCenter)
.weight(0.2f)
.background(
Brush.verticalGradient(
colors = listOf(
@@ -133,13 +135,15 @@ fun ImageViewer() {
Row(
modifier = Modifier
.fillMaxWidth()
.padding(start = 72.dp, end = 72.dp)
.padding(top = 16.dp),
horizontalArrangement = Arrangement.Center
) {
Column(
verticalArrangement = Arrangement.Center,
horizontalAlignment = Alignment.CenterHorizontally,
modifier = Modifier.noRippleClickable {
modifier = Modifier
.noRippleClickable {
if (isDownloading) {
return@noRippleClickable
}
@@ -157,7 +161,7 @@ fun ImageViewer() {
)
} else {
Icon(
painter = painterResource(id = R.drawable.rider_pro_download),
painter = painterResource(id = R.drawable.rider_pro_download_icon),
contentDescription = "",
modifier = Modifier.size(32.dp),
tint = Color.White
@@ -171,7 +175,9 @@ fun ImageViewer() {
)
}
if (!showRawImageStates[pagerState.currentPage]) {
Spacer(modifier = Modifier.width(32.dp))
Spacer(modifier = Modifier.weight(1f))
}
if (!showRawImageStates[pagerState.currentPage]) {
Column(
verticalArrangement = Arrangement.Center,
horizontalAlignment = Alignment.CenterHorizontally,
@@ -180,7 +186,7 @@ fun ImageViewer() {
}
) {
Icon(
painter = painterResource(id = R.drawable.rider_pro_raw),
painter = painterResource(id = R.drawable.rider_pro_original_raw),
contentDescription = "",
modifier = Modifier.size(32.dp),
tint = Color.White

27
app/src/main/java/com/aiosman/riderpro/ui/index/tabs/moment/Moment.kt
View File

@@ -5,6 +5,7 @@ import androidx.compose.animation.ExperimentalSharedTransitionApi
import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.Image
import androidx.compose.foundation.background
import androidx.compose.foundation.border
import androidx.compose.foundation.clickable
import androidx.compose.foundation.interaction.MutableInteractionSource
import androidx.compose.foundation.layout.Arrangement
@@ -30,6 +31,7 @@ import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.pager.HorizontalPager
import androidx.compose.foundation.pager.rememberPagerState
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.ExperimentalMaterialApi
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.Build
@@ -52,6 +54,7 @@ import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.draw.shadow
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.layout.ContentScale
import androidx.compose.ui.platform.LocalContext
@@ -142,12 +145,12 @@ fun MomentsList() {
}
}
)
Box(
modifier = Modifier
.height(4.dp)
.fillMaxWidth()
.background(Color(0xFFF0F2F5))
)
// Box(
// modifier = Modifier
// .height(4.dp)
// .fillMaxWidth()
// .background(Color(0xFFF0F2F5))
// )
}
}
PullRefreshIndicator(model.refreshing, state, Modifier.align(Alignment.TopCenter))
@@ -169,7 +172,7 @@ fun MomentCard(
modifier = Modifier.fillMaxWidth()
) {
Box(
modifier = Modifier.padding(start = 24.dp, end = 24.dp, top = 16.dp, bottom = 8.dp)
modifier = Modifier.padding(start = 16.dp, end = 16.dp, top = 16.dp, bottom = 8.dp)
) {
MomentTopRowGroup(momentEntity = momentEntity)
}
@@ -322,6 +325,7 @@ fun MomentTopRowGroup(momentEntity: MomentEntity) {
contentDescription = "",
modifier = Modifier
.size(40.dp)
.clip(RoundedCornerShape(40.dp))
.noRippleClickable {
navController.navigate(
NavigationRoute.AccountProfile.route.replace(
@@ -408,7 +412,7 @@ fun MomentContentGroup(
text = momentEntity.momentTextContent,
modifier = Modifier
.fillMaxWidth()
.padding(start = 24.dp, end = 24.dp, bottom = 8.dp),
.padding(start = 16.dp, end = 16.dp, bottom = 8.dp),
fontSize = 16.sp
)
}
@@ -511,7 +515,7 @@ fun MomentBottomOperateRowGroup(
modifier = Modifier
.fillMaxWidth()
.height(56.dp)
.padding(horizontal = 16.dp)
.padding(start = 16.dp, end = 0.dp)
) {
Row(
modifier = Modifier.fillMaxSize()
@@ -544,14 +548,15 @@ fun MomentBottomOperateRowGroup(
count = momentEntity.commentCount.toString()
)
}
Spacer(modifier = Modifier.weight(1f))
Box(
modifier = Modifier
.fillMaxWidth()
.fillMaxHeight()
.noRippleClickable {
onFavoriteClick()
},
contentAlignment = Alignment.Center
contentAlignment = Alignment.CenterEnd
) {
MomentOperateBtn(count = momentEntity.favoriteCount.toString()) {
AnimatedFavouriteIcon(

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

@@ -305,7 +305,7 @@ fun ProfileV3(
UserItem(it)
}
}
Spacer(modifier = Modifier.height(16.dp))
Spacer(modifier = Modifier.height(20.dp))
profile?.let {
Box(
modifier = Modifier.padding(horizontal = 16.dp)

5
app/src/main/java/com/aiosman/riderpro/ui/index/tabs/search/DiscoverScreen.kt
View File

@@ -79,7 +79,7 @@ fun DiscoverScreen() {
SearchButton(
modifier = Modifier
.fillMaxWidth()
.padding(top = 16.dp, start = 24.dp, end = 24.dp),
.padding(top = 16.dp, start = 16.dp, end = 16.dp),
) {
SearchViewModel.requestFocus = true
navController.navigate(NavigationRoute.Search.route)
@@ -106,7 +106,7 @@ fun SearchButton(
Box(
modifier = modifier
.clip(shape = RoundedCornerShape(8.dp))
.background(Color(0xFFEEEEEE))
.background(Color(0xFFF4F5F6))
.padding(horizontal = 16.dp, vertical = 12.dp)
.noRippleClickable {
clickAction()
@@ -150,6 +150,7 @@ fun DiscoverView() {
.fillMaxWidth()
.aspectRatio(1f)
.padding(2.dp)
.clip(RoundedCornerShape(8.dp))
.noRippleClickable {
navController.navigateToPost(
id = momentItem.id,

5
app/src/main/java/com/aiosman/riderpro/ui/index/tabs/search/SearchScreen.kt
View File

@@ -2,6 +2,7 @@ package com.aiosman.riderpro.ui.index.tabs.search
import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.background
import androidx.compose.foundation.border
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.PaddingValues
@@ -106,7 +107,7 @@ fun SearchScreen() {
) {
Spacer(modifier = Modifier.height(statusBarPaddingValues.calculateTopPadding()))
Row(
modifier = Modifier.padding(top = 16.dp, start = 24.dp, end = 24.dp),
modifier = Modifier.padding(top = 16.dp, start = 16.dp, end = 16.dp),
verticalAlignment = Alignment.CenterVertically
) {
SearchInput(
@@ -169,7 +170,7 @@ fun SearchInput(
val context = LocalContext.current
Box(
modifier = modifier
.clip(shape = RoundedCornerShape(16.dp))
.clip(shape = RoundedCornerShape(8.dp))
.background(Color(0xFFF4F5F6))
.padding(horizontal = 16.dp, vertical = 12.dp)
) {