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

Merge pull request #8263 from osmandapp/add_car_icon

Browse source 
Fix default icons issue
This commit is contained in:
vshcherb 2020-01-20 12:05:24 +01:00 committed by GitHub
commit 2a3143c21d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
OsmAnd/src/net/osmand/plus/ApplicationMode.java
View file

@ -148,9 +148,9 @@ public class ApplicationMode {
@Expose @Expose
RouteService routeService = RouteService.OSMAND; RouteService routeService = RouteService.OSMAND;
@Expose @Expose
LocationIcon locationIcon = LocationIcon.DEFAULT; LocationIcon locationIcon = null;
@Expose @Expose
NavigationIcon navigationIcon = NavigationIcon.DEFAULT; NavigationIcon navigationIcon = null;
@Expose @Expose
int order; int order;
} }
@ -675,8 +675,12 @@ public class ApplicationMode {
applicationMode.iconColor = modeBean.iconColor; applicationMode.iconColor = modeBean.iconColor;
applicationMode.routingProfile = modeBean.routingProfile; applicationMode.routingProfile = modeBean.routingProfile;
applicationMode.routeService = modeBean.routeService; applicationMode.routeService = modeBean.routeService;
applicationMode.locationIcon = modeBean.locationIcon; if (modeBean.locationIcon != null) {
applicationMode.navigationIcon = modeBean.navigationIcon; applicationMode.locationIcon = modeBean.locationIcon;
}
if (modeBean.navigationIcon != null) {
applicationMode.navigationIcon = modeBean.navigationIcon;
}
applicationMode.order = modeBean.order; applicationMode.order = modeBean.order;
} }
} }
@ -875,7 +879,7 @@ public class ApplicationMode {
PICKUP_TRUCK(R.drawable.ic_action_pickup_truck, R.string.app_mode_pickup_truck, "ic_action_pickup_truck"), PICKUP_TRUCK(R.drawable.ic_action_pickup_truck, R.string.app_mode_pickup_truck, "ic_action_pickup_truck"),
WAGON(R.drawable.ic_action_wagon, R.string.app_mode_wagon, "ic_action_wagon"), WAGON(R.drawable.ic_action_wagon, R.string.app_mode_wagon, "ic_action_wagon"),
UTV(R.drawable.ic_action_utv, R.string.app_mode_utv, "ic_action_utv"), UTV(R.drawable.ic_action_utv, R.string.app_mode_utv, "ic_action_utv"),
OSM(R.drawable.ic_action_osmand_logo, R.string.app_mode_osm, "ic_action_osmand_logo"); OSM(R.drawable.ic_action_openstreetmap_logo, R.string.app_mode_osm, "ic_action_openstreetmap_logo");
@DrawableRes @DrawableRes
private int resId; private int resId;