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

remove duplicate code

Browse source
This commit is contained in:
nazar-kutz 2021-03-22 14:44:47 +02:00
parent b034db4f39
commit 9fda0edc37
3 changed files with 11 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
OsmAnd/src/net/osmand/plus/render/RendererRegistry.java
View file

@ -289,6 +289,15 @@ public class RendererRegistry {
return renderers; return renderers;
} }
public static String getMapStyleName(@NonNull OsmandApplication app) {
RendererRegistry rr = app.getRendererRegistry();
RenderingRulesStorage storage = rr.getCurrentSelectedRenderer();
if (storage == null) {
return "";
}
return RendererRegistry.getRendererName(app, storage.getName());
}
public static String getRendererName(@NonNull Context ctx, @NonNull String name) { public static String getRendererName(@NonNull Context ctx, @NonNull String name) {
String translation = getTranslatedRendererName(ctx, name); String translation = getTranslatedRendererName(ctx, name);
return translation != null ? translation : return translation != null ? translation :

11
OsmAnd/src/net/osmand/plus/routing/cards/RouteLineColorCard.java
View file

@ -214,7 +214,7 @@ public class RouteLineColorCard extends BaseCard implements CardListener, ColorP
if (selectedMode == ColorMode.DEFAULT) { if (selectedMode == ColorMode.DEFAULT) {
String pattern = app.getString(R.string.route_line_use_map_style_appearance); String pattern = app.getString(R.string.route_line_use_map_style_appearance);
String color = app.getString(R.string.shared_string_color).toLowerCase(); String color = app.getString(R.string.shared_string_color).toLowerCase();
description = String.format(pattern, color, getMapStyleName()); description = String.format(pattern, color, RendererRegistry.getMapStyleName(app));
} else { } else {
String pattern = app.getString(R.string.specify_color_for_map_mode); String pattern = app.getString(R.string.specify_color_for_map_mode);
String mapModeTitle = app.getString(isNightMap() ? NIGHT_TITLE_ID : DAY_TITLE_ID); String mapModeTitle = app.getString(isNightMap() ? NIGHT_TITLE_ID : DAY_TITLE_ID);
@ -223,15 +223,6 @@ public class RouteLineColorCard extends BaseCard implements CardListener, ColorP
tvDescription.setText(description); tvDescription.setText(description);
} }
private String getMapStyleName() {
RendererRegistry rr = app.getRendererRegistry();
RenderingRulesStorage storage = rr.getCurrentSelectedRenderer();
if (storage == null) {
return "";
}
return RendererRegistry.getRendererName(app, storage.getName());
}
private boolean isNightMap() { private boolean isNightMap() {
return selectedMapTheme.isNight(); return selectedMapTheme.isNight();
} }

11
OsmAnd/src/net/osmand/plus/routing/cards/RouteLineWidthCard.java
View file

@ -131,7 +131,7 @@ public class RouteLineWidthCard extends BaseCard {
if (selectedMode == WidthMode.DEFAULT) { if (selectedMode == WidthMode.DEFAULT) {
String pattern = app.getString(R.string.route_line_use_map_style_appearance); String pattern = app.getString(R.string.route_line_use_map_style_appearance);
String width = app.getString(R.string.shared_string_color).toLowerCase(); String width = app.getString(R.string.shared_string_color).toLowerCase();
String description = String.format(pattern, width, getMapStyleName()); String description = String.format(pattern, width, RendererRegistry.getMapStyleName(app));
tvDescription.setText(description); tvDescription.setText(description);
tvDescription.setVisibility(View.VISIBLE); tvDescription.setVisibility(View.VISIBLE);
} else { } else {
@ -139,15 +139,6 @@ public class RouteLineWidthCard extends BaseCard {
} }
} }
private String getMapStyleName() {
RendererRegistry rr = app.getRendererRegistry();
RenderingRulesStorage storage = rr.getCurrentSelectedRenderer();
if (storage == null) {
return "";
}
return RendererRegistry.getRendererName(app, storage.getName());
}
private void updateCustomWidthSlider() { private void updateCustomWidthSlider() {
if (selectedMode == WidthMode.CUSTOM) { if (selectedMode == WidthMode.CUSTOM) {
Slider slider = view.findViewById(R.id.width_slider); Slider slider = view.findViewById(R.id.width_slider);