Merge branch 'master' of github.com:osmandapp/Osmand

This commit is contained in:
Victor Shcherb 2020-06-09 19:09:49 +02:00
commit c9d2fbac91

View file

@ -57,8 +57,8 @@ public class VehicleParametersBottomSheet extends BasePreferenceBottomSheet {
VehicleSizeAssets vehicleSizeAssets = VehicleSizeAssets.getAssets(parameterName); VehicleSizeAssets vehicleSizeAssets = VehicleSizeAssets.getAssets(parameterName);
if (vehicleSizeAssets != null) { if (vehicleSizeAssets != null) {
ImageView imageView = mainView.findViewById(R.id.image_view); ImageView imageView = mainView.findViewById(R.id.image_view);
imageView.setImageDrawable(ContextCompat.getDrawable(app, imageView.setImageDrawable(app.getUIUtilities()
!nightMode ? vehicleSizeAssets.getDayIconId() : vehicleSizeAssets.getNightIconId())); .getIcon(!nightMode ? vehicleSizeAssets.getDayIconId() : vehicleSizeAssets.getNightIconId()));
TextView description = mainView.findViewById(R.id.description); TextView description = mainView.findViewById(R.id.description);
description.setText(app.getString(vehicleSizeAssets.getDescriptionRes())); description.setText(app.getString(vehicleSizeAssets.getDescriptionRes()));
} }