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

Merge pull request #8270 from osmandapp/config_location_icon

Browse source 
Fix icons field
This commit is contained in:
vshcherb 2020-01-20 17:12:38 +01:00 committed by GitHub
commit d005712d00
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -148,9 +148,9 @@ public class ApplicationMode {
@Expose
RouteService routeService = RouteService.OSMAND;
@Expose
LocationIcon locationIcon = null;
LocationIcon locIcon = null;
@Expose
NavigationIcon navigationIcon = null;
NavigationIcon navIcon = null;
@Expose
int order;
}
@ -639,8 +639,8 @@ public class ApplicationMode {
b.icon(app, mb.iconName);
b.setColor(mb.iconColor);
b.setOrder(mb.order);
b.locationIcon(mb.locationIcon);
b.navigationIcon(mb.navigationIcon);
b.locationIcon(mb.locIcon);
b.navigationIcon(mb.navIcon);
return b;
}
@ -653,8 +653,8 @@ public class ApplicationMode {
mb.stringKey = stringKey;
mb.routeService = routeService;
mb.routingProfile = routingProfile;
mb.locationIcon = locationIcon;
mb.navigationIcon = navigationIcon;
mb.locIcon = locationIcon;
mb.navIcon = navigationIcon;
mb.order = order;
Gson gson = new GsonBuilder().excludeFieldsWithoutExposeAnnotation().create();
return gson.toJson(mb);
@ -675,11 +675,11 @@ public class ApplicationMode {
applicationMode.iconColor = modeBean.iconColor;
applicationMode.routingProfile = modeBean.routingProfile;
applicationMode.routeService = modeBean.routeService;
if (modeBean.locationIcon != null) {
applicationMode.locationIcon = modeBean.locationIcon;
if (modeBean.locIcon != null) {
applicationMode.locationIcon = modeBean.locIcon;
}
if (modeBean.navigationIcon != null) {
applicationMode.navigationIcon = modeBean.navigationIcon;
if (modeBean.navIcon != null) {
applicationMode.navigationIcon = modeBean.navIcon;
}
applicationMode.order = modeBean.order;
}
@ -701,8 +701,8 @@ public class ApplicationMode {
.setRoutingProfile(m.routingProfile)
.icon(app, m.iconName)
.setColor(m.iconColor)
.locationIcon(m.locationIcon)
.navigationIcon(m.navigationIcon)
.locationIcon(m.locIcon)
.navigationIcon(m.navIcon)
.setOrder(m.order)
.customReg();
}
@ -747,8 +747,8 @@ public class ApplicationMode {
mb.routeService = mode.routeService;
mb.routingProfile = mode.routingProfile;
mb.order = mode.order;
mb.locationIcon = mode.locationIcon;
mb.navigationIcon = mode.navigationIcon;
mb.locIcon = mode.locationIcon;
mb.navIcon = mode.navigationIcon;
modeBeans.add(mb);
}
return modeBeans;