Merge develop into master #1

Merged
SemvdH merged 297 commits from develop into main 2021-01-06 22:20:51 +00:00
Showing only changes of commit 6b97c21a8b - Show all commits

View File

@@ -1,5 +1,7 @@
package com.a1.nextlocation.data;
import androidx.room.Ignore;
import java.util.List;
public class Data {
@@ -7,8 +9,14 @@ public class Data {
private int locationsVisited;
private int totalTime;
private List<Coupon> couponList;
@Ignore
private Location nextLocation;
@Ignore
private Location lastLocation;
@Ignore
private Route currentRoute;