Driver app tour details

.eslintignore

@@ -13,3 +13,5 @@ package-lock.json
 yarn.lock
 
 taxidriver-android-app
+
+/src/lib/motis

.gitignore

@@ -14,3 +14,4 @@ booking-generator/test
 .vscode
 /driver-app/.gradle/
 /driver-app/.idea
+/driver-app/local.properties

.prettierignore

@@ -5,5 +5,5 @@ yarn.lock
 src/lib/components/*
 .github/*
 migrations/*
-
+src/lib/motis
 taxidriver-android-app

docker-compose.yml

@@ -1,7 +1,7 @@
 version: '3'
 services:
   pg:
-    image: postgis/postgis
+    image: postgis/postgis:16-3.4
     restart: always
     container_name: pg
     ports:

driver-app/app/src/main/java/de/motis/prima/Home.kt

@@ -2,6 +2,7 @@ package de.motis.prima
 
 import android.util.Log
 import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
@@ -11,16 +12,29 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.width
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.automirrored.outlined.ExitToApp
+import androidx.compose.material.icons.automirrored.filled.ArrowBack
+import androidx.compose.material.icons.filled.MoreVert
 import androidx.compose.material3.Button
+import androidx.compose.material3.CenterAlignedTopAppBar
+import androidx.compose.material3.DropdownMenu
+import androidx.compose.material3.DropdownMenuItem
+import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
-import androidx.compose.material3.TextButton
+import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.ui.Alignment
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.lifecycle.ViewModel
@@ -50,9 +64,11 @@ class HomeViewModel : ViewModel() {
     }
 }
 
+@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun Home(
     navController: NavController,
+    vehiclesViewModel: VehiclesViewModel,
     viewModel: HomeViewModel = androidx.lifecycle.viewmodel.compose.viewModel()
 ) {
     LaunchedEffect(key1 = viewModel) {
@@ -66,48 +82,111 @@ fun Home(
         }
     }
 
+    var dropdownExpanded by remember {
+        mutableStateOf(false)
+    }
+
     Scaffold(
-        modifier = Modifier
-            .fillMaxSize()
-    ) { contentPadding ->
+        topBar = {
+            CenterAlignedTopAppBar(
+                colors = TopAppBarDefaults.centerAlignedTopAppBarColors(
+                    containerColor = MaterialTheme.colorScheme.primaryContainer,
+                    titleContentColor = MaterialTheme.colorScheme.primary,
+                ),
+                title = {
+                    Text(
+                        "Home",
+                        maxLines = 1,
+                        overflow = TextOverflow.Ellipsis
+                    )
+                },
+                navigationIcon = {
+                    IconButton(onClick = { navController.navigate("home") }) {
+                        Icon(
+                            imageVector = Icons.AutoMirrored.Filled.ArrowBack,
+                            contentDescription = "Localized description"
+                        )
+                    }
+                },
+                actions = {
+                    IconButton(onClick = { dropdownExpanded = !dropdownExpanded }) {
+                        Icon(Icons.Filled.MoreVert, contentDescription = "More Options")
+                    }
+                    DropdownMenu(
+                        expanded = dropdownExpanded,
+                        onDismissRequest = { dropdownExpanded = false }
+                    ) {
+                        DropdownMenuItem(
+                            onClick = {
+                                dropdownExpanded = false
+                                navController.navigate("vehicles")
+
+                            },
+                            text = {Text("Fahrzeug wechseln")}
+                        )
+                        DropdownMenuItem(
+                            onClick = {
+                                viewModel.logout()
+                                dropdownExpanded = false
+
+                            },
+                            text = { Text("Logout") }
+                        )
+                    }
+                }
+            )
+
+        }
+    ) { innerPadding ->
         Column(
             modifier = Modifier
                 .fillMaxSize()
-                .padding(contentPadding)
+                .padding(innerPadding)
         ) {
+            Spacer(modifier = Modifier.height(42.dp))
             Row(
                 modifier = Modifier.fillMaxWidth(),
-                verticalAlignment = Alignment.CenterVertically,
-                horizontalArrangement = Arrangement.End
-            ) {
-                TextButton(onClick = { viewModel.logout() }) {
-                    Icon(
-                        Icons.AutoMirrored.Outlined.ExitToApp, contentDescription = null
-                    )
-                }
-            }
-            Row(
-                modifier = Modifier.fillMaxWidth(),
-                verticalAlignment = Alignment.CenterVertically,
                 horizontalArrangement = Arrangement.Center
             ) {
-                Button(
-                    modifier = Modifier.width(300.dp),
-                    onClick = {
-                        navController.navigate("vehicles") {}
+                if (vehiclesViewModel.selectedVehicleId == 0) {
+                    Button(
+                        modifier = Modifier.width(300.dp),
+                        onClick = {
+                            navController.navigate("vehicles") {}
+                        }
+                    ) {
+                        Text(
+                            text = "Fahrzeug auswählen",
+                            fontSize = 24.sp,
+                            textAlign = TextAlign.Center
+                        )
+                    }
+                } else {
+                    var licensePlate = ""
+                    try {
+                        val vehicle = vehiclesViewModel.vehicles.value.filter {
+                                v -> v.id == vehiclesViewModel.selectedVehicleId
+                        }[0]
+                        licensePlate = vehicle.license_plate
+                    } catch (e: Exception) {
+                        licensePlate = "Kein Fahrzeug ausgewählt"
+                    }
+
+                    Box() {
+                        Text(
+                            text = licensePlate,
+                            fontWeight = FontWeight.Bold,
+                            fontSize = 24.sp,
+                            textAlign = TextAlign.Center
+                        )
                     }
-                ) {
-                    Text(
-                        text = "Fahrzeug auswählen", fontSize = 24.sp
-                    )
                 }
             }
 
-            Spacer(modifier = Modifier.height(20.dp))
+            Spacer(modifier = Modifier.height(36.dp))
 
             Row(
                 modifier = Modifier.fillMaxWidth(),
-                verticalAlignment = Alignment.CenterVertically,
                 horizontalArrangement = Arrangement.Center
             ) {
                 Button(
@@ -117,7 +196,9 @@ fun Home(
                     }
                 ) {
                     Text(
-                        text = "Aufträge", fontSize = 24.sp
+                        text = "Aufträge",
+                        fontSize = 24.sp,
+                        textAlign = TextAlign.Center
                     )
                 }
             }

driver-app/app/src/main/java/de/motis/prima/Login.kt

@@ -76,6 +76,7 @@ class LoginViewModel : ViewModel() {
 @Composable
 fun Login(
     navController: NavController,
+    vehiclesViewModel: VehiclesViewModel,
     viewModel: LoginViewModel = androidx.lifecycle.viewmodel.compose.viewModel()
 ) {
     val snackbarHostState = remember { SnackbarHostState() }
@@ -92,14 +93,15 @@ fun Login(
     LaunchedEffect(key1 = viewModel) {
         // Catching successful login event and navigation to the next screen
         launch {
+            // vehiclesViewModel.selectedVehicleId = 0
             viewModel.navigationEvent.collect { shouldNavigate ->
                 Log.d("Navigation event", "Navigation triggered.")
                 if (shouldNavigate) {
                     Log.d("Navigation event", "Navigating to vehicle selection.")
-                    navController.navigate("home") {
-                        popUpTo("login") {
-                            inclusive = true
-                        }
+                    if (vehiclesViewModel.selectedVehicleId == 0) {
+                        navController.navigate("vehicles") {}
+                    } else {
+                        navController.navigate("tours") {}
                     }
                 }
             }

driver-app/app/src/main/java/de/motis/prima/Nav.kt

@@ -5,6 +5,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
+import androidx.lifecycle.viewmodel.compose.viewModel
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.rememberNavController
@@ -15,8 +16,10 @@ import de.motis.prima.services.CookieStore
 fun Nav() {
 
     val navController = rememberNavController()
+    val vehiclesViewModel: VehiclesViewModel = viewModel()
+    val toursViewModel: ToursViewModel = viewModel()
 
-    // Check before render of any component whether user is authenticated.
+    // Before rendering any component, check whether user is authenticated.
     val startDestination by remember {
         derivedStateOf {
             val cookieStore = CookieStore(DriversApp.instance)
@@ -25,27 +28,47 @@ fun Nav() {
                 "login"
             } else {
                 Log.d("Cookie", "Cookie found. Navigating to Journeys.")
-                "home"
+                if (vehiclesViewModel.selectedVehicleId == 0) {
+                    "vehicles"
+                } else {
+                    "tours"
+                }
             }
         }
     }
 
     NavHost(navController = navController, startDestination = startDestination) {
 
         composable(route = "login") {
-            Login(navController)
+            Login(navController, vehiclesViewModel)
         }
 
         composable(route = "home") {
-            Home(navController)
+            Home(navController, vehiclesViewModel)
         }
 
         composable(route = "vehicles") {
-            Vehicles(navController)
+            Vehicles(navController, vehiclesViewModel)
         }
 
         composable(route = "tours") {
-            Tours(navController)
+            Tours(navController, vehiclesViewModel, toursViewModel)
+        }
+
+        composable(route = "taxameter") {
+            Taxameter(navController, toursViewModel)
+        }
+
+        composable(route = "overview/{tourId}") {
+            val tourId = it.arguments?.getString("tourId")?.toInt()
+            TourOverview(navController, tourId!!)
+        }
+
+
+        composable(route = "legs/{tourId}/{eventIndex}") {
+            val tourId = it.arguments?.getString("tourId")?.toInt()
+            val eventIndex = it.arguments?.getString("eventIndex")?.toInt()
+            TourDetail(navController,  tourId!!, eventIndex!!, toursViewModel)
         }
     }
 }