From 6c923d27b2d4ee34fdf2d2a4f3453d216cd0ffb6 Mon Sep 17 00:00:00 2001
From: Bart <bartvanmoorsel7@gmail.com>
Date: Thu, 17 Dec 2020 13:46:41 +0100
Subject: [PATCH 01/18] Connected locationFragment with recyclerview and added
 functionality

---
 .../com/a1/nextlocation/data/Location.java    | 36 ++++++++++++++++-
 .../fragments/LocationFragment.java           | 39 ++++++++++++++++---
 .../recyclerview/LocationAdapter.java         |  5 ++-
 app/src/main/res/layout/fragment_location.xml |  1 +
 4 files changed, 73 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/com/a1/nextlocation/data/Location.java b/app/src/main/java/com/a1/nextlocation/data/Location.java
index 24422bb..681f816 100644
--- a/app/src/main/java/com/a1/nextlocation/data/Location.java
+++ b/app/src/main/java/com/a1/nextlocation/data/Location.java
@@ -1,11 +1,14 @@
 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;
 
-public class Location {
+public class Location implements Parcelable {
 
     @NonNull
     private String name;
@@ -31,6 +34,25 @@ public class Location {
         this(name,getStringFromCoordinates(latCoord,longCoord),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;
@@ -85,4 +107,16 @@ public class Location {
         return lat1 + "," + long1;
     }
 
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    @Override
+    public void writeToParcel(Parcel dest, int flags) {
+        dest.writeString(name);
+        dest.writeString(coordinates);
+        dest.writeString(description);
+        dest.writeString(imageUrl);
+    }
 }
diff --git a/app/src/main/java/com/a1/nextlocation/fragments/LocationFragment.java b/app/src/main/java/com/a1/nextlocation/fragments/LocationFragment.java
index 133665f..4bc159d 100644
--- a/app/src/main/java/com/a1/nextlocation/fragments/LocationFragment.java
+++ b/app/src/main/java/com/a1/nextlocation/fragments/LocationFragment.java
@@ -3,25 +3,54 @@ 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 com.a1.nextlocation.R;
+import com.a1.nextlocation.data.Location;
+import com.a1.nextlocation.recyclerview.CouponAdapter;
+import com.a1.nextlocation.recyclerview.LocationAdapter;
+import com.a1.nextlocation.recyclerview.LocationListManager;
+
+import java.util.ArrayList;
+import java.util.List;
 
 public class LocationFragment extends Fragment {
+    private RecyclerView locationRecyclerView;
+    private LocationAdapter locationAdapter;
+    private RecyclerView.LayoutManager layoutManager;
+    private List<Location> locationList;
 
     @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);
+
+        locationRecyclerView = view.findViewById(R.id.locationRecyclerView);
+        locationRecyclerView.setHasFixedSize(true);
+        layoutManager = new LinearLayoutManager(this.getContext());
+        LocationListManager locationListManager = new LocationListManager(this.getContext());
+        locationListManager.load();
+        locationList = locationListManager.getLocationList();
+        locationAdapter = new LocationAdapter(this.getContext(), locationList, clickedPosition -> {
+            LocationDetailFragment locationDetailFragment = new LocationDetailFragment();
+            Bundle locationBundle = new Bundle();
+            locationBundle.putParcelable("location", locationList.get(clickedPosition));
+            locationDetailFragment.setArguments(locationBundle);
+            ((FragmentActivity) view.getContext()).getSupportFragmentManager().beginTransaction().replace(R.id.fragment_layout, locationDetailFragment).addToBackStack(null).commit();
+        });
+        locationRecyclerView.setLayoutManager(layoutManager);
+        locationRecyclerView.setAdapter(locationAdapter);
+        return view;
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/a1/nextlocation/recyclerview/LocationAdapter.java b/app/src/main/java/com/a1/nextlocation/recyclerview/LocationAdapter.java
index 5ef367f..9148dc7 100644
--- a/app/src/main/java/com/a1/nextlocation/recyclerview/LocationAdapter.java
+++ b/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
@@ -43,7 +44,7 @@ public class LocationAdapter extends RecyclerView.Adapter<LocationAdapter.Locati
         }
     }
 
-    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;
diff --git a/app/src/main/res/layout/fragment_location.xml b/app/src/main/res/layout/fragment_location.xml
index 11a47f1..b64896e 100644
--- a/app/src/main/res/layout/fragment_location.xml
+++ b/app/src/main/res/layout/fragment_location.xml
@@ -31,6 +31,7 @@
     <androidx.recyclerview.widget.RecyclerView
         android:layout_width="0dp"
         android:layout_height="0dp"
+        android:id="@+id/locationRecyclerView"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"

From 1f7cd49a906775fe707cc4191ae390b2972e44f5 Mon Sep 17 00:00:00 2001
From: RemoMeijer <remcomeijer0210@gmail.com>
Date: Thu, 17 Dec 2020 14:35:05 +0100
Subject: [PATCH 02/18] Route works and is clickable

---
 .../java/com/a1/nextlocation/data/Route.java  | 36 ++++++++++++++++-
 .../fragments/LocationFragment.java           | 23 ++++++-----
 .../nextlocation/fragments/RouteFragment.java | 40 +++++++++++++++++--
 .../recyclerview/RouteAdapter.java            | 21 +++++++++-
 app/src/main/res/layout/fragment_route.xml    |  2 +-
 app/src/main/res/layout/route_item.xml        |  2 +-
 6 files changed, 105 insertions(+), 19 deletions(-)

diff --git a/app/src/main/java/com/a1/nextlocation/data/Route.java b/app/src/main/java/com/a1/nextlocation/data/Route.java
index 7ff67dc..baf6016 100644
--- a/app/src/main/java/com/a1/nextlocation/data/Route.java
+++ b/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);
+    }
 }
diff --git a/app/src/main/java/com/a1/nextlocation/fragments/LocationFragment.java b/app/src/main/java/com/a1/nextlocation/fragments/LocationFragment.java
index 4bc159d..26c53a2 100644
--- a/app/src/main/java/com/a1/nextlocation/fragments/LocationFragment.java
+++ b/app/src/main/java/com/a1/nextlocation/fragments/LocationFragment.java
@@ -36,21 +36,24 @@ public class LocationFragment extends Fragment {
 
         View view = inflater.inflate(R.layout.fragment_location, container, false);
 
-        locationRecyclerView = view.findViewById(R.id.locationRecyclerView);
-        locationRecyclerView.setHasFixedSize(true);
-        layoutManager = new LinearLayoutManager(this.getContext());
-        LocationListManager locationListManager = new LocationListManager(this.getContext());
-        locationListManager.load();
-        locationList = locationListManager.getLocationList();
-        locationAdapter = new LocationAdapter(this.getContext(), locationList, clickedPosition -> {
+        this.locationRecyclerView = view.findViewById(R.id.locationRecyclerView);
+        this.locationRecyclerView.setHasFixedSize(true);
+        this.layoutManager = new LinearLayoutManager(this.getContext());
+
+        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", locationList.get(clickedPosition));
+            locationBundle.putParcelable("location", this.locationList.get(clickedPosition));
             locationDetailFragment.setArguments(locationBundle);
             ((FragmentActivity) view.getContext()).getSupportFragmentManager().beginTransaction().replace(R.id.fragment_layout, locationDetailFragment).addToBackStack(null).commit();
         });
-        locationRecyclerView.setLayoutManager(layoutManager);
-        locationRecyclerView.setAdapter(locationAdapter);
+
+        this.locationRecyclerView.setLayoutManager(this.layoutManager);
+        this.locationRecyclerView.setAdapter(this.locationAdapter);
         return view;
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/a1/nextlocation/fragments/RouteFragment.java b/app/src/main/java/com/a1/nextlocation/fragments/RouteFragment.java
index 59043de..9ac07c3 100644
--- a/app/src/main/java/com/a1/nextlocation/fragments/RouteFragment.java
+++ b/app/src/main/java/com/a1/nextlocation/fragments/RouteFragment.java
@@ -3,15 +3,29 @@ 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 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.ArrayList;
+import java.util.List;
 
 public class RouteFragment extends Fragment {
 
+    private RecyclerView routeRecyclerView;
+    private RecyclerView.LayoutManager layoutManager;
+    private List<Route> routeList;
+    private RouteAdapter routeAdapter;
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -19,9 +33,27 @@ public class RouteFragment 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, 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.routeRecyclerView);
+        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;
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/a1/nextlocation/recyclerview/RouteAdapter.java b/app/src/main/java/com/a1/nextlocation/recyclerview/RouteAdapter.java
index 693945b..6664c6c 100644
--- a/app/src/main/java/com/a1/nextlocation/recyclerview/RouteAdapter.java
+++ b/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,15 @@ 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);
+        RouteAdapter.RouteViewHolder viewHolder = new RouteAdapter.RouteViewHolder(itemView);
+        return viewHolder;
     }
 
     @Override
     public void onBindViewHolder(@NonNull RouteAdapter.RouteViewHolder holder, int position) {
-
+        Route route = routeList.get(position);
+        holder.setTextViewText(route.getName());
     }
 
     @Override
diff --git a/app/src/main/res/layout/fragment_route.xml b/app/src/main/res/layout/fragment_route.xml
index a64cb46..23b76a0 100644
--- a/app/src/main/res/layout/fragment_route.xml
+++ b/app/src/main/res/layout/fragment_route.xml
@@ -28,7 +28,7 @@
         app:layout_constraintTop_toTopOf="parent" />
 
     <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/routeListRV"
+        android:id="@+id/routeRecyclerView"
         android:layout_width="0dp"
         android:layout_height="0dp"
         android:background="@color/primaryColour"
diff --git a/app/src/main/res/layout/route_item.xml b/app/src/main/res/layout/route_item.xml
index 904440e..c6f675f 100644
--- a/app/src/main/res/layout/route_item.xml
+++ b/app/src/main/res/layout/route_item.xml
@@ -17,7 +17,7 @@
     <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"

From 6f10444126dab528cf5ec1e7ad7ceac51a0b6f80 Mon Sep 17 00:00:00 2001
From: RemoMeijer <remcomeijer0210@gmail.com>
Date: Thu, 17 Dec 2020 14:48:15 +0100
Subject: [PATCH 03/18] Route displays name

---
 .../fragments/RouteDetailFragment.java        | 20 +++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/a1/nextlocation/fragments/RouteDetailFragment.java b/app/src/main/java/com/a1/nextlocation/fragments/RouteDetailFragment.java
index c610d6a..d79bfa2 100644
--- a/app/src/main/java/com/a1/nextlocation/fragments/RouteDetailFragment.java
+++ b/app/src/main/java/com/a1/nextlocation/fragments/RouteDetailFragment.java
@@ -7,11 +7,16 @@ import androidx.fragment.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.TextView;
 
 import com.a1.nextlocation.R;
+import com.a1.nextlocation.data.Route;
 
 public class RouteDetailFragment extends Fragment {
 
+    private Route route;
+    private TextView routeDetailText;
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -19,9 +24,16 @@ 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());
+
+
+        return view;
     }
 }
\ No newline at end of file

From 6b197c474238f024387adb41e280839e91af8a84 Mon Sep 17 00:00:00 2001
From: RemoMeijer <remcomeijer0210@gmail.com>
Date: Thu, 17 Dec 2020 14:57:04 +0100
Subject: [PATCH 04/18] Location implements parcable

---
 .../com/a1/nextlocation/data/Location.java    | 36 ++++++++++++++++++-
 1 file changed, 35 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/a1/nextlocation/data/Location.java b/app/src/main/java/com/a1/nextlocation/data/Location.java
index 8185aea..f7d2362 100644
--- a/app/src/main/java/com/a1/nextlocation/data/Location.java
+++ b/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,25 @@ public class Location {
         this(name,getStringFromCoordinates(latCoord,longCoord),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;
@@ -90,4 +112,16 @@ public class Location {
         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);
+    }
 }

From 294814dea827d7f3a8cbda0af7766b90b8cef02f Mon Sep 17 00:00:00 2001
From: Bart <bartvanmoorsel7@gmail.com>
Date: Mon, 4 Jan 2021 10:59:43 +0100
Subject: [PATCH 05/18] StatisticFragment navigation to CouponFragment

---
 .../a1/nextlocation/fragments/StatisticFragment.java | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/a1/nextlocation/fragments/StatisticFragment.java b/app/src/main/java/com/a1/nextlocation/fragments/StatisticFragment.java
index d86d6ea..ab14bff 100644
--- a/app/src/main/java/com/a1/nextlocation/fragments/StatisticFragment.java
+++ b/app/src/main/java/com/a1/nextlocation/fragments/StatisticFragment.java
@@ -2,11 +2,14 @@ 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 android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.Toast;
 
 import com.a1.nextlocation.R;
 
@@ -21,7 +24,12 @@ public class StatisticFragment extends Fragment {
     @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);
+        View view = inflater.inflate(R.layout.fragment_statistic, container, false);
+        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;
     }
 }
\ No newline at end of file

From 9ca3b12d71de5f61e4c71a70a89946ea12a28e2d Mon Sep 17 00:00:00 2001
From: sebas <mab.tromper@student.avans.nl>
Date: Mon, 4 Jan 2021 11:06:04 +0100
Subject: [PATCH 06/18] Added code to CouponFragment

---
 .../fragments/CouponFragment.java             | 33 ++++++++++++++++---
 1 file changed, 29 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/a1/nextlocation/fragments/CouponFragment.java b/app/src/main/java/com/a1/nextlocation/fragments/CouponFragment.java
index 22302bb..b31f5f2 100644
--- a/app/src/main/java/com/a1/nextlocation/fragments/CouponFragment.java
+++ b/app/src/main/java/com/a1/nextlocation/fragments/CouponFragment.java
@@ -3,24 +3,49 @@ 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 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;
+
     @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.routeRecyclerView);
+        this.couponRecyclerView.setHasFixedSize(true);
+        this.layoutManager = new LinearLayoutManager(this.getContext());
+
+        CouponListManager.INSTANCE.setContext(this.getContext());
+        CouponListManager.INSTANCE.load();
+        this.couponList = CouponListManager.INSTANCE.getCouponList();
+
+        this.couponAdapter = new CouponAdapter(this.getContext(), this.couponList);
+
+        this.couponRecyclerView.setLayoutManager(this.layoutManager);
+        this.couponRecyclerView.setAdapter(this.couponAdapter);
+        return view;
     }
 }
\ No newline at end of file

From c355f64d383d6489d4cbc0e71e8fd57b87865e93 Mon Sep 17 00:00:00 2001
From: RemoMeijer <remcomeijer0210@gmail.com>
Date: Mon, 4 Jan 2021 11:08:49 +0100
Subject: [PATCH 07/18] Added couponadapter

---
 .../a1/nextlocation/recyclerview/CouponAdapter.java  | 12 +++++-------
 .../a1/nextlocation/recyclerview/CouponLoader.java   |  2 --
 .../a1/nextlocation/recyclerview/RouteAdapter.java   |  3 +--
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/com/a1/nextlocation/recyclerview/CouponAdapter.java b/app/src/main/java/com/a1/nextlocation/recyclerview/CouponAdapter.java
index 2098508..14aa3c9 100644
--- a/app/src/main/java/com/a1/nextlocation/recyclerview/CouponAdapter.java
+++ b/app/src/main/java/com/a1/nextlocation/recyclerview/CouponAdapter.java
@@ -3,10 +3,12 @@ package com.a1.nextlocation.recyclerview;
 import android.content.Context;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.LayoutInflater;
 
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 
+import com.a1.nextlocation.R;
 import com.a1.nextlocation.data.Coupon;
 
 import java.util.List;
@@ -21,16 +23,11 @@ public class CouponAdapter extends RecyclerView.Adapter<CouponAdapter.CouponView
         void onItemClick(int clickedPosition);
     }
 
-    class CouponViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener {
+    class CouponViewHolder extends RecyclerView.ViewHolder {
 
         public CouponViewHolder(@NonNull View itemView) {
             super(itemView);
         }
-
-        @Override
-        public void onClick(View view) {
-            clickListener.onItemClick(getAdapterPosition());
-        }
     }
 
     public CouponAdapter(Context context, List<Coupon> coupon, OnItemClickListener listener){
@@ -42,7 +39,8 @@ public class CouponAdapter extends RecyclerView.Adapter<CouponAdapter.CouponView
     @NonNull
     @Override
     public CouponViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        return null;
+        View itemView = LayoutInflater.from(parent.getContext()).inflate(R.layout.fragment_coupon, parent, false);
+        return new CouponViewHolder(itemView);
     }
 
     @Override
diff --git a/app/src/main/java/com/a1/nextlocation/recyclerview/CouponLoader.java b/app/src/main/java/com/a1/nextlocation/recyclerview/CouponLoader.java
index 3cfcf13..3c3e39f 100644
--- a/app/src/main/java/com/a1/nextlocation/recyclerview/CouponLoader.java
+++ b/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>> {
diff --git a/app/src/main/java/com/a1/nextlocation/recyclerview/RouteAdapter.java b/app/src/main/java/com/a1/nextlocation/recyclerview/RouteAdapter.java
index 6664c6c..dffb982 100644
--- a/app/src/main/java/com/a1/nextlocation/recyclerview/RouteAdapter.java
+++ b/app/src/main/java/com/a1/nextlocation/recyclerview/RouteAdapter.java
@@ -57,8 +57,7 @@ public class RouteAdapter extends RecyclerView.Adapter<RouteAdapter.RouteViewHol
     @Override
     public RouteAdapter.RouteViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
         View itemView = LayoutInflater.from(parent.getContext()).inflate(R.layout.route_item, parent, false);
-        RouteAdapter.RouteViewHolder viewHolder = new RouteAdapter.RouteViewHolder(itemView);
-        return viewHolder;
+        return new RouteViewHolder(itemView);
     }
 
     @Override

From e2bccb6e769b6daa1e9f8033c6595db2ced7b2bb Mon Sep 17 00:00:00 2001
From: sebas <mab.tromper@student.avans.nl>
Date: Mon, 4 Jan 2021 11:23:16 +0100
Subject: [PATCH 08/18] Changed couponfragment layout

---
 .../main/res/layout-land/fragment_coupon.xml  | 284 -----------------
 app/src/main/res/layout/fragment_coupon.xml   | 289 ++----------------
 2 files changed, 22 insertions(+), 551 deletions(-)
 delete mode 100644 app/src/main/res/layout-land/fragment_coupon.xml

diff --git a/app/src/main/res/layout-land/fragment_coupon.xml b/app/src/main/res/layout-land/fragment_coupon.xml
deleted file mode 100644
index 23b3114..0000000
--- a/app/src/main/res/layout-land/fragment_coupon.xml
+++ /dev/null
@@ -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>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_coupon.xml b/app/src/main/res/layout/fragment_coupon.xml
index c5c21da..2a73bb5 100644
--- a/app/src/main/res/layout/fragment_coupon.xml
+++ b/app/src/main/res/layout/fragment_coupon.xml
@@ -1,284 +1,39 @@
 <?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"
+        android:layout_margin="9dp"
+        android:text="Locations"
+        android:textSize="20sp"
+        app:layout_constraintStart_toEndOf="@id/couponBackButton"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <ImageButton
+        android:id="@+id/couponBackButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        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.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: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="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"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:backgroundTint="@color/buttonColour"
-        android:text="Activate"
+    <androidx.recyclerview.widget.RecyclerView
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:id="@+id/locationRecyclerView"
         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/couponBackButton" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From ff32eefab02a211dfa70949ce6bc5ce4adb9da9a Mon Sep 17 00:00:00 2001
From: RemoMeijer <remcomeijer0210@gmail.com>
Date: Mon, 4 Jan 2021 11:27:49 +0100
Subject: [PATCH 09/18] Added coupon item

---
 .../recyclerview/CouponAdapter.java           |  3 +-
 app/src/main/res/layout/coupon_item.xml       | 55 +++++++++++++++++++
 2 files changed, 56 insertions(+), 2 deletions(-)
 create mode 100644 app/src/main/res/layout/coupon_item.xml

diff --git a/app/src/main/java/com/a1/nextlocation/recyclerview/CouponAdapter.java b/app/src/main/java/com/a1/nextlocation/recyclerview/CouponAdapter.java
index 14aa3c9..dadf00f 100644
--- a/app/src/main/java/com/a1/nextlocation/recyclerview/CouponAdapter.java
+++ b/app/src/main/java/com/a1/nextlocation/recyclerview/CouponAdapter.java
@@ -30,10 +30,9 @@ public class CouponAdapter extends RecyclerView.Adapter<CouponAdapter.CouponView
         }
     }
 
-    public CouponAdapter(Context context, List<Coupon> coupon, OnItemClickListener listener){
+    public CouponAdapter(Context context, List<Coupon> coupon){
         appContext = context;
         couponList = coupon;
-        clickListener = listener;
     }
 
     @NonNull
diff --git a/app/src/main/res/layout/coupon_item.xml b/app/src/main/res/layout/coupon_item.xml
new file mode 100644
index 0000000..8c0f69c
--- /dev/null
+++ b/app/src/main/res/layout/coupon_item.xml
@@ -0,0 +1,55 @@
+<?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="match_parent">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/Box1"
+        android:layout_width="match_parent"
+        android:layout_height="70dp"
+        android:layout_marginHorizontal="20dp"
+        android:layout_marginTop="21dp"
+        android:background="@color/secondaryColour"
+        app:layout_constraintBottom_toTopOf="@id/Box2"
+        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="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>
\ No newline at end of file

From 21183368155af4e6cc66da713e3fc28fdbf00b4a Mon Sep 17 00:00:00 2001
From: RemoMeijer <remcomeijer0210@gmail.com>
Date: Mon, 4 Jan 2021 11:40:06 +0100
Subject: [PATCH 10/18] Switching fragment from statistics to coupon works

---
 .../java/com/a1/nextlocation/fragments/CouponFragment.java | 2 +-
 .../com/a1/nextlocation/fragments/StatisticFragment.java   | 7 ++++---
 app/src/main/res/layout/fragment_coupon.xml                | 4 ++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/a1/nextlocation/fragments/CouponFragment.java b/app/src/main/java/com/a1/nextlocation/fragments/CouponFragment.java
index b31f5f2..675709e 100644
--- a/app/src/main/java/com/a1/nextlocation/fragments/CouponFragment.java
+++ b/app/src/main/java/com/a1/nextlocation/fragments/CouponFragment.java
@@ -34,7 +34,7 @@ public class CouponFragment extends Fragment {
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         View view = inflater.inflate(R.layout.fragment_coupon, container, false);
 
-        this.couponRecyclerView = view.findViewById(R.id.routeRecyclerView);
+        this.couponRecyclerView = view.findViewById(R.id.couponRecyclerView);
         this.couponRecyclerView.setHasFixedSize(true);
         this.layoutManager = new LinearLayoutManager(this.getContext());
 
diff --git a/app/src/main/java/com/a1/nextlocation/fragments/StatisticFragment.java b/app/src/main/java/com/a1/nextlocation/fragments/StatisticFragment.java
index ab14bff..a6f5bae 100644
--- a/app/src/main/java/com/a1/nextlocation/fragments/StatisticFragment.java
+++ b/app/src/main/java/com/a1/nextlocation/fragments/StatisticFragment.java
@@ -5,6 +5,7 @@ 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;
@@ -18,13 +19,13 @@ public class StatisticFragment extends Fragment {
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-
     }
 
     @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         View view = inflater.inflate(R.layout.fragment_statistic, container, false);
+
+
         ConstraintLayout constraintLayout = view.findViewById(R.id.Box4);
         constraintLayout.setOnClickListener(v -> {
             CouponFragment couponFragment = new CouponFragment();
diff --git a/app/src/main/res/layout/fragment_coupon.xml b/app/src/main/res/layout/fragment_coupon.xml
index 2a73bb5..bdbbc67 100644
--- a/app/src/main/res/layout/fragment_coupon.xml
+++ b/app/src/main/res/layout/fragment_coupon.xml
@@ -12,7 +12,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_margin="9dp"
-        android:text="Locations"
+        android:text="Statistics"
         android:textSize="20sp"
         app:layout_constraintStart_toEndOf="@id/couponBackButton"
         app:layout_constraintTop_toTopOf="parent" />
@@ -31,7 +31,7 @@
     <androidx.recyclerview.widget.RecyclerView
         android:layout_width="0dp"
         android:layout_height="0dp"
-        android:id="@+id/locationRecyclerView"
+        android:id="@+id/couponRecyclerView"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"

From d96a54863c4e289a92a5e293aec8c65c5e7b4538 Mon Sep 17 00:00:00 2001
From: RemoMeijer <remcomeijer0210@gmail.com>
Date: Mon, 4 Jan 2021 13:04:02 +0100
Subject: [PATCH 11/18] coupons working

---
 app/src/main/assets/coupons.json              |  8 ++++++--
 .../recyclerview/CouponAdapter.java           | 20 +++++++++++++++++--
 app/src/main/res/layout/coupon_item.xml       | 18 ++++++++++-------
 3 files changed, 35 insertions(+), 11 deletions(-)

diff --git a/app/src/main/assets/coupons.json b/app/src/main/assets/coupons.json
index 39a85db..eefca7d 100644
--- a/app/src/main/assets/coupons.json
+++ b/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"
   }
 ]
\ No newline at end of file
diff --git a/app/src/main/java/com/a1/nextlocation/recyclerview/CouponAdapter.java b/app/src/main/java/com/a1/nextlocation/recyclerview/CouponAdapter.java
index dadf00f..c53cce9 100644
--- a/app/src/main/java/com/a1/nextlocation/recyclerview/CouponAdapter.java
+++ b/app/src/main/java/com/a1/nextlocation/recyclerview/CouponAdapter.java
@@ -4,6 +4,7 @@ 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;
@@ -25,9 +26,22 @@ public class CouponAdapter extends RecyclerView.Adapter<CouponAdapter.CouponView
 
     class CouponViewHolder extends RecyclerView.ViewHolder {
 
+        private TextView couponCode;
+        private TextView couponReward;
+
         public CouponViewHolder(@NonNull View itemView) {
             super(itemView);
         }
+
+        public void setTextViewCode(String text){
+            this.couponCode = itemView.findViewById(R.id.coupon_code);
+            this.couponCode.setText(text);
+        }
+
+        public void setTextViewReward(String text){
+            this.couponReward = itemView.findViewById(R.id.coupon_waarde);
+            this.couponReward.setText(text);
+        }
     }
 
     public CouponAdapter(Context context, List<Coupon> coupon){
@@ -38,13 +52,15 @@ public class CouponAdapter extends RecyclerView.Adapter<CouponAdapter.CouponView
     @NonNull
     @Override
     public CouponViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        View itemView = LayoutInflater.from(parent.getContext()).inflate(R.layout.fragment_coupon, parent, false);
+        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.setTextViewCode(coupon.getCode());
+        holder.setTextViewReward(coupon.getReward());
     }
 
     @Override
diff --git a/app/src/main/res/layout/coupon_item.xml b/app/src/main/res/layout/coupon_item.xml
index 8c0f69c..a2529ad 100644
--- a/app/src/main/res/layout/coupon_item.xml
+++ b/app/src/main/res/layout/coupon_item.xml
@@ -1,24 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<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="match_parent">
+    android:layout_height="wrap_content">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/Box1"
         android:layout_width="match_parent"
         android:layout_height="70dp"
         android:layout_marginHorizontal="20dp"
-        android:layout_marginTop="21dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginBottom="16dp"
         android:background="@color/secondaryColour"
-        app:layout_constraintBottom_toTopOf="@id/Box2"
-        app:layout_constraintEnd_toEndOf="parent"
 
+        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_code"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="Code"
@@ -40,8 +42,10 @@
             app:layout_constraintTop_toTopOf="parent" />
 
         <TextView
-            android:layout_width="wrap_content"
+            android:id="@+id/coupon_waarde"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_marginStart="200dp"
             android:text="Waarde"
             android:textColor="@color/black"
             android:textSize="20sp"

From 547d676a68fdb670790bb7541e467eb6bd1a5b98 Mon Sep 17 00:00:00 2001
From: Bart <bartvanmoorsel7@gmail.com>
Date: Mon, 4 Jan 2021 13:44:09 +0100
Subject: [PATCH 12/18] Coupon onClick unfinished code

---
 .../fragments/CouponFragment.java             |  6 ++++-
 .../recyclerview/CouponAdapter.java           | 22 +++++++++++++++----
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/a1/nextlocation/fragments/CouponFragment.java b/app/src/main/java/com/a1/nextlocation/fragments/CouponFragment.java
index 675709e..aa1d09e 100644
--- a/app/src/main/java/com/a1/nextlocation/fragments/CouponFragment.java
+++ b/app/src/main/java/com/a1/nextlocation/fragments/CouponFragment.java
@@ -42,10 +42,14 @@ public class CouponFragment extends Fragment {
         CouponListManager.INSTANCE.load();
         this.couponList = CouponListManager.INSTANCE.getCouponList();
 
-        this.couponAdapter = new CouponAdapter(this.getContext(), this.couponList);
+        this.couponAdapter = new CouponAdapter(this.getContext(), this.couponList, onClickedItem -> showPopup());
 
         this.couponRecyclerView.setLayoutManager(this.layoutManager);
         this.couponRecyclerView.setAdapter(this.couponAdapter);
         return view;
     }
+
+    private void showPopup() {
+
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/a1/nextlocation/recyclerview/CouponAdapter.java b/app/src/main/java/com/a1/nextlocation/recyclerview/CouponAdapter.java
index c53cce9..d312f25 100644
--- a/app/src/main/java/com/a1/nextlocation/recyclerview/CouponAdapter.java
+++ b/app/src/main/java/com/a1/nextlocation/recyclerview/CouponAdapter.java
@@ -1,6 +1,7 @@
 package com.a1.nextlocation.recyclerview;
 
 import android.content.Context;
+import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.LayoutInflater;
@@ -24,10 +25,11 @@ public class CouponAdapter extends RecyclerView.Adapter<CouponAdapter.CouponView
         void onItemClick(int clickedPosition);
     }
 
-    class CouponViewHolder extends RecyclerView.ViewHolder {
+    class CouponViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener {
 
         private TextView couponCode;
         private TextView couponReward;
+        private Coupon coupon;
 
         public CouponViewHolder(@NonNull View itemView) {
             super(itemView);
@@ -42,11 +44,22 @@ public class CouponAdapter extends RecyclerView.Adapter<CouponAdapter.CouponView
             this.couponReward = itemView.findViewById(R.id.coupon_waarde);
             this.couponReward.setText(text);
         }
+
+        public void setCoupon(Coupon coupon){
+            this.coupon = coupon;
+        }
+
+        @Override
+        public void onClick(View v) {
+            Log.d("yeet", "Coupon code: " + coupon.getCode());
+        }
     }
 
-    public CouponAdapter(Context context, List<Coupon> coupon){
-        appContext = context;
-        couponList = coupon;
+    public CouponAdapter(Context context, List<Coupon> coupon, OnItemClickListener listener){
+        this.appContext = context;
+        this.couponList = coupon;
+        this.clickListener = listener;
+
     }
 
     @NonNull
@@ -59,6 +72,7 @@ public class CouponAdapter extends RecyclerView.Adapter<CouponAdapter.CouponView
     @Override
     public void onBindViewHolder(@NonNull CouponViewHolder holder, int position) {
         Coupon coupon = couponList.get(position);
+        holder.setCoupon(coupon);
         holder.setTextViewCode(coupon.getCode());
         holder.setTextViewReward(coupon.getReward());
     }

From edcfd2ff0a471cb16f34e35ffe942f5dd5cae692 Mon Sep 17 00:00:00 2001
From: Bart <bartvanmoorsel7@gmail.com>
Date: Mon, 4 Jan 2021 14:31:16 +0100
Subject: [PATCH 13/18] Added popups for coupons

---
 .../fragments/CouponFragment.java             | 26 +++++++++++++++++--
 .../recyclerview/CouponAdapter.java           | 13 ++--------
 2 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/com/a1/nextlocation/fragments/CouponFragment.java b/app/src/main/java/com/a1/nextlocation/fragments/CouponFragment.java
index aa1d09e..7d132ee 100644
--- a/app/src/main/java/com/a1/nextlocation/fragments/CouponFragment.java
+++ b/app/src/main/java/com/a1/nextlocation/fragments/CouponFragment.java
@@ -1,5 +1,7 @@
 package com.a1.nextlocation.fragments;
 
+import android.app.AlertDialog;
+import android.content.DialogInterface;
 import android.os.Bundle;
 
 import androidx.fragment.app.Fragment;
@@ -42,14 +44,34 @@ public class CouponFragment extends Fragment {
         CouponListManager.INSTANCE.load();
         this.couponList = CouponListManager.INSTANCE.getCouponList();
 
-        this.couponAdapter = new CouponAdapter(this.getContext(), this.couponList, onClickedItem -> showPopup());
+        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() {
+    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();
 
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/a1/nextlocation/recyclerview/CouponAdapter.java b/app/src/main/java/com/a1/nextlocation/recyclerview/CouponAdapter.java
index d312f25..2ebef10 100644
--- a/app/src/main/java/com/a1/nextlocation/recyclerview/CouponAdapter.java
+++ b/app/src/main/java/com/a1/nextlocation/recyclerview/CouponAdapter.java
@@ -1,7 +1,6 @@
 package com.a1.nextlocation.recyclerview;
 
 import android.content.Context;
-import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.LayoutInflater;
@@ -29,10 +28,10 @@ public class CouponAdapter extends RecyclerView.Adapter<CouponAdapter.CouponView
 
         private TextView couponCode;
         private TextView couponReward;
-        private Coupon coupon;
 
         public CouponViewHolder(@NonNull View itemView) {
             super(itemView);
+            itemView.setOnClickListener(this);
         }
 
         public void setTextViewCode(String text){
@@ -45,13 +44,9 @@ public class CouponAdapter extends RecyclerView.Adapter<CouponAdapter.CouponView
             this.couponReward.setText(text);
         }
 
-        public void setCoupon(Coupon coupon){
-            this.coupon = coupon;
-        }
-
         @Override
         public void onClick(View v) {
-            Log.d("yeet", "Coupon code: " + coupon.getCode());
+            clickListener.onItemClick(getAdapterPosition());
         }
     }
 
@@ -72,7 +67,6 @@ public class CouponAdapter extends RecyclerView.Adapter<CouponAdapter.CouponView
     @Override
     public void onBindViewHolder(@NonNull CouponViewHolder holder, int position) {
         Coupon coupon = couponList.get(position);
-        holder.setCoupon(coupon);
         holder.setTextViewCode(coupon.getCode());
         holder.setTextViewReward(coupon.getReward());
     }
@@ -82,7 +76,4 @@ public class CouponAdapter extends RecyclerView.Adapter<CouponAdapter.CouponView
         return couponList.size();
     }
 
-
-
-
 }

From 1549fc7a59d078f2d06b327c8f944c813174a8f4 Mon Sep 17 00:00:00 2001
From: RemoMeijer <remcomeijer0210@gmail.com>
Date: Mon, 4 Jan 2021 14:35:50 +0100
Subject: [PATCH 14/18] Coupon layout updated

---
 .../recyclerview/CouponAdapter.java           | 11 ++-----
 app/src/main/res/layout/coupon_item.xml       | 32 +++----------------
 2 files changed, 8 insertions(+), 35 deletions(-)

diff --git a/app/src/main/java/com/a1/nextlocation/recyclerview/CouponAdapter.java b/app/src/main/java/com/a1/nextlocation/recyclerview/CouponAdapter.java
index 2ebef10..c25491d 100644
--- a/app/src/main/java/com/a1/nextlocation/recyclerview/CouponAdapter.java
+++ b/app/src/main/java/com/a1/nextlocation/recyclerview/CouponAdapter.java
@@ -34,13 +34,9 @@ public class CouponAdapter extends RecyclerView.Adapter<CouponAdapter.CouponView
             itemView.setOnClickListener(this);
         }
 
-        public void setTextViewCode(String text){
-            this.couponCode = itemView.findViewById(R.id.coupon_code);
-            this.couponCode.setText(text);
-        }
 
-        public void setTextViewReward(String text){
-            this.couponReward = itemView.findViewById(R.id.coupon_waarde);
+        public void setTextViewName(String text){
+            this.couponReward = itemView.findViewById(R.id.coupon_name);
             this.couponReward.setText(text);
         }
 
@@ -67,8 +63,7 @@ public class CouponAdapter extends RecyclerView.Adapter<CouponAdapter.CouponView
     @Override
     public void onBindViewHolder(@NonNull CouponViewHolder holder, int position) {
         Coupon coupon = couponList.get(position);
-        holder.setTextViewCode(coupon.getCode());
-        holder.setTextViewReward(coupon.getReward());
+        holder.setTextViewName(coupon.getReward());
     }
 
     @Override
diff --git a/app/src/main/res/layout/coupon_item.xml b/app/src/main/res/layout/coupon_item.xml
index a2529ad..49e3b93 100644
--- a/app/src/main/res/layout/coupon_item.xml
+++ b/app/src/main/res/layout/coupon_item.xml
@@ -11,8 +11,8 @@
         android:layout_marginHorizontal="20dp"
         android:layout_marginTop="16dp"
         android:layout_marginBottom="16dp"
-        android:background="@color/secondaryColour"
 
+        android:background="@color/secondaryColour"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.4"
@@ -20,38 +20,16 @@
         app:layout_constraintTop_toTopOf="parent">
 
         <TextView
-            android:id="@+id/coupon_code"
-            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:id="@+id/coupon_waarde"
+            android:id="@+id/coupon_name"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginStart="200dp"
-            android:text="Waarde"
+            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="@id/Balk"
+            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
 

From 79e24621e28a1cfbf218a1879544ff34481086ff Mon Sep 17 00:00:00 2001
From: sebas <mab.tromper@student.avans.nl>
Date: Mon, 4 Jan 2021 14:38:39 +0100
Subject: [PATCH 15/18] Statistics now shows amount of coupons

---
 .../nextlocation/fragments/StatisticFragment.java  | 14 ++++++++++++++
 .../nextlocation/recyclerview/CouponAdapter.java   |  5 +++++
 app/src/main/res/layout/fragment_statistic.xml     |  1 +
 3 files changed, 20 insertions(+)

diff --git a/app/src/main/java/com/a1/nextlocation/fragments/StatisticFragment.java b/app/src/main/java/com/a1/nextlocation/fragments/StatisticFragment.java
index a6f5bae..ad3f5e7 100644
--- a/app/src/main/java/com/a1/nextlocation/fragments/StatisticFragment.java
+++ b/app/src/main/java/com/a1/nextlocation/fragments/StatisticFragment.java
@@ -10,12 +10,21 @@ import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.TextView;
 import android.widget.Toast;
 
 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 StatisticFragment extends Fragment {
 
+    private List<Coupon> couponList;
+
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -25,6 +34,11 @@ public class StatisticFragment extends Fragment {
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         View view = inflater.inflate(R.layout.fragment_statistic, container, false);
 
+        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 -> {
diff --git a/app/src/main/java/com/a1/nextlocation/recyclerview/CouponAdapter.java b/app/src/main/java/com/a1/nextlocation/recyclerview/CouponAdapter.java
index c25491d..95ede65 100644
--- a/app/src/main/java/com/a1/nextlocation/recyclerview/CouponAdapter.java
+++ b/app/src/main/java/com/a1/nextlocation/recyclerview/CouponAdapter.java
@@ -53,6 +53,11 @@ public class CouponAdapter extends RecyclerView.Adapter<CouponAdapter.CouponView
 
     }
 
+    public CouponAdapter(Context context, List<Coupon> coupon) {
+        this.appContext = context;
+        this.couponList = coupon;
+    }
+
     @NonNull
     @Override
     public CouponViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
diff --git a/app/src/main/res/layout/fragment_statistic.xml b/app/src/main/res/layout/fragment_statistic.xml
index 6173cea..c3d1846 100644
--- a/app/src/main/res/layout/fragment_statistic.xml
+++ b/app/src/main/res/layout/fragment_statistic.xml
@@ -211,6 +211,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"

From e761dd80e562505e6d8d5a2001bce25619ee1027 Mon Sep 17 00:00:00 2001
From: sebas <mab.tromper@student.avans.nl>
Date: Mon, 4 Jan 2021 14:46:15 +0100
Subject: [PATCH 16/18] Adjusted frame layout in main fragment so that topbar
 now longer displays over the top part of fragments, but instead above it.

---
 app/src/main/res/layout/activity_main.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 3cb3e3b..97123a3 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -10,7 +10,7 @@
         android:id="@+id/fragment_layout"
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/topBar"
         app:layout_constraintBottom_toTopOf="@id/navbar"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
@@ -34,7 +34,6 @@
         android:id="@+id/topBar"
         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"

From 1b770020ed9a6bc6a5d6eb375a097b5620d94d1c Mon Sep 17 00:00:00 2001
From: RemoMeijer <remcomeijer0210@gmail.com>
Date: Mon, 4 Jan 2021 15:37:09 +0100
Subject: [PATCH 17/18] Added List button on Home

---
 app/src/main/assets/routes.json               |  2 +-
 .../fragments/CouponFragment.java             |  8 ++++++++
 .../nextlocation/fragments/HomeFragment.java  | 13 ++++++++++--
 .../fragments/LocationDetailFragment.java     | 16 +++++++++++++--
 .../fragments/LocationFragment.java           |  8 ++++++++
 .../fragments/StatisticFragment.java          |  2 ++
 .../recyclerview/LocationAdapter.java         |  6 +++---
 app/src/main/res/layout/fragment_home.xml     | 20 ++++++++++++++++++-
 app/src/main/res/layout/fragment_location.xml |  4 ++--
 .../main/res/layout/fragment_statistic.xml    | 10 ----------
 10 files changed, 68 insertions(+), 21 deletions(-)

diff --git a/app/src/main/assets/routes.json b/app/src/main/assets/routes.json
index 9c84f63..46c734f 100644
--- a/app/src/main/assets/routes.json
+++ b/app/src/main/assets/routes.json
@@ -3,7 +3,7 @@
     "name": "rondje stad",
     "locations": [
       {
-        "name": "kees kroket",
+        "name": "KesCrOkÊt breeda",
         "coordinates": "2.4654645,6.2342323",
         "description": "lekkere patatjes"
       }
diff --git a/app/src/main/java/com/a1/nextlocation/fragments/CouponFragment.java b/app/src/main/java/com/a1/nextlocation/fragments/CouponFragment.java
index 7d132ee..1faea7f 100644
--- a/app/src/main/java/com/a1/nextlocation/fragments/CouponFragment.java
+++ b/app/src/main/java/com/a1/nextlocation/fragments/CouponFragment.java
@@ -12,6 +12,7 @@ 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;
@@ -26,6 +27,7 @@ public class CouponFragment extends Fragment {
     private RecyclerView.LayoutManager layoutManager;
     private List<Coupon> couponList;
     private CouponAdapter couponAdapter;
+    private ImageButton imageButton;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -40,6 +42,12 @@ public class CouponFragment extends Fragment {
         this.couponRecyclerView.setHasFixedSize(true);
         this.layoutManager = new LinearLayoutManager(this.getContext());
 
+        this.imageButton = view.findViewById(R.id.couponBackButton);
+        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();
diff --git a/app/src/main/java/com/a1/nextlocation/fragments/HomeFragment.java b/app/src/main/java/com/a1/nextlocation/fragments/HomeFragment.java
index 8f5ba7d..ffcbc7c 100644
--- a/app/src/main/java/com/a1/nextlocation/fragments/HomeFragment.java
+++ b/app/src/main/java/com/a1/nextlocation/fragments/HomeFragment.java
@@ -13,12 +13,14 @@ import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.ImageButton;
 
 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;
@@ -42,6 +44,7 @@ import java.util.ArrayList;
 
 public class HomeFragment extends Fragment {
     private final String userAgent = "com.ai.nextlocation.fragments";
+    private ImageButton imageButton;
     private MapView mapView;
     private final int REQUEST_PERMISSIONS_REQUEST_CODE = 1;
     private final String TAG = HomeFragment.class.getCanonicalName();
@@ -60,10 +63,16 @@ public class HomeFragment extends Fragment {
     @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();
+        });
+
+        return view;
     }
 
     @Override
diff --git a/app/src/main/java/com/a1/nextlocation/fragments/LocationDetailFragment.java b/app/src/main/java/com/a1/nextlocation/fragments/LocationDetailFragment.java
index ea2fae9..62b6313 100644
--- a/app/src/main/java/com/a1/nextlocation/fragments/LocationDetailFragment.java
+++ b/app/src/main/java/com/a1/nextlocation/fragments/LocationDetailFragment.java
@@ -3,15 +3,19 @@ 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.ImageButton;
 
 import com.a1.nextlocation.R;
 
 public class LocationDetailFragment extends Fragment {
 
+    private ImageButton imageButton;
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -21,7 +25,15 @@ public class LocationDetailFragment extends Fragment {
     @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);
+
+        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();
+//        });
+
+        return view;
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/a1/nextlocation/fragments/LocationFragment.java b/app/src/main/java/com/a1/nextlocation/fragments/LocationFragment.java
index 26c53a2..3a026d5 100644
--- a/app/src/main/java/com/a1/nextlocation/fragments/LocationFragment.java
+++ b/app/src/main/java/com/a1/nextlocation/fragments/LocationFragment.java
@@ -10,6 +10,7 @@ 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;
@@ -25,6 +26,7 @@ public class LocationFragment extends Fragment {
     private LocationAdapter locationAdapter;
     private RecyclerView.LayoutManager layoutManager;
     private List<Location> locationList;
+    private ImageButton imageButton;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -40,6 +42,12 @@ public class LocationFragment extends Fragment {
         this.locationRecyclerView.setHasFixedSize(true);
         this.layoutManager = new LinearLayoutManager(this.getContext());
 
+//        this.imageButton = view.findViewById(R.id.locationBackButton);
+//        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();
diff --git a/app/src/main/java/com/a1/nextlocation/fragments/StatisticFragment.java b/app/src/main/java/com/a1/nextlocation/fragments/StatisticFragment.java
index ad3f5e7..a4080c5 100644
--- a/app/src/main/java/com/a1/nextlocation/fragments/StatisticFragment.java
+++ b/app/src/main/java/com/a1/nextlocation/fragments/StatisticFragment.java
@@ -10,6 +10,7 @@ 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;
 
@@ -23,6 +24,7 @@ import java.util.List;
 public class StatisticFragment extends Fragment {
 
     private List<Coupon> couponList;
+    private ImageView imageButton;
 
 
     @Override
diff --git a/app/src/main/java/com/a1/nextlocation/recyclerview/LocationAdapter.java b/app/src/main/java/com/a1/nextlocation/recyclerview/LocationAdapter.java
index 9148dc7..b39feae 100644
--- a/app/src/main/java/com/a1/nextlocation/recyclerview/LocationAdapter.java
+++ b/app/src/main/java/com/a1/nextlocation/recyclerview/LocationAdapter.java
@@ -40,6 +40,7 @@ public class LocationAdapter extends RecyclerView.Adapter<LocationAdapter.Locati
         }
 
         public void setTextViewText(String text){
+            this.locationName = itemView.findViewById(R.id.location_name);
             locationName.setText(text);
         }
     }
@@ -53,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
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 2c9a701..f20aeb6 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -1,5 +1,6 @@
 <?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"
@@ -9,6 +10,23 @@
     <org.osmdroid.views.MapView
         android:id="@+id/mapView"
         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:src="@drawable/ic_baseline_outlined_flag_24"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_location.xml b/app/src/main/res/layout/fragment_location.xml
index b64896e..7f03472 100644
--- a/app/src/main/res/layout/fragment_location.xml
+++ b/app/src/main/res/layout/fragment_location.xml
@@ -14,11 +14,11 @@
         android:layout_margin="9dp"
         android:text="Locations"
         android:textSize="20sp"
-        app:layout_constraintStart_toEndOf="@id/routeBackButton"
+        app:layout_constraintStart_toEndOf="@id/locationBackButton"
         app:layout_constraintTop_toTopOf="parent" />
 
     <ImageButton
-        android:id="@+id/routeBackButton"
+        android:id="@+id/locationBackButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:background="@drawable/ic_back_button_24"
diff --git a/app/src/main/res/layout/fragment_statistic.xml b/app/src/main/res/layout/fragment_statistic.xml
index c3d1846..7498fa9 100644
--- a/app/src/main/res/layout/fragment_statistic.xml
+++ b/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"

From 678b179e04369521fd82174f9b815324de34408a Mon Sep 17 00:00:00 2001
From: RemoMeijer <remcomeijer0210@gmail.com>
Date: Mon, 4 Jan 2021 15:46:18 +0100
Subject: [PATCH 18/18] added backbutton

---
 .../a1/nextlocation/fragments/LocationFragment.java    | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/a1/nextlocation/fragments/LocationFragment.java b/app/src/main/java/com/a1/nextlocation/fragments/LocationFragment.java
index 3a026d5..237622d 100644
--- a/app/src/main/java/com/a1/nextlocation/fragments/LocationFragment.java
+++ b/app/src/main/java/com/a1/nextlocation/fragments/LocationFragment.java
@@ -42,11 +42,11 @@ public class LocationFragment extends Fragment {
         this.locationRecyclerView.setHasFixedSize(true);
         this.layoutManager = new LinearLayoutManager(this.getContext());
 
-//        this.imageButton = view.findViewById(R.id.locationBackButton);
-//        this.imageButton.setOnClickListener(v -> {
-//            HomeFragment homeFragment = new HomeFragment();
-//            ((FragmentActivity) view.getContext()).getSupportFragmentManager().beginTransaction().replace(R.id.fragment_layout, homeFragment).addToBackStack(null).commit();
-//        });
+        this.imageButton = view.findViewById(R.id.locationBackButton);
+        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();