Merge pull request #5 from SemvdH/develop

Develop

app/build.gradle

@@ -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'

app/src/main/AndroidManifest.xml

@@ -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>

app/src/main/assets/locations-nl.json

@@ -2,84 +2,84 @@
   {
     "name":"McDonald's Breda Karnemelkstraat",
     "coordinates":"51.586058044064735, 4.775804729737406",
-    "description":"Wist je dat McDonald’s de grootste restaurantketen ter wereld is? Hierdoor hebben we een indrukwekkende geschiedenis. Maar wij kijken liever naar onze toekomst. Nieuwe restaurants, betere producten en duurzaam ondernemen.",
+    "description":"Wist je dat McDonald’s de grootste restaurantketen ter wereld is? Hierdoor hebben we een indrukwekkende geschiedenis. Maar wij kijken liever naar onze toekomst. Nieuwe restaurants, betere producten en duurzaam ondernemen.\n\nAdres:\tKaranemelkstraat 5\nOpeningstijden:\t11:00-23:00\nTelefoon:\t076 533 3000\nAfstand tot (m): ",
     "imageUrl":"mc_donalds",
     "iconUrl": "mcdonalds_icon"
   },
   {
     "name":"Subway Karnemelkstraat 10 A, 1",
     "coordinates":"51.586110268250046, 4.775124041110522",
-    "description":"Subway is een Amerikaanse multinationale fastfoodketen die voornamelijk sandwiches verkoopt. Het bedrijf onderscheidt zich van veel andere broodjeszaken doordat de klant zelf de sandwich kan laten samenstellen. Subway werkt met franchisenemers. Het bedrijf heeft bijna 45.000 vestigingen in alle werelddelen.",
+    "description":"Subway is een Amerikaanse multinationale fastfoodketen die voornamelijk sandwiches verkoopt. Het bedrijf onderscheidt zich van veel andere broodjeszaken doordat de klant zelf de sandwich kan laten samenstellen. Subway werkt met franchisenemers. Het bedrijf heeft bijna 45.000 vestigingen in alle werelddelen.\n\nAdres:\tKarnemelkstraat 10 A\nOpeningstijden:\t10:00-19:30\nTelefoon:\t076 521 4411\nAfstand tot: ",
     "imageUrl":"subway",
     "iconUrl": "subway_icon"
   },
   {
     "name":"Wok To Go Halstraat 40",
     "coordinates":"51.58648245586817, 4.77757540779623",
-    "description":"Bij Wok To Go houden we van snelle, gezonde en smaakvolle maaltijden. Sinds 2003 ontwikkelen onze chef-koks de lekkerste wokgerechten met verse ingrediënten. We doen dit vól overgave onder het motto “Making people happy through food”. Door het roerbakken – met een kleine hoeveelheid olie – op grote hitte, blijven de smaak en gezonde voedingsstoffen bewaard. We kiezen voor gezonde en unieke ingrediënten en bereiden uitgebalanceerde gerechten in een ‘Wokki box’ voor een gezonde levensstijl.",
+    "description":"Bij Wok To Go houden we van snelle, gezonde en smaakvolle maaltijden. Sinds 2003 ontwikkelen onze chef-koks de lekkerste wokgerechten met verse ingrediënten. We doen dit vól overgave onder het motto “Making people happy through food”. Door het roerbakken – met een kleine hoeveelheid olie – op grote hitte, blijven de smaak en gezonde voedingsstoffen bewaard. We kiezen voor gezonde en unieke ingrediënten en bereiden uitgebalanceerde gerechten in een ‘Wokki box’ voor een gezonde levensstijl.\n\nAdres:\tHalstraat 40\nOpeningstijden:\t12:30-21:00\nTelefoon:\t076 522 5643\nAfstand tot: ",
     "imageUrl":"wok_to_go",
     "iconUrl": "wok_icon"
   },
   {
     "name":"De Boterhal Grote Markt 19",
     "coordinates":"51.58798587092525, 4.776248508784696",
-    "description":"De Boterhal in Breda is een internationaal tapasrestaurant, speciaalbiercafé en wijnbar. Men kan gezellig bij ons lunchen, borrelen en dineren. Wij hebben een uitgebreide menukaart met een hele hoop bieren, wijnen, zowel per glas als per fles te verkrijgen, lunch en tapasgerechtjes. Naast het eten wat wij serveren hebben we ook een hoop bieren en wijnen. Naast de bieren op de kaart hebben wij wisselende bieren; vijf ketelbieren en vijf seizoensbieren.",
+    "description":"De Boterhal in Breda is een internationaal tapasrestaurant, speciaalbiercafé en wijnbar. Men kan gezellig bij ons lunchen, borrelen en dineren. Wij hebben een uitgebreide menukaart met een hele hoop bieren, wijnen, zowel per glas als per fles te verkrijgen, lunch en tapasgerechtjes. Naast het eten wat wij serveren hebben we ook een hoop bieren en wijnen. Naast de bieren op de kaart hebben wij wisselende bieren; vijf ketelbieren en vijf seizoensbieren.\n\nAdres:\tGrote Markt 19\nOpeningstijden:\t12:00-01:00\nTelefoon:\t076 889 8180\nAfstand tot: ",
     "imageUrl":"de_boter_hal",
     "iconUrl": "restaurant_icon"
   },
   {
     "name":"Gauchos Grote Markt 33",
     "coordinates":"51.588456220778504, 4.77602051562935",
-    "description":"De middeleeuwse Grote Markt is een historische plek in het Bourgondische hart van Breda, ooit in handen van de Spaanse bezetter. Gauchos Grill-Restaurant combineert daar Brabantse gemoedelijkheid met professionele gastvrijheid. In onze Latijnse keuken bereiden wij op uw aanwijzing een malse Argentijnse steak of een smakelijk visgerecht van de grill.",
+    "description":"De middeleeuwse Grote Markt is een historische plek in het Bourgondische hart van Breda, ooit in handen van de Spaanse bezetter. Gauchos Grill-Restaurant combineert daar Brabantse gemoedelijkheid met professionele gastvrijheid. In onze Latijnse keuken bereiden wij op uw aanwijzing een malse Argentijnse steak of een smakelijk visgerecht van de grill.\n\nAdres:\tGrote Markt 33\nOpeningstijden:\t17:00-23:00\nTelefoon:\t076 522 4505\nAfstand tot: ",
     "imageUrl":"gauchos",
     "iconUrl": "restaurant_icon"
   },
   {
     "name":"The Tosti Club Breda A4, Vlaszak 2",
     "coordinates":"51.588914881807106, 4.780460117020282",
-    "description":"Je kunt bij al onze vestigingen de hele dag terecht, want bij The Tosti Club eet je het klokje rond. Dus kom gezellig ontbijten, lunchen of voor een snelle hap aan het einde van de dag (wat dacht je van onze The Tosti Slice, onze variant op pizza!). Even geen zin in brood? Dan kunnen we je ook verblijden met onder andere acaï smoothiebowls, pancakes, granola’s / yoghurt of gewoon een lekkere warme drank met gebak. Mogen we je de Red Velvet fudge cake aanraden?",
+    "description":"Je kunt bij al onze vestigingen de hele dag terecht, want bij The Tosti Club eet je het klokje rond. Dus kom gezellig ontbijten, lunchen of voor een snelle hap aan het einde van de dag (wat dacht je van onze The Tosti Slice, onze variant op pizza!). Even geen zin in brood? Dan kunnen we je ook verblijden met onder andere acaï smoothiebowls, pancakes, granola’s / yoghurt of gewoon een lekkere warme drank met gebak. Mogen we je de Red Velvet fudge cake aanraden?\n\nAdres:\tVlaszak 2\nOpeningstijden:\t10:30-16:00\nTelefoon:\t076 303 3302\nAfstand tot: ",
     "imageUrl":"the_tosti_club",
     "iconUrl": "restaurant_icon"
   },
   {
     "name":"Coffee & Lunch 4 you Oude Vest 31",
     "coordinates":"51.58724065015693, 4.779495750152812",
-    "description":"Welkom bij Coffee & Lunch 4 you! Onze sfeervolle lunchroom is gelegen in het centrum van Breda, in de directe nabijheid van de parkeergarage en de fietsenstalling.",
+    "description":"Welkom bij Coffee & Lunch 4 you! Onze sfeervolle lunchroom is gelegen in het centrum van Breda, in de directe nabijheid van de parkeergarage en de fietsenstalling.\n\nAdres:\tOude Vest 31\nOpeningstijden:\tgesloten\nTelefoon:\t076 888 6000\nAfstand tot: ",
     "imageUrl":"coffee_and_lunch",
     "iconUrl": "coffee_icon"
   },
   {
     "name":"t Zusje Breda Vismarktstraat 28",
     "coordinates":"51.58989852937449, 4.7734114226595885",
-    "description":"Dat is een avond bij ’t Zusje. Gezellig samenzijn in een huiselijke sfeer en genieten van onze kleine gerechtjes, die je de hele avond kunt bestellen. Bij ‘t Zusje ben je thuis: jij bepaalt zelf de invulling van de avond.\nWe horen graag wat je wensen zijn, vinden het leuk je te verrassen met bijzondere gerechtjes en zetten graag die extra stap. We bieden je een avond uit, zoals wij die zelf ook graag zien. Avondvullend Bourgondisch genieten? In het prachtige pand van ons Zusje in Breda beleef je een gezellige avond met avondvullend tapas eten voor 31,80.\nBel snel en reserveer!",
+    "description":"Dat is een avond bij ’t Zusje. Gezellig samenzijn in een huiselijke sfeer en genieten van onze kleine gerechtjes, die je de hele avond kunt bestellen. Bij ‘t Zusje ben je thuis: jij bepaalt zelf de invulling van de avond.\nWe horen graag wat je wensen zijn, vinden het leuk je te verrassen met bijzondere gerechtjes en zetten graag die extra stap. We bieden je een avond uit, zoals wij die zelf ook graag zien. Avondvullend Bourgondisch genieten? In het prachtige pand van ons Zusje in Breda beleef je een gezellige avond met avondvullend tapas eten voor 31,80.\nBel snel en reserveer!\n\nAdres:\tVismarktstraat 28\nOpeningstijden:\t17:30-22:30\nTelefoon:\t0900 98753\nAfstand tot: ",
     "imageUrl":"t_zusje_breda",
     "iconUrl": "restaurant_icon"
   },
   {
     "name":"VR-World Nassaustraat 2",
     "coordinates":"51.59149198370258, 4.786158496485409",
-    "description":"Virtual Reality is hét uitje van dit moment. Zombies verslaan, vuurballen schieten of met laserzwaarden vechten, met Virtual Reality is niks te gek. Bij VR World zijn we elke dag opzoek naar de nieuwste experiences voor jullie.\n\nWat dacht je bijvoorbeeld van een Escape Room, maar dan in Virtual Reality? Bij VR World bieden wij de nieuwste Escapes aan op het gebied van Virtual Reality. Ontsnap bijvoorbeeld uit een Piramide of ontmantel een raket. Durf jij deze uitdaging aan?\n\nVR World is gelegen op een unieke locatie, namelijk de koepelgevangenis van Breda. Deze gevangenis was tot 2016 nog in werking en daarna hebben bedrijven er hun intrek genomen, zo ook VR World.",
+    "description":"Virtual Reality is hét uitje van dit moment. Zombies verslaan, vuurballen schieten of met laserzwaarden vechten, met Virtual Reality is niks te gek. Bij VR World zijn we elke dag opzoek naar de nieuwste experiences voor jullie.\n\nWat dacht je bijvoorbeeld van een Escape Room, maar dan in Virtual Reality? Bij VR World bieden wij de nieuwste Escapes aan op het gebied van Virtual Reality. Ontsnap bijvoorbeeld uit een Piramide of ontmantel een raket. Durf jij deze uitdaging aan?\n\nVR World is gelegen op een unieke locatie, namelijk de koepelgevangenis van Breda. Deze gevangenis was tot 2016 nog in werking en daarna hebben bedrijven er hun intrek genomen, zo ook VR World.\n\nAdres:\tNassaustraat 2\nOpeningstijden:\t10:00-23:00\nTelefoon:\t085 077 0077\nAfstand tot: ",
     "imageUrl":"vr_world",
     "iconUrl": "vr_icon"
   },
   {
     "name":"Kees Kroket Houtmarkt 9",
     "coordinates":"51.58629976171061, 4.7769606819261",
-    "description":"KEEEEES KROKET! Al meer dan tien jaar is Kees Kroket in het centrum van Breda gevestigd, vlakbij het winkelend publiek. Eerst in de welbekende Houtmarktpassage en sinds april 2019 zijn we gevestigd op onze nieuwe locatie aan de Houtmarkt 9. U proeft de kwaliteit bij onze verse frites. Deze, uit de Agria aardappel gesneden frites, wordt in zonnebloemolie voorgebakken en in een mix van plantaardige oliën afgebakken. Dit zorgt niet alleen voor de heerlijke smaak maar ook dat onze frites relatief weinig verzadigde vetten en transvetzuren bevat, waardoor we van het beeldmerk ‘Verantwoord Frituren’ gebruik mogen maken.",
+    "description":"KEEEEES KROKET! Al meer dan tien jaar is Kees Kroket in het centrum van Breda gevestigd, vlakbij het winkelend publiek. Eerst in de welbekende Houtmarktpassage en sinds april 2019 zijn we gevestigd op onze nieuwe locatie aan de Houtmarkt 9. U proeft de kwaliteit bij onze verse frites. Deze, uit de Agria aardappel gesneden frites, wordt in zonnebloemolie voorgebakken en in een mix van plantaardige oliën afgebakken. Dit zorgt niet alleen voor de heerlijke smaak maar ook dat onze frites relatief weinig verzadigde vetten en transvetzuren bevat, waardoor we van het beeldmerk ‘Verantwoord Frituren’ gebruik mogen maken.\n\nAdres:\tHoutmarkt 9\nOpeningstijden:\t15:00-19:30\nTelefoon:\t076 785 4359\nAfstand tot: ",
     "imageUrl":"kees_kroket",
     "iconUrl": "restaurant_icon"
   },
   {
     "name":"Prison Escape Kloosterlaan 168",
     "coordinates":"51.590621347316336, 4.784612424356731",
-    "description":"Prison Escape duurt in het totaal 3 uur en je hebt als doel om te ontsnappen uit de zwaarbewaakte gevangenis. Een cast van 25 acteurs brengt de ervaring tot leven en het is aan jou om een weg naar buiten te vinden. In de gevangenis zijn verschillende objecten verstopt die het wellicht makkelijker zouden kunnen maken om de weg naar buiten te realiseren.\n\nWees op je hoede, kijk goed om je heen, vertrouw (bijna) niemand en stap op mensen af..\nDe klok tikt en jij hebt 1 doel: de weg naar de vrijheid vinden.",
+    "description":"Prison Escape duurt in het totaal 3 uur en je hebt als doel om te ontsnappen uit de zwaarbewaakte gevangenis. Een cast van 25 acteurs brengt de ervaring tot leven en het is aan jou om een weg naar buiten te vinden. In de gevangenis zijn verschillende objecten verstopt die het wellicht makkelijker zouden kunnen maken om de weg naar buiten te realiseren.\n\nWees op je hoede, kijk goed om je heen, vertrouw (bijna) niemand en stap op mensen af..\nDe klok tikt en jij hebt 1 doel: de weg naar de vrijheid vinden.\n\nAdres:\tKloosterlaan 168\nOpeningstijden:\tvr-za 13:45-22:30\nTelefoon:\t085 065 3268\nAfstand tot: ",
     "imageUrl":"prison_escape_room",
     "iconUrl": "escape_icon"
   },
   {
     "name":"De Koepel - FutureDome Events Nassausingel 26",
     "coordinates":"51.59016000704554, 4.788289825900094",
-    "description":"n groepen word je onder begeleiding van een van onze gidsen rondgeleid langs de meest unieke en mooiste monumentale plekken in en rondom de Koepel!\n\u200B\n\nDe gids zal hierbij op de verschillende locaties toelichting geven over het roemruchte verleden. De rondleiding over het gevangenisterrein brengt u onder andere langs de koepel, de authentieke kapel, vrouwengevangenis, verschillende luchtplaatsen en het oude gerechtsgebouw.",
+    "description":"n groepen word je onder begeleiding van een van onze gidsen rondgeleid langs de meest unieke en mooiste monumentale plekken in en rondom de Koepel!\n\u200B\n\nDe gids zal hierbij op de verschillende locaties toelichting geven over het roemruchte verleden. De rondleiding over het gevangenisterrein brengt u onder andere langs de koepel, de authentieke kapel, vrouwengevangenis, verschillende luchtplaatsen en het oude gerechtsgebouw.\n\nAdres:\tNassausingel 26\nOpeningstijden:\t09:00-17:00\nTelefoon:\t076 763 2700",
     "imageUrl":"de_koepel_future_events",
     "iconUrl": "escape_icon"
   },
@@ -87,70 +87,70 @@
   {
     "name":"Escaping Breda: Escape Room Games Boschstraat 114",
     "coordinates":" 51.59110835530862,4.784147222780912",
-    "description":"Escaping Breda is een nieuwe moderne locatie en heeft op dit moment 2 avontuurlijke escape rooms. Daarnaast komen er volgend jaar nog 2 extra escape rooms bij. \n\nOntsnap uit de spannende escape room Let’s Rob The Bank, een kamer geschikt voor volwassenen én kinderen. Ontsnap je liever uit een escape room met een hoger spannings- en spelniveau? Kies dan voor Patient X.\n\nOp onze locatie in Breda hebben we ook een gezellig boardgame café. Combineer je ontsnapping met een drankje, hapje en alle gratis boardgames.\n\nEscaping Breda is de perfecte plek voor een uitje met je familie, vrienden of collega’s.",
+    "description":"Escaping Breda is een nieuwe moderne locatie en heeft op dit moment 2 avontuurlijke escape rooms. Daarnaast komen er volgend jaar nog 2 extra escape rooms bij. \n\nOntsnap uit de spannende escape room Let’s Rob The Bank, een kamer geschikt voor volwassenen én kinderen. Ontsnap je liever uit een escape room met een hoger spannings- en spelniveau? Kies dan voor Patient X.\n\nOp onze locatie in Breda hebben we ook een gezellig boardgame café. Combineer je ontsnapping met een drankje, hapje en alle gratis boardgames.\n\nEscaping Breda is de perfecte plek voor een uitje met je familie, vrienden of collega’s.\n\nAdres:\tBoschstraat 114\nOpeningstijden:\tOp reservering\nTelefoon:\t085 401 9567\nAfstand tot: ",
     "imageUrl":"escaping_room",
     "iconUrl": "escape_icon"
   },
   {
     "name":"MEZZ Breda Keizerstraat 101",
     "coordinates":"51.583597834546616, 4.778605421170793",
-    "description":"MEZZ is een open club, betrokken, nieuwsgierig en onderzoekend. MEZZ heeft humor, is gevat, soms provocatief en verrassend. Beleving en plezier staan centraal waarbij wij bottom up denken. Wij zijn er voor jou, jouw MEZZ. Heb je ideeën of wil je meer weten, neem contact op. Wij reageren altijd.",
+    "description":"MEZZ is een open club, betrokken, nieuwsgierig en onderzoekend. MEZZ heeft humor, is gevat, soms provocatief en verrassend. Beleving en plezier staan centraal waarbij wij bottom up denken. Wij zijn er voor jou, jouw MEZZ. Heb je ideeën of wil je meer weten, neem contact op. Wij reageren altijd.\n\nAdres:\tKeizerstraat 101\nOpeningstijden:\t-\nTelefoon:\t076 515 6677\nAfstand tot: ",
     "imageUrl":"mezz_breda",
     "iconUrl": "mezz_icon"
   },
   {
     "name":"Het Klooster Breda Schorsmolenstraat 13",
     "coordinates":"51.58774025242826, 4.765006685059431",
-    "description":"In dit oude Kapucijnenklooster wordt een woon- en werkgemeenschap gevestigd onder de naam\n”Het Klooster Breda”. \nMet de inkomsten uit bedrijvigheid wordt 12 mensen die dakloos zijn onderdak geboden, van waaruit zij zich weer een plek in de samenleving kunnen verwerven.",
+    "description":"In dit oude Kapucijnenklooster wordt een woon- en werkgemeenschap gevestigd onder de naam\n”Het Klooster Breda”. \nMet de inkomsten uit bedrijvigheid wordt 12 mensen die dakloos zijn onderdak geboden, van waaruit zij zich weer een plek in de samenleving kunnen verwerven.\n\nAdres:\tSchorsmolenstraat13\nOpeningstijden:\t09:00-17:00\nTelefoon:\t076 593 8845\nAfstand tot: ",
     "imageUrl":"het_klooster_breda",
     "iconUrl": "building_icon"
   },
   {
     "name":"Beach & Lounge club Spider “rooftop bar” Nieuwe Prinsenkade",
     "coordinates":"51.591384128082396, 4.771519780736044",
-    "description":"Beach & Lounge Club Spider staat bekent om zijn immens populaire locatie in Bergen op Zoom. Sinds 2020 heeft deze hoog segment lounge club een tweede locatie geopend in Breda genaamd Beach & Lounge Club Spider Rooftop Bar.",
+    "description":"Beach & Lounge Club Spider staat bekent om zijn immens populaire locatie in Bergen op Zoom. Sinds 2020 heeft deze hoog segment lounge club een tweede locatie geopend in Breda genaamd Beach & Lounge Club Spider Rooftop Bar.\n\nAdres:\tNieuwe Prinsenkade\nOpeningstijden:\t-\nTelefoon:\t-\nAfstand tot: ",
     "imageUrl":"beach_and_lounge_club",
     "iconUrl": "beach_icon"
   },
   {
     "name":"Koningin Wilhelmina Paviljoen Kraanstraat 4b",
     "coordinates":"51.59040026960037, 4.775767751364238",
-    "description":"Koningin Wilhelmina Paviljoen is een bouwwerk in Breda Centrum in Breda. Het behoort tot de Koninklijke Militaire Academie (KMA) en bezit de status van rijksmonument. Het staat aan het Kasteelplein 15, vlak voor het Kasteel van Breda. Het ligt met de voorgevel aan de westkant van de oprijlaan van het kasteel, met de lange rechterzijgevel aan de kasteelgracht en de lange linkerzijgevel aan de Cingelstraat.",
+    "description":"Koningin Wilhelmina Paviljoen is een bouwwerk in Breda Centrum in Breda. Het behoort tot de Koninklijke Militaire Academie (KMA) en bezit de status van rijksmonument. Het staat aan het Kasteelplein 15, vlak voor het Kasteel van Breda. Het ligt met de voorgevel aan de westkant van de oprijlaan van het kasteel, met de lange rechterzijgevel aan de kasteelgracht en de lange linkerzijgevel aan de Cingelstraat.\n\nAdres:\tKraanstraat 4b\nOpeningstijden:\tdi 11:00-16:00\nTelefoon:\t-\nAfstand tot: ",
     "imageUrl":"koningin_wilhelimna_paviljoen",
     "iconUrl": "building_icon"
   },
   {
     "name":"Hercules en de Nemeïsche leeuw",
     "coordinates":"51.59120082440261, 4.777904512729459",
-    "description":"Het beeld toont Hercules met de huid van de Nemeïsche leeuw. Herakles of Hercules is een figuur uit de Griekse mythologie. Hij was een Griekse heros en werd beroemd om de 12 moeilijke werken die hij uitvoerde in opdracht van koning Eurystheus. Het beeld maakt onderdeel uit van 17 anderen zandstenen beelden die Willem III tussen 1670 en 1686 kocht. De beelden stonden verdeeld over grasperken in het Valkenberg park.\nHercules is het enige originele beeld dat overgebleven is.",
+    "description":"Het beeld toont Hercules met de huid van de Nemeïsche leeuw. Herakles of Hercules is een figuur uit de Griekse mythologie. Hij was een Griekse heros en werd beroemd om de 12 moeilijke werken die hij uitvoerde in opdracht van koning Eurystheus. Het beeld maakt onderdeel uit van 17 anderen zandstenen beelden die Willem III tussen 1670 en 1686 kocht. De beelden stonden verdeeld over grasperken in het Valkenberg park.\nHercules is het enige originele beeld dat overgebleven is.\n\nAdres:\t4811 XJ Breda\nOpeningstijden:\t-\nTelefoon:\t14 076\nAfstand tot: ",
     "imageUrl":"hercules_park_valkenburg",
     "iconUrl": "statue_icon"
   },
   {
     "name":"Nassau-Baroniemonument - 1905 - Pierre Cuypers Delpratsingel 1",
     "coordinates":"51.59249639550226, 4.779742259785807",
-    "description":"Het Baroniemonument of Nassau-Baroniemonument is een beeld van de Nederlandse architect Pierre Cuypers. Het staat in het Park Valkenberg in Breda. Het monument werd geplaatst ter herinnering aan de 500-jarige band (1904) tussen Breda en het huis Oranje-Nassau. In 1404 werd Engelbrecht I van Nassau-Siegen gehuldigd als heer van Breda.",
+    "description":"Het Baroniemonument of Nassau-Baroniemonument is een beeld van de Nederlandse architect Pierre Cuypers. Het staat in het Park Valkenberg in Breda. Het monument werd geplaatst ter herinnering aan de 500-jarige band (1904) tussen Breda en het huis Oranje-Nassau. In 1404 werd Engelbrecht I van Nassau-Siegen gehuldigd als heer van Breda.\n\nAdres:\tDelpratsingel 1\nOpeningstijden:\t-\nTelefoon:\t14 076\nAfstand tot: ",
     "imageUrl":"nassau_baroniemonument",
     "iconUrl": "statue_icon"
   },
   {
     "name":"Station Breda Gravinnen van Nassauboulevard 43",
     "coordinates":"51.59569850758307,4.780295549958155",
-    "description":"Station Breda is het centrale spoorwegstation van de Nederlandse stad Breda. Het bevindt zich ten noorden van het centrum van de stad. Omliggende wijken zijn Stationskwartier en Drie Hoefijzers aan de zuidkant, en aan de noordzijde Belcrum, Doornbos-Linie en Havenkwartier.\n\nHet eerste station in Breda werd geopend op 1 mei 1855, toen de Spoorlijn Roosendaal - Breda werd geopend. Dit station werd in 1863 door een nieuw gebouw vervangen, toen de lijn naar Tilburg werd geopend. Omdat Breda toen nog een vesting was en het station onder de beperkingen van de Vestingwet viel, was het zodanig uitgevoerd dat het in tijden van oorlog snel gesloopt zou kunnen worden.",
+    "description":"Station Breda is het centrale spoorwegstation van de Nederlandse stad Breda. Het bevindt zich ten noorden van het centrum van de stad. Omliggende wijken zijn Stationskwartier en Drie Hoefijzers aan de zuidkant, en aan de noordzijde Belcrum, Doornbos-Linie en Havenkwartier.\n\nHet eerste station in Breda werd geopend op 1 mei 1855, toen de Spoorlijn Roosendaal - Breda werd geopend. Dit station werd in 1863 door een nieuw gebouw vervangen, toen de lijn naar Tilburg werd geopend. Omdat Breda toen nog een vesting was en het station onder de beperkingen van de Vestingwet viel, was het zodanig uitgevoerd dat het in tijden van oorlog snel gesloopt zou kunnen worden.\n\nAdres:\tGravinnen van Nassauboulevard 43\nOpeningstijden:\t-\nTelefoon:\t030 751 51 55\nAfstand tot: ",
     "imageUrl":"station_breda",
     "iconUrl": "building_icon"
   },
   {
     "name":"Belcrum Beach Veilingkade 12a",
     "coordinates":"51.59945849923229, 4.765404193295078",
-    "description":"Belcrum Beach is HET stadsstrand van Breda, gelegen op het Haveneiland in de wijk Belcrum. Wij zijn begonnen in 2013 op deze unieke lokatie in Breda. Het strand werkt met drie beheerders en een groot aantal vrijwilligers voor bar, onderhoud, programmering, sponsoring en tuin. Een plek om te relaxen met een drankje en een hapje, genietend van de zon, gezellig kletsen met je vrienden, luisterend naar muziek van een band of DJ, soms in een festival setting. Kinderen die kunnen spelen in het zand of mee kunnen doen aan speciale kinderactiviteiten. Belcrum Beach is ook een unieke lokatie voor een feestje of om je verjaardag te vieren, trouwen op het strand of een trouwfeest behoren ook tot de mogelijkheden.",
+    "description":"Belcrum Beach is HET stadsstrand van Breda, gelegen op het Haveneiland in de wijk Belcrum. Wij zijn begonnen in 2013 op deze unieke lokatie in Breda. Het strand werkt met drie beheerders en een groot aantal vrijwilligers voor bar, onderhoud, programmering, sponsoring en tuin. Een plek om te relaxen met een drankje en een hapje, genietend van de zon, gezellig kletsen met je vrienden, luisterend naar muziek van een band of DJ, soms in een festival setting. Kinderen die kunnen spelen in het zand of mee kunnen doen aan speciale kinderactiviteiten. Belcrum Beach is ook een unieke lokatie voor een feestje of om je verjaardag te vieren, trouwen op het strand of een trouwfeest behoren ook tot de mogelijkheden.\n\nAdres:\tVeilingskade 12a\nOpeningstijden:\t12:00-19:00\nTelefoon:\t-\nAfstand tot: ",
     "imageUrl":"belcrum_beach",
     "iconUrl": "beach_icon"
   },
   {
     "name":"De Belcrum Watertoren (1935) Speelhuislaan 158",
     "coordinates":"51.60052702557225, 4.7689948674496145",
-    "description":"De watertoren in de Belcrum in Breda is een industrieel monument uit het interbellum. De toren is de thuisbasis voor SOAB adviseurs voor woning en leefomgeving en onderstreept de missie van ons bureau. De toren hoort bij de Belcrum. Als landmark en als onderdak voor activiteiten. Zo vierden de Belcrummers hun 400 jaar bestaan in de toren en worden lunches met rondleiding op hoog niveau georganiseerd. Kijken en proeven.",
+    "description":"De watertoren in de Belcrum in Breda is een industrieel monument uit het interbellum. De toren is de thuisbasis voor SOAB adviseurs voor woning en leefomgeving en onderstreept de missie van ons bureau. De toren hoort bij de Belcrum. Als landmark en als onderdak voor activiteiten. Zo vierden de Belcrummers hun 400 jaar bestaan in de toren en worden lunches met rondleiding op hoog niveau georganiseerd. Kijken en proeven.\n\nAdres:\tSpeelhuislaan 158\nOpeningstijden:\t08:30-18:00\nTelefoon:\t076 521 3080\nAfstand tot: ",
     "imageUrl":"belcrum_watertoren",
     "iconUrl": "building_icon"
   }

app/src/main/assets/locations.json

@@ -2,84 +2,84 @@
   {
     "name":"McDonald's Breda Karnemelkstraat",
     "coordinates":"51.586058044064735, 4.775804729737406",
-    "description":"Did you know McDonald's is the largest restaurant chain in the world? This gives us an impressive history. But we prefer to look at our future. New restaurants, better products, and sustainable entrepreneurship.",
+    "description":"Did you know McDonald's is the largest restaurant chain in the world? This gives us an impressive history. But we prefer to look at our future. New restaurants, better products, and sustainable entrepreneurship.\n\nAdress:\tKaranemelkstraat 5\nOpening hours:\t11:00-23:00\nPhone:\t076 533 3000\nDistance to: ",
     "imageUrl":"mc_donalds",
     "iconUrl": "mcdonalds_icon"
   },
   {
     "name":"Subway Karnemelkstraat 10 A, 1",
     "coordinates":"51.586110268250046, 4.775124041110522",
-    "description":"Subway is an American multinational fast-food chain that mainly sells sandwiches. The company distinguishes itself from many other sandwich shops because the customer can have the sandwich put together themselves. Subway works with franchises. The company has nearly 45,000 offices on all continents.",
+    "description":"Subway is an American multinational fast-food chain that mainly sells sandwiches. The company distinguishes itself from many other sandwich shops because the customer can have the sandwich put together themselves. Subway works with franchises. The company has nearly 45,000 offices on all continents.\n\nAdress:\tKarnemelkstraat 10 A\nOpening hours:\t10:00-19:30\nPhone:\t076 521 4411\nDistance to: ",
     "imageUrl":"subway",
     "iconUrl": "subway_icon"
   },
   {
     "name":"Wok To Go Halstraat 40",
     "coordinates":"51.58648245586817, 4.77757540779623",
-    "description":"At Wok To Go we love fast, healthy and tasty meals. Since 2003 our chefs have been developing the most delicious wok dishes with fresh ingredients. We do this with complete dedication under the motto “ Making people happy through food ”. By stir-frying - with a small amount of oil - on high heat, the taste and healthy nutrients are preserved. We choose healthy and different ingredients and prepare balanced courses in a 'Wokki box' for a healthy lifestyle. ",
+    "description":"At Wok To Go we love fast, healthy and tasty meals. Since 2003 our chefs have been developing the most delicious wok dishes with fresh ingredients. We do this with complete dedication under the motto “ Making people happy through food ”. By stir-frying - with a small amount of oil - on high heat, the taste and healthy nutrients are preserved. We choose healthy and different ingredients and prepare balanced courses in a 'Wokki box' for a healthy lifestyle.\n\nAdress:\tHalstraat 40\nOpening hours:\t12:30-21:00\nPhone:\t076 522 5643\nDistance to: ",
     "imageUrl":"wok_to_go",
     "iconUrl": "wok_icon"
   },
   {
     "name":"De Boterhal Grote Markt 19",
     "coordinates":"51.58798587092525, 4.776248508784696",
-    "description":"De Boterhal in Breda is an international tapas restaurant, specialty beer café, and wine bar. You can enjoy lunch, drinks, and dinner with us. We have an extensive menu with a lot of beers, wines, both per glass and per bottle, lunch, and tapas dishes. In addition to the food we serve, we also have a lot of beers and wines. In addition to the beers on the menu, we have varying beers: five kettle beers and five seasonal beers. ",
+    "description":"De Boterhal in Breda is an international tapas restaurant, specialty beer café, and wine bar. You can enjoy lunch, drinks, and dinner with us. We have an extensive menu with a lot of beers, wines, both per glass and per bottle, lunch, and tapas dishes. In addition to the food we serve, we also have a lot of beers and wines. In addition to the beers on the menu, we have varying beers: five kettle beers and five seasonal beers.\n\nAdress:\tGrote Markt 19\nOpening hours:\t12:00-01:00\nPhone:\t076 889 8180\nDistance to: ",
     "imageUrl":"de_boter_hal",
     "iconUrl": "restaurant_icon"
   },
   {
     "name":"Gauchos Grote Markt 33",
     "coordinates":"51.588456220778504, 4.77602051562935",
-    "description":"The medieval Grote Markt is a historic place in the Burgundian heart of Breda, once in the hands of the Spanish occupier. Gauchos Grill-Restaurant combines Brabant conviviality with professional hospitality. In our Latin kitchen, we prepare a tender Argentinian steak or a tasty fish dish from the grill. ",
+    "description":"The medieval Grote Markt is a historic place in the Burgundian heart of Breda, once in the hands of the Spanish occupier. Gauchos Grill-Restaurant combines Brabant conviviality with professional hospitality. In our Latin kitchen, we prepare a tender Argentinian steak or a tasty fish dish from the grill.\n\\nAdress:\tGrote Markt 33\nOpening hours:\t17:00-23:00\nPhone:\t076 522 4505\nDistance to: ",
     "imageUrl":"gauchos",
     "iconUrl": "restaurant_icon"
   },
   {
     "name":"The Tosti Club Breda A4, Vlaszak 2",
     "coordinates":"51.588914881807106, 4.780460117020282",
-    "description":"You can go to all our branches all day because at The Tosti Club you eat around the clock. So come for breakfast, lunch, or a quick bite at the end of the day (how about our The Tosti Slice, our variant on pizza!). If you don't feel like bread, then we can also delight you with acai smoothie bowls, pancakes, granolas/yogurt, or just a nice hot drink with cake. Can we recommend the Red Velvet fudge cake?",
+    "description":"You can go to all our branches all day because at The Tosti Club you eat around the clock. So come for breakfast, lunch, or a quick bite at the end of the day (how about our The Tosti Slice, our variant on pizza!). If you don't feel like bread, then we can also delight you with acai smoothie bowls, pancakes, granolas/yogurt, or just a nice hot drink with cake. Can we recommend the Red Velvet fudge cake?\n\\nAdress:\tVlaszak 2\nOpening hours:\t10:30-16:00\nPhone:\t076 303 3302\nDistance to: ",
     "imageUrl":"the_tosti_club",
     "iconUrl": "restaurant_icon"
   },
   {
     "name":"Coffee & Lunch 4 you Oude Vest 31",
     "coordinates":"51.58724065015693, 4.779495750152812",
-    "description":"Welcome to Coffee & Lunch 4 you! Our atmospheric lunchroom is located in the center of Breda, near the parking garage and the bicycle shed.",
+    "description":"Welcome to Coffee & Lunch 4 you! Our atmospheric lunchroom is located in the center of Breda, near the parking garage and the bicycle shed.\n\nAdress:\tOude Vest 31\nOpening hours:\tClosed\nPhone:\t076 888 6000\nDistance to: ",
     "imageUrl":"coffee_and_lunch",
     "iconUrl": "coffee_icon"
   },
   {
     "name":"t Zusje Breda Vismarktstraat 28",
     "coordinates":"51.58989852937449, 4.7734114226595885",
-    "description":"That is an evening at 't Zusje. Cozy get-together in a homely atmosphere and enjoy our small dishes, which you can order all evening. At' t Zusje you are at home: you determine the content of the evening yourself. \nWe would like to hear what your wishes are, would like to surprise you with special dishes, and would like to go the extra mile. We offer you an evening out, as we would like to see in ourselves. Enjoy a full evening of Burgundian? In the beautiful building of our Zusje in Breda, you will experience a pleasant evening with full evening tapas food for 31.80. \nCall quickly and book!",
+    "description":"That is an evening at 't Zusje. Cozy get-together in a homely atmosphere and enjoy our small dishes, which you can order all evening. At' t Zusje you are at home: you determine the content of the evening yourself. \nWe would like to hear what your wishes are, would like to surprise you with special dishes, and would like to go the extra mile. We offer you an evening out, as we would like to see in ourselves. Enjoy a full evening of Burgundian? In the beautiful building of our Zusje in Breda, you will experience a pleasant evening with full evening tapas food for 31.80. \nCall quickly and book! \n\nAdress:\tVismarktstraat 28\nOpening hours:\t17:30-22:30\nPhone:\t0900 98753\nDistance to: ",
     "imageUrl":"t_zusje_breda",
     "iconUrl": "restaurant_icon"
   },
   {
     "name":"VR-World Nassaustraat 2",
     "coordinates":"51.59149198370258, 4.786158496485409",
-    "description":"Virtual Reality is the outing of the moment. Beating zombies, shooting fireballs, or fighting with laser swords, nothing is too crazy with Virtual Reality. At VR World we are looking every day for the newest experiences for you. \n\nWhat about for an example of an Escape Room, but in Virtual Reality? At VR World we offer the latest Escapes in Virtual Reality. Escape from a Pyramid or dismantle a rocket, for example. Do you dare to take on this challenge? \n\nVR World is located at a unique location, namely the dome prison of Breda. This prison was still in operation until 2016 and then companies moved in, including VR World.",
+    "description":"Virtual Reality is the outing of the moment. Beating zombies, shooting fireballs, or fighting with laser swords, nothing is too crazy with Virtual Reality. At VR World we are looking every day for the newest experiences for you. \n\nWhat about for an example of an Escape Room, but in Virtual Reality? At VR World we offer the latest Escapes in Virtual Reality. Escape from a Pyramid or dismantle a rocket, for example. Do you dare to take on this challenge? \n\nVR World is located at a unique location, namely the dome prison of Breda. This prison was still in operation until 2016 and then companies moved in, including VR World.\n\nAdress:\tNassaustraat 2\nOpening hours:\t10:00-23:00\nPhone:\t085 077 0077\nDistance to: ",
     "imageUrl":"vr_world",
     "iconUrl": "vr_icon"
   },
   {
     "name":"Kees Kroket Houtmarkt 9",
     "coordinates":"51.58629976171061, 4.7769606819261",
-    "description":"KEEEEES KROKET! For more than ten years, Kees Kroket has been located in the center of Breda, close to shoppers. First in the well-known Houtmarktpassage and since April 2019, we have been located at our new location at Houtmarkt 9. You can taste the quality of our fresh fries. These fries, cut from the Agria potato, are pre-fried in sunflower oil and finished in a mix of vegetable oils. This not only ensures the delicious taste, but also that our fries contain relatively little saturated fats and trans-fatty acids, so may use the logo 'Responsible Frying'.",
+    "description":"KEEEEES KROKET! For more than ten years, Kees Kroket has been located in the center of Breda, close to shoppers. First in the well-known Houtmarktpassage and since April 2019, we have been located at our new location at Houtmarkt 9. You can taste the quality of our fresh fries. These fries, cut from the Agria potato, are pre-fried in sunflower oil and finished in a mix of vegetable oils. This not only ensures the delicious taste, but also that our fries contain relatively little saturated fats and trans-fatty acids, so may use the logo 'Responsible Frying'.\n\\nAdress:\tHoutmarkt 9\nOpening hours:\t15:00-19:30\nPhone:\t076 785 4359\nDistance to: ",
     "imageUrl":"kees_kroket",
     "iconUrl": "restaurant_icon"
   },
   {
     "name":"Prison Escape Kloosterlaan 168",
     "coordinates":"51.590621347316336, 4.784612424356731",
-    "description":"Prison Escape lasts a total of 3 hours and your goal is to escape the maximum-security prison. A cast of 25 actors brings the experience to life and it's up to you to find your way out. Hidden objects that might make it easier to realize the way out. \n\nBe careful, look around you, trust (almost) nobody, and approach people .. \nThe clock is ticking and you have 1 goal: to find the way to freedom.",
+    "description":"Prison Escape lasts a total of 3 hours and your goal is to escape the maximum-security prison. A cast of 25 actors brings the experience to life and it's up to you to find your way out. Hidden objects that might make it easier to realize the way out. \n\nBe careful, look around you, trust (almost) nobody, and approach people .. \nThe clock is ticking and you have 1 goal: to find the way to freedom.\n\nAdress:\tKloosterlaan 168\nOpening hours:\tvr-za 13:45-22:30\nPhone:\t085 065 3268\nDistance to: ",
     "imageUrl":"prison_escape_room",
     "iconUrl": "escape_icon"
   },
   {
     "name":"De Koepel - FutureDome Events Nassausingel 26",
     "coordinates":"51.59016000704554, 4.788289825900094",
-    "description":"In groups, you will be guided by one of our guides across the most unique and beautiful monumental places in and around the Dome! \n\n The guide will explain the illustrious past at the various locations. tour of the prison grounds will take you past the dome, the authentic chapel, women's prison, various air places, and the old court building.",
+    "description":"In groups, you will be guided by one of our guides across the most unique and beautiful monumental places in and around the Dome! \n\n The guide will explain the illustrious past at the various locations. tour of the prison grounds will take you past the dome, the authentic chapel, women's prison, various air places, and the old court building.\n\nAdress:\tNassausingel 26\nOpening hours:\t09:00-17:00\nPhone:\t076 763 2700\nDistance to: ",
     "imageUrl":"de_koepel_future_events",
     "iconUrl": "escape_icon"
   },
@@ -87,70 +87,70 @@
   {
     "name":"Escaping Breda: Escape Room Games Boschstraat 114",
     "coordinates":" 51.59110835530862,4.784147222780912",
-    "description":"Escaping Breda is a new modern location and currently has 2 adventurous escape rooms. Besides, 2 extra escape rooms will be added next year. \n\nEscape from the exciting escape room Let's Rob The Bank, a room suitable for adults and children. If you prefer to escape from an escape room with a higher level of excitement and play, then choose Patient X. \n\nOt our location in Breda we also have a cozy board game café. Combine your escape with a drink, snack, and all free board games. \n\nEscaping Breda is the perfect place for an outing with your family, friends, or colleagues.",
+    "description":"Escaping Breda is a new modern location and currently has 2 adventurous escape rooms. Besides, 2 extra escape rooms will be added next year. \n\nEscape from the exciting escape room Let's Rob The Bank, a room suitable for adults and children. If you prefer to escape from an escape room with a higher level of excitement and play, then choose Patient X. \n\nOt our location in Breda we also have a cozy board game café. Combine your escape with a drink, snack, and all free board games. \n\nEscaping Breda is the perfect place for an outing with your family, friends, or colleagues.\n\\nAdress:\\tBoschstraat 114\nOpening hours:\tReservation only\nPhone:\t085 401 9567\nDistance to: ",
     "imageUrl":"escaping_room",
     "iconUrl": "escape_icon"
   },
   {
     "name":"MEZZ Breda Keizerstraat 101",
     "coordinates":"51.583597834546616, 4.778605421170793",
-    "description":"MEZZ is an open club, involved, curious and inquisitive. MEZZ has humor, is witty, sometimes provocative, and surprising. Experience and fun are central where we think bottom-up. We are there for you, your MEZZ. Do you have ideas or will you want to know more, contact us. We always respond.",
+    "description":"MEZZ is an open club, involved, curious and inquisitive. MEZZ has humor, is witty, sometimes provocative, and surprising. Experience and fun are central where we think bottom-up. We are there for you, your MEZZ. Do you have ideas or will you want to know more, contact us. We always respond.\n\nAdress:\tKeizerstraat 101\nOpening hours:\t-\nPhone:\t076 515 6677\nDistance to: ",
     "imageUrl":"mezz_breda",
     "iconUrl": "mezz_icon"
   },
   {
     "name":"Het Klooster Breda Schorsmolenstraat 13",
     "coordinates":"51.58774025242826, 4.765006685059431",
-    "description":"In this old Capuchin monastery a living and working community will be established under the name\" Het Klooster Breda \". \nWith the income from activities, 12 people who are homeless are offered shelter, from which they can regain a place in society .",
+    "description":"In this old Capuchin monastery a living and working community will be established under the name\" Het Klooster Breda \". \nWith the income from activities, 12 people who are homeless are offered shelter, from which they can regain a place in society.\n\nAdress:\tSchorsmolenstraat13\nOpening hours:\t09:00-17:00\nPhone:\t076 593 8845\nDistance to: ",
     "imageUrl":"het_klooster_breda",
     "iconUrl": "building_icon"
   },
   {
     "name":"Beach & Lounge club Spider “rooftop bar” Nieuwe Prinsenkade",
     "coordinates":"51.591384128082396, 4.771519780736044",
-    "description":"Beach & Lounge Club Spider is known for its immensely popular location in Bergen op Zoom. Since 2020, this high segment lounge club has opened a second location in Breda called Beach & Lounge Club Spider Rooftop Bar.",
+    "description":"Beach & Lounge Club Spider is known for its immensely popular location in Bergen op Zoom. Since 2020, this high segment lounge club has opened a second location in Breda called Beach & Lounge Club Spider Rooftop Bar.\n\nAdress:\tNieuwe Prinsenkade\nOpening hours:\t-\nPhone:\t\nDistance to: ",
     "imageUrl":"beach_and_lounge_club",
     "iconUrl": "beach_icon"
   },
   {
     "name":"Koningin Wilhelmina Paviljoen Kraanstraat 4b",
     "coordinates":"51.59040026960037, 4.775767751364238",
-    "description":"Queen Wilhelmina Pavilion is a building in Breda Center in Breda. It belongs to the Royal Military Academy (KMA) and has the status of a national monument. It is located at Kasteelplein 15, just in front of Breda Castle. the west side of the driveway of the castle, with the long right side wall on the castle moat and the long left side wall on the Cingelstraat. ",
+    "description":"Queen Wilhelmina Pavilion is a building in Breda Center in Breda. It belongs to the Royal Military Academy (KMA) and has the status of a national monument. It is located at Kasteelplein 15, just in front of Breda Castle. the west side of the driveway of the castle, with the long right side wall on the castle moat and the long left side wall on the Cingelstraat.\n\nAdress:\tKraanstraat 4b\nOpening hours:\tdi 11:00-16:00\nPhone:\t-\nDistance to: ",
     "imageUrl":"koningin_wilhelimna_paviljoen",
     "iconUrl": "building_icon"
   },
   {
     "name":"Hercules en de Nemeïsche leeuw",
     "coordinates":"51.59120082440261, 4.777904512729459",
-    "description":"The statue shows Hercules with the skin of the Nemean lion. Heracles or Hercules is a figure from Greek mythology. He was a Greek hero and became famous for the 12 difficult works he performed at the behest of King Eurystheus. The statue is part of the 17 other sandstone statues that Willem III bought between 1670 and 1686. The statues were spread over lawns in the Valkenberg park.\nHercules is the only original statue that remains.",
+    "description":"The statue shows Hercules with the skin of the Nemean lion. Heracles or Hercules is a figure from Greek mythology. He was a Greek hero and became famous for the 12 difficult works he performed at the behest of King Eurystheus. The statue is part of the 17 other sandstone statues that Willem III bought between 1670 and 1686. The statues were spread over lawns in the Valkenberg park.\nHercules is the only original statue that remains.\n\nAdress:\t4811 XJ Breda\nOpening hours:\t-\nPhone:\t14 076\nDistance to: ",
     "imageUrl":"hercules_park_valkenburg",
     "iconUrl": "statue_icon"
   },
   {
     "name":"Nassau-Baroniemonument - 1905 - Pierre Cuypers Delpratsingel 1",
     "coordinates":"51.59249639550226, 4.779742259785807",
-    "description":"The Baroniemonument or Nassau-Baroniemonument is a statue of the Dutch architect Pierre Cuypers. It is located in Park Valkenberg in Breda. The monument was placed in memorial of the 500-year bond (1904) between Breda and the Oranje-Nassau house. In 1404 Engelbrecht I of Nassau-Siegen was honored as lord of Breda. ",
+    "description":"The Baroniemonument or Nassau-Baroniemonument is a statue of the Dutch architect Pierre Cuypers. It is located in Park Valkenberg in Breda. The monument was placed in memorial of the 500-year bond (1904) between Breda and the Oranje-Nassau house. In 1404 Engelbrecht I of Nassau-Siegen was honored as lord of Breda.\n\nAdress:\tDelpratsingel 1\nOpening hours:\t-\nPhone:\t14 076\nDistance to: ",
     "imageUrl":"nassau_baroniemonument",
     "iconUrl": "statue_icon"
   },
   {
     "name":"Station Breda Gravinnen van Nassauboulevard 43",
     "coordinates":"51.59569850758307,4.780295549958155",
-    "description":"Breda Station is the central railway station of the Dutch city of Breda. It is located north of the city center. Surrounding neighborhoods are Stationskwartier and Drie Hoefijzers on the south side, and Belcrum, Doornbos-Linie, and Havenkwartier on the north side. \n\nThe first station in Breda was opened on May 1, 1855, when the Roosendaal - Breda Railway was opened. This station was replaced by a new building in 1863, when the line to Tilburg was opened, because Breda was still a fortress at the time and it station fell under the restrictions of the Fortress Act, it was constructed in such a way that it could be quickly demolished in times of war. ",
+    "description":"Breda Station is the central railway station of the Dutch city of Breda. It is located north of the city center. Surrounding neighborhoods are Stationskwartier and Drie Hoefijzers on the south side, and Belcrum, Doornbos-Linie, and Havenkwartier on the north side. \n\nThe first station in Breda was opened on May 1, 1855, when the Roosendaal - Breda Railway was opened. This station was replaced by a new building in 1863, when the line to Tilburg was opened, because Breda was still a fortress at the time and it station fell under the restrictions of the Fortress Act, it was constructed in such a way that it could be quickly demolished in times of war.\n\nAdress:\tGravinnen van Nassauboulevard 43\nOpening hours:\t-\nPhone:\t030 751 51 55\nDistance to: ",
     "imageUrl":"station_breda",
     "iconUrl": "building_icon"
   },
   {
     "name":"Belcrum Beach Veilingkade 12a",
     "coordinates":"51.59945849923229, 4.765404193295078",
-    "description":"Belcrum Beach is THE city beach of Breda, located on the Haveneiland in the Belcrum district. We started in 2013 at this unique location in Breda. The beach works with three managers and a large number of volunteers for the bar, maintenance, programming, sponsoring, and garden. A place to relax with a drink and a snack, enjoying the sun, chatting with your friends, listening to music from a band or DJ, sometimes in a festival setting. Children who can play in the sand or join do special children's activities. Belcrum Beach is also a unique location for a party or to celebrate your birthday, getting married on the beach or a wedding are also possible. ",
+    "description":"Belcrum Beach is THE city beach of Breda, located on the Haveneiland in the Belcrum district. We started in 2013 at this unique location in Breda. The beach works with three managers and a large number of volunteers for the bar, maintenance, programming, sponsoring, and garden. A place to relax with a drink and a snack, enjoying the sun, chatting with your friends, listening to music from a band or DJ, sometimes in a festival setting. Children who can play in the sand or join do special children's activities. Belcrum Beach is also a unique location for a party or to celebrate your birthday, getting married on the beach or a wedding are also possible.\n\nAdress:\tVeilingskade 12a\nOpening hours:\t12:00-19:00\nPhone:\t-\nDistance to: ",
     "imageUrl":"belcrum_beach",
     "iconUrl": "beach_icon"
   },
   {
     "name":"De Belcrum Watertoren (1935) Speelhuislaan 158",
     "coordinates":"51.60052702557225, 4.7689948674496145",
-    "description":"The water tower in the Belcrum in Breda is an industrial monument from the interwar period. The tower is the home base for SOAB advisers for housing and living environments and underlines the mission of our office. The tower is part of the Belcrum. As a landmark and as a shelter for activities. For example, the Belcrummers celebrated their 400th anniversary in the tower, and lunches with a guided tour are organized at a high level. Watch and taste. ",
+    "description":"The water tower in the Belcrum in Breda is an industrial monument from the interwar period. The tower is the home base for SOAB advisers for housing and living environments and underlines the mission of our office. The tower is part of the Belcrum. As a landmark and as a shelter for activities. For example, the Belcrummers celebrated their 400th anniversary in the tower, and lunches with a guided tour are organized at a high level. Watch and taste.\n\nAdress:\tSpeelhuislaan 158\nOpening hours:\t08:30-18:00\nPhone:\t076 521 3080\nDistance to: ",
     "imageUrl":"belcrum_watertoren",
     "iconUrl": "building_icon"
   }

app/src/main/assets/routes-nl.json

@@ -88,5 +88,40 @@
     "totalTime": 342342,
     "description": "Met deze route bezoekt u alle snackbars en restaurants in het centrum van Breda!",
     "imageURL": "kees_kroket"
+  },
+  {
+    "name": "Historische Route",
+    "locations": [
+      {
+        "name":"Koningin Wilhelmina Paviljoen Kraanstraat 4b",
+        "coordinates":"51.59040026960037, 4.775767751364238",
+        "description":"Koningin Wilhelmina Paviljoen is een bouwwerk in Breda Centrum in Breda. Het behoort tot de Koninklijke Militaire Academie (KMA) en bezit de status van rijksmonument. Het staat aan het Kasteelplein 15, vlak voor het Kasteel van Breda. Het ligt met de voorgevel aan de westkant van de oprijlaan van het kasteel, met de lange rechterzijgevel aan de kasteelgracht en de lange linkerzijgevel aan de Cingelstraat.\n\nAdres:\tKraanstraat 4b\nOpeningstijden:\tdi 11:00-16:00\nTelefoon:\t-\nAfstand tot: ",
+        "imageUrl":"koningin_wilhelimna_paviljoen",
+        "iconUrl": "building_icon"
+      },
+      {
+        "name":"Hercules en de Nemeïsche leeuw",
+        "coordinates":"51.59120082440261, 4.777904512729459",
+        "description":"Het beeld toont Hercules met de huid van de Nemeïsche leeuw. Herakles of Hercules is een figuur uit de Griekse mythologie. Hij was een Griekse heros en werd beroemd om de 12 moeilijke werken die hij uitvoerde in opdracht van koning Eurystheus. Het beeld maakt onderdeel uit van 17 anderen zandstenen beelden die Willem III tussen 1670 en 1686 kocht. De beelden stonden verdeeld over grasperken in het Valkenberg park.\nHercules is het enige originele beeld dat overgebleven is.\n\nAdres:\t4811 XJ Breda\nOpeningstijden:\t-\nTelefoon:\t14 076\nAfstand tot: ",
+        "imageUrl":"hercules_park_valkenburg",
+        "iconUrl": "statue_icon"
+      },
+      {
+        "name":"Nassau-Baroniemonument - 1905 - Pierre Cuypers Delpratsingel 1",
+        "coordinates":"51.59249639550226, 4.779742259785807",
+        "description":"Het Baroniemonument of Nassau-Baroniemonument is een beeld van de Nederlandse architect Pierre Cuypers. Het staat in het Park Valkenberg in Breda. Het monument werd geplaatst ter herinnering aan de 500-jarige band (1904) tussen Breda en het huis Oranje-Nassau. In 1404 werd Engelbrecht I van Nassau-Siegen gehuldigd als heer van Breda.\n\nAdres:\tDelpratsingel 1\nOpeningstijden:\t-\nTelefoon:\t14 076\nAfstand tot: ",
+        "imageUrl":"nassau_baroniemonument",
+        "iconUrl": "statue_icon"
+      },
+      {
+        "name":"De Belcrum Watertoren (1935) Speelhuislaan 158",
+        "coordinates":"51.60052702557225, 4.7689948674496145",
+        "description":"De watertoren in de Belcrum in Breda is een industrieel monument uit het interbellum. De toren is de thuisbasis voor SOAB adviseurs voor woning en leefomgeving en onderstreept de missie van ons bureau. De toren hoort bij de Belcrum. Als landmark en als onderdak voor activiteiten. Zo vierden de Belcrummers hun 400 jaar bestaan in de toren en worden lunches met rondleiding op hoog niveau georganiseerd. Kijken en proeven.\n\nAdres:\tSpeelhuislaan 158\nOpeningstijden:\t08:30-18:00\nTelefoon:\t076 521 3080\nAfstand tot: ",
+        "imageUrl":"belcrum_watertoren",
+        "iconUrl": "building_icon"
+      }
+    ],
+    "description": "Met deze route kan je de historische punten ontdekken in het centrum van Breda",
+    "imageURL": "hercules_park_valkenburg"
   }
 ]

app/src/main/assets/routes.json

@@ -1,6 +1,6 @@
 [
   {
-    "name": "Evenementen Route",
+    "name": "Event Route",
     "locations": [
       {
         "name": "Escaping Breda: Escape Room Games Boschstraat 114",
@@ -33,13 +33,11 @@
         "imageUrl": "het_klooster_breda"
       }
     ],
-    "totalDistance": 1073.0,
-    "totalTime": 342342,
     "description": "This route will show you different and fun events scattered all around Breda! Try the escape rooms, an event at the dome or a fun party at MEZZ! With this route you walk past them all!",
     "imageURL": "escaping_room"
   },
   {
-    "name": "Hongerige Route",
+    "name": "Hungry Route",
     "locations": [
       {
         "name":"Subway Karnemelkstraat 10 A, 1",
@@ -84,9 +82,41 @@
         "imageUrl": "de_boter_hal"
       }
     ],
-    "totalDistance": 955.0,
-    "totalTime": 342342,
     "description": "With this route you can visit all snackbars and restaurants in the centre of Breda!",
     "imageURL": "kees_kroket"
+  },
+  {
+    "name": "Historical Route",
+    "locations": [
+      {
+        "name":"Koningin Wilhelmina Paviljoen Kraanstraat 4b",
+        "coordinates":"51.59040026960037, 4.775767751364238",
+        "description":"Queen Wilhelmina Pavilion is a building in Breda Center in Breda. It belongs to the Royal Military Academy (KMA) and has the status of a national monument. It is located at Kasteelplein 15, just in front of Breda Castle. the west side of the driveway of the castle, with the long right side wall on the castle moat and the long left side wall on the Cingelstraat.\n\nAdress:\tKraanstraat 4b\nOpening hours:\tdi 11:00-16:00\nPhone:\t-\nDistance to: ",
+        "imageUrl":"koningin_wilhelimna_paviljoen",
+        "iconUrl": "building_icon"
+      },
+      {
+        "name":"Hercules en de Nemeïsche leeuw",
+        "coordinates":"51.59120082440261, 4.777904512729459",
+        "description":"The statue shows Hercules with the skin of the Nemean lion. Heracles or Hercules is a figure from Greek mythology. He was a Greek hero and became famous for the 12 difficult works he performed at the behest of King Eurystheus. The statue is part of the 17 other sandstone statues that Willem III bought between 1670 and 1686. The statues were spread over lawns in the Valkenberg park.\nHercules is the only original statue that remains.\n\nAdress:\t4811 XJ Breda\nOpening hours:\t-\nPhone:\t14 076\nDistance to: ",
+        "imageUrl":"hercules_park_valkenburg",
+        "iconUrl": "statue_icon"
+      },{
+        "name":"Nassau-Baroniemonument - 1905 - Pierre Cuypers Delpratsingel 1",
+        "coordinates":"51.59249639550226, 4.779742259785807",
+        "description":"The Baroniemonument or Nassau-Baroniemonument is a statue of the Dutch architect Pierre Cuypers. It is located in Park Valkenberg in Breda. The monument was placed in memorial of the 500-year bond (1904) between Breda and the Oranje-Nassau house. In 1404 Engelbrecht I of Nassau-Siegen was honored as lord of Breda.\n\nAdress:\tDelpratsingel 1\nOpening hours:\t-\nPhone:\t14 076\nDistance to: ",
+        "imageUrl":"nassau_baroniemonument",
+        "iconUrl": "statue_icon"
+      },
+      {
+        "name":"De Belcrum Watertoren (1935) Speelhuislaan 158",
+        "coordinates":"51.60052702557225, 4.7689948674496145",
+        "description":"The water tower in the Belcrum in Breda is an industrial monument from the interwar period. The tower is the home base for SOAB advisers for housing and living environments and underlines the mission of our office. The tower is part of the Belcrum. As a landmark and as a shelter for activities. For example, the Belcrummers celebrated their 400th anniversary in the tower, and lunches with a guided tour are organized at a high level. Watch and taste.\n\nAdress:\tSpeelhuislaan 158\nOpening hours:\t08:30-18:00\nPhone:\t076 521 3080\nDistance to: ",
+        "imageUrl":"belcrum_watertoren",
+        "iconUrl": "building_icon"
+      }
+    ],
+    "description": "With this route you can visit some historic points in the centre of Breda!",
+    "imageURL": "hercules_park_valkenburg"
   }
 ]

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

@@ -1,6 +1,7 @@
 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;
@@ -8,12 +9,16 @@ 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.data.Route;
 import com.a1.nextlocation.fragments.HelpPopup;
 import com.a1.nextlocation.fragments.HomeFragment;
+import com.a1.nextlocation.fragments.LocationFragment;
 import com.a1.nextlocation.fragments.Refreshable;
 import com.a1.nextlocation.fragments.RouteFragment;
 import com.a1.nextlocation.fragments.SettingsFragment;
@@ -29,6 +34,11 @@ public class MainActivity extends AppCompatActivity implements Refreshable {
     private static final String TAG = MainActivity.class.getName();
     private BottomNavigationView bottomNav;
     private ImageButton infoButton;
+    private HomeFragment homeFragment = new HomeFragment();
+    private RouteFragment routeFragment = new RouteFragment();
+    private StatisticFragment statisticFragment = new StatisticFragment();
+    private SettingsFragment settingsFragment = new SettingsFragment();
+
 
     /**
      * onCreate method that creates the main activity
@@ -59,9 +69,11 @@ 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();
+            getSupportFragmentManager().beginTransaction().replace(R.id.fragment_layout, homeFragment).commit();
         }
     }
 
@@ -91,24 +103,26 @@ public class MainActivity extends AppCompatActivity implements Refreshable {
 
     private final BottomNavigationView.OnNavigationItemSelectedListener navListener = item -> {
         Fragment selectedFragment = null;
-
         switch (item.getItemId()) {
             case R.id.locations:
-                selectedFragment = new HomeFragment();
+                selectedFragment = homeFragment;
                 break;
             case R.id.routes:
-                selectedFragment = new RouteFragment();
+                selectedFragment = routeFragment;
                 break;
             case R.id.statistics:
-                selectedFragment = new StatisticFragment();
+                selectedFragment = statisticFragment;
                 break;
             case R.id.settings:
-                selectedFragment = new SettingsFragment();
+                selectedFragment = settingsFragment;
                 break;
         }
 
-        getSupportFragmentManager().beginTransaction().replace(R.id.fragment_layout, selectedFragment).commit();
-        return true;
+        if (!selectedFragment.isVisible() && selectedFragment != null){
+            getSupportFragmentManager().beginTransaction().replace(R.id.fragment_layout, selectedFragment).commit();
+            return true;
+        }
+        return false;
     };
 
     /**
@@ -116,9 +130,10 @@ public class MainActivity extends AppCompatActivity implements Refreshable {
      */
     @Override
     public void refreshAndNavigateTo(int id) {
-        bottomNav.getMenu().clear();
-        bottomNav.inflateMenu(R.menu.navmenu);
-        bottomNav.setSelectedItemId(id);
+        this.setContentView(R.layout.activity_main);
+        BottomNavigationView navigationView = (BottomNavigationView)  this.findViewById(R.id.navigation_bar);
+        navigationView.setSelectedItemId(id);
+        navigationView.setOnNavigationItemSelectedListener(navListener);
     }
 
     private final View.OnClickListener onInfoClickListener = new View.OnClickListener() {

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

@@ -1,16 +1,49 @@
 package com.a1.nextlocation.data;
 
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.util.Log;
+
+import com.a1.nextlocation.recyclerview.LocationListManager;
+import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
+
+import java.lang.reflect.Type;
 import java.util.ArrayList;
+import java.util.Arrays;
 
 /**
  * singleton to keep track of different global data
  */
 public enum Data {
     INSTANCE;
+
+    private final String TAG = Data.class.getCanonicalName();
     private double distanceTraveled = 0;
     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;
+    }
+    private android.location.Location location;
 
     public double getZoom() {
         return zoom;
@@ -20,10 +53,13 @@ public enum Data {
         this.zoom = zoom;
     }
 
-    private final ArrayList<String> visitedNames = new ArrayList<>();
+    private ArrayList<String> visitedNames = new ArrayList<>();
 
     public void addDistance(double d) {
         distanceTraveled += d;
+
+        editor.putString("distanceTraveled", String.valueOf(distanceTraveled));
+        editor.apply();
     }
 
     public long getTotalTime() {
@@ -32,8 +68,10 @@ public enum Data {
 
     public void addTimeWalked(long time) {
         totalTime += time;
-    }
 
+        editor.putLong("timeWalked", totalTime);
+        editor.apply();
+    }
 
     public double getDistanceTraveled() {
         return distanceTraveled;
@@ -43,6 +81,9 @@ public enum Data {
         if (!visitedNames.contains(location.getName())) {
             locationsVisited++;
             visitedNames.add(location.getName());
+            saveVisitedNamesList();
+            editor.putInt("locationsVisited", locationsVisited);
+            editor.apply();
         }
     }
 
@@ -50,5 +91,66 @@ 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);
+        Log.i(TAG, "loadAndGetVisitedNamesList: visited names: " + Arrays.toString(visitedNames.toArray()));
+        return visitedNames;
+    }
+
+
+    public void load(){
+        SharedPreferences prefs = context.getSharedPreferences("Data", Context.MODE_PRIVATE);
+        this.editor = prefs.edit();
+        this.distanceTraveled = (Double.parseDouble(prefs.getString("distanceTraveled", "0")));
+
+        this.locationsVisited = loadAndGetVisitedNamesList().size();
+        syncLocationObjectsWithList();
+        this.totalTime = prefs.getLong("timeWalked", 0);
+    }
+
+    /**
+     * sync the visited boolean for location objects with the received list
+     */
+    private void syncLocationObjectsWithList() {
+        for (Location l : LocationListManager.INSTANCE.getLocationList()) {
+            if (visitedNames.contains(l.getName())) l.setVisited(true);
+        }
+    }
+
+    /**
+     * clears the visited locations
+     */
+    public void clearVisitedLocations() {
+        visitedNames.clear();
+        locationsVisited = 0;
+        for (Location l : LocationListManager.INSTANCE.getLocationList()) {
+            l.setVisited(false);
+        }
+    }
+
+    public boolean isVisited(Location location) {
+        return this.visitedNames.contains(location.getName());
+    }
+
+    public android.location.Location getLocation() {
+        return location;
+    }
+
+    public void setLocation(android.location.Location location) {
+        this.location = location;
+    }
 }

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

@@ -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;
+    }
 }

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

@@ -81,7 +81,6 @@ public class Route implements Parcelable {
 
 
     public int getTotalTime() {
-
         return totalTime;
     }
 
@@ -113,4 +112,13 @@ public class Route implements Parcelable {
     public void setDescription(String description) {
         this.description = description;
     }
+
+    public void setLocationVisited(Location location) {
+        for (Location l : this.locations) {
+            if (l.getName().equals(location.getName())) {
+                l.setVisited(true);
+                break;
+            }
+        }
+    }
 }

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

@@ -13,6 +13,15 @@ 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;
 
@@ -20,6 +29,7 @@ public enum RouteHandler {
         this.currentRouteLine = currentRouteLine;
     }
 
+
     public Polyline getCurrentRouteLine() {
         return currentRouteLine;
     }
@@ -54,6 +64,14 @@ public enum RouteHandler {
             Data.INSTANCE.addTimeWalked(System.currentTimeMillis() - startedTime);
         }
         this.currentRoute = route;
+
+        // sync the visited locations with the route
+        for (Location l : this.currentRoute.getLocations()) {
+            if (Data.INSTANCE.isVisited(l)) {
+                this.currentRoute.setLocationVisited(l);
+            }
+        }
+
         setFollowingRoute(true);
         startedTime = System.currentTimeMillis();
     }

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

@@ -53,7 +53,8 @@ public class CouponFragment extends Fragment {
         this.backButton = view.findViewById(R.id.coupon_back_button);
         this.backButton.setOnClickListener(v -> {
             StatisticFragment statisticFragment = new StatisticFragment();
-            ((FragmentActivity) view.getContext()).getSupportFragmentManager().beginTransaction().replace(R.id.fragment_layout, statisticFragment).addToBackStack(null).commit();
+            if (getActivity() != null)
+            getActivity().getSupportFragmentManager().beginTransaction().replace(R.id.fragment_layout, statisticFragment).addToBackStack(null).commit();
         });
 
         this.couponRecyclerView.setLayoutManager(this.layoutManager);

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

@@ -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,13 +21,14 @@ 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;
 
 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 +63,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 +76,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
@@ -83,7 +89,8 @@ public class HomeFragment extends Fragment implements LocationListener {
         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();
+            if (getActivity() != null)
+                getActivity().getSupportFragmentManager().beginTransaction().replace(R.id.fragment_layout, locationFragment).addToBackStack(null).commit();
         });
 
         // set up the route stop button
@@ -132,6 +139,7 @@ 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!");
 
@@ -141,6 +149,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);
     }
 
@@ -197,7 +206,7 @@ public class HomeFragment extends Fragment implements LocationListener {
             if (currentLocation == null) currentLocation = location;
 
             if (location != null) {
-                GeoPoint start = new GeoPoint(location.getLatitude(), location.getLongitude());
+                GeoPoint start = new GeoPoint(currentLocation.getLatitude(), currentLocation.getLongitude());
                 mapController.setCenter(start);
             }
 
@@ -217,6 +226,7 @@ public class HomeFragment extends Fragment implements LocationListener {
 
     }
 
+
     /**
      * displays the route that is currently being followed as a red line
      */
@@ -245,15 +255,25 @@ 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.primaryColour));
 
         // add all locations to the overlay itemss
         for (com.a1.nextlocation.data.Location location : locations) {
             OverlayItem item = new OverlayItem(location.getName(), location.getDescription(), location.convertToGeoPoint());
+            Drawable marker = null;
+            if (location.isVisited()) {
+                Log.d(TAG, "addLocations: location " + location.getName() + " is visited");
+                marker = ContextCompat.getDrawable(requireContext(), R.drawable.ic_baseline_location_on_24);
+                marker.setAlpha(255);
+                marker.setTint(getResources().getColor(R.color.red));
+            } else {
+                Log.d(TAG, "addLocations: location " + location.getName() + " is not visited");
+                marker = ContextCompat.getDrawable(requireContext(), R.drawable.ic_baseline_location_on_24_2);
+                marker.setAlpha(255);
+                marker.setTint(getResources().getColor(R.color.secondaryColour));
+            }
             item.setMarker(marker);
             items.add(item);
         }
@@ -299,6 +319,21 @@ public class HomeFragment extends Fragment implements LocationListener {
         mapView.getOverlays().add(allLocationsOverlay);
         Log.d(TAG, "addLocations: successfully added locations");
 
+        mapView.invalidate();
+        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);
     }
 
     /**
@@ -336,33 +371,62 @@ 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 && distance > 0.1) {
                 Data.INSTANCE.addDistance(distance);
-        }
-        currentLocation = location;
-
-
-        //new thread because we don't want the main thread to hang, this method gets called a lot
-        Thread t = new Thread(() -> {
-            com.a1.nextlocation.data.Location last = null;
-            if (RouteHandler.INSTANCE.isFollowingRoute()) {
-                List<com.a1.nextlocation.data.Location> locs = RouteHandler.INSTANCE.getCurrentRoute().getLocations();
-                last = locs.get(locs.size() - 1);
+                Data.INSTANCE.setLocation(location);
             }
+            currentLocation = location;
 
-            for (com.a1.nextlocation.data.Location l : LocationListManager.INSTANCE.getLocationList()) {
-                // mark the location visited if we are less than 20 meters away
-                if (com.a1.nextlocation.data.Location.getDistance(currentLocation.getLatitude(), currentLocation.getLongitude(), l.getLat(), l.getLong()) < 20) {
-                    Data.INSTANCE.visitLocation(l);
-                    if (l.equals(last)) stopRoute();
+
+            //new thread because we don't want the main thread to hang, this method gets called a lot
+            Thread t = new Thread(() -> {
+                com.a1.nextlocation.data.Location last = null;
+                if (RouteHandler.INSTANCE.isFollowingRoute()) {
+                    List<com.a1.nextlocation.data.Location> locs = RouteHandler.INSTANCE.getCurrentRoute().getLocations();
+                    last = locs.get(locs.size() - 1);
                 }
-            }
 
-            Data.INSTANCE.setZoom(mapView.getZoomLevelDouble());
-        });
+                for (com.a1.nextlocation.data.Location l : LocationListManager.INSTANCE.getLocationList()) {
+                    // mark the location visited if we are less than 20 meters away
+                    if (com.a1.nextlocation.data.Location.getDistance(currentLocation.getLatitude(), currentLocation.getLongitude(), l.getLat(), l.getLong()) < 20) {
+                        Data.INSTANCE.visitLocation(l);
+                        if (l.equals(last)) stopRoute();
+                    }
+                }
 
-        t.start();
+                Data.INSTANCE.setZoom(mapView.getZoomLevelDouble());
+            });
 
+            t.start();
+
+        }
+    }
+
+    public void onLocationVisited(com.a1.nextlocation.data.Location location) {
+        location.setVisited(true);
+        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

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

@@ -1,5 +1,7 @@
 package com.a1.nextlocation.fragments;
 
+import android.annotation.SuppressLint;
+import android.content.Context;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -10,9 +12,9 @@ import android.widget.ImageView;
 import android.widget.TextView;
 
 import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentActivity;
 
 import com.a1.nextlocation.R;
+import com.a1.nextlocation.data.Data;
 import com.a1.nextlocation.data.Location;
 import com.a1.nextlocation.recyclerview.LocationListManager;
 
@@ -37,6 +39,7 @@ public class LocationDetailFragment extends Fragment {
         super.onCreate(savedInstanceState);
     }
 
+    @SuppressLint("DefaultLocale")
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
 
@@ -45,14 +48,33 @@ public class LocationDetailFragment extends Fragment {
         this.titelText = view.findViewById(R.id.detail_location_name);
         this.titelText.setText(location.getName());
 
+        double currentDistanceToLocation = 0.0;
+        if (Data.INSTANCE.getLocation() != null) {
+            currentDistanceToLocation = Location.getDistance(Data.INSTANCE.getLocation().getLatitude(), Data.INSTANCE.getLocation().getLongitude(), this.location.getLat(), this.location.getLong());
+        }
+
+        //Adds distance text from the current distance of the user to the opened location
+        String detailText;
+        if (getContext().getSharedPreferences("Settings", Context.MODE_PRIVATE).getBoolean("imperialSwitch", false)) {
+            if (currentDistanceToLocation > 1609)
+                detailText = location.getDescription() + String.format("%.3f", currentDistanceToLocation * 0.000621371192) + "mi";
+            else
+                detailText = location.getDescription() + String.format("%.2f", currentDistanceToLocation * 1.0936133) + "yd";
+        } else {
+            if (currentDistanceToLocation > 1000)
+                detailText = location.getDescription() + String.format("%.3f", currentDistanceToLocation / 1000) + "km";
+            else
+                detailText = location.getDescription() + currentDistanceToLocation + "m";
+        }
         this.detailText = view.findViewById(R.id.detail_location_text);
-        this.detailText.setText(location.getDescription());
+        this.detailText.setText(detailText);
 
         //Initialises the back button
         this.backButton = view.findViewById(R.id.detail_location_back_button);
         this.backButton.setOnClickListener(v -> {
             LocationFragment locationFragment = new LocationFragment();
-            ((FragmentActivity) view.getContext()).getSupportFragmentManager().beginTransaction().replace(R.id.fragment_layout, locationFragment).addToBackStack(null).commit();
+            if (getActivity() != null)
+                getActivity().getSupportFragmentManager().beginTransaction().replace(R.id.fragment_layout, locationFragment).addToBackStack(null).commit();
         });
 
         //Logs the location

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

@@ -43,7 +43,8 @@ public class LocationFragment extends Fragment {
         this.backButton = view.findViewById(R.id.location_back_button);
         this.backButton.setOnClickListener(v -> {
             HomeFragment homeFragment = new HomeFragment();
-            ((FragmentActivity) view.getContext()).getSupportFragmentManager().beginTransaction().replace(R.id.fragment_layout, homeFragment).addToBackStack(null).commit();
+            if (getActivity() != null)
+                getActivity().getSupportFragmentManager().beginTransaction().replace(R.id.fragment_layout, homeFragment).addToBackStack(null).commit();
         });
 
         //Loads the location list
@@ -58,7 +59,8 @@ public class LocationFragment extends Fragment {
             //Gives the clicked location to the adapter
             locationBundle.putParcelable("location", this.locationList.get(clickedPosition));
             locationDetailFragment.setArguments(locationBundle);
-            ((FragmentActivity) view.getContext()).getSupportFragmentManager().beginTransaction().replace(R.id.fragment_layout, locationDetailFragment).addToBackStack(null).commit();
+            if (getActivity() != null)
+            getActivity().getSupportFragmentManager().beginTransaction().replace(R.id.fragment_layout, locationDetailFragment).addToBackStack(null).commit();
         });
 
         this.locationRecyclerView.setLayoutManager(this.layoutManager);

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

@@ -3,6 +3,7 @@ package com.a1.nextlocation.fragments;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.os.Bundle;
+import android.text.Html;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -13,7 +14,6 @@ import android.widget.TextView;
 import android.widget.Toast;
 
 import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentActivity;
 
 import com.a1.nextlocation.R;
 import com.a1.nextlocation.data.Location;
@@ -30,6 +30,7 @@ public class RouteDetailFragment extends Fragment {
 
     private Route route;
     private Refreshable refreshable;
+    private String time;
 
     @Override
     public void onAttach(@NotNull Context context) {
@@ -44,7 +45,7 @@ public class RouteDetailFragment extends Fragment {
 
     }
 
-    @SuppressLint("SetTextI18n")
+    @SuppressLint({"SetTextI18n", "DefaultLocale"})
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         View view = inflater.inflate(R.layout.fragment_route_detail, container, false);
@@ -60,19 +61,26 @@ public class RouteDetailFragment extends Fragment {
         TextView routeName = view.findViewById(R.id.route_title);
         routeName.setText(this.route.getName());
 
-        TextView routeDetailText = view.findViewById(R.id.reoute_detail_tekst);
-        routeDetailText.setText(this.route.getDescription());
+        TextView routeDetailText = view.findViewById(R.id.route_detail_tekst);
+        StringBuilder locations = new StringBuilder();
+        for (Location location : this.route.getLocations()) {
+            locations.append("<br>•").append(location.getName());
+        }
+        String detailText = this.route.getDescription() + "<br><br><b>" + getResources().getString(R.string.following_locations) + "</b>" + locations + "<br><br><b>" + getResources().getString(R.string.start_location) + ": </b>" + route.getLocations().get(0).getName() + "<br>" + "<b>" + getResources().getString(R.string.end_location) + ": </b>" + route.getLocations().get(route.getLocations().size() - 1).getName();
+        routeDetailText.setText(Html.fromHtml(detailText));
 
+        //sets the text of the totaldistance
         TextView totalDistance = view.findViewById(R.id.total_distance);
-        String distance_tekst = getResources().getString(R.string.total_distance_route);
+        //looks if imperial units or metric
         boolean imperialChecked = getContext().getSharedPreferences("Settings", Context.MODE_PRIVATE).getBoolean("imperialSwitch", false);
-        totalDistance.setText(distance_tekst + " " + String.format("%.1f", calculateRoute(this.route.getLocations())) + (imperialChecked ? "ft" : "m"));
+        totalDistance.setText(getResources().getString(R.string.total_distance_route) + " " + String.format("%.1f", calculateRoute(this.route.getLocations())) + (imperialChecked ? "yd" : "m") + "\n" + getResources().getString(R.string.total_time) + " " + this.time);
 
         //Initialises the back button
         ImageButton backButton = view.findViewById(R.id.route_detail_back_button);
         backButton.setOnClickListener(v -> {
             RouteFragment routeFragment = new RouteFragment();
-            ((FragmentActivity) view.getContext()).getSupportFragmentManager().beginTransaction().replace(R.id.fragment_layout, routeFragment).addToBackStack(null).commit();
+            if (getActivity() != null)
+                getActivity().getSupportFragmentManager().beginTransaction().replace(R.id.fragment_layout, routeFragment).addToBackStack(null).commit();
         });
 
         Button startButton = view.findViewById(R.id.start_route_button);
@@ -89,9 +97,10 @@ public class RouteDetailFragment extends Fragment {
     public void startRoute(View view) {
         ApiHandler.INSTANCE.getDirections(route);
         RouteHandler.INSTANCE.followRoute(route);
-        Toast.makeText(requireContext(), "Route started!", Toast.LENGTH_SHORT).show();
+        Toast.makeText(requireContext(), R.string.route_started_toast, Toast.LENGTH_SHORT).show();
         // navigates to the HomeFragment and refreshes the BottomNavigation
         refreshable.refreshAndNavigateTo(R.id.locations);
+        requireActivity().getSupportFragmentManager().beginTransaction().replace(R.id.fragment_layout, new HomeFragment()).commit();
     }
 
     /**
@@ -116,11 +125,23 @@ public class RouteDetailFragment extends Fragment {
         }
         System.out.println("Total Distance:  " + totalDistance);
 
+        calculateTime(totalDistance);
         // if the imperialSwitch is checked, return feet, if not, return meters
         if (getContext().getSharedPreferences("Settings", Context.MODE_PRIVATE).getBoolean("imperialSwitch", false))
-            return totalDistance *3.28084;
+            return totalDistance * 1.0936133;
         else
             return totalDistance;
     }
 
+    @SuppressLint("DefaultLocale")
+    public void calculateTime(double totalDistance){
+        double totalTimeInMinutes = ((totalDistance / 1000) / 5) * 60;
+        if(totalTimeInMinutes > 60) {
+            int hours = (int)(totalTimeInMinutes / 60);
+            int minutes = (int)(totalTimeInMinutes % 60);
+            this.time = hours + " " + getResources().getString(R.string.hour) + " " + minutes + " " +  getResources().getString(R.string.minutes);
+        }
+        else this.time = (int)(((totalDistance / 1000) / 5) * 60) + " " + getResources().getString(R.string.minutes);
+    }
+
 }

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

@@ -1,5 +1,6 @@
 package com.a1.nextlocation.fragments;
 
+import android.content.Context;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -9,7 +10,6 @@ import android.widget.ImageButton;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentActivity;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
@@ -18,12 +18,21 @@ import com.a1.nextlocation.data.Route;
 import com.a1.nextlocation.recyclerview.RouteAdapter;
 import com.a1.nextlocation.recyclerview.RouteListManager;
 
+import org.jetbrains.annotations.NotNull;
+
 import java.util.List;
 
 public class RouteFragment extends Fragment {
     private static final String TAG = RouteFragment.class.getCanonicalName();
 
     private List<Route> routeList;
+    private Refreshable refreshable;
+
+    @Override
+    public void onAttach(@NotNull Context context) {
+        super.onAttach(context);
+        refreshable = (Refreshable) context;
+    }
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -49,13 +58,17 @@ public class RouteFragment extends Fragment {
             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();
+            if (getActivity() != null)
+                getActivity().getSupportFragmentManager().beginTransaction().replace(R.id.fragment_layout, routeDetailFragment).addToBackStack(null).commit();
         });
 
         ImageButton backButton = view.findViewById(R.id.route_back_button);
         backButton.setOnClickListener(v -> {
             HomeFragment homeFragment = new HomeFragment();
-            ((FragmentActivity) view.getContext()).getSupportFragmentManager().beginTransaction().replace(R.id.fragment_layout, homeFragment).addToBackStack(null).commit();
+            if (getActivity() != null) {
+                getActivity().getSupportFragmentManager().beginTransaction().replace(R.id.fragment_layout, homeFragment).addToBackStack(null).commit();
+                refreshable.refreshAndNavigateTo(R.id.map_view);
+            }
         });
 
         routeRecyclerView.setLayoutManager(layoutManager);

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.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -13,12 +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.R;
+import com.a1.nextlocation.data.Data;
 
 import org.jetbrains.annotations.NotNull;
 
@@ -29,6 +31,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 +45,7 @@ public class SettingsFragment extends Fragment {
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         editor = getContext().getSharedPreferences("Settings", Context.MODE_PRIVATE).edit();
+
     }
 
     @Override
@@ -61,8 +65,10 @@ public class SettingsFragment extends Fragment {
         ImageView backButton = view.findViewById(R.id.settings_back_button);
         backButton.setOnClickListener(v -> {
             HomeFragment homeFragment = new HomeFragment();
-            ((FragmentActivity) view.getContext()).getSupportFragmentManager().beginTransaction().replace(R.id.fragment_layout, homeFragment).addToBackStack(null).commit();
-        });
+            if (getActivity() != null) {
+                getActivity().getSupportFragmentManager().beginTransaction().replace(R.id.fragment_layout, homeFragment).addToBackStack(null).commit();
+                refreshable.refreshAndNavigateTo(R.id.map_view);
+            }});
 
         SharedPreferences sharedPreferences = getContext().getSharedPreferences("Settings", Context.MODE_PRIVATE);
 
@@ -82,29 +88,50 @@ public class SettingsFragment extends Fragment {
         fontSwitch.setChecked(sharedPreferences.getBoolean("fontSwitch", false));
 
         //Initial check to see what setting was last chosen
-        if (fontSwitch.isChecked()){
+        if (fontSwitch.isChecked()) {
             requireActivity().setTheme(R.style.Theme_NextLocationBig);
-        }else if (!fontSwitch.isChecked()){
+        } else if (!fontSwitch.isChecked()) {
             requireActivity().setTheme(R.style.Theme_NextLocation);
         }
 
         //Changes the font settings depending on the state of the toggle
 
         fontSwitch.setOnClickListener(view1 -> {
-            if(fontSwitch.isChecked())
-            {
+            if (fontSwitch.isChecked()) {
                 requireActivity().setTheme(R.style.Theme_NextLocationBig);
-                editor.putBoolean("fontSwitch",true);
-                editor.apply();
+                getActivity().recreate();
             }
             if(!fontSwitch.isChecked())
             {
                 requireActivity().setTheme(R.style.Theme_NextLocation);
-                editor.putBoolean("fontSwitch",false);
-                editor.apply();
+                getActivity().recreate();
             }
+            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

@@ -19,9 +19,19 @@ import com.a1.nextlocation.data.Data;
 import com.a1.nextlocation.recyclerview.CouponAdapter;
 import com.a1.nextlocation.recyclerview.CouponListManager;
 
+import org.jetbrains.annotations.NotNull;
+
 import java.util.List;
 
 public class StatisticFragment extends Fragment {
+    private TextView distance;
+    private Refreshable refreshable;
+
+    @Override
+    public void onAttach(@NotNull Context context) {
+        super.onAttach(context);
+        refreshable = (Refreshable) context;
+    }
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -36,9 +46,7 @@ public class StatisticFragment extends Fragment {
         initializeDistanceTextView(view);
         TextView locs = view.findViewById(R.id.statistics_locations_visited);
         TextView timeText = view.findViewById(R.id.statistics_time_value);
-      
-        double dist = Data.INSTANCE.getDistanceTraveled() / 1000;
-        distance.setText("" + String.format("%.1f", dist) + " km");
+
         locs.setText("" + Data.INSTANCE.getLocationsVisited());
 
         long seconds = Data.INSTANCE.getTotalTime() / 1000;
@@ -59,28 +67,32 @@ public class StatisticFragment extends Fragment {
         ImageView backButton = view.findViewById(R.id.statistics_back_button);
         backButton.setOnClickListener(v -> {
             HomeFragment homeFragment = new HomeFragment();
-            ((FragmentActivity) view.getContext()).getSupportFragmentManager().beginTransaction().replace(R.id.fragment_layout, homeFragment).addToBackStack(null).commit();
+            if (getActivity() != null)
+            getActivity().getSupportFragmentManager().beginTransaction().replace(R.id.fragment_layout, homeFragment).addToBackStack(null).commit();
+            refreshable.refreshAndNavigateTo(R.id.map_view);
         });
 
         //Initialises the coupon button
         ImageView couponButton = view.findViewById(R.id.coupon_button);
         couponButton.setOnClickListener(v -> {
             CouponFragment couponFragment = new CouponFragment();
-            ((FragmentActivity) view.getContext()).getSupportFragmentManager().beginTransaction().replace(R.id.fragment_layout, couponFragment).addToBackStack(null).commit();
+            if (getActivity() != null)
+            getActivity().getSupportFragmentManager().beginTransaction().replace(R.id.fragment_layout, couponFragment).addToBackStack(null).commit();
         });
 
         //Makes the constraintlayout clickable and opens the same layout as the coupon button
         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();
+            if (getActivity() != null)
+            getActivity().getSupportFragmentManager().beginTransaction().replace(R.id.fragment_layout, couponFragment).addToBackStack(null).commit();
         });
         return view;
     }
 
     private void initializeDistanceTextView(View view){
-        TextView distance = view.findViewById(R.id.statistics_km);
-        double dist = Data.INSTANCE.getDistanceTraveled()/1000;
+        distance = view.findViewById(R.id.statistics_km);
+        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

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

@@ -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;
+    }
+}

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

@@ -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, 60);
+        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/drawable-anydpi/ic_stop_icon.xml

@@ -6,7 +6,7 @@
     android:tint="#333333"
     android:alpha="0.6">
   <path
-      android:fillColor="@android:color/white"
+      android:fillColor="@color/primaryColour"
       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>

app/src/main/res/drawable/ic_baseline_location_on_24.xml

@@ -1,10 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
+    android:width="32dp"
+    android:height="32dp"
     android:viewportWidth="24"
     android:viewportHeight="24"
     android:tint="?attr/colorControlNormal">
   <path
-      android:fillColor="@color/primaryColour"
+      android:fillColor="@color/secondaryColour"
       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>

app/src/main/res/drawable/ic_baseline_location_on_24_2.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="32dp"
+    android:height="32dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@color/secondaryColour"
+      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>

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

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

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

@@ -5,6 +5,15 @@
     android:id="@+id/couponItem"
     android:layout_height="wrap_content">
 
+    <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"
@@ -13,7 +22,7 @@
         android:layout_marginTop="16dp"
         android:layout_marginBottom="16dp"
 
-        android:background="@color/secondaryColour"
+        android:background="@color/primaryColour"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.4"
@@ -26,7 +35,7 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="20dp"
             android:text=""
-            android:textColor="@color/black"
+            android:textColor="@color/secondaryColour"
             android:textSize="20sp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"

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

@@ -14,10 +14,13 @@
         android:layout_height="wrap_content"
         android:layout_margin="9dp"
         android:layout_marginTop="20dp"
-        android:text="@string/statistics"
-        android:textSize="20sp"
-        app:layout_constraintStart_toEndOf="@id/coupon_back_button"
-        app:layout_constraintTop_toTopOf="parent" />
+        android:text="@string/coupons"
+        android:textSize="30sp"
+        android:textColor="@color/secondaryColour"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="@id/coupon_back_button"
+        app:layout_constraintBottom_toBottomOf="@id/coupon_back_button"/>
 
     <ImageButton
         android:id="@+id/coupon_back_button"
@@ -26,7 +29,6 @@
         android:layout_marginStart="10dp"
         android:layout_marginTop="12dp"
         android:background="@drawable/ic_back_button_24"
-        android:backgroundTint="@color/buttonColour"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 

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

@@ -24,7 +24,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="20dp"
             android:layout_marginEnd="20dp"
-            android:backgroundTint="@color/secondaryColour"
+            android:backgroundTint="@color/primaryColour"
             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/secondaryColour"
+            android:backgroundTint="@color/primaryColour"
             android:src="@drawable/ic_stop_icon"/>
     </androidx.constraintlayout.widget.ConstraintLayout>
 

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

@@ -15,8 +15,9 @@
         android:layout_margin="9dp"
         android:layout_marginTop="20dp"
         android:text="@string/locations"
-        android:textSize="20sp"
-        app:layout_constraintStart_toEndOf="@id/location_back_button"
+        android:textSize="30sp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
     <ImageButton
@@ -26,7 +27,6 @@
         android:layout_marginStart="10dp"
         android:layout_marginTop="12dp"
         android:background="@drawable/ic_back_button_24"
-        android:backgroundTint="@color/buttonColour"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 

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

@@ -14,7 +14,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
         android:text=""
-        android:textColor="@color/white"
+        android:textColor="@color/secondaryColour"
         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/secondaryColour"
+        android:background="@color/primaryColour"
         android:text=""
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -45,13 +45,12 @@
             android:id="@+id/detail_location_text"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="@color/secondaryColour"
+            android:layout_marginHorizontal="20dp"
+            android:background="@color/primaryColour"
             android:text=""
              />
     </ScrollView>
 
-
-
     <ImageButton
         android:id="@+id/detail_location_back_button"
         android:layout_width="wrap_content"

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

@@ -19,13 +19,16 @@
 
     <TextView
         android:id="@+id/route_title"
+        android:textColor="@color/secondaryColour"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_margin="9dp"
         android:text="@string/routes"
-        android:textSize="20sp"
-        app:layout_constraintStart_toEndOf="@id/route_back_button"
-        app:layout_constraintTop_toTopOf="parent" />
+        android:textSize="30sp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="@id/route_back_button"
+        app:layout_constraintBottom_toBottomOf="@id/route_back_button"/>
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/route_recyclerview"

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

@@ -13,7 +13,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="20dp"
-        android:layout_marginTop="20dp"
         android:background="@drawable/ic_back_button_24"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
@@ -22,7 +21,7 @@
         android:id="@+id/route_title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textColor="@color/white"
+        android:textColor="@color/secondaryColour"
         android:textSize="30sp"
         app:layout_constraintBottom_toTopOf="@+id/route_detail_image"
         android:text=""
@@ -31,37 +30,43 @@
         app:layout_constraintTop_toTopOf="parent" />
 
     <ImageView
-        android:layout_width="250dp"
-        android:layout_height="250dp"
-        android:layout_margin="40dp"
         android:id="@+id/route_detail_image"
-        app:layout_constraintTop_toBottomOf="@id/route_detail_back_button"
-        app:layout_constraintStart_toStartOf="parent"
+        android:layout_width="228dp"
+        android:layout_height="208dp"
+        android:layout_margin="40dp"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintBottom_toTopOf="@id/reoute_detail_tekst" />
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/route_detail_back_button" />
 
-    <TextView
-        android:id="@+id/reoute_detail_tekst"
+    <ScrollView
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginHorizontal="20dp"
-        android:layout_marginTop="20dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.6"
+        android:layout_height="200dp"
+        android:layout_margin="20dp"
+        android:background="@color/primaryColour"
+        android:id="@+id/route_scroll_view"
+        app:layout_constraintTop_toBottomOf="@id/route_detail_image"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/route_detail_image" />
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintBottom_toTopOf="@id/total_distance">
+
+        <TextView
+            android:id="@+id/route_detail_tekst"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="20dp" />
+    </ScrollView>
+
 
     <Button
         android:id="@+id/start_route_button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="45dp"
         android:backgroundTint="@color/secondaryColour"
         android:text="@string/start_route"
-        android:textColor="@color/buttonColour"
+        android:textColor="@color/primaryColour"
+        android:layout_marginBottom="50dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.498"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/total_distance" />
 
@@ -69,14 +74,13 @@
         android:id="@+id/total_distance"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="20dp"
-        android:background="@color/secondaryColour"
+        android:background="@color/primaryColour"
         android:text="@string/total_distance"
-        android:textColor="@color/buttonColour"
+        android:textColor="@color/secondaryColour"
         app:layout_constraintBottom_toTopOf="@+id/start_route_button"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.498"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/reoute_detail_tekst" />
+        app:layout_constraintTop_toBottomOf="@+id/route_scroll_view" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>

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"
@@ -14,8 +15,7 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="10dp"
         android:layout_marginTop="10dp"
-        android:backgroundTint="@color/primaryColour"
-        android:src="@drawable/ic_back_button_24"
+        android:background="@drawable/ic_back_button_24"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
@@ -25,12 +25,22 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="10dp"
         android:text="@string/settings"
-        android:textColor="@color/white"
+        android:textColor="@color/secondaryColour"
         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"
@@ -39,16 +49,15 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/textView"
-        android:background="@color/secondaryColour"
+        android:background="@color/primaryColour"
         android:layout_marginHorizontal="20dp"
-
         >
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/language"
-            android:textColor="@color/black"
+            android:textColor="@color/secondaryColour"
             android:textSize="20sp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="@id/Balk"
@@ -57,9 +66,9 @@
 
         <View
             android:id="@+id/Balk"
-            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"
@@ -79,12 +88,22 @@
 
     </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/secondaryColour"
+        android:background="@color/primaryColour"
         app:layout_constraintBottom_toTopOf="@id/Box3"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -96,7 +115,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/imperial_system"
-            android:textColor="@color/black"
+            android:textColor="@color/secondaryColour"
             android:textSize="20sp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="@id/Balk2"
@@ -105,9 +124,9 @@
 
         <View
             android:id="@+id/Balk2"
-            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"
@@ -126,13 +145,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/secondaryColour"
-        app:layout_constraintBottom_toBottomOf="parent"
+        android:background="@color/primaryColour"
+        app:layout_constraintBottom_toTopOf="@id/Box4"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/Box2"
@@ -142,7 +170,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/_65_mode"
-            android:textColor="@color/black"
+            android:textColor="@color/secondaryColour"
             android:textSize="20sp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="@id/Balk3"
@@ -151,9 +179,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 +196,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

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

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

@@ -16,30 +16,34 @@
         android:layout_width="300dp"
         android:layout_height="50dp"
         android:text="@string/help"
-        android:textColor="@color/black"
+        android:textColor="@color/secondaryColour"
         android:textAlignment="center"
-        android:background="@color/secondaryColour"
+        android:background="@color/primaryColour"
         android:paddingVertical="10dp"/>
 
     <ScrollView
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/helpPopTitle"
+        android:id="@+id/scrollView2"
         android:layout_width="300dp"
-        android:layout_height="450dp">
+        android:layout_height="400dp"
+        android:layout_marginHorizontal="10dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/helpPopTitle"
+        app:layout_constraintBottom_toTopOf="@id/help_ok_button"
+        >
 
         <TextView
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/helpPopTitle"
             android:layout_width="280dp"
             android:layout_height="430dp"
-            android:text="@string/help_discription"
-            android:textColor="@color/white"
             android:layout_marginStart="10dp"
-            android:layout_marginEnd="10dp"
             android:layout_marginTop="10dp"
-            android:layout_marginBottom="10dp"/>
+            android:layout_marginEnd="10dp"
+            android:layout_marginBottom="10dp"
+            android:text="@string/help_discription"
+            android:textColor="@color/secondaryColour"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/helpPopTitle" />
 
 
     </ScrollView>
@@ -48,10 +52,13 @@
         android:id="@+id/help_ok_button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="16dp"
+        android:backgroundTint="@color/buttonColour"
+        android:textColor="@color/primaryColour"
         android:text="ok"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/helpPopTitle" />
+        app:layout_constraintTop_toBottomOf="@id/scrollView2"
+        app:layout_constraintStart_toStartOf="parent" />
 
 
 

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

@@ -4,10 +4,28 @@
     android:layout_width="match_parent"
     android:layout_height="50dp"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:background="@color/secondaryColour"
+    android:background="@color/primaryColour"
     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"
@@ -25,6 +43,7 @@
         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"

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

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

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/white</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/secondaryColour</item>
+        <item name="colorSwitchThumbNormal">@color/buttonColourCB</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

@@ -12,7 +12,7 @@
     <string name="colorblind">Kleurenblind</string>
     <string name="total_distance">Totale afstand:</string>
     <string name="visited_locations">Bezochte locaties:</string>
-    <string name="total_time">Totale tijd:</string>
+    <string name="total_time">Totale route tijd:</string>
     <string name="coupons_collected">Coupons gespaard:</string>
     <string name="coupons">Coupons</string>
     <string name="start_route">Start Route</string>
@@ -20,10 +20,19 @@
     <string name="activate">activeren</string>
     <string name="done">Klaar</string>
     <string name="total_distance_route">De totale afstand van de route is: </string>
+    <string name="route_stop_toast">Route is gestopt!</string>
     <string name="cancel">annuleren</string>
     <string name="English">Engels</string>
     <string name="Dutch">Nederlands</string>
     <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="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. \n\n\n</string>
+    <string name="end_location">Eind locatie</string>
+    <string name="start_location">Start locatie</string>
+    <string name="following_locations">"Deze route bevat de volgende locaties: "</string>
+    <string name="notification_title">Je bent dicht bij een locatie!</string>
+    <string name="notification_text">Je bent bijna bij %1$s</string>
+    <string name="hour">uur</string>
+    <string name="minutes">minuten</string>
+    <string name="route_started_toast">Route is gestart!</string>
 </resources>

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

@@ -7,8 +7,11 @@
     <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="primaryColour">#FFFFFFFF</color>
+    <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

@@ -10,7 +10,7 @@
     <string name="colorblind">Colorblind</string>
     <string name="total_distance">Total distance:</string>
     <string name="visited_locations">Visited locations:</string>
-    <string name="total_time">Total time:</string>
+    <string name="total_time">Total route time:</string>
     <string name="coupons_collected">Coupons collected:</string>
     <string name="coupons">Coupons</string>
     <string name="start_route">Start Route</string>
@@ -24,5 +24,13 @@
     <string name="English">English</string>
     <string name="Chinese">Chinese</string>
     <string name="help">HELP</string>
-    <string name="help_discription">Hasn\'t been translated yet</string>
+    <string name="help_discription">Various buttons can be seen at the bottom of the screen. These buttons have the following functions: \n\nLocations: displays a list of all locations that can be visited. Each location is briefly described. \n\nRoutes: Displays a list of all routes that can be walked. A description is given of each route. \n\nStats: Displays personal statistics. \n\nSettings: This is where app settings can be adjusted according to your preferences. \n\nHold down on a location to display additional information about the chosen location. \n\n\n</string>
+    <string name="notification_title">You\'re close to a location!</string>
+    <string name="notification_text">You\'re almost at %1$s</string>
+    <string name="following_locations">This route contains the following locations: </string>
+    <string name="end_location">End location</string>
+    <string name="start_location">Start location</string>
+    <string name="hour">hour</string>
+    <string name="minutes">minutes</string>
+    <string name="route_started_toast">Route started!</string>
 </resources>

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

@@ -2,12 +2,19 @@
     <!-- 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/black</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">16sp</item>
+        <item name="android:textColor">@color/black</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">
@@ -17,6 +24,10 @@
         <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/test/java/com/a1/nextlocation/DataTest.java

@@ -20,29 +20,53 @@ public class DataTest {
 
     @Test
     public void testDistance(){
-        data.addDistance(2356.234);
+        try {
+            data.addDistance(2356.234);
+        } catch (NullPointerException e) {
+            System.out.println("shared preferences not mocked");
+        }
         double expected = 2356.234;
         assertEquals(expected, data.getDistanceTraveled(), 0.01);
-        data.addDistance(234342.1);
+        try {
+            data.addDistance(2356.234);
+        } catch (NullPointerException e) {
+            System.out.println("shared preferences not mocked");
+        }
         assertNotEquals(expected, data.getDistanceTraveled());
     }
 
     @Test
     public void testTimeWalked(){
-        data.addTimeWalked(3456);
+        try {
+            data.addTimeWalked(3456);
+        } catch (NullPointerException e) {
+            System.out.println("shared preferences not mocked");
+        }
         long expected = 3456;
         assertEquals(expected, data.getTotalTime());
-        data.addTimeWalked(3445);
+        try {
+            data.addTimeWalked(3456);
+        } catch (NullPointerException e) {
+            System.out.println("shared preferences not mocked");
+        }
         assertNotEquals(expected, data.getTotalTime());
     }
 
     @Test
     public void testVisitedLocation(){
         Location testLocation = new Location("test", "test", "test", "test");
-        data.visitLocation(testLocation);
+        try {
+            data.visitLocation(testLocation);
+        } catch (NullPointerException e) {
+            System.out.println("shared preferences not mocked");
+        }
         int expected = 1;
         assertEquals(expected, data.getLocationsVisited());
-        data.visitLocation(new Location("TESTFORFALSE", "TESTFORFALSE", "TESTFORFALSE", "TESTFORFALSE"));
+        try {
+            data.visitLocation(new Location("TESTFORFALSE", "TESTFORFALSE", "TESTFORFALSE", "TESTFORFALSE"));
+        } catch (NullPointerException e) {
+            System.out.println("shared preferences not mocked");
+        }
         assertNotEquals(expected, data.getLocationsVisited());
     }
 

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

@@ -1,5 +1,7 @@
 package com.a1.nextlocation;
 
+import android.util.Log;
+
 import com.a1.nextlocation.data.Route;
 import com.a1.nextlocation.data.RouteHandler;
 
@@ -50,7 +52,11 @@ public class RouteHandlerTest {
         assertEquals(expected, routeHandler.isFollowingRoute());
         assertEquals(testRoute, routeHandler.getCurrentRoute());
 
-        routeHandler.finishRoute();
+        try {
+            routeHandler.finishRoute();
+        } catch (NullPointerException e) {
+            System.out.println("shared preferences not mocked");
+        }
         assertNull(routeHandler.getCurrentRoute());
 
         routeHandler.followRoute(new Route("FALSEROUTENAME"));