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

Fix small issues with new progress bar

Browse source
This commit is contained in:
Alex Sytnyk 2018-05-25 17:43:35 +03:00
parent c62f0ae66c
commit 5e26ec37d9
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
OsmAnd/src/net/osmand/plus/activities/MapActivity.java
View file

@ -440,6 +440,10 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
if (pbExtView.getVisibility() == View.VISIBLE) { if (pbExtView.getVisibility() == View.VISIBLE) {
pbExtView.setVisibility(View.GONE); pbExtView.setVisibility(View.GONE);
} }
if (MapRouteInfoMenu.isVisible()) {
pb.setVisibility(View.GONE);
return;
}
if (pb.getVisibility() == View.GONE) { if (pb.getVisibility() == View.GONE) {
pb.setVisibility(View.VISIBLE); pb.setVisibility(View.VISIBLE);
} }

4
OsmAnd/src/net/osmand/plus/views/mapwidgets/RouteInfoWidgetsFactory.java
View file

@ -764,7 +764,6 @@ public class RouteInfoWidgetsFactory {
private int dist; private int dist;
private LanesDrawable lanesDrawable; private LanesDrawable lanesDrawable;
private View centerInfo; private View centerInfo;
private View progress;
private int shadowRadius; private int shadowRadius;
public LanesControl(final MapActivity map, final OsmandMapTileView view) { public LanesControl(final MapActivity map, final OsmandMapTileView view) {
@ -772,7 +771,6 @@ public class RouteInfoWidgetsFactory {
lanesText = (TextView) map.findViewById(R.id.map_lanes_dist_text); lanesText = (TextView) map.findViewById(R.id.map_lanes_dist_text);
lanesShadowText = (TextView) map.findViewById(R.id.map_lanes_dist_text_shadow); lanesShadowText = (TextView) map.findViewById(R.id.map_lanes_dist_text_shadow);
centerInfo = (View) map.findViewById(R.id.map_center_info); centerInfo = (View) map.findViewById(R.id.map_center_info);
progress = (View) map.findViewById(R.id.map_horizontal_progress);
lanesDrawable = new LanesDrawable(map, map.getMapView().getScaleCoefficient()); lanesDrawable = new LanesDrawable(map, map.getMapView().getScaleCoefficient());
lanesView.setImageDrawable(lanesDrawable); lanesView.setImageDrawable(lanesDrawable);
trackingUtilities = map.getMapViewTrackingUtilities(); trackingUtilities = map.getMapViewTrackingUtilities();
@ -859,7 +857,7 @@ public class RouteInfoWidgetsFactory {
updateVisibility(lanesShadowText, visible && shadowRadius > 0); updateVisibility(lanesShadowText, visible && shadowRadius > 0);
updateVisibility(lanesText, visible); updateVisibility(lanesText, visible);
updateVisibility(lanesView, visible); updateVisibility(lanesView, visible);
updateVisibility(centerInfo, visible || progress.getVisibility() == View.VISIBLE); updateVisibility(centerInfo, visible);
return true; return true;
} }
} }