comment

No luck so far

app/build.gradle

@@ -26,6 +26,9 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+    repositories {
+        maven { url "https://jitpack.io" }
+    }
 }
 
 dependencies {
@@ -47,6 +50,10 @@ dependencies {
     //osm
     implementation 'org.osmdroid:osmdroid-android:6.1.8'
 
+    //osm bonus pack
+    implementation 'com.github.MKergall:osmbonuspack:6.6.0'
+
     androidTestImplementation 'androidx.test.ext:junit:1.1.2'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
+    testImplementation 'org.mockito:mockito-core:2.7.22'
 }

app/src/main/AndroidManifest.xml

@@ -6,6 +6,8 @@
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
 
     <application
         android:allowBackup="true"

app/src/main/assets/locations.json

@@ -82,7 +82,7 @@
     "name":"MEZZ Breda Keizerstraat 101",
     "coordinates":"51.58394697737321,4.779757901349616",
     "description":"4811HL Breda",
-    "imageUrl":"NULL"
+    "imageUrl":"mezz_breda"
   },
   {
     "name":"Het Klooster Breda Schorsmolenstraat 13",

app/src/main/assets/routes.json

@@ -3,9 +3,35 @@
     "name": "rondje stad",
     "locations": [
       {
-        "name": "KesCrOkÊt breeda",
-        "coordinates": "2.4654645,6.2342323",
-        "description": "lekkere patatjes"
+        "name":"Prison Escape Kloosterlaan 168",
+        "coordinates":"51.59073795635181,4.784917104321059",
+        "description":"4811EE Breda",
+        "imageUrl":"NULL"
+      },
+      {
+        "name":"De Koepel - FutureDome Events Nassausingel 26",
+        "coordinates":"51.590431588532105,4.786756741648511",
+        "description":"4811HP Breda",
+        "imageUrl":"NULL"
+      },
+
+      {
+        "name":"Escaping Breda: Escape Room Games Boschstraat 114",
+        "coordinates":" 51.59110835530862,4.784147222780912",
+        "description":"4811GK Breda",
+        "imageUrl":"NULL"
+      },
+      {
+        "name":"MEZZ Breda Keizerstraat 101",
+        "coordinates":"51.58394697737321,4.779757901349616",
+        "description":"4811HL Breda",
+        "imageUrl":"NULL"
+      },
+      {
+        "name":"Het Klooster Breda Schorsmolenstraat 13",
+        "coordinates":"51.58775443759389,4.765568874365066",
+        "description":"4811VN Breda",
+        "imageUrl":"NULL"
       }
     ],
     "totalDistance": 2.3434,

app/src/main/java/com/a1/nextlocation/MainActivity.java

@@ -1,24 +1,32 @@
 package com.a1.nextlocation;
 
-import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentTransaction;
 
 import android.os.Bundle;
+import android.util.Log;
 import android.view.MenuItem;
 
 import com.a1.nextlocation.R;
+import com.a1.nextlocation.data.Coupon;
+import com.a1.nextlocation.data.FileIO;
+import com.a1.nextlocation.data.Route;
 import com.a1.nextlocation.fragments.HomeFragment;
 import com.a1.nextlocation.fragments.RouteFragment;
 import com.a1.nextlocation.fragments.SettingsFragment;
 import com.a1.nextlocation.fragments.StatisticFragment;
+import com.a1.nextlocation.network.ApiHandler;
 import com.a1.nextlocation.recyclerview.CouponListManager;
 import com.a1.nextlocation.recyclerview.LocationListManager;
 import com.a1.nextlocation.recyclerview.RouteListManager;
 import com.google.android.material.bottomnavigation.BottomNavigationView;
 
+import java.io.File;
+import java.util.Arrays;
+
 public class MainActivity extends AppCompatActivity {
+    private static final String TAG = MainActivity.class.getName();
+
     /**
      * onCreate method that creates the main activity
      * @param savedInstanceState the saved instance state of the app
@@ -28,9 +36,15 @@ public class MainActivity extends AppCompatActivity {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
 
-        BottomNavigationView bottomNav = findViewById(R.id.navbar);
+        BottomNavigationView bottomNav = findViewById(R.id.navigation_bar);
         bottomNav.setOnNavigationItemSelectedListener(navListener);
 
+
+        /*System.out.println(Arrays.toString(getFilesDir().listFiles()));
+        FileIO<Route> fileIO = new FileIO<>();
+        fileIO.writeFileData(new Route("TERSTSET"), getApplicationContext());
+        Log.d(TAG, "onCreate: " + "FILE GESCHREVENN!!!!!");*/
+
         LocationListManager.INSTANCE.setContext(this);
         LocationListManager.INSTANCE.load();
         CouponListManager.INSTANCE.setContext(this);

app/src/main/java/com/a1/nextlocation/data/FileIO.java

@@ -2,17 +2,26 @@ package com.a1.nextlocation.data;
 
 import android.content.Context;
 import android.content.res.AssetManager;
+import android.os.Environment;
 import android.util.Log;
 
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
 
+import org.json.JSONArray;
+
 import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.FileWriter;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.Reader;
 import java.lang.reflect.Type;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 
@@ -50,7 +59,45 @@ public class FileIO<T> {
         return res;
     }
 
-    public void writeFileData(T objectToWrite) {
-        //TODO make
-    }
+//    public void writeFileData(T objectToWrite, Context context) {
+//        //TODO make
+//        //object naar jsonobject
+//        //jsonarray toevoegen/maken
+//        //filewriter naar file
+//
+//        String filename = "";
+//        if (objectToWrite instanceof Coupon){
+//            filename = "coupons.json";
+//        }
+//
+//        if (objectToWrite instanceof Route){
+//            filename = "routes.json";
+//        }
+//
+//        if (objectToWrite instanceof Location){
+//            filename = "locations.json";
+//        }
+//
+//        try (FileOutputStream fileOutputStream = context.openFileOutput(filename, Context.MODE_PRIVATE)){
+//            String json = new Gson().toJson(objectToWrite);
+//
+//            fileOutputStream.write(json.getBytes(StandardCharsets.UTF_8));
+//
+//        } catch (FileNotFoundException e) {
+//            e.printStackTrace();
+//        } catch (IOException e) {
+//            e.printStackTrace();
+//        }
+//
+//        /*try (FileWriter fileWriter = new FileWriter(filename)){
+//
+//            String json = new Gson().toJson(objectToWrite);
+//
+//            fileWriter.append(json);
+//            fileWriter.flush();
+//
+//        } catch (IOException e) {
+//            e.printStackTrace();
+//        }*/
+//    }
 }

app/src/main/java/com/a1/nextlocation/data/Location.java

@@ -35,6 +35,10 @@ public class Location implements Parcelable {
         this(name,getStringFromCoordinates(latCoord,longCoord),description,imageUrl);
     }
 
+    public Location(String name, android.location.Location loc, String description, String imageUrl) {
+        this(name,getStringFromCoordinates(loc.getLatitude(),loc.getLongitude()),description,imageUrl);
+    }
+
     protected Location(Parcel in) {
         name = in.readString();
         coordinates = in.readString();
@@ -90,8 +94,8 @@ public class Location implements Parcelable {
 
     public double[] getCoordinatesAsDoubles() {
         double[] res = new double[2];
-        res[0] = getLat();
-        res[1] = getLong();
+        res[1] = getLat();
+        res[0] = getLong();
 
         return res;
     }
@@ -105,7 +109,45 @@ public class Location implements Parcelable {
     }
 
     public static String getStringFromCoordinates(double lat1, double long1) {
-        return lat1 + "," + long1;
+        return long1 + "," + lat1;
+    }
+
+    public double getDistance(Location other) {
+        double dlon = other.getLong() - getLong();
+        double dlat = other.getLat() - getLong();
+        double a = Math.pow(Math.sin(dlat / 2), 2)
+                + Math.cos(getLat()) * Math.cos(other.getLong())
+                * Math.pow(Math.sin(dlon / 2),2);
+
+        double c = 2 * Math.asin(Math.sqrt(a));
+
+        // Radius of earth in kilometers. Use 3956
+        // for miles
+        double r = 6371;
+
+        // calculate the result
+        double distance = c * r;
+
+        return Math.floor(distance);
+    }
+
+    public static double getDistance(double lat1, double lon1, double lat2, double lon2) {
+        double dlon = lon2 - lon1;
+        double dlat = lat2 - lat1;
+        double a = Math.pow(Math.sin(dlat / 2), 2)
+                + Math.cos(lat1) * Math.cos(lat2)
+                * Math.pow(Math.sin(dlon / 2),2);
+
+        double c = 2 * Math.asin(Math.sqrt(a));
+
+        // Radius of earth in kilometers. Use 3956
+        // for miles
+        double r = 6371;
+
+        // calculate the result
+        double distance = c * r;
+
+        return Math.floor(distance);
     }
 
     public GeoPoint convertToGeoPoint() {

app/src/main/java/com/a1/nextlocation/data/StaticData.java

@@ -0,0 +1,47 @@
+package com.a1.nextlocation.data;
+
+import org.osmdroid.views.overlay.Polyline;
+
+import java.util.ArrayList;
+
+/**
+ * singleton to keep track of different global data
+ */
+public enum StaticData {
+    INSTANCE;
+    private double distanceTraveled = 0;
+    private int locationsVisited = 0;
+
+    private ArrayList<String> visitedNames = new ArrayList<>();
+
+    public void addDistance(double d) {
+        distanceTraveled += d;
+    }
+
+
+    public double getDistanceTraveled() {
+        return distanceTraveled;
+    }
+
+    public void visitLocation(Location location) {
+        if (!visitedNames.contains(location.getName())) {
+            locationsVisited++;
+            visitedNames.add(location.getName());
+        }
+    }
+
+    public int getLocationsVisited() {
+        return locationsVisited;
+    }
+
+    private Polyline currentRoute;
+
+    public void setCurrentRoute(Polyline currentRoute) {
+        this.currentRoute = currentRoute;
+    }
+
+    public Polyline getCurrentRoute() {
+        return currentRoute;
+    }
+
+}

app/src/main/java/com/a1/nextlocation/fragments/CouponFragment.java

@@ -1,7 +1,6 @@
 package com.a1.nextlocation.fragments;
 
 import android.app.AlertDialog;
-import android.content.DialogInterface;
 import android.os.Bundle;
 
 import androidx.fragment.app.Fragment;
@@ -38,11 +37,11 @@ public class CouponFragment extends Fragment {
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         View view = inflater.inflate(R.layout.fragment_coupon, container, false);
 
-        this.couponRecyclerView = view.findViewById(R.id.couponRecyclerView);
+        this.couponRecyclerView = view.findViewById(R.id.coupon_recyclerview);
         this.couponRecyclerView.setHasFixedSize(true);
         this.layoutManager = new LinearLayoutManager(this.getContext());
 
-        this.imageButton = view.findViewById(R.id.couponBackButton);
+        this.imageButton = view.findViewById(R.id.coupon_back_button);
         this.imageButton.setOnClickListener(v -> {
             StatisticFragment statisticFragment = new StatisticFragment();
             ((FragmentActivity) view.getContext()).getSupportFragmentManager().beginTransaction().replace(R.id.fragment_layout, statisticFragment).addToBackStack(null).commit();

app/src/main/java/com/a1/nextlocation/fragments/HomeFragment.java

@@ -5,8 +5,9 @@ package com.a1.nextlocation.fragments;
 import android.Manifest;
 import android.content.Context;
 import android.content.pm.PackageManager;
-import android.content.res.Resources;
+import android.graphics.drawable.Drawable;
 import android.location.Location;
+import android.location.LocationListener;
 import android.location.LocationManager;
 import android.os.Bundle;
 import android.util.Log;
@@ -14,6 +15,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageButton;
+import android.widget.Toast;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -23,31 +25,38 @@ import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentActivity;
 
 import com.a1.nextlocation.R;
-import com.a1.nextlocation.data.Route;
-import com.a1.nextlocation.recyclerview.CouponListManager;
-import com.a1.nextlocation.recyclerview.CustomOverlay;
+import com.a1.nextlocation.data.StaticData;
+import com.a1.nextlocation.json.DirectionsResult;
+import com.a1.nextlocation.network.ApiHandler;
 import com.a1.nextlocation.recyclerview.LocationListManager;
-import com.a1.nextlocation.recyclerview.RouteListManager;
 
 import org.osmdroid.api.IMapController;
 import org.osmdroid.config.Configuration;
 import org.osmdroid.util.GeoPoint;
 import org.osmdroid.views.MapView;
+import org.osmdroid.views.overlay.ItemizedIconOverlay;
 import org.osmdroid.views.overlay.Overlay;
 import org.osmdroid.views.overlay.OverlayItem;
+import org.osmdroid.views.overlay.Polyline;
 import org.osmdroid.views.overlay.compass.CompassOverlay;
 import org.osmdroid.views.overlay.compass.InternalCompassOrientationProvider;
 import org.osmdroid.views.overlay.mylocation.GpsMyLocationProvider;
 import org.osmdroid.views.overlay.mylocation.MyLocationNewOverlay;
 
 import java.util.ArrayList;
+import java.util.List;
 
-public class HomeFragment extends Fragment {
+public class HomeFragment extends Fragment implements LocationListener{
     private final String userAgent = "com.ai.nextlocation.fragments";
+    public final static String MAPQUEST_API_KEY = "vuyXjqnAADpjeL9QwtgWGleIk95e36My";
     private ImageButton imageButton;
     private MapView mapView;
     private final int REQUEST_PERMISSIONS_REQUEST_CODE = 1;
     private final String TAG = HomeFragment.class.getCanonicalName();
+//    private RoadManager roadManager;
+    private Polyline roadOverlay;
+    private int color;
+    private Location currentLocation;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -57,7 +66,10 @@ public class HomeFragment extends Fragment {
                 Manifest.permission.ACCESS_FINE_LOCATION,
                 // WRITE_EXTERNAL_STORAGE is required in order to show the map
                 Manifest.permission.WRITE_EXTERNAL_STORAGE);
+//        roadManager = new MapQuestRoadManager(MAPQUEST_API_KEY);
+//        roadManager.addRequestOption("routeType=foot-walking");
 
+        color = requireContext().getColor(R.color.red);
     }
 
     @Override
@@ -72,9 +84,30 @@ public class HomeFragment extends Fragment {
             ((FragmentActivity) view.getContext()).getSupportFragmentManager().beginTransaction().replace(R.id.fragment_layout, locationFragment).addToBackStack(null).commit();
         });
 
+        ApiHandler.INSTANCE.addListener(this::onDirectionsAvailable);
         return view;
     }
 
+    private void onDirectionsAvailable(DirectionsResult directionsResult) {
+        Log.d(TAG, "onDirectionsAvailable: got result! " + directionsResult);
+        ArrayList<GeoPoint> geoPoints = directionsResult.getGeoPoints();
+        roadOverlay = new Polyline();
+        roadOverlay.setPoints(geoPoints);
+
+        // this is for mapquest, but it gives a "no value for guidancelinkcollection" error and google has never heard of that
+//        GeoPoint[] gp = directionsResult.getStartAndEndPoint();
+//        ArrayList<GeoPoint> arrayList = new ArrayList<>(Arrays.asList(gp));
+//        Road road = roadManager.getRoad(arrayList);
+//        roadOverlay = RoadManager.buildRoadOverlay(road);
+
+        roadOverlay.setColor(color);
+
+
+        StaticData.INSTANCE.setCurrentRoute(roadOverlay);
+        Log.d(TAG, "onDirectionsAvailable: successfully added road!");
+
+    }
+
     @Override
     public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
@@ -82,12 +115,16 @@ public class HomeFragment extends Fragment {
         initMap(view);
     }
 
+    /**
+     * This method initializes the map and all the things it needs
+     * @param view the view the map is on
+     */
     private void initMap(@NonNull View view) {
         // set the user agent
         Configuration.getInstance().setUserAgentValue(userAgent);
 
         // create the map view
-        mapView = view.findViewById(R.id.mapView);
+        mapView = view.findViewById(R.id.map_view);
         mapView.setDestroyMode(false);
         mapView.setTag("mapView");
         mapView.setMultiTouchControls(true);
@@ -100,27 +137,14 @@ public class HomeFragment extends Fragment {
         compassOverlay.enableCompass();
         mapView.getOverlays().add(compassOverlay);
 
+        addLocations();
+
         // add the location overlay
         MyLocationNewOverlay mLocationOverlay = new MyLocationNewOverlay(gpsMyLocationProvider, mapView);
         mLocationOverlay.enableFollowLocation();
         mLocationOverlay.enableMyLocation();
         mapView.getOverlays().add(mLocationOverlay);
 
-        CustomOverlay customOverlay = new CustomOverlay(getResources().getDrawable(R.drawable.ic_baseline_location_on_24),mapView);
-
-        for (com.a1.nextlocation.data.Location l : LocationListManager.INSTANCE.getLocationList()) {
-            GeoPoint p = new GeoPoint(l.getLat(), l.getLong());
-            OverlayItem overlayItem = new OverlayItem(l.getName(),l.getDescription(), p);
-
-            customOverlay.addOverlayItem(overlayItem);
-            Log.d(TAG, "initMap: " + "succes");
-        }
-
-
-        mapView.getOverlays().add(customOverlay);
-
-
-
         // add the zoom controller
         IMapController mapController = mapView.getController();
         mapController.setZoom(15.0);
@@ -129,10 +153,22 @@ public class HomeFragment extends Fragment {
         LocationManager locationManager = (LocationManager) requireActivity().getSystemService(Context.LOCATION_SERVICE);
 
 
+
+
         try {
+
+            locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER,0,0,this);
+            locationManager.requestLocationUpdates(LocationManager.NETWORK_PROVIDER,0,0,this);
+
             Location location = locationManager.getLastKnownLocation(LocationManager.GPS_PROVIDER);
-            GeoPoint startPoint = new GeoPoint(location.getLatitude(), location.getLongitude());
-            mapController.setCenter(startPoint);
+            if (currentLocation == null) {
+                currentLocation = location;
+            }
+
+            if( location != null ) {
+                GeoPoint start = new GeoPoint(location.getLatitude(), location.getLongitude());
+                mapController.setCenter(start);
+            }
 
         } catch (SecurityException e) {
             Log.d(TAG, "onViewCreated: exception while getting location: " + e.getLocalizedMessage());
@@ -145,7 +181,64 @@ public class HomeFragment extends Fragment {
 
         }
 
+
+        displayRoute();
+
     }
+
+    private void displayRoute() {
+
+        if (roadOverlay == null) {
+            if (StaticData.INSTANCE.getCurrentRoute() != null) {
+                roadOverlay = StaticData.INSTANCE.getCurrentRoute();
+                mapView.getOverlays().add(roadOverlay);
+                mapView.invalidate();
+                Log.d(TAG, "initMap: successfully added road!");
+            }
+        } else {
+            mapView.getOverlays().add(roadOverlay);
+            mapView.invalidate();
+            Log.d(TAG, "initMap: successfully added road!");
+        }
+    }
+
+    private void addLocations() {
+        List<com.a1.nextlocation.data.Location> locations = LocationListManager.INSTANCE.getLocationList();
+        final ArrayList<OverlayItem> items = new ArrayList<>(locations.size());
+        Drawable marker = ContextCompat.getDrawable(requireContext(),R.drawable.ic_baseline_location_on_24);
+        marker.setAlpha(255);
+        marker.setTint(getResources().getColor(R.color.primaryColour));
+        for (com.a1.nextlocation.data.Location location : locations) {
+            OverlayItem item = new OverlayItem(location.getName(),location.getDescription(),location.convertToGeoPoint());
+            item.setMarker(marker);
+            items.add(item);
+        }
+        Overlay allLocationsOverlay = new ItemizedIconOverlay<OverlayItem>(items,
+                new ItemizedIconOverlay.OnItemGestureListener<OverlayItem>() {
+                    @Override
+                    public boolean onItemSingleTapUp(int index, OverlayItem item) {
+                        com.a1.nextlocation.data.Location clicked = locations.get(index);
+                        requireActivity().getSupportFragmentManager().beginTransaction().replace(R.id.fragment_layout, new LocationDetailFragment(clicked)).commit();
+                        return false;
+                    }
+
+                    @Override
+                    public boolean onItemLongPress(int index, OverlayItem item) {
+                        com.a1.nextlocation.data.Location clicked = locations.get(index);
+                        Toast.makeText(requireContext(), clicked.getName(),Toast.LENGTH_SHORT).show();
+//                        Route route = new Route("Route to " + clicked.getName());
+//                        route.addLocation(new com.a1.nextlocation.data.Location("Current location",currentLocation.getLatitude(),currentLocation.getLongitude(),"your location",null));
+//                        route.addLocation(clicked);
+//                        ApiHandler.INSTANCE.getDirections(route);
+                        return true;
+                    }
+                },requireContext());
+
+        mapView.getOverlays().add(allLocationsOverlay);
+        Log.d(TAG, "addLocations: successfully added locations");
+
+    }
+
     private void requestPermissionsIfNecessary(String... permissions) {
         ArrayList<String> permissionsToRequest = new ArrayList<>();
         if (this.getContext() != null)
@@ -163,4 +256,37 @@ public class HomeFragment extends Fragment {
                     REQUEST_PERMISSIONS_REQUEST_CODE);
         }
     }
+
+    @Override
+    public void onLocationChanged(@NonNull Location location) {
+        double distance = currentLocation.distanceTo(location); // in meters
+        StaticData.INSTANCE.addDistance(distance);
+        currentLocation = location;
+
+        //new thread because we don't want the main thread to hang
+        Thread t = new Thread(() -> {
+            for (com.a1.nextlocation.data.Location l : LocationListManager.INSTANCE.getLocationList()) {
+                if (com.a1.nextlocation.data.Location.getDistance(currentLocation.getLatitude(),currentLocation.getLongitude(),l.getLat(),l.getLong()) < 10) {
+                    StaticData.INSTANCE.visitLocation(l);
+                }
+            }
+        });
+
+        t.start();
+    }
+
+    @Override
+    public void onStatusChanged(String provider, int status, Bundle extras) {
+
+    }
+
+    @Override
+    public void onProviderEnabled(@NonNull String provider) {
+
+    }
+
+    @Override
+    public void onProviderDisabled(@NonNull String provider) {
+
+    }
 }

app/src/main/java/com/a1/nextlocation/fragments/LocationDetailFragment.java

@@ -1,39 +1,52 @@
 package com.a1.nextlocation.fragments;
 
+import android.content.Intent;
 import android.os.Bundle;
 
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentActivity;
 
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageButton;
 
 import com.a1.nextlocation.R;
+import com.a1.nextlocation.data.Location;
 
 public class LocationDetailFragment extends Fragment {
+    private static final String TAG = LocationDetailFragment.class.getCanonicalName();
 
     private ImageButton imageButton;
+    private Location location;
+
+    public LocationDetailFragment() {
+
+    }
+
+    public LocationDetailFragment(Location location) {
+        this.location = location;
+    }
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-
     }
 
     @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
 
         View view = inflater.inflate(R.layout.fragment_location_detail, container, false);
-//
-//        this.imageButton = view.findViewById(R.id.detail_location_back_button);
-//        this.imageButton.setOnClickListener(v -> {
-//            LocationFragment locationFragment = new LocationFragment();
-//            ((FragmentActivity) view.getContext()).getSupportFragmentManager().beginTransaction().replace(R.id.fragment_layout, locationFragment).addToBackStack(null).commit();
-//        });
+        this.imageButton = view.findViewById(R.id.detail_location_back_button);
+        this.imageButton.setOnClickListener(v -> {
+            LocationFragment locationFragment = new LocationFragment();
+            ((FragmentActivity) view.getContext()).getSupportFragmentManager().beginTransaction().replace(R.id.fragment_layout, locationFragment).addToBackStack(null).commit();
+        });
 
+        if (location != null) {
+            Log.d(TAG, "onCreateView: the location has a name of: " + location.getName());
+        }
         return view;
     }
 }

app/src/main/java/com/a1/nextlocation/fragments/LocationFragment.java

@@ -14,11 +14,9 @@ import android.widget.ImageButton;
 
 import com.a1.nextlocation.R;
 import com.a1.nextlocation.data.Location;
-import com.a1.nextlocation.recyclerview.CouponAdapter;
 import com.a1.nextlocation.recyclerview.LocationAdapter;
 import com.a1.nextlocation.recyclerview.LocationListManager;
 
-import java.util.ArrayList;
 import java.util.List;
 
 public class LocationFragment extends Fragment {
@@ -38,11 +36,11 @@ public class LocationFragment extends Fragment {
 
         View view = inflater.inflate(R.layout.fragment_location, container, false);
 
-        this.locationRecyclerView = view.findViewById(R.id.locationRecyclerView);
+        this.locationRecyclerView = view.findViewById(R.id.location_recyclerview);
         this.locationRecyclerView.setHasFixedSize(true);
         this.layoutManager = new LinearLayoutManager(this.getContext());
 
-        this.imageButton = view.findViewById(R.id.locationBackButton);
+        this.imageButton = view.findViewById(R.id.location_back_button);
         this.imageButton.setOnClickListener(v -> {
             HomeFragment homeFragment = new HomeFragment();
             ((FragmentActivity) view.getContext()).getSupportFragmentManager().beginTransaction().replace(R.id.fragment_layout, homeFragment).addToBackStack(null).commit();

app/src/main/java/com/a1/nextlocation/fragments/RouteDetailFragment.java

@@ -3,14 +3,18 @@ package com.a1.nextlocation.fragments;
 import android.os.Bundle;
 
 import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
 
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.Button;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import com.a1.nextlocation.R;
 import com.a1.nextlocation.data.Route;
+import com.a1.nextlocation.network.ApiHandler;
 
 public class RouteDetailFragment extends Fragment {
 
@@ -32,8 +36,17 @@ public class RouteDetailFragment extends Fragment {
 
         this.routeDetailText = view.findViewById(R.id.routeDetailText);
         this.routeDetailText.setText(this.route.getName());
+        Button startButton = view.findViewById(R.id.start_route_button);
+        startButton.setOnClickListener(this::startRoute);
 
 
         return view;
     }
+
+    public void startRoute(View view) {
+        ApiHandler.INSTANCE.getDirections(route);
+        Toast.makeText(requireContext(),"Route started!",Toast.LENGTH_SHORT).show();
+        ((FragmentActivity) view.getContext()).getSupportFragmentManager().beginTransaction().replace(R.id.fragment_layout, new HomeFragment()).addToBackStack(null).commit();
+
+    }
 }

app/src/main/java/com/a1/nextlocation/fragments/RouteFragment.java

@@ -2,11 +2,14 @@ package com.a1.nextlocation.fragments;
 
 import android.os.Bundle;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentActivity;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -16,10 +19,15 @@ import com.a1.nextlocation.data.Route;
 import com.a1.nextlocation.recyclerview.RouteAdapter;
 import com.a1.nextlocation.recyclerview.RouteListManager;
 
-import java.util.ArrayList;
 import java.util.List;
+import com.a1.nextlocation.data.Location;
+import com.a1.nextlocation.data.Route;
+import com.a1.nextlocation.json.DirectionsResult;
+import com.a1.nextlocation.network.ApiHandler;
+import com.a1.nextlocation.network.DirectionsListener;
 
 public class RouteFragment extends Fragment {
+    private static final String TAG = RouteFragment.class.getCanonicalName();
 
     private RecyclerView routeRecyclerView;
     private RecyclerView.LayoutManager layoutManager;
@@ -36,7 +44,7 @@ public class RouteFragment extends Fragment {
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         View view = inflater.inflate(R.layout.fragment_route, container, false);
 
-        this.routeRecyclerView = view.findViewById(R.id.routeRecyclerView);
+        this.routeRecyclerView = view.findViewById(R.id.route_recyclerview);
         this.routeRecyclerView.setHasFixedSize(true);
         this.layoutManager = new LinearLayoutManager(this.getContext());
 
@@ -56,4 +64,21 @@ public class RouteFragment extends Fragment {
         this.routeRecyclerView.setAdapter(this.routeAdapter);
         return view;
     }
+
+    @Override
+    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+
+//        ApiHandler.INSTANCE.getDirections(51.49017262451581, 4.289038164073164,51.47337383133509, 4.303535222390562);
+//        Route r = new Route("test");
+//        r.addLocation(new Location("test",51.574473766034046, 4.7628379328055175,"route",null));
+//        r.addLocation(new Location("test",51.577354223919876, 4.771120593941968,"route",null));
+//        r.addLocation(new Location("test",51.573033468635174, 4.782750651807139,"route",null));
+//        r.addLocation(new Location("test",51.56519104881196, 4.748246716295709,"route",null));
+//        r.addLocation(new Location("test",51.57367360644676, 4.74404101271347,"route",null));
+//        r.addLocation(new Location("test",51.57852769146427, 4.739878224473907,"route",null));
+////        r.addLocation(new Location("test",51.489063681658145, 4.289596063527951,"route",null));
+////        r.addLocation(new Location("test",51.483012677667766, 4.28003245468457,"route",null));
+//        ApiHandler.INSTANCE.getDirections(r);
+    }
 }

app/src/main/java/com/a1/nextlocation/fragments/StatisticFragment.java

@@ -16,6 +16,7 @@ import android.widget.Toast;
 
 import com.a1.nextlocation.R;
 import com.a1.nextlocation.data.Coupon;
+import com.a1.nextlocation.data.StaticData;
 import com.a1.nextlocation.recyclerview.CouponAdapter;
 import com.a1.nextlocation.recyclerview.CouponListManager;
 
@@ -36,6 +37,13 @@ public class StatisticFragment extends Fragment {
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         View view = inflater.inflate(R.layout.fragment_statistic, container, false);
 
+        TextView distance = view.findViewById(R.id.statistics_km);
+        TextView locs = view.findViewById(R.id.statistics_locations_visited);
+        double dist = StaticData.INSTANCE.getDistanceTraveled()/1000;
+        distance.setText(""  + String.format("%.1f",dist) + " km");
+        locs.setText("" + StaticData.INSTANCE.getLocationsVisited());
+
+
         this.couponList = CouponListManager.INSTANCE.getCouponList();
         CouponAdapter adapter = new CouponAdapter(this.getContext(), this.couponList);
         TextView couponNumber = view.findViewById(R.id.couponAmount);

app/src/main/java/com/a1/nextlocation/json/DirectionsResult.java

@@ -0,0 +1,190 @@
+package com.a1.nextlocation.json;
+
+import android.util.Log;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+import com.google.gson.JsonPrimitive;
+
+import org.json.JSONArray;
+import org.osmdroid.util.GeoPoint;
+
+import java.lang.reflect.Array;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+public class DirectionsResult {
+    private static final String TAG = DirectionsResult.class.getCanonicalName();
+    private List<DirectionsStep> steps = new ArrayList<>();
+    private double distance;
+    private double duration;
+    private double[][] wayPointCoordinates;
+    private GeoPoint[] startAndEndPoint = new GeoPoint[2];
+
+    public List<DirectionsStep> getSteps() {
+        return steps;
+    }
+
+    public void setSteps(List<DirectionsStep> steps) {
+        this.steps = steps;
+    }
+
+    public double getDistance() {
+        return distance;
+    }
+
+    public void setDistance(double distance) {
+        this.distance = distance;
+    }
+
+    public double getDuration() {
+        return duration;
+    }
+
+    public void setDuration(double duration) {
+        this.duration = duration;
+    }
+
+    public void addStep(DirectionsStep step) {
+        this.steps.add(step);
+    }
+
+    public GeoPoint[] getStartAndEndPoint() {
+        return startAndEndPoint;
+    }
+
+    /**
+     * converts all the geopoints in all the steps into an arraylist to display it on the map
+     * @return the list of geopoints
+     */
+    public ArrayList<GeoPoint> getGeoPoints() {
+        int size = 0;
+        // we'll have a lot of waypoints, so calculate the size first so that the list won't have to be extended (o p t i m i z e)
+        for (int i = 0; i < this.getSteps().size(); i++) {
+            size += this.getSteps().get(i).getWaypoints().length;
+        }
+
+        ArrayList<GeoPoint> res = new ArrayList<>(size);
+        for (DirectionsStep step : this.getSteps()) {
+            Collections.addAll(res, step.getWaypoints());
+        }
+        return res;
+    }
+
+    /**
+     * parses a given json string into this object. It gets all the waypoints and steps and combines them so that every step also has the correct coordinates associated with it
+     *
+     * @param json the json string to parse.
+     */
+    public void parse(String json) {
+
+        Gson gson = new GsonBuilder().setPrettyPrinting().create();
+        JsonObject feature = JsonParser.parseString(json).getAsJsonObject().get("features").getAsJsonArray().get(0).getAsJsonObject();
+        JsonObject properties = feature.get("properties").getAsJsonObject();
+        JsonArray wayPointCoordinates = feature.get("geometry").getAsJsonObject().getAsJsonArray("coordinates");
+        this.wayPointCoordinates = new double[wayPointCoordinates.size()][2];
+
+
+        // fill the way point coordinates list for later use
+        for (int i = 0; i < wayPointCoordinates.size(); i++) {
+            JsonElement j = wayPointCoordinates.get(i);
+            JsonArray arr = j.getAsJsonArray();
+            this.wayPointCoordinates[i][0] = arr.get(0).getAsDouble();
+            this.wayPointCoordinates[i][1] = arr.get(1).getAsDouble();
+        }
+
+
+        JsonArray segments = properties.getAsJsonArray("segments");
+
+        for (JsonElement element : segments) {
+            JsonObject segment = element.getAsJsonObject();
+
+            setDistance(segment.get("distance").getAsDouble());
+            setDuration(segment.get("duration").getAsDouble());
+
+            JsonArray steps = segment.getAsJsonArray("steps");
+
+            for (JsonElement j : steps) {
+
+                DirectionsStep step = gson.fromJson(j, DirectionsStep.class);
+                double lat;
+                double longl;
+
+                // kinda stinky but it works
+                for (int i = 0; i < 2; i++) {
+                    lat = this.wayPointCoordinates[step.getWay_points().get(i)][0];
+                    longl = this.wayPointCoordinates[step.getWay_points().get(i)][1];
+                    step.getWaypoints()[i] = new GeoPoint(lat, longl);
+                }
+
+                addStep(step);
+                Log.d(TAG, "parse: added step" + step);
+            }
+        }
+
+        startAndEndPoint[0] = this.getSteps().get(0).getWaypoints()[0];
+        startAndEndPoint[1] = this.getSteps().get(this.getSteps().size()-1).getWaypoints()[1];
+
+    }
+
+    public void parseRoute(String json) {
+
+        Gson gson = new GsonBuilder().setPrettyPrinting().create();
+        JsonArray routes = JsonParser.parseString(json).getAsJsonObject().getAsJsonArray("routes");
+        for (JsonElement element : routes) {
+            JsonObject route = element.getAsJsonObject();
+            JsonObject summary = route.getAsJsonObject("summary");
+            this.distance = summary.get("distance").getAsDouble();
+            this.duration = summary.get("duration").getAsDouble();
+
+            JsonPrimitive geometry = route.getAsJsonPrimitive("geometry");
+            JsonArray wayPointCoordinates = GeometryDecoder.decodeGeometry(geometry.getAsString(), false);
+            this.wayPointCoordinates = new double[wayPointCoordinates.size()][2];
+
+
+            // fill the way point coordinates list for later use
+            for (int i = 0; i < wayPointCoordinates.size(); i++) {
+                JsonElement j = wayPointCoordinates.get(i);
+                JsonArray arr = j.getAsJsonArray();
+                this.wayPointCoordinates[i][0] = arr.get(0).getAsDouble();
+                this.wayPointCoordinates[i][1] = arr.get(1).getAsDouble();
+            }
+
+
+            JsonArray segments = route.getAsJsonArray("segments");
+
+            for (JsonElement e : segments) {
+                JsonObject segment = e.getAsJsonObject();
+
+                setDistance(segment.get("distance").getAsDouble());
+                setDuration(segment.get("duration").getAsDouble());
+
+                JsonArray steps = segment.getAsJsonArray("steps");
+
+                for (JsonElement j : steps) {
+
+                    DirectionsStep step = gson.fromJson(j, DirectionsStep.class);
+                    double lat;
+                    double longl;
+
+                    // kinda stinky but it works
+                    for (int i = 0; i < 2; i++) {
+                        lat = this.wayPointCoordinates[step.getWay_points().get(i)][0];
+                        longl = this.wayPointCoordinates[step.getWay_points().get(i)][1];
+                        step.getWaypoints()[i] = new GeoPoint(lat, longl);
+                    }
+
+                    addStep(step);
+                    Log.d(TAG, "parse: added step" + step);
+                }
+            }
+
+        }
+
+    }
+}

app/src/main/java/com/a1/nextlocation/json/DirectionsStep.java

@@ -0,0 +1,72 @@
+package com.a1.nextlocation.json;
+
+import org.osmdroid.util.GeoPoint;
+
+import java.util.ArrayList;
+
+/**
+ * pojo class that holds the step object from the api response
+ */
+public class DirectionsStep {
+    private double distance;
+    private double duration;
+    private String instruction;
+    private String name;
+    /**
+     * these are the actual waypoints that the step refers to. The first is the beginning of the step, and the second is what it leads to.
+     * The second geopoint is always the first geopoint of the next step in the list of the {@link DirectionsResult} object.
+     */
+    private GeoPoint[] waypoints = new GeoPoint[2];
+    /**
+     * this is a list of the waypoints that are in the response, it is called way_points so it can be automatically serialized with gson
+     */
+    private ArrayList<Integer> way_points;
+
+    public double getDistance() {
+        return distance;
+    }
+
+    public void setDistance(double distance) {
+        this.distance = distance;
+    }
+
+    public double getDuration() {
+        return duration;
+    }
+
+    public void setDuration(double duration) {
+        this.duration = duration;
+    }
+
+    public String getInstruction() {
+        return instruction;
+    }
+
+    public void setInstruction(String instruction) {
+        this.instruction = instruction;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public ArrayList<Integer> getWay_points() {
+        return way_points;
+    }
+
+    public void setWay_points(ArrayList<Integer> way_points) {
+        this.way_points = way_points;
+    }
+
+    public GeoPoint[] getWaypoints() {
+        return waypoints;
+    }
+
+    public void setWaypoints(GeoPoint[] waypoints) {
+        this.waypoints = waypoints;
+    }
+}

app/src/main/java/com/a1/nextlocation/json/GeometryDecoder.java

@@ -0,0 +1,63 @@
+package com.a1.nextlocation.json;
+
+import com.google.gson.JsonArray;
+
+import org.json.JSONArray;
+import org.json.JSONException;
+
+/**
+ * source: https://github.com/GIScience/openrouteservice-docs#geometry-decoding
+ */
+public class GeometryDecoder {
+
+    public static JsonArray decodeGeometry(String encodedGeometry, boolean inclElevation) {
+        JsonArray geometry = new JsonArray();
+        int len = encodedGeometry.length();
+        int index = 0;
+        int lat = 0;
+        int lng = 0;
+        int ele = 0;
+
+        while (index < len) {
+            int result = 1;
+            int shift = 0;
+            int b;
+            do {
+                b = encodedGeometry.charAt(index++) - 63 - 1;
+                result += b << shift;
+                shift += 5;
+            } while (b >= 0x1f);
+            lat += (result & 1) != 0 ? ~(result >> 1) : (result >> 1);
+
+            result = 1;
+            shift = 0;
+            do {
+                b = encodedGeometry.charAt(index++) - 63 - 1;
+                result += b << shift;
+                shift += 5;
+            } while (b >= 0x1f);
+            lng += (result & 1) != 0 ? ~(result >> 1) : (result >> 1);
+
+
+            if(inclElevation){
+                result = 1;
+                shift = 0;
+                do {
+                    b = encodedGeometry.charAt(index++) - 63 - 1;
+                    result += b << shift;
+                    shift += 5;
+                } while (b >= 0x1f);
+                ele += (result & 1) != 0 ? ~(result >> 1) : (result >> 1);
+            }
+
+            JsonArray location = new JsonArray();
+            location.add(lat / 1E5);
+            location.add(lng / 1E5);
+            if(inclElevation){
+                location.add((float) (ele / 100));
+            }
+            geometry.add(location);
+        }
+        return geometry;
+    }
+}

app/src/main/java/com/a1/nextlocation/network/ApiHandler.java

@@ -4,14 +4,20 @@ import android.util.Log;
 
 import com.a1.nextlocation.data.Location;
 import com.a1.nextlocation.data.Route;
+import com.a1.nextlocation.json.DirectionsResult;
+import com.google.gson.Gson;
+import com.google.gson.JsonObject;
 
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Objects;
 import java.util.concurrent.atomic.AtomicReference;
 
 import okhttp3.MediaType;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
+import okhttp3.RequestBody;
 import okhttp3.Response;
 
 public enum ApiHandler {
@@ -22,21 +28,22 @@ public enum ApiHandler {
     public static final MediaType JSON = MediaType.get("application/json; charset=utf-8");
     private final String BASE_URL = "https://api.openrouteservice.org/v2/directions/";
     private final String API_KEY = "5b3ce3597851110001cf6248d4eee2099f724255918adc71cc502b2a";
-    private final String DIRECTIONS_MODE = "foot_walking";
+    private final String DIRECTIONS_MODE = "foot-walking";
+    private List<DirectionsListener> listeners = new ArrayList<>();
 
     private OkHttpClient client = new OkHttpClient();
 
-    public Route getDirections(Location startLocation, Location endLocation) {
-        return getDirections(startLocation.getCoordinates(),endLocation.getCoordinates());
+    public void getDirections(Location startLocation, Location endLocation) {
+        getDirections(startLocation.getCoordinates(),endLocation.getCoordinates());
     }
 
-    public Route getDirections(double startLat, double startLong, double endLat, double endLong) {
-        return getDirections(startLat + "," + startLong, endLat + "," + endLong);
+    public void getDirections(double startLat, double startLong, double endLat, double endLong) {
+        getDirections(startLong + "," + startLat, endLong + "," + endLat);
     }
 
-    public Route getDirections(String startLocation, String endLocation) {
+    public void getDirections(String startLocation, String endLocation) {
+
         String requestUrl = BASE_URL + DIRECTIONS_MODE + "?api_key=" + API_KEY + "&start=" +startLocation + "&end=" + endLocation;
-        AtomicReference<Route> res = null;
         Thread t = new Thread(() -> {
 
             Request request = new Request.Builder().url(requestUrl).build();
@@ -45,6 +52,76 @@ public enum ApiHandler {
                 if (response.body() != null) {
                     String responseString = Objects.requireNonNull(response.body()).string();
                     Log.d(TAG, "getDirections: got response: " + responseString);
+
+                    DirectionsResult result = new DirectionsResult();
+                    result.parse(responseString);
+                    Log.d(TAG, "getDirections: " + result.getSteps().size());
+
+                    for (DirectionsListener listener : listeners) {
+                        listener.onDirectionsAvailable(result);
+                    }
+                }
+
+            } catch (IOException e) {
+                Log.d(TAG, "getDirections: caught exception: " + e.getLocalizedMessage());
+            }
+        });
+
+        t.start();
+
+//        try {
+//            t.join();
+//        } catch (InterruptedException e) {
+//            e.printStackTrace();
+//        }
+
+    }
+
+    public void addListener(DirectionsListener listener) {
+        this.listeners.add(listener);
+    }
+
+    public void getDirections(Route route) {
+//        for (int i = 0; i < route.getLocations().size()-1; i+= 2) {
+//            Location start = route.getLocations().get(i);
+//            Location end = route.getLocations().get(i+1);
+//            getDirections(start,end);
+//        }
+
+        ArrayList<double[]> allCoords = new ArrayList<>();
+        for (Location location : route.getLocations()) {
+            allCoords.add(location.getCoordinatesAsDoubles());
+        }
+
+        String body = "{\"coordinates\":" + new Gson().toJson(allCoords) + "}";
+
+
+        String requestUrl = BASE_URL + DIRECTIONS_MODE + "?api_key=" + API_KEY;
+
+        Thread t = new Thread(() -> {
+
+            RequestBody requestBody = RequestBody.create(body,JSON);
+            Request request = new Request.Builder()
+                    .url(requestUrl)
+                    .post(requestBody)
+                    .build();
+
+            try (Response response = client.newCall(request).execute()) {
+                if (response.body() != null) {
+                    String responseString = Objects.requireNonNull(response.body()).string();
+                    Log.d(TAG, "getDirections: got response: " + responseString);
+                    if (responseString.startsWith("{\"error")) {
+                        Log.e(TAG, "getDirections: ERROR IN REQUEST!");
+                        return;
+                    }
+
+                    DirectionsResult result = new DirectionsResult();
+                    result.parseRoute(responseString);
+                    Log.d(TAG, "getDirections: " + result.getSteps().size());
+
+                    for (DirectionsListener listener : listeners) {
+                        listener.onDirectionsAvailable(result);
+                    }
                 }
 
             } catch (IOException e) {
@@ -59,7 +136,8 @@ public enum ApiHandler {
         } catch (InterruptedException e) {
             e.printStackTrace();
         }
-        return res.get();
+
+
     }
 
 

app/src/main/java/com/a1/nextlocation/network/DirectionsListener.java

@@ -0,0 +1,8 @@
+package com.a1.nextlocation.network;
+
+import com.a1.nextlocation.data.Route;
+import com.a1.nextlocation.json.DirectionsResult;
+
+public interface DirectionsListener {
+    void onDirectionsAvailable(DirectionsResult result);
+}

app/src/main/res/layout-land/fragment_route_detail.xml

@@ -13,14 +13,14 @@
         android:layout_height="wrap_content"
         android:layout_margin="10dp"
         android:background="@drawable/ic_back_button_24"
-        app:layout_constraintBottom_toBottomOf="@+id/routeTitle"
+        app:layout_constraintBottom_toBottomOf="@+id/route_title"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/routeTitle"
-        app:layout_constraintEnd_toStartOf="@id/routeTitle"
+        app:layout_constraintTop_toTopOf="@+id/route_title"
+        app:layout_constraintEnd_toStartOf="@id/route_title"
         />
 
     <TextView
-        android:id="@+id/routeTitle"
+        android:id="@+id/route_title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="250dp"

app/src/main/res/layout/activity_main.xml

@@ -10,15 +10,15 @@
         android:id="@+id/fragment_layout"
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        app:layout_constraintTop_toBottomOf="@+id/topBar"
-        app:layout_constraintBottom_toTopOf="@id/navbar"
+        app:layout_constraintTop_toBottomOf="@+id/top_bar"
+        app:layout_constraintBottom_toTopOf="@id/navigation_bar"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         />
 
     <com.google.android.material.bottomnavigation.BottomNavigationView
         android:showAsAction="always|withText"
-        android:id="@+id/navbar"
+        android:id="@+id/navigation_bar"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:background="@color/white"
@@ -31,7 +31,7 @@
         />
 
     <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/topBar"
+        android:id="@+id/top_bar"
         android:layout_width="match_parent"
         android:layout_height="50dp"
         app:layout_constraintTop_toTopOf="parent"
@@ -41,27 +41,27 @@
         android:background="@color/primaryColour"/>
 
         <ImageButton
-            android:id="@+id/infoButton"
+            android:id="@+id/info_button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:src="@drawable/ic_baseline_info_24"
             android:backgroundTint="@color/primaryColour"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@id/topBar"
-            app:layout_constraintBottom_toBottomOf="@id/topBar"
+            app:layout_constraintTop_toTopOf="@id/top_bar"
+            app:layout_constraintBottom_toBottomOf="@id/top_bar"
             android:tint="@color/secondaryColour"
             />
 
     <TextView
+        android:id="@+id/text_view"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        app:layout_constraintStart_toEndOf="@id/infoButton"
-        app:layout_constraintTop_toTopOf="@id/topBar"
-        app:layout_constraintBottom_toBottomOf="@id/topBar"
         android:text="@string/app_name"
-        android:textSize="25dp"
         android:textColor="@color/secondaryColour"
-        />
+        android:textSize="25dp"
+        app:layout_constraintBottom_toBottomOf="@id/top_bar"
+        app:layout_constraintStart_toEndOf="@id/info_button"
+        app:layout_constraintTop_toTopOf="@id/top_bar" />
 
 
 </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/coupon_item.xml

@@ -5,7 +5,7 @@
     android:layout_height="wrap_content">
 
     <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/Box1"
+        android:id="@+id/name_box"
         android:layout_width="match_parent"
         android:layout_height="70dp"
         android:layout_marginHorizontal="20dp"

app/src/main/res/layout/fragment_coupon.xml

@@ -12,28 +12,30 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_margin="9dp"
+        android:layout_marginTop="20dp"
         android:text="Statistics"
         android:textSize="20sp"
-        app:layout_constraintStart_toEndOf="@id/couponBackButton"
+        app:layout_constraintStart_toEndOf="@id/coupon_back_button"
         app:layout_constraintTop_toTopOf="parent" />
 
     <ImageButton
-        android:id="@+id/couponBackButton"
+        android:id="@+id/coupon_back_button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginStart="10dp"
+        android:layout_marginTop="12dp"
         android:background="@drawable/ic_back_button_24"
         android:backgroundTint="@color/buttonColour"
         android:text="Back"
-        android:layout_margin="10dp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
     <androidx.recyclerview.widget.RecyclerView
         android:layout_width="0dp"
         android:layout_height="0dp"
-        android:id="@+id/couponRecyclerView"
+        android:id="@+id/coupon_recyclerview"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/couponBackButton" />
+        app:layout_constraintTop_toBottomOf="@+id/coupon_back_button" />
 </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/fragment_home.xml

@@ -6,9 +6,8 @@
     android:layout_height="match_parent"
     tools:context=".fragments.HomeFragment">
 
-
     <org.osmdroid.views.MapView
-        android:id="@+id/mapView"
+        android:id="@+id/map_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
@@ -24,6 +23,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="20dp"
             android:layout_marginEnd="20dp"
+            android:backgroundTint="@color/secondaryColour"
             android:src="@drawable/ic_baseline_outlined_flag_24"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent" />

app/src/main/res/layout/fragment_location.xml

@@ -12,28 +12,31 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_margin="9dp"
+        android:layout_marginTop="20dp"
         android:text="Locations"
         android:textSize="20sp"
-        app:layout_constraintStart_toEndOf="@id/locationBackButton"
+        app:layout_constraintStart_toEndOf="@id/location_back_button"
         app:layout_constraintTop_toTopOf="parent" />
 
     <ImageButton
-        android:id="@+id/locationBackButton"
+        android:id="@+id/location_back_button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginStart="10dp"
+        android:layout_marginTop="12dp"
         android:background="@drawable/ic_back_button_24"
         android:backgroundTint="@color/buttonColour"
         android:text="Back"
-        android:layout_margin="10dp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
     <androidx.recyclerview.widget.RecyclerView
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:id="@+id/locationRecyclerView"
-        app:layout_constraintBottom_toBottomOf="parent"
+        android:id="@+id/location_recyclerview"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginTop="60dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/routeBackButton" />
+        app:layout_constraintTop_toBottomOf="@+id/location_RV" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/fragment_location_detail.xml

@@ -44,11 +44,11 @@
         android:id="@+id/detail_location_back_button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:src="@drawable/ic_back_button_24"
+        android:layout_marginStart="10dp"
+        android:layout_marginTop="12dp"
         android:backgroundTint="@color/primaryColour"
-        app:layout_constraintBottom_toBottomOf="@+id/detail_location_name"
-        app:layout_constraintEnd_toStartOf="@+id/detail_location_name"
+        android:src="@drawable/ic_back_button_24"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/detail_location_name" />
+        app:layout_constraintTop_toTopOf="parent" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/fragment_route.xml

@@ -8,7 +8,7 @@
     tools:context=".fragments.RouteFragment">
 
     <ImageButton
-        android:id="@+id/routeBackButton"
+        android:id="@+id/route_back_button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_margin="10dp"
@@ -18,23 +18,23 @@
         app:layout_constraintTop_toTopOf="parent" />
 
     <TextView
-        android:id="@+id/routeTitle"
+        android:id="@+id/route_title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_margin="9dp"
         android:text="titel"
         android:textSize="20sp"
-        app:layout_constraintStart_toEndOf="@id/routeBackButton"
+        app:layout_constraintStart_toEndOf="@id/route_back_button"
         app:layout_constraintTop_toTopOf="parent" />
 
     <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/routeRecyclerView"
+        android:id="@+id/route_recyclerview"
         android:layout_width="0dp"
         android:layout_height="0dp"
         android:background="@color/primaryColour"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/routeBackButton" />
+        app:layout_constraintTop_toBottomOf="@+id/route_back_button" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/fragment_route_detail.xml

@@ -13,13 +13,13 @@
         android:layout_height="wrap_content"
         android:layout_marginEnd="100dp"
         android:background="@drawable/ic_back_button_24"
-        app:layout_constraintBottom_toBottomOf="@id/routeTitle"
-        app:layout_constraintEnd_toStartOf="@id/routeTitle"
+        app:layout_constraintBottom_toBottomOf="@id/route_title"
+        app:layout_constraintEnd_toStartOf="@id/route_title"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@id/routeTitle" />
+        app:layout_constraintTop_toTopOf="@id/route_title" />
 
     <TextView
-        android:id="@+id/routeTitle"
+        android:id="@+id/route_title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="titel"
@@ -46,36 +46,24 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginHorizontal="20dp"
-        android:layout_marginBottom="100dp"
-        app:layout_constraintBottom_toTopOf="@id/startRouteText"
+        android:layout_marginTop="56dp"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.6"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/routeDetailImage" />
 
-    <ImageButton
-        android:id="@+id/startRouteButton"
-        android:backgroundTint="@color/primaryColour"
-        android:scaleX="5"
-        android:scaleY="5"
-        android:layout_width="70dp"
-        android:layout_height="70dp"
-        android:layout_margin="20dp"
-        app:layout_constraintBottom_toBottomOf="@+id/startRouteText"
-        app:layout_constraintEnd_toStartOf="@+id/startRouteText"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/startRouteText"
-        android:src="@drawable/ic_baseline_play_arrow_24"
-        />
-
-    <TextView
-        android:id="@+id/startRouteText"
+    <Button
+        android:id="@+id/start_route_button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_margin="20dp"
-        android:text="@string/start_route"
-        android:textSize="50sp"
+        android:text="Start Route"
+        android:backgroundTint="@color/secondaryColour"
+        android:textColor="@color/buttonColour"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@id/startRouteButton"
-        app:layout_constraintTop_toBottomOf="@id/routeDetailText" />
+        app:layout_constraintHorizontal_bias="0.498"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/routeDetailText"
+        app:layout_constraintVertical_bias="0.671" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/fragment_settings.xml

@@ -30,7 +30,7 @@
         app:layout_constraintTop_toTopOf="parent" />
 
     <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/Box1"
+        android:id="@+id/name_box"
         android:layout_width="match_parent"
         android:layout_height="70dp"
         app:layout_constraintBottom_toTopOf="@id/Box2"
@@ -86,7 +86,7 @@
         app:layout_constraintBottom_toTopOf="@id/Box3"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/Box1"
+        app:layout_constraintTop_toBottomOf="@id/name_box"
 
         >
 

app/src/main/res/layout/fragment_statistic.xml

@@ -20,7 +20,7 @@
         app:layout_constraintTop_toTopOf="parent" />
 
     <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/Box1"
+        android:id="@+id/name_box"
         android:layout_width="match_parent"
         android:layout_height="70dp"
         app:layout_constraintBottom_toTopOf="@id/Box2"
@@ -55,6 +55,7 @@
             />
 
         <TextView
+            android:id="@+id/statistics_km"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text=" km"
@@ -77,7 +78,7 @@
         app:layout_constraintBottom_toTopOf="@id/Box3"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/Box1"
+        app:layout_constraintTop_toBottomOf="@id/name_box"
 
         >
 
@@ -103,6 +104,7 @@
             app:layout_constraintTop_toTopOf="parent" />
 
         <TextView
+            android:id="@+id/statistics_locations_visited"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="GETAL"

app/src/main/res/layout/location_item.xml

@@ -21,6 +21,6 @@
         android:gravity="center"
         android:text="location"
         android:textSize="20dp"
-        app:layout_constraintStart_toEndOf="@+id/routeImage" />
+        app:layout_constraintStart_toEndOf="@+id/route_Image" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/route_item.xml

@@ -9,7 +9,7 @@
     <ImageView
         android:layout_width="50dp"
         android:layout_height="50dp"
-        android:id="@+id/routeImage"
+        android:id="@+id/route_Image"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"
         />
@@ -21,7 +21,7 @@
         android:text="test text"
         android:gravity="center"
         android:textSize="20dp"
-        app:layout_constraintStart_toEndOf="@+id/routeImage"
+        app:layout_constraintStart_toEndOf="@+id/route_Image"
         />
 
 </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/values/colors.xml

@@ -10,4 +10,5 @@
     <color name="primaryColour">#FF115571</color>
     <color name="secondaryColour">#FF31AFB4</color>
     <color name="buttonColour">#FF14212D</color>
+    <color name="red">#FF0000</color>
 </resources>

app/src/test/java/com/a1/nextlocation/CouponTestClass.java

@@ -0,0 +1,32 @@
+package com.a1.nextlocation;
+
+import com.a1.nextlocation.data.Coupon;
+
+import org.junit.Before;
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+
+public class CouponTestClass {
+    private Coupon testCoupon;
+
+    @Before
+    public void init(){
+        testCoupon = new Coupon("TESTCODE", "REWARDISTRUE");
+    }
+
+    @Test
+    public void testSetCode() {
+        testCoupon.setCode("testing");
+        String expected = "testing";
+        assertEquals(expected, testCoupon.getCode());
+    }
+
+    @Test
+    public void testSetReward() {
+        testCoupon.setReward("testreward");
+        String expected = "testreward";
+        assertNotNull(testCoupon.getReward());
+        assertEquals(expected, testCoupon.getReward());
+    }
+}

app/src/test/java/com/a1/nextlocation/DataTestClass.java

@@ -0,0 +1,81 @@
+package com.a1.nextlocation;
+
+import com.a1.nextlocation.data.Coupon;
+import com.a1.nextlocation.data.Data;
+import com.a1.nextlocation.data.Location;
+import com.a1.nextlocation.data.Route;
+
+import org.junit.Before;
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class DataTestClass {
+    private Data data;
+
+    @Before
+    public void init(){
+        data = new Data();
+    }
+
+
+    @Test
+    public void testSetDistanceTraveled() {
+        data.setDistanceTraveled(100);
+
+        int expected = 100;
+        assertEquals(expected, data.getDistanceTraveled(), 0.1);
+    }
+
+    @Test
+    public void testSetLocationsVisited() {
+        data.setLocationsVisited(16);
+
+        int expected = 16;
+        assertEquals(expected, data.getLocationsVisited());
+    }
+
+    @Test
+    public void testSetTotalTime() {
+        data.setTotalTime(120);
+
+        int expected = 120;
+        assertEquals(expected, data.getTotalTime());
+    }
+
+    @Test
+    public void testSetCouponList() {
+        List<Coupon> expected = new ArrayList<>();
+        expected.add(new Coupon("CODE1", "REWARD1"));
+        expected.add(new Coupon("CODE2", "REWARD2"));
+        expected.add(new Coupon("CODE3", "REWARD3"));
+
+        data.setCouponList(expected);
+        assertEquals(expected, data.getCouponList());
+    }
+
+    @Test
+    public void testNextLocation() {
+        Location expected = new Location("name1", "cord1", "desc1", null);
+        data.setNextLocation(expected);
+        assertEquals(expected, data.getNextLocation());
+    }
+
+    @Test
+    public void testLastLocation() {
+        Location expected = new Location("name2", "cord2", "desc2", null);
+        data.setLastLocation(expected);
+        assertEquals(expected, data.getLastLocation());
+    }
+
+    @Test
+    public void testCurrentRoute() {
+        Route expected = new Route("testRoute1");
+        data.setCurrentRoute(expected);
+        assertEquals(expected, data.getCurrentRoute());
+    }
+
+
+}

app/src/test/java/com/a1/nextlocation/FileIOTest.java

@@ -0,0 +1,57 @@
+package com.a1.nextlocation;
+
+import android.app.Instrumentation;
+import android.content.Context;
+import android.content.pm.InstrumentationInfo;
+import android.widget.ArrayAdapter;
+
+import com.a1.nextlocation.data.FileIO;
+import com.a1.nextlocation.data.Location;
+import com.a1.nextlocation.data.Route;
+import com.google.gson.reflect.TypeToken;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+import org.mockito.Mock;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+import static org.mockito.MockitoAnnotations.initMocks;
+
+public class FileIOTest {
+
+//    @Test
+//    public void testReadFileIO() {
+//        //System.out.println(Arrays.toString(mMockContext.fileList()));
+//        Context mMockContext = mock(MainActivity.class);
+//        List<Route> expected = new ArrayList<>();
+//        Route testRoute = new Route("rondje stad");
+//        testRoute.addLocation(new Location("kees kroket", "2.4654645,6.2342323", "lekkere patatjes", null));
+//        testRoute.setTotalDistance(2.3434f);
+//        testRoute.setTotalTime(342342);
+//        expected.add(testRoute);
+//
+//        /*
+//        FileIO<ArrayList<Route>> fileIO = new FileIO<>();
+//        ArrayList<Route> res = fileIO.readFileData(context, "routes.json",new TypeToken<ArrayList<Route>>(){}.getType());
+//         */
+//
+//        if (mMockContext.getAssets() == null)
+//            System.out.println("daar ga je");
+//
+//        FileIO<ArrayList<Route>> fileIO = new FileIO<>();
+//        ArrayList<Route> res = fileIO.readFileData(mMockContext, "routes.json", new TypeToken<ArrayList<Route>>(){}.getType());
+//
+//        assertEquals(expected, res);
+//
+//    }
+
+}

app/src/test/java/com/a1/nextlocation/LocationTest.java

@@ -0,0 +1,97 @@
+package com.a1.nextlocation;
+
+import com.a1.nextlocation.data.Location;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.osmdroid.util.GeoPoint;
+
+import static org.junit.Assert.*;
+
+public class LocationTest {
+    private Location testLocation;
+    @Before
+    public void init(){
+        testLocation = new Location("testName", "15.4,27.5", "testDesc", null);
+    }
+
+    @Test
+    public void nameTest(){
+        String testName = "nameTestName";
+
+        String expectedBefore = "testName";
+        String expectedAfter = "nameTestName";
+
+        assertEquals(expectedBefore, testLocation.getName());
+        testLocation.setName(testName);
+        assertEquals(expectedAfter, testLocation.getName());
+    }
+
+    @Test
+    public void coordinatesTest(){
+        String testCoordinaates = "32.4,15.7";
+
+        String expectedBefore = "15.4,27.5";
+        String expectedAfter = "32.4,15.7";
+
+        assertEquals(expectedBefore, testLocation.getCoordinates());
+        testLocation.setCoordinates(testCoordinaates);
+        assertEquals(expectedAfter, testLocation.getCoordinates());
+    }
+
+    @Test
+    public void descriptionTest(){
+        String testDescription = "This description is a test!";
+
+        String expectedBefore = "testDesc";
+        String expectedAfter = "This description is a test!";
+
+        assertEquals(expectedBefore, testLocation.getDescription());
+        testLocation.setDescription(testDescription);
+        assertEquals(expectedAfter, testLocation.getDescription());
+    }
+
+    @Test
+    public void ImageURLTest(){
+        String testURL = "https://i.imgur.com/FvohwaS.png";
+
+        String expectedBefore = null;
+        String expectedAfter = "https://i.imgur.com/FvohwaS.png";
+
+        assertEquals(expectedBefore ,testLocation.getImageUrl());
+        testLocation.setImageUrl(testURL);
+        assertEquals(expectedAfter, testLocation.getImageUrl());
+    }
+
+    @Test
+    public void coordinateDoublesTest(){
+        double[] testDoubles = new double[2];
+        testDoubles[0] = 15.4;
+        testDoubles[1] = 27.5;
+
+        double [] expectedCoordAsDouble = testDoubles;
+        String expectedStringFromDouble = "15.4,27.5";
+
+        assertArrayEquals(expectedCoordAsDouble, testLocation.getCoordinatesAsDoubles(), 0.1);
+        assertEquals(expectedStringFromDouble, testLocation.getStringFromCoordinates(testDoubles[0], testDoubles[1]));
+    }
+
+    @Test
+    public void geoPointTest(){
+        String testGeoPointCoords = "30.3,55.5";
+
+        GeoPoint expectedBefore = new GeoPoint(15.4, 27.5);
+        GeoPoint expectedAfter = new GeoPoint(30.3, 55.5);
+
+        assertEquals(expectedBefore, testLocation.convertToGeoPoint());
+        testLocation.setCoordinates(testGeoPointCoords);
+        assertEquals(expectedAfter, testLocation.convertToGeoPoint());
+    }
+
+    @Test
+    public void AlternateConstructorTest(){
+        Location alternateTestLocation = new Location("testName", 15.4, 27.5, "testDesc", null);
+
+        assertNotNull(alternateTestLocation);
+    }
+}

app/src/test/java/com/a1/nextlocation/RouteTest.java

@@ -0,0 +1,93 @@
+package com.a1.nextlocation;
+
+import com.a1.nextlocation.data.Location;
+import com.a1.nextlocation.data.Route;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.junit.Assert.*;
+
+public class RouteTest {
+    private Route route;
+
+    @Before
+    public void init(){
+        route = new Route("testName");
+    }
+
+    @Test
+    public void nameTest(){
+        String testName = "secondTestName";
+
+        String expectedBefore = "testName";
+        String expectedAfter = "secondTestName";
+
+        assertEquals(expectedBefore, route.getName());
+        route.setName(testName);
+        assertEquals(expectedAfter, route.getName());
+    }
+
+    @Test
+    public void getLocationsTest(){
+        List<Location> expected = new ArrayList<>();
+
+        assertEquals(expected, route.getLocations());
+    }
+
+    @Test
+    public void SetLocationsTest(){
+        List<Location> testList = new ArrayList<>();
+        testList.add(new Location("name1", "coord1", "desc1", null));
+        testList.add(new Location("name2", "coord2", "desc2", null));
+        testList.add(new Location("name3", "coord3", "desc3", null));
+
+        List<Location> expectedBefore = new ArrayList<>();
+        List<Location> expectedAfter = testList;
+
+        assertEquals(expectedBefore, route.getLocations());
+        route.setLocations(testList);
+        assertEquals(expectedAfter, route.getLocations());
+    }
+
+    @Test
+    public void AddLocationTest(){
+        Location testLocation = new Location("testLocationName", "testCoordinates", "testDescription", null);
+
+        List<Location> expectedBefore = new ArrayList<>();
+        List<Location> expectedAfter = new ArrayList<>();
+        expectedAfter.add(testLocation);
+
+        assertEquals(expectedBefore, route.getLocations());
+        route.addLocation(testLocation);
+        assertEquals(expectedAfter, route.getLocations());
+    }
+
+    @Test
+    public void totalDistanceTest(){
+        float testDistance = 523;
+
+        float expectedBefore = 0;
+        float expectedAfter = 523;
+
+        assertEquals(expectedBefore, route.getTotalDistance(), 0.01);
+        route.setTotalDistance(testDistance);
+        assertEquals(expectedAfter, route.getTotalDistance(), 0.01);
+    }
+
+    @Test
+    public void totalTimeTest(){
+        int testTime = 36;
+
+        int expectedBefore = 0;
+        int expectedAfter = 36;
+
+        assertEquals(expectedBefore, route.getTotalTime());
+        route.setTotalTime(testTime);
+        assertEquals(expectedAfter, route.getTotalTime());
+    }
+
+}