dearsky/LBJ_Console
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 29 Wiki Activity

fix: optimize the display logic of history item spacing

Browse Source
This commit is contained in:
Nedifinita
2025-08-19 17:43:21 +08:00
parent cd4b58e16b
commit 8894a73999
1 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
app/src/main/java/org/noxylva/lbjconsole/ui/screens/HistoryScreen.kt
View File

@@ -155,7 +155,18 @@ fun TrainRecordItem(
} }
} }
Spacer(modifier = Modifier.height(2.dp)) val hasTrainDisplay = recordMap["train"]?.toString()?.isNotEmpty() ?: false
val hasRouteOrPosition = record.route.trim().isNotEmpty() && !record.route.trim().all { it == '*' } ||
record.position.trim().isNotEmpty() && !record.position.trim().all { it == '-' || it == '.' } && record.position.trim() != "<NUL>"
val hasSpeed = record.speed.trim().isNotEmpty() &&
!record.speed.trim().all { it == '*' || it == '-' } &&
record.speed.trim() != "NUL" && record.speed.trim() != "<NUL>"
val hasLocoInfo = locoInfoUtil != null && record.locoType.isNotEmpty() && record.loco.isNotEmpty() &&
locoInfoUtil.getLocoInfoDisplay(record.locoType, record.loco) != null
val shouldShowOnlyTime = !hasTrainDisplay && !hasRouteOrPosition && !hasSpeed && !hasLocoInfo
Spacer(modifier = Modifier.height(if (shouldShowOnlyTime) 0.dp else 2.dp))
Row( Row(
modifier = Modifier.fillMaxWidth(), modifier = Modifier.fillMaxWidth(),
@@ -229,7 +240,7 @@ fun TrainRecordItem(
} }
} }
Spacer(modifier = Modifier.height(8.dp)) Spacer(modifier = Modifier.height(if (shouldShowOnlyTime) 0.dp else 2.dp))
Row( Row(
modifier = Modifier.fillMaxWidth(), modifier = Modifier.fillMaxWidth(),
@@ -289,7 +300,7 @@ fun TrainRecordItem(
record.loco record.loco
) )
if (locoInfoText != null) { if (locoInfoText != null) {
Spacer(modifier = Modifier.height(4.dp)) Spacer(modifier = Modifier.height(if (shouldShowOnlyTime) 0.dp else 2.dp))
Text( Text(
text = locoInfoText, text = locoInfoText,
fontSize = 14.sp, fontSize = 14.sp,
@@ -297,7 +308,8 @@ fun TrainRecordItem(
) )
} }
} }
Spacer(modifier = Modifier.height(8.dp))
Spacer(modifier = Modifier.height(if (shouldShowOnlyTime) 0.dp else 2.dp))
AnimatedVisibility( AnimatedVisibility(
visible = isExpanded, visible = isExpanded,
enter = expandVertically(animationSpec = spring(dampingRatio = Spring.DampingRatioNoBouncy, stiffness = Spring.StiffnessMediumLow)) + fadeIn(animationSpec = spring(dampingRatio = Spring.DampingRatioNoBouncy, stiffness = Spring.StiffnessMediumLow)), enter = expandVertically(animationSpec = spring(dampingRatio = Spring.DampingRatioNoBouncy, stiffness = Spring.StiffnessMediumLow)) + fadeIn(animationSpec = spring(dampingRatio = Spring.DampingRatioNoBouncy, stiffness = Spring.StiffnessMediumLow)),
@@ -597,7 +609,7 @@ fun MergedTrainRecordItem(
} }
} }
Spacer(modifier = Modifier.height(8.dp)) Spacer(modifier = Modifier.height(2.dp))
Row( Row(
modifier = Modifier.fillMaxWidth(), modifier = Modifier.fillMaxWidth(),
@@ -657,7 +669,7 @@ fun MergedTrainRecordItem(
latestRecord.loco latestRecord.loco
) )
if (locoInfoText != null) { if (locoInfoText != null) {
Spacer(modifier = Modifier.height(4.dp)) Spacer(modifier = Modifier.height(2.dp))
Text( Text(
text = locoInfoText, text = locoInfoText,
fontSize = 14.sp, fontSize = 14.sp,
@@ -665,7 +677,7 @@ fun MergedTrainRecordItem(
) )
} }
} }
Spacer(modifier = Modifier.height(8.dp)) Spacer(modifier = Modifier.height(2.dp))
AnimatedVisibility( AnimatedVisibility(
visible = isExpanded, visible = isExpanded,
enter = expandVertically(animationSpec = spring(dampingRatio = Spring.DampingRatioNoBouncy, stiffness = Spring.StiffnessMediumLow)) + fadeIn(animationSpec = spring(dampingRatio = Spring.DampingRatioNoBouncy, stiffness = Spring.StiffnessMediumLow)), enter = expandVertically(animationSpec = spring(dampingRatio = Spring.DampingRatioNoBouncy, stiffness = Spring.StiffnessMediumLow)) + fadeIn(animationSpec = spring(dampingRatio = Spring.DampingRatioNoBouncy, stiffness = Spring.StiffnessMediumLow)),
@@ -793,7 +805,7 @@ fun MergedTrainRecordItem(
val zoomLevel = org.osmdroid.views.MapView.getTileSystem().getBoundingBoxZoom(boundingBox, width, height) val zoomLevel = org.osmdroid.views.MapView.getTileSystem().getBoundingBoxZoom(boundingBox, width, height)
val latSpan = boundingBox.latitudeSpan val latSpan = boundingBox.latitudeSpan
val adjustedCenter = org.osmdroid.util.GeoPoint( val adjustedCenter = org.osmdroid.util.GeoPoint(
boundingBox.center.latitude + latSpan * 0.25, // Shift center UP (north) to create top padding boundingBox.center.latitude + latSpan * 0.25,
boundingBox.center.longitude boundingBox.center.longitude
) )
val newZoom = zoomLevel - 1.0 val newZoom = zoomLevel - 1.0