From 10b4ceb22f7e054506a95caa70fce7622b7fb52c Mon Sep 17 00:00:00 2001 From: json Date: Tue, 28 Jan 2025 23:21:43 +0800 Subject: [PATCH 1/2] [23259] Added sort mechanism on view more logic --- .../skedgo/tripkit/ui/tripresults/TripResultViewModel.kt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/TripKitAndroidUI/src/main/java/com/skedgo/tripkit/ui/tripresults/TripResultViewModel.kt b/TripKitAndroidUI/src/main/java/com/skedgo/tripkit/ui/tripresults/TripResultViewModel.kt index f9fb47d9..711bcaaa 100644 --- a/TripKitAndroidUI/src/main/java/com/skedgo/tripkit/ui/tripresults/TripResultViewModel.kt +++ b/TripKitAndroidUI/src/main/java/com/skedgo/tripkit/ui/tripresults/TripResultViewModel.kt @@ -145,6 +145,12 @@ class TripResultViewModel @Inject constructor( moreButtonText.set(context.resources.getString(R.string.more)) moreButtonVisible.set(true) } + + sortTripResults() + } + + private fun sortTripResults() { + tripResults.sortBy { it.trip?.startTimeInSecs ?: Long.MAX_VALUE } } override fun equals(other: Any?): Boolean { From 94127e6ceedb024fa0354e2d589526d029959539 Mon Sep 17 00:00:00 2001 From: json Date: Thu, 30 Jan 2025 15:02:59 +0800 Subject: [PATCH 2/2] [14958] Added ellipsis logic on vehicle marker label --- .../tripkit/ui/timetables/TimetableMapContributor.kt | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/TripKitAndroidUI/src/main/java/com/skedgo/tripkit/ui/timetables/TimetableMapContributor.kt b/TripKitAndroidUI/src/main/java/com/skedgo/tripkit/ui/timetables/TimetableMapContributor.kt index a9134408..14382f0e 100644 --- a/TripKitAndroidUI/src/main/java/com/skedgo/tripkit/ui/timetables/TimetableMapContributor.kt +++ b/TripKitAndroidUI/src/main/java/com/skedgo/tripkit/ui/timetables/TimetableMapContributor.kt @@ -307,10 +307,13 @@ class TimetableMapContributor(val fragment: Fragment) : TripKitMapContributor { if (service!!.serviceColor == null || service!!.serviceColor.color == Color.BLACK) fragment.resources.getColor( R.color.v4_color ) else service!!.serviceColor.color + val maxLength = 3 val text = - (if (TextUtils.isEmpty(service!!.serviceNumber)) if (mStop == null || mStop!!.type == null) "" else StringUtils.capitalizeFirst( - mStop!!.type.toString() - ) else service!!.serviceNumber)!! + (if (TextUtils.isEmpty(service!!.serviceNumber)) { + if (mStop == null || mStop!!.type == null) "" else StringUtils.capitalizeFirst(mStop!!.type.toString()) + } else service!!.serviceNumber)!!.let { + if (it.length > maxLength) it.take(maxLength - 1) + "…" else it + } val icon = vehicleMarkerIconCreatorLazy.get().call(bearing, color, text) val markerTitle = title googleMap?.let { map: GoogleMap ->