diff options
author | Andrew Dolgov <[email protected]> | 2016-04-14 10:16:59 +0300 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2016-04-14 10:16:59 +0300 |
commit | 2e27a463d880d5f2119e6f055268a0d08598ee8c (patch) | |
tree | 22fd49b44b5ddb481b6116fb76081242ac66600c | |
parent | bca92c0d8e2ffd2412251d2a17452bfca349e99d (diff) |
prevent webview flashing white on dark theme
3 files changed, 11 insertions, 1 deletions
diff --git a/org.fox.ttrss/src/main/AndroidManifest.xml b/org.fox.ttrss/src/main/AndroidManifest.xml index 018b3a82..6b01520f 100755 --- a/org.fox.ttrss/src/main/AndroidManifest.xml +++ b/org.fox.ttrss/src/main/AndroidManifest.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.fox.ttrss" - android:versionCode="406" + android:versionCode="407" android:versionName="1.174" > <uses-sdk diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java index a1a2f019..8fba4d62 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java @@ -3,6 +3,7 @@ package org.fox.ttrss; import android.annotation.SuppressLint; import android.app.Activity; import android.content.SharedPreferences; +import android.graphics.Color; import android.net.Uri; import android.os.Build; import android.os.Bundle; @@ -447,6 +448,10 @@ public class ArticleFragment extends Fragment { ws.setMediaPlaybackRequiresUserGesture(false); } + if (CommonActivity.THEME_DARK.equals(m_prefs.getString("theme", CommonActivity.THEME_DEFAULT))) { + m_web.setBackgroundColor(Color.BLACK); + } + if (m_prefs.getBoolean("justify_article_text", true)) { cssOverride += "body { text-align : justify; } "; } diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java index 617787e1..9c7974ea 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java @@ -4,6 +4,7 @@ import android.annotation.SuppressLint; import android.app.Activity; import android.content.SharedPreferences; import android.database.Cursor; +import android.graphics.Color; import android.net.Uri; import android.os.Bundle; import android.preference.PreferenceManager; @@ -29,6 +30,7 @@ import android.widget.TextView; import com.shamanland.fab.ShowHideOnScroll; +import org.fox.ttrss.CommonActivity; import org.fox.ttrss.R; import org.fox.ttrss.util.ImageCacheService; import org.fox.ttrss.util.NotifyingScrollView; @@ -238,6 +240,9 @@ public class OfflineArticleFragment extends Fragment { final WebView web = (WebView)view.findViewById(R.id.article_content); if (web != null) { + if (CommonActivity.THEME_DARK.equals(m_prefs.getString("theme", CommonActivity.THEME_DEFAULT))) { + web.setBackgroundColor(Color.BLACK); + } web.setWebViewClient(new WebViewClient() { @Override |