From ee6ab670007ddafb76c8688306373f39dcf1e0e7 Mon Sep 17 00:00:00 2001 From: Chumva Date: Fri, 4 May 2018 12:33:54 +0300 Subject: [PATCH] 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 @@ #727272 #339966 #008bf8 - #ffffff - #17191a + + #ffffff + #17191a \ 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; }