Button be working now

app/build.gradle

@@ -40,10 +40,8 @@ dependencies {
     implementation 'com.google.android.material:material:1.2.1'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'com.google.android.gms:play-services-location:17.1.0'
     implementation 'com.google.android.gms:play-services-maps:17.0.0'
     testImplementation 'junit:junit:4.13.1'
-//    implementation "com.android.support:support-compat:28.0.0"
 
     // okhttp
     implementation 'com.squareup.okhttp3:okhttp:4.9.0'

app/src/main/AndroidManifest.xml

@@ -25,11 +25,6 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <receiver android:name=".geofencing.GeoFenceBroadcastReceiver">
-            <intent-filter>
-                <action android:name="android.intent.action.USER_PRESENT" />
-            </intent-filter>
-        </receiver>
     </application>
 
 </manifest>

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

@@ -1,7 +1,6 @@
 package com.a1.nextlocation;
 
 import android.app.Activity;
-import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.res.Configuration;
 import android.os.Bundle;
@@ -9,11 +8,11 @@ import android.view.View;
 import android.widget.ImageButton;
 
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatDelegate;
 import androidx.fragment.app.DialogFragment;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 
-import com.a1.nextlocation.data.Data;
 import com.a1.nextlocation.fragments.HelpPopup;
 import com.a1.nextlocation.fragments.HomeFragment;
 import com.a1.nextlocation.fragments.Refreshable;
@@ -61,8 +60,6 @@ public class MainActivity extends AppCompatActivity implements Refreshable {
         CouponListManager.INSTANCE.load();
         RouteListManager.INSTANCE.setContext(this);
         RouteListManager.INSTANCE.load();
-        Data.INSTANCE.setContext(this);
-        Data.INSTANCE.load();
 
         if (savedInstanceState == null) {
             getSupportFragmentManager().beginTransaction().replace(R.id.fragment_layout, new HomeFragment()).commit();

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

@@ -1,12 +1,5 @@
 package com.a1.nextlocation.data;
 
-import android.content.Context;
-import android.content.SharedPreferences;
-
-import com.google.gson.Gson;
-import com.google.gson.reflect.TypeToken;
-
-import java.lang.reflect.Type;
 import java.util.ArrayList;
 
 /**
@@ -18,26 +11,6 @@ public enum Data {
     private int locationsVisited = 0;
     private long totalTime = 0;
     private double zoom = 0;
-    private SharedPreferences.Editor editor;
-    private Context context;
-    private LocationProximityListener locationProximityListener;
-
-    public void setContext(Context context) {
-        this.context = context;
-    }
-
-    public void setEditor(SharedPreferences.Editor editor) {
-        this.editor = editor;
-    }
-
-
-    public LocationProximityListener getLocationProximityListener() {
-        return locationProximityListener;
-    }
-
-    public void setLocationProximityListener(LocationProximityListener locationProximityListener) {
-        this.locationProximityListener = locationProximityListener;
-    }
 
     public double getZoom() {
         return zoom;
@@ -47,13 +20,10 @@ public enum Data {
         this.zoom = zoom;
     }
 
-    private ArrayList<String> visitedNames = new ArrayList<>();
+    private final ArrayList<String> visitedNames = new ArrayList<>();
 
     public void addDistance(double d) {
         distanceTraveled += d;
-
-        editor.putString("distanceTraveled", String.valueOf(distanceTraveled));
-        editor.apply();
     }
 
     public long getTotalTime() {
@@ -64,6 +34,7 @@ public enum Data {
         totalTime += time;
     }
 
+
     public double getDistanceTraveled() {
         return distanceTraveled;
     }
@@ -72,9 +43,6 @@ public enum Data {
         if (!visitedNames.contains(location.getName())) {
             locationsVisited++;
             visitedNames.add(location.getName());
-            saveVisitedNamesList();
-            editor.putInt("locationsVisited", locationsVisited);
-            editor.apply();
         }
     }
 
@@ -82,30 +50,5 @@ public enum Data {
         return locationsVisited;
     }
 
-    @FunctionalInterface
-    public interface LocationProximityListener {
-        void onLocationVisited(Location location);
-    }
-
-    public void saveVisitedNamesList(){
-        Gson gson = new Gson();
-        String json = gson.toJson(visitedNames);
-        editor.putString("visitedNames", json);
-        editor.apply();
-    }
-
-    public ArrayList<String> loadAndGetVisitedNamesList(){
-        String json = context.getSharedPreferences("Data", Context.MODE_PRIVATE).getString("visitedNames", "[]");
-        Type type = new TypeToken<ArrayList<String>>() {}.getType();
-        visitedNames = new Gson().fromJson(json, type);
-        return visitedNames;
-    }
-
-    public void load(){
-        SharedPreferences prefs = context.getSharedPreferences("Data", Context.MODE_PRIVATE);
-        this.editor = prefs.edit();
-        Data.INSTANCE.addDistance(Double.parseDouble(prefs.getString("distanceTraveled", "0")));
-        this.locationsVisited = loadAndGetVisitedNamesList().size();
-    }
 
 }

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

@@ -25,8 +25,6 @@ public class Location implements Parcelable {
     private String imageUrl;
     private String iconUrl;
 
-    private boolean visited;
-
     public Location(@NotNull String name, String coordinates, String description, @Nullable String imageUrl) {
         this.name = name;
         this.coordinates = coordinates;
@@ -173,12 +171,4 @@ public class Location implements Parcelable {
         parcel.writeString(description);
         parcel.writeString(imageUrl);
     }
-
-    public boolean isVisited() {
-        return visited;
-    }
-
-    public void setVisited(boolean visited) {
-        this.visited = visited;
-    }
 }

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

@@ -13,15 +13,6 @@ public enum RouteHandler {
     private int stepCount = 0;
     private RouteFinishedListener routeFinishedListener;
     private long startedTime;
-    private double currentRouteDuration;
-
-    public void setCurrentRouteDuration(double currentRouteDuration) {
-        this.currentRouteDuration = currentRouteDuration;
-    }
-
-    public double getCurrentRouteDuration() {
-        return currentRouteDuration;
-    }
 
     private Polyline currentRouteLine;
 
@@ -29,7 +20,6 @@ public enum RouteHandler {
         this.currentRouteLine = currentRouteLine;
     }
 
-
     public Polyline getCurrentRouteLine() {
         return currentRouteLine;
     }

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

@@ -2,10 +2,7 @@ package com.a1.nextlocation.fragments;
 
 
 import android.Manifest;
-import android.app.NotificationChannel;
-import android.app.NotificationManager;
 import android.content.Context;
-import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
 import android.graphics.drawable.Drawable;
 import android.location.Location;
@@ -22,7 +19,6 @@ import android.widget.Toast;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.core.app.ActivityCompat;
-import androidx.core.app.NotificationCompat;
 import androidx.core.content.ContextCompat;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentActivity;
@@ -30,7 +26,6 @@ import androidx.fragment.app.FragmentActivity;
 import com.a1.nextlocation.R;
 import com.a1.nextlocation.data.Data;
 import com.a1.nextlocation.data.RouteHandler;
-import com.a1.nextlocation.geofencing.GeofenceInitalizer;
 import com.a1.nextlocation.json.DirectionsResult;
 import com.a1.nextlocation.network.ApiHandler;
 import com.a1.nextlocation.recyclerview.LocationListManager;
@@ -65,8 +60,6 @@ public class HomeFragment extends Fragment implements LocationListener {
     private int color;
     private Location currentLocation;
     private Overlay allLocationsOverlay;
-    private GeofenceInitalizer initializer;
-    private final static String CHANNEL_ID = "next_location01";
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -78,7 +71,6 @@ public class HomeFragment extends Fragment implements LocationListener {
                 Manifest.permission.WRITE_EXTERNAL_STORAGE);
 
         color = requireContext().getColor(R.color.red);
-        Data.INSTANCE.setLocationProximityListener(this::onLocationVisited);
     }
 
     @Override
@@ -140,7 +132,6 @@ public class HomeFragment extends Fragment implements LocationListener {
         roadOverlay.setColor(color);
 
         // pass the line to the route handler
-        RouteHandler.INSTANCE.setCurrentRouteDuration(directionsResult.getDuration());
         RouteHandler.INSTANCE.setCurrentRouteLine(roadOverlay);
         Log.d(TAG, "onDirectionsAvailable: successfully added road!");
 
@@ -150,7 +141,6 @@ public class HomeFragment extends Fragment implements LocationListener {
     public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
 
-        initializer = new GeofenceInitalizer(requireContext(),requireActivity());
         initMap(view);
     }
 
@@ -227,8 +217,6 @@ public class HomeFragment extends Fragment implements LocationListener {
 
     }
 
-
-
     /**
      * displays the route that is currently being followed as a red line
      */
@@ -257,7 +245,6 @@ public class HomeFragment extends Fragment implements LocationListener {
     private void addLocations() {
         // get the locations of the current route or all locations
         List<com.a1.nextlocation.data.Location> locations = RouteHandler.INSTANCE.isFollowingRoute() ? RouteHandler.INSTANCE.getCurrentRoute().getLocations() : LocationListManager.INSTANCE.getLocationList();
-        initializer.removeGeoFences();
         final ArrayList<OverlayItem> items = new ArrayList<>(locations.size());
         // marker icon
         Drawable marker = ContextCompat.getDrawable(requireContext(), R.drawable.ic_baseline_location_on_24);
@@ -312,19 +299,6 @@ public class HomeFragment extends Fragment implements LocationListener {
         mapView.getOverlays().add(allLocationsOverlay);
         Log.d(TAG, "addLocations: successfully added locations");
 
-        addGeofences(locations);
-
-    }
-
-    /**
-     * adds the geofences for the currently active locations
-     * @param locations the locations to add geofences for
-     */
-    private void addGeofences(List<com.a1.nextlocation.data.Location> locations) {
-
-        Log.d(TAG, "addGeofences: adding geofences!");
-
-        initializer.init(locations);
     }
 
     /**
@@ -362,9 +336,8 @@ public class HomeFragment extends Fragment implements LocationListener {
         if (currentLocation != null) {
             double distance = currentLocation.distanceTo(location); // in meters
             // can't walk 100 meters in a few seconds
-            if (distance < 100) {
+            if (distance < 100)
                 Data.INSTANCE.addDistance(distance);
-            }
         }
         currentLocation = location;
 
@@ -392,33 +365,6 @@ public class HomeFragment extends Fragment implements LocationListener {
 
     }
 
-    public void onLocationVisited(com.a1.nextlocation.data.Location location) {
-        Data.INSTANCE.visitLocation(location);
-        showNotification(location);
-
-    }
-
-    private void showNotification(com.a1.nextlocation.data.Location location) {
-
-        NotificationManager mNotificationManager = (NotificationManager) requireActivity().getSystemService(Context.NOTIFICATION_SERVICE);
-        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O) {
-            int importance = NotificationManager.IMPORTANCE_LOW;
-            NotificationChannel notificationChannel = new NotificationChannel(CHANNEL_ID, "next_location", importance);
-            notificationChannel.enableLights(true);
-            notificationChannel.enableVibration(true);
-            notificationChannel.setVibrationPattern(new long[]{100, 200, 300, 400, 500, 400, 300, 200, 400});
-            mNotificationManager.createNotificationChannel(notificationChannel);
-        }
-
-        NotificationCompat.Builder mBuilder = new NotificationCompat.Builder(requireContext(),CHANNEL_ID)
-                .setSmallIcon(R.drawable.ic_launcher_foreground)
-                .setContentTitle(getString(R.string.notification_title))
-                .setContentText(getString(R.string.notification_text,location.getName()))
-                .setAutoCancel(true);
-
-        mNotificationManager.notify(0,mBuilder.build());
-    }
-
     // empty override methods for the LocationListener
 
     @Override

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

@@ -5,6 +5,7 @@ import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.res.Configuration;
 import android.os.Bundle;
+import android.preference.PreferenceManager;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -13,11 +14,13 @@ import android.widget.ArrayAdapter;
 import android.widget.ImageView;
 import android.widget.Spinner;
 
+import androidx.appcompat.app.AppCompatDelegate;
 import androidx.appcompat.widget.SwitchCompat;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentActivity;
 import androidx.fragment.app.FragmentTransaction;
 
+import com.a1.nextlocation.MainActivity;
 import com.a1.nextlocation.R;
 
 import org.jetbrains.annotations.NotNull;
@@ -29,6 +32,7 @@ public class SettingsFragment extends Fragment {
     private SharedPreferences.Editor editor;
     private SwitchCompat fontSwitch;
     private SwitchCompat imperialSwitch;
+    private SwitchCompat colorBlindMode;
     private Refreshable refreshable;
 
     @Override
@@ -42,6 +46,7 @@ public class SettingsFragment extends Fragment {
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         editor = getContext().getSharedPreferences("Settings", Context.MODE_PRIVATE).edit();
+
     }
 
     @Override
@@ -94,17 +99,37 @@ public class SettingsFragment extends Fragment {
             if(fontSwitch.isChecked())
             {
                 requireActivity().setTheme(R.style.Theme_NextLocationBig);
-                editor.putBoolean("fontSwitch",true);
-                editor.apply();
             }
             if(!fontSwitch.isChecked())
             {
-                requireActivity().setTheme(R.style.Theme_NextLocation);
-                editor.putBoolean("fontSwitch",false);
-                editor.apply();
+                requireActivity().setTheme(R.style.Theme_NextLocation);;
             }
+            editor.putBoolean("fontSwitch",fontSwitch.isChecked());
+            editor.apply();
             editor.commit();
         });
+
+        this.colorBlindMode = view.findViewById(R.id.colourblindSwitch);
+        this.colorBlindMode.setChecked(sharedPreferences.getBoolean("colorBlindModeSwitch", false));
+
+        this.colorBlindMode.setOnClickListener(view1 -> {
+            editor.putBoolean("colorBlindModeSwitch", colorBlindMode.isChecked());
+            editor.apply();
+            editor.commit();
+
+            if (colorBlindMode.isChecked()){
+                requireActivity().setTheme(R.style.Theme_NextLocation);
+                AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
+                getActivity().recreate();
+                System.out.println("AAN");
+            }else if (!colorBlindMode.isChecked()){
+                requireActivity().setTheme(R.style.Theme_NextLocation);
+                AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
+                getActivity().recreate();
+                System.out.println("UIT");
+            }
+
+        });
     }
 
     private void initializeLanguageDropdown(View view) {

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

@@ -79,7 +79,7 @@ public class StatisticFragment extends Fragment {
 
     private void initializeDistanceTextView(View view){
         distance = view.findViewById(R.id.statistics_km);
-        double dist = Double.parseDouble(getContext().getSharedPreferences("Data", Context.MODE_PRIVATE).getString("distanceTraveled", "0")) /1000;
+        double dist = Data.INSTANCE.getDistanceTraveled()/1000;
         if (getContext().getSharedPreferences("Settings", Context.MODE_PRIVATE).getBoolean("imperialSwitch", false))
             distance.setText(""  + String.format("%.1f",dist * 0.621371) + " mi");
         else

app/src/main/java/com/a1/nextlocation/geofencing/GeoFenceBroadcastReceiver.java

@@ -1,61 +0,0 @@
-package com.a1.nextlocation.geofencing;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.util.Log;
-
-import com.a1.nextlocation.data.Data;
-import com.a1.nextlocation.data.Location;
-import com.a1.nextlocation.recyclerview.LocationListManager;
-import com.google.android.gms.location.Geofence;
-import com.google.android.gms.location.GeofenceStatusCodes;
-import com.google.android.gms.location.GeofencingEvent;
-
-import java.util.List;
-
-/**
- * broadcast receiver for geofence events
- */
-public class GeoFenceBroadcastReceiver extends BroadcastReceiver {
-    private final String TAG = GeoFenceBroadcastReceiver.class.getCanonicalName();
-
-    @Override
-    public void onReceive(Context context, Intent intent) {
-
-        GeofencingEvent geofencingEvent = GeofencingEvent.fromIntent(intent);
-        Log.i(TAG, "onReceive: RECEIVED GEOFENCE STUFF");
-
-        if (geofencingEvent.hasError()) {
-            String errorMessage = GeofenceStatusCodes
-                    .getStatusCodeString(geofencingEvent.getErrorCode());
-            Log.e(TAG, errorMessage);
-            return;
-        }
-
-        // Get the transition type.
-        int geofenceTransition = geofencingEvent.getGeofenceTransition();
-
-        switch (geofenceTransition) {
-            case Geofence.GEOFENCE_TRANSITION_ENTER:
-                List<Geofence> geofenceList = geofencingEvent.getTriggeringGeofences();
-                // loop through list of geofences
-                for (Geofence geofence : geofenceList) {
-                    for (Location l : LocationListManager.INSTANCE.getLocationList()) {
-                        if (geofence.getRequestId().equals(l.getName())) {
-                            l.setVisited(true);
-                            // let the homefragment know that we are close to a location
-                            Data.INSTANCE.getLocationProximityListener().onLocationVisited(l);
-                            Log.d(TAG, "onReceive: VISITED LOCATION " + l.getName());
-                            break;
-                        }
-                    }
-                }
-
-                break;
-            case Geofence.GEOFENCE_TRANSITION_EXIT:
-                Log.d(TAG, "onReceive: exiting geofence...");
-                break;
-        }
-    }
-}

app/src/main/java/com/a1/nextlocation/geofencing/GeoFencingHelper.java

@@ -1,51 +0,0 @@
-package com.a1.nextlocation.geofencing;
-
-import android.app.PendingIntent;
-import android.content.Context;
-import android.content.ContextWrapper;
-import android.content.Intent;
-import android.provider.SyncStateContract;
-
-import com.google.android.gms.location.Geofence;
-import com.google.android.gms.location.GeofencingRequest;
-
-import org.osmdroid.util.GeoPoint;
-
-public class GeoFencingHelper extends ContextWrapper {
-    private PendingIntent pendingIntent;
-
-    public GeoFencingHelper(Context base) {
-        super(base);
-    }
-
-    public GeofencingRequest getGeoFencingRequest(Geofence geofence) {
-        GeofencingRequest.Builder builder = new GeofencingRequest.Builder();
-        builder.setInitialTrigger(GeofencingRequest.INITIAL_TRIGGER_ENTER);
-        builder.addGeofence(geofence);
-        return builder.build();
-
-    }
-
-    public Geofence getGeofence(String ID, GeoPoint point, float radius) {
-
-        return new Geofence.Builder()
-                .setCircularRegion(point.getLatitude(), point.getLongitude(), radius)
-                .setRequestId(ID)
-                .setTransitionTypes(Geofence.GEOFENCE_TRANSITION_ENTER |
-                        Geofence.GEOFENCE_TRANSITION_EXIT)
-                .setLoiteringDelay(5000)
-                .setExpirationDuration(Geofence.NEVER_EXPIRE)
-                .build();
-    }
-
-    public PendingIntent getPendingIntent() {
-        if (pendingIntent != null) {
-            return pendingIntent;
-        }
-
-        Intent intent = new Intent(this, GeoFenceBroadcastReceiver.class);
-        pendingIntent = PendingIntent.getBroadcast(this, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT);
-
-        return pendingIntent;
-    }
-}

app/src/main/java/com/a1/nextlocation/geofencing/GeofenceInitalizer.java

@@ -1,109 +0,0 @@
-package com.a1.nextlocation.geofencing;
-
-import android.Manifest;
-import android.app.Activity;
-import android.app.PendingIntent;
-import android.content.Context;
-import android.content.pm.PackageManager;
-import android.os.Build;
-import android.util.Log;
-
-import androidx.annotation.NonNull;
-import androidx.core.app.ActivityCompat;
-import androidx.core.content.ContextCompat;
-
-import com.a1.nextlocation.data.Data;
-import com.a1.nextlocation.data.Location;
-import com.a1.nextlocation.recyclerview.LocationListManager;
-import com.google.android.gms.location.Geofence;
-import com.google.android.gms.location.GeofencingClient;
-import com.google.android.gms.location.GeofencingRequest;
-import com.google.android.gms.location.LocationServices;
-import com.google.android.gms.tasks.OnFailureListener;
-import com.google.android.gms.tasks.OnSuccessListener;
-
-import org.osmdroid.util.GeoPoint;
-
-import java.util.List;
-
-import static android.content.ContentValues.TAG;
-
-public class GeofenceInitalizer {
-    private final Activity activity;
-    private GeofencingClient geofencingClient;
-    private GeoFencingHelper geoFencingHelper;
-    private final Context context;
-    private final String TAG = GeofenceInitalizer.class.getCanonicalName();
-    private List<Location> locations;
-    private int BACKGROUND_LOCATION_ACCESS_REQUEST_CODE = 10002;
-
-    public GeofenceInitalizer(Context context, Activity activity) {
-        this.context = context;
-        this.activity = activity;
-    }
-
-    public void init(List<Location> locations) {
-        if (!checkFineLocationPermission()) return;
-
-        geofencingClient = LocationServices.getGeofencingClient(context);
-        geoFencingHelper = new GeoFencingHelper(context);
-        this.locations = locations;
-        if (Build.VERSION.SDK_INT >= 29) {
-            //If API is higher then 29 we need background permission
-
-            if (ContextCompat.checkSelfPermission(context, Manifest.permission.ACCESS_BACKGROUND_LOCATION) == PackageManager.PERMISSION_GRANTED) {
-                addFences();
-            } else {
-                //Permission is not granted!! Need to request it..
-                if (ActivityCompat.shouldShowRequestPermissionRationale(activity, Manifest.permission.ACCESS_BACKGROUND_LOCATION)) {
-                    //We show a dialog and ask for permission
-                    ActivityCompat.requestPermissions(activity, new String[]{Manifest.permission.ACCESS_BACKGROUND_LOCATION}, BACKGROUND_LOCATION_ACCESS_REQUEST_CODE);
-                } else {
-                    ActivityCompat.requestPermissions(activity, new String[]{Manifest.permission.ACCESS_BACKGROUND_LOCATION}, BACKGROUND_LOCATION_ACCESS_REQUEST_CODE);
-
-                }
-            }
-        } else {
-            addFences();
-        }
-    }
-
-    private void addFences() {
-        for (Location location : locations) {
-            GeoPoint t = new GeoPoint(location.getLat(), location.getLong());
-            addGeofence(t, location.getName());
-        }
-    }
-
-    public void removeGeoFences() {
-        geofencingClient = LocationServices.getGeofencingClient(context);
-        geoFencingHelper = new GeoFencingHelper(context);
-
-        PendingIntent pendingIntent = geoFencingHelper.getPendingIntent();
-
-        geofencingClient.removeGeofences(pendingIntent)
-                .addOnSuccessListener(aVoid -> Log.d(TAG, "Geofence is removed... "))
-                .addOnFailureListener(e -> Log.d(TAG, e.getLocalizedMessage()));
-        if (this.locations != null) this.locations.clear();
-
-    }
-
-    private void addGeofence(GeoPoint p, String name) {
-        if (!checkFineLocationPermission()) return;
-
-        Geofence geofence = geoFencingHelper.getGeofence(name, p, 45);
-        GeofencingRequest geofencingRequest = geoFencingHelper.getGeoFencingRequest(geofence);
-        PendingIntent pendingIntent = geoFencingHelper.getPendingIntent();
-
-        geofencingClient.addGeofences(geofencingRequest, pendingIntent).addOnSuccessListener(v -> {
-            Log.i(TAG, "addGeofence: added geofence");
-        }).addOnFailureListener(v -> {
-            Log.e(TAG, "addGeofence: failure adding geofence " + v.getMessage());
-        });
-        Log.i(TAG, "addGeofence: added geofence to client");
-    }
-
-    private boolean checkFineLocationPermission() {
-        return ActivityCompat.checkSelfPermission(context, Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED;
-    }
-}

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

@@ -6,7 +6,8 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:background="@color/primaryColour"
     android:id="@+id/settingFragment"
-    tools:context=".fragments.SettingsFragment">
+    tools:context=".fragments.SettingsFragment"
+    android:theme="@style/Theme.Switches">
 
     <androidx.appcompat.widget.AppCompatImageButton
         android:id="@+id/settings_back_button"
@@ -31,6 +32,16 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
+
+    <View
+        android:layout_width="0dp"
+        android:layout_height="74dp"
+        app:layout_constraintTop_toTopOf="@id/name_box"
+        app:layout_constraintBottom_toBottomOf="@id/name_box"
+        app:layout_constraintLeft_toLeftOf="@id/name_box"
+        app:layout_constraintRight_toRightOf="@id/name_box"
+        android:background="@color/secondaryColour"/>
+
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/name_box"
         android:layout_width="match_parent"
@@ -41,7 +52,6 @@
         app:layout_constraintTop_toBottomOf="@id/textView"
         android:background="@color/primaryColour"
         android:layout_marginHorizontal="20dp"
-
         >
 
         <TextView
@@ -57,7 +67,7 @@
 
         <View
             android:id="@+id/Balk"
-            android:layout_width="1dp"
+            android:layout_width="2dp"
             android:layout_height="match_parent"
             android:background="@color/secondaryColour"
             app:layout_constraintBottom_toBottomOf="parent"
@@ -79,6 +89,16 @@
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
+
+    <View
+        android:layout_width="0dp"
+        android:layout_height="74dp"
+        app:layout_constraintTop_toTopOf="@id/Box2"
+        app:layout_constraintBottom_toBottomOf="@id/Box2"
+        app:layout_constraintLeft_toLeftOf="@id/Box2"
+        app:layout_constraintRight_toRightOf="@id/Box2"
+        android:background="@color/secondaryColour"/>
+
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/Box2"
         android:layout_width="match_parent"
@@ -105,9 +125,9 @@
 
         <View
             android:id="@+id/Balk2"
-            android:layout_width="1dp"
+            android:layout_width="2dp"
             android:layout_height="match_parent"
-            android:background="@color/buttonColour"
+            android:background="@color/secondaryColour"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -126,13 +146,22 @@
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
+    <View
+        android:layout_width="0dp"
+        android:layout_height="74dp"
+        app:layout_constraintTop_toTopOf="@id/Box3"
+        app:layout_constraintBottom_toBottomOf="@id/Box3"
+        app:layout_constraintLeft_toLeftOf="@id/Box3"
+        app:layout_constraintRight_toRightOf="@id/Box3"
+        android:background="@color/secondaryColour"/>
+
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/Box3"
         android:layout_width="match_parent"
         android:layout_height="70dp"
         android:layout_marginHorizontal="20dp"
         android:background="@color/primaryColour"
-        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintBottom_toTopOf="@id/Box4"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/Box2"
@@ -151,9 +180,9 @@
 
         <View
             android:id="@+id/Balk3"
-            android:layout_width="1dp"
+            android:layout_width="2dp"
             android:layout_height="match_parent"
-            android:background="@color/black"
+            android:background="@color/secondaryColour"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -168,6 +197,61 @@
             app:layout_constraintStart_toStartOf="@id/Balk3"
             app:layout_constraintTop_toTopOf="parent" />
 
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+    <View
+        android:layout_width="0dp"
+        android:layout_height="74dp"
+        app:layout_constraintTop_toTopOf="@id/Box4"
+        app:layout_constraintBottom_toBottomOf="@id/Box4"
+        app:layout_constraintLeft_toLeftOf="@id/Box4"
+        app:layout_constraintRight_toRightOf="@id/Box4"
+        android:background="@color/secondaryColour"/>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/Box4"
+        android:layout_width="match_parent"
+        android:layout_height="70dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/Box3"
+        android:background="@color/primaryColour"
+        android:layout_marginHorizontal="20dp"
+        >
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/colorblind"
+            android:textColor="@color/secondaryColour"
+            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="2dp"
+            android:layout_height="match_parent"
+            android:background="@color/secondaryColour"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            />
+
+        <androidx.appcompat.widget.SwitchCompat
+            android:id="@+id/colourblindSwitch"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            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>
 

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

@@ -20,6 +20,15 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
+    <View
+        android:layout_width="0dp"
+        android:layout_height="74dp"
+        app:layout_constraintTop_toTopOf="@id/name_box"
+        app:layout_constraintBottom_toBottomOf="@id/name_box"
+        app:layout_constraintLeft_toLeftOf="@id/name_box"
+        app:layout_constraintRight_toRightOf="@id/name_box"
+        android:background="@color/secondaryColour"/>
+
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/name_box"
         android:layout_width="match_parent"
@@ -46,7 +55,7 @@
 
         <View
             android:id="@+id/Balk"
-            android:layout_width="1dp"
+            android:layout_width="2dp"
             android:layout_height="match_parent"
             android:background="@color/secondaryColour"
             app:layout_constraintBottom_toBottomOf="parent"
@@ -69,6 +78,15 @@
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
+    <View
+        android:layout_width="0dp"
+        android:layout_height="74dp"
+        app:layout_constraintTop_toTopOf="@id/Box2"
+        app:layout_constraintBottom_toBottomOf="@id/Box2"
+        app:layout_constraintLeft_toLeftOf="@id/Box2"
+        app:layout_constraintRight_toRightOf="@id/Box2"
+        android:background="@color/secondaryColour"/>
+
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/Box2"
         android:layout_width="match_parent"
@@ -95,7 +113,7 @@
 
         <View
             android:id="@+id/Balk2"
-            android:layout_width="1dp"
+            android:layout_width="2dp"
             android:layout_height="match_parent"
             android:background="@color/secondaryColour"
             app:layout_constraintBottom_toBottomOf="parent"
@@ -118,6 +136,15 @@
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
+    <View
+        android:layout_width="0dp"
+        android:layout_height="74dp"
+        app:layout_constraintTop_toTopOf="@id/Box3"
+        app:layout_constraintBottom_toBottomOf="@id/Box3"
+        app:layout_constraintLeft_toLeftOf="@id/Box3"
+        app:layout_constraintRight_toRightOf="@id/Box3"
+        android:background="@color/secondaryColour"/>
+
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/Box3"
         android:layout_width="match_parent"
@@ -142,7 +169,7 @@
 
         <View
             android:id="@+id/Balk3"
-            android:layout_width="1dp"
+            android:layout_width="2dp"
             android:layout_height="match_parent"
             android:background="@color/secondaryColour"
             app:layout_constraintBottom_toBottomOf="parent"
@@ -165,6 +192,15 @@
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
+    <View
+        android:layout_width="0dp"
+        android:layout_height="74dp"
+        app:layout_constraintTop_toTopOf="@id/Box4"
+        app:layout_constraintBottom_toBottomOf="@id/Box4"
+        app:layout_constraintLeft_toLeftOf="@id/Box4"
+        app:layout_constraintRight_toRightOf="@id/Box4"
+        android:background="@color/secondaryColour"/>
+
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/Box4"
         android:layout_width="match_parent"
@@ -191,7 +227,7 @@
 
         <View
             android:id="@+id/Balk4"
-            android:layout_width="1dp"
+            android:layout_width="2dp"
             android:layout_height="match_parent"
             android:background="@color/secondaryColour"
             app:layout_constraintBottom_toBottomOf="parent"

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

@@ -8,6 +8,24 @@
     android:id="@+id/locationItem"
     android:layout_margin="20dp">
 
+    <View
+        android:layout_width="0dp"
+        android:layout_height="54dp"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        android:background="@color/secondaryColour"/>
+
+    <View
+        android:layout_width="0dp"
+        android:layout_height="46dp"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        android:background="@color/primaryColour"/>
+
     <ImageView
         android:id="@+id/location_image"
         android:layout_width="50dp"

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

@@ -8,6 +8,24 @@
     android:id="@+id/routeItem"
     android:layout_margin="20dp">
 
+    <View
+        android:layout_width="0dp"
+        android:layout_height="54dp"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        android:background="@color/secondaryColour"/>
+
+    <View
+        android:layout_width="0dp"
+        android:layout_height="46dp"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        android:background="@color/primaryColour"/>
+
     <ImageView
         android:layout_width="50dp"
         android:layout_height="50dp"

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

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="purple_200">#FFBB86FC</color>
+    <color name="purple_500">#FF6200EE</color>
+    <color name="purple_700">#FF3700B3</color>
+    <color name="teal_200">#FF03DAC5</color>
+    <color name="teal_700">#FF018786</color>
+    <color name="black">#FF000000</color>
+    <color name="white">#FFFFFFFF</color>
+    <color name="primaryColour">#FF115571</color>
+    <color name="secondaryColour">#FF31AFB4</color>
+    <color name="buttonColour">#FF14212D</color>
+    <color name="red">#FF0000</color>
+</resources>

app/src/main/res/values-night/themes.xml

@@ -2,15 +2,28 @@
     <!-- Base application theme. -->
     <style name="Theme.NextLocation" parent="Theme.MaterialComponents.DayNight.NoActionBar">
         <!-- Primary brand color. -->
-        <item name="colorPrimary">@color/purple_200</item>
-        <item name="colorPrimaryVariant">@color/purple_700</item>
-        <item name="colorOnPrimary">@color/black</item>
+        <item name="colorPrimary">@color/primaryColour</item>
         <!-- Secondary brand color. -->
-        <item name="colorSecondary">@color/teal_200</item>
-        <item name="colorSecondaryVariant">@color/teal_200</item>
-        <item name="colorOnSecondary">@color/black</item>
-        <!-- Status bar color. -->
-        <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
+        <item name="colorSecondary">@color/secondaryColour</item>
         <!-- Customize your theme here. -->
+        <item name="colorButtonNormal">@color/buttonColour</item>
+        <item name="colorPrimaryDark">@color/secondaryColour</item>
+        <item name="android:textSize">16sp</item>
+    </style>
+
+    <style name="Theme.Switches" parent="Theme.MaterialComponents.DayNight.NoActionBar">
+        <item name="colorControlActivated">@color/buttonColour</item>
+        <item name="colorSwitchThumbNormal">@color/primaryColour</item>
+    </style>
+
+    <style name="Theme.NextLocationBig" parent="Theme.MaterialComponents.DayNight.NoActionBar">
+        <!-- Primary brand color. -->
+        <item name="colorPrimary">@color/primaryColour</item>
+        <!-- Secondary brand color. -->
+        <item name="colorSecondary">@color/secondaryColour</item>
+        <!-- Customize your theme here. -->
+        <item name="colorButtonNormal">@color/buttonColour</item>
+        <item name="colorPrimaryDark">@color/secondaryColour</item>
+        <item name="android:textSize">24sp</item>
     </style>
 </resources>

app/src/main/res/values-nl/strings.xml

@@ -26,6 +26,4 @@
     <string name="Chinese">Chinees</string>
     <string name="help">HELP</string>
     <string name="help_discription">Onderaan het scherm zijn verschillende knoppen te zien. Deze knoppen hebben de volgende functies: \n\nLocaties: toont een lijst met alle locaties die bezocht kunnen worden. Elke locatie wordt kort beschreven. \n\nRoutes: Toont een lijst met alle routes die gelopen kunnen worden. Van elke route wordt een omschrijving gegeven. \n\nStatistieken: Toont persoonlijke statistieken.  \n\nInstellingen: Hier kunnen app-instellingen worden aangepast naar eigen voorkeur. \n\nEen locatie ingedrukt houden laat extra informatie zien over de gekozen locatie</string>
-    <string name="notification_title">Je bent dicht bij een locatie!</string>
-    <string name="notification_text">Je bent bijna bij %1$s</string>
 </resources>

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

@@ -11,4 +11,7 @@
     <color name="secondaryColour">#FF000000</color>
     <color name="buttonColour">#FF000000</color>
     <color name="red">#FF0000</color>
+    <color name="primaryColourCB">#FF115571</color>
+    <color name="secondaryColourCB">#FF31AFB4</color>
+    <color name="buttonColourCB">#FF14212D</color>
 </resources>

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

@@ -25,6 +25,4 @@
     <string name="Chinese">Chinese</string>
     <string name="help">HELP</string>
     <string name="help_discription">Hasn\'t been translated yet</string>
-    <string name="notification_title">You\'re close to a location!</string>
-    <string name="notification_text">You\'re almost at %1$s</string>
 </resources>

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

@@ -11,6 +11,11 @@
         <item name="android:textSize">16sp</item>
     </style>
 
+    <style name="Theme.Switches" parent="Theme.MaterialComponents.DayNight.NoActionBar">
+        <item name="colorControlActivated">@color/buttonColour</item>
+        <item name="colorSwitchThumbNormal">@color/primaryColour</item>
+    </style>
+
     <style name="Theme.NextLocationBig" parent="Theme.MaterialComponents.DayNight.NoActionBar">
         <!-- Primary brand color. -->
         <item name="colorPrimary">@color/primaryColour</item>
@@ -21,4 +26,7 @@
         <item name="colorPrimaryDark">@color/secondaryColour</item>
         <item name="android:textSize">24sp</item>
     </style>
+
+
+
 </resources>