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

Update icons

Browse source
This commit is contained in:
Victor Shcherb 2015-03-15 16:35:17 +01:00
parent 7fd1d625a2
commit fb55113c38
4 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
OsmAnd/res/layout/main.xml
View file

@ -22,6 +22,7 @@
android:id="@+id/MapView" android:id="@+id/MapView"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:background="@drawable/btn_flat"
android:contentDescription="@string/shared_string_map" android:contentDescription="@string/shared_string_map"
android:visibility="gone" /> android:visibility="gone" />

2
OsmAnd/res/layout/map_hud_widget.xml
View file

@ -40,7 +40,6 @@
android:shadowColor="@color/color_myloc_distance" android:shadowColor="@color/color_myloc_distance"
android:textColor="@color/color_black" android:textColor="@color/color_black"
android:shadowRadius="10" android:shadowRadius="10"
android:textStyle="bold"
android:textSize="@dimen/map_widget_text_size" android:textSize="@dimen/map_widget_text_size"
android:text="1048" /> android:text="1048" />
<TextView <TextView
@ -55,7 +54,6 @@
android:shadowColor="@color/color_myloc_distance" android:shadowColor="@color/color_myloc_distance"
android:textColor="@color/color_black" android:textColor="@color/color_black"
android:shadowRadius="10" android:shadowRadius="10"
android:textStyle="bold"
android:textSize="@dimen/map_widget_text_size_small" android:textSize="@dimen/map_widget_text_size_small"
android:text="km" /> android:text="km" />
</LinearLayout> </LinearLayout>

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

@ -338,6 +338,10 @@ public class MapInfoWidgetsFactory {
RouteDirectionInfo next = routingHelper.getRouteDirections().get(di); RouteDirectionInfo next = routingHelper.getRouteDirections().get(di);
type[0] = next.getTurnType(); type[0] = next.getTurnType();
text = RoutingHelper.formatStreetName(next.getStreetName(), next.getRef(), next.getDestinationName()); text = RoutingHelper.formatStreetName(next.getStreetName(), next.getRef(), next.getDestinationName());
if(next.distance > 0) {
text += " " + OsmAndFormatter.getFormattedDistance(next.distance, map.getMyApplication());
}
} }
} }
} else if(settings.getApplicationMode() != ApplicationMode.DEFAULT && } else if(settings.getApplicationMode() != ApplicationMode.DEFAULT &&

3
OsmAnd/src/net/osmand/plus/views/mapwidgets/NextTurnInfoWidget.java
View file

@ -43,7 +43,6 @@ public class NextTurnInfoWidget extends TextInfoWidget {
setImageDrawable(null, false); setImageDrawable(null, false);
setTopImageDrawable(turnDrawable, true); setTopImageDrawable(turnDrawable, true);
} }
updateVisibility(false);
} }
public TurnType getTurnType() { public TurnType getTurnType() {
@ -51,6 +50,7 @@ public class NextTurnInfoWidget extends TextInfoWidget {
} }
public void setTurnType(TurnType turnType) { public void setTurnType(TurnType turnType) {
updateVisibility(turnType != null);
if (turnDrawable.setTurnType(turnType)) { if (turnDrawable.setTurnType(turnType)) {
if(horisontalMini) { if(horisontalMini) {
setImageDrawable(turnDrawable, false); setImageDrawable(turnDrawable, false);
@ -58,7 +58,6 @@ public class NextTurnInfoWidget extends TextInfoWidget {
setTopImageDrawable(turnDrawable, true); setTopImageDrawable(turnDrawable, true);
} }
} }
updateVisibility(turnType != null);
} }
public void setTurnImminent(int turnImminent, boolean deviatedFromRoute) { public void setTurnImminent(int turnImminent, boolean deviatedFromRoute) {