From 3a4ea76b4f1d4bb7330c6b4d43b88c537bfb4036 Mon Sep 17 00:00:00 2001 From: M66B Date: Sat, 18 Sep 2021 12:40:33 +0200 Subject: [PATCH] Fixed force light background color --- app/build.gradle | 2 +- app/src/main/java/eu/faircode/email/WebViewEx.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 1c8fbfaf74..46a9945cc0 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -4,7 +4,7 @@ apply plugin: 'kotlin-android' apply plugin: 'de.undercouch.download' def getVersionCode = { -> return 1726 } -def getRevision = { -> "\"b\"" } +def getRevision = { -> "\"c\"" } def getReleaseName = { -> return "\"Yaverlandia\"" } // https://en.wikipedia.org/wiki/List_of_dinosaur_genera diff --git a/app/src/main/java/eu/faircode/email/WebViewEx.java b/app/src/main/java/eu/faircode/email/WebViewEx.java index 6723c5c833..ba477a519f 100644 --- a/app/src/main/java/eu/faircode/email/WebViewEx.java +++ b/app/src/main/java/eu/faircode/email/WebViewEx.java @@ -107,9 +107,9 @@ public class WebViewEx extends WebView implements DownloadListener, View.OnLongC WebSettings settings = getSettings(); - boolean dark = (Helper.isDarkTheme(context) && !force_light); + boolean dark = Helper.isDarkTheme(context); if (WebViewEx.isFeatureSupported(WebViewFeature.FORCE_DARK)) - WebSettingsCompat.setForceDark(settings, dark ? FORCE_DARK_ON : FORCE_DARK_OFF); + WebSettingsCompat.setForceDark(settings, dark && !force_light ? FORCE_DARK_ON : FORCE_DARK_OFF); if (!dark) setBackgroundColor(ColorUtils.setAlphaComponent(Color.WHITE, 127));