From 6edcd7b74f4a4e3454db679e94ff45523c7a6d30 Mon Sep 17 00:00:00 2001 From: Bart Date: Tue, 12 Jan 2021 15:03:46 +0100 Subject: [PATCH 1/3] Total time walked gets saved and loaded --- app/src/main/java/com/a1/nextlocation/data/Data.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/a1/nextlocation/data/Data.java b/app/src/main/java/com/a1/nextlocation/data/Data.java index 77b14b2..d4b36c7 100644 --- a/app/src/main/java/com/a1/nextlocation/data/Data.java +++ b/app/src/main/java/com/a1/nextlocation/data/Data.java @@ -63,6 +63,9 @@ public enum Data { public void addTimeWalked(long time) { totalTime += time; + + editor.putLong("timeWalked", totalTime); + editor.apply(); } public double getDistanceTraveled() { @@ -105,8 +108,9 @@ public enum Data { public void load(){ SharedPreferences prefs = context.getSharedPreferences("Data", Context.MODE_PRIVATE); this.editor = prefs.edit(); - Data.INSTANCE.addDistance(Double.parseDouble(prefs.getString("distanceTraveled", "0"))); + this.addDistance(Double.parseDouble(prefs.getString("distanceTraveled", "0"))); this.locationsVisited = loadAndGetVisitedNamesList().size(); + this.totalTime = prefs.getLong("timeWalked", 0); } public android.location.Location getLocation() { From d87adeec8d4cd8bd9f024a2a95466b1748c89665 Mon Sep 17 00:00:00 2001 From: Bipin Date: Tue, 12 Jan 2021 15:10:54 +0100 Subject: [PATCH 2/3] text sizes and colours --- app/src/main/res/layout/fragment_coupon.xml | 12 +++++++----- app/src/main/res/layout/fragment_location.xml | 5 +++-- app/src/main/res/layout/fragment_route.xml | 8 +++++--- app/src/main/res/layout/fragment_route_detail.xml | 2 +- 4 files changed, 16 insertions(+), 11 deletions(-) diff --git a/app/src/main/res/layout/fragment_coupon.xml b/app/src/main/res/layout/fragment_coupon.xml index ba8db19..5ec516d 100644 --- a/app/src/main/res/layout/fragment_coupon.xml +++ b/app/src/main/res/layout/fragment_coupon.xml @@ -14,10 +14,13 @@ android:layout_height="wrap_content" android:layout_margin="9dp" android:layout_marginTop="20dp" - android:text="@string/statistics" - android:textSize="20sp" - app:layout_constraintStart_toEndOf="@id/coupon_back_button" - app:layout_constraintTop_toTopOf="parent" /> + android:text="@string/coupons" + android:textSize="30sp" + android:textColor="@color/secondaryColour" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toTopOf="@id/coupon_back_button" + app:layout_constraintBottom_toBottomOf="@id/coupon_back_button"/> diff --git a/app/src/main/res/layout/fragment_location.xml b/app/src/main/res/layout/fragment_location.xml index 27f2aa8..c6fef6d 100644 --- a/app/src/main/res/layout/fragment_location.xml +++ b/app/src/main/res/layout/fragment_location.xml @@ -15,8 +15,9 @@ android:layout_margin="9dp" android:layout_marginTop="20dp" android:text="@string/locations" - android:textSize="20sp" - app:layout_constraintStart_toEndOf="@id/location_back_button" + android:textSize="30sp" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" /> + android:textSize="30sp" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toTopOf="@id/route_back_button" + app:layout_constraintBottom_toBottomOf="@id/route_back_button"/> Date: Tue, 12 Jan 2021 15:28:26 +0100 Subject: [PATCH 3/3] 0,0 fix --- .../main/java/com/a1/nextlocation/fragments/HomeFragment.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/com/a1/nextlocation/fragments/HomeFragment.java b/app/src/main/java/com/a1/nextlocation/fragments/HomeFragment.java index 95fc7d5..037db2e 100644 --- a/app/src/main/java/com/a1/nextlocation/fragments/HomeFragment.java +++ b/app/src/main/java/com/a1/nextlocation/fragments/HomeFragment.java @@ -208,7 +208,7 @@ public class HomeFragment extends Fragment implements LocationListener { if (currentLocation == null) currentLocation = location; if (location != null) { - GeoPoint start = new GeoPoint(location.getLatitude(), location.getLongitude()); + GeoPoint start = new GeoPoint(currentLocation.getLatitude(), currentLocation.getLongitude()); mapController.setCenter(start); }