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

Route detail added

Browse Source
This commit is contained in:
RemoMeijer
2021-01-12 13:52:02 +01:00
parent b110d25549
commit efbbe7124b
7 changed files with 41 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -54,7 +54,8 @@ public class LocationDetailFragment extends Fragment {
currentDistanceToLocation = Location.getDistance(Data.INSTANCE.getLocation().getLatitude(), Data.INSTANCE.getLocation().getLongitude(), this.location.getLat(), this.location.getLong());
}
String detailText = "";
//Adds distance text from the current distance of the user to the opened location
String detailText;
if(getContext().getSharedPreferences("Settings", Context.MODE_PRIVATE).getBoolean("imperialSwitch", false)){
if(currentDistanceToLocation > 1609)
detailText = location.getDescription() + String.format("%.3f",currentDistanceToLocation * 0.000621371192) + "mi";
@@ -66,7 +67,6 @@ public class LocationDetailFragment extends Fragment {
else
detailText = location.getDescription() + currentDistanceToLocation + "m";
}
this.detailText = view.findViewById(R.id.detail_location_text);
this.detailText.setText(detailText);

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

@@ -3,6 +3,7 @@ package com.a1.nextlocation.fragments;
import android.annotation.SuppressLint;
import android.content.Context;
import android.os.Bundle;
import android.text.Html;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -44,7 +45,7 @@ public class RouteDetailFragment extends Fragment {
}
@SuppressLint("SetTextI18n")
@SuppressLint({"SetTextI18n", "DefaultLocale"})
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
View view = inflater.inflate(R.layout.fragment_route_detail, container, false);
@@ -60,8 +61,14 @@ public class RouteDetailFragment extends Fragment {
TextView routeName = view.findViewById(R.id.route_title);
routeName.setText(this.route.getName());
TextView routeDetailText = view.findViewById(R.id.reoute_detail_tekst);
routeDetailText.setText(this.route.getDescription());
TextView routeDetailText = view.findViewById(R.id.route_detail_tekst);
StringBuilder locations = new StringBuilder();
for(Location location : this.route.getLocations()){
locations.append("<br>•").append(location.getName());
}
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));
TextView totalDistance = view.findViewById(R.id.total_distance);
String distance_tekst = getResources().getString(R.string.total_distance_route);