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-11 21:23:28 +08:00
parent 58a1824e80
commit 6b750b507b
1 changed files with 22 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -152,44 +152,30 @@ fun LoginPage() {
Box( Box(
modifier = Modifier modifier = Modifier
.fillMaxSize() .fillMaxSize()
// .offset(
// y = (-72).dp
// ),
) { ) {
val context = LocalContext.current // 获取 Context val localContext = LocalContext.current // 获取 Context
MovingImageWall(context.resources) // 将 resources 传递给 MovingImageWall MovingImageWall(localContext.resources) // 将 resources 传递给 MovingImageWall
// MovingImageWall()
} }
Column( Column(
modifier = Modifier modifier = Modifier
.fillMaxSize() .fillMaxSize()
.padding(horizontal = 24.dp), .padding(horizontal = 24.dp),
horizontalAlignment = Alignment.CenterHorizontally
) { ) {
Spacer(modifier = Modifier.weight(1f)) Spacer(modifier = Modifier.weight(1f))
// to bottom Image(
Box( painter = painterResource(id = R.mipmap.rider_pro_color_logo),
contentAlignment = Alignment.TopCenter, contentDescription = "Rider Pro",
) { modifier = Modifier
Column( .size(52.dp)
horizontalAlignment = Alignment.CenterHorizontally, )
modifier = Modifier.fillMaxWidth() Spacer(modifier = Modifier.height(32.dp))
) { Text(
Image( "Connecting Riders",
painter = painterResource(id = R.mipmap.rider_pro_color_logo), fontSize = 28.sp,
contentDescription = "Rider Pro", fontWeight = FontWeight.W900
modifier = Modifier )
.size(48.dp) Text("Worldwide", fontSize = 28.sp, fontWeight = FontWeight.W900)
)
Spacer(modifier = Modifier.height(32.dp))
Text(
"Connecting Riders",
fontSize = 28.sp,
fontWeight = FontWeight.W900
)
Text("Worldwide", fontSize = 28.sp, fontWeight = FontWeight.W900)
}
}
Spacer(modifier = Modifier.height(32.dp)) Spacer(modifier = Modifier.height(32.dp))
ActionButton( ActionButton(
modifier = Modifier.fillMaxWidth(), modifier = Modifier.fillMaxWidth(),
@@ -235,7 +221,7 @@ fun LoginPage() {
} }
) )
} }
Spacer(modifier = Modifier.height(120.dp)) Spacer(modifier = Modifier.height(70.dp))
} }
} }
} }
@@ -274,7 +260,7 @@ fun MovingImageWall(resources: Resources) {
} }
Lifecycle.Event.ON_PAUSE -> { Lifecycle.Event.ON_PAUSE -> {
// 可选： 在Composable暂停时取消协程 // 可选： 在Composable暂停时取消协程
coroutineScope.cancel() // coroutineScope.cancel()
} }
else -> {} else -> {}
} }
@@ -285,8 +271,6 @@ fun MovingImageWall(resources: Resources) {
Box( Box(
modifier = Modifier modifier = Modifier
.fillMaxWidth() .fillMaxWidth()
// .height(5000.dp)
// .offset(y = (-72).dp)
) { ) {
val scrollState1 = rememberScrollState() val scrollState1 = rememberScrollState()
val scrollableState1 = rememberScrollableState { delta -> val scrollableState1 = rememberScrollableState { delta ->
@@ -339,13 +323,13 @@ fun MovingImageWall(resources: Resources) {
modifier = Modifier modifier = Modifier
.fillMaxWidth() .fillMaxWidth()
.fillMaxHeight() .fillMaxHeight()
.background(Color.White.copy(alpha = 0.5f)), .background(Color.White.copy(alpha = 0.3f)),
contentAlignment = Alignment.BottomCenter contentAlignment = Alignment.BottomCenter
) { ) {
Box( Box(
modifier = Modifier modifier = Modifier
.fillMaxWidth() .fillMaxWidth()
.height(650.dp) .height(500.dp)
.background( .background(
Brush.verticalGradient( Brush.verticalGradient(
colors = listOf( colors = listOf(
@@ -353,7 +337,7 @@ fun MovingImageWall(resources: Resources) {
Color.White Color.White
), ),
startY = 0f, startY = 0f,
endY = 650f endY = 500f
) )
) )
) )
@@ -379,17 +363,11 @@ fun ImageColumn(
.height(208.dp) .height(208.dp)
.scale(1f) .scale(1f)
.graphicsLayer { .graphicsLayer {
var translation = if (reverse) { val translation = if (reverse) {
offset offset
} else { } else {
offset offset
} }
// 检查是否超出屏幕范围
// if (translation < -imageHeight.value * 3) { // 移出屏幕底部
//// translation += (imageHeight.value * 3)
// } else if (translation > (totalHeight / 2)) { // 移出屏幕顶部
// translation -= (totalHeight / 2)
// }
translationY = translation translationY = translation
} }
.clip(RoundedCornerShape(16.dp)), .clip(RoundedCornerShape(16.dp)),