From ca8d291262dca8f7a507f612ac15d086f945cd8e Mon Sep 17 00:00:00 2001 From: Robin Koedood Date: Wed, 6 Jan 2021 13:44:17 +0100 Subject: [PATCH] [CHANGED] String values --- .../com/a1/nextlocation/fragments/LocationDetailFragment.java | 4 ++++ app/src/main/res/layout/fragment_location_detail.xml | 3 +-- app/src/main/res/layout/fragment_route.xml | 1 - app/src/main/res/layout/fragment_settings.xml | 1 - app/src/main/res/layout/fragment_statistic.xml | 3 --- 5 files changed, 5 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/com/a1/nextlocation/fragments/LocationDetailFragment.java b/app/src/main/java/com/a1/nextlocation/fragments/LocationDetailFragment.java index 19f73cd..dc58ce3 100644 --- a/app/src/main/java/com/a1/nextlocation/fragments/LocationDetailFragment.java +++ b/app/src/main/java/com/a1/nextlocation/fragments/LocationDetailFragment.java @@ -49,4 +49,8 @@ public class LocationDetailFragment extends Fragment { } return view; } + + public void setLocation(Location location) { + this.location = location; + } } \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_location_detail.xml b/app/src/main/res/layout/fragment_location_detail.xml index 468aa89..a89a336 100644 --- a/app/src/main/res/layout/fragment_location_detail.xml +++ b/app/src/main/res/layout/fragment_location_detail.xml @@ -35,7 +35,6 @@ android:layout_width="match_parent" android:layout_height="200dp" android:layout_margin="20dp" - android:layout_height="wrap_content" android:background="@color/secondaryColour" android:text="" app:layout_constraintEnd_toEndOf="parent" @@ -47,7 +46,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@color/secondaryColour" - android:text="@string/locatie_detail_tekst" + android:text="" /> diff --git a/app/src/main/res/layout/fragment_route.xml b/app/src/main/res/layout/fragment_route.xml index 500edc2..3904b49 100644 --- a/app/src/main/res/layout/fragment_route.xml +++ b/app/src/main/res/layout/fragment_route.xml @@ -14,7 +14,6 @@ android:layout_height="wrap_content" android:layout_margin="10dp" android:background="@drawable/ic_back_button_24" - android:text="@string/terug" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml index 11b0f61..343de74 100644 --- a/app/src/main/res/layout/fragment_settings.xml +++ b/app/src/main/res/layout/fragment_settings.xml @@ -160,7 +160,6 @@ app:layout_constraintTop_toTopOf="parent" /> @@ -234,7 +232,6 @@ android:background="@drawable/ic_back_button_24" android:backgroundTint="@color/buttonColour" android:src="@drawable/ic_back_button_24" - android:text="@string/terug" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" />