diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 85595c5..c43e550 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -33,8 +33,8 @@ android { applicationId = "pl.firmatpp.kierowca" minSdk = 26 targetSdk = 35 - versionCode = 36 - versionName = "1.0.35" + versionCode = 37 + versionName = "1.0.36" setProperty("archivesBaseName", "pl.firmatpp.kierowca") testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" diff --git a/app/src/main/java/pl/firmatpp/kierowca/ui/DriverApp.kt b/app/src/main/java/pl/firmatpp/kierowca/ui/DriverApp.kt index 5d3578c..4ebf0c4 100644 --- a/app/src/main/java/pl/firmatpp/kierowca/ui/DriverApp.kt +++ b/app/src/main/java/pl/firmatpp/kierowca/ui/DriverApp.kt @@ -563,7 +563,17 @@ private fun RoutesScreen( val compactWidth = screenWidthDp < 360 Scaffold( - topBar = { StitchHeader(height = appBrandHeaderHeightDp(screenHeightDp).dp) }, + topBar = { + Box(Modifier.fillMaxWidth()) { + StitchHeader(height = appBrandHeaderHeightDp(screenHeightDp).dp) + RouteDayLiveUpdateBanner( + message = state.routeDayLiveUpdateMessage, + modifier = Modifier + .align(Alignment.BottomCenter) + .padding(horizontal = horizontalPadding, vertical = 10.dp), + ) + } + }, bottomBar = { StitchBottomBar( activeScreen = DriverScreen.Routes, @@ -608,7 +618,6 @@ private fun RoutesScreen( } } } - item { RouteDayLiveUpdateBanner(state.routeDayLiveUpdateMessage) } item { RouteDateSelector( selectedDate = state.selectedDate, @@ -639,14 +648,14 @@ private fun RoutesScreen( } @Composable -private fun RouteDayLiveUpdateBanner(message: String?) { +private fun RouteDayLiveUpdateBanner(message: String?, modifier: Modifier = Modifier) { if (message.isNullOrBlank()) return Card( colors = CardDefaults.cardColors(containerColor = Color(0xFFEAF7EF)), border = BorderStroke(1.dp, Color(0xFF9BD1AD)), shape = RoundedCornerShape(8.dp), - modifier = Modifier.fillMaxWidth(), + modifier = modifier.fillMaxWidth(), ) { Row( Modifier.fillMaxWidth().padding(14.dp),