From a67b47d7171a1e9db7938e5aae10a570bfd34c92 Mon Sep 17 00:00:00 2001
From: Alex Sytnyk <asytnyk0@gmail.com>
Date: Thu, 3 May 2018 19:50:32 +0300
Subject: [PATCH 01/14] Add TravelNeededMapsCard and related stuff

---
 OsmAnd/res/layout/travel_needed_map_item.xml  |  1 +
 OsmAnd/res/layout/travel_needed_maps_card.xml |  5 +-
 OsmAnd/res/values/strings.xml                 |  2 +-
 .../wikivoyage/explore/ExploreRvAdapter.java  | 46 +++++++--
 .../explore/ExploreTabFragment.java           |  8 ++
 .../travelcards/TravelDownloadUpdateCard.java |  2 +-
 .../travelcards/TravelNeededMapsCard.java     | 96 +++++++++++++++++++
 7 files changed, 146 insertions(+), 14 deletions(-)
 create mode 100644 OsmAnd/src/net/osmand/plus/wikivoyage/explore/travelcards/TravelNeededMapsCard.java

diff --git a/OsmAnd/res/layout/travel_needed_map_item.xml b/OsmAnd/res/layout/travel_needed_map_item.xml
index 796217baa0..2f7860f4cd 100644
--- a/OsmAnd/res/layout/travel_needed_map_item.xml
+++ b/OsmAnd/res/layout/travel_needed_map_item.xml
@@ -76,6 +76,7 @@
 	</LinearLayout>
 
 	<View
+		android:id="@+id/divider"
 		android:layout_width="match_parent"
 		android:layout_height="1dp"
 		android:layout_marginLeft="@dimen/bottom_sheet_divider_margin_start"
diff --git a/OsmAnd/res/layout/travel_needed_maps_card.xml b/OsmAnd/res/layout/travel_needed_maps_card.xml
index 9a2ba31d71..df23394d47 100644
--- a/OsmAnd/res/layout/travel_needed_maps_card.xml
+++ b/OsmAnd/res/layout/travel_needed_maps_card.xml
@@ -28,14 +28,13 @@
 			osmand:typeface="@string/font_roboto_medium"/>
 
 		<net.osmand.plus.widgets.TextViewEx
-			android:id="@+id/description"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:lineSpacingMultiplier="@dimen/text_button_line_spacing_multiplier"
+			android:text="@string/maps_you_need_descr"
 			android:textColor="@color/wikivoyage_secondary_text"
 			android:textSize="@dimen/travel_card_primary_text_size"
-			osmand:typeface="@string/font_roboto_regular"
-			tools:text="@string/maps_you_need_descr"/>
+			osmand:typeface="@string/font_roboto_regular"/>
 
 	</LinearLayout>
 
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index a2d845e36b..97c2b1d22f 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -12,7 +12,7 @@
     <string name="purchase_cancelled_dialog_title">You have cancel OsmAnd Live subscription</string>
     <string name="purchase_cancelled_dialog_descr">Renew subscription to continue use the all features:</string>
 
-    <string name="maps_you_need_descr">You read articles: %1$s. Based on this, we suggest you download these maps:</string>
+    <string name="maps_you_need_descr">Based on the articles you saved, we recommend you to download following maps:</string>
     <string name="maps_you_need">Maps you need</string>
     <string name="osmand_team">OsmAnd team</string>
     <string name="popular_destinations">Popular destinations</string>
diff --git a/OsmAnd/src/net/osmand/plus/wikivoyage/explore/ExploreRvAdapter.java b/OsmAnd/src/net/osmand/plus/wikivoyage/explore/ExploreRvAdapter.java
index 99b00c9f99..e1ffdc77a3 100644
--- a/OsmAnd/src/net/osmand/plus/wikivoyage/explore/ExploreRvAdapter.java
+++ b/OsmAnd/src/net/osmand/plus/wikivoyage/explore/ExploreRvAdapter.java
@@ -19,13 +19,16 @@ import net.osmand.plus.wikivoyage.explore.travelcards.StartEditingTravelCard;
 import net.osmand.plus.wikivoyage.explore.travelcards.StartEditingTravelCard.StartEditingTravelVH;
 import net.osmand.plus.wikivoyage.explore.travelcards.TravelDownloadUpdateCard;
 import net.osmand.plus.wikivoyage.explore.travelcards.TravelDownloadUpdateCard.DownloadUpdateVH;
+import net.osmand.plus.wikivoyage.explore.travelcards.TravelNeededMapsCard;
+import net.osmand.plus.wikivoyage.explore.travelcards.TravelNeededMapsCard.NeededMapsVH;
 
 import java.util.ArrayList;
 import java.util.List;
 
 public class ExploreRvAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
 
-	private static final int DOWNLOAD_UPDATE_CARD_POSITION = 0;
+	private static final int FIRST_POSITION = 0;
+	private static final int SECOND_POSITION = 1;
 
 	private final List<BaseTravelCard> items = new ArrayList<>();
 
@@ -48,6 +51,9 @@ public class ExploreRvAdapter extends RecyclerView.Adapter<RecyclerView.ViewHold
 			case HeaderTravelCard.TYPE:
 				return new HeaderTravelVH(inflate(parent, R.layout.wikivoyage_list_header));
 
+			case TravelNeededMapsCard.TYPE:
+				return new NeededMapsVH(inflate(parent, R.layout.travel_needed_maps_card));
+
 			default:
 				throw new RuntimeException("Unsupported view type: " + viewType);
 		}
@@ -131,23 +137,45 @@ public class ExploreRvAdapter extends RecyclerView.Adapter<RecyclerView.ViewHold
 		return false;
 	}
 
+	public void setNeededMapsCard(TravelNeededMapsCard card) {
+		if (addItem(getNeededMapsCardPosition(), card)) {
+			notifyDataSetChanged();
+		}
+	}
+
+	private int getNeededMapsCardPosition() {
+		if (downloadUpdateCardExists(FIRST_POSITION)) {
+			return SECOND_POSITION;
+		}
+		return FIRST_POSITION;
+	}
+
 	public void setDownloadUpdateCard(TravelDownloadUpdateCard card) {
-		if (addItem(DOWNLOAD_UPDATE_CARD_POSITION, card)) {
+		if (addItem(getDownloadUpdateCardPosition(), card)) {
 			notifyDataSetChanged();
 		}
 	}
 
 	public void updateDownloadUpdateCard() {
-		notifyItemChanged(DOWNLOAD_UPDATE_CARD_POSITION);
+		int pos = getDownloadUpdateCardPosition();
+		if (downloadUpdateCardExists(pos)) {
+			notifyItemChanged(pos);
+		}
 	}
 
 	public void removeDownloadUpdateCard() {
-		if (items.size() > DOWNLOAD_UPDATE_CARD_POSITION) {
-			BaseTravelCard card = getItem(DOWNLOAD_UPDATE_CARD_POSITION);
-			if (card.getCardType() == TravelDownloadUpdateCard.TYPE) {
-				removeItem(DOWNLOAD_UPDATE_CARD_POSITION);
-				notifyItemRemoved(DOWNLOAD_UPDATE_CARD_POSITION);
-			}
+		int pos = getDownloadUpdateCardPosition();
+		if (downloadUpdateCardExists(pos)) {
+			removeItem(pos);
+			notifyItemRemoved(pos);
 		}
 	}
+
+	private int getDownloadUpdateCardPosition() {
+		return FIRST_POSITION;
+	}
+
+	private boolean downloadUpdateCardExists(int position) {
+		return items.size() > position && items.get(position).getCardType() == TravelDownloadUpdateCard.TYPE;
+	}
 }
diff --git a/OsmAnd/src/net/osmand/plus/wikivoyage/explore/ExploreTabFragment.java b/OsmAnd/src/net/osmand/plus/wikivoyage/explore/ExploreTabFragment.java
index 746e4e116c..19dd01e526 100644
--- a/OsmAnd/src/net/osmand/plus/wikivoyage/explore/ExploreTabFragment.java
+++ b/OsmAnd/src/net/osmand/plus/wikivoyage/explore/ExploreTabFragment.java
@@ -34,6 +34,7 @@ import net.osmand.plus.wikivoyage.explore.travelcards.HeaderTravelCard;
 import net.osmand.plus.wikivoyage.explore.travelcards.OpenBetaTravelCard;
 import net.osmand.plus.wikivoyage.explore.travelcards.StartEditingTravelCard;
 import net.osmand.plus.wikivoyage.explore.travelcards.TravelDownloadUpdateCard;
+import net.osmand.plus.wikivoyage.explore.travelcards.TravelNeededMapsCard;
 
 import java.io.File;
 import java.io.IOException;
@@ -153,6 +154,7 @@ public class ExploreTabFragment extends BaseOsmAndFragment implements DownloadIn
 		this.mainIndexItem = mainIndexItem;
 		this.neededIndexItems = neededIndexItems;
 		addDownloadUpdateCard();
+		addNeededMapsCard();
 	}
 
 	private void addDownloadUpdateCard() {
@@ -209,6 +211,12 @@ public class ExploreTabFragment extends BaseOsmAndFragment implements DownloadIn
 		}
 	}
 
+	private void addNeededMapsCard() {
+		if (!neededIndexItems.isEmpty()) {
+			adapter.setNeededMapsCard(new TravelNeededMapsCard(getMyApplication(), nightMode, neededIndexItems));
+		}
+	}
+
 	@NonNull
 	private String getWikivoyageFileName() {
 		File selectedTravelBook = getMyApplication().getTravelDbHelper().getSelectedTravelBook();
diff --git a/OsmAnd/src/net/osmand/plus/wikivoyage/explore/travelcards/TravelDownloadUpdateCard.java b/OsmAnd/src/net/osmand/plus/wikivoyage/explore/travelcards/TravelDownloadUpdateCard.java
index b7c1226887..a8b8987727 100644
--- a/OsmAnd/src/net/osmand/plus/wikivoyage/explore/travelcards/TravelDownloadUpdateCard.java
+++ b/OsmAnd/src/net/osmand/plus/wikivoyage/explore/travelcards/TravelDownloadUpdateCard.java
@@ -128,7 +128,7 @@ public class TravelDownloadUpdateCard extends BaseTravelCard {
 
 	@NonNull
 	private String getFileTitle() {
-		return indexItem == null ? "" : indexItem.getBasename().replace("_", " ");
+		return indexItem == null ? "" : indexItem.getVisibleName(app, app.getRegions(), false);
 	}
 
 	@NonNull
diff --git a/OsmAnd/src/net/osmand/plus/wikivoyage/explore/travelcards/TravelNeededMapsCard.java b/OsmAnd/src/net/osmand/plus/wikivoyage/explore/travelcards/TravelNeededMapsCard.java
new file mode 100644
index 0000000000..a987764b76
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/wikivoyage/explore/travelcards/TravelNeededMapsCard.java
@@ -0,0 +1,96 @@
+package net.osmand.plus.wikivoyage.explore.travelcards;
+
+import android.graphics.drawable.Drawable;
+import android.support.annotation.NonNull;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import net.osmand.plus.OsmandApplication;
+import net.osmand.plus.R;
+import net.osmand.plus.download.IndexItem;
+
+import java.util.List;
+
+public class TravelNeededMapsCard extends BaseTravelCard {
+
+	public static final int TYPE = 70;
+
+	private List<IndexItem> items;
+
+	private Drawable downloadIcon;
+
+	public TravelNeededMapsCard(OsmandApplication app, boolean nightMode, List<IndexItem> items) {
+		super(app, nightMode);
+		this.items = items;
+		downloadIcon = getActiveIcon(R.drawable.ic_action_import);
+	}
+
+	@Override
+	public void bindViewHolder(@NonNull RecyclerView.ViewHolder viewHolder) {
+		if (viewHolder instanceof NeededMapsVH) {
+			NeededMapsVH holder = (NeededMapsVH) viewHolder;
+			adjustChildCount(holder.itemsContainer);
+			for (int i = 0; i < items.size(); i++) {
+				boolean lastItem = i == items.size() - 1;
+				IndexItem item = items.get(i);
+				View view = holder.itemsContainer.getChildAt(i);
+				((ImageView) view.findViewById(R.id.icon))
+						.setImageDrawable(getActiveIcon(item.getType().getIconResource()));
+				((TextView) view.findViewById(R.id.title)).setText(item.getVisibleName(app, app.getRegions(), false));
+				((TextView) view.findViewById(R.id.description)).setText(getItemDescription(item));
+				((ImageView) view.findViewById(R.id.icon_action)).setImageDrawable(downloadIcon);
+				view.findViewById(R.id.divider).setVisibility(lastItem ? View.GONE : View.VISIBLE);
+			}
+		}
+	}
+
+	@Override
+	public int getCardType() {
+		return TYPE;
+	}
+
+	private void adjustChildCount(LinearLayout itemsContainer) {
+		int itemsCount = items.size();
+		int childCount = itemsContainer.getChildCount();
+		if (itemsCount == childCount) {
+			return;
+		}
+		if (itemsCount > childCount) {
+			LayoutInflater inflater = LayoutInflater.from(itemsContainer.getContext());
+			for (int i = childCount; i < itemsCount; i++) {
+				inflater.inflate(R.layout.travel_needed_map_item, itemsContainer);
+			}
+		} else if (itemsCount < childCount) {
+			itemsContainer.removeViews(0, childCount - itemsCount);
+		}
+	}
+
+	private String getItemDescription(IndexItem item) {
+		return app.getString(R.string.file_size_in_mb, item.getArchiveSizeMB()) + " • " + item.getType().getString(app);
+	}
+
+	public static class NeededMapsVH extends RecyclerView.ViewHolder {
+
+		final LinearLayout itemsContainer;
+		final View secondaryBtnContainer;
+		final TextView secondaryBtn;
+		final View buttonsDivider;
+		final View primaryBtnContainer;
+		final TextView primaryButton;
+
+		@SuppressWarnings("RedundantCast")
+		public NeededMapsVH(View itemView) {
+			super(itemView);
+			itemsContainer = (LinearLayout) itemView.findViewById(R.id.items_container);
+			secondaryBtnContainer = itemView.findViewById(R.id.secondary_btn_container);
+			secondaryBtn = (TextView) itemView.findViewById(R.id.secondary_button);
+			buttonsDivider = itemView.findViewById(R.id.buttons_divider);
+			primaryBtnContainer = itemView.findViewById(R.id.primary_btn_container);
+			primaryButton = (TextView) itemView.findViewById(R.id.primary_button);
+		}
+	}
+}

From b3c4a40899f4e939e188fed2e3b1e42eecbc27f6 Mon Sep 17 00:00:00 2001
From: PaulStets <stetsenko.pavlo@gmail.com>
Date: Fri, 4 May 2018 10:17:57 +0300
Subject: [PATCH 02/14] Fixed an issue with incorrect dialog in cologne

---
 .../osmand/plus/wikivoyage/WikivoyageWebViewClient.java    | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/wikivoyage/WikivoyageWebViewClient.java b/OsmAnd/src/net/osmand/plus/wikivoyage/WikivoyageWebViewClient.java
index f10c962121..62e8b5b167 100644
--- a/OsmAnd/src/net/osmand/plus/wikivoyage/WikivoyageWebViewClient.java
+++ b/OsmAnd/src/net/osmand/plus/wikivoyage/WikivoyageWebViewClient.java
@@ -80,7 +80,8 @@ public class WikivoyageWebViewClient extends WebViewClient implements RegionCall
 
 	@Override
 	public boolean shouldOverrideUrlLoading(WebView view, String url) {
-		if (url.contains(WIKIVOAYAGE_DOMAIN)) {
+		boolean isWebPage = url.startsWith(PAGE_PREFIX_HTTP) || url.startsWith(PAGE_PREFIX_HTTPS);
+		if (url.contains(WIKIVOAYAGE_DOMAIN) && isWebPage) {
 			String lang = getLang(url);
 			String articleName = getArticleNameFromUrl(url, lang);
 			long articleId = app.getTravelDbHelper().getArticleId(articleName, lang);
@@ -90,11 +91,11 @@ public class WikivoyageWebViewClient extends WebViewClient implements RegionCall
 				warnAboutExternalLoad(url, context, nightMode);
 			}
 			return true;
-		} else if (url.contains(WIKI_DOMAIN)) {
+		} else if (url.contains(WIKI_DOMAIN) && isWebPage) {
 			String lang = getLang(url);
 			String articleName = getArticleNameFromUrl(url, lang);
 			getWikiArticle(articleName, lang, url);
-		} else if (url.startsWith(PAGE_PREFIX_HTTP) || url.startsWith(PAGE_PREFIX_HTTPS)) {
+		} else if (isWebPage) {
 			warnAboutExternalLoad(url, context, nightMode);
 		} else if (url.startsWith(PREFIX_GEO)) {
 			if (article != null) {

From 2e55393c4f1728ddefd23e4502e0cf613389fdc2 Mon Sep 17 00:00:00 2001
From: Chumva <chumva.forever@gmail.com>
Date: Fri, 4 May 2018 11:26:07 +0300
Subject: [PATCH 03/14] added sort languages for wikivoyage popupMenu

---
 .../wikivoyage/article/WikivoyageArticleDialogFragment.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/OsmAnd/src/net/osmand/plus/wikivoyage/article/WikivoyageArticleDialogFragment.java b/OsmAnd/src/net/osmand/plus/wikivoyage/article/WikivoyageArticleDialogFragment.java
index 98cd31fe51..cf2411006e 100644
--- a/OsmAnd/src/net/osmand/plus/wikivoyage/article/WikivoyageArticleDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/wikivoyage/article/WikivoyageArticleDialogFragment.java
@@ -253,7 +253,8 @@ public class WikivoyageArticleDialogFragment extends WikiArticleBaseDialogFragme
 		for (String n : langs) {
 			names.put(n, FileNameTranslationHelper.getVoiceName(getContext(), n));
 		}
-		for (final Map.Entry<String, String> e : names.entrySet()) {
+		Map<String, String> sortedNames = AndroidUtils.sortByValue(names);
+		for (final Map.Entry<String, String> e : sortedNames.entrySet()) {
 			final String lang = e.getValue();
 			final String langKey = e.getKey();
 			MenuItem item = popup.getMenu().add(lang);

From 00c57563cb3d9e2f9766e1852b13a906ad18e467 Mon Sep 17 00:00:00 2001
From: PaulStets <stetsenko.pavlo@gmail.com>
Date: Fri, 4 May 2018 12:15:31 +0300
Subject: [PATCH 04/14] Fix the domains

---
 .../src/net/osmand/plus/wikivoyage/WikivoyageWebViewClient.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OsmAnd/src/net/osmand/plus/wikivoyage/WikivoyageWebViewClient.java b/OsmAnd/src/net/osmand/plus/wikivoyage/WikivoyageWebViewClient.java
index 62e8b5b167..6e2ba7207a 100644
--- a/OsmAnd/src/net/osmand/plus/wikivoyage/WikivoyageWebViewClient.java
+++ b/OsmAnd/src/net/osmand/plus/wikivoyage/WikivoyageWebViewClient.java
@@ -65,7 +65,7 @@ public class WikivoyageWebViewClient extends WebViewClient implements RegionCall
 	private static final String PREFIX_GEO = "geo:";
 	private static final String PAGE_PREFIX_HTTP = "http://";
 	private static final String PAGE_PREFIX_HTTPS = "https://";
-	private static final String WIKIVOAYAGE_DOMAIN = ".wikivoyage.com/wiki/";
+	private static final String WIKIVOAYAGE_DOMAIN = ".wikivoyage.org/wiki/";
 	private static final String WIKI_DOMAIN = ".wikipedia.org/wiki/";
 	private FetchWikiRegion fetchRegionTask;
 	private WikiArticleSearchTask articleSearchTask;

From 1609233fddc6fe8867f517f755748659e5e5711d Mon Sep 17 00:00:00 2001
From: Chumva <chumva.forever@gmail.com>
Date: Fri, 4 May 2018 12:31:57 +0300
Subject: [PATCH 05/14] added background color to wiki webview

---
 OsmAnd/res/values/colors.xml                                   | 2 ++
 .../src/net/osmand/plus/wikipedia/WikipediaDialogFragment.java | 2 ++
 .../wikivoyage/article/WikivoyageArticleDialogFragment.java    | 3 +++
 3 files changed, 7 insertions(+)

diff --git a/OsmAnd/res/values/colors.xml b/OsmAnd/res/values/colors.xml
index e0872ed64c..7f3b8674e5 100644
--- a/OsmAnd/res/values/colors.xml
+++ b/OsmAnd/res/values/colors.xml
@@ -437,5 +437,7 @@
 	<color name="wikivoyage_secondary_text">#727272</color>
 	<color name="wikivoyage_start_editing_card_image_background">#339966</color>
 	<color name="wikivoyage_open_beta_card_image_background">#008bf8</color>
+	<color name="wikivoyage_webview_background_light">#ffffff</color>
+	<color name="wikivoyage_webview_background_dark">#17191a</color>
 
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/wikipedia/WikipediaDialogFragment.java b/OsmAnd/src/net/osmand/plus/wikipedia/WikipediaDialogFragment.java
index 1b7fbd4d29..21f492937a 100644
--- a/OsmAnd/src/net/osmand/plus/wikipedia/WikipediaDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/wikipedia/WikipediaDialogFragment.java
@@ -106,6 +106,8 @@ public class WikipediaDialogFragment extends WikiArticleBaseDialogFragment {
 		webSettings.setJavaScriptEnabled(true);
 		contentWebView.setWebViewClient(new WikipediaWebViewClient(getActivity(), nightMode));
 		updateWebSettings();
+		contentWebView.setBackgroundColor(ContextCompat.getColor(getMyApplication(),
+				nightMode ? R.color.wikivoyage_webview_background_dark : R.color.wikivoyage_webview_background_light));
 
 		return mainView;
 	}
diff --git a/OsmAnd/src/net/osmand/plus/wikivoyage/article/WikivoyageArticleDialogFragment.java b/OsmAnd/src/net/osmand/plus/wikivoyage/article/WikivoyageArticleDialogFragment.java
index cf2411006e..84181a4163 100644
--- a/OsmAnd/src/net/osmand/plus/wikivoyage/article/WikivoyageArticleDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/wikivoyage/article/WikivoyageArticleDialogFragment.java
@@ -10,6 +10,7 @@ import android.support.annotation.Nullable;
 import android.support.v4.app.FragmentActivity;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentManager.BackStackEntry;
+import android.support.v4.content.ContextCompat;
 import android.support.v7.widget.PopupMenu;
 import android.support.v7.widget.Toolbar;
 import android.text.TextUtils;
@@ -159,6 +160,8 @@ public class WikivoyageArticleDialogFragment extends WikiArticleBaseDialogFragme
 		contentWebView.addJavascriptInterface(new WikivoyageArticleWebAppInterface(), "Android");
 		webViewClient = new WikivoyageWebViewClient(getActivity(), getFragmentManager(), nightMode);
 		contentWebView.setWebViewClient(webViewClient);
+		contentWebView.setBackgroundColor(ContextCompat.getColor(getMyApplication(),
+				nightMode ? R.color.wikivoyage_webview_background_dark : R.color.wikivoyage_webview_background_light));
 
 		return mainView;
 	}

From ee6ab670007ddafb76c8688306373f39dcf1e0e7 Mon Sep 17 00:00:00 2001
From: Chumva <chumva.forever@gmail.com>
Date: Fri, 4 May 2018 12:33:54 +0300
Subject: [PATCH 06/14] renamed wiki webview colors

---
 OsmAnd/res/values/colors.xml                                 | 5 +++--
 .../net/osmand/plus/wikipedia/WikipediaDialogFragment.java   | 2 +-
 .../wikivoyage/article/WikivoyageArticleDialogFragment.java  | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/OsmAnd/res/values/colors.xml b/OsmAnd/res/values/colors.xml
index 7f3b8674e5..40f3143980 100644
--- a/OsmAnd/res/values/colors.xml
+++ b/OsmAnd/res/values/colors.xml
@@ -437,7 +437,8 @@
 	<color name="wikivoyage_secondary_text">#727272</color>
 	<color name="wikivoyage_start_editing_card_image_background">#339966</color>
 	<color name="wikivoyage_open_beta_card_image_background">#008bf8</color>
-	<color name="wikivoyage_webview_background_light">#ffffff</color>
-	<color name="wikivoyage_webview_background_dark">#17191a</color>
+
+	<color name="wiki_webview_background_light">#ffffff</color>
+	<color name="wiki_webview_background_dark">#17191a</color>
 
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/wikipedia/WikipediaDialogFragment.java b/OsmAnd/src/net/osmand/plus/wikipedia/WikipediaDialogFragment.java
index 21f492937a..b4170e1da4 100644
--- a/OsmAnd/src/net/osmand/plus/wikipedia/WikipediaDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/wikipedia/WikipediaDialogFragment.java
@@ -107,7 +107,7 @@ public class WikipediaDialogFragment extends WikiArticleBaseDialogFragment {
 		contentWebView.setWebViewClient(new WikipediaWebViewClient(getActivity(), nightMode));
 		updateWebSettings();
 		contentWebView.setBackgroundColor(ContextCompat.getColor(getMyApplication(),
-				nightMode ? R.color.wikivoyage_webview_background_dark : R.color.wikivoyage_webview_background_light));
+				nightMode ? R.color.wiki_webview_background_dark : R.color.wiki_webview_background_light));
 
 		return mainView;
 	}
diff --git a/OsmAnd/src/net/osmand/plus/wikivoyage/article/WikivoyageArticleDialogFragment.java b/OsmAnd/src/net/osmand/plus/wikivoyage/article/WikivoyageArticleDialogFragment.java
index 84181a4163..a069d938ad 100644
--- a/OsmAnd/src/net/osmand/plus/wikivoyage/article/WikivoyageArticleDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/wikivoyage/article/WikivoyageArticleDialogFragment.java
@@ -161,7 +161,7 @@ public class WikivoyageArticleDialogFragment extends WikiArticleBaseDialogFragme
 		webViewClient = new WikivoyageWebViewClient(getActivity(), getFragmentManager(), nightMode);
 		contentWebView.setWebViewClient(webViewClient);
 		contentWebView.setBackgroundColor(ContextCompat.getColor(getMyApplication(),
-				nightMode ? R.color.wikivoyage_webview_background_dark : R.color.wikivoyage_webview_background_light));
+				nightMode ? R.color.wiki_webview_background_dark : R.color.wiki_webview_background_light));
 
 		return mainView;
 	}

From 6dd1712cc8ed21d8184849b060611289e19748a4 Mon Sep 17 00:00:00 2001
From: Chumva <chumva.forever@gmail.com>
Date: Fri, 4 May 2018 13:35:24 +0300
Subject: [PATCH 07/14] added show images dialog options for wikipedia

---
 .../res/layout/wikipedia_dialog_fragment.xml  |  9 +++
 OsmAnd/res/values/strings.xml                 |  1 +
 .../wikipedia/WikipediaDialogFragment.java    | 69 ++++++++----------
 ...pediaOptionsBottomSheetDialogFragment.java | 70 +++++++++++++++++++
 4 files changed, 110 insertions(+), 39 deletions(-)
 create mode 100644 OsmAnd/src/net/osmand/plus/wikivoyage/WikipediaOptionsBottomSheetDialogFragment.java

diff --git a/OsmAnd/res/layout/wikipedia_dialog_fragment.xml b/OsmAnd/res/layout/wikipedia_dialog_fragment.xml
index db6b07919f..8dbb3f31ca 100644
--- a/OsmAnd/res/layout/wikipedia_dialog_fragment.xml
+++ b/OsmAnd/res/layout/wikipedia_dialog_fragment.xml
@@ -54,6 +54,15 @@
 				tools:text="En"
 				tools:textColor="?attr/wikivoyage_active_color" />
 
+			<android.support.v7.widget.AppCompatImageView
+				android:id="@+id/options_button"
+				style="@style/Widget.AppCompat.ActionButton"
+				android:layout_width="48dp"
+				android:layout_height="match_parent"
+				android:layout_gravity="top"
+				android:contentDescription="@string/shared_string_options"
+				tools:src="@drawable/ic_overflow_menu_white"/>
+
             </LinearLayout>
 
         </android.support.v7.widget.Toolbar>
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index 97c2b1d22f..5c55afa69f 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -9,6 +9,7 @@
          3. All your modified/created strings are in the top of the file (to make easier find what\'s translated).
     PLEASE: Have a look at http://code.google.com/p/osmand/wiki/UIConsistency, it may really improve your and our work  :-)  Thx - Hardy
     -->
+    <string name="show_images">Show images</string>
     <string name="purchase_cancelled_dialog_title">You have cancel OsmAnd Live subscription</string>
     <string name="purchase_cancelled_dialog_descr">Renew subscription to continue use the all features:</string>
 
diff --git a/OsmAnd/src/net/osmand/plus/wikipedia/WikipediaDialogFragment.java b/OsmAnd/src/net/osmand/plus/wikipedia/WikipediaDialogFragment.java
index b4170e1da4..b9fead599f 100644
--- a/OsmAnd/src/net/osmand/plus/wikipedia/WikipediaDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/wikipedia/WikipediaDialogFragment.java
@@ -3,6 +3,7 @@ package net.osmand.plus.wikipedia;
 import android.annotation.SuppressLint;
 import android.app.Dialog;
 import android.content.Context;
+import android.content.Intent;
 import android.content.res.ColorStateList;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
@@ -10,6 +11,7 @@ import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.customtabs.CustomTabsIntent;
+import android.support.v4.app.FragmentManager;
 import android.support.v4.content.ContextCompat;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.PopupMenu;
@@ -17,12 +19,12 @@ import android.support.v7.widget.Toolbar;
 import android.text.TextUtils;
 import android.view.Gravity;
 import android.view.LayoutInflater;
-import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.webkit.WebSettings;
 import android.webkit.WebView;
+import android.widget.ImageView;
 import android.widget.TextView;
 
 import net.osmand.AndroidUtils;
@@ -30,10 +32,10 @@ import net.osmand.IndexConstants;
 import net.osmand.data.Amenity;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.OsmandPlugin;
-import net.osmand.plus.OsmandSettings;
 import net.osmand.plus.R;
 import net.osmand.plus.development.OsmandDevelopmentPlugin;
 import net.osmand.plus.helpers.FileNameTranslationHelper;
+import net.osmand.plus.wikivoyage.WikipediaOptionsBottomSheetDialogFragment;
 import net.osmand.util.Algorithms;
 
 import java.io.File;
@@ -47,10 +49,6 @@ public class WikipediaDialogFragment extends WikiArticleBaseDialogFragment {
 
 	public static final String TAG = "WikipediaDialogFragment";
 
-	private static final int MENU_ITEM_NO_ID = 0;
-	private static final int MENU_ITEM_SHOW_ID = 1;
-	private static final int MENU_ITEM_WIFI_ID = 2;
-
 	private TextView readFullArticleButton;
 
 	private Amenity amenity;
@@ -75,7 +73,25 @@ public class WikipediaDialogFragment extends WikiArticleBaseDialogFragment {
 		setupToolbar((Toolbar) mainView.findViewById(R.id.toolbar));
 
 		articleToolbarText = (TextView) mainView.findViewById(R.id.title_text_view);
-
+		ImageView options = (ImageView) mainView.findViewById(R.id.options_button);
+		options.setImageDrawable(getIcon(R.drawable.ic_overflow_menu_white, R.color.icon_color));
+		options.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				OsmandApplication app = getMyApplication();
+				if (app != null) {
+					FragmentManager fm = getFragmentManager();
+					if (fm == null) {
+						return;
+					}
+					WikipediaOptionsBottomSheetDialogFragment fragment = new WikipediaOptionsBottomSheetDialogFragment();
+					fragment.setUsedOnMap(false);
+					fragment.setTargetFragment(WikipediaDialogFragment.this,
+							WikipediaOptionsBottomSheetDialogFragment.REQUEST_CODE);
+					fragment.show(fm, WikipediaOptionsBottomSheetDialogFragment.TAG);
+				}
+			}
+		});
 		ColorStateList buttonColorStateList = AndroidUtils.createPressedColorStateList(getContext(), nightMode,
 				R.color.ctx_menu_controller_button_text_color_light_n, R.color.ctx_menu_controller_button_text_color_light_p,
 				R.color.ctx_menu_controller_button_text_color_dark_n, R.color.ctx_menu_controller_button_text_color_dark_p);
@@ -256,37 +272,12 @@ public class WikipediaDialogFragment extends WikiArticleBaseDialogFragment {
 		return showInstance(activity, amenity, null);
 	}
 
-	protected void setupToolbar(Toolbar toolbar) {
-		super.setupToolbar(toolbar);
-		toolbar.setOverflowIcon(getIcon(R.drawable.ic_overflow_menu_white, R.color.icon_color));
-
-		Menu menu = toolbar.getMenu();
-		MenuItem.OnMenuItemClickListener itemClickListener = new MenuItem.OnMenuItemClickListener() {
-			@Override
-			public boolean onMenuItemClick(MenuItem item) {
-				OsmandApplication app = getMyApplication();
-				if (app != null) {
-					int itemId = item.getItemId();
-					if (itemId == MENU_ITEM_SHOW_ID) {
-						app.getSettings().WIKI_ARTICLE_SHOW_IMAGES.set(OsmandSettings.WikiArticleShowImages.ON);
-						return true;
-					} else if (itemId == MENU_ITEM_WIFI_ID) {
-						app.getSettings().WIKI_ARTICLE_SHOW_IMAGES.set(OsmandSettings.WikiArticleShowImages.WIFI);
-						return true;
-					} else if (itemId == MENU_ITEM_NO_ID) {
-						app.getSettings().WIKI_ARTICLE_SHOW_IMAGES.set(OsmandSettings.WikiArticleShowImages.OFF);
-						return true;
-					}
-				}
-				return false;
-			}
-		};
-
-		MenuItem itemShow = menu.add(0, MENU_ITEM_SHOW_ID, 0, R.string.shared_string_show);
-		itemShow.setOnMenuItemClickListener(itemClickListener);
-		MenuItem itemWifi = menu.add(0, MENU_ITEM_WIFI_ID, 0, R.string.shared_string_only_with_wifi);
-		itemWifi.setOnMenuItemClickListener(itemClickListener);
-		MenuItem itemNo = menu.add(0, MENU_ITEM_NO_ID, 0, R.string.shared_string_dont);
-		itemNo.setOnMenuItemClickListener(itemClickListener);
+	@Override
+	public void onActivityResult(int requestCode, int resultCode, Intent data) {
+		super.onActivityResult(requestCode, resultCode, data);
+		if (resultCode == WikipediaOptionsBottomSheetDialogFragment.SHOW_PICTURES_CHANGED_REQUEST_CODE) {
+			updateWebSettings();
+			populateArticle();
+		}
 	}
 }
diff --git a/OsmAnd/src/net/osmand/plus/wikivoyage/WikipediaOptionsBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/wikivoyage/WikipediaOptionsBottomSheetDialogFragment.java
new file mode 100644
index 0000000000..9532b7b57d
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/wikivoyage/WikipediaOptionsBottomSheetDialogFragment.java
@@ -0,0 +1,70 @@
+package net.osmand.plus.wikivoyage;
+
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.support.v7.widget.PopupMenu;
+import android.view.Gravity;
+import android.view.MenuItem;
+import android.view.View;
+
+import net.osmand.plus.OsmandApplication;
+import net.osmand.plus.OsmandSettings;
+import net.osmand.plus.OsmandSettings.WikiArticleShowImages;
+import net.osmand.plus.R;
+import net.osmand.plus.base.MenuBottomSheetDialogFragment;
+import net.osmand.plus.base.bottomsheetmenu.BaseBottomSheetItem;
+import net.osmand.plus.base.bottomsheetmenu.BottomSheetItemWithDescription;
+import net.osmand.plus.base.bottomsheetmenu.simpleitems.TitleItem;
+
+
+public class WikipediaOptionsBottomSheetDialogFragment extends MenuBottomSheetDialogFragment {
+
+	public final static String TAG = "WikipediaOptionsBottomSheetDialogFragment";
+
+	public static final int REQUEST_CODE = 0;
+	public static final int SHOW_PICTURES_CHANGED_REQUEST_CODE = 1;
+
+	@Override
+	public void createMenuItems(Bundle savedInstanceState) {
+		final OsmandApplication app = getMyApplication();
+		final OsmandSettings.CommonPreference<WikiArticleShowImages> showImagesPref = app.getSettings().WIKI_ARTICLE_SHOW_IMAGES;
+
+		items.add(new TitleItem(getString(R.string.shared_string_options)));
+
+		BaseBottomSheetItem showImagesItem = new BottomSheetItemWithDescription.Builder()
+				.setDescription(getString(showImagesPref.get().name))
+				.setDescriptionColorId(nightMode ? R.color.wikivoyage_active_dark : R.color.wikivoyage_active_light)
+				.setIcon(getContentIcon(R.drawable.ic_type_img))
+				.setTitle(getString(R.string.download_images))
+				.setLayoutId(R.layout.bottom_sheet_item_with_right_descr)
+				.setOnClickListener(new View.OnClickListener() {
+					@Override
+					public void onClick(View v) {
+						final PopupMenu popup = new PopupMenu(v.getContext(), v, Gravity.END);
+						for (final WikiArticleShowImages showImages : WikiArticleShowImages.values()) {
+							MenuItem item = popup.getMenu().add(getString(showImages.name));
+							item.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
+								@Override
+								public boolean onMenuItemClick(MenuItem item) {
+									showImagesPref.set(showImages);
+									sendResult();
+									dismiss();
+									return true;
+								}
+							});
+						}
+						popup.show();
+					}
+				})
+				.create();
+		items.add(showImagesItem);
+	}
+
+	private void sendResult() {
+		Fragment fragment = getTargetFragment();
+		if (fragment != null) {
+			fragment.onActivityResult(getTargetRequestCode(), SHOW_PICTURES_CHANGED_REQUEST_CODE, null);
+		}
+	}
+}
+

From 32a1e729d9a1407e0698c9891689fa650e558201 Mon Sep 17 00:00:00 2001
From: Alex Sytnyk <asytnyk0@gmail.com>
Date: Fri, 4 May 2018 13:38:18 +0300
Subject: [PATCH 08/14] Fix NPE

---
 .../explore/ExploreTabFragment.java           | 24 ++++++++++---------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/wikivoyage/explore/ExploreTabFragment.java b/OsmAnd/src/net/osmand/plus/wikivoyage/explore/ExploreTabFragment.java
index 19dd01e526..9bfc4df848 100644
--- a/OsmAnd/src/net/osmand/plus/wikivoyage/explore/ExploreTabFragment.java
+++ b/OsmAnd/src/net/osmand/plus/wikivoyage/explore/ExploreTabFragment.java
@@ -94,17 +94,19 @@ public class ExploreTabFragment extends BaseOsmAndFragment implements DownloadIn
 
 	@Override
 	public void downloadHasFinished() {
-		final OsmandApplication app = getMyApplication();
-		File targetFile = mainIndexItem.getTargetFile(app);
-		if (downloadUpdateCard != null && mainIndexItem != null && targetFile.exists()) {
-			downloadUpdateCard.setLoadingInProgress(false);
-			removeDownloadUpdateCard();
-			TravelDbHelper travelDbHelper = app.getTravelDbHelper();
-			travelDbHelper.initTravelBooks();
-			travelDbHelper.selectTravelBook(targetFile);
-			Fragment parent = getParentFragment();
-			if (parent != null && parent instanceof WikivoyageExploreDialogFragment) {
-				((WikivoyageExploreDialogFragment) parent).populateData();
+		if (mainIndexItem != null) {
+			final OsmandApplication app = getMyApplication();
+			File targetFile = mainIndexItem.getTargetFile(app);
+			if (downloadUpdateCard != null && targetFile.exists()) {
+				downloadUpdateCard.setLoadingInProgress(false);
+				removeDownloadUpdateCard();
+				TravelDbHelper travelDbHelper = app.getTravelDbHelper();
+				travelDbHelper.initTravelBooks();
+				travelDbHelper.selectTravelBook(targetFile);
+				Fragment parent = getParentFragment();
+				if (parent != null && parent instanceof WikivoyageExploreDialogFragment) {
+					((WikivoyageExploreDialogFragment) parent).populateData();
+				}
 			}
 		}
 	}

From abcaaa4bf498fe3ada090f87d3813f5549a82074 Mon Sep 17 00:00:00 2001
From: Dmitriy Prodchenko <dmpr0.ua@gmail.com>
Date: Fri, 4 May 2018 13:44:24 +0300
Subject: [PATCH 09/14] CSS for Travel and Wikipedia: fix table styles

---
 OsmAnd/assets/article_style.css | 53 ++++++++++++++++++++++++++-------
 1 file changed, 43 insertions(+), 10 deletions(-)

diff --git a/OsmAnd/assets/article_style.css b/OsmAnd/assets/article_style.css
index db40aa439d..7d32f8d31d 100755
--- a/OsmAnd/assets/article_style.css
+++ b/OsmAnd/assets/article_style.css
@@ -242,7 +242,8 @@ p {
     color: var(--main-text-color-night);
 }
 
-ul, dl {
+/* Lists */
+ul, dl, ol {
     /* font-size: var(--main-text-font-size); */
     color: var(--main-text-color-day);
     font-size: inherit;
@@ -259,15 +260,10 @@ li {
     padding-bottom: 1%;
 }
 
-.nightmode ul, .nightmode dl  {
+.nightmode ul, .nightmode dl, .nightmode ol  {
     color: #cccccc;
 }
 
-.toc {
-    font-size: var(--main-text-font-size);
-}
-
-
 img {
     width: 100%;
 }
@@ -327,10 +323,47 @@ a.geo {
     text-decoration: none;
     display: inline-block;
 }
-
-td {
-    display: inline-block;
+/* Tables */
+table {
+    display: block;
+    overflow-y: scroll;
     word-wrap: break-word;
+    color: var(--main-text-color-day);
+    border: 1px solid var(--divider-color-day);
+    background: var(--divider-color-day);
+    margin-left: 0% !important;
+    margin-right: 0% !important;
+    margin-bottom: 7% !important;
+    font-size: inherit;
+}
+
+.nightmode table {
+    color: var(--main-text-color-night);
+    border: 1px solid var(--background-color-night);
+    background: var(--divider-color-night) !important;
+}
+
+
+td, tr, th {
+    border: 1px solid var(--divider-color-day);
+    color: var(--main-text-color-night);
+    background: var(--divider-color-day);
+}
+
+.nightmode td, .nightmode tr, .nightmode th {
+    color: var(--main-text-color-night);
+    border: 1px solid var(--background-color-night);
+    background: var(--divider-color-night) !important;
+}
+
+.toc, .toc td, .toc tr {
+    border: 0px solid;
+    background: var(--background-color-day);
+}
+
+.nightmode .toc, .toc td, .toc tr {
+    border: 0px solid;
+    background: var(--background-color-night) !important;
 }
 
 .thumb-tright, .thumbinner {

From 9f8c329e28c8cd9968874d322fd7c3b49a007541 Mon Sep 17 00:00:00 2001
From: Chumva <chumva.forever@gmail.com>
Date: Fri, 4 May 2018 13:48:57 +0300
Subject: [PATCH 10/14] add check for requestCode

---
 .../src/net/osmand/plus/wikipedia/WikipediaDialogFragment.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/OsmAnd/src/net/osmand/plus/wikipedia/WikipediaDialogFragment.java b/OsmAnd/src/net/osmand/plus/wikipedia/WikipediaDialogFragment.java
index b9fead599f..613f71bea4 100644
--- a/OsmAnd/src/net/osmand/plus/wikipedia/WikipediaDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/wikipedia/WikipediaDialogFragment.java
@@ -275,7 +275,8 @@ public class WikipediaDialogFragment extends WikiArticleBaseDialogFragment {
 	@Override
 	public void onActivityResult(int requestCode, int resultCode, Intent data) {
 		super.onActivityResult(requestCode, resultCode, data);
-		if (resultCode == WikipediaOptionsBottomSheetDialogFragment.SHOW_PICTURES_CHANGED_REQUEST_CODE) {
+		if (requestCode == WikipediaOptionsBottomSheetDialogFragment.REQUEST_CODE
+				&& resultCode == WikipediaOptionsBottomSheetDialogFragment.SHOW_PICTURES_CHANGED_REQUEST_CODE) {
 			updateWebSettings();
 			populateArticle();
 		}

From 4ab036bd21f5bfa84bd82f5d3a909a3f32709239 Mon Sep 17 00:00:00 2001
From: Chumva <chumva.forever@gmail.com>
Date: Fri, 4 May 2018 13:53:01 +0300
Subject: [PATCH 11/14] moved WikipediaOptionsBottomSheetDialogFragment to
 wikipedia package

---
 .../WikipediaOptionsBottomSheetDialogFragment.java              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename OsmAnd/src/net/osmand/plus/{wikivoyage => wikipedia}/WikipediaOptionsBottomSheetDialogFragment.java (98%)

diff --git a/OsmAnd/src/net/osmand/plus/wikivoyage/WikipediaOptionsBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/wikipedia/WikipediaOptionsBottomSheetDialogFragment.java
similarity index 98%
rename from OsmAnd/src/net/osmand/plus/wikivoyage/WikipediaOptionsBottomSheetDialogFragment.java
rename to OsmAnd/src/net/osmand/plus/wikipedia/WikipediaOptionsBottomSheetDialogFragment.java
index 9532b7b57d..e2c1e50a38 100644
--- a/OsmAnd/src/net/osmand/plus/wikivoyage/WikipediaOptionsBottomSheetDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/wikipedia/WikipediaOptionsBottomSheetDialogFragment.java
@@ -1,4 +1,4 @@
-package net.osmand.plus.wikivoyage;
+package net.osmand.plus.wikipedia;
 
 import android.os.Bundle;
 import android.support.v4.app.Fragment;

From ac7e56013d8cfee048dc12b31569355e83dda37b Mon Sep 17 00:00:00 2001
From: Chumva <chumva.forever@gmail.com>
Date: Fri, 4 May 2018 13:54:13 +0300
Subject: [PATCH 12/14] removed unnecessary import

---
 .../src/net/osmand/plus/wikipedia/WikipediaDialogFragment.java   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/OsmAnd/src/net/osmand/plus/wikipedia/WikipediaDialogFragment.java b/OsmAnd/src/net/osmand/plus/wikipedia/WikipediaDialogFragment.java
index 613f71bea4..d224c0ced4 100644
--- a/OsmAnd/src/net/osmand/plus/wikipedia/WikipediaDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/wikipedia/WikipediaDialogFragment.java
@@ -35,7 +35,6 @@ import net.osmand.plus.OsmandPlugin;
 import net.osmand.plus.R;
 import net.osmand.plus.development.OsmandDevelopmentPlugin;
 import net.osmand.plus.helpers.FileNameTranslationHelper;
-import net.osmand.plus.wikivoyage.WikipediaOptionsBottomSheetDialogFragment;
 import net.osmand.util.Algorithms;
 
 import java.io.File;

From 03b8977aa5912d04c9a22bfd16d8e1328d999e8f Mon Sep 17 00:00:00 2001
From: Dmitriy Prodchenko <dmpr0.ua@gmail.com>
Date: Fri, 4 May 2018 17:15:56 +0300
Subject: [PATCH 13/14] Add icon for OsmAnd Live subscription

---
 .../ic_action_subscription_osmand_live.png       | Bin 0 -> 2566 bytes
 .../ic_action_subscription_osmand_live.png       | Bin 0 -> 3556 bytes
 .../ic_action_subscription_osmand_live.png       | Bin 0 -> 4696 bytes
 3 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 OsmAnd/res/drawable-hdpi/ic_action_subscription_osmand_live.png
 create mode 100644 OsmAnd/res/drawable-xhdpi/ic_action_subscription_osmand_live.png
 create mode 100644 OsmAnd/res/drawable-xxhdpi/ic_action_subscription_osmand_live.png

diff --git a/OsmAnd/res/drawable-hdpi/ic_action_subscription_osmand_live.png b/OsmAnd/res/drawable-hdpi/ic_action_subscription_osmand_live.png
new file mode 100644
index 0000000000000000000000000000000000000000..9ed159d530099d123acf5bebc7e71aea9398200b
GIT binary patch
literal 2566
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
IX9Vr~4?pBU!2kdN

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_subscription_osmand_live.png b/OsmAnd/res/drawable-xhdpi/ic_action_subscription_osmand_live.png
new file mode 100644
index 0000000000000000000000000000000000000000..07cc2f82885dab4bcfd4540a5afc7c514cd94c58
GIT binary patch
literal 3556
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
T+Zw>mf0w0&EvDG~T+Dv}9)m(-

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_subscription_osmand_live.png b/OsmAnd/res/drawable-xxhdpi/ic_action_subscription_osmand_live.png
new file mode 100644
index 0000000000000000000000000000000000000000..58092db4f03b6c8a810564d04689916b4742335d
GIT binary patch
literal 4696
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
P|9XtD=9o%-m#F^%+)Hb?

literal 0
HcmV?d00001


From 769e66fd4577b3b8cc38d54c01d0abc387356f3c Mon Sep 17 00:00:00 2001
From: Dmitriy Prodchenko <dmpr0.ua@gmail.com>
Date: Fri, 4 May 2018 18:45:18 +0300
Subject: [PATCH 14/14] Fix string

---
 OsmAnd/res/values/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index 5c55afa69f..16218bc7af 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -673,7 +673,7 @@
     <string name="osm_live_hide_user_name">Do not show my name in reports</string>
     <string name="osm_live_support_region">Support region</string>
     <string name="osm_live_month_cost">Month cost</string>
-    <string name="osm_live_month_cost_desc">Monthly payment.</string>
+    <string name="osm_live_month_cost_desc">Monthly payment</string>
     <string name="osm_live_active">Active</string>
     <string name="osm_live_not_active">Inactive</string>
     <string name="osm_live_enter_email">Please enter a valid e-mail address</string>