Odwzoruj listę kursów ze Stitch

app/build.gradle.kts

@@ -12,8 +12,8 @@ android {
         applicationId = "pl.firmatpp.kierowca"
         minSdk = 26
         targetSdk = 35
-        versionCode = 1
-        versionName = "1.0.0"
+        versionCode = 3
+        versionName = "1.0.2"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
 
         buildConfigField("String", "API_BASE_URL", "\"https://api-intranet.firmatpp.pl/api/\"")
@@ -71,6 +71,8 @@ dependencies {
     implementation(libs.coroutines.android)
     implementation(libs.okhttp)
     implementation(libs.okhttp.logging)
+    implementation(libs.play.services.auth)
+    implementation(libs.play.services.auth.api.phone)
     implementation(libs.retrofit)
     implementation(libs.retrofit.gson)
 

app/src/main/java/pl/firmatpp/kierowca/domain/OtpCodeExtractor.kt

@@ -0,0 +1,8 @@
+package pl.firmatpp.kierowca.domain
+
+object OtpCodeExtractor {
+    private val codePattern = Regex("""(?<!\d)\d{4,10}(?!\d)""")
+
+    fun extract(message: String): String? =
+        codePattern.find(message)?.value
+}

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

@@ -1,26 +1,37 @@
 package pl.firmatpp.kierowca.ui
 
+import android.Manifest
+import android.app.Activity
+import android.content.BroadcastReceiver
 import android.content.Context
+import android.content.Intent
+import android.content.IntentFilter
+import android.content.pm.PackageManager
 import android.net.Uri
-import androidx.activity.compose.ManagedActivityResultLauncher
+import android.os.Build
 import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.result.PickVisualMediaRequest
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.compose.foundation.background
+import androidx.compose.foundation.BorderStroke
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.ColumnScope
+import androidx.compose.foundation.layout.IntrinsicSize
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.aspectRatio
+import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.heightIn
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.grid.GridCells
 import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
@@ -31,16 +42,21 @@ 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.LocalShipping
 import androidx.compose.material.icons.outlined.Logout
+import androidx.compose.material.icons.outlined.Menu
+import androidx.compose.material.icons.outlined.Person
 import androidx.compose.material.icons.outlined.Phone
 import androidx.compose.material.icons.outlined.Refresh
+import androidx.compose.material.icons.outlined.TaskAlt
 import androidx.compose.material3.Button
 import androidx.compose.material3.ButtonDefaults
 import androidx.compose.material3.Card
 import androidx.compose.material3.CardDefaults
 import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
@@ -50,7 +66,7 @@ import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBar
 import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
@@ -59,6 +75,7 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.text.font.FontFamily
@@ -66,23 +83,35 @@ 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.core.content.ContextCompat
 import androidx.core.content.FileProvider
 import coil.compose.AsyncImage
 import coil.request.ImageRequest
+import com.google.android.gms.auth.api.phone.SmsRetriever
+import com.google.android.gms.common.api.CommonStatusCodes
+import com.google.android.gms.common.api.Status
 import java.io.File
+import java.time.LocalDate
+import java.time.format.DateTimeFormatter
+import java.util.Locale
 import pl.firmatpp.kierowca.data.model.DriverRouteDto
 import pl.firmatpp.kierowca.data.model.RoutePhotoDto
+import pl.firmatpp.kierowca.domain.OtpCodeExtractor
 import pl.firmatpp.kierowca.domain.RouteDisplayMapper
 import pl.firmatpp.kierowca.ui.theme.TppColors
 
 @Composable
 fun DriverApp(viewModel: DriverViewModel) {
     val state by viewModel.state.collectAsState()
+    SmsUserConsentEffect(
+        enabled = state.screen == DriverScreen.Phone || state.screen == DriverScreen.Otp,
+        onCode = viewModel::updateOtpCode,
+    )
 
     Box(Modifier.fillMaxSize().background(TppColors.Surface)) {
         when (state.screen) {
             DriverScreen.Phone -> PhoneScreen(state, viewModel::requestOtp)
-            DriverScreen.Otp -> OtpScreen(state, viewModel::verifyOtp, viewModel::back)
+            DriverScreen.Otp -> OtpScreen(state, viewModel::updateOtpCode, viewModel::verifyOtp, viewModel::back)
             DriverScreen.Routes -> RoutesScreen(state, viewModel::refreshRoutes, viewModel::openRoute, viewModel::logout)
             DriverScreen.Detail -> DetailScreen(state, viewModel::back, viewModel::uploadPhoto, viewModel::openPhoto)
             DriverScreen.Photo -> PhotoScreen(state, viewModel::back)
@@ -110,24 +139,30 @@ private fun PhoneScreen(state: DriverUiState, onSubmit: (String) -> Unit) {
             singleLine = true,
         )
         ErrorText(state.error)
+        Spacer(Modifier.height(if (state.error.isNullOrBlank()) 18.dp else 8.dp))
         PrimaryButton("Wyslij kod") { onSubmit(phone) }
     }
 }
 
 @Composable
-private fun OtpScreen(state: DriverUiState, onSubmit: (String) -> Unit, onBack: () -> Unit) {
-    var code by remember { mutableStateOf("") }
+private fun OtpScreen(
+    state: DriverUiState,
+    onCodeChange: (String) -> Unit,
+    onSubmit: (String) -> Unit,
+    onBack: () -> Unit,
+) {
     AuthShell(title = "Kod SMS", subtitle = "Wpisz kod wyslany na ${state.maskedPhone}.", onBack = onBack) {
         OutlinedTextField(
-            value = code,
-            onValueChange = { code = it.filter(Char::isDigit).take(6) },
+            value = state.otpCode,
+            onValueChange = { onCodeChange(it) },
             label = { Text("Kod OTP") },
             keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.NumberPassword),
             modifier = Modifier.fillMaxWidth(),
             singleLine = true,
         )
         ErrorText(state.error)
-        PrimaryButton("Zaloguj") { onSubmit(code) }
+        Spacer(Modifier.height(if (state.error.isNullOrBlank()) 18.dp else 8.dp))
+        PrimaryButton("Zaloguj") { onSubmit(state.otpCode) }
     }
 }
 
@@ -153,30 +188,34 @@ private fun RoutesScreen(
     onLogout: () -> Unit,
 ) {
     Scaffold(
-        topBar = {
-            TopAppBar(
-                title = { Text("Dzisiejsze kursy") },
-                actions = {
-                    IconButton(onClick = onRefresh) { Icon(Icons.Outlined.Refresh, contentDescription = "Odswiez") }
-                    IconButton(onClick = onLogout) { Icon(Icons.Outlined.Logout, contentDescription = "Wyloguj") }
-                },
-                colors = TopAppBarDefaults.topAppBarColors(containerColor = TppColors.Surface),
-            )
-        },
+        topBar = { StitchHeader(onRefresh = onRefresh, onLogout = onLogout) },
+        bottomBar = { StitchBottomBar(onRefresh = onRefresh, onLogout = onLogout) },
         containerColor = TppColors.Surface,
     ) { padding ->
         LazyColumn(
             Modifier.fillMaxSize().padding(padding),
-            contentPadding = PaddingValues(16.dp),
-            verticalArrangement = Arrangement.spacedBy(16.dp),
+            contentPadding = PaddingValues(start = 16.dp, top = 24.dp, end = 16.dp, bottom = 20.dp),
+            verticalArrangement = Arrangement.spacedBy(18.dp),
         ) {
             item {
-                Text("Kierowca: ${state.driver?.displayName.orEmpty()}", color = TppColors.Muted)
+                Row(
+                    Modifier.fillMaxWidth(),
+                    horizontalArrangement = Arrangement.SpaceBetween,
+                    verticalAlignment = Alignment.CenterVertically,
+                ) {
+                    Text(
+                        "Dzisiejsze Kursy",
+                        style = MaterialTheme.typography.headlineLarge,
+                        fontWeight = FontWeight.Bold,
+                        color = TppColors.Ink,
+                    )
+                    DateChip()
+                }
             }
             if (state.routes.isEmpty()) {
                 item { EmptyState("Brak kursow na dzisiaj") }
             } else {
-                items(state.routes, key = { it.id }) { route -> RouteCard(route, onRoute) }
+                items(state.routes, key = { it.id }) { route -> StitchRouteCard(route, onRoute) }
             }
             item { ErrorText(state.error) }
         }
@@ -184,24 +223,176 @@ private fun RoutesScreen(
 }
 
 @Composable
-private fun RouteCard(route: DriverRouteDto, onRoute: (String) -> Unit) {
+private fun StitchHeader(onRefresh: () -> Unit, onLogout: () -> Unit) {
+    Column(Modifier.fillMaxWidth().background(Color.White)) {
+        Row(
+            Modifier.fillMaxWidth().height(104.dp).padding(horizontal = 24.dp),
+            horizontalArrangement = Arrangement.SpaceBetween,
+            verticalAlignment = Alignment.CenterVertically,
+        ) {
+            IconButton(onClick = onRefresh) {
+                Icon(Icons.Outlined.Menu, contentDescription = "Menu", tint = TppColors.Muted, modifier = Modifier.size(32.dp))
+            }
+            TppWordmark()
+            IconButton(onClick = onLogout) {
+                Icon(Icons.Outlined.Person, contentDescription = "Profil", tint = TppColors.Muted, modifier = Modifier.size(32.dp))
+            }
+        }
+        HorizontalDivider(color = TppColors.Outline.copy(alpha = 0.8f), thickness = 2.dp)
+    }
+}
+
+@Composable
+private fun TppWordmark() {
+    Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(8.dp)) {
+        Column(verticalArrangement = Arrangement.spacedBy(3.dp)) {
+            repeat(3) {
+                Box(Modifier.width(28.dp).height(4.dp).background(TppColors.Forest))
+            }
+        }
+        Column(horizontalAlignment = Alignment.CenterHorizontally) {
+            Text("FIRMA", color = TppColors.LogoLeaf, fontFamily = FontFamily.Monospace, fontWeight = FontWeight.Bold)
+            Text("TPP", color = TppColors.Ink, style = MaterialTheme.typography.headlineLarge, fontWeight = FontWeight.Black)
+        }
+    }
+}
+
+@Composable
+private fun DateChip() {
+    val formatter = remember { DateTimeFormatter.ofPattern("d MMM", Locale("pl", "PL")) }
+    val label = remember { LocalDate.now().format(formatter).replace(".", "").replaceFirstChar { it.uppercase() } }
+    Row(
+        modifier = Modifier.background(TppColors.Panel, RoundedCornerShape(12.dp)).padding(horizontal = 16.dp, vertical = 12.dp),
+        verticalAlignment = Alignment.CenterVertically,
+        horizontalArrangement = Arrangement.spacedBy(10.dp),
+    ) {
+        Icon(Icons.Outlined.CalendarToday, contentDescription = null, tint = TppColors.Forest)
+        Text(label, fontFamily = FontFamily.Monospace, color = TppColors.Muted, fontWeight = FontWeight.SemiBold)
+    }
+}
+
+@Composable
+private fun StitchRouteCard(route: DriverRouteDto, onRoute: (String) -> Unit) {
     val display = RouteDisplayMapper.toCard(route)
+    val stripColor = routeStatusColor(route.status)
     Card(
-        modifier = Modifier.fillMaxWidth().clickable { onRoute(route.id) },
+        modifier = Modifier.fillMaxWidth(),
         colors = CardDefaults.cardColors(containerColor = Color.White),
         shape = RoundedCornerShape(8.dp),
-        border = CardDefaults.outlinedCardBorder(),
+        border = BorderStroke(1.dp, TppColors.Outline),
     ) {
-        Row(Modifier.fillMaxWidth()) {
-            Box(Modifier.size(width = 5.dp, height = 132.dp).background(TppColors.Forest))
-            Column(Modifier.padding(18.dp), verticalArrangement = Arrangement.spacedBy(8.dp)) {
-                Text(display.time, fontFamily = FontFamily.Monospace, color = TppColors.Navy, fontWeight = FontWeight.Bold)
-                Text("${display.origin} -> ${display.destination}", style = MaterialTheme.typography.titleLarge, fontWeight = FontWeight.Bold)
-                Text(display.contractLabel, fontFamily = FontFamily.Monospace, color = TppColors.Muted)
-                Text(listOf(display.status, display.distanceLabel).filter { it.isNotBlank() }.joinToString(" / "), color = TppColors.Muted)
+        Row(Modifier.fillMaxWidth().height(IntrinsicSize.Min)) {
+            Box(
+                Modifier
+                    .fillMaxHeight()
+                    .width(8.dp)
+                    .background(stripColor, RoundedCornerShape(topStart = 8.dp, bottomStart = 8.dp)),
+            )
+            Column(Modifier.fillMaxWidth()) {
+                Column(Modifier.padding(start = 24.dp, top = 24.dp, end = 24.dp, bottom = 20.dp)) {
+                    Row(
+                        Modifier.fillMaxWidth(),
+                        horizontalArrangement = Arrangement.SpaceBetween,
+                        verticalAlignment = Alignment.CenterVertically,
+                    ) {
+                        StatusChip(route.status, stripColor)
+                        Text(
+                            "Kontrakt: #${display.contractLabel.trimStart('#')}",
+                            fontFamily = FontFamily.Monospace,
+                            color = TppColors.Ink,
+                            fontWeight = FontWeight.SemiBold,
+                        )
+                    }
+                    Spacer(Modifier.height(26.dp))
+                    RouteTimeline(display.origin, display.destination)
+                }
+                HorizontalDivider(color = TppColors.Outline.copy(alpha = 0.55f))
+                Button(
+                    onClick = { onRoute(route.id) },
+                    modifier = Modifier.fillMaxWidth().padding(16.dp).height(56.dp),
+                    colors = ButtonDefaults.buttonColors(containerColor = stripColor),
+                    shape = RoundedCornerShape(4.dp),
+                ) {
+                    Text("Szczegóły  →", fontFamily = FontFamily.Monospace, fontWeight = FontWeight.Bold)
                 }
             }
         }
+    }
+}
+
+@Composable
+private fun StatusChip(status: String, color: Color) {
+    Text(
+        status.ifBlank { "NOWY" }.uppercase(Locale("pl", "PL")),
+        modifier = Modifier
+            .background(color.copy(alpha = 0.18f), RoundedCornerShape(3.dp))
+            .padding(horizontal = 14.dp, vertical = 8.dp),
+        color = color,
+        fontFamily = FontFamily.Monospace,
+        fontWeight = FontWeight.Bold,
+    )
+}
+
+@Composable
+private fun RouteTimeline(origin: String, destination: String) {
+    Row(horizontalArrangement = Arrangement.spacedBy(14.dp)) {
+        Column(horizontalAlignment = Alignment.CenterHorizontally) {
+            Box(Modifier.size(18.dp).background(Color.White, RoundedCornerShape(50)).padding(3.dp)) {
+                Box(Modifier.fillMaxSize().background(TppColors.Forest, RoundedCornerShape(50)))
+            }
+            Box(Modifier.width(3.dp).height(64.dp).background(TppColors.Outline.copy(alpha = 0.8f)))
+            Box(Modifier.size(18.dp).background(TppColors.Navy, RoundedCornerShape(50)))
+        }
+        Column(verticalArrangement = Arrangement.spacedBy(30.dp)) {
+            Column {
+                Text("SKĄD", color = TppColors.Muted, fontFamily = FontFamily.Monospace, fontWeight = FontWeight.Bold)
+                Text(origin, style = MaterialTheme.typography.titleLarge, color = TppColors.Ink, fontWeight = FontWeight.Bold)
+            }
+            Column {
+                Text("DOKĄD", color = TppColors.Muted, fontFamily = FontFamily.Monospace, fontWeight = FontWeight.Bold)
+                Text(destination, style = MaterialTheme.typography.titleLarge, color = TppColors.Ink, fontWeight = FontWeight.Bold)
+            }
+        }
+    }
+}
+
+@Composable
+private fun StitchBottomBar(onRefresh: () -> Unit, onLogout: () -> Unit) {
+    Column(Modifier.fillMaxWidth().background(Color.White)) {
+        HorizontalDivider(color = TppColors.Outline.copy(alpha = 0.9f), thickness = 2.dp)
+        Row(
+            Modifier.fillMaxWidth().height(82.dp),
+            horizontalArrangement = Arrangement.SpaceEvenly,
+            verticalAlignment = Alignment.CenterVertically,
+        ) {
+            BottomNavItem("Zlecenia", Icons.Outlined.TaskAlt, active = true, onClick = onRefresh)
+            BottomNavItem("Trasy", Icons.Outlined.LocalShipping, active = false, onClick = onRefresh)
+            BottomNavItem("Profil", Icons.Outlined.Person, active = false, onClick = onLogout)
+        }
+    }
+}
+
+@Composable
+private fun BottomNavItem(label: String, icon: ImageVector, active: Boolean, onClick: () -> Unit) {
+    Column(
+        modifier = Modifier.heightIn(min = 64.dp).clickable(onClick = onClick).padding(horizontal = 18.dp),
+        horizontalAlignment = Alignment.CenterHorizontally,
+        verticalArrangement = Arrangement.Center,
+    ) {
+        Icon(icon, contentDescription = label, tint = if (active) TppColors.Forest else TppColors.Muted)
+        Spacer(Modifier.height(6.dp))
+        Text(label, color = if (active) TppColors.Forest else TppColors.Muted, fontFamily = FontFamily.Monospace)
+    }
+}
+
+private fun routeStatusColor(status: String): Color {
+    val normalized = status.uppercase(Locale("pl", "PL"))
+    return when {
+        "NOW" in normalized -> TppColors.Navy
+        "ZAK" in normalized || "GOT" in normalized -> TppColors.Forest
+        "TRAK" in normalized || "START" in normalized -> Color(0xFFF5B800)
+        else -> TppColors.Forest
+    }
 }
 
 @OptIn(ExperimentalMaterial3Api::class)
@@ -218,6 +409,10 @@ private fun DetailScreen(
         val capturedUri = cameraUri
         if (ok && capturedUri != null) onUpload(capturedUri, "camera")
     }
+    val cameraPermissionLauncher = rememberLauncherForActivityResult(ActivityResultContracts.RequestPermission()) { granted ->
+        val pendingUri = cameraUri
+        if (granted && pendingUri != null) cameraLauncher.launch(pendingUri)
+    }
     val pickerLauncher = rememberLauncherForActivityResult(ActivityResultContracts.PickVisualMedia()) { uri ->
         if (uri != null) onUpload(uri, "gallery")
     }
@@ -246,7 +441,11 @@ private fun DetailScreen(
                 PhotoGrid(route.photos, state.imageAuthHeader, onPhoto, onCamera = {
                     val newUri = createCameraUri(context)
                     cameraUri = newUri
+                    if (ContextCompat.checkSelfPermission(context, Manifest.permission.CAMERA) == PackageManager.PERMISSION_GRANTED) {
                         cameraLauncher.launch(newUri)
+                    } else {
+                        cameraPermissionLauncher.launch(Manifest.permission.CAMERA)
+                    }
                 }, onGallery = {
                     pickerLauncher.launch(PickVisualMediaRequest(ActivityResultContracts.PickVisualMedia.ImageOnly))
                 })
@@ -361,6 +560,68 @@ private fun createCameraUri(context: Context): Uri {
     return FileProvider.getUriForFile(context, "${context.packageName}.fileprovider", file)
 }
 
+@Composable
+private fun SmsUserConsentEffect(enabled: Boolean, onCode: (String) -> Unit) {
+    val context = LocalContext.current
+    val launcher = rememberLauncherForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
+        if (result.resultCode == Activity.RESULT_OK) {
+            val message = result.data?.getStringExtra(SmsRetriever.EXTRA_SMS_MESSAGE).orEmpty()
+            OtpCodeExtractor.extract(message)?.let(onCode)
+        }
+    }
+
+    DisposableEffect(enabled, context) {
+        if (!enabled) return@DisposableEffect onDispose { }
+
+        SmsRetriever.getClient(context).startSmsUserConsent(null)
+
+        val receiver = object : BroadcastReceiver() {
+            override fun onReceive(receiverContext: Context?, intent: Intent?) {
+                if (intent?.action != SmsRetriever.SMS_RETRIEVED_ACTION) return
+
+                val status = intent.smsRetrieverStatus() ?: return
+                if (status.statusCode != CommonStatusCodes.SUCCESS) return
+
+                intent.smsConsentIntent()?.let(launcher::launch)
+            }
+        }
+
+        val filter = IntentFilter(SmsRetriever.SMS_RETRIEVED_ACTION)
+        ContextCompat.registerReceiver(
+            context,
+            receiver,
+            filter,
+            SmsRetriever.SEND_PERMISSION,
+            null,
+            ContextCompat.RECEIVER_EXPORTED,
+        )
+
+        onDispose {
+            runCatching { context.unregisterReceiver(receiver) }
+        }
+    }
+}
+
+private fun Intent.smsRetrieverStatus(): Status? {
+    val extras = extras ?: return null
+    @Suppress("DEPRECATION")
+    return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+        extras.getParcelable(SmsRetriever.EXTRA_STATUS, Status::class.java)
+    } else {
+        extras.getParcelable(SmsRetriever.EXTRA_STATUS)
+    }
+}
+
+private fun Intent.smsConsentIntent(): Intent? {
+    val extras = extras ?: return null
+    @Suppress("DEPRECATION")
+    return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+        extras.getParcelable(SmsRetriever.EXTRA_CONSENT_INTENT, Intent::class.java)
+    } else {
+        extras.getParcelable(SmsRetriever.EXTRA_CONSENT_INTENT)
+    }
+}
+
 @Composable
 private fun imageRequest(url: String?, authorization: String?): ImageRequest {
     val context = LocalContext.current

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

@@ -19,6 +19,7 @@ data class DriverUiState(
     val screen: DriverScreen = DriverScreen.Phone,
     val loading: Boolean = false,
     val phone: String = "",
+    val otpCode: String = "",
     val maskedPhone: String = "",
     val driver: DriverDto? = null,
     val routes: List<DriverRouteDto> = emptyList(),
@@ -45,6 +46,7 @@ class DriverViewModel(application: Application) : AndroidViewModel(application)
             it.copy(
                 screen = DriverScreen.Otp,
                 phone = phone,
+                otpCode = "",
                 maskedPhone = response.phoneMasked.orEmpty(),
                 error = null,
             )
@@ -57,6 +59,10 @@ class DriverViewModel(application: Application) : AndroidViewModel(application)
         refreshRoutes()
     }
 
+    fun updateOtpCode(code: String) {
+        _state.update { it.copy(otpCode = code.filter(Char::isDigit).take(10)) }
+    }
+
     fun refreshRoutes() = runLoading {
         val response = repository.bootstrap()
         _state.update {

app/src/test/java/pl/firmatpp/kierowca/domain/OtpCodeExtractorTest.kt

@@ -0,0 +1,20 @@
+package pl.firmatpp.kierowca.domain
+
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertNull
+import org.junit.Test
+
+class OtpCodeExtractorTest {
+    @Test
+    fun extractsFourToTenDigitOtpFromSmsBody() {
+        assertEquals("1234", OtpCodeExtractor.extract("Kod TPP: 1234"))
+        assertEquals("987654", OtpCodeExtractor.extract("Twoj kod weryfikacyjny to 987654."))
+        assertEquals("1234567890", OtpCodeExtractor.extract("Code 1234567890"))
+    }
+
+    @Test
+    fun ignoresNumbersThatAreTooShortOrTooLong() {
+        assertNull(OtpCodeExtractor.extract("Kod 123"))
+        assertNull(OtpCodeExtractor.extract("Kod 12345678901"))
+    }
+}

gradle/libs.versions.toml

@@ -13,6 +13,8 @@ datastore = "1.1.1"
 coil = "2.7.0"
 camerax = "1.4.1"
 work = "2.10.0"
+playServicesAuth = "21.6.0"
+playServicesAuthApiPhone = "18.3.0"
 junit = "4.13.2"
 
 [libraries]
@@ -40,6 +42,8 @@ coroutines-test = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-
 junit = { group = "junit", name = "junit", version.ref = "junit" }
 okhttp = { group = "com.squareup.okhttp3", name = "okhttp", version.ref = "okhttp" }
 okhttp-logging = { group = "com.squareup.okhttp3", name = "logging-interceptor", version.ref = "okhttp" }
+play-services-auth = { group = "com.google.android.gms", name = "play-services-auth", version.ref = "playServicesAuth" }
+play-services-auth-api-phone = { group = "com.google.android.gms", name = "play-services-auth-api-phone", version.ref = "playServicesAuthApiPhone" }
 retrofit = { group = "com.squareup.retrofit2", name = "retrofit", version.ref = "retrofit" }
 retrofit-gson = { group = "com.squareup.retrofit2", name = "converter-gson", version.ref = "retrofit" }