From f427a676fb3bbc948bd4b78261b93907bef0be5f Mon Sep 17 00:00:00 2001
From: Alex Sytnyk <asytnyk0@gmail.com>
Date: Fri, 20 Apr 2018 18:40:39 +0300
Subject: [PATCH 1/2] Fix background of text buttons on wikivoyage article card

---
 .../res/drawable/rounded_background_3dp.xml   |  4 +
 OsmAnd/res/layout/wikivoyage_article_card.xml | 90 +++++++++++--------
 2 files changed, 56 insertions(+), 38 deletions(-)
 create mode 100644 OsmAnd/res/drawable/rounded_background_3dp.xml

diff --git a/OsmAnd/res/drawable/rounded_background_3dp.xml b/OsmAnd/res/drawable/rounded_background_3dp.xml
new file mode 100644
index 0000000000..36ae579a85
--- /dev/null
+++ b/OsmAnd/res/drawable/rounded_background_3dp.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+	<corners android:radius="3dp"/>
+</shape>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/wikivoyage_article_card.xml b/OsmAnd/res/layout/wikivoyage_article_card.xml
index 4dc9be0e06..75b112dc39 100644
--- a/OsmAnd/res/layout/wikivoyage_article_card.xml
+++ b/OsmAnd/res/layout/wikivoyage_article_card.xml
@@ -87,58 +87,72 @@
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content">
 
-				<net.osmand.plus.widgets.TextViewEx
-					android:id="@+id/left_button"
+				<FrameLayout
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
 					android:layout_marginLeft="@dimen/bottom_sheet_content_padding_small"
 					android:layout_marginStart="@dimen/bottom_sheet_content_padding_small"
-					android:background="?attr/selectableItemBackgroundBorderless"
-					android:drawablePadding="@dimen/bottom_sheet_content_padding_small"
-					android:ellipsize="end"
-					android:gravity="center_vertical"
-					android:letterSpacing="@dimen/text_button_letter_spacing"
-					android:maxLines="1"
-					android:paddingBottom="@dimen/context_menu_padding_margin_tiny"
-					android:paddingLeft="@dimen/bottom_sheet_content_padding_small"
-					android:paddingRight="@dimen/bottom_sheet_content_padding_small"
-					android:paddingTop="@dimen/context_menu_padding_margin_tiny"
-					android:textColor="?attr/wikivoyage_active_color"
-					android:textSize="@dimen/text_button_text_size"
-					osmand:typeface="@string/font_roboto_medium"
-					tools:drawableLeft="@drawable/ic_action_read_article"
-					tools:drawableTint="?attr/wikivoyage_active_color"
-					tools:ignore="UnusedAttribute"
-					tools:text="Read"/>
+					android:background="@drawable/rounded_background_3dp">
+
+					<net.osmand.plus.widgets.TextViewEx
+						android:id="@+id/left_button"
+						android:layout_width="wrap_content"
+						android:layout_height="wrap_content"
+						android:background="?attr/selectableItemBackgroundBorderless"
+						android:drawablePadding="@dimen/bottom_sheet_content_padding_small"
+						android:ellipsize="end"
+						android:gravity="center_vertical"
+						android:letterSpacing="@dimen/text_button_letter_spacing"
+						android:maxLines="1"
+						android:paddingBottom="@dimen/context_menu_padding_margin_tiny"
+						android:paddingLeft="@dimen/bottom_sheet_content_padding_small"
+						android:paddingRight="@dimen/bottom_sheet_content_padding_small"
+						android:paddingTop="@dimen/context_menu_padding_margin_tiny"
+						android:textColor="?attr/wikivoyage_active_color"
+						android:textSize="@dimen/text_button_text_size"
+						osmand:typeface="@string/font_roboto_medium"
+						tools:drawableLeft="@drawable/ic_action_read_article"
+						tools:drawableTint="?attr/wikivoyage_active_color"
+						tools:ignore="UnusedAttribute"
+						tools:text="Read"/>
+
+				</FrameLayout>
 
 				<View
 					android:layout_width="0dp"
 					android:layout_height="match_parent"
 					android:layout_weight="1"/>
 
-				<net.osmand.plus.widgets.TextViewEx
-					android:id="@+id/right_button"
+				<FrameLayout
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
 					android:layout_marginEnd="@dimen/bottom_sheet_content_padding_small"
 					android:layout_marginRight="@dimen/bottom_sheet_content_padding_small"
-					android:background="?attr/selectableItemBackgroundBorderless"
-					android:drawablePadding="@dimen/bottom_sheet_content_padding_small"
-					android:ellipsize="end"
-					android:gravity="center_vertical"
-					android:letterSpacing="@dimen/text_button_letter_spacing"
-					android:maxLines="1"
-					android:paddingBottom="@dimen/context_menu_padding_margin_tiny"
-					android:paddingLeft="@dimen/bottom_sheet_content_padding_small"
-					android:paddingRight="@dimen/bottom_sheet_content_padding_small"
-					android:paddingTop="@dimen/context_menu_padding_margin_tiny"
-					android:textColor="?attr/wikivoyage_active_color"
-					android:textSize="@dimen/text_button_text_size"
-					osmand:typeface="@string/font_roboto_medium"
-					tools:drawableRight="@drawable/ic_action_read_later_fill"
-					tools:drawableTint="?attr/wikivoyage_active_color"
-					tools:ignore="UnusedAttribute"
-					tools:text="Delete"/>
+					android:background="@drawable/rounded_background_3dp">
+
+					<net.osmand.plus.widgets.TextViewEx
+						android:id="@+id/right_button"
+						android:layout_width="wrap_content"
+						android:layout_height="wrap_content"
+						android:background="?attr/selectableItemBackgroundBorderless"
+						android:drawablePadding="@dimen/bottom_sheet_content_padding_small"
+						android:ellipsize="end"
+						android:gravity="center_vertical"
+						android:letterSpacing="@dimen/text_button_letter_spacing"
+						android:maxLines="1"
+						android:paddingBottom="@dimen/context_menu_padding_margin_tiny"
+						android:paddingLeft="@dimen/bottom_sheet_content_padding_small"
+						android:paddingRight="@dimen/bottom_sheet_content_padding_small"
+						android:paddingTop="@dimen/context_menu_padding_margin_tiny"
+						android:textColor="?attr/wikivoyage_active_color"
+						android:textSize="@dimen/text_button_text_size"
+						osmand:typeface="@string/font_roboto_medium"
+						tools:drawableRight="@drawable/ic_action_read_later_fill"
+						tools:drawableTint="?attr/wikivoyage_active_color"
+						tools:ignore="UnusedAttribute"
+						tools:text="Delete"/>
+
+				</FrameLayout>
 
 			</LinearLayout>
 

From ed625b563328982f813e1323464d95610561d252 Mon Sep 17 00:00:00 2001
From: Alexey Kulish <alexey.kulish@osmand.net>
Date: Fri, 20 Apr 2018 19:16:27 +0300
Subject: [PATCH 2/2] Fix divider color for wikivoyage navigation list

---
 .../article/WikivoyageArticleNavigationFragment.java         | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/OsmAnd/src/net/osmand/plus/wikivoyage/article/WikivoyageArticleNavigationFragment.java b/OsmAnd/src/net/osmand/plus/wikivoyage/article/WikivoyageArticleNavigationFragment.java
index 2d9b6d6410..bb555e4501 100644
--- a/OsmAnd/src/net/osmand/plus/wikivoyage/article/WikivoyageArticleNavigationFragment.java
+++ b/OsmAnd/src/net/osmand/plus/wikivoyage/article/WikivoyageArticleNavigationFragment.java
@@ -138,6 +138,11 @@ public class WikivoyageArticleNavigationFragment extends MenuBottomSheetDialogFr
 		return false;
 	}
 
+	@Override
+	protected int getBgColorId() {
+		return nightMode ? R.color.wikivoyage_bottom_bar_bg_dark : R.color.bg_color_light;
+	}
+
 	private void sendResults(long cityId) {
 		Fragment fragment = getTargetFragment();
 		if (fragment != null) {