Merge branch 'refs/heads/develop' into task/23022-tripkitui-refactor-…

…phase2 # Conflicts: # TripKitAndroidUI/src/main/java/com/skedgo/tripkit/ui/timetables/TimetableMapContributor.kt
skedgo · Feb 6, 2025 · e72141c · e72141c
2 parents d98433f + db7531c
commit e72141c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 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
@@ -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 ->

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
@@ -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 {