diff --git a/OsmAnd-java/src/main/java/net/osmand/data/TransportStop.java b/OsmAnd-java/src/main/java/net/osmand/data/TransportStop.java index 1de6286527..0fdacabdc7 100644 --- a/OsmAnd-java/src/main/java/net/osmand/data/TransportStop.java +++ b/OsmAnd-java/src/main/java/net/osmand/data/TransportStop.java @@ -11,7 +11,7 @@ public class TransportStop extends MapObject { private static final int DELETED_STOP = -1; private int[] referencesToRoutes = null; - private Amenity amenity; + private TransportStopAggregated transportStopAggregated; public int distance; public int x31; public int y31; @@ -37,11 +37,53 @@ public class TransportStop extends MapObject { } public Amenity getAmenity() { - return amenity; + if (transportStopAggregated != null) { + return transportStopAggregated.getAmenity(); + } + return null; } public void setAmenity(Amenity amenity) { - this.amenity = amenity; + if (transportStopAggregated == null) { + transportStopAggregated = new TransportStopAggregated(); + } + transportStopAggregated.setAmenity(amenity); + } + + public List getLocalTransportStops() { + if (transportStopAggregated != null) { + return transportStopAggregated.getLocalTransportStops(); + } + return Collections.emptyList(); + } + + public void addLocalTransportStop(TransportStop stop) { + if (transportStopAggregated == null) { + transportStopAggregated = new TransportStopAggregated(); + } + transportStopAggregated.addLocalTransportStop(stop); + } + + public List getNearbyTransportStops() { + if (transportStopAggregated != null) { + return transportStopAggregated.getNearbyTransportStops(); + } + return Collections.emptyList(); + } + + public void addNearbyTransportStop(TransportStop stop) { + if (transportStopAggregated == null) { + transportStopAggregated = new TransportStopAggregated(); + } + transportStopAggregated.addNearbyTransportStop(stop); + } + + public TransportStopAggregated getTransportStopAggregated() { + return transportStopAggregated; + } + + public void setTransportStopAggregated(TransportStopAggregated stopAggregated) { + transportStopAggregated = stopAggregated; } @Override diff --git a/OsmAnd-java/src/main/java/net/osmand/data/TransportStopAggregated.java b/OsmAnd-java/src/main/java/net/osmand/data/TransportStopAggregated.java new file mode 100644 index 0000000000..4388014eed --- /dev/null +++ b/OsmAnd-java/src/main/java/net/osmand/data/TransportStopAggregated.java @@ -0,0 +1,65 @@ +package net.osmand.data; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +public class TransportStopAggregated { + + private Amenity amenity; + private List localTransportStops; + private List nearbyTransportStops; + + public TransportStopAggregated() { + } + + public Amenity getAmenity() { + return amenity; + } + + public void setAmenity(Amenity amenity) { + this.amenity = amenity; + } + + public List getLocalTransportStops() { + if (localTransportStops == null) { + return Collections.emptyList(); + } + return this.localTransportStops; + } + + public void addLocalTransportStop(TransportStop stop) { + if (localTransportStops == null) { + localTransportStops = new ArrayList<>(); + } + localTransportStops.add(stop); + } + + public void addLocalTransportStops(List stops) { + if (localTransportStops == null) { + localTransportStops = new ArrayList<>(); + } + localTransportStops.addAll(stops); + } + + public List getNearbyTransportStops() { + if (nearbyTransportStops == null) { + return Collections.emptyList(); + } + return this.nearbyTransportStops; + } + + public void addNearbyTransportStop(TransportStop stop) { + if (nearbyTransportStops == null) { + nearbyTransportStops = new ArrayList<>(); + } + nearbyTransportStops.add(stop); + } + + public void addNearbyTransportStops(List stops) { + if (nearbyTransportStops == null) { + nearbyTransportStops = new ArrayList<>(); + } + nearbyTransportStops.addAll(stops); + } +} \ No newline at end of file diff --git a/OsmAnd/res/color-v21/dlg_btn_secondary_text_dark.xml b/OsmAnd/res/color-v21/dlg_btn_secondary_text_dark.xml index 40dada9eda..4cac1da501 100644 --- a/OsmAnd/res/color-v21/dlg_btn_secondary_text_dark.xml +++ b/OsmAnd/res/color-v21/dlg_btn_secondary_text_dark.xml @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/OsmAnd/res/color-v21/dlg_btn_secondary_text_light.xml b/OsmAnd/res/color-v21/dlg_btn_secondary_text_light.xml index 54854c95fc..f3995c460b 100644 --- a/OsmAnd/res/color-v21/dlg_btn_secondary_text_light.xml +++ b/OsmAnd/res/color-v21/dlg_btn_secondary_text_light.xml @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/OsmAnd/res/color/bottom_navigation_color_selector_light.xml b/OsmAnd/res/color/bottom_navigation_color_selector_light.xml index d1537744a1..a27964ebe9 100644 --- a/OsmAnd/res/color/bottom_navigation_color_selector_light.xml +++ b/OsmAnd/res/color/bottom_navigation_color_selector_light.xml @@ -1,5 +1,5 @@ - + diff --git a/OsmAnd/res/color/dlg_btn_secondary_text_dark.xml b/OsmAnd/res/color/dlg_btn_secondary_text_dark.xml index 5622a463ee..4de20c1a6c 100644 --- a/OsmAnd/res/color/dlg_btn_secondary_text_dark.xml +++ b/OsmAnd/res/color/dlg_btn_secondary_text_dark.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/OsmAnd/res/color/dlg_btn_secondary_text_light.xml b/OsmAnd/res/color/dlg_btn_secondary_text_light.xml index b79bc83136..cf3bcdde70 100644 --- a/OsmAnd/res/color/dlg_btn_secondary_text_light.xml +++ b/OsmAnd/res/color/dlg_btn_secondary_text_light.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/OsmAnd/res/drawable-hdpi/ic_action_offroad.png b/OsmAnd/res/drawable-hdpi/ic_action_offroad.png new file mode 100644 index 0000000000..2386299bc3 Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/ic_action_offroad.png differ diff --git a/OsmAnd/res/drawable-hdpi/map_action_offroad.png b/OsmAnd/res/drawable-hdpi/map_action_offroad.png new file mode 100644 index 0000000000..2386299bc3 Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/map_action_offroad.png differ diff --git a/OsmAnd/res/drawable-large-hdpi/map_action_offroad.png b/OsmAnd/res/drawable-large-hdpi/map_action_offroad.png new file mode 100644 index 0000000000..e8e7087332 Binary files /dev/null and b/OsmAnd/res/drawable-large-hdpi/map_action_offroad.png differ diff --git a/OsmAnd/res/drawable-large-xhdpi/map_action_offroad.png b/OsmAnd/res/drawable-large-xhdpi/map_action_offroad.png new file mode 100644 index 0000000000..a24c8505b9 Binary files /dev/null and b/OsmAnd/res/drawable-large-xhdpi/map_action_offroad.png differ diff --git a/OsmAnd/res/drawable-large/map_action_offroad.png b/OsmAnd/res/drawable-large/map_action_offroad.png new file mode 100644 index 0000000000..2386299bc3 Binary files /dev/null and b/OsmAnd/res/drawable-large/map_action_offroad.png differ diff --git a/OsmAnd/res/drawable-mdpi/ic_action_offroad.png b/OsmAnd/res/drawable-mdpi/ic_action_offroad.png new file mode 100644 index 0000000000..3346f553a1 Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/ic_action_offroad.png differ diff --git a/OsmAnd/res/drawable-mdpi/map_action_offroad.png b/OsmAnd/res/drawable-mdpi/map_action_offroad.png new file mode 100644 index 0000000000..3346f553a1 Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/map_action_offroad.png differ diff --git a/OsmAnd/res/drawable-v21/dlg_btn_primary_dark.xml b/OsmAnd/res/drawable-v21/dlg_btn_primary_dark.xml index e3b2c54f9b..0e7474ea6c 100644 --- a/OsmAnd/res/drawable-v21/dlg_btn_primary_dark.xml +++ b/OsmAnd/res/drawable-v21/dlg_btn_primary_dark.xml @@ -6,7 +6,7 @@ - + diff --git a/OsmAnd/res/drawable-v21/dlg_btn_primary_light.xml b/OsmAnd/res/drawable-v21/dlg_btn_primary_light.xml index 01bcae29a4..48480a533b 100644 --- a/OsmAnd/res/drawable-v21/dlg_btn_primary_light.xml +++ b/OsmAnd/res/drawable-v21/dlg_btn_primary_light.xml @@ -6,7 +6,7 @@ - + diff --git a/OsmAnd/res/drawable-v21/dlg_btn_stroked_dark.xml b/OsmAnd/res/drawable-v21/dlg_btn_stroked_dark.xml index 5aa9278c8c..4b947b86a0 100644 --- a/OsmAnd/res/drawable-v21/dlg_btn_stroked_dark.xml +++ b/OsmAnd/res/drawable-v21/dlg_btn_stroked_dark.xml @@ -3,7 +3,7 @@ - + @@ -15,7 +15,7 @@ - + diff --git a/OsmAnd/res/drawable-v21/dlg_btn_stroked_light.xml b/OsmAnd/res/drawable-v21/dlg_btn_stroked_light.xml index 6c9b38e82c..6591f2a54d 100644 --- a/OsmAnd/res/drawable-v21/dlg_btn_stroked_light.xml +++ b/OsmAnd/res/drawable-v21/dlg_btn_stroked_light.xml @@ -2,7 +2,7 @@ - + @@ -14,7 +14,7 @@ - + diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_offroad.png b/OsmAnd/res/drawable-xhdpi/ic_action_offroad.png new file mode 100644 index 0000000000..e8e7087332 Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/ic_action_offroad.png differ diff --git a/OsmAnd/res/drawable-xhdpi/map_action_offroad.png b/OsmAnd/res/drawable-xhdpi/map_action_offroad.png new file mode 100644 index 0000000000..e8e7087332 Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/map_action_offroad.png differ diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_offroad.png b/OsmAnd/res/drawable-xxhdpi/ic_action_offroad.png new file mode 100644 index 0000000000..a24c8505b9 Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/ic_action_offroad.png differ diff --git a/OsmAnd/res/drawable-xxhdpi/map_action_offroad.png b/OsmAnd/res/drawable-xxhdpi/map_action_offroad.png new file mode 100644 index 0000000000..a24c8505b9 Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/map_action_offroad.png differ diff --git a/OsmAnd/res/drawable-xxxhdpi/ic_action_offroad.png b/OsmAnd/res/drawable-xxxhdpi/ic_action_offroad.png new file mode 100644 index 0000000000..4a3a198295 Binary files /dev/null and b/OsmAnd/res/drawable-xxxhdpi/ic_action_offroad.png differ diff --git a/OsmAnd/res/drawable-xxxhdpi/map_action_offroad.png b/OsmAnd/res/drawable-xxxhdpi/map_action_offroad.png new file mode 100644 index 0000000000..4a3a198295 Binary files /dev/null and b/OsmAnd/res/drawable-xxxhdpi/map_action_offroad.png differ diff --git a/OsmAnd/res/drawable/bg_bottom_menu_dark.xml b/OsmAnd/res/drawable/bg_bottom_menu_dark.xml index dd45b295ef..25aac8c184 100644 --- a/OsmAnd/res/drawable/bg_bottom_menu_dark.xml +++ b/OsmAnd/res/drawable/bg_bottom_menu_dark.xml @@ -5,7 +5,7 @@ - + \ No newline at end of file diff --git a/OsmAnd/res/drawable/bg_bottom_menu_light.xml b/OsmAnd/res/drawable/bg_bottom_menu_light.xml index 7a6ec22e1c..7305d60ab4 100644 --- a/OsmAnd/res/drawable/bg_bottom_menu_light.xml +++ b/OsmAnd/res/drawable/bg_bottom_menu_light.xml @@ -5,7 +5,7 @@ - + \ No newline at end of file diff --git a/OsmAnd/res/drawable/btn_active_dark.xml b/OsmAnd/res/drawable/btn_active_dark.xml index 30d5835f31..f9e58283e9 100644 --- a/OsmAnd/res/drawable/btn_active_dark.xml +++ b/OsmAnd/res/drawable/btn_active_dark.xml @@ -3,7 +3,7 @@ - + \ No newline at end of file diff --git a/OsmAnd/res/drawable/btn_active_light.xml b/OsmAnd/res/drawable/btn_active_light.xml index c53e42ef98..35e2c9274e 100644 --- a/OsmAnd/res/drawable/btn_active_light.xml +++ b/OsmAnd/res/drawable/btn_active_light.xml @@ -3,7 +3,7 @@ - + \ No newline at end of file diff --git a/OsmAnd/res/drawable/btn_active_trans_dark.xml b/OsmAnd/res/drawable/btn_active_trans_dark.xml index c09053eb61..f2de038750 100644 --- a/OsmAnd/res/drawable/btn_active_trans_dark.xml +++ b/OsmAnd/res/drawable/btn_active_trans_dark.xml @@ -4,7 +4,7 @@ - + @@ -17,7 +17,7 @@ - + \ No newline at end of file diff --git a/OsmAnd/res/drawable/btn_active_trans_light.xml b/OsmAnd/res/drawable/btn_active_trans_light.xml index b4bcb2dbb2..d00f79fa61 100644 --- a/OsmAnd/res/drawable/btn_active_trans_light.xml +++ b/OsmAnd/res/drawable/btn_active_trans_light.xml @@ -4,7 +4,7 @@ - + @@ -17,7 +17,7 @@ - + \ No newline at end of file diff --git a/OsmAnd/res/drawable/btn_border_active_dark.xml b/OsmAnd/res/drawable/btn_border_active_dark.xml index 7bfff2de9a..99b1c7a0f5 100644 --- a/OsmAnd/res/drawable/btn_border_active_dark.xml +++ b/OsmAnd/res/drawable/btn_border_active_dark.xml @@ -3,7 +3,7 @@ - + \ No newline at end of file diff --git a/OsmAnd/res/drawable/btn_border_active_light.xml b/OsmAnd/res/drawable/btn_border_active_light.xml index 52999f4b4c..264b30dc55 100644 --- a/OsmAnd/res/drawable/btn_border_active_light.xml +++ b/OsmAnd/res/drawable/btn_border_active_light.xml @@ -3,7 +3,7 @@ - + \ No newline at end of file diff --git a/OsmAnd/res/drawable/btn_border_dark.xml b/OsmAnd/res/drawable/btn_border_dark.xml index 512e6a5583..3ef8a6c473 100644 --- a/OsmAnd/res/drawable/btn_border_dark.xml +++ b/OsmAnd/res/drawable/btn_border_dark.xml @@ -3,7 +3,7 @@ - + diff --git a/OsmAnd/res/drawable/btn_border_light.xml b/OsmAnd/res/drawable/btn_border_light.xml index c4d6957187..fedae94ad5 100644 --- a/OsmAnd/res/drawable/btn_border_light.xml +++ b/OsmAnd/res/drawable/btn_border_light.xml @@ -3,7 +3,7 @@ - + diff --git a/OsmAnd/res/drawable/btn_border_pressed_dark.xml b/OsmAnd/res/drawable/btn_border_pressed_dark.xml index 3bbe4043e9..64dd9828c7 100644 --- a/OsmAnd/res/drawable/btn_border_pressed_dark.xml +++ b/OsmAnd/res/drawable/btn_border_pressed_dark.xml @@ -3,7 +3,7 @@ - + \ No newline at end of file diff --git a/OsmAnd/res/drawable/btn_border_pressed_light.xml b/OsmAnd/res/drawable/btn_border_pressed_light.xml index 12e9738e62..be7f23f65c 100644 --- a/OsmAnd/res/drawable/btn_border_pressed_light.xml +++ b/OsmAnd/res/drawable/btn_border_pressed_light.xml @@ -3,7 +3,7 @@ - + \ No newline at end of file diff --git a/OsmAnd/res/drawable/btn_border_pressed_trans_dark.xml b/OsmAnd/res/drawable/btn_border_pressed_trans_dark.xml index b38c5a48f1..b36170a5ac 100644 --- a/OsmAnd/res/drawable/btn_border_pressed_trans_dark.xml +++ b/OsmAnd/res/drawable/btn_border_pressed_trans_dark.xml @@ -4,7 +4,7 @@ - + \ No newline at end of file diff --git a/OsmAnd/res/drawable/btn_border_pressed_trans_light.xml b/OsmAnd/res/drawable/btn_border_pressed_trans_light.xml index a9adb32ed8..25c3ce00a1 100644 --- a/OsmAnd/res/drawable/btn_border_pressed_trans_light.xml +++ b/OsmAnd/res/drawable/btn_border_pressed_trans_light.xml @@ -4,7 +4,7 @@ - + \ No newline at end of file diff --git a/OsmAnd/res/drawable/btn_border_trans_dark.xml b/OsmAnd/res/drawable/btn_border_trans_dark.xml index 7f2d58c3ab..35c4d09d3d 100644 --- a/OsmAnd/res/drawable/btn_border_trans_dark.xml +++ b/OsmAnd/res/drawable/btn_border_trans_dark.xml @@ -4,7 +4,7 @@ - + diff --git a/OsmAnd/res/drawable/btn_border_trans_light.xml b/OsmAnd/res/drawable/btn_border_trans_light.xml index adc199e8c7..9828d80705 100644 --- a/OsmAnd/res/drawable/btn_border_trans_light.xml +++ b/OsmAnd/res/drawable/btn_border_trans_light.xml @@ -4,7 +4,7 @@ - + diff --git a/OsmAnd/res/drawable/btn_pressed_trans_light.xml b/OsmAnd/res/drawable/btn_pressed_trans_light.xml index a9adb32ed8..25c3ce00a1 100644 --- a/OsmAnd/res/drawable/btn_pressed_trans_light.xml +++ b/OsmAnd/res/drawable/btn_pressed_trans_light.xml @@ -4,7 +4,7 @@ - + \ No newline at end of file diff --git a/OsmAnd/res/drawable/btn_round_profile_blue.xml b/OsmAnd/res/drawable/btn_round_profile_blue.xml index d936954e69..9c536536ec 100644 --- a/OsmAnd/res/drawable/btn_round_profile_blue.xml +++ b/OsmAnd/res/drawable/btn_round_profile_blue.xml @@ -10,7 +10,7 @@ - + diff --git a/OsmAnd/res/drawable/btn_round_profile_night.xml b/OsmAnd/res/drawable/btn_round_profile_night.xml index f07b29d54e..13c3febd78 100644 --- a/OsmAnd/res/drawable/btn_round_profile_night.xml +++ b/OsmAnd/res/drawable/btn_round_profile_night.xml @@ -15,7 +15,7 @@ - + diff --git a/OsmAnd/res/drawable/btn_rounded_dark.xml b/OsmAnd/res/drawable/btn_rounded_dark.xml index fddd00c115..cfc53db98c 100644 --- a/OsmAnd/res/drawable/btn_rounded_dark.xml +++ b/OsmAnd/res/drawable/btn_rounded_dark.xml @@ -3,7 +3,7 @@ - + diff --git a/OsmAnd/res/drawable/btn_rounded_light.xml b/OsmAnd/res/drawable/btn_rounded_light.xml index cdcd101e5f..d8bc48b05e 100644 --- a/OsmAnd/res/drawable/btn_rounded_light.xml +++ b/OsmAnd/res/drawable/btn_rounded_light.xml @@ -3,7 +3,7 @@ - + diff --git a/OsmAnd/res/drawable/btn_trans_rounded_dark.xml b/OsmAnd/res/drawable/btn_trans_rounded_dark.xml index 7fb0894253..de86f28e47 100644 --- a/OsmAnd/res/drawable/btn_trans_rounded_dark.xml +++ b/OsmAnd/res/drawable/btn_trans_rounded_dark.xml @@ -4,7 +4,7 @@ - + diff --git a/OsmAnd/res/drawable/btn_trans_rounded_light.xml b/OsmAnd/res/drawable/btn_trans_rounded_light.xml index af1aab31fa..458787b7d0 100644 --- a/OsmAnd/res/drawable/btn_trans_rounded_light.xml +++ b/OsmAnd/res/drawable/btn_trans_rounded_light.xml @@ -4,7 +4,7 @@ - + diff --git a/OsmAnd/res/drawable/dlg_btn_primary_dark.xml b/OsmAnd/res/drawable/dlg_btn_primary_dark.xml index 2d9f8c6b8e..01dd9d72e0 100644 --- a/OsmAnd/res/drawable/dlg_btn_primary_dark.xml +++ b/OsmAnd/res/drawable/dlg_btn_primary_dark.xml @@ -10,7 +10,7 @@ - + diff --git a/OsmAnd/res/drawable/dlg_btn_primary_light.xml b/OsmAnd/res/drawable/dlg_btn_primary_light.xml index 40093d61a6..c39959d25d 100644 --- a/OsmAnd/res/drawable/dlg_btn_primary_light.xml +++ b/OsmAnd/res/drawable/dlg_btn_primary_light.xml @@ -9,7 +9,7 @@ - + diff --git a/OsmAnd/res/drawable/dlg_btn_stroked_dark.xml b/OsmAnd/res/drawable/dlg_btn_stroked_dark.xml index 44e90cce2f..60623f3e1a 100644 --- a/OsmAnd/res/drawable/dlg_btn_stroked_dark.xml +++ b/OsmAnd/res/drawable/dlg_btn_stroked_dark.xml @@ -10,7 +10,7 @@ - + diff --git a/OsmAnd/res/drawable/dlg_btn_stroked_light.xml b/OsmAnd/res/drawable/dlg_btn_stroked_light.xml index 296ccb04b8..6532b27e60 100644 --- a/OsmAnd/res/drawable/dlg_btn_stroked_light.xml +++ b/OsmAnd/res/drawable/dlg_btn_stroked_light.xml @@ -10,7 +10,7 @@ - + diff --git a/OsmAnd/res/drawable/pages_active_dark.xml b/OsmAnd/res/drawable/pages_active_dark.xml index bf2fed66ca..58c2c13eda 100644 --- a/OsmAnd/res/drawable/pages_active_dark.xml +++ b/OsmAnd/res/drawable/pages_active_dark.xml @@ -2,7 +2,7 @@ - + diff --git a/OsmAnd/res/drawable/pages_active_light.xml b/OsmAnd/res/drawable/pages_active_light.xml index ea344ee8e6..30beab47f3 100644 --- a/OsmAnd/res/drawable/pages_active_light.xml +++ b/OsmAnd/res/drawable/pages_active_light.xml @@ -2,7 +2,7 @@ - + diff --git a/OsmAnd/res/drawable/ripple_active_dark.xml b/OsmAnd/res/drawable/ripple_active_dark.xml index fb06db30be..4bc7feb3ad 100644 --- a/OsmAnd/res/drawable/ripple_active_dark.xml +++ b/OsmAnd/res/drawable/ripple_active_dark.xml @@ -2,7 +2,7 @@ android:color="@color/per42black"> - + diff --git a/OsmAnd/res/drawable/ripple_active_light.xml b/OsmAnd/res/drawable/ripple_active_light.xml index e35f875a09..4caa4032e9 100644 --- a/OsmAnd/res/drawable/ripple_active_light.xml +++ b/OsmAnd/res/drawable/ripple_active_light.xml @@ -2,7 +2,7 @@ android:color="@color/per42black"> - + diff --git a/OsmAnd/res/drawable/ripple_dark.xml b/OsmAnd/res/drawable/ripple_dark.xml index ce5672d46c..79e9e84f2a 100644 --- a/OsmAnd/res/drawable/ripple_dark.xml +++ b/OsmAnd/res/drawable/ripple_dark.xml @@ -2,7 +2,7 @@ android:color="@color/active_buttons_and_links_trans_dark"> - + diff --git a/OsmAnd/res/drawable/ripple_light.xml b/OsmAnd/res/drawable/ripple_light.xml index f4a9855f6b..10954d6aac 100644 --- a/OsmAnd/res/drawable/ripple_light.xml +++ b/OsmAnd/res/drawable/ripple_light.xml @@ -2,7 +2,7 @@ android:color="@color/active_buttons_and_links_trans_light"> - + diff --git a/OsmAnd/res/drawable/ripple_rounded_dark.xml b/OsmAnd/res/drawable/ripple_rounded_dark.xml index a0b9e77bd2..f22f55eb8e 100644 --- a/OsmAnd/res/drawable/ripple_rounded_dark.xml +++ b/OsmAnd/res/drawable/ripple_rounded_dark.xml @@ -2,7 +2,7 @@ android:color="@color/active_buttons_and_links_trans_dark"> - + diff --git a/OsmAnd/res/drawable/ripple_rounded_light.xml b/OsmAnd/res/drawable/ripple_rounded_light.xml index dd575011a4..45f1344a35 100644 --- a/OsmAnd/res/drawable/ripple_rounded_light.xml +++ b/OsmAnd/res/drawable/ripple_rounded_light.xml @@ -2,7 +2,7 @@ android:color="@color/active_buttons_and_links_trans_light"> - + diff --git a/OsmAnd/res/drawable/ripple_solid_dark.xml b/OsmAnd/res/drawable/ripple_solid_dark.xml index 9e9e6a0cce..eb1fd49a4e 100644 --- a/OsmAnd/res/drawable/ripple_solid_dark.xml +++ b/OsmAnd/res/drawable/ripple_solid_dark.xml @@ -2,7 +2,7 @@ android:color="@color/active_buttons_and_links_pressed_dark"> - + diff --git a/OsmAnd/res/drawable/ripple_solid_light.xml b/OsmAnd/res/drawable/ripple_solid_light.xml index b390b7cce7..393e92e5a8 100644 --- a/OsmAnd/res/drawable/ripple_solid_light.xml +++ b/OsmAnd/res/drawable/ripple_solid_light.xml @@ -2,7 +2,7 @@ android:color="@color/active_buttons_and_links_pressed_light"> - + diff --git a/OsmAnd/res/drawable/transport_stop_route_bg.xml b/OsmAnd/res/drawable/transport_stop_route_bg.xml index ac8defb11b..2178ef24b3 100644 --- a/OsmAnd/res/drawable/transport_stop_route_bg.xml +++ b/OsmAnd/res/drawable/transport_stop_route_bg.xml @@ -2,7 +2,7 @@ - + diff --git a/OsmAnd/res/layout-land/dest_reached_menu_fragment.xml b/OsmAnd/res/layout-land/dest_reached_menu_fragment.xml index 499d6aa5f9..36c0a0826b 100644 --- a/OsmAnd/res/layout-land/dest_reached_menu_fragment.xml +++ b/OsmAnd/res/layout-land/dest_reached_menu_fragment.xml @@ -77,8 +77,9 @@ android:id="@+id/findParkingButton" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginTop="8dp" - android:layout_marginBottom="8dp" + android:minHeight="@dimen/dialog_button_ex_height" + android:paddingTop="12dp" + android:paddingBottom="12dp" android:paddingLeft="8dp" android:paddingRight="8dp" android:drawableLeft="@drawable/ic_action_parking_dark" @@ -97,8 +98,9 @@ android:id="@+id/recalcDestButton" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginTop="8dp" - android:layout_marginBottom="8dp" + android:minHeight="@dimen/dialog_button_ex_height" + android:paddingTop="12dp" + android:paddingBottom="12dp" android:paddingLeft="8dp" android:paddingRight="8dp" android:drawableLeft="@drawable/ic_action_gdirections_dark" @@ -117,8 +119,9 @@ android:id="@+id/removeDestButton" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginTop="8dp" - android:layout_marginBottom="8dp" + android:minHeight="@dimen/dialog_button_ex_height" + android:paddingTop="12dp" + android:paddingBottom="12dp" android:paddingLeft="8dp" android:paddingRight="8dp" android:drawableLeft="@drawable/ic_action_done" diff --git a/OsmAnd/res/layout-v14/check_item_rel.xml b/OsmAnd/res/layout-v14/check_item_rel.xml index d7821443ef..772612b76d 100644 --- a/OsmAnd/res/layout-v14/check_item_rel.xml +++ b/OsmAnd/res/layout-v14/check_item_rel.xml @@ -1,7 +1,7 @@ - + tools:tint="@color/active_color_primary_light"/> + tools:textColor="@color/active_color_primary_light"/> + tools:tint="@color/active_color_primary_light"/> + tools:tint="@color/active_color_primary_light"/> + tools:textColor="@color/active_color_primary_light"/> + tools:tint="@color/active_color_primary_light"/> + android:background="@color/divider_color_dark"/> @@ -25,7 +25,7 @@ android:layout_height="48dp" android:layout_gravity="center_vertical" android:id="@+id/numberOfRowsTextView" - android:textColor="@color/dashboard_blue" + android:textColor="@color/active_color_primary_light" android:textSize="@dimen/default_list_text_size" osmand:typeface="@string/font_roboto_regular" android:gravity="center" diff --git a/OsmAnd/res/layout/dest_reached_menu_fragment.xml b/OsmAnd/res/layout/dest_reached_menu_fragment.xml index f1bdd7fdb4..917220dc15 100644 --- a/OsmAnd/res/layout/dest_reached_menu_fragment.xml +++ b/OsmAnd/res/layout/dest_reached_menu_fragment.xml @@ -1,10 +1,10 @@ + xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:clickable="true" + android:background="@android:color/transparent"> diff --git a/OsmAnd/res/layout/fragment_map_markers_groups.xml b/OsmAnd/res/layout/fragment_map_markers_groups.xml index 74911b1118..1bc03db2b7 100644 --- a/OsmAnd/res/layout/fragment_map_markers_groups.xml +++ b/OsmAnd/res/layout/fragment_map_markers_groups.xml @@ -21,7 +21,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/ic_action_plus" - app:backgroundTint="@color/dashboard_blue" + app:backgroundTint="@color/active_color_primary_light" app:fabSize="normal" app:useCompatPadding="true"/> diff --git a/OsmAnd/res/layout/fragment_selected_profile.xml b/OsmAnd/res/layout/fragment_selected_profile.xml index 5a8eea845f..f8f42f8312 100644 --- a/OsmAnd/res/layout/fragment_selected_profile.xml +++ b/OsmAnd/res/layout/fragment_selected_profile.xml @@ -66,7 +66,7 @@ android:layout_height="wrap_content" android:ellipsize="end" android:maxLines="1" - android:text="Base Profile"/> + android:text="@string/profile_type_base_string"/> @@ -372,7 +372,7 @@ android:layout_marginEnd="@dimen/list_content_padding" android:layout_marginLeft="@dimen/list_content_padding" android:layout_marginRight="@dimen/list_content_padding" - android:text="Profile keeps its own settings" + android:text="@string/edit_profile_setup_subtitle" android:textColor="@color/description_font_and_bottom_sheet_icons"/> @@ -452,14 +452,14 @@ @@ -502,14 +502,14 @@ diff --git a/OsmAnd/res/layout/grid_menu_item.xml b/OsmAnd/res/layout/grid_menu_item.xml index 206d2a025b..5d27fedc0b 100644 --- a/OsmAnd/res/layout/grid_menu_item.xml +++ b/OsmAnd/res/layout/grid_menu_item.xml @@ -29,7 +29,7 @@ android:gravity="center_horizontal" android:lines="2" android:maxLines="2" - android:textColor="@color/searchbar_text_hint_light" + android:textColor="?android:textColorSecondary" tools:text="Remove POI"/> diff --git a/OsmAnd/res/layout/map_context_menu_button.xml b/OsmAnd/res/layout/map_context_menu_button.xml new file mode 100644 index 0000000000..131ecabac8 --- /dev/null +++ b/OsmAnd/res/layout/map_context_menu_button.xml @@ -0,0 +1,32 @@ + + + + + + + + + + \ No newline at end of file diff --git a/OsmAnd/res/layout/map_context_menu_fragment.xml b/OsmAnd/res/layout/map_context_menu_fragment.xml index 579f2fd3a3..f8d2b891e7 100644 --- a/OsmAnd/res/layout/map_context_menu_fragment.xml +++ b/OsmAnd/res/layout/map_context_menu_fragment.xml @@ -242,73 +242,26 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:clickable="true" + android:focusable="true" android:orientation="horizontal" android:paddingBottom="@dimen/context_menu_padding_margin_small" + android:paddingLeft="@dimen/content_padding_half" + android:paddingRight="@dimen/content_padding_half" android:visibility="gone" tools:visibility="visible"> - + - + - - - - - - - - - + @@ -317,62 +270,26 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:clickable="true" + android:focusable="true" android:orientation="horizontal" android:paddingBottom="@dimen/context_menu_padding_margin_small" + android:paddingLeft="@dimen/content_padding_half" + android:paddingRight="@dimen/content_padding_half" android:visibility="gone" tools:visibility="visible"> - + layout="@layout/map_context_menu_button" /> - + - - - - - - - + layout="@layout/map_context_menu_button" /> @@ -381,36 +298,17 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:clickable="true" + android:focusable="true" android:orientation="horizontal" android:paddingBottom="@dimen/context_menu_padding_margin_small" + android:paddingLeft="@dimen/content_padding_half" + android:paddingRight="@dimen/content_padding_half" android:visibility="gone" tools:visibility="visible"> - - - - - + layout="@layout/map_context_menu_button" /> diff --git a/OsmAnd/res/layout/map_marker_item_show_hide_history.xml b/OsmAnd/res/layout/map_marker_item_show_hide_history.xml index 3d066409d2..f7a41b629e 100644 --- a/OsmAnd/res/layout/map_marker_item_show_hide_history.xml +++ b/OsmAnd/res/layout/map_marker_item_show_hide_history.xml @@ -24,7 +24,7 @@ tools:text="Show passed" android:textSize="@dimen/default_sub_text_size" osmand:typeface="@string/font_roboto_medium" - android:textColor="@color/dashboard_blue"/> + android:textColor="@color/active_color_primary_light"/> diff --git a/OsmAnd/res/layout/my_places_fabs.xml b/OsmAnd/res/layout/my_places_fabs.xml index 46abc9966e..7195ff90a1 100644 --- a/OsmAnd/res/layout/my_places_fabs.xml +++ b/OsmAnd/res/layout/my_places_fabs.xml @@ -15,7 +15,7 @@ android:layout_alignParentRight="true" android:contentDescription="@string/quick_action_new_action" android:src="@drawable/ic_action_plus" - app:backgroundTint="@color/dashboard_blue" + app:backgroundTint="@color/active_color_primary_light" app:fabSize="normal" app:useCompatPadding="true"/> diff --git a/OsmAnd/res/layout/purchase_dialog_card_header.xml b/OsmAnd/res/layout/purchase_dialog_card_header.xml index 75d1b8f64e..7f170c0161 100644 --- a/OsmAnd/res/layout/purchase_dialog_card_header.xml +++ b/OsmAnd/res/layout/purchase_dialog_card_header.xml @@ -37,7 +37,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="2dp" - android:textColor="@color/dialog_text_description_color" + android:textColor="?attr/dialog_text_description_color" android:textSize="@dimen/default_sub_text_size" tools:text="@string/osm_live_subscription"/> diff --git a/OsmAnd/res/layout/purchase_dialog_osm_live_card.xml b/OsmAnd/res/layout/purchase_dialog_osm_live_card.xml index 997ae7a2dd..5697540951 100644 --- a/OsmAnd/res/layout/purchase_dialog_osm_live_card.xml +++ b/OsmAnd/res/layout/purchase_dialog_osm_live_card.xml @@ -43,7 +43,7 @@ android:layout_marginRight="@dimen/card_padding" android:layout_marginBottom="@dimen/list_header_padding" android:text="@string/osm_live_payment_header" - android:textColor="@color/dialog_text_description_color" + android:textColor="?attr/dialog_text_description_color" android:textSize="@dimen/default_desc_text_size" osmand:typeface="@string/font_roboto_regular" /> diff --git a/OsmAnd/res/layout/quick_action_add_dialog.xml b/OsmAnd/res/layout/quick_action_add_dialog.xml index 11baa2320a..1d65e28b1d 100644 --- a/OsmAnd/res/layout/quick_action_add_dialog.xml +++ b/OsmAnd/res/layout/quick_action_add_dialog.xml @@ -36,6 +36,6 @@ android:text="@string/shared_string_dismiss" android:layout_gravity="right" android:background="?attr/selectableItemBackground" - android:textColor="@color/dashboard_blue" + android:textColor="@color/active_color_primary_light" android:textAllCaps="true"/> \ No newline at end of file diff --git a/OsmAnd/res/layout/quick_action_create_edit_dialog.xml b/OsmAnd/res/layout/quick_action_create_edit_dialog.xml index f3d0eaad6e..e9f15be4ef 100644 --- a/OsmAnd/res/layout/quick_action_create_edit_dialog.xml +++ b/OsmAnd/res/layout/quick_action_create_edit_dialog.xml @@ -126,7 +126,7 @@ android:gravity="center" android:layout_gravity="bottom" android:foreground="?attr/selectableItemBackground" - android:background="@color/dashboard_blue"/> + android:background="@color/active_color_primary_light"/> diff --git a/OsmAnd/res/layout/quick_action_list.xml b/OsmAnd/res/layout/quick_action_list.xml index 3d90620d82..059e6587ef 100644 --- a/OsmAnd/res/layout/quick_action_list.xml +++ b/OsmAnd/res/layout/quick_action_list.xml @@ -71,6 +71,6 @@ android:layout_margin="16dp" android:src="@drawable/ic_action_plus" android:contentDescription="@string/quick_action_new_action" - app:backgroundTint="@color/dashboard_blue"/> + app:backgroundTint="@color/active_color_primary_light"/> \ No newline at end of file diff --git a/OsmAnd/res/layout/quick_action_show_hide_poi.xml b/OsmAnd/res/layout/quick_action_show_hide_poi.xml index e106505bc5..869f4e0002 100644 --- a/OsmAnd/res/layout/quick_action_show_hide_poi.xml +++ b/OsmAnd/res/layout/quick_action_show_hide_poi.xml @@ -55,7 +55,7 @@ android:gravity="left" android:text="@string/quick_action_add_category" android:textAllCaps="true" - android:textColor="@color/dashboard_blue" + android:textColor="@color/active_color_primary_light" android:textSize="@dimen/default_list_text_size" /> diff --git a/OsmAnd/res/layout/quick_action_switchable_action.xml b/OsmAnd/res/layout/quick_action_switchable_action.xml index a9e67ef1ec..5f9c018f0c 100644 --- a/OsmAnd/res/layout/quick_action_switchable_action.xml +++ b/OsmAnd/res/layout/quick_action_switchable_action.xml @@ -100,7 +100,7 @@ android:gravity="left" android:text="@string/quick_action_map_style_action" android:textAllCaps="true" - android:textColor="@color/dashboard_blue" + android:textColor="@color/active_color_primary_light" android:textSize="@dimen/default_list_text_size" /> diff --git a/OsmAnd/res/values-eu/strings.xml b/OsmAnd/res/values-eu/strings.xml index ecff418f5d..5b4d43f4fc 100644 --- a/OsmAnd/res/values-eu/strings.xml +++ b/OsmAnd/res/values-eu/strings.xml @@ -2969,7 +2969,7 @@ Area honi dagokio: %1$s x %2$s Aurreko ibilbidea Graduak Hautatu nabigazioan ekidin beharreko garraio publikoak: - % modua + %s modua Ekidin garraio motak… Ibili \"%s\" etiketaren gehieneko luzera 255 karaktere da. diff --git a/OsmAnd/res/values-nb/strings.xml b/OsmAnd/res/values-nb/strings.xml index 3b976a9abf..c68bd7e0de 100644 --- a/OsmAnd/res/values-nb/strings.xml +++ b/OsmAnd/res/values-nb/strings.xml @@ -3000,7 +3000,7 @@ Lengden på \"%s\"-verdien Velg offentlige transporttyper å unngå for navigasjon: Unngå transporttyper… - &s-modus + %s-modus Grader Milliradianer Vinkel-måleenheter diff --git a/OsmAnd/res/values-nl/strings.xml b/OsmAnd/res/values-nl/strings.xml index 2aedb3e4d3..4bd3a8d562 100644 --- a/OsmAnd/res/values-nl/strings.xml +++ b/OsmAnd/res/values-nl/strings.xml @@ -2782,7 +2782,7 @@ voor Gebied: %1$s x %2$s Milliradialen Wijzig azimuth meet formaat. Selecteer de te vermijden openbaar vervoer opties: - % modus + %s modus Vermijd transport types… Loop The maximale tag lengte van \"%s\" is 255 karakters. diff --git a/OsmAnd/res/values/colors.xml b/OsmAnd/res/values/colors.xml index 960cb6b8f5..761dbe124e 100644 --- a/OsmAnd/res/values/colors.xml +++ b/OsmAnd/res/values/colors.xml @@ -1,48 +1,58 @@ + #212121 + #cccccc + #727272 + #727272 + #bfbfbf + #404040 + #237bff + #d28521 + #e6e6e6 + #2c3033 + #f0f0f0 + #17181a + #eaf0f0f0 + #ea17181a + #ffffff + #222526 + #ff8800 + #101112 + #e68200 + #101112 + + #0f67eb + #b87114 + #f0f0f0 + #222526 + #ffffff + #17181a + #ffffff + #cccccc + #727272 + #727272 + #fff9b2 #43453b #f3edae #32332c - #78cc5c - #f0f0f0 - #17191a - #eaf0f0f0 - #ea17191a - - #212121 - #cccccc - #212121 - #727272 - #e6e6e6 - #2d3133 - #727272 - #808080 - #b3b3b3 - #4d4d4d - - #bfbfbf #c5d2e6 + #3db878 #3a9f73 #14c45d #50ae55 #b5e5b9 - #853fc5 #3f51b5 - #a0a0a0 #357ef2 - #fff - #212121 #7a8c99 #727272 - #5b6872 #727272 @@ -62,8 +72,6 @@ #BBBBBB #FFFFFF - #de000000 - #8a000000 #ffffffff #b3ffffff @@ -133,7 +141,6 @@ #727272 #ccc - #ff4f4f4f #505050 @@ -150,8 +157,6 @@ #eaeaea #F0F0F0 #3d474c - #212121 - #536DFE #b4c3cc #727272 #ff8f00 @@ -353,8 +358,6 @@ #ffffff #17191a - #212121 - #cccccc #727272 #536dfe #e69122 @@ -382,8 +385,6 @@ #17191a #b3b3b3 #454a4d - #212121 - #cccccc #a6a6a6 #595959 #5baf3f @@ -446,12 +447,8 @@ #2d3133 #f0f0f0 #2d3133 - #ffffff - #cccccc #ffffff #000000 - #212121 - #cccccc #727272 #339966 #008bf8 @@ -473,19 +470,9 @@ #ffffff #1b1d1f #f0f0f0 - #cccccc - #212121 #727272 #4d4d4d #b3b3b3 - #237bff - #d28521 - #0F67EB - #B87114 - #F0F0F0 - #222526 - #ffffff - #17181A #cccccc #505050 #66237bff @@ -494,11 +481,6 @@ #EFEFEF #ababab - #727272 - #727272 - #ffffff - #cccccc - #237BFF #732EEB #0EBE92 diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml index 0d176a1e89..dad3df45eb 100644 --- a/OsmAnd/res/values/strings.xml +++ b/OsmAnd/res/values/strings.xml @@ -11,20 +11,31 @@ Thx - Hardy --> + Offroad + Setup Profile + Profile keeps its own settings + Configure map + Select default map options for profile + Configure screen + Select default screen options for profile + Navigation settings + Select default navigation settings for profile + Specify max number of changes + Number of changes UFO - • Application profiles: create your own profile for your needs, with a custom icon and color\n\n - • Add settings for default and min/max speed for profiles\n\n - • Add a widget with current coordinates\n\n - • Add options to show the compass on the map with a radius ruler\n\n + • Application profiles: create a custom profile for your own needs, with a custom icon and color\n\n + • Now customize any profile\'s default and min/max speeds\n\n + • Added a widget for the current coordinates\n\n + • Added options to show the compass and a radius ruler on the map\n\n • Fix background track logging\n\n • Improved background map downloads\n\n • Fixed Wikipedia language selection\n\n • Fixed compass button behavior during navigation\n\n • Other bug fixes\n\n - Precision horizontal: %1$s, vertical: %2$s - Precision horizontal: %s + Precision horizontally: %1$s, vertically: %2$s + Precision horizontally: %s Personal transporter Monowheel Scooter @@ -33,76 +44,76 @@ Default speed Change default speed settings Set min/max speed - Used for calculations of expected arrival time during routing - New Profile + Used to calculate the expected arrival time during routing + New profile Crash - The last launch of OsmAnd failed. Help us improve OsmAnd. Please send us an error message. - Press again to change the map orientation + The last launch of OsmAnd failed. Please help us to improve OsmAnd by sharing the error message. + Tap again to change the map orientation OsmAnd downloading service Magenta Icon - Please give us 30 seconds, share feedback and rate our work on Google Play. + Please give us 30 seconds by sharing your feedback and rating our work on Google Play. Rate Privacy Policy Help us make OsmAnd better! - Allow OsmAnd to collect and process anonymous application usage data. We do not collect or store data about your location, or about the locations that you view on the map.\n\nYou can always change your selection in Settings > Privacy and Security. + Allow OsmAnd to collect and process anonymous application usage data. We do not collect or store data about your position, or about any locations you view on the map.\n\nYou can change your selection at any time in Settings > Privacy and Security. Choose what type of data you want to share: - Downloaded Maps - Visited screens - Collected Data + Maps downloaded + Screens visited + Data collected List of data you want to share with OsmAnd. - We collect this data to understand the maps of which regions and countries are the most popular. - We collect this data to understand the most popular features of OsmAnd. - By clicking \"Allow\" you agree with our %1$s + We collect this data to understand which maps of which regions and countries are the most popular. + We collect this data to understand which OsmAnd features are the most popular. + By tapping \"Allow\" you agree with our %1$s Privacy and Security - Choose your data for sharing with us + Select which data you are sharing with us No, thank you Allow - Profile Name - Navigation Type + Profile name + Navigation type Taxi Shuttle bus Subway Horse Helicopter - You can add own modified version of routing.xml to ..osmand/routing + You can add your own modified version of the file routing.xml in ..osmand/routing Skiing Skiing Show compass ruler Hide compass ruler Select icon Mode: %s - User Mode, derived from: %s + User mode, derived from: %s Ski Type: %s Base Profile Select navigation type - You need to select Navigation type to create New Application Profile - Enter Profile Name + Please select a navigation type for the new application profile + Enter profile name Profile name shouldn\'t be empty! - Duplicate Name - There is already profile with such name - You cannot delete OsmAnd base profiles - Save Changes - You need to save changes to Profile before proceed - Delete Profile - Are you sure you want to delete %s profile - Select base profile - Custom Application Profile should be based on one of the default App Profiles. Selected Profile defines basic settings: setup of Widgets, units of speed and distance. In string below Profile\'s name, you could learn which Navigation Profiles are suitable for each Application Profile. + Duplicate name + There is already profile with that name + You cannot delete OsmAnd\'s base profiles + Save changes + You need to save changes to the profile before proceeding + Delete profile + Are you sure you want to delete the %s profile + Select a base profile + Base your custom profile on one of the default app profiles, this defines the basic setup like default visibility of widgets and units of speed and distance. These are the default app profiles, together with examples of custom profiles they may be extended to: Select navigation type - Car, Truck, Motorcycle - MTB, Moped, Horse - Walking, Hiking, Running + Car, truck, motorcycle + MTB, moped, horse + Walking, hiking, running All PT types - Ship, Rowing, Sailing - Airplane, Gliding + Ship, rowing, sailing + Airplane, gliding Geocoding - Straight Line - BRouter (Offline) + Straight line + BRouter (offline) OsmAnd routing Custom routing profile Special routing - 3rd-party routing + Third-party routing Select the profiles to be visible in the app. Application profiles Searching GPS @@ -113,7 +124,7 @@ %1$d files (%2$s) are present at previous location \'%3$s\'. Move maps Don\'t move - The route by foot is approximately %1$s and it could be faster than by public transport + The route by foot is approximately %1$s and may be faster than via public transport Unfortunately, OsmAnd could not find a route suitable for your settings. Try the pedestrian navigation. Try changing the settings. @@ -3239,4 +3250,5 @@ Off-piste Freerides and offpiste are unofficial routes and passages. Typically ungroomed, unmainted by the officials and not checked in the evening. Enter at own risk. + diff --git a/OsmAnd/res/values/styles.xml b/OsmAnd/res/values/styles.xml index d247fd917e..411b1a3e99 100644 --- a/OsmAnd/res/values/styles.xml +++ b/OsmAnd/res/values/styles.xml @@ -112,8 +112,8 @@ @color/color_myloc_distance @color/ctx_menu_info_divider_light @color/ctx_menu_card_btn_light - @color/searchbar_text_light - @color/searchbar_text_hint_light + @color/text_color_primary_light + @color/text_color_secondary_light @color/divider_light ?android:attr/colorBackground @color/tool_bar_color_light @@ -137,7 +137,7 @@ @drawable/bg_bottom_menu_light @drawable/bg_left_menu_light @drawable/bg_point_editor_view_light - @color/dashboard_divider_light + @color/divider_color_light @color/divider_color @drawable/dashboard_button_light @color/ctx_menu_info_view_bg_light @@ -165,14 +165,18 @@ @color/dashboard_general_button_text_light @drawable/check_light - @color/color_black + + @color/text_color_primary_light + @color/text_color_secondary_light + @color/text_color_tertiary_light + @color/color_black @color/spinner_list_background_light @color/color_white @color/osmand_orange @color/osmand_orange_dark - @color/dashboard_blue + @color/active_color_primary_light @color/actionbar_light_color @style/Widget.Styled.ActionBarLight @@ -189,7 +193,6 @@ @style/OsmandLightTheme.SearchTabbar @style/OsmandLightTheme.Toolbar @style/OsmandLightTheme.NewAppTheme - @color/icon_color @color/map_widget_blue @color/color_dialog_buttons_light @@ -203,12 +206,12 @@ @color/subscription_active_bg_color_light @color/subscription_active_div_color_light - @color/dialog_bg_color_light - @color/dialog_transparent_bg_color_light - @color/dialog_title_color_light - @color/dialog_description_color_light - @color/dialog_text_description_color - @color/card_description_text_color_light + @color/activity_background_color_light + @color/activity_background_transparent_color_light + @color/text_color_primary_light + @color/text_color_primary_light + @color/text_color_secondary_light + @color/text_color_tertiary_light @color/wikivoyage_bg_light @color/wikivoyage_card_bg_light @@ -219,9 +222,9 @@ @color/wikivoyage_bottom_bar_bg_light @color/wikivoyage_bottom_bar_divider_light @color/wikivoyage_secondary_btn_bg_light - @color/wikivoyage_primary_btn_text_light + @color/active_buttons_and_links_text_light @color/wikivoyage_welcome_bg_light - @color/wikivoyage_primary_text_light + @color/text_color_primary_light @drawable/travel_card_bg_light @drawable/travel_card_stroke_bg_light @@ -241,8 +244,8 @@ @drawable/flow_toolbar_bg_light @color/divider_light - @color/main_font_light - @color/active_buttons_and_links_light + @color/text_color_primary_light + @color/active_color_primary_light @color/card_and_list_background_light @color/activity_background_light @drawable/pages_bg_light @@ -275,7 +278,7 @@