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 8fdb88f71a - Show all commits

View File

@@ -1,11 +1,21 @@
package com.a1.nextlocation.data;
import androidx.annotation.NonNull;
import androidx.room.Entity;
import androidx.room.Ignore;
import androidx.room.PrimaryKey;
import java.util.List;
@Entity
public class Data {
@PrimaryKey
@NonNull
private float distanceTraveled;
private int locationsVisited;
private int totalTime;
private List<Coupon> couponList;
@@ -19,6 +29,12 @@ public class Data {
@Ignore
private Route currentRoute;
public Data() {
this.distanceTraveled = 0;
this.locationsVisited = 0;
this.totalTime = 0;
}
public float getDistanceTraveled() {