sem/Next-Location
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity

Merge branch 'develop' of https://github.com/SemvdH/Next-Location into develop

Browse Source
This commit is contained in:
RemoMeijer
2021-01-06 19:29:03 +01:00
parent c3d317baea 4d00735f24
commit a4413ca42c
4 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/AndroidManifest.xml
View File

@@ -17,7 +17,8 @@
android:supportsRtl="true" android:supportsRtl="true"
android:theme="@style/Theme.NextLocation" android:theme="@style/Theme.NextLocation"
android:hardwareAccelerated="false"> android:hardwareAccelerated="false">
<activity android:name=".MainActivity"> <activity android:name=".MainActivity"
android:screenOrientation="portrait">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />

2
app/src/main/assets/routes.json
View File

@@ -20,7 +20,7 @@
}, },
{ {
"name":"Het Klooster Breda Schorsmolenstraat 13", "name":"Het Klooster Breda Schorsmolenstraat 13",
"coordinates":"51.58765659148822, 4.764801414019652" "coordinates":"51.58775443759389,4.765568874365066"
} }
], ],
"totalDistance": 1073.0, "totalDistance": 1073.0,

9
app/src/main/java/com/a1/nextlocation/fragments/LocationDetailFragment.java
View File

@@ -16,6 +16,7 @@ import android.widget.TextView;
import com.a1.nextlocation.R; import com.a1.nextlocation.R;
import com.a1.nextlocation.data.Location; import com.a1.nextlocation.data.Location;
import com.a1.nextlocation.recyclerview.LocationListManager;
public class LocationDetailFragment extends Fragment { public class LocationDetailFragment extends Fragment {
private static final String TAG = LocationDetailFragment.class.getCanonicalName(); 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); this.locationImage = view.findViewById(R.id.detail_location_image);
Context context = this.locationImage.getContext(); if (this.location.getImageUrl() != null) {
int id = context.getResources().getIdentifier(this.location.getImageUrl(), "drawable", context.getPackageName());
this.locationImage.setImageResource(id); int id = requireContext().getResources().getIdentifier(this.location.getImageUrl(), "drawable", requireContext().getPackageName());
this.locationImage.setImageResource(id);
}
return view; return view;
} }

9
app/src/main/java/com/a1/nextlocation/recyclerview/LocationListManager.java
View File

@@ -32,4 +32,13 @@ public enum LocationListManager {
this.locationList = locationLoader.load(); 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;
}
} }