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

Develop #4

Merged
SemvdH merged 2 commits from develop into main 2021-01-07 10:44:23 +00:00
Conversation 0 Commits 2 Files Changed 3 +7 -6
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/com/a1/nextlocation/fragments/RouteDetailFragment.java
View File

@@ -66,7 +66,7 @@ public class RouteDetailFragment extends Fragment {
TextView totalDistance = view.findViewById(R.id.total_distance); TextView totalDistance = view.findViewById(R.id.total_distance);
String distance_tekst = getResources().getString(R.string.total_distance_route); String distance_tekst = getResources().getString(R.string.total_distance_route);
boolean imperialChecked = getContext().getSharedPreferences("Settings", Context.MODE_PRIVATE).getBoolean("imperialSwitch", false); boolean imperialChecked = getContext().getSharedPreferences("Settings", Context.MODE_PRIVATE).getBoolean("imperialSwitch", false);
totalDistance.setText(distance_tekst + " " + String.format("%.1f", calculateRoute(this.route.getLocations())) + (imperialChecked ? "ft" : "m")); totalDistance.setText(distance_tekst + " " + String.format("%.1f", calculateRoute(this.route.getLocations())) + (imperialChecked ? "yd" : "m"));
//Initialises the back button //Initialises the back button
ImageButton backButton = view.findViewById(R.id.route_detail_back_button); ImageButton backButton = view.findViewById(R.id.route_detail_back_button);
@@ -118,7 +118,7 @@ public class RouteDetailFragment extends Fragment {
// if the imperialSwitch is checked, return feet, if not, return meters // if the imperialSwitch is checked, return feet, if not, return meters
if (getContext().getSharedPreferences("Settings", Context.MODE_PRIVATE).getBoolean("imperialSwitch", false)) if (getContext().getSharedPreferences("Settings", Context.MODE_PRIVATE).getBoolean("imperialSwitch", false))
return totalDistance *3.28084; return totalDistance * 1.0936133;
else else
return totalDistance; return totalDistance;
} }

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

@@ -22,6 +22,7 @@ import com.a1.nextlocation.recyclerview.CouponListManager;
import java.util.List; import java.util.List;
public class StatisticFragment extends Fragment { public class StatisticFragment extends Fragment {
private TextView distance;
@Override @Override
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
@@ -36,9 +37,7 @@ public class StatisticFragment extends Fragment {
initializeDistanceTextView(view); initializeDistanceTextView(view);
TextView locs = view.findViewById(R.id.statistics_locations_visited); TextView locs = view.findViewById(R.id.statistics_locations_visited);
TextView timeText = view.findViewById(R.id.statistics_time_value); TextView timeText = view.findViewById(R.id.statistics_time_value);
double dist = Data.INSTANCE.getDistanceTraveled() / 1000;
distance.setText("" + String.format("%.1f", dist) + " km");
locs.setText("" + Data.INSTANCE.getLocationsVisited()); locs.setText("" + Data.INSTANCE.getLocationsVisited());
long seconds = Data.INSTANCE.getTotalTime() / 1000; long seconds = Data.INSTANCE.getTotalTime() / 1000;
@@ -79,7 +78,7 @@ public class StatisticFragment extends Fragment {
} }
private void initializeDistanceTextView(View view){ private void initializeDistanceTextView(View view){
TextView distance = view.findViewById(R.id.statistics_km); distance = view.findViewById(R.id.statistics_km);
double dist = Data.INSTANCE.getDistanceTraveled()/1000; double dist = Data.INSTANCE.getDistanceTraveled()/1000;
if (getContext().getSharedPreferences("Settings", Context.MODE_PRIVATE).getBoolean("imperialSwitch", false)) if (getContext().getSharedPreferences("Settings", Context.MODE_PRIVATE).getBoolean("imperialSwitch", false))
distance.setText("" + String.format("%.1f",dist * 0.621371) + " mi"); distance.setText("" + String.format("%.1f",dist * 0.621371) + " mi");

2
app/src/main/res/values/themes.xml
View File

@@ -7,6 +7,7 @@
<item name="colorSecondary">@color/secondaryColour</item> <item name="colorSecondary">@color/secondaryColour</item>
<!-- Customize your theme here. --> <!-- Customize your theme here. -->
<item name="colorButtonNormal">@color/buttonColour</item> <item name="colorButtonNormal">@color/buttonColour</item>
<item name="colorPrimaryDark">@color/secondaryColour</item>
<item name="android:textSize">16sp</item> <item name="android:textSize">16sp</item>
</style> </style>
@@ -17,6 +18,7 @@
<item name="colorSecondary">@color/secondaryColour</item> <item name="colorSecondary">@color/secondaryColour</item>
<!-- Customize your theme here. --> <!-- Customize your theme here. -->
<item name="colorButtonNormal">@color/buttonColour</item> <item name="colorButtonNormal">@color/buttonColour</item>
<item name="colorPrimaryDark">@color/secondaryColour</item>
<item name="android:textSize">24sp</item> <item name="android:textSize">24sp</item>
</style> </style>
</resources> </resources>