Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix review

Browse source
This commit is contained in:
Dima-1 2020-07-03 16:04:54 +03:00
parent 6869639c08
commit 2aa182cf87
2 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OsmAnd/src/net/osmand/plus/settings/fragments/RouteParametersFragment.java
View file

@ -255,7 +255,7 @@ public class RouteParametersFragment extends BaseSettingsFragment implements OnP
straightAngle.setKey(settings.ROUTE_STRAIGHT_ANGLE.getId()); straightAngle.setKey(settings.ROUTE_STRAIGHT_ANGLE.getId());
straightAngle.setTitle(getString(R.string.recalc_angle_dialog_title)); straightAngle.setTitle(getString(R.string.recalc_angle_dialog_title));
straightAngle.setSummary(String.format(getString(R.string.shared_string_angle_param), straightAngle.setSummary(String.format(getString(R.string.shared_string_angle_param),
(int) am.getStrAngle() + "")); String.valueOf((int) am.getStrAngle())));
straightAngle.setLayoutResource(R.layout.preference_with_descr); straightAngle.setLayoutResource(R.layout.preference_with_descr);
straightAngle.setIcon(getRoutingPrefIcon("routing_recalc_distance")); //TODO change for appropriate icon when available straightAngle.setIcon(getRoutingPrefIcon("routing_recalc_distance")); //TODO change for appropriate icon when available
getPreferenceScreen().addPreference(straightAngle); getPreferenceScreen().addPreference(straightAngle);

17
OsmAnd/src/net/osmand/plus/settings/fragments/VehicleParametersFragment.java
View file

@ -4,11 +4,11 @@ import android.content.Context;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.widget.ImageView; import android.widget.ImageView;
import androidx.annotation.Nullable;
import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentManager;
import androidx.preference.Preference; import androidx.preference.Preference;
import androidx.preference.PreferenceViewHolder; import androidx.preference.PreferenceViewHolder;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.R; import net.osmand.plus.R;
import net.osmand.plus.activities.SettingsBaseActivity; import net.osmand.plus.activities.SettingsBaseActivity;
import net.osmand.plus.routing.RouteProvider.RouteService; import net.osmand.plus.routing.RouteProvider.RouteService;
@ -46,12 +46,13 @@ public class VehicleParametersFragment extends BaseSettingsFragment implements O
if (routeService == RouteService.OSMAND) { if (routeService == RouteService.OSMAND) {
GeneralRouter router = app.getRouter(mode); GeneralRouter router = app.getRouter(mode);
if (router != null) { if (router != null) {
GeneralRouterProfile routerProfile = router.getProfile();
Map<String, RoutingParameter> parameters = router.getParameters(); Map<String, RoutingParameter> parameters = router.getParameters();
setupCustomRoutingPropertyPref(parameters.get(VEHICLE_HEIGHT)); setupCustomRoutingPropertyPref(parameters.get(VEHICLE_HEIGHT), routerProfile);
setupCustomRoutingPropertyPref(parameters.get(VEHICLE_WEIGHT)); setupCustomRoutingPropertyPref(parameters.get(VEHICLE_WEIGHT), routerProfile);
setupCustomRoutingPropertyPref(parameters.get(VEHICLE_WIDTH)); setupCustomRoutingPropertyPref(parameters.get(VEHICLE_WIDTH), routerProfile);
setupCustomRoutingPropertyPref(parameters.get(VEHICLE_LENGTH)); setupCustomRoutingPropertyPref(parameters.get(VEHICLE_LENGTH), routerProfile);
if (router.getProfile() != GeneralRouterProfile.PUBLIC_TRANSPORT) { if (routerProfile != GeneralRouterProfile.PUBLIC_TRANSPORT) {
setupDefaultSpeedPref(); setupDefaultSpeedPref();
} }
} }
@ -60,8 +61,8 @@ public class VehicleParametersFragment extends BaseSettingsFragment implements O
} }
} }
private void setupCustomRoutingPropertyPref(RoutingParameter parameter) { private void setupCustomRoutingPropertyPref(@Nullable RoutingParameter parameter,
GeneralRouterProfile routerProfile = app.getRouter(getSelectedAppMode()).getProfile(); GeneralRouterProfile routerProfile) {
if (parameter == null) { if (parameter == null) {
return; return;
} }