msb-public
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Code Issues Projects Releases Wiki Activity

Removed fake dark debug option

Browse Source
pull/217/head
M66B 9 months ago
parent 1b780f6e15
commit b85f64be29
6 changed files with 6 additions and 44 deletions
Show Stats Download Patch File Download Diff File

15
app/src/main/java/eu/faircode/email/AdapterMessage.java
Unescape View File

@ -329,7 +329,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
private List<String> languages;
private static boolean debug;
private boolean canDarken;
private boolean fake_dark;
private boolean show_recent;
private boolean gotoTop = false;
@ -2454,7 +2453,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
ibSummarize.setVisibility(tools && !outbox && button_summarize && AI.isAvailable(context) && message.content ? View.VISIBLE : View.GONE);
ibFullScreen.setVisibility(tools && full && button_full_screen && message.content ? View.VISIBLE : View.GONE);
ibForceLight.setVisibility(tools && full && dark && button_force_light && message.content ? View.VISIBLE : View.GONE);
ibForceLight.setImageLevel(!(canDarken || fake_dark) || force_light ? 1 : 0);
ibForceLight.setImageLevel(!canDarken || force_light ? 1 : 0);
ibImportance.setVisibility(tools && button_importance && !outbox && seen ? View.VISIBLE : View.GONE);
ibHide.setVisibility(tools && button_hide && !outbox ? View.VISIBLE : View.GONE);
ibSeen.setVisibility(tools && button_seen && !outbox && seen ? View.VISIBLE : View.GONE);
@ -2997,7 +2996,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
boolean show_images = properties.getValue("images", message.id);
boolean show_quotes = properties.getValue("quotes", message.id);
boolean dark = Helper.isDarkTheme(context);
boolean force_light = properties.getValue("force_light", message.id);
boolean always_images = prefs.getBoolean("html_always_images", false);
if (always_images && show_full) {
@ -3142,8 +3140,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
float scale = (size == 0 || textSize == 0 ? 1.0f : size / (textSize * message_zoom / 100f));
args.putFloat("scale", scale);
args.putBoolean("fake_dark", !canDarken && fake_dark && dark && !force_light);
Log.breadcrumb("message:body", args);
new SimpleTask<Object>() {
@ -3328,10 +3324,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
HtmlHelper.restorePre(document);
}
boolean fake_dark = args.getBoolean("fake_dark");
if (fake_dark)
HtmlHelper.fakeDark(document);
boolean browser_zoom = prefs.getBoolean("browser_zoom", false);
int message_zoom = prefs.getInt("message_zoom", 100);
if (browser_zoom && message_zoom != 100) {
@ -5816,7 +5808,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
});
boolean isDark = Helper.isDarkTheme(context);
tvDark.setVisibility(isDark && !(canDarken || fake_dark) ? View.VISIBLE : View.GONE);
tvDark.setVisibility(isDark && !canDarken ? View.VISIBLE : View.GONE);
}
boolean disable_tracking = prefs.getBoolean("disable_tracking", true);
@ -7474,7 +7466,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
}
private void onActionForceLight(TupleMessageEx message) {
if (canDarken || fake_dark) {
if (canDarken) {
boolean force_light = !properties.getValue("force_light", message.id);
properties.setValue("force_light", message.id, force_light);
ibForceLight.setImageLevel(force_light ? 1 : 0);
@ -8465,7 +8457,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
debug = prefs.getBoolean("debug", false);
this.canDarken = WebViewEx.isFeatureSupported(context, WebViewFeature.ALGORITHMIC_DARKENING);
this.fake_dark = prefs.getBoolean("fake_dark", false);
this.show_recent = prefs.getBoolean("show_recent", false);
DiffUtil.ItemCallback<TupleMessageEx> callback = new DiffUtil.ItemCallback<TupleMessageEx>() {

2
app/src/main/java/eu/faircode/email/FragmentOptions.java
Unescape View File

@ -170,7 +170,7 @@ public class FragmentOptions extends FragmentBase {
"language_detection",
"quick_filter", "quick_scroll", "quick_actions",
"experiments", "debug", "log_level", "test1", "test2", "test3", "test4", "test5",
"webview_legacy", "browser_zoom", "fake_dark",
"webview_legacy", "browser_zoom",
"show_recent",
"biometrics",
"default_light",

12
app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java
Unescape View File

@ -199,7 +199,6 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc
private SwitchCompat swAutoScroll;
private SwitchCompat swUndoManager;
private SwitchCompat swBrowserZoom;
private SwitchCompat swFakeDark;
private EditText etViewportHeight;
private SwitchCompat swIgnoreFormattedSize;
private SwitchCompat swShowRecent;
@ -303,7 +302,7 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc
"cache_lists", "oauth_tabs",
"start_delay", "range_size", "chunk_size", "thread_range", "restart_interval",
"autoscroll_editor", "undo_manager",
"browser_zoom", "fake_dark",
"browser_zoom",
"ignore_formatted_size",
"show_recent",
"use_modseq", "preamble", "uid_command", "perform_expunge", "uid_expunge",
@ -469,7 +468,6 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc
swAutoScroll = view.findViewById(R.id.swAutoScroll);
swUndoManager = view.findViewById(R.id.swUndoManager);
swBrowserZoom = view.findViewById(R.id.swBrowserZoom);
swFakeDark = view.findViewById(R.id.swFakeDark);
etViewportHeight = view.findViewById(R.id.etViewportHeight);
swIgnoreFormattedSize = view.findViewById(R.id.swIgnoreFormattedSize);
swShowRecent = view.findViewById(R.id.swShowRecent);
@ -1439,13 +1437,6 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc
}
});
swFakeDark.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
prefs.edit().putBoolean("fake_dark", checked).apply();
}
});
etViewportHeight.setHint(Integer.toString(WebViewEx.getDefaultViewportHeight(getContext())));
etViewportHeight.addTextChangedListener(new TextWatcher() {
@Override
@ -2577,7 +2568,6 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc
swAutoScroll.setChecked(prefs.getBoolean("autoscroll_editor", false));
swUndoManager.setChecked(prefs.getBoolean("undo_manager", false));
swBrowserZoom.setChecked(prefs.getBoolean("browser_zoom", false));
swFakeDark.setChecked(prefs.getBoolean("fake_dark", false));
int dvh = WebViewEx.getDefaultViewportHeight(getContext());
int vh = prefs.getInt("viewport_height", dvh);

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

@ -441,12 +441,6 @@ public class WebViewEx extends WebView implements DownloadListener, View.OnLongC
public static boolean isFeatureSupported(Context context, String feature) {
if (WebViewFeature.ALGORITHMIC_DARKENING.equals(feature)) {
if (BuildConfig.DEBUG) {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
boolean fake_dark = prefs.getBoolean("fake_dark", false);
if (fake_dark)
return false;
}
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q)
return false;

14
app/src/main/res/layout/fragment_options_misc.xml
Unescape View File

@ -1360,18 +1360,6 @@
app:layout_constraintTop_toBottomOf="@id/swUndoManager"
app:switchPadding="12dp" />
<androidx.appcompat.widget.SwitchCompat
android:id="@+id/swFakeDark"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:checked="true"
android:text="@string/title_advanced_fake_dark"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/swBrowserZoom"
app:switchPadding="12dp" />
<TextView
android:id="@+id/tvViewportHeight"
android:layout_width="0dp"
@ -1383,7 +1371,7 @@
android:textColor="?android:attr/textColorPrimary"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/swFakeDark" />
app:layout_constraintTop_toBottomOf="@id/swBrowserZoom" />
<EditText
android:id="@+id/etViewportHeight"

1
app/src/main/res/values/strings.xml
Unescape View File

@ -971,7 +971,6 @@
<string name="title_advanced_auto_scroll" translatable="false">Auto scroll editor</string>
<string name="title_advanced_undo_manager" translatable="false">Use Android\'s undo manager</string>
<string name="title_advanced_browser_zoom" translatable="false">Use browser zoom</string>
<string name="title_advanced_fake_dark" translatable="false">Fake dark</string>
<string name="title_advanced_viewport_height" translatable="false">Viewport height</string>
<string name="title_advanced_ignore_formatted_size" translatable="false">Ignore formatted size</string>
<string name="title_advanced_show_recent" translatable="false">Show recent flag</string>

Write Preview
Loading…
Cancel
Save