Merge branch 'follow-route' into RecyclerView

# Conflicts:
#	app/src/main/java/com/a1/nextlocation/fragments/RouteDetailFragment.java

app/src/main/res/drawable-anydpi/ic_stop_icon.xml

@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="#333333"
+    android:alpha="0.6">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M8,16h8V8H8V16zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10s10,-4.48 10,-10S17.52,2 12,2L12,2z"
+      android:fillType="evenOdd"/>
+</vector>

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

@@ -27,6 +27,17 @@
             android:src="@drawable/ic_baseline_outlined_flag_24"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
+
+        <ImageButton
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/home_stop_route_button"
+            android:layout_marginTop="20dp"
+            android:layout_marginEnd="20dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/location_list_button"
+            android:backgroundTint="@color/secondaryColour"
+            android:src="@drawable/ic_stop_icon"/>
     </androidx.constraintlayout.widget.ConstraintLayout>
 
 </FrameLayout>

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

@@ -54,6 +54,7 @@
             app:layout_constraintTop_toTopOf="parent" />
 
         <TextView
+            android:id="@+id/statistics_km"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/km"
@@ -102,6 +103,7 @@
             app:layout_constraintTop_toTopOf="parent" />
 
         <TextView
+            android:id="@+id/statistics_locations_visited"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/getal"

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

@@ -10,4 +10,5 @@
     <color name="primaryColour">#FF115571</color>
     <color name="secondaryColour">#FF31AFB4</color>
     <color name="buttonColour">#FF14212D</color>
+    <color name="red">#FF0000</color>
 </resources>

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

@@ -1,25 +1,21 @@
 <resources>
     <string name="app_name">Next Location</string>
-    <string name="locaties">Locaties</string>
+    <!-- TODO: Remove or change this placeholder text -->
+    <string name="hello_blank_fragment">Hello blank fragment</string>
+    <string name="locations">Locaties</string>
     <string name="routes">Routes</string>
-    <string name="statistieken">Statistieken</string>
-    <string name="instellingen">Instellingen</string>
+    <string name="statistics">Statistieken</string>
+    <string name="settings">Instellingen</string>
     <string name="taal">Taal</string>
     <string name="imperiaal_systeem">Imperiaal systeem</string>
     <string name="_65_stand">65+ stand</string>
     <string name="kleurenblind">Kleurenblind</string>
+    <string name="statistieken">Statistieken</string>
     <string name="totale_afstand">Totale afstand:</string>
     <string name="bezochte_locaties">Bezochte locaties:</string>
     <string name="totale_tijd">Totale tijd:</string>
     <string name="coupons_gespaard">Coupons gespaard:</string>
     <string name="coupons">Coupons</string>
     <string name="start_route">Start Route</string>
-    <string name="naam">Naam</string>
-    <string name="terug">Terug</string>
-    <string name="locatie_detail">Locatie Detail</string>
-    <string name="locatie_detail_tekst">Detail tekst</string>
-    <string name="titel">Titel</string>
-    <string name="km">Kilometer</string>
-    <string name="getal">Getal</string>
-    <string name="minuten">Minuten</string>
+    <string name="route_stop_toast">Route stopped!</string>
 </resources>