feat: open departures / directions when clicking on widget

Bnyro · Bnyro · commit caccd0a3e997 · 2025-10-21T17:43:33.000+02:00
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -4,6 +4,7 @@ plugins {
     alias(libs.plugins.kotlin.compose)
     kotlin("plugin.serialization") version "2.1.21"
     id("com.google.protobuf") version "0.9.5"
+    id("kotlin-parcelize")
 }
 
 android {
diff --git a/app/src/main/java/net/youapps/transport/MainActivity.kt b/app/src/main/java/net/youapps/transport/MainActivity.kt
@@ -5,6 +5,7 @@ import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
 import androidx.activity.viewModels
+import androidx.compose.runtime.LaunchedEffect
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.rememberNavController
@@ -20,6 +21,8 @@ import net.youapps.transport.screens.HomeScreen
 import net.youapps.transport.screens.SettingsScreen
 import net.youapps.transport.screens.TripDetailsScreen
 import net.youapps.transport.ui.theme.TransportYouTheme
+import androidx.compose.runtime.collectAsState
+import androidx.core.content.IntentCompat
 
 class MainActivity : ComponentActivity() {
     val departuresModel: DeparturesModel by viewModels { DeparturesModel.Factory }
@@ -32,10 +35,39 @@ class MainActivity : ComponentActivity() {
         super.onCreate(savedInstanceState)
         enableEdgeToEdge()
 
+
+        val initialLocationForDepartures =
+            IntentCompat.getParcelableExtra(
+                intent, DEPARTURES_FROM_INTENT_KEY,
+                NavRoutes.DeparturesFromLocation::class.java
+            )
+
+        val initialOriginForDirections =
+            IntentCompat.getParcelableExtra(
+                intent, DIRECTIONS_FROM_KEY,
+                NavRoutes.DeparturesFromLocation::class.java
+            )
+
+        val initialDestinationForDirections =
+            IntentCompat.getParcelableExtra(
+                intent, DIRECTIONS_TO_KEY,
+                NavRoutes.DeparturesFromLocation::class.java
+            )
+
         setContent {
             TransportYouTheme {
                 val navController = rememberNavController()
 
+                LaunchedEffect(Unit) {
+                    if (initialLocationForDepartures != null) {
+                        navController.navigate(initialLocationForDepartures)
+                    } else if (initialDestinationForDirections != null && initialOriginForDirections != null) {
+                        directionsModel.origin.value = initialOriginForDirections.toLocation()
+                        directionsModel.destination.value = initialDestinationForDirections.toLocation()
+                        navController.navigate(NavRoutes.Directions)
+                    }
+                }
+
                 NavHost(navController = navController, startDestination = NavRoutes.Home) {
                     composable<NavRoutes.DeparturesFromLocation> { backStackEntry ->
                         val departuresScreen: NavRoutes.DeparturesFromLocation =
@@ -55,7 +87,8 @@ class MainActivity : ComponentActivity() {
                     composable<NavRoutes.TripDetails> { backStackEntry ->
                         val tripDetails: NavRoutes.TripDetails = backStackEntry.toRoute()
 
-                        val tripWrapper = directionsModel.trips.value.find { it.id == tripDetails.tripId }!!
+                        val tripWrapper = directionsModel.trips.collectAsState().value
+                            .find { it.id == tripDetails.tripId }!!
                         TripDetailsScreen(navController, directionsModel, tripWrapper.trip)
                     }
 
@@ -70,4 +103,10 @@ class MainActivity : ComponentActivity() {
             }
         }
     }
+
+    companion object {
+        const val DEPARTURES_FROM_INTENT_KEY = "departures_from"
+        const val DIRECTIONS_FROM_KEY = "directions_from"
+        const val DIRECTIONS_TO_KEY = "directions_to"
+    }
 }
diff --git a/app/src/main/java/net/youapps/transport/NavRoutes.kt b/app/src/main/java/net/youapps/transport/NavRoutes.kt
@@ -1,9 +1,11 @@
 package net.youapps.transport
 
+import android.os.Parcelable
 import de.schildbach.pte.dto.Location
 import de.schildbach.pte.dto.LocationType
 import de.schildbach.pte.dto.Point
 import de.schildbach.pte.dto.Product
+import kotlinx.parcelize.Parcelize
 import kotlinx.serialization.Serializable
 
 object NavRoutes {
@@ -14,6 +16,7 @@ object NavRoutes {
     object Directions
 
     @Serializable
+    @Parcelize
     data class DeparturesFromLocation(
         val type: LocationType? = null,
         val id: String? = null,
@@ -22,7 +25,7 @@ object NavRoutes {
         val place: String? = null,
         val name: String? = null,
         val products: List<String>? = null
-    ) {
+    ): Parcelable {
         constructor(location: Location) : this(
             location.type,
             location.id,
diff --git a/app/src/main/java/net/youapps/transport/widget/DeparturesWidget.kt b/app/src/main/java/net/youapps/transport/widget/DeparturesWidget.kt
@@ -20,11 +20,14 @@ import androidx.glance.GlanceModifier
 import androidx.glance.GlanceTheme
 import androidx.glance.ImageProvider
 import androidx.glance.LocalContext
+import androidx.glance.action.clickable
 import androidx.glance.appwidget.GlanceAppWidget
 import androidx.glance.appwidget.GlanceAppWidgetManager
+import androidx.glance.appwidget.action.actionStartActivity
 import androidx.glance.appwidget.components.CircleIconButton
 import androidx.glance.appwidget.components.Scaffold
 import androidx.glance.appwidget.components.TitleBar
+import androidx.glance.appwidget.cornerRadius
 import androidx.glance.appwidget.lazy.LazyColumn
 import androidx.glance.appwidget.lazy.items
 import androidx.glance.appwidget.provideContent
@@ -39,9 +42,12 @@ import androidx.glance.text.FontWeight
 import androidx.glance.text.Text
 import androidx.glance.text.TextStyle
 import de.schildbach.pte.dto.Departure
+import de.schildbach.pte.dto.LocationType
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
+import net.youapps.transport.MainActivity
+import net.youapps.transport.NavRoutes
 import net.youapps.transport.R
 import net.youapps.transport.TransportYouApp
 import net.youapps.transport.components.directions.DEMO_DEPARTURE
@@ -118,9 +124,16 @@ class DeparturesWidget : GlanceAppWidget() {
         onRefresh: () -> Unit,
         onConfigureClicked: () -> Unit
     ) {
-        val scope = rememberCoroutineScope()
         val context = LocalContext.current
 
+        val startLocation = remember {
+            NavRoutes.DeparturesFromLocation(
+                type = LocationType.STATION,
+                id = locationId,
+                name = locationName,
+            )
+        }
+
         Scaffold {
             Column(
                 modifier = GlanceModifier
@@ -129,6 +142,18 @@ class DeparturesWidget : GlanceAppWidget() {
                 horizontalAlignment = Alignment.CenterHorizontally,
             ) {
                 TitleBar(
+                    modifier = GlanceModifier
+                        .cornerRadius(12.dp)
+                        .clickable(
+                            actionStartActivity(
+                                Intent(context, MainActivity::class.java)
+                                    .apply { flags = Intent.FLAG_ACTIVITY_NEW_TASK }
+                                    .putExtra(
+                                        MainActivity.DEPARTURES_FROM_INTENT_KEY,
+                                        startLocation
+                                    )
+                            )
+                        ),
                     startIcon = ImageProvider(R.drawable.ic_app_full_size),
                     title = locationName
                 ) {
@@ -167,7 +192,18 @@ class DeparturesWidget : GlanceAppWidget() {
                     LazyColumn {
                         items(departures) { departure ->
                             GlanceDepartureItem(departure) {
-                                // TODO("open directions in app")
+                                val intent = Intent(context, MainActivity::class.java)
+                                    .apply { flags = Intent.FLAG_ACTIVITY_NEW_TASK }
+                                    .putExtra(MainActivity.DIRECTIONS_FROM_KEY, startLocation)
+                                    .putExtra(
+                                        MainActivity.DIRECTIONS_TO_KEY,
+                                        NavRoutes.DeparturesFromLocation(
+                                            type = LocationType.STATION,
+                                            id = departure.destination?.id,
+                                            name = departure.destination?.uniqueShortName(),
+                                        )
+                                    )
+                                context.startActivity(intent)
                             }
                         }
 

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@ plugins {`
`4`	`4`	`alias(libs.plugins.kotlin.compose)`
`5`	`5`	`kotlin("plugin.serialization") version "2.1.21"`
`6`	`6`	`id("com.google.protobuf") version "0.9.5"`
	`7`	`+ id("kotlin-parcelize")`
`7`	`8`	`}`
`8`	`9`
`9`	`10`	`android {`