From de11e59db16e53b12871682b0a43a425d06d08fe Mon Sep 17 00:00:00 2001 From: RemoMeijer Date: Tue, 12 Jan 2021 16:34:27 +0100 Subject: [PATCH] Fixed total distance bug --- app/src/main/java/com/a1/nextlocation/data/Data.java | 3 ++- .../java/com/a1/nextlocation/fragments/SettingsFragment.java | 2 ++ .../java/com/a1/nextlocation/fragments/StatisticFragment.java | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) 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 d4b36c7..49c9008 100644 --- a/app/src/main/java/com/a1/nextlocation/data/Data.java +++ b/app/src/main/java/com/a1/nextlocation/data/Data.java @@ -2,6 +2,7 @@ package com.a1.nextlocation.data; import android.content.Context; import android.content.SharedPreferences; +import android.util.Log; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; @@ -108,7 +109,7 @@ public enum Data { public void load(){ SharedPreferences prefs = context.getSharedPreferences("Data", Context.MODE_PRIVATE); this.editor = prefs.edit(); - this.addDistance(Double.parseDouble(prefs.getString("distanceTraveled", "0"))); + this.distanceTraveled = (Double.parseDouble(prefs.getString("distanceTraveled", "0"))); this.locationsVisited = loadAndGetVisitedNamesList().size(); this.totalTime = prefs.getLong("timeWalked", 0); } diff --git a/app/src/main/java/com/a1/nextlocation/fragments/SettingsFragment.java b/app/src/main/java/com/a1/nextlocation/fragments/SettingsFragment.java index 401f70e..ced92c7 100644 --- a/app/src/main/java/com/a1/nextlocation/fragments/SettingsFragment.java +++ b/app/src/main/java/com/a1/nextlocation/fragments/SettingsFragment.java @@ -5,6 +5,7 @@ import android.content.Context; import android.content.SharedPreferences; import android.content.res.Configuration; import android.os.Bundle; +import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -19,6 +20,7 @@ import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentTransaction; import com.a1.nextlocation.R; +import com.a1.nextlocation.data.Data; import org.jetbrains.annotations.NotNull; diff --git a/app/src/main/java/com/a1/nextlocation/fragments/StatisticFragment.java b/app/src/main/java/com/a1/nextlocation/fragments/StatisticFragment.java index 8d18b5a..4da5466 100644 --- a/app/src/main/java/com/a1/nextlocation/fragments/StatisticFragment.java +++ b/app/src/main/java/com/a1/nextlocation/fragments/StatisticFragment.java @@ -82,7 +82,7 @@ public class StatisticFragment extends Fragment { private void initializeDistanceTextView(View view){ distance = view.findViewById(R.id.statistics_km); - double dist = Double.parseDouble(getContext().getSharedPreferences("Data", Context.MODE_PRIVATE).getString("distanceTraveled", "0")) /1000; + double dist = Data.INSTANCE.getDistanceTraveled() / 1000; if (getContext().getSharedPreferences("Settings", Context.MODE_PRIVATE).getBoolean("imperialSwitch", false)) distance.setText("" + String.format("%.1f",dist * 0.621371) + " mi"); else