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

small fixes after SettingsBaseActivity removed

Browse source
This commit is contained in:
nazar-kutz 2020-11-02 13:52:16 +02:00
parent b27f92308c
commit ca6e5413d1
3 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
OsmAnd/res/values/strings.xml
View file

@ -11,6 +11,7 @@
Thx - Hardy
-->
<string name="message_you_need_add_two_points_to_show_graphs">You must add at least two points.</string>
<string name="icon_group_travel">Travel</string>
<string name="icon_group_emergency">Emergency</string>
<string name="icon_group_sport">Sport</string>

7
OsmAnd/src/net/osmand/plus/measurementtool/graph/CustomGraphAdapter.java
View file

@ -22,7 +22,6 @@ import net.osmand.AndroidUtils;
import net.osmand.plus.OsmAndFormatter;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.R;
import net.osmand.plus.activities.SettingsNavigationActivity;
import net.osmand.plus.helpers.CustomBarChartRenderer;
import net.osmand.plus.helpers.GpxUiHelper;
import net.osmand.router.RouteStatisticsHelper;
@ -34,9 +33,9 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
public class CustomGraphAdapter extends BaseGraphAdapter<HorizontalBarChart, BarData, RouteStatistics> {
import static net.osmand.plus.track.ColorsCard.MINIMUM_CONTRAST_RATIO;
private static final int MINIMUM_CONTRAST_RATIO = 3;
public class CustomGraphAdapter extends BaseGraphAdapter<HorizontalBarChart, BarData, RouteStatistics> {
private String selectedPropertyName;
private ViewGroup legendContainer;
@ -153,7 +152,7 @@ public class CustomGraphAdapter extends BaseGraphAdapter<HorizontalBarChart, Bar
legendIcon.setBackgroundResource(AndroidUtils.resolveAttribute(app, R.attr.bg_circle_contour));
}
String propertyName = segment.getUserPropertyName();
String name = SettingsNavigationActivity.getStringPropertyName(app, propertyName, propertyName.replaceAll("_", " "));
String name = AndroidUtils.getRenderingStringPropertyName(app, propertyName, propertyName.replaceAll("_", " "));
boolean selected = segment.getPropertyName().equals(propertyNameToFullSpan);
Spannable text = getSpanLegend(name, segment, selected);
TextView legend = (TextView) view.findViewById(R.id.legend_text);

3
OsmAnd/src/net/osmand/plus/routepreparationmenu/cards/RouteInfoCard.java
View file

@ -13,7 +13,6 @@ import net.osmand.AndroidUtils;
import net.osmand.GPXUtilities.GPXTrackAnalysis;
import net.osmand.plus.R;
import net.osmand.plus.activities.MapActivity;
import net.osmand.plus.activities.SettingsBaseActivity;
import net.osmand.plus.helpers.GpxUiHelper;
import net.osmand.plus.measurementtool.graph.CustomGraphAdapter;
import net.osmand.plus.measurementtool.graph.CustomGraphAdapter.LegendViewType;
@ -66,7 +65,7 @@ public class RouteInfoCard extends BaseCard {
private void updateHeader() {
TextView title = (TextView) view.findViewById(R.id.info_type_title);
String name = AndroidUtils.getStringRouteInfoPropertyValue(app, routeStatistics.name);
String name = AndroidUtils.getStringRouteInfoPropertyValue(app, statistics.name);
title.setText(name);
}