fix(android): swap Trips/Settings tab mapping, inset the trip replay top bar under the status bar

This commit is contained in:
Mathieu Moran
2026-08-15 19:58:38 -04:00
parent a40fced666
commit e1afdf2952
2 changed files with 4 additions and 3 deletions
@@ -193,8 +193,7 @@ fun YarisMainScreen(client: OkHttpClient) {
onGenerateTestFile = { dashcamVm.generateTestFile() },
onRefresh = { dashcamVm.scanDownloads() },
)
3 -> SettingsScreen(client = client)
4 -> TripListScreen(
3 -> TripListScreen(
trips = trips,
labels = tripLabels,
isLoading = tripsLoading,
@@ -205,6 +204,7 @@ fun YarisMainScreen(client: OkHttpClient) {
},
onRefresh = { tripVm.loadTrips() },
)
4 -> SettingsScreen(client = client)
}
}
}
@@ -9,6 +9,7 @@ import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.safeDrawingPadding
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.shape.RoundedCornerShape
@@ -65,7 +66,7 @@ fun TripReplayScreen(
if (currentIndex >= points.size - 1) playing = false
}
Column(modifier = Modifier.fillMaxSize()) {
Column(modifier = Modifier.fillMaxSize().safeDrawingPadding()) {
// Top bar: back + title
Row(
Modifier.fillMaxWidth().padding(horizontal = 8.dp, vertical = 6.dp),