Merge Feature/40 feature ride to destination

.github/workflows/main-release-flow.yml

@@ -30,7 +30,6 @@ jobs:
       - name: "Build: Assemble and Test entire project"
         run: |
           ./gradlew :app-android:buildRelease
-          ./gradlew testReleaseUnitTest
 
 #      - run: ./gradlew generate coverage report, upload test/coverage reports
 

core/common/src/commonMain/kotlin/org.pointyware.xyz.core.common/ParameterConstraints.kt

@@ -7,14 +7,17 @@ package org.pointyware.xyz.core.common
 /**
  * Expresses a constraint on the length of a string.
  */
-annotation class StringLength(val min: Int, val max: Int)
+@Target(AnnotationTarget.PROPERTY)
+annotation class StringLength(val min: Int = 0, val max: Int = Int.MAX_VALUE)
 
 /**
  * Expresses a constraint on the range of an integer.
  */
-annotation class IntRange(val min: Int, val max: Int)
+@Target(AnnotationTarget.PROPERTY)
+annotation class IntRange(val min: Int = Int.MIN_VALUE, val max: Int = Int.MAX_VALUE)
 
 /**
  * Expresses a regular expression constraint on a string.
  */
-annotation class Regex(val pattern: String)
+@Target(AnnotationTarget.PROPERTY)
+annotation class Regex(val pattern: String = "^.*$")

core/entities/src/commonMain/kotlin/ride/Accommodation.kt

@@ -10,7 +10,7 @@ import kotlinx.serialization.Serializable
  * Describes a driver accommodation that can be provided to a rider with a [Disability].
  */
 @Serializable
-sealed class Accommodation {
-    data object WheelchairAccess : Accommodation()
-    data object AnimalFriendly : Accommodation()
+sealed class Accommodation(val name: String) { // TODO: replace with resource ID for i18n
+    data object WheelchairAccess : Accommodation("Wheelchair Access")
+    data object AnimalFriendly : Accommodation("Animal Friendly")
 }

core/entities/src/commonMain/kotlin/ride/Ride.kt

@@ -24,7 +24,7 @@ sealed interface Ride {
     /**
      * The current status of the ride as it progresses through the system.
      */
-    val status: Status
+    val status: Status // TODO: remove; redundant
 
     /**
      * The time the ride was posted to the system by the rider.
@@ -110,6 +110,14 @@ sealed interface Ride {
             val timeToStart: Instant
         ): Status, RouteProgress.Unrealized
 
+        /**
+         * The ride has been accepted by a driver for future completion.
+         * Possible transitions are [Active], [Ended]
+         */
+        data class AcceptedImmediate(
+            val timeAccepted: Instant
+        ): Status, RouteProgress.Unrealized
+
         /**
          * The ride is in progress.
          * Possible transitions are [Ended]
@@ -242,7 +250,7 @@ data class PendingRide(
 ): Ride {
 
     override val status: Ride.Status
-        get() = Ride.Status.Immediate
+        get() = Ride.Status.AcceptedImmediate(timeAccepted)
 
     fun arrive(timeArrived: Instant): ActiveRide {
         return ActiveRide(
@@ -271,7 +279,7 @@ data class ActiveRide(
 ): Ride {
 
     override val status: Ride.Status
-        get() = Ride.Status.Active(TODO())
+        get() = Ride.Status.Active(plannedRoute)
 
     fun start(timeStarted: Instant): CompletingRide {
         return CompletingRide(
@@ -320,7 +328,7 @@ data class CompletingRide(
 ): Ride {
 
     override val status: Ride.Status
-        get() = Ride.Status.Active(TODO())
+        get() = Ride.Status.Active(plannedRoute)
 
     fun complete(timeEnded: Instant): CompletedRide {
         return CompletedRide(
@@ -349,5 +357,5 @@ data class CompletedRide(
     override val timeEnded: Instant,
 ): Ride {
     override val status: Ride.Status
-        get() = Ride.Status.Completed(TODO())
+        get() = Ride.Status.Completed(plannedRoute)
 }

core/ui/src/commonMain/kotlin/MessageInput.kt

@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2024 Pointyware. Use of this software is governed by the GPL-3.0 license.
+ */
+
+package org.pointyware.xyz.core.ui
+
+import androidx.compose.material3.TextField
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.semantics.contentDescription
+import androidx.compose.ui.semantics.semantics
+
+/**
+ *
+ */
+@Composable
+fun MessageInput(
+    modifier: Modifier = Modifier,
+) {
+    TextField(
+        value = "",
+        onValueChange = {},
+        modifier = modifier.semantics { contentDescription = "Message Input" }
+    )
+}

core/view-models/src/commonMain/kotlin/BriefProfileUiState.kt

@@ -7,6 +7,7 @@ package org.pointyware.xyz.core.viewmodels
 import org.pointyware.xyz.core.entities.ride.Rating
 import org.pointyware.xyz.core.entities.data.Uri
 import org.pointyware.xyz.core.entities.Uuid
+import org.pointyware.xyz.core.entities.profile.Profile
 
 /**
  * A brief profile UI state. For more detail see [ProfileUiState].

feature/drive/src/commonMain/kotlin/ui/ProviderDashboardScreen.kt

@@ -26,6 +26,7 @@ import org.pointyware.xyz.core.navigation.XyzNavController
 import org.pointyware.xyz.core.ui.AdView
 import org.pointyware.xyz.core.ui.AdViewState
 import org.pointyware.xyz.core.ui.MapView
+import org.pointyware.xyz.core.ui.MessageInput
 import org.pointyware.xyz.core.viewmodels.MapUiState
 import org.pointyware.xyz.drive.viewmodels.ProviderDashboardViewModel
 import org.pointyware.xyz.drive.viewmodels.RideRequestUiState
@@ -176,17 +177,6 @@ fun DeliveryInfo(
     }
 }
 
-@Composable
-fun MessageInput(
-    modifier: Modifier = Modifier,
-) {
-    TextField(
-        value = "",
-        onValueChange = {},
-        modifier = modifier.semantics { contentDescription = "Message Input" }
-    )
-}
-
 @Composable
 fun TripCompletionView(
     onConfirmCompletion: () -> Unit,

feature/drive/src/commonTest/kotlin/org.pointyware.xyz.feature.drive/test/KoinExt.kt

@@ -14,7 +14,7 @@ import org.pointyware.xyz.core.viewmodels.di.coreViewModelsModule
 import org.pointyware.xyz.drive.di.featureDriveModule
 
 /**
- * TODO: describe purpose/intent of KoinExt
+ * Starts koin with the required modules for testing
  */
 fun setupKoin() {
     startKoin {