diff --git a/alerts.json b/alerts.json index 02ec912..2c14595 100644 --- a/alerts.json +++ b/alerts.json @@ -109,7 +109,7 @@ "SATURDAY", "SUNDAY" ], - "start": "17:00", + "start": "20:00", "end": "05:00", "from": "2024-04-06", "to": "2024-06-30" diff --git a/api/src/commonMain/kotlin/com/sixbynine/transit/path/api/alerts/GithubAlerts.kt b/api/src/commonMain/kotlin/com/sixbynine/transit/path/api/alerts/GithubAlerts.kt index f239be6..14cf67e 100644 --- a/api/src/commonMain/kotlin/com/sixbynine/transit/path/api/alerts/GithubAlerts.kt +++ b/api/src/commonMain/kotlin/com/sixbynine/transit/path/api/alerts/GithubAlerts.kt @@ -4,6 +4,7 @@ import com.sixbynine.transit.path.api.Station import com.sixbynine.transit.path.time.NewYorkTimeZone import com.sixbynine.transit.path.time.now import kotlinx.datetime.DayOfWeek +import kotlinx.datetime.Instant import kotlinx.datetime.LocalDate import kotlinx.datetime.LocalDateTime import kotlinx.datetime.LocalTime @@ -245,8 +246,8 @@ fun Alert.hidesTrain(stationName: String, headSign: String): Boolean { return false } -fun Alert.hidesTrainNow(stationName: String, headSign: String): Boolean { - val dateTime = now().toLocalDateTime(NewYorkTimeZone) +fun Alert.hidesTrainAt(stationName: String, headSign: String, time: Instant): Boolean { + val dateTime = time.toLocalDateTime(NewYorkTimeZone) return isActiveAt(dateTime) && hidesTrain(stationName, headSign) } diff --git a/composeApp/build.gradle.kts b/composeApp/build.gradle.kts index cfdc89f..b268340 100644 --- a/composeApp/build.gradle.kts +++ b/composeApp/build.gradle.kts @@ -103,8 +103,8 @@ android { applicationId = "com.sixbynine.transit.path" minSdk = libs.versions.android.minSdk.get().toInt() targetSdk = libs.versions.android.targetSdk.get().toInt() - versionCode = 30 - versionName = "2024.04.07.1" + versionCode = 31 + versionName = "2024.04.07.2" resourceConfigurations += setOf("en", "es") } buildFeatures { diff --git a/composeApp/src/commonMain/kotlin/com/sixbynine/transit/path/widget/WidgetDataFetcher.kt b/composeApp/src/commonMain/kotlin/com/sixbynine/transit/path/widget/WidgetDataFetcher.kt index bd00c98..0115636 100644 --- a/composeApp/src/commonMain/kotlin/com/sixbynine/transit/path/widget/WidgetDataFetcher.kt +++ b/composeApp/src/commonMain/kotlin/com/sixbynine/transit/path/widget/WidgetDataFetcher.kt @@ -11,7 +11,7 @@ import com.sixbynine.transit.path.api.Stations import com.sixbynine.transit.path.api.TrainFilter import com.sixbynine.transit.path.api.alerts.GithubAlerts import com.sixbynine.transit.path.api.alerts.GithubAlertsRepository -import com.sixbynine.transit.path.api.alerts.hidesTrainNow +import com.sixbynine.transit.path.api.alerts.hidesTrainAt import com.sixbynine.transit.path.api.isEastOf import com.sixbynine.transit.path.api.isInNewJersey import com.sixbynine.transit.path.api.isInNewYork @@ -145,9 +145,10 @@ object WidgetDataFetcher { data[station.pathApiName] ?.filterNot { train -> stationAlerts.any { alert -> - alert.hidesTrainNow( + alert.hidesTrainAt( stationName = station.pathApiName, - headSign = train.headsign + headSign = train.headsign, + time = train.projectedArrival, ) } } diff --git a/iosApp/iosApp/Info.plist b/iosApp/iosApp/Info.plist index dc7b0dd..962704f 100644 --- a/iosApp/iosApp/Info.plist +++ b/iosApp/iosApp/Info.plist @@ -23,7 +23,7 @@ CFBundleShortVersionString 2.3 CFBundleVersion - 9 + 10 CFBundleLocalizations en