diff --git a/android/app/src/main/kotlin/tw/avianjay/taiwanbus/flutter/RouteTripMonitorService.kt b/android/app/src/main/kotlin/tw/avianjay/taiwanbus/flutter/RouteTripMonitorService.kt index 6d1f7f1..ebdb962 100644 --- a/android/app/src/main/kotlin/tw/avianjay/taiwanbus/flutter/RouteTripMonitorService.kt +++ b/android/app/src/main/kotlin/tw/avianjay/taiwanbus/flutter/RouteTripMonitorService.kt @@ -34,6 +34,9 @@ import kotlin.math.abs import org.json.JSONArray import org.json.JSONObject +internal fun buildOnboardTripSubText(nearestStopName: String): String = + "已上車 · 最近站牌 $nearestStopName" + class RouteTripMonitorService : Service() { private val ioExecutor = Executors.newSingleThreadExecutor() private val mainHandler = Handler(Looper.getMainLooper()) @@ -815,7 +818,7 @@ class RouteTripMonitorService : Service() { remainingStops == 0 -> "已接近 ${destinationStop.stopName}" else -> "距離 ${destinationStop.stopName} 還有 $remainingStops 站 · $destinationEtaText" }, - subText = "已上車 · 最近站牌 ${nearestStop.stopName}", + subText = buildOnboardTripSubText(nearestStop.stopName), progressMax = toProgressMax(journeyPointCount), progressValue = toProgressValue(currentProgressPoint, journeyPointCount), shortCriticalText = buildShortCriticalText( diff --git a/android/app/src/test/kotlin/tw/avianjay/taiwanbus/flutter/TripNotificationTextTest.kt b/android/app/src/test/kotlin/tw/avianjay/taiwanbus/flutter/TripNotificationTextTest.kt new file mode 100644 index 0000000..2e713bf --- /dev/null +++ b/android/app/src/test/kotlin/tw/avianjay/taiwanbus/flutter/TripNotificationTextTest.kt @@ -0,0 +1,15 @@ +package tw.avianjay.taiwanbus.flutter + +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Test + +class TripNotificationTextTest { + @Test + fun onboardSubTextOmitsCurrentStopEta() { + val subText = buildOnboardTripSubText("目前站") + + assertEquals("已上車 · 最近站牌 目前站", subText) + assertFalse(subText.contains("3 分")) + } +}