diff --git a/OsmAnd/res/values/colors.xml b/OsmAnd/res/values/colors.xml index 7611f7f773..db07be413c 100644 --- a/OsmAnd/res/values/colors.xml +++ b/OsmAnd/res/values/colors.xml @@ -1,6 +1,7 @@ + #bfbfbf #c5d2e6 #3db878 #3a9f73 diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml index f50529ba4b..bae0d1fe87 100644 --- a/OsmAnd/res/values/strings.xml +++ b/OsmAnd/res/values/strings.xml @@ -9,8 +9,8 @@ 3. All your modified/created strings are in the top of the file (to make easier find what\'s translated). PLEASE: Have a look at http://code.google.com/p/osmand/wiki/UIConsistency, it may really improve your and our work :-) Thx - Hardy --> - Routes within - NEAR IN + Routes near in + NEAR Enter the file name. Make as Start Point Current diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java index 9bb2433d6e..24cc6e332d 100644 --- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java +++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java @@ -62,6 +62,7 @@ import net.osmand.plus.views.controls.SingleTapConfirm; import net.osmand.util.Algorithms; import java.util.List; +import java.util.Locale; import static android.util.TypedValue.COMPLEX_UNIT_DIP; import static net.osmand.plus.mapcontextmenu.MenuBuilder.SHADOW_HEIGHT_TOP_DP; @@ -498,7 +499,11 @@ public class MapContextMenuFragment extends BaseOsmAndFragment implements Downlo List localTransportStopRoutes = menu.getLocalTransportStopRoutes(); List nearbyTransportStopRoutes = menu.getNearbyTransportStopRoutes(); - + if (nightMode) { + nearbRoutesWithinTv.setTextColor(ContextCompat.getColor(getContext(), R.color.ctx_menu_bottom_view_secondary_text_color_dark)); + } else { + nearbRoutesWithinTv.setTextColor(ContextCompat.getColor(getContext(), R.color.ctx_menu_nearby_routes_text_color_dark)); + } if (localTransportStopRoutes != null && localTransportStopRoutes.size() > 0) { localTransportStopRoutesGrid.setAdapter(createTransportStopRouteAdapter(localTransportStopRoutes)); localTransportStopRoutesGrid.setVisibility(View.VISIBLE); @@ -507,7 +512,7 @@ public class MapContextMenuFragment extends BaseOsmAndFragment implements Downlo } if (nearbyTransportStopRoutes != null && nearbyTransportStopRoutes.size() > 0) { String nearInDistance = getMyApplication().getString(R.string.transport_nearby_routes) + " " - + OsmAndFormatter.getFormattedDistance(TransportStopController.SHOW_STOPS_RADIUS_METERS, getMyApplication()); + + OsmAndFormatter.getFormattedDistance(TransportStopController.SHOW_STOPS_RADIUS_METERS, getMyApplication()).toUpperCase(Locale.ROOT) +":"; nearbRoutesWithinTv.setText(nearInDistance); nearbyTransportStopRoutesGrid.setAdapter(createTransportStopRouteAdapter(nearbyTransportStopRoutes)); nearbyTransportStopRoutesGrid.setVisibility(View.VISIBLE);