comment

No luck so far

app/build.gradle

@@ -55,4 +55,5 @@ dependencies {
 
     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/coupons.json

@@ -1,6 +1,10 @@
 [
   {
-    "code": "2345",
-    "reward": "fdasfasdf"
+    "code": "KROKET10",
+    "reward": "Gratis 2e kroket bij Kees Kroket™"
+  },
+  {
+    "code": "654",
+    "reward": ",juygly"
   }
 ]

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": "kees kroket",
-        "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,14 +1,16 @@
 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;
@@ -19,7 +21,12 @@ 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
@@ -29,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

@@ -1,12 +1,15 @@
 package com.a1.nextlocation.data;
 
+import android.os.Parcel;
+import android.os.Parcelable;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import org.jetbrains.annotations.NotNull;
 import org.osmdroid.util.GeoPoint;
 
-public class Location {
+public class Location implements Parcelable {
 
     @NonNull
     private String name;
@@ -32,6 +35,29 @@ public class Location {
         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();
+        description = in.readString();
+        imageUrl = in.readString();
+    }
+
+    public static final Creator<Location> CREATOR = new Creator<Location>() {
+        @Override
+        public Location createFromParcel(Parcel in) {
+            return new Location(in);
+        }
+
+        @Override
+        public Location[] newArray(int size) {
+            return new Location[size];
+        }
+    };
+
     @NotNull
     public String getName() {
         return name;
@@ -68,8 +94,8 @@ public class Location {
 
     public double[] getCoordinatesAsDoubles() {
         double[] res = new double[2];
-        res[0] = getLat();
-        res[1] = getLong();
+        res[1] = getLat();
+        res[0] = getLong();
 
         return res;
     }
@@ -83,11 +109,61 @@ public class Location {
     }
 
     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() {
         return new GeoPoint(this.getLat(),this.getLong());
     }
 
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    @Override
+    public void writeToParcel(Parcel parcel, int i) {
+        parcel.writeString(name);
+        parcel.writeString(coordinates);
+        parcel.writeString(description);
+        parcel.writeString(imageUrl);
+    }
 }

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

@@ -1,5 +1,8 @@
 package com.a1.nextlocation.data;
 
+import android.os.Parcel;
+import android.os.Parcelable;
+
 import androidx.annotation.NonNull;
 
 import org.jetbrains.annotations.NotNull;
@@ -7,7 +10,7 @@ import org.jetbrains.annotations.NotNull;
 import java.util.ArrayList;
 import java.util.List;
 
-public class Route {
+public class Route implements Parcelable {
 
 
     @NonNull
@@ -29,6 +32,25 @@ public class Route {
 
     }
 
+    protected Route(Parcel in) {
+        this.name = in.readString();
+        this.locations = in.createTypedArrayList(Location.CREATOR);
+        this.totalDistance = in.readFloat();
+        this.totalTime = in.readInt();
+    }
+
+    public static final Creator<Route> CREATOR = new Creator<Route>() {
+        @Override
+        public Route createFromParcel(Parcel in) {
+            return new Route(in);
+        }
+
+        @Override
+        public Route[] newArray(int size) {
+            return new Route[size];
+        }
+    };
+
     public void addLocation(Location location) {
         this.locations.add(location);
     }
@@ -69,4 +91,16 @@ public class Route {
         this.totalTime = totalTime;
     }
 
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    @Override
+    public void writeToParcel(Parcel parcel, int i) {
+        parcel.writeString(name);
+        parcel.writeTypedList(locations);
+        parcel.writeFloat(totalDistance);
+        parcel.writeInt(totalTime);
+    }
 }

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,26 +1,84 @@
 package com.a1.nextlocation.fragments;
 
+import android.app.AlertDialog;
 import android.os.Bundle;
 
 import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 
 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.Coupon;
+import com.a1.nextlocation.recyclerview.CouponAdapter;
+import com.a1.nextlocation.recyclerview.CouponListManager;
+
+import java.util.List;
 
 public class CouponFragment extends Fragment {
 
+    private RecyclerView couponRecyclerView;
+    private RecyclerView.LayoutManager layoutManager;
+    private List<Coupon> couponList;
+    private CouponAdapter couponAdapter;
+    private ImageButton imageButton;
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
     }
 
     @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-        // Inflate the layout for this fragment
-        return inflater.inflate(R.layout.fragment_coupon, container, false);
+    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.coupon_recyclerview);
+        this.couponRecyclerView.setHasFixedSize(true);
+        this.layoutManager = new LinearLayoutManager(this.getContext());
+
+        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();
+        });
+
+        CouponListManager.INSTANCE.setContext(this.getContext());
+        CouponListManager.INSTANCE.load();
+        this.couponList = CouponListManager.INSTANCE.getCouponList();
+
+        this.couponAdapter = new CouponAdapter(this.getContext(), this.couponList, clickedPosition -> showPopup(this.couponList.get(clickedPosition)));
+
+        this.couponRecyclerView.setLayoutManager(this.layoutManager);
+        this.couponRecyclerView.setAdapter(this.couponAdapter);
+        return view;
+    }
+
+    private void showPopup(Coupon coupon) {
+        AlertDialog.Builder activateBuilder = new AlertDialog.Builder(getContext());
+        AlertDialog.Builder couponCodeBuilder = new AlertDialog.Builder(getContext());
+        // TODO: use string resources instead of hardcoded strings
+        activateBuilder.setMessage("Weet je zeker dat je deze coupon wilt activeren?");
+        activateBuilder.setCancelable(true);
+        // TODO: use string resources instead of hardcoded strings
+        activateBuilder.setPositiveButton("activeren", (dialog, which) -> {
+            // TODO: use string resources instead of hardcoded strings
+            dialog.cancel();
+            couponCodeBuilder.setMessage("Code: " + coupon.getCode());
+            couponCodeBuilder.setPositiveButton("Klaar", (dialog1, which1) -> {
+                dialog.cancel();
+            });
+            AlertDialog couponCodePopup = couponCodeBuilder.create();
+            couponCodePopup.show();
+        });
+        // TODO: use string resources instead of hardcoded strings
+        activateBuilder.setNegativeButton("annuleren", (dialog, which) -> dialog.cancel());
+        AlertDialog couponPopup = activateBuilder.create();
+        couponPopup.show();
+
     }
 }

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

@@ -5,46 +5,58 @@ 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;
 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;
 import androidx.core.app.ActivityCompat;
 import androidx.core.content.ContextCompat;
 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) {
@@ -54,15 +66,45 @@ 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
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
-        // Inflate the layout for this fragment
-        return inflater.inflate(R.layout.fragment_home, container, false);
 
+        View view = inflater.inflate(R.layout.fragment_home, container, false);
+
+        this.imageButton = view.findViewById(R.id.location_list_button);
+        this.imageButton.setOnClickListener(v -> {
+            LocationFragment locationFragment = new LocationFragment();
+            ((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!");
 
     }
 
@@ -73,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);
@@ -91,25 +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);
@@ -118,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());
@@ -134,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)
@@ -152,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,27 +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) {
-        // Inflate the layout for this fragment
-        return inflater.inflate(R.layout.fragment_location_detail, container, false);
+    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();
+        });
+
+        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

@@ -3,25 +3,63 @@ package com.a1.nextlocation.fragments;
 import android.os.Bundle;
 
 import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 
 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;
+import com.a1.nextlocation.recyclerview.LocationAdapter;
+import com.a1.nextlocation.recyclerview.LocationListManager;
+
+import java.util.List;
 
 public class LocationFragment extends Fragment {
+    private RecyclerView locationRecyclerView;
+    private LocationAdapter locationAdapter;
+    private RecyclerView.LayoutManager layoutManager;
+    private List<Location> locationList;
+    private ImageButton imageButton;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-
     }
 
     @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-        // Inflate the layout for this fragment
-        return inflater.inflate(R.layout.fragment_location, container, false);
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+
+        View view = inflater.inflate(R.layout.fragment_location, container, false);
+
+        this.locationRecyclerView = view.findViewById(R.id.location_recyclerview);
+        this.locationRecyclerView.setHasFixedSize(true);
+        this.layoutManager = new LinearLayoutManager(this.getContext());
+
+        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();
+        });
+
+        LocationListManager.INSTANCE.setContext(this.getContext());
+        LocationListManager.INSTANCE.load();
+        this.locationList = LocationListManager.INSTANCE.getLocationList();
+
+        this.locationAdapter = new LocationAdapter(this.getContext(), this.locationList, clickedPosition -> {
+            LocationDetailFragment locationDetailFragment = new LocationDetailFragment();
+            Bundle locationBundle = new Bundle();
+            locationBundle.putParcelable("location", this.locationList.get(clickedPosition));
+            locationDetailFragment.setArguments(locationBundle);
+            ((FragmentActivity) view.getContext()).getSupportFragmentManager().beginTransaction().replace(R.id.fragment_layout, locationDetailFragment).addToBackStack(null).commit();
+        });
+
+        this.locationRecyclerView.setLayoutManager(this.layoutManager);
+        this.locationRecyclerView.setAdapter(this.locationAdapter);
+        return view;
     }
 }

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

@@ -3,15 +3,24 @@ 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 {
 
+    private Route route;
+    private TextView routeDetailText;
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -19,9 +28,25 @@ public class RouteDetailFragment extends Fragment {
     }
 
     @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-        // Inflate the layout for this fragment
-        return inflater.inflate(R.layout.fragment_route_detail, container, false);
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        View view = inflater.inflate(R.layout.fragment_route_detail, container, false);
+        if(getArguments().getParcelable("route") != null) {
+            this.route = getArguments().getParcelable("route");
+        }
+
+        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

@@ -5,6 +5,9 @@ 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;
@@ -12,6 +15,11 @@ import android.view.View;
 import android.view.ViewGroup;
 
 import com.a1.nextlocation.R;
+import com.a1.nextlocation.data.Route;
+import com.a1.nextlocation.recyclerview.RouteAdapter;
+import com.a1.nextlocation.recyclerview.RouteListManager;
+
+import java.util.List;
 import com.a1.nextlocation.data.Location;
 import com.a1.nextlocation.data.Route;
 import com.a1.nextlocation.json.DirectionsResult;
@@ -21,34 +29,56 @@ 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;
+    private List<Route> routeList;
+    private RouteAdapter routeAdapter;
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        ApiHandler.INSTANCE.addListener(this::onDirectionsAvailable);
 
     }
 
     @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-        // Inflate the layout for this fragment
-        return inflater.inflate(R.layout.fragment_route, container, false);
+    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.route_recyclerview);
+        this.routeRecyclerView.setHasFixedSize(true);
+        this.layoutManager = new LinearLayoutManager(this.getContext());
+
+        RouteListManager.INSTANCE.setContext(this.getContext());
+        RouteListManager.INSTANCE.load();
+        this.routeList = RouteListManager.INSTANCE.getRouteList();
+
+        this.routeAdapter = new RouteAdapter(this.getContext(), this.routeList, clickedPosition -> {
+            RouteDetailFragment routeDetailFragment = new RouteDetailFragment();
+            Bundle routeBundle = new Bundle();
+            routeBundle.putParcelable("route", this.routeList.get(clickedPosition));
+            routeDetailFragment.setArguments(routeBundle);
+            ((FragmentActivity) view.getContext()).getSupportFragmentManager().beginTransaction().replace(R.id.fragment_layout, routeDetailFragment).addToBackStack(null).commit();
+        });
+
+        this.routeRecyclerView.setLayoutManager(this.layoutManager);
+        this.routeRecyclerView.setAdapter(this.routeAdapter);
+        return view;
     }
 
     @Override
     public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
 
-//        ApiHandler.INSTANCE.getDirections(8.681436,49.41461,8.687872,49.420318);
-        Route r = new Route("test");
-        r.addLocation(new Location("test",8.681436,49.41461,"route",null));
-        r.addLocation(new Location("test",8.687872,49.420318,"route",null));
-        ApiHandler.INSTANCE.getDirections(r);
-    }
-
-    public void onDirectionsAvailable(DirectionsResult result) {
-        Log.d(TAG, "onDirectionsAvailable: got result! " + result);
-        
-        
+//        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

@@ -2,26 +2,59 @@ package com.a1.nextlocation.fragments;
 
 import android.os.Bundle;
 
+import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
+import androidx.recyclerview.widget.RecyclerView;
 
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+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;
+
+import java.util.List;
 
 public class StatisticFragment extends Fragment {
 
+    private List<Coupon> couponList;
+    private ImageView imageButton;
+
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-
     }
 
     @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-        // Inflate the layout for this fragment
-        return inflater.inflate(R.layout.fragment_statistic, container, false);
+    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);
+        couponNumber.setText(String.valueOf(adapter.getItemCount()));
+
+
+        ConstraintLayout constraintLayout = view.findViewById(R.id.Box4);
+        constraintLayout.setOnClickListener(v -> {
+            CouponFragment couponFragment = new CouponFragment();
+            ((FragmentActivity) view.getContext()).getSupportFragmentManager().beginTransaction().replace(R.id.fragment_layout, couponFragment).addToBackStack(null).commit();
+        });
+        return view;
     }
 }

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

@@ -15,6 +15,7 @@ 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 {
@@ -23,6 +24,7 @@ public class DirectionsResult {
     private double distance;
     private double duration;
     private double[][] wayPointCoordinates;
+    private GeoPoint[] startAndEndPoint = new GeoPoint[2];
 
     public List<DirectionsStep> getSteps() {
         return steps;
@@ -52,8 +54,31 @@ public class DirectionsResult {
         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) {
@@ -86,7 +111,7 @@ public class DirectionsResult {
 
             for (JsonElement j : steps) {
 
-                DirectionsStep step = gson.fromJson(j,DirectionsStep.class);
+                DirectionsStep step = gson.fromJson(j, DirectionsStep.class);
                 double lat;
                 double longl;
 
@@ -94,7 +119,7 @@ public class DirectionsResult {
                 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);
+                    step.getWaypoints()[i] = new GeoPoint(lat, longl);
                 }
 
                 addStep(step);
@@ -102,6 +127,9 @@ public class DirectionsResult {
             }
         }
 
+        startAndEndPoint[0] = this.getSteps().get(0).getWaypoints()[0];
+        startAndEndPoint[1] = this.getSteps().get(this.getSteps().size()-1).getWaypoints()[1];
+
     }
 
     public void parseRoute(String json) {
@@ -115,7 +143,7 @@ public class DirectionsResult {
             this.duration = summary.get("duration").getAsDouble();
 
             JsonPrimitive geometry = route.getAsJsonPrimitive("geometry");
-            JsonArray wayPointCoordinates = GeometryDecoder.decodeGeometry(geometry.getAsString(),false);
+            JsonArray wayPointCoordinates = GeometryDecoder.decodeGeometry(geometry.getAsString(), false);
             this.wayPointCoordinates = new double[wayPointCoordinates.size()][2];
 
 
@@ -140,7 +168,7 @@ public class DirectionsResult {
 
                 for (JsonElement j : steps) {
 
-                    DirectionsStep step = gson.fromJson(j,DirectionsStep.class);
+                    DirectionsStep step = gson.fromJson(j, DirectionsStep.class);
                     double lat;
                     double longl;
 
@@ -148,7 +176,7 @@ public class DirectionsResult {
                     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);
+                        step.getWaypoints()[i] = new GeoPoint(lat, longl);
                     }
 
                     addStep(step);
@@ -158,7 +186,5 @@ public class DirectionsResult {
 
         }
 
-
-
     }
 }

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

@@ -38,7 +38,7 @@ public enum ApiHandler {
     }
 
     public void getDirections(double startLat, double startLong, double endLat, double endLong) {
-        getDirections(startLat + "," + startLong, endLat + "," + endLong);
+        getDirections(startLong + "," + startLat, endLong + "," + endLat);
     }
 
     public void getDirections(String startLocation, String endLocation) {
@@ -69,6 +69,12 @@ public enum ApiHandler {
 
         t.start();
 
+//        try {
+//            t.join();
+//        } catch (InterruptedException e) {
+//            e.printStackTrace();
+//        }
+
     }
 
     public void addListener(DirectionsListener listener) {
@@ -104,6 +110,10 @@ public enum ApiHandler {
                 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);
@@ -121,6 +131,12 @@ public enum ApiHandler {
 
         t.start();
 
+        try {
+            t.join();
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
+
 
     }
 

app/src/main/java/com/a1/nextlocation/recyclerview/CouponAdapter.java

@@ -3,10 +3,13 @@ package com.a1.nextlocation.recyclerview;
 import android.content.Context;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.LayoutInflater;
+import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 
+import com.a1.nextlocation.R;
 import com.a1.nextlocation.data.Coupon;
 
 import java.util.List;
@@ -23,31 +26,49 @@ public class CouponAdapter extends RecyclerView.Adapter<CouponAdapter.CouponView
 
     class CouponViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener {
 
+        private TextView couponCode;
+        private TextView couponReward;
+
         public CouponViewHolder(@NonNull View itemView) {
             super(itemView);
+            itemView.setOnClickListener(this);
+        }
+
+
+        public void setTextViewName(String text){
+            this.couponReward = itemView.findViewById(R.id.coupon_name);
+            this.couponReward.setText(text);
         }
 
         @Override
-        public void onClick(View view) {
+        public void onClick(View v) {
             clickListener.onItemClick(getAdapterPosition());
         }
     }
 
     public CouponAdapter(Context context, List<Coupon> coupon, OnItemClickListener listener){
-        appContext = context;
-        couponList = coupon;
-        clickListener = listener;
+        this.appContext = context;
+        this.couponList = coupon;
+        this.clickListener = listener;
+
+    }
+
+    public CouponAdapter(Context context, List<Coupon> coupon) {
+        this.appContext = context;
+        this.couponList = coupon;
     }
 
     @NonNull
     @Override
     public CouponViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        return null;
+        View itemView = LayoutInflater.from(parent.getContext()).inflate(R.layout.coupon_item, parent, false);
+        return new CouponViewHolder(itemView);
     }
 
     @Override
     public void onBindViewHolder(@NonNull CouponViewHolder holder, int position) {
-
+        Coupon coupon = couponList.get(position);
+        holder.setTextViewName(coupon.getReward());
     }
 
     @Override
@@ -55,7 +76,4 @@ public class CouponAdapter extends RecyclerView.Adapter<CouponAdapter.CouponView
         return couponList.size();
     }
 
-
-
-
 }

app/src/main/java/com/a1/nextlocation/recyclerview/CouponLoader.java

@@ -5,11 +5,9 @@ import android.util.Log;
 
 import com.a1.nextlocation.data.Coupon;
 import com.a1.nextlocation.data.FileIO;
-import com.a1.nextlocation.data.Location;
 import com.google.gson.reflect.TypeToken;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
 public class CouponLoader implements Loader<List<Coupon>> {

app/src/main/java/com/a1/nextlocation/recyclerview/LocationAdapter.java

@@ -18,7 +18,7 @@ public class LocationAdapter extends RecyclerView.Adapter<LocationAdapter.Locati
 
     private Context appContext;
     private List<Location> locationList;
-    private CouponAdapter.OnItemClickListener clickListener;
+    private OnItemClickListener clickListener;
 
     public interface OnItemClickListener {
         void onItemClick(int clickedPosition);
@@ -31,6 +31,7 @@ public class LocationAdapter extends RecyclerView.Adapter<LocationAdapter.Locati
         public LocationViewHolder(@NonNull View itemView) {
             super(itemView);
             this.locationName = itemView.findViewById(R.id.location_name);
+            itemView.setOnClickListener(this);
         }
 
         @Override
@@ -39,11 +40,12 @@ public class LocationAdapter extends RecyclerView.Adapter<LocationAdapter.Locati
         }
 
         public void setTextViewText(String text){
+            this.locationName = itemView.findViewById(R.id.location_name);
             locationName.setText(text);
         }
     }
 
-    public LocationAdapter(Context context, List<Location> location, CouponAdapter.OnItemClickListener listener){
+    public LocationAdapter(Context context, List<Location> location, OnItemClickListener listener){
         this.appContext = context;
         this.locationList = location;
         this.clickListener = listener;
@@ -52,9 +54,8 @@ public class LocationAdapter extends RecyclerView.Adapter<LocationAdapter.Locati
     @NonNull
     @Override
     public LocationAdapter.LocationViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        View itemView = LayoutInflater.from(parent.getContext()).inflate(R.layout.fragment_location, parent, false);
-        LocationViewHolder viewHolder = new LocationViewHolder(itemView);
-        return viewHolder;
+        View itemView = LayoutInflater.from(parent.getContext()).inflate(R.layout.location_item, parent, false);
+        return new LocationViewHolder(itemView);
     }
 
     @Override

app/src/main/java/com/a1/nextlocation/recyclerview/RouteAdapter.java

@@ -1,12 +1,17 @@
 package com.a1.nextlocation.recyclerview;
 
 import android.content.Context;
+import android.util.Log;
+import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 
+import com.a1.nextlocation.R;
+import com.a1.nextlocation.data.Location;
 import com.a1.nextlocation.data.Route;
 
 import java.util.List;
@@ -23,14 +28,23 @@ public class RouteAdapter extends RecyclerView.Adapter<RouteAdapter.RouteViewHol
 
     class RouteViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener {
 
+        private TextView routeName;
+
         public RouteViewHolder(@NonNull View itemView) {
             super(itemView);
+            this.routeName = itemView.findViewById(R.id.route_name);
+            itemView.setOnClickListener(this);
         }
 
         @Override
         public void onClick(View view) {
             clickListener.onItemClick(getAdapterPosition());
         }
+
+        public void setTextViewText(String text){
+            this.routeName = itemView.findViewById(R.id.route_name);
+            this.routeName.setText(text);
+        }
     }
 
     public RouteAdapter(Context context, List<Route> route, CouponAdapter.OnItemClickListener listener){
@@ -42,12 +56,14 @@ public class RouteAdapter extends RecyclerView.Adapter<RouteAdapter.RouteViewHol
     @NonNull
     @Override
     public RouteAdapter.RouteViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        return null;
+        View itemView = LayoutInflater.from(parent.getContext()).inflate(R.layout.route_item, parent, false);
+        return new RouteViewHolder(itemView);
     }
 
     @Override
     public void onBindViewHolder(@NonNull RouteAdapter.RouteViewHolder holder, int position) {
-
+        Route route = routeList.get(position);
+        holder.setTextViewText(route.getName());
     }
 
     @Override

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

@@ -1,284 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:background="@color/primaryColour"
-    tools:context=".fragments.CouponFragment">
-
-    <androidx.appcompat.widget.AppCompatImageButton
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:backgroundTint="@color/primaryColour"
-        android:src="@drawable/ic_back_button_24"
-        app:layout_constraintBottom_toBottomOf="@+id/textView"
-        app:layout_constraintEnd_toStartOf="@+id/textView"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/textView" />
-
-    <TextView
-        android:id="@+id/textView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="10dp"
-        android:text="@string/coupons"
-        android:textColor="@color/white"
-        android:textSize="30sp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/Box1"
-        android:layout_width="match_parent"
-        android:layout_height="50dp"
-        app:layout_constraintBottom_toTopOf="@id/Box2"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/textView"
-        android:background="@color/secondaryColour"
-        android:layout_marginHorizontal="20dp"
-
-        >
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="Code"
-            android:textColor="@color/black"
-            android:textSize="20sp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="@id/Balk"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <View
-            android:id="@+id/Balk"
-            android:layout_width="1dp"
-            android:layout_height="match_parent"
-            android:background="@color/black"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="Waarde"
-            android:textColor="@color/black"
-            android:textSize="20sp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="@id/Balk"
-            app:layout_constraintTop_toTopOf="parent" />
-
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/Box2"
-        android:layout_width="match_parent"
-        android:layout_height="50dp"
-        android:layout_marginHorizontal="20dp"
-        android:background="@color/secondaryColour"
-        app:layout_constraintBottom_toTopOf="@id/Box3"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/Box1"
-
-        >
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="FRISDRANKJE20"
-            android:textColor="@color/black"
-            android:textSize="20sp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="@id/Balk2"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <View
-            android:id="@+id/Balk2"
-            android:layout_width="1dp"
-            android:layout_height="match_parent"
-            android:background="@color/black"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="1x Frisdrank"
-            android:textColor="@color/black"
-            android:textSize="20sp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="@id/Balk2"
-            app:layout_constraintTop_toTopOf="parent" />
-
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/Box3"
-        android:layout_width="match_parent"
-        android:layout_height="50dp"
-        android:layout_marginHorizontal="20dp"
-        android:background="@color/secondaryColour"
-        app:layout_constraintBottom_toTopOf="@id/Box4"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/Box2"
-        >
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="CHOCOMEL30"
-            android:textColor="@color/black"
-            android:textSize="20sp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="@id/Balk3"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <View
-            android:id="@+id/Balk3"
-            android:layout_width="1dp"
-            android:layout_height="match_parent"
-            android:background="@color/black"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="1x Chocomel"
-            android:textColor="@color/black"
-            android:textSize="20sp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="@id/Balk3"
-            app:layout_constraintTop_toTopOf="parent" />
-
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/Box4"
-        android:layout_width="match_parent"
-        android:layout_height="50dp"
-        app:layout_constraintBottom_toTopOf="@id/Box5"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/Box3"
-        android:background="@color/secondaryColour"
-        android:layout_marginHorizontal="20dp"
-
-        >
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="FRISTI200"
-            android:textColor="@color/black"
-            android:textSize="20sp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="@id/Balk4"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <View
-            android:id="@+id/Balk4"
-            android:layout_width="1dp"
-            android:layout_height="match_parent"
-            android:background="@color/black"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="2x Fristi"
-            android:textColor="@color/black"
-            android:textSize="20sp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="@id/Balk4"
-            app:layout_constraintTop_toTopOf="parent" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/Box5"
-        android:layout_width="match_parent"
-        android:layout_height="50dp"
-        app:layout_constraintBottom_toTopOf="@id/ButtonActivate"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/Box4"
-        android:background="@color/secondaryColour"
-        android:layout_marginHorizontal="20dp"
-
-        >
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="OLA30"
-            android:textColor="@color/black"
-            android:textSize="20sp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="@id/Balk5"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <View
-            android:id="@+id/Balk5"
-            android:layout_width="1dp"
-            android:layout_height="match_parent"
-            android:background="@color/black"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="1x Waterijsje"
-            android:textColor="@color/black"
-            android:textSize="20sp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="@id/Balk5"
-            app:layout_constraintTop_toTopOf="parent" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-    <Button
-        android:id="@+id/ButtonActivate"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:backgroundTint="@color/buttonColour"
-        android:text="Activate"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/Box5"
-        />
-
-</androidx.constraintlayout.widget.ConstraintLayout>

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_toTopOf="parent"
-        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,10 +31,9 @@
         />
 
     <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/topBar"
+        android:id="@+id/top_bar"
         android:layout_width="match_parent"
         android:layout_height="50dp"
-        android:layout_marginTop="50dp"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toTopOf="@id/fragment_layout"
         app:layout_constraintStart_toStartOf="parent"
@@ -42,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

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/name_box"
+        android:layout_width="match_parent"
+        android:layout_height="70dp"
+        android:layout_marginHorizontal="20dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginBottom="16dp"
+
+        android:background="@color/secondaryColour"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.4"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <TextView
+            android:id="@+id/coupon_name"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="20dp"
+            android:text="Naam"
+            android:textColor="@color/black"
+            android:textSize="20sp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -1,284 +1,41 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:background="@color/primaryColour"
-    tools:context=".fragments.CouponFragment">
-
-    <androidx.appcompat.widget.AppCompatImageButton
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:backgroundTint="@color/primaryColour"
-        android:src="@drawable/ic_back_button_24"
-        app:layout_constraintBottom_toBottomOf="@+id/textView"
-        app:layout_constraintEnd_toStartOf="@+id/textView"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/textView" />
+    tools:context=".fragments.LocationFragment">
 
     <TextView
-        android:id="@+id/textView"
+        android:id="@+id/coupon_RV"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="10dp"
-        android:text="@string/coupons"
-        android:textColor="@color/white"
-        android:textSize="30sp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/Box1"
-        android:layout_width="match_parent"
-        android:layout_height="70dp"
-        app:layout_constraintBottom_toTopOf="@id/Box2"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/textView"
-        android:background="@color/secondaryColour"
-        android:layout_marginHorizontal="20dp"
-
-        >
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="Code"
-            android:textColor="@color/black"
+        android:layout_margin="9dp"
+        android:layout_marginTop="20dp"
+        android:text="Statistics"
         android:textSize="20sp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="@id/Balk"
-            app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintStart_toEndOf="@id/coupon_back_button"
         app:layout_constraintTop_toTopOf="parent" />
 
-        <View
-            android:id="@+id/Balk"
-            android:layout_width="1dp"
-            android:layout_height="match_parent"
-            android:background="@color/black"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="Waarde"
-            android:textColor="@color/black"
-            android:textSize="20sp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="@id/Balk"
-            app:layout_constraintTop_toTopOf="parent" />
-
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/Box2"
-        android:layout_width="match_parent"
-        android:layout_height="70dp"
-        android:layout_marginHorizontal="20dp"
-        android:background="@color/secondaryColour"
-        app:layout_constraintBottom_toTopOf="@id/Box3"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/Box1"
-
-        >
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="FRISDRANKJE20"
-            android:textColor="@color/black"
-            android:textSize="20sp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="@id/Balk2"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <View
-            android:id="@+id/Balk2"
-            android:layout_width="1dp"
-            android:layout_height="match_parent"
-            android:background="@color/black"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="1x Frisdrank"
-            android:textColor="@color/black"
-            android:textSize="20sp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="@id/Balk2"
-            app:layout_constraintTop_toTopOf="parent" />
-
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/Box3"
-        android:layout_width="match_parent"
-        android:layout_height="70dp"
-        android:layout_marginHorizontal="20dp"
-        android:background="@color/secondaryColour"
-        app:layout_constraintBottom_toTopOf="@id/Box4"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/Box2"
-        >
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="CHOCOMEL30"
-            android:textColor="@color/black"
-            android:textSize="20sp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="@id/Balk3"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <View
-            android:id="@+id/Balk3"
-            android:layout_width="1dp"
-            android:layout_height="match_parent"
-            android:background="@color/black"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="1x Chocomel"
-            android:textColor="@color/black"
-            android:textSize="20sp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="@id/Balk3"
-            app:layout_constraintTop_toTopOf="parent" />
-
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/Box4"
-        android:layout_width="match_parent"
-        android:layout_height="70dp"
-        app:layout_constraintBottom_toTopOf="@id/Box5"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/Box3"
-        android:background="@color/secondaryColour"
-        android:layout_marginHorizontal="20dp"
-
-        >
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="FRISTI200"
-            android:textColor="@color/black"
-            android:textSize="20sp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="@id/Balk4"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <View
-            android:id="@+id/Balk4"
-            android:layout_width="1dp"
-            android:layout_height="match_parent"
-            android:background="@color/black"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="2x Fristi"
-            android:textColor="@color/black"
-            android:textSize="20sp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="@id/Balk4"
-            app:layout_constraintTop_toTopOf="parent" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/Box5"
-        android:layout_width="match_parent"
-        android:layout_height="70dp"
-        app:layout_constraintBottom_toTopOf="@id/ButtonActivate"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/Box4"
-        android:background="@color/secondaryColour"
-        android:layout_marginHorizontal="20dp"
-
-        >
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="OLA30"
-            android:textColor="@color/black"
-            android:textSize="20sp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="@id/Balk5"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <View
-            android:id="@+id/Balk5"
-            android:layout_width="1dp"
-            android:layout_height="match_parent"
-            android:background="@color/black"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="1x Waterijsje"
-            android:textColor="@color/black"
-            android:textSize="20sp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="@id/Balk5"
-            app:layout_constraintTop_toTopOf="parent" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-    <Button
-        android:id="@+id/ButtonActivate"
+    <ImageButton
+        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="Activate"
+        android:text="Back"
+        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/coupon_recyclerview"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/Box5"
-        />
-
+        app:layout_constraintTop_toBottomOf="@+id/coupon_back_button" />
 </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -1,14 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     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" />
+        android:layout_height="match_parent">
+
+    </org.osmdroid.views.MapView>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <ImageButton
+            android:id="@+id/location_list_button"
+            android:layout_width="wrap_content"
+            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" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
 </FrameLayout>

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

@@ -12,27 +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/routeBackButton"
+        app:layout_constraintStart_toEndOf="@id/location_back_button"
         app:layout_constraintTop_toTopOf="parent" />
 
     <ImageButton
-        android:id="@+id/routeBackButton"
+        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"
-        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/routeListRV"
+        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

@@ -7,16 +7,6 @@
     android:background="@color/primaryColour"
     tools:context=".fragments.StatisticFragment">
 
-    <androidx.appcompat.widget.AppCompatImageButton
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:backgroundTint="@color/primaryColour"
-        android:src="@drawable/ic_back_button_24"
-        app:layout_constraintBottom_toBottomOf="@+id/textView"
-        app:layout_constraintEnd_toStartOf="@+id/textView"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/textView" />
-
     <TextView
         android:id="@+id/textView"
         android:layout_width="wrap_content"
@@ -30,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"
@@ -65,6 +55,7 @@
             />
 
         <TextView
+            android:id="@+id/statistics_km"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text=" km"
@@ -87,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"
 
         >
 
@@ -113,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"
@@ -211,6 +203,7 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:id="@+id/couponAmount"
             android:text="GETAL"
             android:textColor="@color/black"
             android:textSize="20sp"

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"
         />
@@ -17,11 +17,11 @@
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
-        android:id="@+id/routeName"
+        android:id="@+id/route_name"
         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());
+    }
+
+}