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

Merge develop into master #1

Merged
SemvdH merged 297 commits from develop into main 2021-01-06 22:20:51 +00:00
Conversation 6 Commits 297 Files Changed 143 +8
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6b97c21a8b - Show all commits

8
app/src/main/java/com/a1/nextlocation/data/Data.java
View File

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