Dodaj ekran startowy podczas sprawdzania sesji

app/build.gradle.kts

@@ -12,8 +12,8 @@ android {
         applicationId = "pl.firmatpp.kierowca"
         minSdk = 26
         targetSdk = 35
-        versionCode = 9
-        versionName = "1.0.8"
+        versionCode = 14
+        versionName = "1.0.13"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
 
         buildConfigField("String", "API_BASE_URL", "\"https://api-intranet.firmatpp.pl/api/\"")
@@ -45,6 +45,10 @@ android {
         compose = true
         buildConfig = true
     }
+
+    lint {
+        disable += "NullSafeMutableLiveData"
+    }
 }
 
 dependencies {

app/src/main/AndroidManifest.xml

@@ -7,7 +7,9 @@
 
     <application
         android:allowBackup="false"
+        android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
+        android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.TppKierowca">
         <activity

app/src/main/java/pl/firmatpp/kierowca/data/DeviceInfoProvider.kt

@@ -0,0 +1,38 @@
+package pl.firmatpp.kierowca.data
+
+import android.content.Context
+import android.os.Build
+import android.provider.Settings
+import pl.firmatpp.kierowca.BuildConfig
+import pl.firmatpp.kierowca.data.model.DriverDeviceInfo
+
+class DeviceInfoProvider(
+    private val context: Context,
+    private val tokenStore: TokenStore,
+) {
+    suspend fun currentDeviceInfo(): DriverDeviceInfo =
+        DriverDeviceInfo(
+            deviceId = tokenStore.deviceId(),
+            androidId = Settings.Secure.getString(context.contentResolver, Settings.Secure.ANDROID_ID),
+            brand = Build.BRAND,
+            manufacturer = Build.MANUFACTURER,
+            model = Build.MODEL,
+            device = Build.DEVICE,
+            product = Build.PRODUCT,
+            androidVersion = Build.VERSION.RELEASE,
+            sdkInt = Build.VERSION.SDK_INT,
+            appVersion = BuildConfig.VERSION_NAME,
+            serialNumber = readSerialNumber(),
+        )
+
+    private fun readSerialNumber(): String? =
+        runCatching {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                Build.getSerial()
+            } else {
+                @Suppress("DEPRECATION")
+                Build.SERIAL
+            }
+        }.getOrNull()
+            ?.takeUnless { it.isBlank() || it.equals(Build.UNKNOWN, ignoreCase = true) }
+}

app/src/main/java/pl/firmatpp/kierowca/data/DriverRepository.kt

@@ -19,12 +19,13 @@ class DriverRepository(
     private val context: Context,
     private val api: MobileDriverApi = ApiFactory.mobileDriverApi(),
     private val tokenStore: TokenStore = TokenStore(context),
+    private val deviceInfoProvider: DeviceInfoProvider = DeviceInfoProvider(context, tokenStore),
 ) {
     suspend fun requestOtp(phoneNumber: String): OtpResponse =
         api.requestOtp(RequestOtpBody(phoneNumber))
 
     suspend fun verifyOtp(phoneNumber: String, code: String, deviceName: String): DriverDto {
-        val response = api.verifyOtp(VerifyOtpBody(phoneNumber, code, deviceName))
+        val response = api.verifyOtp(VerifyOtpBody(phoneNumber, code, deviceName, deviceInfoProvider.currentDeviceInfo()))
         val token = response.accessToken ?: error("Brak tokenu sesji.")
         tokenStore.save(token)
         return response.driver ?: error("Brak danych kierowcy.")
@@ -62,6 +63,10 @@ class DriverRepository(
         )
     }
 
+    suspend fun deletePhoto(photoId: String) {
+        api.deletePhoto(authHeader(requireToken()), photoId)
+    }
+
     suspend fun logout() {
         val token = tokenStore.read()
         if (token != null) {

app/src/main/java/pl/firmatpp/kierowca/data/TokenStore.kt

@@ -6,11 +6,13 @@ import androidx.datastore.preferences.core.stringPreferencesKey
 import androidx.datastore.preferences.preferencesDataStore
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.map
+import java.util.UUID
 
 private val Context.driverDataStore by preferencesDataStore(name = "driver_session")
 
 class TokenStore(private val context: Context) {
     private val tokenKey = stringPreferencesKey("access_token")
+    private val deviceIdKey = stringPreferencesKey("device_id")
 
     suspend fun save(token: String) {
         context.driverDataStore.edit { preferences ->
@@ -22,6 +24,21 @@ class TokenStore(private val context: Context) {
         .map { it[tokenKey] }
         .first()
 
+    suspend fun deviceId(): String {
+        val existing = context.driverDataStore.data
+            .map { it[deviceIdKey] }
+            .first()
+
+        if (!existing.isNullOrBlank()) return existing
+
+        val generated = UUID.randomUUID().toString()
+        context.driverDataStore.edit { preferences ->
+            preferences[deviceIdKey] = generated
+        }
+
+        return generated
+    }
+
     suspend fun clear() {
         context.driverDataStore.edit { it.remove(tokenKey) }
     }

app/src/main/java/pl/firmatpp/kierowca/data/api/MobileDriverApi.kt

@@ -10,6 +10,7 @@ import pl.firmatpp.kierowca.data.model.RouteResponse
 import pl.firmatpp.kierowca.data.model.VerifyOtpBody
 import pl.firmatpp.kierowca.data.model.VerifyOtpResponse
 import retrofit2.http.Body
+import retrofit2.http.DELETE
 import retrofit2.http.GET
 import retrofit2.http.Header
 import retrofit2.http.Multipart
@@ -52,4 +53,10 @@ interface MobileDriverApi {
         @Part("longitude") longitude: RequestBody?,
         @Part("locationAccuracyMeters") locationAccuracyMeters: RequestBody?,
     ): PhotoUploadResponse
+
+    @DELETE("mobile/driver/photos/{photoId}")
+    suspend fun deletePhoto(
+        @Header("Authorization") authorization: String,
+        @Path("photoId") photoId: String,
+    ): Map<String, Boolean>
 }

app/src/main/java/pl/firmatpp/kierowca/data/model/DriverModels.kt

@@ -6,6 +6,21 @@ data class VerifyOtpBody(
     val phoneNumber: String,
     val code: String,
     val deviceName: String,
+    val device: DriverDeviceInfo,
+)
+
+data class DriverDeviceInfo(
+    val deviceId: String,
+    val androidId: String?,
+    val brand: String?,
+    val manufacturer: String?,
+    val model: String?,
+    val device: String?,
+    val product: String?,
+    val androidVersion: String?,
+    val sdkInt: Int,
+    val appVersion: String?,
+    val serialNumber: String?,
 )
 
 data class OtpResponse(
@@ -69,15 +84,25 @@ data class DriverRouteDto(
     val distanceKm: Double?,
     val notes: String?,
     val truck: TruckDto?,
+    val originNavigation: NavigationPointDto? = null,
+    val destinationNavigation: NavigationPointDto? = null,
     val photos: List<RoutePhotoDto> = emptyList(),
 )
 
 data class TruckDto(
     val id: String,
     val registration: String?,
+    val trailerRegistration: String? = null,
     val name: String?,
 )
 
+data class NavigationPointDto(
+    val id: String,
+    val label: String?,
+    val latitude: Double?,
+    val longitude: Double?,
+)
+
 data class RoutePhotoDto(
     val id: String,
     val routeId: String,
@@ -90,6 +115,8 @@ data class RoutePhotoDto(
     val longitude: Double?,
     val locationAccuracyMeters: Double?,
     val createdAt: String?,
+    val canDelete: Boolean = false,
+    val deleteUntil: String? = null,
 )
 
 data class PhotoUploadResponse(

app/src/main/java/pl/firmatpp/kierowca/ui/DriverApp.kt

@@ -18,6 +18,7 @@ import androidx.activity.result.contract.ActivityResultContracts
 import androidx.compose.foundation.BorderStroke
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
+import androidx.compose.foundation.border
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
@@ -44,15 +45,20 @@ import androidx.compose.foundation.lazy.grid.GridCells
 import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
 import androidx.compose.foundation.lazy.grid.items
 import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.text.BasicTextField
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.AddPhotoAlternate
 import androidx.compose.material.icons.outlined.ArrowBack
 import androidx.compose.material.icons.outlined.CameraAlt
 import androidx.compose.material.icons.outlined.CalendarToday
 import androidx.compose.material.icons.outlined.Factory
+import androidx.compose.material.icons.outlined.Delete
 import androidx.compose.material.icons.outlined.LocationOn
 import androidx.compose.material.icons.outlined.LocalShipping
+import androidx.compose.material.icons.outlined.Navigation
 import androidx.compose.material.icons.outlined.Person
 import androidx.compose.material.icons.outlined.Phone
 import androidx.compose.material.ExperimentalMaterialApi
@@ -89,11 +95,14 @@ import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import androidx.compose.foundation.verticalScroll
 import androidx.core.content.ContextCompat
 import androidx.core.content.FileProvider
 import androidx.lifecycle.Lifecycle
@@ -114,6 +123,7 @@ import java.util.Locale
 import pl.firmatpp.kierowca.R
 import pl.firmatpp.kierowca.data.PhotoUploadMetadata
 import pl.firmatpp.kierowca.data.model.DriverRouteDto
+import pl.firmatpp.kierowca.data.model.NavigationPointDto
 import pl.firmatpp.kierowca.data.model.RoutePhotoDto
 import pl.firmatpp.kierowca.domain.OtpCodeExtractor
 import pl.firmatpp.kierowca.domain.RouteDisplayMapper
@@ -125,7 +135,7 @@ fun DriverApp(viewModel: DriverViewModel) {
     val lifecycleOwner = LocalLifecycleOwner.current
     var appInForeground by remember { mutableStateOf(true) }
 
-    BackHandler(enabled = state.screen != DriverScreen.Phone && state.screen != DriverScreen.Routes) {
+    BackHandler(enabled = state.screen != DriverScreen.Initializing && state.screen != DriverScreen.Phone && state.screen != DriverScreen.Routes) {
         viewModel.back()
     }
     DisposableEffect(lifecycleOwner, state.screen) {
@@ -158,6 +168,7 @@ fun DriverApp(viewModel: DriverViewModel) {
 
     Box(Modifier.fillMaxSize().background(TppColors.Surface)) {
         when (state.screen) {
+            DriverScreen.Initializing -> StartupScreen()
             DriverScreen.Phone -> PhoneScreen(state, viewModel::requestOtp)
             DriverScreen.Otp -> OtpScreen(state, viewModel::updateOtpCode, viewModel::verifyOtp, viewModel::back)
             DriverScreen.Routes -> RoutesScreen(
@@ -168,11 +179,11 @@ fun DriverApp(viewModel: DriverViewModel) {
                 onRoute = viewModel::openRoute,
             )
             DriverScreen.Profile -> ProfileScreen(state, viewModel::refreshRoutes, viewModel::openProfile, viewModel::logout)
-            DriverScreen.Detail -> DetailScreen(state, viewModel::back, viewModel::uploadPhoto, viewModel::openPhoto)
+            DriverScreen.Detail -> DetailScreen(state, viewModel::back, viewModel::uploadPhoto, viewModel::openPhoto, viewModel::deletePhoto, viewModel::refreshSelectedRoute)
             DriverScreen.Photo -> PhotoScreen(state, viewModel::back)
         }
 
-        if (state.loading) {
+        if (state.loading && state.screen != DriverScreen.Initializing) {
             Box(Modifier.fillMaxSize().background(Color.White.copy(alpha = 0.42f)), contentAlignment = Alignment.Center) {
                 CircularProgressIndicator(color = TppColors.Forest)
             }
@@ -180,22 +191,167 @@ fun DriverApp(viewModel: DriverViewModel) {
     }
 }
 
+@Composable
+private fun StartupScreen() {
+    Column(
+        Modifier
+            .fillMaxSize()
+            .statusBarsPadding()
+            .navigationBarsPadding()
+            .padding(32.dp),
+        horizontalAlignment = Alignment.CenterHorizontally,
+        verticalArrangement = Arrangement.Center,
+    ) {
+        Image(
+            painter = painterResource(R.drawable.tpp5),
+            contentDescription = "Firma TPP",
+            contentScale = ContentScale.Fit,
+            modifier = Modifier
+                .fillMaxWidth()
+                .height(120.dp),
+        )
+        Spacer(Modifier.height(32.dp))
+        CircularProgressIndicator(color = TppColors.Forest)
+        Spacer(Modifier.height(20.dp))
+        Text(
+            "Sprawdzanie sesji",
+            color = TppColors.Muted,
+            fontFamily = FontFamily.Monospace,
+            fontWeight = FontWeight.SemiBold,
+        )
+    }
+}
+
 @Composable
 private fun PhoneScreen(state: DriverUiState, onSubmit: (String) -> Unit) {
-    var phone by remember { mutableStateOf(state.phone) }
-    AuthShell(title = "TPP Kierowca", subtitle = "Zaloguj sie numerem telefonu kierowcy.") {
-        OutlinedTextField(
-            value = phone,
-            onValueChange = { phone = it },
-            label = { Text("Numer telefonu") },
-            leadingIcon = { Icon(Icons.Outlined.Phone, contentDescription = null) },
-            keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Phone),
-            modifier = Modifier.fillMaxWidth(),
-            singleLine = true,
+    var phoneDigits by remember(state.phone) { mutableStateOf(polishPhoneDigits(state.phone)) }
+    Box(
+        Modifier
+            .fillMaxSize()
+            .background(TppColors.Surface)
+            .statusBarsPadding()
+            .navigationBarsPadding()
+            .padding(24.dp),
+    ) {
+        Card(
+            modifier = Modifier.fillMaxSize(),
+            colors = CardDefaults.cardColors(containerColor = Color(0xFFFEFFFC)),
+            border = BorderStroke(1.dp, TppColors.Outline),
+            shape = RoundedCornerShape(4.dp),
+        ) {
+            Column(
+                Modifier
+                    .fillMaxSize()
+                    .verticalScroll(rememberScrollState())
+                    .padding(horizontal = 28.dp, vertical = 36.dp),
+                horizontalAlignment = Alignment.CenterHorizontally,
+            ) {
+                Image(
+                    painter = painterResource(R.drawable.tpp5),
+                    contentDescription = "Firma TPP",
+                    contentScale = ContentScale.Fit,
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .height(132.dp),
+                )
+                Spacer(Modifier.height(42.dp))
+                Text(
+                    "Zaloguj się",
+                    style = MaterialTheme.typography.headlineLarge,
+                    color = TppColors.Muted,
+                    fontWeight = FontWeight.Bold,
+                )
+                Spacer(Modifier.height(76.dp))
+                Column(Modifier.fillMaxWidth(), verticalArrangement = Arrangement.spacedBy(18.dp)) {
+                    Text(
+                        "Numer Telefonu",
+                        color = Color.Black,
+                        fontFamily = FontFamily.Monospace,
+                        fontWeight = FontWeight.Bold,
+                        fontSize = 23.sp,
+                    )
+                    PhoneNumberField(
+                        digits = phoneDigits,
+                        onDigitsChange = { phoneDigits = polishPhoneDigits(it) },
+                    )
+                    Text(
+                        "Otrzymasz kod SMS do weryfikacji.",
+                        color = TppColors.Muted,
+                        fontFamily = FontFamily.Monospace,
+                        fontWeight = FontWeight.SemiBold,
+                        fontSize = 18.sp,
                     )
                     ErrorText(state.error)
-        Spacer(Modifier.height(if (state.error.isNullOrBlank()) 18.dp else 8.dp))
-        PrimaryButton("Wyslij kod") { onSubmit(phone) }
+                    Spacer(Modifier.height(if (state.error.isNullOrBlank()) 22.dp else 8.dp))
+                    Button(
+                        onClick = { onSubmit("+48$phoneDigits") },
+                        modifier = Modifier
+                            .fillMaxWidth()
+                            .height(72.dp),
+                        colors = ButtonDefaults.buttonColors(containerColor = TppColors.ContainerGreen),
+                        shape = RoundedCornerShape(4.dp),
+                        contentPadding = PaddingValues(horizontal = 20.dp),
+                    ) {
+                        Text(
+                            "Wyślij kod OTP",
+                            fontFamily = FontFamily.Monospace,
+                            fontWeight = FontWeight.Bold,
+                            fontSize = 22.sp,
+                        )
+                    }
+                }
+            }
+        }
+    }
+}
+
+@Composable
+private fun PhoneNumberField(digits: String, onDigitsChange: (String) -> Unit) {
+    Row(
+        modifier = Modifier
+            .fillMaxWidth()
+            .height(82.dp)
+            .background(Color(0xFFFEFFFC), RoundedCornerShape(2.dp))
+            .border(BorderStroke(1.dp, TppColors.Outline), RoundedCornerShape(2.dp)),
+        verticalAlignment = Alignment.CenterVertically,
+    ) {
+        Box(
+            Modifier
+                .width(94.dp)
+                .fillMaxHeight()
+                .background(TppColors.Panel),
+            contentAlignment = Alignment.Center,
+        ) {
+            Text("+48", color = TppColors.Ink, fontSize = 26.sp)
+        }
+        Box(Modifier.width(1.dp).fillMaxHeight().background(TppColors.Outline))
+        BasicTextField(
+            value = formatPolishPhoneDigits(digits),
+            onValueChange = { onDigitsChange(it) },
+            singleLine = true,
+            keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Phone),
+            textStyle = TextStyle(
+                color = TppColors.Muted,
+                fontSize = 28.sp,
+                fontWeight = FontWeight.Medium,
+            ),
+            modifier = Modifier
+                .weight(1f)
+                .padding(horizontal = 24.dp),
+            decorationBox = { innerTextField ->
+                Box(contentAlignment = Alignment.CenterStart) {
+                    if (digits.isBlank()) {
+                        Text(
+                            "000 000 000",
+                            color = TppColors.Muted.copy(alpha = 0.92f),
+                            fontSize = 28.sp,
+                            fontWeight = FontWeight.Medium,
+                        )
+                    }
+                    innerTextField()
+                }
+            },
+        )
     }
 }
 
@@ -349,8 +505,16 @@ private fun RouteDateSelector(selectedDate: String, minDate: String, maxDate: St
             }.toList()
         }.getOrElse { listOf(LocalDate.parse(selectedDate)) }
     }
+    val listState = rememberLazyListState()
 
-    LazyRow(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
+    LaunchedEffect(dates, selectedDate) {
+        val selectedIndex = dates.indexOfFirst { it.toString() == selectedDate }
+        if (selectedIndex >= 0) {
+            listState.scrollToItem(selectedIndex)
+        }
+    }
+
+    LazyRow(state = listState, horizontalArrangement = Arrangement.spacedBy(8.dp)) {
         items(dates, key = { it.toString() }) { date ->
             DateSelectorChip(
                 date = date,
@@ -566,16 +730,19 @@ private fun routeStatusColor(status: String): Color {
     }
 }
 
-@OptIn(ExperimentalMaterial3Api::class)
+@OptIn(ExperimentalMaterial3Api::class, ExperimentalMaterialApi::class)
 @Composable
 private fun DetailScreen(
     state: DriverUiState,
     onBack: () -> Unit,
     onUpload: (Uri, String, PhotoUploadMetadata) -> Unit,
     onPhoto: (RoutePhotoDto) -> Unit,
+    onDeletePhoto: (RoutePhotoDto) -> Unit,
+    onRefresh: () -> Unit,
 ) {
     val context = LocalContext.current
     var cameraUri by remember { mutableStateOf<Uri?>(null) }
+    val pullRefreshState = rememberPullRefreshState(state.refreshing, onRefresh)
     val cameraLauncher = rememberLauncherForActivityResult(ActivityResultContracts.TakePicture()) { ok ->
         val capturedUri = cameraUri
         if (ok && capturedUri != null) onUpload(capturedUri, "camera", cameraPhotoMetadata(context))
@@ -590,6 +757,7 @@ private fun DetailScreen(
         if (uri != null) onUpload(uri, "gallery", PhotoUploadMetadata())
     }
     val route = state.selectedRoute
+    val canManagePhotos = canManageRoutePhotos(state.selectedDate)
 
     Scaffold(
         topBar = {
@@ -598,18 +766,21 @@ private fun DetailScreen(
         containerColor = TppColors.Surface,
     ) { padding ->
         if (route == null) return@Scaffold
+        Box(Modifier.fillMaxSize().padding(padding).pullRefresh(pullRefreshState)) {
             LazyColumn(
-            Modifier.fillMaxSize().padding(padding),
+                Modifier.fillMaxSize(),
                 contentPadding = PaddingValues(16.dp),
                 verticalArrangement = Arrangement.spacedBy(24.dp),
             ) {
-            item { ManifestSection(route) }
+                item { ManifestSection(route, onNavigate = { openNavigation(context, it) }) }
                 item {
                     CargoDocumentationSection(
                         photos = route.photos,
                         imageAuthHeader = state.imageAuthHeader,
                         allowGalleryUploads = state.allowGalleryUploads,
+                        canManagePhotos = canManagePhotos,
                         onPhoto = onPhoto,
+                        onDeletePhoto = onDeletePhoto,
                         onCamera = {
                             val newUri = createCameraUri(context)
                             cameraUri = newUri
@@ -627,6 +798,14 @@ private fun DetailScreen(
                 }
                 item { ErrorText(state.error) }
             }
+            PullRefreshIndicator(
+                refreshing = state.refreshing,
+                state = pullRefreshState,
+                modifier = Modifier.align(Alignment.TopCenter),
+                backgroundColor = Color.White,
+                contentColor = TppColors.Forest,
+            )
+        }
     }
 }
 
@@ -653,7 +832,7 @@ private fun DetailHeader(onBack: () -> Unit) {
 }
 
 @Composable
-private fun ManifestSection(route: DriverRouteDto) {
+private fun ManifestSection(route: DriverRouteDto, onNavigate: (NavigationPointDto) -> Unit) {
     val stripColor = routeStatusColor(route.status)
     Card(
         colors = CardDefaults.cardColors(containerColor = Color.White),
@@ -676,7 +855,6 @@ private fun ManifestSection(route: DriverRouteDto) {
                             color = TppColors.Ink,
                         )
                     }
-                    RouteStartChip(route.startsAt)
                 }
             }
             HorizontalDivider(color = TppColors.Outline.copy(alpha = 0.65f))
@@ -687,6 +865,8 @@ private fun ManifestSection(route: DriverRouteDto) {
                 icon = Icons.Outlined.Factory,
                 iconBackground = TppColors.Panel,
                 iconTint = TppColors.ContainerGreen,
+                navigationPoint = route.originNavigation,
+                onNavigate = onNavigate,
             )
             HorizontalDivider(color = TppColors.Outline.copy(alpha = 0.45f))
             RoutePointBlock(
@@ -697,29 +877,14 @@ private fun ManifestSection(route: DriverRouteDto) {
                 iconBackground = TppColors.Panel.copy(alpha = 0.72f),
                 iconTint = TppColors.Forest,
                 framed = true,
+                navigationPoint = route.destinationNavigation,
+                onNavigate = onNavigate,
             )
             RouteFactsFooter(route)
         }
     }
 }
 
-@Composable
-private fun RouteStartChip(startsAt: String) {
-    Row(
-        modifier = Modifier.background(TppColors.Panel, RoundedCornerShape(8.dp)).padding(horizontal = 10.dp, vertical = 8.dp),
-        verticalAlignment = Alignment.CenterVertically,
-        horizontalArrangement = Arrangement.spacedBy(6.dp),
-    ) {
-        Icon(Icons.Outlined.CalendarToday, contentDescription = null, tint = TppColors.Muted, modifier = Modifier.size(18.dp))
-        Text(
-            startsAt.ifBlank { "Dziś" },
-            color = TppColors.Muted,
-            fontFamily = FontFamily.Monospace,
-            fontWeight = FontWeight.SemiBold,
-        )
-    }
-}
-
 @Composable
 private fun RoutePointBlock(
     label: String,
@@ -729,10 +894,13 @@ private fun RoutePointBlock(
     iconBackground: Color,
     iconTint: Color,
     framed: Boolean = false,
+    navigationPoint: NavigationPointDto? = null,
+    onNavigate: (NavigationPointDto) -> Unit = {},
 ) {
     Row(
         Modifier.fillMaxWidth().padding(20.dp),
         horizontalArrangement = Arrangement.spacedBy(16.dp),
+        verticalAlignment = Alignment.CenterVertically,
     ) {
         Box(
             Modifier.size(48.dp).background(iconBackground, RoundedCornerShape(24.dp)),
@@ -760,6 +928,14 @@ private fun RoutePointBlock(
                 Text(subtitle, color = TppColors.Muted, style = MaterialTheme.typography.bodyLarge)
             }
         }
+        if (navigationPoint?.hasCoordinates() == true) {
+            IconButton(
+                onClick = { onNavigate(navigationPoint) },
+                modifier = Modifier.size(48.dp).background(TppColors.Forest, RoundedCornerShape(24.dp)),
+            ) {
+                Icon(Icons.Outlined.Navigation, contentDescription = "Nawiguj", tint = Color.White)
+            }
+        }
     }
 }
 
@@ -790,7 +966,9 @@ private fun CargoDocumentationSection(
     photos: List<RoutePhotoDto>,
     imageAuthHeader: String?,
     allowGalleryUploads: Boolean,
+    canManagePhotos: Boolean,
     onPhoto: (RoutePhotoDto) -> Unit,
+    onDeletePhoto: (RoutePhotoDto) -> Unit,
     onCamera: () -> Unit,
     onGallery: () -> Unit,
 ) {
@@ -801,12 +979,18 @@ private fun CargoDocumentationSection(
             Box(Modifier.width(116.dp).height(3.dp).background(TppColors.ContainerGreen))
         }
         Column(verticalArrangement = Arrangement.spacedBy(12.dp)) {
+            if (canManagePhotos) {
                 if (allowGalleryUploads) {
                     CargoActionButton("Dodaj zdjęcie z galerii", Icons.Outlined.AddPhotoAlternate, TppColors.ContainerGreen, onGallery)
                 }
                 CargoActionButton("Zrób nowe zdjęcie", Icons.Outlined.CameraAlt, TppColors.Forest, onCamera)
+            } else {
+                Box(Modifier.fillMaxWidth().background(TppColors.Panel, RoundedCornerShape(4.dp)).padding(14.dp)) {
+                    Text("Zdjęcia można dodawać tylko dla dzisiejszych kursów.", color = TppColors.Muted, fontFamily = FontFamily.Monospace)
                 }
-        PhotoGrid(photos, imageAuthHeader, onPhoto)
+            }
+        }
+        PhotoGrid(photos, imageAuthHeader, onPhoto, onDeletePhoto)
     }
 }
 
@@ -829,6 +1013,7 @@ private fun PhotoGrid(
     photos: List<RoutePhotoDto>,
     imageAuthHeader: String?,
     onPhoto: (RoutePhotoDto) -> Unit,
+    onDeletePhoto: (RoutePhotoDto) -> Unit,
 ) {
     val rows = ceil((photos.size.coerceAtLeast(1) / 2f).toDouble()).toInt()
     val gridHeight = (rows * 172).coerceIn(172, 520).dp
@@ -855,12 +1040,31 @@ private fun PhotoGrid(
                     horizontalArrangement = Arrangement.spacedBy(12.dp),
                 ) {
                     items(photos, key = { it.id }) { photo ->
+                        Box(Modifier.aspectRatio(1f)) {
                             AsyncImage(
                                 model = imageRequest(photo.url, imageAuthHeader),
                                 contentDescription = "Zdjecie ladunku",
                                 contentScale = ContentScale.Crop,
-                            modifier = Modifier.aspectRatio(1f).clickable { onPhoto(photo) },
+                                modifier = Modifier.fillMaxSize().clickable { onPhoto(photo) },
                             )
+                            if (photo.canDelete) {
+                                IconButton(
+                                    onClick = { onDeletePhoto(photo) },
+                                    modifier = Modifier
+                                        .align(Alignment.TopEnd)
+                                        .padding(6.dp)
+                                        .size(34.dp)
+                                        .background(TppColors.Error, RoundedCornerShape(17.dp)),
+                                ) {
+                                    Icon(
+                                        Icons.Outlined.Delete,
+                                        contentDescription = "Usuń zdjęcie",
+                                        tint = Color.White,
+                                        modifier = Modifier.size(18.dp),
+                                    )
+                                }
+                            }
+                        }
                     }
                 }
             }
@@ -880,14 +1084,21 @@ private fun EmptyPhotoState() {
 
 private fun DriverRouteDto.truckLabel(): String {
     val registration = truck?.registration.orEmpty()
+    val trailerRegistration = truck?.trailerRegistration.orEmpty()
     val name = truck?.name.orEmpty()
 
-    return when {
+    val vehicle = when {
         registration.isNotBlank() && name.isNotBlank() -> "$registration ($name)"
         registration.isNotBlank() -> registration
         name.isNotBlank() -> name
         else -> "-"
     }
+
+    return if (trailerRegistration.isNotBlank()) {
+        "$vehicle\nNaczepa: $trailerRegistration"
+    } else {
+        vehicle
+    }
 }
 
 private fun DriverRouteDto.distanceLabel(): String =
@@ -939,12 +1150,42 @@ private fun ErrorText(error: String?) {
     if (!error.isNullOrBlank()) Text(error, color = TppColors.Error, modifier = Modifier.padding(vertical = 8.dp))
 }
 
+private fun polishPhoneDigits(value: String): String {
+    val digits = value.filter(Char::isDigit)
+    val withoutCountryCode = if (digits.length > 9 && digits.startsWith("48")) digits.drop(2) else digits
+
+    return withoutCountryCode.take(9)
+}
+
+private fun formatPolishPhoneDigits(value: String): String =
+    value.chunked(3).joinToString(" ")
+
 private fun createCameraUri(context: Context): Uri {
     val dir = File(context.cacheDir, "camera").apply { mkdirs() }
     val file = File.createTempFile("ladunek-", ".jpg", dir)
     return FileProvider.getUriForFile(context, "${context.packageName}.fileprovider", file)
 }
 
+private fun NavigationPointDto.hasCoordinates(): Boolean = latitude != null && longitude != null
+
+private fun openNavigation(context: Context, point: NavigationPointDto) {
+    val latitude = point.latitude ?: return
+    val longitude = point.longitude ?: return
+    val googleMapsIntent = Intent(Intent.ACTION_VIEW, Uri.parse("google.navigation:q=$latitude,$longitude"))
+        .setPackage("com.google.android.apps.maps")
+
+    if (googleMapsIntent.resolveActivity(context.packageManager) != null) {
+        context.startActivity(googleMapsIntent)
+        return
+    }
+
+    val label = Uri.encode(point.label?.takeIf { it.isNotBlank() } ?: "Cel")
+    val geoIntent = Intent(Intent.ACTION_VIEW, Uri.parse("geo:0,0?q=$latitude,$longitude($label)"))
+    if (geoIntent.resolveActivity(context.packageManager) != null) {
+        context.startActivity(geoIntent)
+    }
+}
+
 private fun cameraCapturePermissions(context: Context): Array<String> = buildList {
     if (!hasPermission(context, Manifest.permission.CAMERA)) {
         add(Manifest.permission.CAMERA)

app/src/main/java/pl/firmatpp/kierowca/ui/DriverUiRules.kt

@@ -0,0 +1,6 @@
+package pl.firmatpp.kierowca.ui
+
+import java.time.LocalDate
+
+fun canManageRoutePhotos(selectedDate: String, today: LocalDate = LocalDate.now()): Boolean =
+    runCatching { LocalDate.parse(selectedDate).isEqual(today) }.getOrDefault(false)

app/src/main/java/pl/firmatpp/kierowca/ui/DriverViewModel.kt

@@ -15,11 +15,11 @@ import pl.firmatpp.kierowca.data.model.DriverDto
 import pl.firmatpp.kierowca.data.model.DriverRouteDto
 import pl.firmatpp.kierowca.data.model.RoutePhotoDto
 
-enum class DriverScreen { Phone, Otp, Routes, Profile, Detail, Photo }
+enum class DriverScreen { Initializing, Phone, Otp, Routes, Profile, Detail, Photo }
 
 data class DriverUiState(
-    val screen: DriverScreen = DriverScreen.Phone,
-    val loading: Boolean = false,
+    val screen: DriverScreen = DriverScreen.Initializing,
+    val loading: Boolean = true,
     val refreshing: Boolean = false,
     val phone: String = "",
     val otpCode: String = "",
@@ -40,16 +40,22 @@ data class DriverUiState(
 class DriverViewModel(application: Application) : AndroidViewModel(application) {
     private val repository = DriverRepository(application)
     private val _state = MutableStateFlow(DriverUiState(loading = true))
+    private val otpAutoSubmitPolicy = OtpAutoSubmitPolicy()
     val state: StateFlow<DriverUiState> = _state
 
     init {
         viewModelScope.launch {
-            if (repository.hasToken()) refreshRoutes() else _state.update { it.copy(loading = false) }
+            if (repository.hasToken()) {
+                refreshRoutes()
+            } else {
+                _state.update { it.copy(screen = DriverScreen.Phone, loading = false) }
+            }
         }
     }
 
     fun requestOtp(phone: String) = runLoading {
         val response = repository.requestOtp(phone)
+        otpAutoSubmitPolicy.reset()
         _state.update {
             it.copy(
                 screen = DriverScreen.Otp,
@@ -68,7 +74,12 @@ class DriverViewModel(application: Application) : AndroidViewModel(application)
     }
 
     fun updateOtpCode(code: String) {
-        _state.update { it.copy(otpCode = code.filter(Char::isDigit).take(10)) }
+        val sanitized = code.filter(Char::isDigit).take(6)
+        _state.update { it.copy(otpCode = sanitized) }
+
+        if (otpAutoSubmitPolicy.shouldSubmit(sanitized, _state.value.loading)) {
+            verifyOtp(sanitized)
+        }
     }
 
     fun refreshRoutes() = loadRoutes(date = _state.value.selectedDate, showLoading = true, navigateToRoutes = true)
@@ -99,7 +110,12 @@ class DriverViewModel(application: Application) : AndroidViewModel(application)
                     )
                 }
             }.onFailure { throwable ->
-                _state.update { it.copy(error = throwable.message ?: "Wystapil blad.") }
+                _state.update {
+                    it.copy(
+                        screen = if (it.screen == DriverScreen.Initializing) DriverScreen.Phone else it.screen,
+                        error = throwable.message ?: "Wystapil blad.",
+                    )
+                }
             }
 
             _state.update {
@@ -113,6 +129,30 @@ class DriverViewModel(application: Application) : AndroidViewModel(application)
         _state.update { it.copy(screen = DriverScreen.Detail, selectedRoute = response.route, error = null) }
     }
 
+    fun refreshSelectedRoute() {
+        val routeId = _state.value.selectedRoute?.id ?: return
+
+        viewModelScope.launch {
+            _state.update { it.copy(refreshing = true, error = null) }
+
+            runCatching { repository.route(routeId) }
+                .onSuccess { response ->
+                    _state.update {
+                        it.copy(
+                            selectedRoute = response.route,
+                            routes = it.routes.map { route -> if (route.id == routeId) response.route else route },
+                            error = null,
+                        )
+                    }
+                }
+                .onFailure { throwable ->
+                    _state.update { it.copy(error = throwable.message ?: "Wystapil blad.") }
+                }
+
+            _state.update { it.copy(refreshing = false) }
+        }
+    }
+
     fun openProfile() {
         _state.update { it.copy(screen = DriverScreen.Profile, error = null) }
     }
@@ -123,6 +163,12 @@ class DriverViewModel(application: Application) : AndroidViewModel(application)
         openRoute(route.id)
     }
 
+    fun deletePhoto(photo: RoutePhotoDto) = runLoading {
+        val route = _state.value.selectedRoute ?: return@runLoading
+        repository.deletePhoto(photo.id)
+        openRoute(route.id)
+    }
+
     fun openPhoto(photo: RoutePhotoDto) {
         _state.update { it.copy(screen = DriverScreen.Photo, selectedPhoto = photo) }
     }
@@ -141,7 +187,7 @@ class DriverViewModel(application: Application) : AndroidViewModel(application)
 
     fun logout() = runLoading {
         repository.logout()
-        _state.update { DriverUiState(screen = DriverScreen.Phone) }
+        _state.update { DriverUiState(screen = DriverScreen.Phone, loading = false) }
     }
 
     private fun runLoading(block: suspend () -> Unit) {

app/src/main/java/pl/firmatpp/kierowca/ui/OtpAutoSubmitPolicy.kt

@@ -0,0 +1,27 @@
+package pl.firmatpp.kierowca.ui
+
+class OtpAutoSubmitPolicy {
+    private var lastSubmittedCode: String? = null
+
+    fun shouldSubmit(code: String, loading: Boolean): Boolean {
+        if (code.length < OTP_LENGTH) {
+            lastSubmittedCode = null
+            return false
+        }
+
+        if (loading || code.length != OTP_LENGTH || code == lastSubmittedCode) {
+            return false
+        }
+
+        lastSubmittedCode = code
+        return true
+    }
+
+    fun reset() {
+        lastSubmittedCode = null
+    }
+
+    private companion object {
+        const val OTP_LENGTH = 6
+    }
+}

app/src/main/res/drawable/ic_launcher_background.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+    <solid android:color="#F7FAF8" />
+</shape>

app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background" />
+    <foreground android:drawable="@mipmap/ic_launcher_foreground" />
+</adaptive-icon>

app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background" />
+    <foreground android:drawable="@mipmap/ic_launcher_foreground" />
+</adaptive-icon>

app/src/main/res/values/strings.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">TPP Kierowca</string>
+    <string name="app_name">Firma TPP - Kierowca</string>
 </resources>

app/src/test/java/pl/firmatpp/kierowca/ui/DriverUiRulesTest.kt

@@ -0,0 +1,23 @@
+package pl.firmatpp.kierowca.ui
+
+import java.time.LocalDate
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertTrue
+import org.junit.Test
+
+class DriverUiRulesTest {
+    private val today = LocalDate.parse("2026-06-30")
+
+    @Test
+    fun allowsPhotoActionsOnlyForTodayRouteDate() {
+        assertTrue(canManageRoutePhotos("2026-06-30", today))
+        assertFalse(canManageRoutePhotos("2026-06-29", today))
+        assertFalse(canManageRoutePhotos("2026-07-01", today))
+    }
+
+    @Test
+    fun blocksPhotoActionsWhenDateIsInvalid() {
+        assertFalse(canManageRoutePhotos("", today))
+        assertFalse(canManageRoutePhotos("not-a-date", today))
+    }
+}

app/src/test/java/pl/firmatpp/kierowca/ui/DriverUiStateTest.kt

@@ -0,0 +1,15 @@
+package pl.firmatpp.kierowca.ui
+
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertTrue
+import org.junit.Test
+
+class DriverUiStateTest {
+    @Test
+    fun startsOnInitializingScreenBeforeTokenCheckCompletes() {
+        val state = DriverUiState()
+
+        assertEquals(DriverScreen.Initializing, state.screen)
+        assertTrue(state.loading)
+    }
+}

app/src/test/java/pl/firmatpp/kierowca/ui/OtpAutoSubmitPolicyTest.kt

@@ -0,0 +1,41 @@
+package pl.firmatpp.kierowca.ui
+
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertTrue
+import org.junit.Test
+
+class OtpAutoSubmitPolicyTest {
+    @Test
+    fun submitsWhenSixthDigitIsEntered() {
+        val policy = OtpAutoSubmitPolicy()
+
+        assertFalse(policy.shouldSubmit("12345", loading = false))
+        assertTrue(policy.shouldSubmit("123456", loading = false))
+    }
+
+    @Test
+    fun submitsSmsRetrieverCodeOnlyOnceWhileItStaysTheSame() {
+        val policy = OtpAutoSubmitPolicy()
+
+        assertTrue(policy.shouldSubmit("987654", loading = false))
+        assertFalse(policy.shouldSubmit("987654", loading = false))
+    }
+
+    @Test
+    fun allowsRetryAfterCodeIsEditedBelowSixDigits() {
+        val policy = OtpAutoSubmitPolicy()
+
+        assertTrue(policy.shouldSubmit("111111", loading = false))
+        assertFalse(policy.shouldSubmit("111111", loading = false))
+        assertFalse(policy.shouldSubmit("11111", loading = false))
+        assertTrue(policy.shouldSubmit("111111", loading = false))
+    }
+
+    @Test
+    fun doesNotSubmitWhileLoadingOrForLongerCodes() {
+        val policy = OtpAutoSubmitPolicy()
+
+        assertFalse(policy.shouldSubmit("123456", loading = true))
+        assertFalse(policy.shouldSubmit("1234567", loading = false))
+    }
+}

tests/device-metadata.test.mjs

@@ -0,0 +1,27 @@
+import test from 'node:test';
+import assert from 'node:assert/strict';
+import { readFileSync } from 'node:fs';
+import { dirname, resolve } from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const root = resolve(__dirname, '..');
+
+function readSource(path) {
+  return readFileSync(resolve(root, path), 'utf8');
+}
+
+test('driver app sends Android device metadata during OTP verification', () => {
+  const models = readSource('app/src/main/java/pl/firmatpp/kierowca/data/model/DriverModels.kt');
+  const repository = readSource('app/src/main/java/pl/firmatpp/kierowca/data/DriverRepository.kt');
+  const deviceInfo = readSource('app/src/main/java/pl/firmatpp/kierowca/data/DeviceInfoProvider.kt');
+
+  assert.match(models, /data class DriverDeviceInfo/);
+  assert.match(models, /val device: DriverDeviceInfo/);
+  assert.match(repository, /DeviceInfoProvider/);
+  assert.match(repository, /deviceInfoProvider\.currentDeviceInfo/);
+  assert.match(deviceInfo, /Settings\.Secure\.ANDROID_ID/);
+  assert.match(deviceInfo, /Build\.MANUFACTURER/);
+  assert.match(deviceInfo, /Build\.MODEL/);
+  assert.match(deviceInfo, /BuildConfig\.VERSION_NAME/);
+});