route profile enum changes

This commit is contained in:
madwasp79 2019-05-23 14:35:54 +03:00
parent b2803a779c
commit e988174ea5

View file

@ -55,7 +55,6 @@ import net.osmand.plus.routing.RouteProvider.RouteService;
import net.osmand.plus.widgets.OsmandTextFieldBoxes; import net.osmand.plus.widgets.OsmandTextFieldBoxes;
import net.osmand.router.GeneralRouter; import net.osmand.router.GeneralRouter;
import net.osmand.util.Algorithms; import net.osmand.util.Algorithms;
import org.apache.commons.lang3.EnumUtils;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import studio.carbonylgroup.textfieldboxes.ExtendedEditText; import studio.carbonylgroup.textfieldboxes.ExtendedEditText;
@ -710,7 +709,7 @@ public class EditProfileFragment extends BaseOsmAndFragment {
int iconRes = R.drawable.ic_action_gdirections_dark; int iconRes = R.drawable.ic_action_gdirections_dark;
String name = e.getValue().getProfileName(); String name = e.getValue().getProfileName();
String description = context.getString(R.string.osmand_default_routing); String description = context.getString(R.string.osmand_default_routing);
if (EnumUtils.isValidEnum(RoutingProfilesResources.class, name.toUpperCase())){ if (RoutingProfilesResources.isRpValue(name.toUpperCase())){
iconRes = RoutingProfilesResources.valueOf(name.toUpperCase()).getIconRes(); iconRes = RoutingProfilesResources.valueOf(name.toUpperCase()).getIconRes();
name = context name = context
.getString(RoutingProfilesResources.valueOf(name.toUpperCase()).getStringRes()); .getString(RoutingProfilesResources.valueOf(name.toUpperCase()).getStringRes());
@ -749,6 +748,18 @@ public class EditProfileFragment extends BaseOsmAndFragment {
public int getIconRes() { public int getIconRes() {
return iconRes; return iconRes;
} }
private static final List<String> rpValues = new ArrayList<>();
static {
for (RoutingProfilesResources rpr : RoutingProfilesResources.values()) {
rpValues.add(rpr.name());
}
}
public static boolean isRpValue(String value) {
return rpValues.contains(value);
}
} }
private class ApplicationProfileObject { private class ApplicationProfileObject {