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

Merge branch 'master' into coord_formatter

Browse source 
# Conflicts:
#	OsmAnd/src/net/osmand/plus/mapcontextmenu/MenuBuilder.java
This commit is contained in:
madwasp79 2019-07-05 14:24:50 +03:00
commit afa47039d9
268 changed files with 1260 additions and 1069 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
OsmAnd-java/src/main/java/net/osmand/GPXUtilities.java
View file

@ -317,6 +317,8 @@ public class GPXUtilities {
public static class Metadata extends GPXExtensions {
public String desc;
public String link;
public String getArticleTitle() {
return getExtensionsToRead().get("article_title");
}
@ -1404,6 +1406,7 @@ public class GPXUtilities {
writeNotNullText(serializer, "name", trackName);
if (file.metadata != null) {
writeNotNullText(serializer, "desc", file.metadata.desc);
writeNotNullTextWithAttribute(serializer, "link", "href", file.metadata.link);
writeExtensions(serializer, file.metadata);
}
serializer.endTag(null, "metadata");
@ -1472,6 +1475,14 @@ public class GPXUtilities {
return path;
}
private static void writeNotNullTextWithAttribute(XmlSerializer serializer, String tag, String attribute, String value) throws IOException {
if (value != null) {
serializer.startTag(null, tag);
serializer.attribute(null, attribute, value);
serializer.endTag(null, tag);
}
}
private static void writeNotNullText(XmlSerializer serializer, String tag, String value) throws IOException {
if (value != null) {
serializer.startTag(null, tag);
@ -1502,11 +1513,7 @@ public class GPXUtilities {
}
writeNotNullText(serializer, "name", p.name);
writeNotNullText(serializer, "desc", p.desc);
if (p.link != null) {
serializer.startTag(null, "link");
serializer.attribute(null, "href", p.link);
serializer.endTag(null, "link");
}
writeNotNullTextWithAttribute(serializer, "link", "href", p.link);
writeNotNullText(serializer, "type", p.category);
if (p.comment != null) {
writeNotNullText(serializer, "cmt", p.comment);
@ -1697,6 +1704,9 @@ public class GPXUtilities {
if (tag.equals("desc")) {
((Metadata) parse).desc = readText(parser, "desc");
}
if (tag.equals("link")) {
((Metadata) parse).link = parser.getAttributeValue("", "href");
}
} else if (parse instanceof Route) {
if (tag.equals("name")) {
((Route) parse).name = readText(parser, "name");

48
OsmAnd-java/src/main/java/net/osmand/data/TransportStop.java
View file

@ -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<TransportStop> 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<TransportStop> 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

65
OsmAnd-java/src/main/java/net/osmand/data/TransportStopAggregated.java Normal file
View file

@ -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<TransportStop> localTransportStops;
private List<TransportStop> nearbyTransportStops;
public TransportStopAggregated() {
}
public Amenity getAmenity() {
return amenity;
}
public void setAmenity(Amenity amenity) {
this.amenity = amenity;
}
public List<TransportStop> 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<TransportStop> stops) {
if (localTransportStops == null) {
localTransportStops = new ArrayList<>();
}
localTransportStops.addAll(stops);
}
public List<TransportStop> 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<TransportStop> stops) {
if (nearbyTransportStops == null) {
nearbyTransportStops = new ArrayList<>();
}
nearbyTransportStops.addAll(stops);
}
}

4
OsmAnd/res/color/bottom_navigation_color_selector_dark.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@color/color_dialog_buttons_dark" android:state_checked="true"/>
<item android:color="@color/ctx_menu_info_text_dark" android:state_checked="false"/>
<item android:color="@color/active_color_primary_dark" android:state_checked="true"/>
<item android:color="@color/text_color_primary_dark" android:state_checked="false"/>
</selector>

2
OsmAnd/res/color/bottom_navigation_color_selector_light.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@color/active_color_primary_light" android:state_checked="true"/>
<item android:color="@color/icon_color" android:state_checked="false"/>
<item android:color="@color/icon_color_default_light" android:state_checked="false"/>
</selector>

BIN
OsmAnd/res/drawable-hdpi/ic_action_offroad.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 402 B

BIN
OsmAnd/res/drawable-hdpi/map_action_offroad.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 402 B

BIN
OsmAnd/res/drawable-large-hdpi/map_action_offroad.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 437 B

BIN
OsmAnd/res/drawable-large-xhdpi/map_action_offroad.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 611 B

BIN
OsmAnd/res/drawable-large/map_action_offroad.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 402 B

BIN
OsmAnd/res/drawable-mdpi/ic_action_offroad.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 264 B

BIN
OsmAnd/res/drawable-mdpi/map_action_offroad.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 264 B

2
OsmAnd/res/drawable-v21/dlg_btn_primary_dark.xml
View file

@ -2,7 +2,7 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_enabled="false"><shape android:shape="rectangle">
<solid android:color="@color/inactive_buttons_and_links_dark" />
<solid android:color="@color/inactive_buttons_and_links_bg_dark" />
<corners android:radius="@dimen/dlg_button_rect_rad" />
</shape></item>
<item><shape android:shape="rectangle">

2
OsmAnd/res/drawable-v21/dlg_btn_primary_light.xml
View file

@ -2,7 +2,7 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_enabled="false"><shape android:shape="rectangle">
<solid android:color="@color/inactive_buttons_and_links_light" />
<solid android:color="@color/inactive_buttons_and_links_bg_light" />
<corners android:radius="@dimen/dlg_button_rect_rad" />
</shape></item>
<item><shape android:shape="rectangle">

4
OsmAnd/res/drawable-v21/dlg_btn_secondary_dark.xml
View file

@ -2,11 +2,11 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_enabled="false"><shape android:shape="rectangle">
<solid android:color="@color/inactive_buttons_and_links_dark" />
<solid android:color="@color/inactive_buttons_and_links_bg_dark" />
<corners android:radius="@dimen/dlg_button_rect_rad" />
</shape></item>
<item><shape android:shape="rectangle">
<solid android:color="@color/inactive_buttons_and_links_dark" />
<solid android:color="@color/inactive_buttons_and_links_bg_dark" />
<corners android:radius="@dimen/dlg_button_rect_rad" />
</shape></item>

2
OsmAnd/res/drawable-v21/dlg_btn_secondary_light.xml
View file

@ -2,7 +2,7 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_enabled="false"><shape android:shape="rectangle">
<solid android:color="@color/inactive_buttons_and_links_light" />
<solid android:color="@color/inactive_buttons_and_links_bg_light" />
<corners android:radius="@dimen/dlg_button_rect_rad" />
</shape></item>
<item><shape android:shape="rectangle">

6
OsmAnd/res/drawable-v21/dlg_btn_stroked_dark.xml
View file

@ -9,14 +9,14 @@
</item>
<item android:state_enabled="false">
<shape android:shape="rectangle">
<solid android:color="@color/inactive_buttons_and_links_dark" />
<solid android:color="@color/inactive_buttons_and_links_bg_dark" />
<corners android:radius="@dimen/dlg_button_rect_rad" />
</shape>
</item>
<item>
<shape android:shape="rectangle">
<stroke android:width="1dp" android:color="@color/divider_color_dark" />
<solid android:color="@color/stroked_buttons_and_links_dark" />
<stroke android:width="1dp" android:color="@color/stroked_buttons_and_links_outline_dark" />
<solid android:color="@color/stroked_buttons_and_links_bg_dark" />
<corners android:radius="@dimen/dlg_button_rect_rad" />
</shape>
</item>

6
OsmAnd/res/drawable-v21/dlg_btn_stroked_light.xml
View file

@ -8,14 +8,14 @@
</item>
<item android:state_enabled="false">
<shape android:shape="rectangle">
<solid android:color="@color/inactive_buttons_and_links_light" />
<solid android:color="@color/inactive_buttons_and_links_bg_light" />
<corners android:radius="@dimen/dlg_button_rect_rad" />
</shape>
</item>
<item>
<shape android:shape="rectangle">
<stroke android:width="1dp" android:color="@color/divider_color_light" />
<solid android:color="@color/stroked_buttons_and_links_light" />
<stroke android:width="1dp" android:color="@color/stroked_buttons_and_links_outline_light" />
<solid android:color="@color/stroked_buttons_and_links_bg_light" />
<corners android:radius="@dimen/dlg_button_rect_rad" />
</shape>
</item>

BIN
OsmAnd/res/drawable-xhdpi/ic_action_offroad.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 437 B

BIN
OsmAnd/res/drawable-xhdpi/map_action_offroad.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 437 B

BIN
OsmAnd/res/drawable-xxhdpi/ic_action_offroad.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 611 B

BIN
OsmAnd/res/drawable-xxhdpi/map_action_offroad.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 611 B

BIN
OsmAnd/res/drawable-xxxhdpi/ic_action_offroad.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 808 B

BIN
OsmAnd/res/drawable-xxxhdpi/map_action_offroad.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 808 B

2
OsmAnd/res/drawable/bg_additional_menu_dark.xml
View file

@ -5,7 +5,7 @@
</item>
<item>
<shape>
<solid android:color="@color/ctx_menu_bg_dark"/>
<solid android:color="@color/list_background_color_dark"/>
</shape>
</item>
</layer-list>

2
OsmAnd/res/drawable/bg_additional_menu_sides_dark.xml
View file

@ -5,7 +5,7 @@
</item>
<item>
<shape>
<solid android:color="@color/ctx_menu_bg_dark"/>
<solid android:color="@color/list_background_color_dark"/>
</shape>
</item>
</layer-list>

2
OsmAnd/res/drawable/bg_additional_menu_topsides_dark.xml
View file

@ -5,7 +5,7 @@
</item>
<item>
<shape>
<solid android:color="@color/ctx_menu_bg_dark"/>
<solid android:color="@color/list_background_color_dark"/>
</shape>
</item>
</layer-list>

2
OsmAnd/res/drawable/bg_bottom_sheet_sides_landscape_dark.xml
View file

@ -5,7 +5,7 @@
</item>
<item>
<shape>
<solid android:color="@color/bg_color_dark"/>
<solid android:color="@color/list_background_color_dark"/>
</shape>
</item>
</layer-list>

2
OsmAnd/res/drawable/bg_bottom_sheet_sides_landscape_light.xml
View file

@ -5,7 +5,7 @@
</item>
<item>
<shape>
<solid android:color="@color/bg_color_light"/>
<solid android:color="@color/list_background_color_light"/>
</shape>
</item>
</layer-list>

2
OsmAnd/res/drawable/bg_bottom_sheet_topsides_landscape_dark.xml
View file

@ -5,7 +5,7 @@
</item>
<item>
<shape>
<solid android:color="@color/bg_color_dark"/>
<solid android:color="@color/list_background_color_dark"/>
</shape>
</item>
</layer-list>

2
OsmAnd/res/drawable/bg_bottom_sheet_topsides_landscape_light.xml
View file

@ -5,7 +5,7 @@
</item>
<item>
<shape>
<solid android:color="@color/bg_color_light"/>
<solid android:color="@color/list_background_color_light"/>
</shape>
</item>
</layer-list>

2
OsmAnd/res/drawable/bg_card_dark.xml
View file

@ -6,7 +6,7 @@
<item>
<shape>
<solid
android:color="@color/bg_color_dark" />
android:color="@color/list_background_color_dark" />
<corners
android:radius="2dp" />
</shape>

2
OsmAnd/res/drawable/bg_card_light.xml
View file

@ -6,7 +6,7 @@
<item>
<shape>
<solid
android:color="@color/bg_color_light" />
android:color="@color/list_background_color_light" />
<corners
android:radius="2dp" />
</shape>

2
OsmAnd/res/drawable/bg_left_menu_dark.xml
View file

@ -6,7 +6,7 @@
<item>
<shape>
<solid
android:color="@color/bg_color_dark" />
android:color="@color/list_background_color_dark" />
</shape>
</item>
</layer-list>

2
OsmAnd/res/drawable/bg_left_menu_light.xml
View file

@ -6,7 +6,7 @@
<item>
<shape>
<solid
android:color="@color/bg_color_light" />
android:color="@color/list_background_color_light" />
</shape>
</item>
</layer-list>

2
OsmAnd/res/drawable/bg_map_context_menu_dark.xml
View file

@ -6,7 +6,7 @@
<item>
<shape>
<solid
android:color="@color/ctx_menu_bg_dark" />
android:color="@color/list_background_color_dark" />
</shape>
</item>
</layer-list>

2
OsmAnd/res/drawable/bg_map_context_menu_light.xml
View file

@ -6,7 +6,7 @@
<item>
<shape>
<solid
android:color="@color/ctx_menu_bg_light" />
android:color="@color/list_background_color_light" />
</shape>
</item>
</layer-list>

2
OsmAnd/res/drawable/bg_point_editor_view_dark.xml
View file

@ -6,7 +6,7 @@
<item>
<shape>
<solid
android:color="@color/bg_color_dark" />
android:color="@color/list_background_color_dark" />
</shape>
</item>
</layer-list>

2
OsmAnd/res/drawable/bg_point_editor_view_light.xml
View file

@ -6,7 +6,7 @@
<item>
<shape>
<solid
android:color="@color/bg_color_light" />
android:color="@color/list_background_color_light" />
</shape>
</item>
</layer-list>

2
OsmAnd/res/drawable/btn_border_bg_dark.xml
View file

@ -4,5 +4,5 @@
<corners android:radius="3dp" />
<stroke
android:width="1dp"
android:color="@color/ctx_menu_info_divider_dark" />
android:color="@color/divider_color_dark" />
</shape>

2
OsmAnd/res/drawable/btn_border_bg_light.xml
View file

@ -4,5 +4,5 @@
<corners android:radius="3dp" />
<stroke
android:width="1dp"
android:color="@color/ctx_menu_info_divider_light" />
android:color="@color/divider_color_light" />
</shape>

2
OsmAnd/res/drawable/btn_border_trans_dark.xml
View file

@ -17,7 +17,7 @@
<shape android:shape="rectangle">
<solid android:color="@null" />
<corners android:radius="4dp" />
<stroke android:width="1dp" android:color="@color/divider_dark" />
<stroke android:width="1dp" android:color="@color/divider_color_dark" />
</shape>
</item>
</selector>

2
OsmAnd/res/drawable/btn_border_trans_light.xml
View file

@ -17,7 +17,7 @@
<shape android:shape="rectangle">
<solid android:color="@null" />
<corners android:radius="4dp" />
<stroke android:width="1dp" android:color="@color/divider_light" />
<stroke android:width="1dp" android:color="@color/divider_color_light" />
</shape>
</item>
</selector>

6
OsmAnd/res/drawable/btn_round_border_dark.xml
View file

@ -3,21 +3,21 @@
<item android:state_pressed="true">
<shape android:shape="rectangle">
<solid android:color="@color/bg_color_dark" />
<solid android:color="@color/list_background_color_dark" />
<stroke android:color="@color/map_widget_blue_pressed" android:width="1dp"/>
<corners android:radius="@dimen/map_button_rect_rad" />
</shape>
</item>
<item android:state_enabled="false">
<shape android:shape="rectangle">
<solid android:color="@color/bg_color_dark" />
<solid android:color="@color/list_background_color_dark" />
<stroke android:color="@color/searchbar_tab_inactive_light" android:width="1dp"/>
<corners android:radius="@dimen/map_button_rect_rad" />
</shape>
</item>
<item>
<shape android:shape="rectangle">
<solid android:color="@color/bg_color_dark" />
<solid android:color="@color/list_background_color_dark" />
<stroke android:color="@color/map_widget_blue" android:width="1dp"/>
<corners android:radius="@dimen/map_button_rect_rad" />
</shape>

2
OsmAnd/res/drawable/btn_round_border_dark_2.xml
View file

@ -2,7 +2,7 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape android:shape="rectangle">
<stroke android:color="@color/color_dialog_buttons_dark" android:width="2dp"/>
<stroke android:color="@color/active_color_primary_dark" android:width="2dp"/>
<corners android:radius="@dimen/map_button_rect_rad" />
</shape>
</item>

6
OsmAnd/res/drawable/btn_round_border_light.xml
View file

@ -3,21 +3,21 @@
<item android:state_pressed="true">
<shape android:shape="rectangle">
<solid android:color="@color/bg_color_light" />
<solid android:color="@color/list_background_color_light" />
<stroke android:color="@color/map_widget_blue_pressed" android:width="1dp"/>
<corners android:radius="@dimen/map_button_rect_rad" />
</shape>
</item>
<item android:state_enabled="false">
<shape android:shape="rectangle">
<solid android:color="@color/bg_color_light" />
<solid android:color="@color/list_background_color_light" />
<stroke android:color="@color/searchbar_tab_inactive_light" android:width="1dp"/>
<corners android:radius="@dimen/map_button_rect_rad" />
</shape>
</item>
<item>
<shape android:shape="rectangle">
<solid android:color="@color/bg_color_light" />
<solid android:color="@color/list_background_color_light" />
<stroke android:color="@color/map_widget_blue" android:width="1dp"/>
<corners android:radius="@dimen/map_button_rect_rad" />
</shape>

2
OsmAnd/res/drawable/btn_round_border_light_2.xml
View file

@ -2,7 +2,7 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape android:shape="rectangle">
<stroke android:color="@color/color_dialog_buttons_light" android:width="2dp"/>
<stroke android:color="@color/active_color_primary_light" android:width="2dp"/>
<corners android:radius="@dimen/map_button_rect_rad" />
</shape>
</item>

2
OsmAnd/res/drawable/btn_round_profile_blue.xml
View file

@ -6,7 +6,7 @@
<corners android:radius="@dimen/map_button_rect_rad" />
</shape></item>
<item android:state_enabled="false"><shape android:shape="rectangle">
<solid android:color="@color/inactive_buttons_and_links_light" />
<solid android:color="@color/inactive_buttons_and_links_bg_light" />
<corners android:radius="@dimen/map_button_rect_rad" />
</shape></item>
<item><shape android:shape="rectangle">

2
OsmAnd/res/drawable/btn_round_profile_night.xml
View file

@ -9,7 +9,7 @@
</item>
<item android:state_enabled="false">
<shape android:shape="rectangle">
<solid android:color="@color/inactive_buttons_and_links_dark"/>
<solid android:color="@color/inactive_buttons_and_links_bg_dark"/>
<corners android:radius="@dimen/map_button_rect_rad"/>
</shape>
</item>

2
OsmAnd/res/drawable/btn_rounded_dark.xml
View file

@ -16,7 +16,7 @@
<shape android:shape="rectangle">
<solid android:color="@color/card_and_list_background_dark" />
<corners android:radius="@dimen/route_info_button_bg_line_radius" />
<stroke android:width="1dp" android:color="@color/divider_dark" />
<stroke android:width="1dp" android:color="@color/divider_color_dark" />
</shape>
</item>
</selector>

2
OsmAnd/res/drawable/btn_rounded_light.xml
View file

@ -16,7 +16,7 @@
<shape android:shape="rectangle">
<solid android:color="@color/card_and_list_background_light" />
<corners android:radius="@dimen/route_info_button_bg_line_radius" />
<stroke android:width="1dp" android:color="@color/divider_light" />
<stroke android:width="1dp" android:color="@color/divider_color_light" />
</shape>
</item>
</selector>

2
OsmAnd/res/drawable/btn_trans_rounded_dark.xml
View file

@ -17,7 +17,7 @@
<shape android:shape="rectangle">
<solid android:color="@color/card_and_list_background_dark" />
<corners android:radius="@dimen/route_info_button_bg_line_radius" />
<stroke android:width="1dp" android:color="@color/divider_dark" />
<stroke android:width="1dp" android:color="@color/divider_color_dark" />
</shape>
</item>
</selector>

2
OsmAnd/res/drawable/btn_trans_rounded_light.xml
View file

@ -17,7 +17,7 @@
<shape android:shape="rectangle">
<solid android:color="@color/card_and_list_background_light" />
<corners android:radius="@dimen/route_info_button_bg_line_radius" />
<stroke android:width="1dp" android:color="@color/divider_light" />
<stroke android:width="1dp" android:color="@color/divider_color_light" />
</shape>
</item>
</selector>

2
OsmAnd/res/drawable/chart_marker_background_dark.xml
View file

@ -2,6 +2,6 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners android:radius="4dp" />
<solid android:color="@color/bg_color_dark"/>
<solid android:color="@color/list_background_color_dark"/>
<stroke android:width="1dp" android:color="#808080" />
</shape>

2
OsmAnd/res/drawable/chart_marker_background_light.xml
View file

@ -2,6 +2,6 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners android:radius="4dp" />
<solid android:color="@color/bg_color_light"/>
<solid android:color="@color/list_background_color_light"/>
<stroke android:width="1dp" android:color="#808080" />
</shape>

2
OsmAnd/res/drawable/circle_contour_bg_dark.xml
View file

@ -7,7 +7,7 @@
<shape android:shape="oval">
<stroke
android:width="1dp"
android:color="@color/divider_dark" />
android:color="@color/divider_color_dark" />
</shape>
</item>
</layer-list>

2
OsmAnd/res/drawable/circle_contour_bg_light.xml
View file

@ -7,7 +7,7 @@
<shape android:shape="oval">
<stroke
android:width="1dp"
android:color="@color/divider_light" />
android:color="@color/divider_color_light" />
</shape>
</item>
</layer-list>

2
OsmAnd/res/drawable/circle_dialog_bg_light.xml
View file

@ -4,7 +4,7 @@
<item>
<inset>
<shape android:shape="oval">
<solid android:color="@color/bg_color_light"/>
<solid android:color="@color/list_background_color_light"/>
</shape>
</inset>
</item>

2
OsmAnd/res/drawable/circle_dialog_bg_night.xml
View file

@ -4,7 +4,7 @@
<item>
<inset>
<shape android:shape="oval">
<solid android:color="@color/bg_color_dark"/>
<solid android:color="@color/list_background_color_dark"/>
</shape>
</inset>
</item>

4
OsmAnd/res/drawable/dlg_btn_primary_dark.xml
View file

@ -2,11 +2,11 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true"><shape android:shape="rectangle">
<solid android:color="@color/active_buttons_and_links_pressed_dark" />
<solid android:color="@color/active_buttons_and_links_bg_pressed_dark" />
<corners android:radius="@dimen/dlg_button_rect_rad" />
</shape></item>
<item android:state_enabled="false"><shape android:shape="rectangle">
<solid android:color="@color/inactive_buttons_and_links_dark" />
<solid android:color="@color/inactive_buttons_and_links_bg_dark" />
<corners android:radius="@dimen/dlg_button_rect_rad" />
</shape></item>
<item><shape android:shape="rectangle">

4
OsmAnd/res/drawable/dlg_btn_primary_light.xml
View file

@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true"><shape android:shape="rectangle">
<solid android:color="@color/active_buttons_and_links_pressed_light" />
<solid android:color="@color/active_buttons_and_links_bg_pressed_light" />
<corners android:radius="@dimen/dlg_button_rect_rad" />
</shape></item>
<item android:state_enabled="false"><shape android:shape="rectangle">
<solid android:color="@color/inactive_buttons_and_links_light" />
<solid android:color="@color/inactive_buttons_and_links_bg_light" />
<corners android:radius="@dimen/dlg_button_rect_rad" />
</shape></item>
<item><shape android:shape="rectangle">

6
OsmAnd/res/drawable/dlg_btn_secondary_dark.xml
View file

@ -2,15 +2,15 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true"><shape android:shape="rectangle">
<solid android:color="@color/active_buttons_and_links_pressed_dark" />
<solid android:color="@color/active_buttons_and_links_bg_pressed_dark" />
<corners android:radius="@dimen/dlg_button_rect_rad" />
</shape></item>
<item android:state_enabled="false"><shape android:shape="rectangle">
<solid android:color="@color/inactive_buttons_and_links_dark" />
<solid android:color="@color/inactive_buttons_and_links_bg_dark" />
<corners android:radius="@dimen/dlg_button_rect_rad" />
</shape></item>
<item><shape android:shape="rectangle">
<solid android:color="@color/inactive_buttons_and_links_dark" />
<solid android:color="@color/inactive_buttons_and_links_bg_dark" />
<corners android:radius="@dimen/dlg_button_rect_rad" />
</shape></item>

4
OsmAnd/res/drawable/dlg_btn_secondary_light.xml
View file

@ -2,11 +2,11 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true"><shape android:shape="rectangle">
<solid android:color="@color/active_buttons_and_links_pressed_light" />
<solid android:color="@color/active_buttons_and_links_bg_pressed_light" />
<corners android:radius="@dimen/dlg_button_rect_rad" />
</shape></item>
<item android:state_enabled="false"><shape android:shape="rectangle">
<solid android:color="@color/inactive_buttons_and_links_light" />
<solid android:color="@color/inactive_buttons_and_links_bg_light" />
<corners android:radius="@dimen/dlg_button_rect_rad" />
</shape></item>
<item><shape android:shape="rectangle">

8
OsmAnd/res/drawable/dlg_btn_stroked_dark.xml
View file

@ -2,16 +2,16 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true"><shape android:shape="rectangle">
<solid android:color="@color/active_buttons_and_links_pressed_dark" />
<solid android:color="@color/active_buttons_and_links_bg_pressed_dark" />
<corners android:radius="@dimen/dlg_button_rect_rad" />
</shape></item>
<item android:state_enabled="false"><shape android:shape="rectangle">
<solid android:color="@color/inactive_buttons_and_links_dark" />
<solid android:color="@color/inactive_buttons_and_links_bg_dark" />
<corners android:radius="@dimen/dlg_button_rect_rad" />
</shape></item>
<item><shape android:shape="rectangle">
<stroke android:color="@color/divider_color_dark" android:width="1dp" />
<solid android:color="@color/stroked_buttons_and_links_dark" />
<stroke android:color="@color/stroked_buttons_and_links_outline_dark" android:width="1dp" />
<solid android:color="@color/stroked_buttons_and_links_bg_dark" />
<corners android:radius="@dimen/dlg_button_rect_rad" />
</shape></item>

8
OsmAnd/res/drawable/dlg_btn_stroked_light.xml
View file

@ -2,16 +2,16 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true"><shape android:shape="rectangle">
<solid android:color="@color/active_buttons_and_links_pressed_light" />
<solid android:color="@color/active_buttons_and_links_bg_pressed_light" />
<corners android:radius="@dimen/dlg_button_rect_rad" />
</shape></item>
<item android:state_enabled="false"><shape android:shape="rectangle">
<solid android:color="@color/inactive_buttons_and_links_light" />
<solid android:color="@color/inactive_buttons_and_links_bg_light" />
<corners android:radius="@dimen/dlg_button_rect_rad" />
</shape></item>
<item><shape android:shape="rectangle">
<stroke android:color="@color/divider_color_light" android:width="1dp" />
<solid android:color="@color/stroked_buttons_and_links_light" />
<stroke android:color="@color/stroked_buttons_and_links_outline_light" android:width="1dp" />
<solid android:color="@color/stroked_buttons_and_links_bg_light" />
<corners android:radius="@dimen/dlg_button_rect_rad" />
</shape></item>

2
OsmAnd/res/drawable/download_dark.xml
View file

@ -2,5 +2,5 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_selected="true" android:drawable="@color/download_pressed_dark"/>
<item android:state_pressed="true" android:drawable="@color/download_pressed_dark"/>
<item android:drawable="@color/actionbar_dark_color"/>
<item android:drawable="@color/app_bar_color_dark"/>
</selector>

2
OsmAnd/res/drawable/expandable_list_item_background_dark.xml
View file

@ -2,5 +2,5 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@color/list_item_dark_pressed" android:state_pressed="true"/>
<item android:drawable="@color/list_item_dark_pressed" android:state_focused="true"/>
<item android:drawable="@color/list_item_dark"/>
<item android:drawable="@color/list_background_color_dark"/>
</selector>

2
OsmAnd/res/drawable/expandable_list_item_background_light.xml
View file

@ -3,6 +3,6 @@
<item android:drawable="@color/list_item_light_pressed" android:state_selected="true"/>
<item android:drawable="@color/list_item_light_pressed" android:state_pressed="true"/>
<item android:drawable="@color/list_item_light_pressed" android:state_focused="true"/>
<item android:drawable="@color/list_item_light"/>
<item android:drawable="@color/list_background_color_light"/>
</selector>

2
OsmAnd/res/drawable/marker_circle_background_light_n.xml
View file

@ -4,5 +4,5 @@
android:shape="oval">
<solid
android:color="@color/dashboard_divider_light"/>
android:color="@color/divider_color_light"/>
</shape>

2
OsmAnd/res/drawable/multi_selection_menu_bg_dark_land.xml
View file

@ -6,7 +6,7 @@
<item>
<shape>
<solid
android:color="@color/ctx_menu_bg_dark" />
android:color="@color/list_background_color_dark" />
</shape>
</item>
</layer-list>

2
OsmAnd/res/drawable/multi_selection_menu_bg_light_land.xml
View file

@ -6,7 +6,7 @@
<item>
<shape>
<solid
android:color="@color/ctx_menu_bg_light" />
android:color="@color/list_background_color_light" />
</shape>
</item>
</layer-list>

21
OsmAnd/res/drawable/preference_activity_action_bar_shadow.xml
View file

@ -1,21 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item android:bottom="8dp">
<shape android:shape="rectangle" >
<size android:height="1dp" />
<solid android:color="#43000000" />
</shape>
</item>
<item android:top="1dp">
<item>
<shape
android:dither="true"
android:shape="rectangle" >
android:dither="true"
android:shape="rectangle">
<gradient
android:angle="270"
android:endColor="#00000000"
android:startColor="#10000000" />
android:angle="270"
android:endColor="#00000000"
android:startColor="#10000000" />
<size android:height="8dp" />
</shape>

2
OsmAnd/res/drawable/quick_action_controls_background.xml
View file

@ -2,7 +2,7 @@
<shape android:shape="rectangle"
xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/dashboard_divider_light" />
<solid android:color="@color/divider_color_light" />
<corners android:bottomLeftRadius="2dp" android:bottomRightRadius="2dp"/>
</shape>

2
OsmAnd/res/drawable/ripple_solid_dark.xml
View file

@ -1,5 +1,5 @@
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="@color/active_buttons_and_links_pressed_dark">
android:color="@color/active_buttons_and_links_bg_pressed_dark">
<item android:id="@android:id/mask">
<shape android:shape="rectangle">
<solid android:color="@color/active_color_primary_dark" />

2
OsmAnd/res/drawable/ripple_solid_light.xml
View file

@ -1,5 +1,5 @@
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="@color/active_buttons_and_links_pressed_light">
android:color="@color/active_buttons_and_links_bg_pressed_light">
<item android:id="@android:id/mask">
<shape android:shape="rectangle">
<solid android:color="@color/active_color_primary_light" />

2
OsmAnd/res/drawable/route_cards_topsides_light.xml
View file

@ -5,7 +5,7 @@
</item>
<item>
<shape>
<solid android:color="@color/bg_color_light"/>
<solid android:color="@color/list_background_color_light"/>
<corners android:radius="4dp" />
</shape>
</item>

2
OsmAnd/res/drawable/wikipedia_select_lang_bg_light_n.xml
View file

@ -6,7 +6,7 @@
<stroke
android:width="1dp"
android:color="@color/ctx_menu_info_divider_light" />
android:color="@color/divider_color_light" />
<corners android:radius="3dp" />

2
OsmAnd/res/drawable/wikivoyage_search_history_placeholder.xml
View file

@ -18,6 +18,6 @@
<bitmap
android:gravity="center"
android:src="@drawable/ic_action_history"
android:tint="@color/icon_color"/>
android:tint="@color/icon_color_default_light"/>
</item>
</layer-list>

2
OsmAnd/res/drawable/wikivoyage_search_placeholder.xml
View file

@ -18,6 +18,6 @@
<bitmap
android:gravity="center"
android:src="@drawable/ic_action_placeholder_city"
android:tint="@color/icon_color"/>
android:tint="@color/icon_color_default_light"/>
</item>
</layer-list>

2
OsmAnd/res/layout-land/fragment_direction_indication_dialog.xml
View file

@ -6,7 +6,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/ctx_menu_info_view_bg"
android:background="?attr/activity_background_color"
android:orientation="vertical">
<android.support.design.widget.AppBarLayout

2
OsmAnd/res/layout-land/fragment_plan_route_half_screen.xml
View file

@ -110,7 +110,7 @@
android:id="@+id/markers_list_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/ctx_menu_info_view_bg_dark">
android:background="@color/activity_background_color_dark">
<android.support.v7.widget.RecyclerView
android:id="@+id/markers_recycler_view"

6
OsmAnd/res/layout-land/point_editor_fragment.xml
View file

@ -10,7 +10,7 @@
android:id="@+id/background_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/ctx_menu_info_view_bg"
android:background="?attr/activity_background_color"
android:clickable="true"
android:orientation="vertical">
@ -30,7 +30,7 @@
android:id="@+id/editor_scroll_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/ctx_menu_info_view_bg"
android:background="?attr/activity_background_color"
android:fillViewport="true">
<LinearLayout
@ -237,7 +237,7 @@
android:id="@+id/buttons_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/ctx_menu_info_view_bg"
android:background="?attr/activity_background_color"
android:orientation="horizontal">
<Button

2
OsmAnd/res/layout-xlarge/first_usage_welcome_fragment.xml
View file

@ -12,7 +12,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop"
android:background="@color/bg_color_dark"/>
android:background="@color/list_background_color_dark"/>
<LinearLayout
android:layout_width="wrap_content"

4
OsmAnd/res/layout/along_the_route_point_item.xml
View file

@ -69,7 +69,7 @@
android:layout_marginStart="6dp"
android:drawablePadding="2dp"
android:maxLines="1"
android:textColor="@color/secondary_text_dark"
android:textColor="@color/text_color_secondary_dark"
android:textSize="@dimen/default_sub_text_size"
tools:text="Intermediate point " />
@ -81,7 +81,7 @@
android:layout_weight="1"
android:ellipsize="end"
android:maxLines="1"
android:textColor="@color/secondary_text_dark"
android:textColor="@color/text_color_secondary_dark"
android:textSize="@dimen/default_sub_text_size"
tools:text="some description" />

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

@ -2,7 +2,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/ctx_menu_info_view_bg"
android:background="?attr/activity_background_color"
android:orientation="vertical">
<ExpandableListView

133
OsmAnd/res/layout/bottom_sheet_item_with_descr_and_radio_btn.xml
View file

@ -1,81 +1,78 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="@dimen/bottom_sheet_large_list_item_height"
android:background="?attr/selectableItemBackground"
android:orientation="vertical">
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="@dimen/bottom_sheet_large_list_item_height"
android:background="?attr/selectableItemBackground"
android:orientation="vertical"
>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="63dp"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingStart="@dimen/list_content_padding"
android:paddingLeft="@dimen/list_content_padding"
android:paddingEnd="@dimen/list_content_padding"
android:paddingRight="@dimen/list_content_padding">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="63dp"
android:paddingStart="@dimen/list_content_padding"
android:paddingEnd="@dimen/list_content_padding"
android:paddingLeft="@dimen/list_content_padding"
android:paddingRight="@dimen/list_content_padding"
android:gravity="center_vertical"
android:orientation="horizontal">
<ImageView
android:id="@+id/icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/bottom_sheet_icon_margin"
android:layout_marginRight="@dimen/bottom_sheet_icon_margin"
tools:src="@drawable/ic_action_coordinates_latitude"
tools:tint="?attr/default_icon_color" />
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/content_padding"
android:layout_marginRight="@dimen/content_padding"
android:layout_weight="1"
android:gravity="center_vertical"
android:orientation="vertical">
<ImageView
android:id="@+id/icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/bottom_sheet_icon_margin"
android:layout_marginRight="@dimen/bottom_sheet_icon_margin"
tools:tint="?attr/primary_icon_color"
tools:src="@drawable/ic_action_coordinates_latitude"/>
<TextView
android:id="@+id/title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxLines="2"
android:textAppearance="@style/TextAppearance.ListItemTitle"
android:textColor="?android:textColorPrimary"
tools:text="Item Title" />
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_marginEnd="@dimen/content_padding"
android:layout_marginRight="@dimen/content_padding"
android:gravity="center_vertical"
android:orientation="vertical">
<TextView
android:id="@+id/description"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxLines="1"
android:textColor="?android:textColorSecondary"
tools:text="Item additional desription" />
</LinearLayout>
<TextView
android:id="@+id/title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxLines="2"
android:textAppearance="@style/TextAppearance.ListItemTitle"
android:textColor="?attr/main_font_color_basic"
tools:text="Item Title"/>
<RadioButton
android:id="@+id/compound_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@null"
android:clickable="false"
android:focusable="false"
android:saveEnabled="false" />
<TextView
android:id="@+id/description"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxLines="1"
tools:text="Item additional desription"/>
</LinearLayout>
</LinearLayout>
<RadioButton
android:id="@+id/compound_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@null"
android:clickable="false"
android:focusable="false"
android:saveEnabled="false"/>
</LinearLayout>
<View
android:id="@+id/divider_bottom"
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginStart="64dp"
android:layout_marginLeft="64dp"
android:background="@color/divider_light"/>
<View
android:id="@+id/divider_bottom"
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginStart="64dp"
android:layout_marginLeft="64dp"
android:background="?attr/divider_color" />
</LinearLayout>

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

@ -19,7 +19,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
tools:tint="?attr/primary_icon_color"
tools:tint="?attr/default_icon_color"
tools:src="@drawable/ic_action_sadface"/>
<TextView

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

@ -5,7 +5,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
tools:background="@color/ctx_menu_bg_dark">
tools:background="@color/list_background_color_dark">
<View
android:id="@+id/input_area_top_padding"

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

@ -6,7 +6,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="fill_parent"
android:layout_height="@dimen/dashboard_map_toolbar"
android:background="@color/actionbar_light_color"
android:background="@color/app_bar_color_light"
app:contentInsetLeft="4dp"
app:contentInsetStart="4dp">

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

@ -8,7 +8,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/color_dialog_buttons_light"
android:background="@color/active_color_primary_light"
android:orientation="vertical"
android:paddingLeft="24dp"
android:paddingRight="24dp"

4
OsmAnd/res/layout/download_item_list_section.xml
View file

@ -9,7 +9,7 @@
android:minHeight="40dp"
android:orientation="horizontal"
android:paddingLeft="@dimen/list_header_padding"
android:background="?attr/ctx_menu_info_view_bg"
android:background="?attr/activity_background_color"
android:paddingRight="@dimen/list_header_padding">
<net.osmand.plus.widgets.TextViewEx
@ -20,6 +20,7 @@
android:layout_marginRight="12dp"
android:layout_weight="1"
android:maxLines="1"
android:textColor="?android:textColorSecondary"
android:textSize="@dimen/default_desc_text_size"
osmand:typeface="@string/font_roboto_medium"
tools:text="World Regions"/>
@ -33,6 +34,7 @@
android:maxLines="1"
android:textSize="@dimen/default_desc_text_size"
android:visibility="gone"
android:textColor="?android:textColorSecondary"
osmand:typeface="@string/font_roboto_medium"
tools:text="600Mb"
tools:visibility="visible"/>

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

@ -4,7 +4,7 @@
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="vertical"
android:background="?attr/ctx_menu_info_view_bg">
android:background="?attr/activity_background_color">
<ExpandableListView
android:id="@android:id/list"

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

@ -11,7 +11,7 @@
android:id="@+id/background_image"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/bg_color_dark"
android:background="@color/list_background_color_dark"
android:scaleType="centerCrop"/>
<LinearLayout

28
OsmAnd/res/layout/first_usage_wizard_fragment.xml
View file

@ -5,7 +5,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/ctx_menu_info_view_bg"
android:background="?attr/activity_background_color"
android:clickable="true"
android:orientation="vertical"
android:theme="@style/OsmandLightTheme">
@ -58,7 +58,7 @@
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:text="@string/shared_string_skip"
android:textColor="@color/color_dialog_buttons_light"/>
android:textColor="@color/active_color_primary_light"/>
</LinearLayout>
@ -102,7 +102,7 @@
android:layout_height="60dp"
android:scaleType="center"
android:src="@drawable/ic_action_location_off"
android:tint="@color/icon_color"/>
android:tint="@color/icon_color_default_light"/>
<LinearLayout
android:layout_width="match_parent"
@ -136,7 +136,7 @@
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/dashboard_divider_light"/>
android:background="@color/divider_color_light"/>
<android.support.v7.widget.AppCompatButton
android:id="@+id/no_location_action_button"
@ -146,7 +146,7 @@
android:gravity="center"
android:minHeight="47dp"
android:text="@string/search_my_location"
android:textColor="@color/color_dialog_buttons_light"/>
android:textColor="@color/active_color_primary_light"/>
</LinearLayout>
@ -180,7 +180,7 @@
android:layout_height="60dp"
android:scaleType="center"
android:src="@drawable/ic_action_wifi_off"
android:tint="@color/icon_color"/>
android:tint="@color/icon_color_default_light"/>
<LinearLayout
android:layout_width="match_parent"
@ -223,7 +223,7 @@
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/dashboard_divider_light"/>
android:background="@color/divider_color_light"/>
<android.support.v7.widget.AppCompatButton
android:id="@+id/no_inet_action_button"
@ -233,7 +233,7 @@
android:gravity="center"
android:minHeight="47dp"
android:text="@string/try_again"
android:textColor="@color/color_dialog_buttons_light"/>
android:textColor="@color/active_color_primary_light"/>
</LinearLayout>
@ -427,7 +427,7 @@
android:layout_height="60dp"
android:scaleType="center"
android:src="@drawable/ic_map"
android:tint="@color/icon_color"/>
android:tint="@color/icon_color_default_light"/>
<LinearLayout
android:layout_width="match_parent"
@ -491,7 +491,7 @@
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:text="@string/search_another_country"
android:textColor="@color/color_dialog_buttons_light"
android:textColor="@color/active_color_primary_light"
android:visibility="gone"/>
<android.support.v7.widget.CardView
@ -525,7 +525,7 @@
android:layout_height="60dp"
android:scaleType="center"
android:src="@drawable/ic_map"
android:tint="@color/icon_color"/>
android:tint="@color/icon_color_default_light"/>
<LinearLayout
android:layout_width="match_parent"
@ -614,7 +614,7 @@
android:layout_height="44dp"
android:contentDescription="@string/shared_string_cancel"
android:src="@drawable/map_action_cancel"
android:tint="@color/icon_color"/>
android:tint="@color/icon_color_default_light"/>
</LinearLayout>
@ -626,7 +626,7 @@
android:id="@+id/map2_downloading_divider"
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/dashboard_divider_light"/>
android:background="@color/divider_color_light"/>
<android.support.v7.widget.AppCompatButton
android:id="@+id/map_downloading_action_button"
@ -731,7 +731,7 @@
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:text="@string/shared_string_change"
android:textColor="@color/color_dialog_buttons_light"/>
android:textColor="@color/active_color_primary_light"/>
</LinearLayout>

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

@ -6,7 +6,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/ctx_menu_info_view_bg"
android:background="?attr/activity_background_color"
android:orientation="vertical">
<android.support.v7.widget.Toolbar

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

@ -66,7 +66,7 @@
<android.support.design.widget.CoordinatorLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/ctx_menu_info_view_bg">
android:background="?attr/activity_background_color">
<net.osmand.plus.LockableViewPager
android:id="@+id/map_markers_view_pager"

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

@ -139,7 +139,7 @@
android:id="@+id/points_list_container"
android:layout_width="match_parent"
android:layout_height="@dimen/measurement_tool_points_list_container_height"
android:background="@color/ctx_menu_info_view_bg_dark"
android:background="@color/activity_background_color_dark"
android:visibility="gone">
<android.support.v7.widget.RecyclerView

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

@ -13,7 +13,7 @@
android:id="@+id/markers_list_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:background="@color/ctx_menu_info_view_bg_dark">
tools:background="@color/activity_background_color_dark">
<android.support.v7.widget.RecyclerView
android:id="@+id/markers_recycler_view"

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

@ -32,7 +32,7 @@
android:id="@+id/markers_list_container"
android:layout_width="match_parent"
android:layout_height="@dimen/measurement_tool_points_list_container_height"
tools:background="@color/ctx_menu_info_view_bg_dark">
tools:background="@color/activity_background_color_dark">
<android.support.v7.widget.RecyclerView
android:id="@+id/markers_recycler_view"

50
OsmAnd/res/layout/fragment_selected_profile.xml
View file

@ -6,7 +6,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/ctx_menu_info_view_bg">
android:background="?attr/activity_background_color">
<ScrollView
android:id="@+id/scroll_view_container"
@ -48,7 +48,7 @@
android:layout_marginEnd="@dimen/bottom_sheet_icon_margin"
android:layout_marginRight="@dimen/bottom_sheet_icon_margin"
android:layout_gravity="center_vertical"
android:tint="?attr/primary_icon_color"
android:tint="?attr/default_icon_color"
tools:src="@drawable/ic_action_coordinates_latitude"/>
<LinearLayout
@ -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"/>
<TextView
android:id="@+id/mode_title"
@ -74,7 +74,7 @@
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxLines="1"
android:textColor="?attr/main_font_color_basic"
android:textColor="?android:textColorPrimary"
android:textSize="18sp"
tools:text="Item additional description"/>
@ -97,7 +97,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/ctx_menu_info_view_bg"
android:background="?attr/activity_background_color"
android:orientation="vertical">
<ImageView
@ -141,7 +141,7 @@
android:layout_height="60dp"
android:layout_weight="1"
android:layout_margin="@dimen/list_content_padding"
app:primaryColor="@color/color_dialog_buttons_dark"
app:primaryColor="@color/active_color_primary_dark"
app:labelText="@string/profile_name_hint">
<studio.carbonylgroup.textfieldboxes.ExtendedEditText
@ -184,7 +184,7 @@
android:id="@+id/navigation_type_otfb"
android:layout_width="match_parent"
android:layout_height="60dp"
app:primaryColor="@color/color_dialog_buttons_dark"
app:primaryColor="@color/active_color_primary_dark"
app:labelText="Navigation Type">
<studio.carbonylgroup.textfieldboxes.ExtendedEditText
@ -218,7 +218,7 @@
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/divider_light"/>
android:background="@color/divider_color_light"/>
<LinearLayout
@ -245,7 +245,7 @@
android:layout_weight="1"
android:textSize="@dimen/default_list_text_size"
android:text="@string/shared_string_icon"
android:textColor="?attr/main_font_color_basic"/>
android:textColor="?android:textColorPrimary"/>
<ImageView
android:id="@+id/profile_icon_img"
@ -261,7 +261,7 @@
android:layout_width="1dp"
android:layout_height="36dp"
android:layout_gravity="center_vertical"
android:background="@color/divider_light"/>
android:background="@color/divider_color_light"/>
<LinearLayout
android:id="@+id/select_icon_color_button"
@ -281,7 +281,7 @@
android:gravity="center_vertical"
android:textSize="@dimen/default_list_text_size"
android:text="@string/shared_string_color"
android:textColor="?attr/main_font_color_basic"/>
android:textColor="?android:textColorPrimary"/>
<ImageView
android:id="@+id/color_sample_img"
@ -298,7 +298,7 @@
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/divider_light"/>
android:background="@color/divider_color_light"/>
</LinearLayout>
@ -323,7 +323,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/ctx_menu_info_view_bg"
android:background="?attr/activity_background_color"
android:orientation="vertical">
<ImageView
@ -361,7 +361,7 @@
android:layout_marginLeft="@dimen/list_content_padding"
android:layout_marginRight="@dimen/list_content_padding"
android:text="@string/edit_profile_setup_title"
android:textColor="?attr/main_font_color_basic"
android:textColor="?android:textColorPrimary"
android:textSize="@dimen/default_list_text_size"/>
<TextView
@ -390,7 +390,7 @@
android:layout_marginStart="@dimen/list_content_padding"
android:layout_marginLeft="@dimen/list_content_padding"
android:src="@drawable/ic_action_layers_dark"
android:tint="?attr/primary_icon_color"/>
android:tint="?attr/default_icon_color"/>
<LinearLayout
android:layout_width="match_parent"
@ -404,8 +404,8 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/edit_profile_configure_map"
android:textColor="?attr/main_font_color_basic"
android:text="@string/configure_map"
android:textColor="?android:textColorPrimary"
android:textSize="@dimen/default_list_text_size"/>
<TextView
@ -421,7 +421,7 @@
android:layout_height="1dp"
android:layout_marginStart="64dp"
android:layout_marginLeft="64dp"
android:background="@color/divider_light"/>
android:background="@color/divider_color_light"/>
<LinearLayout
android:id="@+id/screen_config_btn"
@ -438,7 +438,7 @@
android:layout_marginStart="@dimen/list_content_padding"
android:layout_marginLeft="@dimen/list_content_padding"
android:src="@drawable/ic_configure_screen_dark"
android:tint="?attr/primary_icon_color"/>
android:tint="?attr/default_icon_color"/>
<LinearLayout
android:layout_width="match_parent"
@ -452,8 +452,8 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/edit_profile_configure_screen_title"
android:textColor="?attr/main_font_color_basic"
android:text="@string/map_widget_config"
android:textColor="?android:textColorPrimary"
android:textSize="@dimen/default_list_text_size"/>
<TextView
@ -470,7 +470,7 @@
android:layout_height="1dp"
android:layout_marginStart="64dp"
android:layout_marginLeft="64dp"
android:background="@color/divider_light"
android:background="@color/divider_color_light"
/>
<LinearLayout
@ -488,7 +488,7 @@
android:layout_marginStart="@dimen/list_content_padding"
android:layout_marginLeft="@dimen/list_content_padding"
android:src="@drawable/ic_action_gdirections_dark"
android:tint="?attr/primary_icon_color"/>
android:tint="?attr/default_icon_color"/>
<LinearLayout
android:layout_width="match_parent"
@ -502,8 +502,8 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/edit_profile_nav_settings_title"
android:textColor="?attr/main_font_color_basic"
android:text="@string/routing_settings_2"
android:textColor="?android:textColorPrimary"
android:textSize="@dimen/default_list_text_size"/>
<TextView

Some files were not shown because too many files have changed in this diff Show more