From c2bf1d762ace7d4793b1ac5d2ab3dbddcedb911b Mon Sep 17 00:00:00 2001 From: Sem van der Hoeven Date: Wed, 6 Jan 2021 19:25:10 +0100 Subject: [PATCH] added findbyname in locationlistmanager --- app/src/main/AndroidManifest.xml | 3 ++- app/src/main/assets/routes.json | 2 +- .../nextlocation/fragments/LocationDetailFragment.java | 9 ++++++--- .../nextlocation/recyclerview/LocationListManager.java | 9 +++++++++ 4 files changed, 18 insertions(+), 5 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index d00b05f..1d0c446 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -17,7 +17,8 @@ android:supportsRtl="true" android:theme="@style/Theme.NextLocation" android:hardwareAccelerated="false"> - + diff --git a/app/src/main/assets/routes.json b/app/src/main/assets/routes.json index 8520041..537b128 100644 --- a/app/src/main/assets/routes.json +++ b/app/src/main/assets/routes.json @@ -20,7 +20,7 @@ }, { "name":"Het Klooster Breda Schorsmolenstraat 13", - "coordinates":"51.58765659148822, 4.764801414019652" + "coordinates":"51.58775443759389,4.765568874365066" } ], "totalDistance": 1073.0, 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 e56e6d4..bce6d44 100644 --- a/app/src/main/java/com/a1/nextlocation/fragments/LocationDetailFragment.java +++ b/app/src/main/java/com/a1/nextlocation/fragments/LocationDetailFragment.java @@ -17,6 +17,7 @@ import android.widget.TextView; import com.a1.nextlocation.R; import com.a1.nextlocation.data.Location; +import com.a1.nextlocation.recyclerview.LocationListManager; public class LocationDetailFragment extends Fragment { private static final String TAG = LocationDetailFragment.class.getCanonicalName(); @@ -62,9 +63,11 @@ public class LocationDetailFragment extends Fragment { } this.locationImage = view.findViewById(R.id.detail_location_image); - Context context = this.locationImage.getContext(); - int id = context.getResources().getIdentifier(this.location.getImageUrl(), "drawable", context.getPackageName()); - this.locationImage.setImageResource(id); + if (this.location.getImageUrl() != null) { + + int id = requireContext().getResources().getIdentifier(this.location.getImageUrl(), "drawable", requireContext().getPackageName()); + this.locationImage.setImageResource(id); + } return view; } diff --git a/app/src/main/java/com/a1/nextlocation/recyclerview/LocationListManager.java b/app/src/main/java/com/a1/nextlocation/recyclerview/LocationListManager.java index 84e2eb9..e677d52 100644 --- a/app/src/main/java/com/a1/nextlocation/recyclerview/LocationListManager.java +++ b/app/src/main/java/com/a1/nextlocation/recyclerview/LocationListManager.java @@ -33,4 +33,13 @@ public enum LocationListManager { this.locationList = locationLoader.load(); } + public Location findByName(String name) { + Location res = null; + for (Location location : this.locationList) { + if (location.getName().equals(name)) res = location; + break; + } + return res; + } + }