Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7a8525d2 authored by Ellen Poe's avatar Ellen Poe
Browse files

Merge branch 'ellenhp/route_color_optional' into 'main' 

Make routeColor optional

See merge request e/os/cardinal!44
parents 6f9bec89 96ca1a74

cardinal-android/app/src/main/java/earth/maps/cardinal/transit/TransitousModels.kt

+4 −4
Original line number Diff line number Diff line
@@ -63,12 +63,12 @@ data class StopTime( 
    @SerialName("agencyId") val agencyId: String,

    @SerialName("agencyName") val agencyName: String,

    @SerialName("agencyUrl") val agencyUrl: String,

    @SerialName("routeColor") val routeColor: String,

    @SerialName("routeColor") val routeColor: String? = null,

    @SerialName("tripId") val tripId: String,

    @SerialName("routeType") val routeType: Int,

    @SerialName("routeShortName") val routeShortName: String,

    @SerialName("routeLongName") val routeLongName: String?,

    @SerialName("tripShortName") val tripShortName: String?,

    @SerialName("routeLongName") val routeLongName: String? = null,

    @SerialName("tripShortName") val tripShortName: String? = null,

    @SerialName("displayName") val displayName: String,

    @SerialName("pickupDropoffType") val pickupDropoffType: String,

    @SerialName("cancelled") val cancelled: Boolean,
@@ -77,7 +77,7 @@ data class StopTime( 
) {

    fun parseRouteColor(): Color? {

        return try {

            Color("#$routeColor".toColorInt())

            routeColor?.let { Color("#$routeColor".toColorInt()) }

        } catch (_: IllegalArgumentException) {

            null

        }