merge

app/src/main/java/com/a1/nextlocation/data/Location.java

@@ -1,12 +1,15 @@
 package com.a1.nextlocation.data;
 
+import android.os.Parcel;
+import android.os.Parcelable;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import org.jetbrains.annotations.NotNull;
 import org.osmdroid.util.GeoPoint;
 
-public class Location {
+public class Location implements Parcelable {
 
     @NonNull
     private String name;
@@ -32,6 +35,25 @@ public class Location {
         this(name,getStringFromCoordinates(latCoord,longCoord),description,imageUrl);
     }
 
+    protected Location(Parcel in) {
+        name = in.readString();
+        coordinates = in.readString();
+        description = in.readString();
+        imageUrl = in.readString();
+    }
+
+    public static final Creator<Location> CREATOR = new Creator<Location>() {
+        @Override
+        public Location createFromParcel(Parcel in) {
+            return new Location(in);
+        }
+
+        @Override
+        public Location[] newArray(int size) {
+            return new Location[size];
+        }
+    };
+
     @NotNull
     public String getName() {
         return name;
@@ -90,4 +112,16 @@ public class Location {
         return new GeoPoint(this.getLat(),this.getLong());
     }
 
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    @Override
+    public void writeToParcel(Parcel parcel, int i) {
+        parcel.writeString(name);
+        parcel.writeString(coordinates);
+        parcel.writeString(description);
+        parcel.writeString(imageUrl);
+    }
 }

app/src/main/java/com/a1/nextlocation/data/Route.java

@@ -1,5 +1,8 @@
 package com.a1.nextlocation.data;
 
+import android.os.Parcel;
+import android.os.Parcelable;
+
 import androidx.annotation.NonNull;
 
 import org.jetbrains.annotations.NotNull;
@@ -7,7 +10,7 @@ import org.jetbrains.annotations.NotNull;
 import java.util.ArrayList;
 import java.util.List;
 
-public class Route {
+public class Route implements Parcelable {
 
 
     @NonNull
@@ -29,6 +32,25 @@ public class Route {
 
     }
 
+    protected Route(Parcel in) {
+        this.name = in.readString();
+        this.locations = in.createTypedArrayList(Location.CREATOR);
+        this.totalDistance = in.readFloat();
+        this.totalTime = in.readInt();
+    }
+
+    public static final Creator<Route> CREATOR = new Creator<Route>() {
+        @Override
+        public Route createFromParcel(Parcel in) {
+            return new Route(in);
+        }
+
+        @Override
+        public Route[] newArray(int size) {
+            return new Route[size];
+        }
+    };
+
     public void addLocation(Location location) {
         this.locations.add(location);
     }
@@ -69,4 +91,16 @@ public class Route {
         this.totalTime = totalTime;
     }
 
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    @Override
+    public void writeToParcel(Parcel parcel, int i) {
+        parcel.writeString(name);
+        parcel.writeTypedList(locations);
+        parcel.writeFloat(totalDistance);
+        parcel.writeInt(totalTime);
+    }
 }