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

Merge branch 'develop' of https://github.com/SemvdH/Next-Location into develop

Browse Source
This commit is contained in:
Sem van der Hoeven
2021-01-12 16:40:31 +01:00
parent 43c3060f1e de11e59db1
commit 158ddac964
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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);
}

2
app/src/main/java/com/a1/nextlocation/fragments/SettingsFragment.java
View File

@@ -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;

2
app/src/main/java/com/a1/nextlocation/fragments/StatisticFragment.java
View File

@@ -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