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

Route displays expected time

Browse Source
This commit is contained in:
RemoMeijer
2021-01-12 14:43:07 +01:00
parent 5162dab0ff
commit a7495d24ad
4 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/com/a1/nextlocation/data/Route.java
View File

@@ -81,7 +81,6 @@ public class Route implements Parcelable {
public int getTotalTime() {
return totalTime;
}

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

@@ -31,6 +31,7 @@ public class RouteDetailFragment extends Fragment {
private Route route;
private Refreshable refreshable;
private String time;
@Override
public void onAttach(@NotNull Context context) {
@@ -69,11 +70,11 @@ public class RouteDetailFragment extends Fragment {
String detailText = this.route.getDescription() + "<br><br><b>" + getResources().getString(R.string.following_locations) + "</b>" + locations + "<br><br><b>" + getResources().getString(R.string.start_location) + ": </b>" + route.getLocations().get(0).getName() + "<br>" + "<b>" + getResources().getString(R.string.end_location) + ": </b>" + route.getLocations().get(route.getLocations().size()-1).getName();
routeDetailText.setText(Html.fromHtml(detailText));
//sets the text of the totaldistance
TextView totalDistance = view.findViewById(R.id.total_distance);
String distance_tekst = getResources().getString(R.string.total_distance_route);
//looks if imperial units or metric
boolean imperialChecked = getContext().getSharedPreferences("Settings", Context.MODE_PRIVATE).getBoolean("imperialSwitch", false);
totalDistance.setText(distance_tekst + " " + String.format("%.1f", calculateRoute(this.route.getLocations())) + (imperialChecked ? "yd" : "m"));
totalDistance.setText(getResources().getString(R.string.total_distance_route) + " " + String.format("%.1f", calculateRoute(this.route.getLocations())) + (imperialChecked ? "yd" : "m") + "\n" + getResources().getString(R.string.total_time) + " " + this.time);
//Initialises the back button
ImageButton backButton = view.findViewById(R.id.route_detail_back_button);
@@ -123,6 +124,7 @@ public class RouteDetailFragment extends Fragment {
}
System.out.println("Total Distance: " + totalDistance);
calculateTime(totalDistance);
// if the imperialSwitch is checked, return feet, if not, return meters
if (getContext().getSharedPreferences("Settings", Context.MODE_PRIVATE).getBoolean("imperialSwitch", false))
return totalDistance * 1.0936133;
@@ -130,4 +132,15 @@ public class RouteDetailFragment extends Fragment {
return totalDistance;
}
@SuppressLint("DefaultLocale")
public void calculateTime(double totalDistance){
double totalTimeInMinutes = ((totalDistance / 1000) / 5) * 60;
if(totalTimeInMinutes > 60) {
int hours = (int)(totalTimeInMinutes / 60);
int minutes = (int)(totalTimeInMinutes % 60);
this.time = hours + " " + getResources().getString(R.string.hour) + " " + minutes + " " + getResources().getString(R.string.minutes);
}
else this.time = (int)(((totalDistance / 1000) / 5) * 60) + " " + getResources().getString(R.string.minutes);
}
}