From 22d760bbda614bb9698df5c23cb7d0953e4bed0a Mon Sep 17 00:00:00 2001
From: Bart <bartvanmoorsel7@gmail.com>
Date: Wed, 6 Jan 2021 20:10:27 +0100
Subject: [PATCH 1/2] Updated  language, removed chinese from language dropdown

---
 app/src/main/assets/routes.json                               | 4 ++--
 .../java/com/a1/nextlocation/fragments/SettingsFragment.java  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/assets/routes.json b/app/src/main/assets/routes.json
index dfb02b1..048c015 100644
--- a/app/src/main/assets/routes.json
+++ b/app/src/main/assets/routes.json
@@ -35,7 +35,7 @@
     ],
     "totalDistance": 1073.0,
     "totalTime": 342342,
-    "description": "Deze route laat u leuke events verspreid door breda zien! Probeer de escaperooms uit, een event bij de koepel, of een leuk feest bij MEZZ! Met deze route loopt u langs ze allemaal.",
+    "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"
   },
   {
@@ -86,7 +86,7 @@
     ],
     "totalDistance": 955.0,
     "totalTime": 342342,
-    "description": "Met deze route bezoekt u alle snackbars en restaurants in het centrum van Breda!",
+    "description": "With this route you'll visit all the snack bars and restaurants in the city centre of Breda!\n",
     "imageURL": "kees_kroket"
   }
 ]
\ No newline at end of file
diff --git a/app/src/main/java/com/a1/nextlocation/fragments/SettingsFragment.java b/app/src/main/java/com/a1/nextlocation/fragments/SettingsFragment.java
index 3549a40..89d3f6b 100644
--- a/app/src/main/java/com/a1/nextlocation/fragments/SettingsFragment.java
+++ b/app/src/main/java/com/a1/nextlocation/fragments/SettingsFragment.java
@@ -96,7 +96,7 @@ public class SettingsFragment extends Fragment {
 
     private void initializeLanguageDropdown(View view) {
         Spinner languageDropdown = view.findViewById(R.id.dropdown_menu_Settings);
-        String[] items = new String[]{getResources().getString(R.string.Dutch), getResources().getString(R.string.English), getResources().getString(R.string.Chinese)};
+        String[] items = new String[]{getResources().getString(R.string.Dutch), getResources().getString(R.string.English)};
         ArrayAdapter<String> arrayAdapter = new ArrayAdapter<>(getActivity(), android.R.layout.simple_spinner_dropdown_item, items);
         languageDropdown.setAdapter(arrayAdapter);
 

From 9a05e486c110e2ea8ec5e55e3b130afccfb0dce9 Mon Sep 17 00:00:00 2001
From: RemoMeijer <remcomeijer0210@gmail.com>
Date: Wed, 6 Jan 2021 20:12:25 +0100
Subject: [PATCH 2/2] Removed landscape mode, since it wont be used

---
 .../layout-land/fragment_location_detail.xml  | 55 --------------
 .../res/layout-land/fragment_route_detail.xml | 71 -------------------
 2 files changed, 126 deletions(-)
 delete mode 100644 app/src/main/res/layout-land/fragment_location_detail.xml
 delete mode 100644 app/src/main/res/layout-land/fragment_route_detail.xml

diff --git a/app/src/main/res/layout-land/fragment_location_detail.xml b/app/src/main/res/layout-land/fragment_location_detail.xml
deleted file mode 100644
index 386d98a..0000000
--- a/app/src/main/res/layout-land/fragment_location_detail.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/primaryColour"
-    tools:context=".fragments.LocationDetailFragment">
-
-    <TextView
-        android:id="@+id/detail_location_name"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="16dp"
-        android:text=""
-        android:textColor="@color/white"
-        android:textSize="30sp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <ImageView
-        android:id="@+id/detail_location_image"
-        android:layout_width="309dp"
-        android:layout_height="283dp"
-        android:layout_marginStart="30dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/detail_location_name"
-        tools:src="@tools:sample/avatars" />
-
-    <TextView
-        android:id="@+id/detail_location_text"
-        android:layout_width="309dp"
-        android:layout_height="283dp"
-        android:layout_marginEnd="30dp"
-        android:background="@color/secondaryColour"
-        android:text=""
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/detail_location_name" />
-
-    <ImageButton
-        android:id="@+id/detail_location_back_button"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="30dp"
-        android:backgroundTint="@color/primaryColour"
-        android:src="@drawable/ic_back_button_24"
-        app:layout_constraintBottom_toBottomOf="@+id/detail_location_name"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/detail_location_name"
-        app:layout_constraintVertical_bias="0.0" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-land/fragment_route_detail.xml b/app/src/main/res/layout-land/fragment_route_detail.xml
deleted file mode 100644
index 3fe3a2d..0000000
--- a/app/src/main/res/layout-land/fragment_route_detail.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:background="@color/primaryColour"
-    tools:context=".fragments.RouteDetailFragment">
-
-    <Button
-        android:id="@+id/start_route_button2"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:backgroundTint="@color/secondaryColour"
-        android:text="@string/start_route"
-        android:textColor="@color/buttonColour"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="@+id/reoute_detail_tekst"
-        app:layout_constraintStart_toStartOf="@+id/reoute_detail_tekst"
-        app:layout_constraintTop_toBottomOf="@+id/reoute_detail_tekst"
-        app:layout_constraintVertical_bias="0.873" />
-
-    <ImageButton
-        android:id="@+id/routeDetailBackButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_margin="10dp"
-        android:background="@drawable/ic_back_button_24"
-        app:layout_constraintBottom_toBottomOf="@+id/route_title"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/route_title"
-        app:layout_constraintEnd_toStartOf="@id/route_title"
-        />
-
-    <TextView
-        android:id="@+id/route_title"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="250dp"
-        android:text="titel"
-        android:textColor="@color/white"
-        android:textSize="30sp"
-        app:layout_constraintBottom_toTopOf="@+id/route_detail_image"
-        app:layout_constraintEnd_toStartOf="@+id/reoute_detail_tekst"
-        app:layout_constraintStart_toEndOf="@id/routeDetailBackButton"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <ImageView
-        android:id="@+id/route_detail_image"
-        android:layout_width="250dp"
-        android:layout_height="250dp"
-        android:layout_marginEnd="350dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <TextView
-        android:id="@+id/reoute_detail_tekst"
-        android:layout_width="0dp"
-        android:layout_height="10dp"
-        android:layout_marginStart="50dp"
-        android:layout_marginEnd="50dp"
-        android:layout_marginBottom="200dp"
-        android:text=""
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@id/route_detail_image"
-        app:layout_constraintTop_toTopOf="parent" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file