Merge pull request #46 from hyperrail/development

Release 0.9.6
hyperrail · Sep 9, 2017 · 81e411a · 81e411a
2 parents a6c5e85 + f76d626
commit 81e411a
Show file tree

Hide file tree

Showing 7 changed files with 675 additions and 672 deletions.
diff --git a/Hyperrail/build.gradle b/Hyperrail/build.gradle
@@ -8,8 +8,8 @@ apply plugin: 'com.android.application'
 apply plugin: 'com.google.firebase.firebase-perf'
 apply plugin: 'com.google.firebase.firebase-crash'
 
-def VERSION_CODE = 7
-def VERSION_NAME = '0.9.5'
+def VERSION_CODE = 8
+def VERSION_NAME = '0.9.6'
 
 android {
     signingConfigs {
@@ -22,12 +22,12 @@ android {
             }
         }
     }
-    compileSdkVersion 25
-    buildToolsVersion '25.0.0'
+    compileSdkVersion 26
+    buildToolsVersion '26.0.0'
     defaultConfig {
         applicationId "be.hyperrail.android"
         minSdkVersion 19
-        targetSdkVersion 25
+        targetSdkVersion 26
         versionCode VERSION_CODE
         versionName VERSION_NAME
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -56,11 +56,11 @@ dependencies {
     })
 
     compile 'joda-time:joda-time:2.9.4'
-    compile 'com.android.support:appcompat-v7:25.3.1'
-    compile 'com.android.support:support-v4:25.3.1'
-    compile 'com.android.support:cardview-v7:25.3.1'
-    compile 'com.android.support:recyclerview-v7:25.3.1'
-    compile 'com.android.support:design:25.3.1'
+    compile 'com.android.support:appcompat-v7:26.0.0'
+    compile 'com.android.support:support-v4:26.0.0'
+    compile 'com.android.support:cardview-v7:26.0.0'
+    compile 'com.android.support:recyclerview-v7:26.0.0'
+    compile 'com.android.support:design:26.0.0'
     compile 'com.google.android.gms:play-services-location:10.2.6'
     compile 'com.google.firebase:firebase-crash:10.2.6'
     compile 'com.google.firebase:firebase-perf:10.2.6'

diff --git a/Hyperrail/src/main/java/be/hyperrail/android/RouteDetailActivity.java b/Hyperrail/src/main/java/be/hyperrail/android/RouteDetailActivity.java
@@ -19,8 +19,8 @@
 import android.view.View;
 
 import org.joda.time.DateTime;
-
-import java.text.DateFormat;
+import org.joda.time.format.DateTimeFormat;
+import org.joda.time.format.DateTimeFormatter;
 
 import be.hyperrail.android.adapter.OnRecyclerItemClickListener;
 import be.hyperrail.android.adapter.RouteDetailCardAdapter;
@@ -29,6 +29,8 @@
 import be.hyperrail.android.irail.implementation.TrainStub;
 import be.hyperrail.android.irail.implementation.Transfer;
 
+import static be.hyperrail.android.R.string.warning_not_realtime_datetime;
+
 /**
  * Activity to show one specific route
  */
@@ -54,9 +56,8 @@ protected void onCreate(Bundle savedInstanceState) {
 
         setTitle(route.getDepartureStation().getLocalizedName() + " - " + route.getArrivalStation().getLocalizedName());
 
-        DateFormat df = DateFormat.getDateInstance(DateFormat.LONG);
-
-        setSubTitle(df.format(route.getDepartureTime().toString()));
+        DateTimeFormatter df = DateTimeFormat.forPattern(getString(warning_not_realtime_datetime));
+        setSubTitle(df.print(route.getDepartureTime()));
 
         // disable pull-to-refresh
         // TODO: support refreshing
@@ -108,7 +109,7 @@ protected void getData() {
 
     @Override
     protected void getInitialData() {
-       route = (Route) getIntent().getSerializableExtra("route");
+        route = (Route) getIntent().getSerializableExtra("route");
     }
 
     @Override

diff --git a/Hyperrail/src/main/java/be/hyperrail/android/irail/db/StationsDb.java b/Hyperrail/src/main/java/be/hyperrail/android/irail/db/StationsDb.java
@@ -55,7 +55,7 @@ public class StationsDb extends SQLiteOpenHelper implements IrailStationProvider
 
     // If you change the database schema, you must increment the database version.
     // year/month/day/increment
-    private static final int DATABASE_VERSION = 17061200;
+    private static final int DATABASE_VERSION = 17090900;
 
     // Name of the database file
     private static final String DATABASE_NAME = "stations.db";