Merge pull request #7020 from StoDevX/android-borderColor-fix

Fix Android `borderColor` crash when setting transparent border on bus screen

Author: rye

source/views/transportation/bus/components/bus-stop-row.tsx

@@ -1,5 +1,5 @@
 import * as React from 'react'
-import {Platform, StyleSheet} from 'react-native'
+import {ColorValue, Platform, StyleSheet} from 'react-native'
 import {Column} from '@frogpond/layout'
 import {Detail, ListRow, Title} from '@frogpond/lists'
 import type {BusTimetableEntry} from '../types'
@@ -36,8 +36,8 @@ type Props = {
 	stop: BusTimetableEntry
 	departureIndex: null | number
 	now: Moment
-	barColor: string
-	currentStopColor: string
+	barColor: ColorValue
+	currentStopColor: ColorValue
 	isFirstRow: boolean
 	isLastRow: boolean
 	status: BusStateEnum

source/views/transportation/bus/components/progress-chunk.tsx

@@ -1,6 +1,6 @@
 import * as React from 'react'
 import * as c from '@frogpond/colors'
-import {Platform, StyleSheet, View} from 'react-native'
+import {ColorValue, Platform, StyleSheet, View} from 'react-native'
 import type {BusStopStatusEnum} from '../lib'
 
 const isAndroid = Platform.OS === 'android'
@@ -25,7 +25,7 @@ const styles = StyleSheet.create({
 	},
 	skippingStop: {
 		backgroundColor: c.clear,
-		borderColor: c.clear,
+		borderColor: c.transparent,
 	},
 	passedStop: {
 		height: 12,
@@ -47,8 +47,8 @@ const styles = StyleSheet.create({
 })
 
 type Props = {
-	barColor: string
-	currentStopColor: string
+	barColor: ColorValue
+	currentStopColor: ColorValue
 	isFirstChunk: boolean
 	isLastChunk: boolean
 	stopStatus: BusStopStatusEnum

source/views/transportation/bus/types.ts

@@ -1,11 +1,12 @@
 import type {Moment} from 'moment'
+import {ColorValue} from 'react-native'
 
 export type DayOfWeek = 'Su' | 'Mo' | 'Tu' | 'We' | 'Th' | 'Fr' | 'Sa'
 export type Coordinates = [number, number]
 
 export type BusLineColors = {
-	bar: string
-	dot: string
+	bar: ColorValue
+	dot: ColorValue
 }
 
 export type UnprocessedDepartureTimeList = Array<string | false>