Merge branch 'RecyclerView' of https://github.com/SemvdH/Next-Location into RecyclerView
# Conflicts: # app/src/main/java/com/a1/nextlocation/fragments/LocationDetailFragment.java
This commit is contained in:
@@ -15,21 +15,14 @@ public class Route implements Parcelable {
|
|||||||
|
|
||||||
@NonNull
|
@NonNull
|
||||||
private String name;
|
private String name;
|
||||||
|
private String description;
|
||||||
|
|
||||||
private List<Location> locations;
|
private List<Location> locations;
|
||||||
|
|
||||||
|
|
||||||
private float totalDistance;
|
private float totalDistance;
|
||||||
|
|
||||||
|
|
||||||
private int totalTime;
|
private int totalTime;
|
||||||
|
|
||||||
public Route(@NotNull String name) {
|
public Route(@NotNull String name) {
|
||||||
|
|
||||||
this.name = name;
|
this.name = name;
|
||||||
this.locations = new ArrayList<>();
|
this.locations = new ArrayList<>();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
protected Route(Parcel in) {
|
protected Route(Parcel in) {
|
||||||
@@ -103,4 +96,12 @@ public class Route implements Parcelable {
|
|||||||
parcel.writeFloat(totalDistance);
|
parcel.writeFloat(totalDistance);
|
||||||
parcel.writeInt(totalTime);
|
parcel.writeInt(totalTime);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public String getDescription() {
|
||||||
|
return description;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setDescription(String description) {
|
||||||
|
this.description = description;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
package com.a1.nextlocation.fragments;
|
package com.a1.nextlocation.fragments;
|
||||||
|
|
||||||
|
import android.media.Image;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
|
|
||||||
import androidx.fragment.app.Fragment;
|
import androidx.fragment.app.Fragment;
|
||||||
@@ -52,6 +53,7 @@ public class LocationFragment extends Fragment {
|
|||||||
|
|
||||||
this.locationAdapter = new LocationAdapter(this.getContext(), this.locationList, clickedPosition -> {
|
this.locationAdapter = new LocationAdapter(this.getContext(), this.locationList, clickedPosition -> {
|
||||||
LocationDetailFragment locationDetailFragment = new LocationDetailFragment();
|
LocationDetailFragment locationDetailFragment = new LocationDetailFragment();
|
||||||
|
locationDetailFragment.setLocation(this.locationList.get(clickedPosition));
|
||||||
Bundle locationBundle = new Bundle();
|
Bundle locationBundle = new Bundle();
|
||||||
locationBundle.putParcelable("location", this.locationList.get(clickedPosition));
|
locationBundle.putParcelable("location", this.locationList.get(clickedPosition));
|
||||||
locationDetailFragment.setLocation(this.locationList.get(clickedPosition));
|
locationDetailFragment.setLocation(this.locationList.get(clickedPosition));
|
||||||
|
|||||||
Reference in New Issue
Block a user