Compare commits

...
4 Commits
Author SHA1 Message Date
admin 18baec5020 Ukryj galerie wedlug ustawien 2026-06-30 21:52:29 +02:00
admin 2531ff2b9f Dodaj odswiezanie i wybor daty kursow 2026-06-30 21:47:10 +02:00
admin 983a77c9fb Popraw header i ekran profilu 2026-06-30 21:20:51 +02:00
admin 780463cc3a Popraw dolna nawigacje i safe area 2026-06-30 21:12:26 +02:00
7 changed files with 304 additions and 83 deletions
+3 -2
View File
@@ -12,8 +12,8 @@ android {
applicationId = "pl.firmatpp.kierowca"
minSdk = 26
targetSdk = 35
versionCode = 3
versionName = "1.0.2"
versionCode = 7
versionName = "1.0.6"
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
buildConfigField("String", "API_BASE_URL", "\"https://api-intranet.firmatpp.pl/api/\"")
@@ -64,6 +64,7 @@ dependencies {
implementation(libs.camera.view)
implementation(libs.coil.compose)
implementation(libs.compose.material.icons.extended)
implementation("androidx.compose.material:material")
implementation(libs.compose.material3)
implementation(libs.compose.ui)
implementation(libs.compose.ui.graphics)
@@ -30,8 +30,8 @@ class DriverRepository(
return response.driver ?: error("Brak danych kierowcy.")
}
suspend fun bootstrap(): BootstrapResponse =
api.bootstrap(authHeader(requireToken()))
suspend fun bootstrap(date: String? = null): BootstrapResponse =
api.bootstrap(authHeader(requireToken()), date)
suspend fun route(routeId: String): RouteResponse =
api.route(authHeader(requireToken()), routeId)
@@ -16,6 +16,7 @@ import retrofit2.http.Multipart
import retrofit2.http.POST
import retrofit2.http.Part
import retrofit2.http.Path
import retrofit2.http.Query
interface MobileDriverApi {
@POST("mobile/driver/auth/request-otp")
@@ -28,7 +29,10 @@ interface MobileDriverApi {
suspend fun logout(@Header("Authorization") authorization: String): Map<String, Boolean>
@GET("mobile/driver/bootstrap")
suspend fun bootstrap(@Header("Authorization") authorization: String): BootstrapResponse
suspend fun bootstrap(
@Header("Authorization") authorization: String,
@Query("date") date: String?,
): BootstrapResponse
@GET("mobile/driver/routes/{routeId}")
suspend fun route(
@@ -30,6 +30,17 @@ data class DriverDto(
data class BootstrapResponse(
val session: DriverSessionDto,
val routes: RoutesBucketDto,
val driverAppSettings: DriverAppSettingsDto?,
)
data class DriverAppSettingsDto(
val minDate: String,
val maxDate: String,
val today: String,
val selectedDate: String,
val maxPastDays: Int,
val autoRefreshSeconds: Int,
val allowGalleryUploads: Boolean?,
)
data class DriverSessionDto(
@@ -9,11 +9,13 @@ import android.content.IntentFilter
import android.content.pm.PackageManager
import android.net.Uri
import android.os.Build
import androidx.activity.compose.BackHandler
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.Image
import androidx.compose.foundation.background
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
@@ -29,10 +31,13 @@ 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.navigationBarsPadding
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.statusBarsPadding
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.LazyRow
import androidx.compose.foundation.lazy.grid.GridCells
import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
import androidx.compose.foundation.lazy.grid.items
@@ -44,12 +49,12 @@ 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.material.ExperimentalMaterialApi
import androidx.compose.material.pullrefresh.PullRefreshIndicator
import androidx.compose.material.pullrefresh.pullRefresh
import androidx.compose.material.pullrefresh.rememberPullRefreshState
import androidx.compose.material3.Button
import androidx.compose.material3.ButtonDefaults
import androidx.compose.material3.Card
@@ -67,6 +72,7 @@ import androidx.compose.material3.TopAppBar
import androidx.compose.material3.TopAppBarDefaults
import androidx.compose.runtime.Composable
import androidx.compose.runtime.DisposableEffect
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.collectAsState
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
@@ -78,6 +84,7 @@ 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.res.painterResource
import androidx.compose.ui.text.font.FontFamily
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.input.KeyboardType
@@ -85,6 +92,9 @@ import androidx.compose.foundation.text.KeyboardOptions
import androidx.compose.ui.unit.dp
import androidx.core.content.ContextCompat
import androidx.core.content.FileProvider
import androidx.lifecycle.Lifecycle
import androidx.lifecycle.LifecycleEventObserver
import androidx.lifecycle.compose.LocalLifecycleOwner
import coil.compose.AsyncImage
import coil.request.ImageRequest
import com.google.android.gms.auth.api.phone.SmsRetriever
@@ -93,7 +103,9 @@ import com.google.android.gms.common.api.Status
import java.io.File
import java.time.LocalDate
import java.time.format.DateTimeFormatter
import kotlinx.coroutines.delay
import java.util.Locale
import pl.firmatpp.kierowca.R
import pl.firmatpp.kierowca.data.model.DriverRouteDto
import pl.firmatpp.kierowca.data.model.RoutePhotoDto
import pl.firmatpp.kierowca.domain.OtpCodeExtractor
@@ -103,6 +115,35 @@ import pl.firmatpp.kierowca.ui.theme.TppColors
@Composable
fun DriverApp(viewModel: DriverViewModel) {
val state by viewModel.state.collectAsState()
val lifecycleOwner = LocalLifecycleOwner.current
var appInForeground by remember { mutableStateOf(true) }
BackHandler(enabled = state.screen != DriverScreen.Phone && state.screen != DriverScreen.Routes) {
viewModel.back()
}
DisposableEffect(lifecycleOwner, state.screen) {
val observer = LifecycleEventObserver { _, event ->
when (event) {
Lifecycle.Event.ON_START -> {
appInForeground = true
if (state.screen == DriverScreen.Routes) viewModel.refreshRoutesSilently()
}
Lifecycle.Event.ON_STOP -> appInForeground = false
else -> Unit
}
}
lifecycleOwner.lifecycle.addObserver(observer)
onDispose { lifecycleOwner.lifecycle.removeObserver(observer) }
}
LaunchedEffect(state.screen, state.selectedDate, state.autoRefreshSeconds, appInForeground) {
if (state.screen != DriverScreen.Routes || !appInForeground) return@LaunchedEffect
val intervalMillis = state.autoRefreshSeconds.coerceIn(30, 600) * 1000L
while (true) {
delay(intervalMillis)
viewModel.refreshRoutesSilently()
}
}
SmsUserConsentEffect(
enabled = state.screen == DriverScreen.Phone || state.screen == DriverScreen.Otp,
onCode = viewModel::updateOtpCode,
@@ -112,7 +153,14 @@ fun DriverApp(viewModel: DriverViewModel) {
when (state.screen) {
DriverScreen.Phone -> PhoneScreen(state, viewModel::requestOtp)
DriverScreen.Otp -> OtpScreen(state, viewModel::updateOtpCode, viewModel::verifyOtp, viewModel::back)
DriverScreen.Routes -> RoutesScreen(state, viewModel::refreshRoutes, viewModel::openRoute, viewModel::logout)
DriverScreen.Routes -> RoutesScreen(
state = state,
onRefresh = viewModel::refreshRoutesSilently,
onDate = viewModel::selectRouteDate,
onProfile = viewModel::openProfile,
onRoute = viewModel::openRoute,
)
DriverScreen.Profile -> ProfileScreen(state, viewModel::refreshRoutes, viewModel::openProfile, viewModel::logout)
DriverScreen.Detail -> DetailScreen(state, viewModel::back, viewModel::uploadPhoto, viewModel::openPhoto)
DriverScreen.Photo -> PhotoScreen(state, viewModel::back)
}
@@ -179,21 +227,30 @@ private fun AuthShell(title: String, subtitle: String, onBack: (() -> Unit)? = n
}
}
@OptIn(ExperimentalMaterial3Api::class)
@OptIn(ExperimentalMaterial3Api::class, ExperimentalMaterialApi::class)
@Composable
private fun RoutesScreen(
state: DriverUiState,
onRefresh: () -> Unit,
onDate: (String) -> Unit,
onProfile: () -> Unit,
onRoute: (String) -> Unit,
onLogout: () -> Unit,
) {
Scaffold(
topBar = { StitchHeader(onRefresh = onRefresh, onLogout = onLogout) },
bottomBar = { StitchBottomBar(onRefresh = onRefresh, onLogout = onLogout) },
topBar = { StitchHeader() },
bottomBar = {
StitchBottomBar(
activeScreen = DriverScreen.Routes,
onRoutes = onRefresh,
onProfile = onProfile,
)
},
containerColor = TppColors.Surface,
) { padding ->
val pullRefreshState = rememberPullRefreshState(state.refreshing, onRefresh)
Box(Modifier.fillMaxSize().padding(padding).pullRefresh(pullRefreshState)) {
LazyColumn(
Modifier.fillMaxSize().padding(padding),
Modifier.fillMaxSize(),
contentPadding = PaddingValues(start = 16.dp, top = 24.dp, end = 16.dp, bottom = 20.dp),
verticalArrangement = Arrangement.spacedBy(18.dp),
) {
@@ -204,63 +261,67 @@ private fun RoutesScreen(
verticalAlignment = Alignment.CenterVertically,
) {
Text(
"Dzisiejsze Kursy",
routeListTitle(state.selectedDate),
style = MaterialTheme.typography.headlineLarge,
fontWeight = FontWeight.Bold,
color = TppColors.Ink,
)
DateChip()
DateChip(state.selectedDate)
}
}
item {
RouteDateSelector(
selectedDate = state.selectedDate,
minDate = state.minRouteDate,
maxDate = state.maxRouteDate,
onDate = onDate,
)
}
if (state.routes.isEmpty()) {
item { EmptyState("Brak kursow na dzisiaj") }
item { EmptyState("Brak kursow na wybrany dzien") }
} else {
items(state.routes, key = { it.id }) { route -> StitchRouteCard(route, onRoute) }
}
item { ErrorText(state.error) }
}
PullRefreshIndicator(
refreshing = state.refreshing,
state = pullRefreshState,
modifier = Modifier.align(Alignment.TopCenter),
backgroundColor = Color.White,
contentColor = TppColors.Forest,
)
}
}
}
@Composable
private fun StitchHeader(onRefresh: () -> Unit, onLogout: () -> Unit) {
Column(Modifier.fillMaxWidth().background(Color.White)) {
Row(
private fun StitchHeader() {
Column(Modifier.fillMaxWidth().background(Color.White).statusBarsPadding()) {
Box(
Modifier.fillMaxWidth().height(104.dp).padding(horizontal = 24.dp),
horizontalArrangement = Arrangement.SpaceBetween,
verticalAlignment = Alignment.CenterVertically,
contentAlignment = Alignment.Center,
) {
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))
}
TppLogo()
}
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)
}
}
private fun TppLogo() {
Image(
painter = painterResource(R.drawable.tpp5),
contentDescription = "TPP",
contentScale = ContentScale.Fit,
modifier = Modifier.width(142.dp).height(50.dp),
)
}
@Composable
private fun DateChip() {
private fun DateChip(date: String) {
val formatter = remember { DateTimeFormatter.ofPattern("d MMM", Locale("pl", "PL")) }
val label = remember { LocalDate.now().format(formatter).replace(".", "").replaceFirstChar { it.uppercase() } }
val label = remember(date) { LocalDate.parse(date).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,
@@ -271,6 +332,57 @@ private fun DateChip() {
}
}
@Composable
private fun RouteDateSelector(selectedDate: String, minDate: String, maxDate: String, onDate: (String) -> Unit) {
val dates = remember(minDate, maxDate) {
runCatching {
generateSequence(LocalDate.parse(minDate)) { date ->
val next = date.plusDays(1)
if (next <= LocalDate.parse(maxDate)) next else null
}.toList()
}.getOrElse { listOf(LocalDate.parse(selectedDate)) }
}
LazyRow(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
items(dates, key = { it.toString() }) { date ->
DateSelectorChip(
date = date,
selected = date.toString() == selectedDate,
onClick = { onDate(date.toString()) },
)
}
}
}
@Composable
private fun DateSelectorChip(date: LocalDate, selected: Boolean, onClick: () -> Unit) {
val formatter = remember { DateTimeFormatter.ofPattern("EEE d MMM", Locale("pl", "PL")) }
val label = remember(date) { date.format(formatter).replace(".", "").replaceFirstChar { it.uppercase() } }
val background = if (selected) TppColors.Forest else Color.White
val content = if (selected) Color.White else TppColors.Muted
Row(
modifier = Modifier
.background(background, RoundedCornerShape(8.dp))
.clickable(onClick = onClick)
.padding(horizontal = 14.dp, vertical = 10.dp),
verticalAlignment = Alignment.CenterVertically,
) {
Text(label, color = content, fontFamily = FontFamily.Monospace, fontWeight = FontWeight.SemiBold)
}
}
private fun routeListTitle(selectedDate: String): String {
val today = LocalDate.now()
val date = runCatching { LocalDate.parse(selectedDate) }.getOrDefault(today)
return when (date) {
today -> "Dzisiejsze Kursy"
today.plusDays(1) -> "Jutrzejsze Kursy"
else -> "Kursy"
}
}
@Composable
private fun StitchRouteCard(route: DriverRouteDto, onRoute: (String) -> Unit) {
val display = RouteDisplayMapper.toCard(route)
@@ -357,17 +469,69 @@ private fun RouteTimeline(origin: String, destination: String) {
}
@Composable
private fun StitchBottomBar(onRefresh: () -> Unit, onLogout: () -> Unit) {
Column(Modifier.fillMaxWidth().background(Color.White)) {
private fun ProfileScreen(
state: DriverUiState,
onRoutes: () -> Unit,
onProfile: () -> Unit,
onLogout: () -> Unit,
) {
Scaffold(
topBar = { StitchHeader() },
bottomBar = {
StitchBottomBar(
activeScreen = DriverScreen.Profile,
onRoutes = onRoutes,
onProfile = onProfile,
)
},
containerColor = TppColors.Surface,
) { padding ->
Column(
Modifier
.fillMaxSize()
.padding(padding)
.padding(horizontal = 20.dp, vertical = 24.dp),
verticalArrangement = Arrangement.spacedBy(18.dp),
) {
Card(
modifier = Modifier.fillMaxWidth(),
colors = CardDefaults.cardColors(containerColor = Color.White),
shape = RoundedCornerShape(8.dp),
border = BorderStroke(1.dp, TppColors.Outline),
) {
Column(Modifier.padding(24.dp), verticalArrangement = Arrangement.spacedBy(12.dp)) {
Icon(Icons.Outlined.Person, contentDescription = null, tint = TppColors.Forest, modifier = Modifier.size(34.dp))
Text(
"Witaj ${state.driver?.displayName.orEmpty().ifBlank { "Kierowco" }}",
style = MaterialTheme.typography.headlineSmall,
fontWeight = FontWeight.Bold,
color = TppColors.Ink,
)
}
}
Button(
onClick = onLogout,
modifier = Modifier.fillMaxWidth().height(56.dp),
colors = ButtonDefaults.buttonColors(containerColor = TppColors.Forest),
shape = RoundedCornerShape(4.dp),
) {
Text("Wyloguj", fontWeight = FontWeight.Bold)
}
}
}
}
@Composable
private fun StitchBottomBar(activeScreen: DriverScreen, onRoutes: () -> Unit, onProfile: () -> Unit) {
Column(Modifier.fillMaxWidth().background(Color.White).navigationBarsPadding()) {
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)
BottomNavItem("Zlecenia", Icons.Outlined.LocalShipping, active = activeScreen == DriverScreen.Routes, onClick = onRoutes)
BottomNavItem("Profil", Icons.Outlined.Person, active = activeScreen == DriverScreen.Profile, onClick = onProfile)
}
}
}
@@ -421,6 +585,7 @@ private fun DetailScreen(
Scaffold(
topBar = {
TopAppBar(
modifier = Modifier.statusBarsPadding(),
title = { Text("Szczegoly kursu") },
navigationIcon = { IconButton(onClick = onBack) { Icon(Icons.Outlined.ArrowBack, contentDescription = "Wstecz") } },
colors = TopAppBarDefaults.topAppBarColors(containerColor = TppColors.Surface),
@@ -438,7 +603,7 @@ private fun DetailScreen(
item {
Text("Zdjecia ladunku", style = MaterialTheme.typography.titleLarge, fontWeight = FontWeight.Bold)
Spacer(Modifier.height(12.dp))
PhotoGrid(route.photos, state.imageAuthHeader, onPhoto, onCamera = {
PhotoGrid(route.photos, state.imageAuthHeader, state.allowGalleryUploads, onPhoto, onCamera = {
val newUri = createCameraUri(context)
cameraUri = newUri
if (ContextCompat.checkSelfPermission(context, Manifest.permission.CAMERA) == PackageManager.PERMISSION_GRANTED) {
@@ -472,6 +637,7 @@ private fun ManifestSection(route: DriverRouteDto) {
private fun PhotoGrid(
photos: List<RoutePhotoDto>,
imageAuthHeader: String?,
allowGalleryUploads: Boolean,
onPhoto: (RoutePhotoDto) -> Unit,
onCamera: () -> Unit,
onGallery: () -> Unit,
@@ -483,7 +649,9 @@ private fun PhotoGrid(
horizontalArrangement = Arrangement.spacedBy(12.dp),
) {
item { ActionTile("Aparat", Icons.Outlined.CameraAlt, onCamera) }
if (allowGalleryUploads) {
item { ActionTile("Galeria", Icons.Outlined.AddPhotoAlternate, onGallery) }
}
items(photos, key = { it.id }) { photo ->
AsyncImage(
model = imageRequest(photo.url, imageAuthHeader),
@@ -516,6 +684,7 @@ private fun PhotoScreen(state: DriverUiState, onBack: () -> Unit) {
Scaffold(
topBar = {
TopAppBar(
modifier = Modifier.statusBarsPadding(),
title = { Text("Podglad zdjecia") },
navigationIcon = { IconButton(onClick = onBack) { Icon(Icons.Outlined.ArrowBack, contentDescription = "Wstecz") } },
colors = TopAppBarDefaults.topAppBarColors(containerColor = Color.Black, titleContentColor = Color.White, navigationIconContentColor = Color.White),
@@ -8,21 +8,28 @@ import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.StateFlow
import kotlinx.coroutines.flow.update
import kotlinx.coroutines.launch
import java.time.LocalDate
import pl.firmatpp.kierowca.data.DriverRepository
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, Detail, Photo }
enum class DriverScreen { Phone, Otp, Routes, Profile, Detail, Photo }
data class DriverUiState(
val screen: DriverScreen = DriverScreen.Phone,
val loading: Boolean = false,
val refreshing: Boolean = false,
val phone: String = "",
val otpCode: String = "",
val maskedPhone: String = "",
val driver: DriverDto? = null,
val routes: List<DriverRouteDto> = emptyList(),
val selectedDate: String = LocalDate.now().toString(),
val minRouteDate: String = LocalDate.now().minusDays(7).toString(),
val maxRouteDate: String = LocalDate.now().plusDays(1).toString(),
val autoRefreshSeconds: Int = 60,
val allowGalleryUploads: Boolean = true,
val selectedRoute: DriverRouteDto? = null,
val selectedPhoto: RoutePhotoDto? = null,
val imageAuthHeader: String? = null,
@@ -63,17 +70,41 @@ class DriverViewModel(application: Application) : AndroidViewModel(application)
_state.update { it.copy(otpCode = code.filter(Char::isDigit).take(10)) }
}
fun refreshRoutes() = runLoading {
val response = repository.bootstrap()
fun refreshRoutes() = loadRoutes(date = _state.value.selectedDate, showLoading = true, navigateToRoutes = true)
fun refreshRoutesSilently() = loadRoutes(date = _state.value.selectedDate, showLoading = false, navigateToRoutes = false)
fun selectRouteDate(date: String) = loadRoutes(date = date, showLoading = true, navigateToRoutes = true)
private fun loadRoutes(date: String?, showLoading: Boolean, navigateToRoutes: Boolean) {
viewModelScope.launch {
_state.update { it.copy(loading = showLoading, refreshing = !showLoading, error = null) }
runCatching {
val response = repository.bootstrap(date)
val settings = response.driverAppSettings
_state.update {
it.copy(
screen = DriverScreen.Routes,
screen = if (navigateToRoutes) DriverScreen.Routes else it.screen,
driver = response.session.driver,
routes = response.routes.today,
selectedDate = settings?.selectedDate ?: date ?: it.selectedDate,
minRouteDate = settings?.minDate ?: it.minRouteDate,
maxRouteDate = settings?.maxDate ?: it.maxRouteDate,
autoRefreshSeconds = settings?.autoRefreshSeconds ?: it.autoRefreshSeconds,
allowGalleryUploads = settings?.allowGalleryUploads ?: it.allowGalleryUploads,
imageAuthHeader = repository.imageAuthHeader(),
error = null,
)
}
}.onFailure { throwable ->
_state.update { it.copy(error = throwable.message ?: "Wystapil blad.") }
}
_state.update {
it.copy(loading = false, refreshing = false)
}
}
}
fun openRoute(routeId: String) = runLoading {
@@ -81,6 +112,10 @@ class DriverViewModel(application: Application) : AndroidViewModel(application)
_state.update { it.copy(screen = DriverScreen.Detail, selectedRoute = response.route, error = null) }
}
fun openProfile() {
_state.update { it.copy(screen = DriverScreen.Profile, error = null) }
}
fun uploadPhoto(uri: Uri, source: String) = runLoading {
val route = _state.value.selectedRoute ?: return@runLoading
repository.uploadPhoto(route.id, uri, source)
@@ -96,6 +131,7 @@ class DriverViewModel(application: Application) : AndroidViewModel(application)
when (it.screen) {
DriverScreen.Photo -> it.copy(screen = DriverScreen.Detail, selectedPhoto = null)
DriverScreen.Detail -> it.copy(screen = DriverScreen.Routes, selectedRoute = null)
DriverScreen.Profile -> it.copy(screen = DriverScreen.Routes)
DriverScreen.Otp -> it.copy(screen = DriverScreen.Phone)
else -> it
}
Binary file not shown.

After

Width:  |  Height:  |  Size: 1010 KiB