Update to version 1.1

README.md

@@ -1,10 +1,10 @@
 # Train Radar
 
+[Download APK](https://github.com/bortoz/trainradar/releases/tag/v1.0)\
 [Documentazione completa](https://github.com/bortoz/trainradar/blob/master/docs/docs.pdf)
 
 #### Sommario
 _Train Radar_ è l'applicazione che ti permette di seguire in tempo reale i treni in tutta Italia! Questa applicazione si ispira a _flighradar24_, un'applicazione che mostra la posizione degli aerei in tutto il mondo in diretta, tuttavia non esiste alcuna applicazione simile sul Play Store per i treni. Grazie a _Train Radar_ puoi monitorare i treni di qualsiasi regione, ordinarli in base alla propria distanza e monitorare i ritardi di ogni treno!
-\end{abstract}
 
 ## Dettagli tecnici
 

app/build.gradle

@@ -7,12 +7,10 @@ android {
         minSdkVersion 26
         targetSdkVersion 29
         versionCode 1
-        versionName "1.0"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        versionName "1.1"
     }
     buildTypes {
         release {
-            minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
@@ -24,15 +22,15 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
-    implementation 'com.android.support:appcompat-v7:29.0.0'
+    implementation 'com.android.support:support-annotations:29.0.0'
     implementation 'com.android.volley:volley:1.1.1'
     implementation 'com.google.android.gms:play-services-maps:17.0.0'
     implementation 'com.google.android.gms:play-services-location:17.0.0'
-    implementation 'com.google.android.material:material:1.0.0'
+    implementation 'com.google.android.material:material:1.1.0'
     implementation 'com.google.code.gson:gson:2.8.6'
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    implementation 'com.r0adkll:slidableactivity:2.1.0'
+    implementation 'com.tomergoldst.android:tooltips:1.0.10'
+    implementation 'com.github.Ferfalk:SimpleSearchView:0.1.5'
+    implementation 'org.apache.commons:commons-lang3:3.9'
 }

app/debug/output.json

@@ -0,0 +1,19 @@
+[
+  {
+    "outputType": {
+      "type": "APK"
+    },
+    "apkData": {
+      "type": "MAIN",
+      "splits": [],
+      "versionCode": 1,
+      "versionName": "1.0",
+      "enabled": true,
+      "outputFile": "app-debug.apk",
+      "fullName": "debug",
+      "baseName": "debug"
+    },
+    "path": "app-debug.apk",
+    "properties": {}
+  }
+]

app/release/output.json

@@ -0,0 +1,20 @@
+{
+  "version": 1,
+  "artifactType": {
+    "type": "APK",
+    "kind": "Directory"
+  },
+  "applicationId": "it.trainradar",
+  "variantName": "release",
+  "elements": [
+    {
+      "type": "SINGLE",
+      "filters": [],
+      "properties": [],
+      "versionCode": 1,
+      "versionName": "1",
+      "enabled": true,
+      "outputFile": "app-release.apk"
+    }
+  ]
+}

app/src/main/AndroidManifest.xml

@@ -16,28 +16,32 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/Theme.AppCompat.Light.NoActionBar"
-        android:usesCleartextTraffic="true">
+        android:theme="@style/AppTheme">
         <activity
             android:name=".view.RadarActivity"
             android:label="@string/title_activity_radar"
-            android:resizeableActivity="false">
+            android:resizeableActivity="false"
+            android:theme="@style/AppTheme.MainActivity"
+            android:windowSoftInputMode="adjustNothing">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
+
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
+
                 <data
                     android:host="trainradar.it"
-                    android:path="/radar"
-                    android:scheme="http" />
+                    android:scheme="https" />
             </intent-filter>
         </activity>
-        <activity android:name=".view.TrainActivity" />
-        <activity android:name=".view.NearTrainsActivity" />
+        <activity
+            android:name=".view.NearTrainsActivity"
+            android:label="@string/title_activity_near_trains"
+            android:windowSoftInputMode="adjustResize" />
 
         <meta-data
             android:name="com.google.android.geo.API_KEY"

app/src/main/java/it/trainradar/core/Realtime.java

@@ -0,0 +1,20 @@
+package it.trainradar.core;
+
+import java.io.Serializable;
+
+public class Realtime implements Cloneable, Serializable {
+    private boolean cancelled;
+    private Integer minutes;
+
+    public Realtime(boolean cancelled) {
+        this.cancelled = cancelled;
+    }
+
+    public boolean isCancelled() {
+        return cancelled;
+    }
+
+    public Integer getDelay() {
+        return minutes;
+    }
+}

app/src/main/java/it/trainradar/core/Station.java

@@ -8,22 +8,20 @@
 import java.util.ArrayList;
 
 public class Station implements Serializable {
-    private String id;
-    private ArrayList<String> altIds;
     private String name;
     private LatLng position;
     private ArrayList<String> links;
 
-    public String getId() {
-        return id;
+    public String getName() {
+        return name;
     }
 
-    public ArrayList<String> getAltIds() {
-        return altIds;
+    public double getLatitude() {
+        return position.latitude;
     }
 
-    public String getName() {
-        return name;
+    public double getLongitude() {
+        return position.longitude;
     }
 
     public LatLng getPosition() {
@@ -38,6 +36,10 @@ public Location getLocation() {
         return location;
     }
 
+    public float distanceTo(Station station) {
+        return getLocation().distanceTo(station.getLocation());
+    }
+
     public ArrayList<String> getLinks() {
         return links;
     }

app/src/main/java/it/trainradar/core/Stop.java

@@ -3,20 +3,27 @@
 import java.io.Serializable;
 import java.time.LocalTime;
 
+import it.trainradar.manager.StationManager;
+
 public class Stop implements Serializable {
-    private String id;
-    private LocalTime arrival;
-    private LocalTime departure;
+    private String station;
+    private LocalTime arrivalTime;
+    private LocalTime departureTime;
 
-    public String getId() {
-        return id;
+    public Station getStation() {
+        return StationManager.getStation(station);
     }
 
     public LocalTime getArrival() {
-        return arrival;
+        return arrivalTime != null ? arrivalTime : departureTime;
     }
 
     public LocalTime getDeparture() {
-        return departure;
+        return departureTime != null ? departureTime : arrivalTime;
+    }
+
+    @Override
+    public boolean equals(Object object) {
+        return object instanceof Stop && station.equals(((Stop) object).station);
     }
 }