Don't include year when showing custom departure/arrival date to save space, minor text adjustments

Author: Bertware

Hyperrail/src/main/java/be/hyperrail/android/fragments/RouteSearchFragment.java

@@ -386,7 +386,7 @@ public void onDateTimePicked(DateTime d) {
 
         DateTime now = new DateTime();
 
-        DateTimeFormatter df = DateTimeFormat.forPattern("dd MMMM yyyy");
+        DateTimeFormatter df = DateTimeFormat.forPattern("dd MMMM");
         DateTimeFormatter tf = DateTimeFormat.forPattern("HH:mm");
 
         String day = df.print(searchDateTime);
@@ -396,10 +396,11 @@ public void onDateTimePicked(DateTime d) {
         if (now.get(DateTimeFieldType.year()) == searchDateTime.get(DateTimeFieldType.year())) {
             if (now.get(DateTimeFieldType.dayOfYear()) == searchDateTime.get(DateTimeFieldType.dayOfYear())) {
                 day = getActivity().getResources().getString(R.string.time_today);
-            } else  //noinspection RedundantCast
-                if (now.get(DateTimeFieldType.dayOfYear()) + 1 == (int) searchDateTime.get(DateTimeFieldType.dayOfYear())) {
-                    day = getActivity().getResources().getString(R.string.time_tomorrow);
-                }
+            } else if (now.get(DateTimeFieldType.dayOfYear()) + 1 == (int) searchDateTime.get(DateTimeFieldType.dayOfYear())) {
+                day = getActivity().getResources().getString(R.string.time_tomorrow);
+            } else if (now.get(DateTimeFieldType.dayOfYear()) - 1 == (int) searchDateTime.get(DateTimeFieldType.dayOfYear())) {
+                day = getActivity().getResources().getString(R.string.time_yesterday);
+            }
         }
         vDatetime.setText(day + " " + at + " " + time);
     }

Hyperrail/src/main/res/values-fr/strings.xml

@@ -148,4 +148,5 @@
         <item quantity="other">%d arrêts</item>
     </plurals>
     <string name="status_departure_cancelled">Départ annulé</string>
+    <string name="time_yesterday">hier</string>
 </resources>

Hyperrail/src/main/res/values-nl/strings.xml

@@ -165,4 +165,5 @@
     </plurals>
     <string name="pref_mlgtraffic">Tekeningen treincomposities door MLGTraffic</string>
     <string name="status_departure_cancelled">Vertrek afgeschaft</string>
+    <string name="time_yesterday">gisteren</string>
 </resources>

Hyperrail/src/main/res/values/strings.xml

@@ -62,6 +62,7 @@
     <string name="time_today">today</string>
     <string name="time_now">now</string>
     <string name="time_tomorrow">tomorrow</string>
+    <string name="time_yesterday">yesterday</string>
     <string name="time_at">at</string>
     <string name="delay">%1$d\'</string>
     <string name="error_departure_equals_destination">Invalid query</string>
@@ -93,7 +94,7 @@
     <string name="ETA_transfer_departure">At %s I will leave from %s with %s</string>
 
     <string-array name="departarrive">
-        <item>Leave</item>
+        <item>Depart</item>
         <item>Arrive</item>
     </string-array>