V2.2.6 (#1000)

woheller69 · web-flow · commit 9f3613bb88d9 · 2025-11-25T14:02:47.000+01:00
* Better display for delays (like in Öffi) #957 * Release V2.26 Fastlane, Changelog Minor fix in AlertService
diff --git a/app/build.gradle b/app/build.gradle
@@ -8,8 +8,8 @@ apply from: 'witness.gradle'
 android {
 
 	defaultConfig {
-		versionCode 129
-		versionName "2.2.5"
+		versionCode 130
+		versionName "2.2.6"
 
 		applicationId "de.grobox.liberario"
 		minSdkVersion 24
diff --git a/app/src/main/java/de/grobox/transportr/AlertService.java b/app/src/main/java/de/grobox/transportr/AlertService.java
@@ -161,7 +161,7 @@ private void stopGpsLocListener() {
 	public void onLocationChanged(@NonNull Location location) {
 		lastLocationUpdate = System.currentTimeMillis();
 		long timeToDestination = (arrivalTimeLong - System.currentTimeMillis()) / 1000;
-		String timeString = (timeToDestination > 60) ? getString(R.string.in_x_minutes, Math.round(timeToDestination / 60.0)) : getString(R.string.seconds, timeToDestination);
+		String timeString = (Math.abs(timeToDestination) > 60) ? getString(R.string.in_x_minutes, Math.round(timeToDestination / 60.0)) : getString(R.string.seconds, timeToDestination);
 		long distanceToDestination = (long) destination.distanceTo(location);
 		if (distanceToDestination > ARRIVAL_THRESHOLD_METERS){
 			updateNotification(getString(R.string.meter, distanceToDestination) + " / " + timeString , false);
@@ -175,7 +175,7 @@ public void onLocationChanged(@NonNull Location location) {
 
 	private void onLocationUpdateTimeout() {
 		long timeToDestination = (arrivalTimeLong - System.currentTimeMillis()) / 1000;
-		String timeString = (timeToDestination > 60) ? getString(R.string.in_x_minutes, Math.round(timeToDestination / 60.0)) : getString(R.string.seconds, timeToDestination);
+		String timeString = (Math.abs(timeToDestination) > 60) ? getString(R.string.in_x_minutes, Math.round(timeToDestination / 60.0)) : getString(R.string.seconds, timeToDestination);
 		if (timeToDestination > ARRIVAL_THRESHOLD_SEC){
 			updateNotification( timeString , false);
 		} else {
diff --git a/app/src/main/java/de/grobox/transportr/departures/DepartureViewHolder.kt b/app/src/main/java/de/grobox/transportr/departures/DepartureViewHolder.kt
@@ -66,15 +66,17 @@ internal class DepartureViewHolder(v: View) : RecyclerView.ViewHolder(v) {
                 visibility = it.visibility
             }
         }
-        timeAbs.text = formatTime(timeAbs.context, plannedTime)
+
+        timeAbs.text = formatTime(timeAbs.context, predictedTime?.let { Date(it.time) } ?: plannedTime)
+
         predictedTime?.let {
             val delayTime = it.time - plannedTime.time
             formatDelay(timeRel.context, delayTime).let {
                 delay.apply {
-                    text = it.delay
-                    setTextColor(it.color)
+                    text = "("+ it.delay + ")"
                     visibility = VISIBLE
                 }
+                timeAbs.setTextColor(it.color)
             }
         } ?: run { delay.visibility = GONE }
 
diff --git a/app/src/main/java/de/grobox/transportr/trips/BaseViewHolder.kt b/app/src/main/java/de/grobox/transportr/trips/BaseViewHolder.kt
@@ -30,6 +30,7 @@ import androidx.recyclerview.widget.RecyclerView
 import de.grobox.transportr.R
 import de.grobox.transportr.utils.DateUtils.formatDelay
 import de.grobox.transportr.utils.DateUtils.formatTime
+import de.grobox.transportr.utils.TransportrUtils.getColorFromAttr
 import de.schildbach.pte.dto.Position
 import de.schildbach.pte.dto.Stop
 import java.util.*
@@ -49,13 +50,12 @@ internal abstract class BaseViewHolder(v: View) : RecyclerView.ViewHolder(v) {
 
         if (stop.isArrivalTimePredicted && stop.arrivalDelay != null) {
             val delay = stop.arrivalDelay
-            time.time = time.time - delay
             formatDelay(delayView.context, delay).let {
                 delayView.apply {
-                    text = it.delay
-                    setTextColor(it.color)
+                    text = "("+it.delay+")"
                     visibility = VISIBLE
                 }
+                if (timeView!=null) timeView.setTextColor(it.color)
             }
         } else {
             delayView.visibility = GONE
@@ -70,13 +70,12 @@ internal abstract class BaseViewHolder(v: View) : RecyclerView.ViewHolder(v) {
 
         if (stop.isDepartureTimePredicted && stop.departureDelay != null) {
             val delay = stop.departureDelay
-            time.time = time.time - delay
             formatDelay(delayView.context, delay).let {
                 delayView.apply {
-                    text = it.delay
-                    setTextColor(it.color)
+                    text = "("+it.delay+")"
                     visibility = VISIBLE
                 }
+                if (timeView!=null) timeView.setTextColor(it.color)
             }
         } else {
             delayView.visibility = GONE
diff --git a/app/src/main/res/layout/list_item_departure.xml b/app/src/main/res/layout/list_item_departure.xml
@@ -46,7 +46,6 @@
 			android:id="@+id/delay"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:textColor="@color/md_red_500"
 			app:layout_constraintHorizontal_bias="1.0"
 			app:layout_constraintLeft_toLeftOf="parent"
 			app:layout_constraintRight_toRightOf="@+id/departureTimeAbs"
diff --git a/app/src/main/res/layout/list_item_leg.xml b/app/src/main/res/layout/list_item_leg.xml
@@ -23,7 +23,6 @@
 		android:id="@+id/fromDelay"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:textColor="@color/md_red_500"
 		app:layout_constraintRight_toRightOf="@+id/fromTime"
 		app:layout_constraintTop_toBottomOf="@+id/fromTime"
 		tools:text="+12"
@@ -213,7 +212,6 @@
 		android:id="@+id/toDelay"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:textColor="@color/md_red_500"
 		app:layout_constraintEnd_toEndOf="@+id/toTime"
 		app:layout_constraintTop_toBottomOf="@+id/toTime"
 		tools:text="+3"
diff --git a/app/src/main/res/layout/list_item_stop.xml b/app/src/main/res/layout/list_item_stop.xml
@@ -20,7 +20,6 @@
 		android:id="@+id/fromDelay"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:textColor="@color/md_red_500"
 		app:layout_constraintRight_toRightOf="@+id/fromTime"
 		app:layout_constraintTop_toBottomOf="@+id/fromTime"
 		app:layout_constraintEnd_toEndOf="@+id/fromTime"
@@ -40,7 +39,6 @@
 		android:id="@+id/toDelay"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:textColor="@color/md_red_500"
 		app:layout_constraintEnd_toEndOf="@+id/toTime"
 		app:layout_constraintTop_toBottomOf="@+id/toTime"
 		tools:text="+3"
diff --git a/app/src/main/res/layout/list_item_trip.xml b/app/src/main/res/layout/list_item_trip.xml
@@ -45,7 +45,6 @@
 			android:layout_height="wrap_content"
 			android:layout_marginTop="0dp"
 			android:gravity="end"
-			android:textColor="@color/md_red_500"
 			app:layout_constraintLeft_toLeftOf="parent"
 			app:layout_constraintRight_toRightOf="@+id/fromTime"
 			app:layout_constraintTop_toBottomOf="@+id/fromTime"
@@ -133,7 +132,6 @@
 			android:layout_width="0dp"
 			android:layout_height="wrap_content"
 			android:gravity="end"
-			android:textColor="@color/md_red_500"
 			app:layout_constraintLeft_toLeftOf="parent"
 			app:layout_constraintRight_toRightOf="@+id/toTime"
 			app:layout_constraintTop_toBottomOf="@+id/toTime"
diff --git a/app/src/main/res/xml/changelog_master.xml b/app/src/main/res/xml/changelog_master.xml
@@ -2,6 +2,14 @@
 <changelog xmlns:tools="http://schemas.android.com/tools"
     tools:ignore="UnusedResources">
 
+    <release
+        version="2.2.6"
+        versioncode="130">
+        <change>IMPORTANT CHANGE</change>
+        <change>Predicted time is displayed instead of scheduled time</change>
+        <change>Display of delay is informative only</change>
+    </release>
+
     <release
         version="2.2.5"
         versioncode="129">
diff --git a/fastlane/metadata/android/en-US/changelogs/130.txt b/fastlane/metadata/android/en-US/changelogs/130.txt
@@ -0,0 +1,3 @@
+* IMPORTANT CHANGE
+* Predicted time is displayed instead of scheduled time
+* Display of delay is informative only

Original file line number	Diff line number	Diff line change
`@@ -66,15 +66,17 @@ internal class DepartureViewHolder(v: View) : RecyclerView.ViewHolder(v) {`
`66`	`66`	`visibility = it.visibility`
`67`	`67`	`}`
`68`	`68`	`}`
`69`		`- timeAbs.text = formatTime(timeAbs.context, plannedTime)`
	`69`	`+`
	`70`	`+ timeAbs.text = formatTime(timeAbs.context, predictedTime?.let { Date(it.time) } ?: plannedTime)`
	`71`	`+`
`70`	`72`	`predictedTime?.let {`
`71`	`73`	`val delayTime = it.time - plannedTime.time`
`72`	`74`	`formatDelay(timeRel.context, delayTime).let {`
`73`	`75`	`delay.apply {`
`74`		`- text = it.delay`
`75`		`- setTextColor(it.color)`
	`76`	`+ text = "("+ it.delay + ")"`
`76`	`77`	`visibility = VISIBLE`
`77`	`78`	`}`
	`79`	`+ timeAbs.setTextColor(it.color)`
`78`	`80`	`}`
`79`	`81`	`} ?: run { delay.visibility = GONE }`
`80`	`82`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+* IMPORTANT CHANGE`
	`2`	`+* Predicted time is displayed instead of scheduled time`
	`3`	`+* Display of delay is informative only`