Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-03-31 06:08:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Auto original dark"

Browse Source 
This reverts commit a67e679e17.
This commit is contained in:
M66B
2021-09-17 23:17:35 +02:00
parent a67e679e17
commit 97d46e5c03
4 changed files with 39 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/src/main/java/eu/faircode/email/WebViewEx.java
View File

@@ -23,10 +23,7 @@ import android.content.Context;
import android.content.SharedPreferences;
import android.content.res.Configuration;
import android.graphics.Bitmap;
import android.graphics.BlendMode;
import android.graphics.Color;
import android.graphics.PorterDuff;
import android.graphics.drawable.Drawable;
import android.net.Uri;
import android.os.Build;
import android.util.Pair;
@@ -107,18 +104,23 @@ public class WebViewEx extends WebView implements DownloadListener, View.OnLongC
int zoom = prefs.getInt("view_zoom", compact ? 0 : 1);
int message_zoom = prefs.getInt("message_zoom", 100);
boolean monospaced = prefs.getBoolean("monospaced", false);
boolean confirm_html = prefs.getBoolean("confirm_html", true);
boolean html_dark = prefs.getBoolean("html_dark", confirm_html);
WebSettings settings = getSettings();
boolean forced = false;
boolean dark = Helper.isDarkTheme(context);
if (WebViewEx.isFeatureSupported(WebViewFeature.FORCE_DARK)) {
if (html_dark &&
WebViewEx.isFeatureSupported(WebViewFeature.FORCE_DARK)) {
WebSettingsCompat.setForceDark(settings, dark ? FORCE_DARK_ON : FORCE_DARK_OFF);
setBackgroundColor(Color.TRANSPARENT);
} else {
if (!dark)
setBackgroundColor(Color.TRANSPARENT);
forced = true;
}
setBackgroundColor(dark && !forced
? Color.WHITE
: ColorUtils.setAlphaComponent(Color.WHITE, 127));
float fontSize = 16f /* Default */ * message_zoom / 100f;
if (zoom == 0 /* small */)
fontSize *= HtmlHelper.FONT_SMALL;
@@ -176,7 +178,7 @@ public class WebViewEx extends WebView implements DownloadListener, View.OnLongC
});
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M)
setOnScrollChangeListener(new OnScrollChangeListener() {
setOnScrollChangeListener(new View.OnScrollChangeListener() {
@Override
public void onScrollChange(View v, int scrollX, int scrollY, int oldScrollX, int oldScrollY) {
Log.i("Scroll (x,y)=" + scrollX + "," + scrollY);