sem/Next-Location
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity

Compare commits

base: sem:fuckcolours
Branches Tags
sem:main sem:develop sem:ButtonFix sem:CosmeticFixes sem:routeFragmentDetail sem:Locaitegezeik sem:fuckcolours sem:saveDataMA8 sem:geofence sem:imperial-system sem:languages sem:follow-route sem:route_detail sem:helpPopup sem:Tests sem:RecyclerView sem:display-route sem:couponPopup sem:directions-api sem:LocationCreation sem:Fragment sem:data sem:bottomNavigation
sem:v2.0 sem:v1.2 sem:v1.1 sem:v1.0
..
compare: sem:geofence
Branches Tags
sem:main sem:develop sem:ButtonFix sem:CosmeticFixes sem:routeFragmentDetail sem:Locaitegezeik sem:fuckcolours sem:saveDataMA8 sem:geofence sem:imperial-system sem:languages sem:follow-route sem:route_detail sem:helpPopup sem:Tests sem:RecyclerView sem:display-route sem:couponPopup sem:directions-api sem:LocationCreation sem:Fragment sem:data sem:bottomNavigation
sem:v2.0 sem:v1.2 sem:v1.1 sem:v1.0

2 Commits
fuckcolour ... geofence

Author SHA1 Message Date
Sem van der Hoeven
5544da5d2e add geofencing 2021-01-12 13:22:00 +01:00
Sem van der Hoeven
e286929b77 added geofencing stuff 2021-01-12 11:12:28 +01:00
29 changed files with 377 additions and 298 deletions
Expand all files Collapse all files

2
app/build.gradle
View File

@@ -40,8 +40,10 @@ 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'

5
app/src/main/AndroidManifest.xml
View File

@@ -25,6 +25,11 @@
<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>

1
app/src/main/java/com/a1/nextlocation/MainActivity.java
View File

@@ -8,7 +8,6 @@ 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;

14
app/src/main/java/com/a1/nextlocation/data/Data.java
View File

@@ -11,6 +11,15 @@ public enum Data {
private int locationsVisited = 0;
private long totalTime = 0;
private double zoom = 0;
private LocationProximityListener locationProximityListener;
public LocationProximityListener getLocationProximityListener() {
return locationProximityListener;
}
public void setLocationProximityListener(LocationProximityListener locationProximityListener) {
this.locationProximityListener = locationProximityListener;
}
public double getZoom() {
return zoom;
@@ -50,5 +59,10 @@ public enum Data {
return locationsVisited;
}
@FunctionalInterface
public interface LocationProximityListener {
void onLocationVisited(Location location);
}
}

10
app/src/main/java/com/a1/nextlocation/data/Location.java
View File

@@ -25,6 +25,8 @@ 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;
@@ -171,4 +173,12 @@ public class Location implements Parcelable {
parcel.writeString(description);
parcel.writeString(imageUrl);
}
public boolean isVisited() {
return visited;
}
public void setVisited(boolean visited) {
this.visited = visited;
}
}

53
app/src/main/java/com/a1/nextlocation/fragments/HomeFragment.java
View File

@@ -2,6 +2,8 @@ package com.a1.nextlocation.fragments;
import android.Manifest;
import android.app.NotificationChannel;
import android.app.NotificationManager;
import android.content.Context;
import android.content.pm.PackageManager;
import android.graphics.drawable.Drawable;
@@ -19,6 +21,7 @@ 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;
@@ -26,6 +29,7 @@ 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;
@@ -60,6 +64,8 @@ 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) {
@@ -71,6 +77,7 @@ public class HomeFragment extends Fragment implements LocationListener {
Manifest.permission.WRITE_EXTERNAL_STORAGE);
color = requireContext().getColor(R.color.red);
Data.INSTANCE.setLocationProximityListener(this::onLocationVisited);
}
@Override
@@ -141,6 +148,7 @@ 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);
}
@@ -217,6 +225,8 @@ public class HomeFragment extends Fragment implements LocationListener {
}
/**
* displays the route that is currently being followed as a red line
*/
@@ -245,11 +255,12 @@ 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);
marker.setAlpha(255);
marker.setTint(getResources().getColor(R.color.secondaryColour));
marker.setTint(getResources().getColor(R.color.primaryColour));
// add all locations to the overlay itemss
for (com.a1.nextlocation.data.Location location : locations) {
@@ -299,6 +310,19 @@ 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);
}
/**
@@ -365,6 +389,33 @@ 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

35
app/src/main/java/com/a1/nextlocation/fragments/SettingsFragment.java
View File

@@ -5,7 +5,6 @@ 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;
@@ -14,13 +13,11 @@ 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;
@@ -32,7 +29,6 @@ public class SettingsFragment extends Fragment {
private SharedPreferences.Editor editor;
private SwitchCompat fontSwitch;
private SwitchCompat imperialSwitch;
private SwitchCompat colorBlindMode;
private Refreshable refreshable;
@Override
@@ -46,7 +42,6 @@ public class SettingsFragment extends Fragment {
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
editor = getContext().getSharedPreferences("Settings", Context.MODE_PRIVATE).edit();
}
@Override
@@ -99,36 +94,16 @@ 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",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");
editor.putBoolean("fontSwitch",false);
editor.apply();
}
editor.commit();
});
}

58
app/src/main/java/com/a1/nextlocation/geofencing/GeoFenceBroadcastReceiver.java Normal file
View File

@@ -0,0 +1,58 @@
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;
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;
}
}
}

51
app/src/main/java/com/a1/nextlocation/geofencing/GeoFencingHelper.java Normal file
View File

@@ -0,0 +1,51 @@
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;
}
}

109
app/src/main/java/com/a1/nextlocation/geofencing/GeofenceInitalizer.java Normal file
View File

@@ -0,0 +1,109 @@
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;
}
}

2
app/src/main/res/drawable-anydpi/ic_stop_icon.xml
View File

@@ -6,7 +6,7 @@
android:tint="#333333"
android:alpha="0.6">
<path
android:fillColor="@color/primaryColour"
android:fillColor="@android:color/white"
android:pathData="M8,16h8V8H8V16zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10s10,-4.48 10,-10S17.52,2 12,2L12,2z"
android:fillType="evenOdd"/>
</vector>

2
app/src/main/res/drawable/ic_baseline_location_on_24.xml
View File

@@ -5,6 +5,6 @@
android:viewportHeight="24"
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@color/secondaryColour"
android:fillColor="@color/primaryColour"
android:pathData="M12,2C8.13,2 5,5.13 5,9c0,5.25 7,13 7,13s7,-7.75 7,-13c0,-3.87 -3.13,-7 -7,-7zM12,11.5c-1.38,0 -2.5,-1.12 -2.5,-2.5s1.12,-2.5 2.5,-2.5 2.5,1.12 2.5,2.5 -1.12,2.5 -2.5,2.5z"/>
</vector>

4
app/src/main/res/layout/activity_main.xml
View File

@@ -22,9 +22,9 @@
android:id="@+id/navigation_bar"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:background="@color/primaryColour"
android:background="@color/white"
app:itemIconTint="@color/secondaryColour"
app:itemTextColor="@color/secondaryColour"
app:itemTextColor="@color/primaryColour"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"

4
app/src/main/res/layout/coupon_item.xml
View File

@@ -13,7 +13,7 @@
android:layout_marginTop="16dp"
android:layout_marginBottom="16dp"
android:background="@color/primaryColour"
android:background="@color/secondaryColour"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.4"
@@ -26,7 +26,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
android:text=""
android:textColor="@color/secondaryColour"
android:textColor="@color/black"
android:textSize="20sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"

4
app/src/main/res/layout/fragment_home.xml
View File

@@ -24,7 +24,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:layout_marginEnd="20dp"
android:backgroundTint="@color/primaryColour"
android:backgroundTint="@color/secondaryColour"
android:src="@drawable/ic_baseline_outlined_flag_24"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@@ -37,7 +37,7 @@
android:layout_marginEnd="20dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/location_list_button"
android:backgroundTint="@color/primaryColour"
android:backgroundTint="@color/secondaryColour"
android:src="@drawable/ic_stop_icon"/>
</androidx.constraintlayout.widget.ConstraintLayout>

6
app/src/main/res/layout/fragment_location_detail.xml
View File

@@ -14,7 +14,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text=""
android:textColor="@color/secondaryColour"
android:textColor="@color/white"
android:textSize="30sp"
android:gravity="center"
app:layout_constraintEnd_toEndOf="parent"
@@ -35,7 +35,7 @@
android:layout_width="match_parent"
android:layout_height="200dp"
android:layout_margin="20dp"
android:background="@color/primaryColour"
android:background="@color/secondaryColour"
android:text=""
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -45,7 +45,7 @@
android:id="@+id/detail_location_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/primaryColour"
android:background="@color/secondaryColour"
android:text=""
/>
</ScrollView>

1
app/src/main/res/layout/fragment_route.xml
View File

@@ -19,7 +19,6 @@
<TextView
android:id="@+id/route_title"
android:textColor="@color/secondaryColour"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="9dp"

7
app/src/main/res/layout/fragment_route_detail.xml
View File

@@ -45,7 +45,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="20dp"
android:textColor="@color/secondaryColour"
android:layout_marginTop="20dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.6"
@@ -59,7 +58,7 @@
android:layout_marginBottom="45dp"
android:backgroundTint="@color/secondaryColour"
android:text="@string/start_route"
android:textColor="@color/primaryColour"
android:textColor="@color/buttonColour"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.498"
@@ -71,9 +70,9 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:background="@color/primaryColour"
android:background="@color/secondaryColour"
android:text="@string/total_distance"
android:textColor="@color/secondaryColour"
android:textColor="@color/buttonColour"
app:layout_constraintBottom_toTopOf="@+id/start_route_button"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.498"

116
app/src/main/res/layout/fragment_settings.xml
View File

@@ -6,8 +6,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:background="@color/primaryColour"
android:id="@+id/settingFragment"
tools:context=".fragments.SettingsFragment"
android:theme="@style/Theme.Switches">
tools:context=".fragments.SettingsFragment">
<androidx.appcompat.widget.AppCompatImageButton
android:id="@+id/settings_back_button"
@@ -26,22 +25,12 @@
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:text="@string/settings"
android:textColor="@color/secondaryColour"
android:textColor="@color/white"
android:textSize="30sp"
app:layout_constraintEnd_toEndOf="parent"
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"
@@ -50,15 +39,16 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/textView"
android:background="@color/primaryColour"
android:background="@color/secondaryColour"
android:layout_marginHorizontal="20dp"
>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/language"
android:textColor="@color/secondaryColour"
android:textColor="@color/black"
android:textSize="20sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@id/Balk"
@@ -67,9 +57,9 @@
<View
android:id="@+id/Balk"
android:layout_width="2dp"
android:layout_width="1dp"
android:layout_height="match_parent"
android:background="@color/secondaryColour"
android:background="@color/black"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -89,22 +79,12 @@
</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"
android:layout_height="70dp"
android:layout_marginHorizontal="20dp"
android:background="@color/primaryColour"
android:background="@color/secondaryColour"
app:layout_constraintBottom_toTopOf="@id/Box3"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -116,7 +96,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/imperial_system"
android:textColor="@color/secondaryColour"
android:textColor="@color/black"
android:textSize="20sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@id/Balk2"
@@ -125,9 +105,9 @@
<View
android:id="@+id/Balk2"
android:layout_width="2dp"
android:layout_width="1dp"
android:layout_height="match_parent"
android:background="@color/secondaryColour"
android:background="@color/black"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -146,22 +126,13 @@
</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_toTopOf="@id/Box4"
android:background="@color/secondaryColour"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/Box2"
@@ -171,7 +142,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/_65_mode"
android:textColor="@color/secondaryColour"
android:textColor="@color/black"
android:textSize="20sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@id/Balk3"
@@ -180,9 +151,9 @@
<View
android:id="@+id/Balk3"
android:layout_width="2dp"
android:layout_width="1dp"
android:layout_height="match_parent"
android:background="@color/secondaryColour"
android:background="@color/black"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -197,61 +168,6 @@
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>

78
app/src/main/res/layout/fragment_statistic.xml
View File

@@ -14,27 +14,18 @@
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:text="@string/statistics"
android:textColor="@color/secondaryColour"
android:textColor="@color/white"
android:textSize="30sp"
app:layout_constraintEnd_toEndOf="parent"
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"
android:layout_height="70dp"
android:layout_marginHorizontal="20dp"
android:background="@color/primaryColour"
android:background="@color/secondaryColour"
app:layout_constraintBottom_toTopOf="@id/Box2"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -46,7 +37,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/total_distance"
android:textColor="@color/secondaryColour"
android:textColor="@color/black"
android:textSize="20sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@id/Balk"
@@ -55,9 +46,9 @@
<View
android:id="@+id/Balk"
android:layout_width="2dp"
android:layout_width="1dp"
android:layout_height="match_parent"
android:background="@color/secondaryColour"
android:background="@color/black"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -68,7 +59,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text=""
android:textColor="@color/secondaryColour"
android:textColor="@color/black"
android:textSize="20sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
@@ -78,21 +69,12 @@
</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"
android:layout_height="70dp"
android:layout_marginHorizontal="20dp"
android:background="@color/primaryColour"
android:background="@color/secondaryColour"
app:layout_constraintBottom_toTopOf="@id/Box3"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -104,7 +86,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/visited_locations"
android:textColor="@color/secondaryColour"
android:textColor="@color/black"
android:textSize="20sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@id/Balk2"
@@ -113,9 +95,9 @@
<View
android:id="@+id/Balk2"
android:layout_width="2dp"
android:layout_width="1dp"
android:layout_height="match_parent"
android:background="@color/secondaryColour"
android:background="@color/black"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -126,7 +108,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text=""
android:textColor="@color/secondaryColour"
android:textColor="@color/black"
android:textSize="20sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
@@ -136,21 +118,12 @@
</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"
android:background="@color/secondaryColour"
app:layout_constraintBottom_toTopOf="@id/Box4"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -160,7 +133,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/total_time"
android:textColor="@color/secondaryColour"
android:textColor="@color/black"
android:textSize="20sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@id/Balk3"
@@ -169,9 +142,9 @@
<View
android:id="@+id/Balk3"
android:layout_width="2dp"
android:layout_width="1dp"
android:layout_height="match_parent"
android:background="@color/secondaryColour"
android:background="@color/black"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -182,7 +155,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text=""
android:textColor="@color/secondaryColour"
android:textColor="@color/black"
android:textSize="20sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
@@ -192,21 +165,12 @@
</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"
android:layout_marginHorizontal="20dp"
android:background="@color/primaryColour"
android:background="@color/secondaryColour"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.85"
@@ -218,7 +182,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/coupons_collected"
android:textColor="@color/secondaryColour"
android:textColor="@color/black"
android:textSize="20sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@id/Balk4"
@@ -227,9 +191,9 @@
<View
android:id="@+id/Balk4"
android:layout_width="2dp"
android:layout_width="1dp"
android:layout_height="match_parent"
android:background="@color/secondaryColour"
android:background="@color/black"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -240,7 +204,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text=""
android:textColor="@color/secondaryColour"
android:textColor="@color/black"
android:textSize="20sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"

7
app/src/main/res/layout/help_popup.xml
View File

@@ -16,9 +16,9 @@
android:layout_width="300dp"
android:layout_height="50dp"
android:text="@string/help"
android:textColor="@color/secondaryColour"
android:textColor="@color/black"
android:textAlignment="center"
android:background="@color/primaryColour"
android:background="@color/secondaryColour"
android:paddingVertical="10dp"/>
<ScrollView
@@ -35,7 +35,7 @@
android:layout_width="280dp"
android:layout_height="430dp"
android:text="@string/help_discription"
android:textColor="@color/secondaryColour"
android:textColor="@color/white"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:layout_marginTop="10dp"
@@ -49,7 +49,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:backgroundTint="@color/buttonColour"
android:text="ok"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@+id/helpPopTitle" />

21
app/src/main/res/layout/location_item.xml
View File

@@ -4,28 +4,10 @@
android:layout_width="match_parent"
android:layout_height="50dp"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:background="@color/primaryColour"
android:background="@color/secondaryColour"
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"
@@ -43,7 +25,6 @@
android:layout_height="47dp"
android:layout_marginStart="5dp"
android:gravity="left"
android:textColor="@color/secondaryColour"
android:text=""
android:textSize="20sp"
app:layout_constraintBottom_toBottomOf="parent"

21
app/src/main/res/layout/route_item.xml
View File

@@ -4,28 +4,10 @@
android:layout_width="match_parent"
android:layout_height="50dp"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:background="@color/primaryColour"
android:background="@color/secondaryColour"
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"
@@ -39,7 +21,6 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center"
android:textColor="@color/secondaryColour"
android:text=""
android:textSize="20sp"
app:layout_constraintBottom_toBottomOf="parent"

14
app/src/main/res/values-night/colors.xml
View File

@@ -1,14 +0,0 @@
<?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>

29
app/src/main/res/values-night/themes.xml
View File

@@ -2,28 +2,15 @@
<!-- Base application theme. -->
<style name="Theme.NextLocation" parent="Theme.MaterialComponents.DayNight.NoActionBar">
<!-- Primary brand color. -->
<item name="colorPrimary">@color/primaryColour</item>
<item name="colorPrimary">@color/purple_200</item>
<item name="colorPrimaryVariant">@color/purple_700</item>
<item name="colorOnPrimary">@color/black</item>
<!-- Secondary brand color. -->
<item name="colorSecondary">@color/secondaryColour</item>
<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>
<!-- 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>

2
app/src/main/res/values-nl/strings.xml
View File

@@ -26,4 +26,6 @@
<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>

9
app/src/main/res/values/colors.xml
View File

@@ -7,11 +7,8 @@
<color name="teal_700">#FF018786</color>
<color name="black">#FF000000</color>
<color name="white">#FFFFFFFF</color>
<color name="primaryColour">#FFFFFFFF</color>
<color name="secondaryColour">#FF000000</color>
<color name="buttonColour">#FF000000</color>
<color name="primaryColour">#FF115571</color>
<color name="secondaryColour">#FF31AFB4</color>
<color name="buttonColour">#FF14212D</color>
<color name="red">#FF0000</color>
<color name="primaryColourCB">#FF115571</color>
<color name="secondaryColourCB">#FF31AFB4</color>
<color name="buttonColourCB">#FF14212D</color>
</resources>

2
app/src/main/res/values/strings.xml
View File

@@ -25,4 +25,6 @@
<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>

8
app/src/main/res/values/themes.xml
View File

@@ -11,11 +11,6 @@
<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>
@@ -26,7 +21,4 @@
<item name="colorPrimaryDark">@color/secondaryColour</item>
<item name="android:textSize">24sp</item>
</style>
</resources>