修改打卡点详情的布局细节参数(边距、字体、尺寸)

This commit is contained in:
2024-07-13 20:33:14 +08:00
parent 4eb12c1a99
commit e3aae7e05f
5 changed files with 141 additions and 34 deletions

View File

@@ -23,6 +23,7 @@ import androidx.compose.foundation.lazy.staggeredgrid.StaggeredGridCells
import androidx.compose.foundation.lazy.staggeredgrid.items
import androidx.compose.foundation.lazy.staggeredgrid.rememberLazyStaggeredGridState
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.Favorite
import androidx.compose.material.icons.filled.LocationOn
@@ -138,18 +139,32 @@ fun LocationDetail() {
BottomSheetScaffold(
scaffoldState = scaffoldState,
sheetPeekHeight = getPeekHeight(),
sheetContainerColor = Color.White,
sheetContainerColor = Color.Transparent,
sheetShape = RoundedCornerShape(16.dp),
sheetDragHandle = null,
sheetContent = {
Column(
Modifier
.fillMaxWidth()
.background(color = Color.White)
) {
Column(
modifier = Modifier
.padding(horizontal = 16.dp)
) {
Text("Location Name", fontSize = 24.sp, fontWeight = FontWeight.Bold)
Spacer(modifier = Modifier.height(16.dp))
Spacer(modifier = Modifier.height(12.dp))
// 自定义短线
Box(
modifier = Modifier
.width(32.dp) // 修改宽度
.height(4.dp) // 修改高度
.background(Color(0f,0f,0f,0.4f), RoundedCornerShape(3.dp)) // 修改颜色和圆角
.padding(top = 12.dp) // 调整位置
.align(Alignment.CenterHorizontally)
)
Text("Location Name", modifier = Modifier.padding(top = 24.dp), fontSize = 18.sp, fontWeight = FontWeight.Bold)
Spacer(modifier = Modifier.height(8.dp))
FlowRow(
horizontalArrangement = Arrangement.spacedBy(8.dp),
verticalArrangement = Arrangement.spacedBy(8.dp)
@@ -158,40 +173,33 @@ fun LocationDetail() {
Box(
modifier = Modifier
.background(Color(0xFFF5F5F5))
.padding(horizontal = 8.dp, vertical = 4.dp)
.padding(horizontal = 7.dp, vertical = 2.dp)
) {
Text("Tag $it", color = Color(0xFFb2b2b2))
Text("Tag $it", color = Color(0xFFb2b2b2), fontSize = 12.sp)
}
}
}
HorizontalDivider(
modifier = Modifier.padding(vertical = 16.dp),
modifier = Modifier.padding(top = 16.dp),
color = Color(0xFFF5F5F5)
)
Row(
modifier = Modifier.padding(vertical = 16.dp)
modifier = Modifier.padding(vertical = 16.dp),
verticalAlignment = Alignment.CenterVertically
) {
Column {
Text(
"Location name",
fontSize = 16.sp,
fontSize = 14.sp,
fontWeight = FontWeight.Bold
)
Spacer(modifier = Modifier.height(8.dp))
Text("距离46KM,骑行时间77分钟")
Text("距离46KM,骑行时间77分钟",fontSize = 12.sp)
}
Spacer(modifier = Modifier.weight(1f))
IconButton(
onClick = { }
) {
Icon(
Icons.Filled.LocationOn,
contentDescription = "Location"
)
}
Image(painter = painterResource(id = R.drawable.rider_pro_location_map), contentDescription = "")
}
}
@@ -204,23 +212,25 @@ fun LocationDetail() {
Column(
modifier = Modifier
.padding(horizontal = 16.dp)
.padding(top = 16.dp)
.padding(top = 18.dp)
) {
Row {
Text("官方摄影师作品", fontSize = 16.sp, fontWeight = FontWeight.Bold)
Text("官方摄影师作品", fontSize = 15.sp, fontWeight = FontWeight.Bold)
Spacer(modifier = Modifier.weight(1f))
Image(
painter = painterResource(id = R.drawable.rider_pro_nav_next),
contentDescription = "Next",
modifier = Modifier.size(24.dp).clickable {
navController.navigate("OfficialPhoto")
}
modifier = Modifier
.size(24.dp)
.clickable {
navController.navigate("OfficialPhoto")
}
)
}
Spacer(modifier = Modifier.height(16.dp))
Spacer(modifier = Modifier.height(17.dp))
Row(
modifier = Modifier.height(240.dp)
modifier = Modifier.height(232.dp)
) {
Box(
modifier = Modifier.weight(1f)
@@ -228,9 +238,10 @@ fun LocationDetail() {
Image(
painter = painterResource(id = R.drawable.default_avatar),
contentDescription = "Avatar",
modifier = Modifier.fillMaxSize()
.clip(MaterialTheme.shapes.medium),
contentScale = ContentScale.Crop
modifier = Modifier
.fillMaxSize()
.clip(RoundedCornerShape(16.dp)),
contentScale = ContentScale.Crop,
)
}
Spacer(modifier = Modifier.width(16.dp))
@@ -242,7 +253,7 @@ fun LocationDetail() {
contentDescription = "Avatar",
modifier = Modifier
.fillMaxSize()
.clip(MaterialTheme.shapes.medium),
.clip(RoundedCornerShape(16.dp)),
contentScale = ContentScale.Crop
)
}
@@ -279,13 +290,16 @@ fun LocationDetail() {
Image(
painter = painterResource(id = item.resId),
contentDescription = "Feed",
modifier = Modifier.fillMaxWidth()
modifier = Modifier
.fillMaxWidth()
.clip(MaterialTheme.shapes.medium),
contentScale = ContentScale.FillWidth
)
Spacer(modifier = Modifier.height(8.dp))
Column(
modifier = Modifier.fillMaxWidth().padding(horizontal = 8.dp)
modifier = Modifier
.fillMaxWidth()
.padding(horizontal = 8.dp)
) {
Box(
modifier = Modifier.fillMaxWidth()
@@ -300,7 +314,8 @@ fun LocationDetail() {
Image(
painter = painterResource(id = R.drawable.default_avatar),
contentDescription = "Avatar",
modifier = Modifier.size(18.dp)
modifier = Modifier
.size(18.dp)
.clip(CircleShape),
contentScale = ContentScale.Crop
)