From 91db76c6d5913681ef7bfbd11a4770753acadeda Mon Sep 17 00:00:00 2001 From: RemoMeijer Date: Wed, 6 Jan 2021 20:06:46 +0100 Subject: [PATCH 1/6] Start route button not in nav bar anymore --- app/src/main/res/layout/fragment_route_detail.xml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/app/src/main/res/layout/fragment_route_detail.xml b/app/src/main/res/layout/fragment_route_detail.xml index 48b4dda..3b051a4 100644 --- a/app/src/main/res/layout/fragment_route_detail.xml +++ b/app/src/main/res/layout/fragment_route_detail.xml @@ -55,7 +55,7 @@ android:id="@+id/start_route_button" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginBottom="30dp" + android:layout_marginBottom="45dp" android:backgroundTint="@color/secondaryColour" android:text="@string/start_route" android:textColor="@color/buttonColour" @@ -69,15 +69,13 @@ android:id="@+id/total_distance" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="141dp" - android:layout_marginBottom="19dp" - android:text="@string/total_distance" android:background="@color/secondaryColour" + android:text="@string/total_distance" android:textColor="@color/buttonColour" app:layout_constraintBottom_toTopOf="@+id/start_route_button" - app:layout_constraintTop_toBottomOf="@+id/reoute_detail_tekst" - app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" - tools:layout_editor_absoluteX="169dp" /> + app:layout_constraintHorizontal_bias="0.498" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/reoute_detail_tekst" /> \ No newline at end of file From 7f9783aeb1d9f5cd3d12c904b6386350e3af3c51 Mon Sep 17 00:00:00 2001 From: RemoMeijer Date: Wed, 6 Jan 2021 20:09:11 +0100 Subject: [PATCH 2/6] Text on 65+ mode not in total distance anymore --- app/src/main/res/layout/fragment_route_detail.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/res/layout/fragment_route_detail.xml b/app/src/main/res/layout/fragment_route_detail.xml index 3b051a4..3eb21d2 100644 --- a/app/src/main/res/layout/fragment_route_detail.xml +++ b/app/src/main/res/layout/fragment_route_detail.xml @@ -45,7 +45,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginHorizontal="20dp" - android:layout_marginTop="56dp" + android:layout_marginTop="20dp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.6" app:layout_constraintStart_toStartOf="parent" @@ -69,6 +69,7 @@ android:id="@+id/total_distance" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_marginTop="20dp" android:background="@color/secondaryColour" android:text="@string/total_distance" android:textColor="@color/buttonColour" From 22d760bbda614bb9698df5c23cb7d0953e4bed0a Mon Sep 17 00:00:00 2001 From: Bart Date: Wed, 6 Jan 2021 20:10:27 +0100 Subject: [PATCH 3/6] 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 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 Date: Wed, 6 Jan 2021 20:12:25 +0100 Subject: [PATCH 4/6] 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 @@ - - - - - - - - - - - - \ 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 @@ - - - -