diff --git a/app/src/main/java/eu/faircode/email/ActivityBase.java b/app/src/main/java/eu/faircode/email/ActivityBase.java index fed6f8afa9..4d340e754d 100644 --- a/app/src/main/java/eu/faircode/email/ActivityBase.java +++ b/app/src/main/java/eu/faircode/email/ActivityBase.java @@ -109,6 +109,8 @@ abstract class ActivityBase extends AppCompatActivity implements SharedPreferenc setSupportActionBar(toolbar); + FragmentDialogTheme.setBackground(this, container, this instanceof ActivityCompose); + super.setContentView(container); } diff --git a/app/src/main/java/eu/faircode/email/ActivityDMARC.java b/app/src/main/java/eu/faircode/email/ActivityDMARC.java index 709dabf1cf..ad7c130910 100644 --- a/app/src/main/java/eu/faircode/email/ActivityDMARC.java +++ b/app/src/main/java/eu/faircode/email/ActivityDMARC.java @@ -75,7 +75,6 @@ public class ActivityDMARC extends ActivityBase { grpReady = findViewById(R.id.grpReady); // Initialize - FragmentDialogTheme.setBackground(this, view, false); grpReady.setVisibility(View.GONE); load(); diff --git a/app/src/main/java/eu/faircode/email/ActivityDSN.java b/app/src/main/java/eu/faircode/email/ActivityDSN.java index b5d4568fa5..55c4f384cf 100644 --- a/app/src/main/java/eu/faircode/email/ActivityDSN.java +++ b/app/src/main/java/eu/faircode/email/ActivityDSN.java @@ -57,7 +57,6 @@ public class ActivityDSN extends ActivityBase { grpReady = findViewById(R.id.grpReady); // Initialize - FragmentDialogTheme.setBackground(this, view, false); grpReady.setVisibility(View.GONE); load(); diff --git a/app/src/main/java/eu/faircode/email/ActivityEML.java b/app/src/main/java/eu/faircode/email/ActivityEML.java index 1e52fa15cd..99df8a5a42 100644 --- a/app/src/main/java/eu/faircode/email/ActivityEML.java +++ b/app/src/main/java/eu/faircode/email/ActivityEML.java @@ -207,7 +207,6 @@ public class ActivityEML extends ActivityBase { }); // Initialize - FragmentDialogTheme.setBackground(this, view, false); vSeparatorAttachments.setVisibility(View.GONE); grpReady.setVisibility(View.GONE); cardHeaders.setVisibility(View.GONE); diff --git a/app/src/main/java/eu/faircode/email/ActivitySignature.java b/app/src/main/java/eu/faircode/email/ActivitySignature.java index 4978359f82..e4515c3c28 100644 --- a/app/src/main/java/eu/faircode/email/ActivitySignature.java +++ b/app/src/main/java/eu/faircode/email/ActivitySignature.java @@ -208,7 +208,6 @@ public class ActivitySignature extends ActivityBase { }); // Initialize - FragmentDialogTheme.setBackground(this, view, true); tvHtmlRemark.setVisibility(View.GONE); style_bar.setVisibility(View.GONE); diff --git a/app/src/main/java/eu/faircode/email/FragmentAbout.java b/app/src/main/java/eu/faircode/email/FragmentAbout.java index 531fcaa3d4..392ff9b944 100644 --- a/app/src/main/java/eu/faircode/email/FragmentAbout.java +++ b/app/src/main/java/eu/faircode/email/FragmentAbout.java @@ -108,8 +108,6 @@ public class FragmentAbout extends FragmentBase { llContributors.addView(tv); } - FragmentDialogTheme.setBackground(context, view, false); - return view; } diff --git a/app/src/main/java/eu/faircode/email/FragmentAccount.java b/app/src/main/java/eu/faircode/email/FragmentAccount.java index db4825df37..635f4d46e4 100644 --- a/app/src/main/java/eu/faircode/email/FragmentAccount.java +++ b/app/src/main/java/eu/faircode/email/FragmentAccount.java @@ -626,7 +626,6 @@ public class FragmentAccount extends FragmentBase { // Initialize Helper.setViewsEnabled(view, false); - FragmentDialogTheme.setBackground(getContext(), view, false); tvGmailHint.setVisibility(View.GONE); diff --git a/app/src/main/java/eu/faircode/email/FragmentAccounts.java b/app/src/main/java/eu/faircode/email/FragmentAccounts.java index 669b94214c..94b0cd2de4 100644 --- a/app/src/main/java/eu/faircode/email/FragmentAccounts.java +++ b/app/src/main/java/eu/faircode/email/FragmentAccounts.java @@ -291,8 +291,6 @@ public class FragmentAccounts extends FragmentBase { animator = Helper.getFabAnimator(fab, getViewLifecycleOwner()); // Initialize - FragmentDialogTheme.setBackground(getContext(), view, false); - if (settings) { fab.show(); fabCompose.hide(); diff --git a/app/src/main/java/eu/faircode/email/FragmentAnswer.java b/app/src/main/java/eu/faircode/email/FragmentAnswer.java index f04080395e..e96668526b 100644 --- a/app/src/main/java/eu/faircode/email/FragmentAnswer.java +++ b/app/src/main/java/eu/faircode/email/FragmentAnswer.java @@ -198,8 +198,6 @@ public class FragmentAnswer extends FragmentBase { }); // Initialize - FragmentDialogTheme.setBackground(context, view, true); - etLabel.setVisibility(BuildConfig.DEBUG ? View.VISIBLE : View.GONE); cbExternal.setVisibility(View.GONE); cbSnippet.setVisibility(View.GONE); diff --git a/app/src/main/java/eu/faircode/email/FragmentAnswers.java b/app/src/main/java/eu/faircode/email/FragmentAnswers.java index 77ec4cb2de..cc1d641aa2 100644 --- a/app/src/main/java/eu/faircode/email/FragmentAnswers.java +++ b/app/src/main/java/eu/faircode/email/FragmentAnswers.java @@ -197,7 +197,6 @@ public class FragmentAnswers extends FragmentBase { }); // Initialize - FragmentDialogTheme.setBackground(getContext(), view, false); grpReady.setVisibility(View.GONE); pbWait.setVisibility(View.VISIBLE); diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java index fe0030629d..e52975f995 100644 --- a/app/src/main/java/eu/faircode/email/FragmentCompose.java +++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java @@ -1084,7 +1084,6 @@ public class FragmentCompose extends FragmentBase { // Initialize setHasOptionsMenu(true); - FragmentDialogTheme.setBackground(getContext(), view, true); if (keyboard_no_fullscreen) { // https://developer.android.com/reference/android/view/inputmethod/EditorInfo#IME_FLAG_NO_FULLSCREEN diff --git a/app/src/main/java/eu/faircode/email/FragmentDialogTheme.java b/app/src/main/java/eu/faircode/email/FragmentDialogTheme.java index 70d3b74929..30acab970a 100644 --- a/app/src/main/java/eu/faircode/email/FragmentDialogTheme.java +++ b/app/src/main/java/eu/faircode/email/FragmentDialogTheme.java @@ -649,25 +649,33 @@ public class FragmentDialogTheme extends FragmentDialogBase { boolean solarized = theme.startsWith("solarized"); boolean you = theme.startsWith("you_"); + Integer color = null; if (cards) { if (you && (!dark || !black) && Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) - view.setBackgroundColor(ContextCompat.getColor(context, dark + color = ContextCompat.getColor(context, dark ? android.R.color.system_background_dark - : android.R.color.system_background_light)); + : android.R.color.system_background_light); else { if (compose) { if (!dark || solarized) - view.setBackgroundColor(Helper.resolveColor(context, R.attr.colorCardBackground)); + color = Helper.resolveColor(context, R.attr.colorCardBackground); } else { if (!dark && !solarized) - view.setBackgroundColor(ContextCompat.getColor(context, beige + color = ContextCompat.getColor(context, beige ? R.color.lightColorBackground_cards_beige - : R.color.lightColorBackground_cards)); + : R.color.lightColorBackground_cards); } } } else { if (tabular_card_bg) - view.setBackgroundColor(Helper.resolveColor(context, R.attr.colorCardBackground)); + color = Helper.resolveColor(context, R.attr.colorCardBackground); } + + if (color == null) + color = ContextCompat.getColor(context, dark + ? android.R.color.system_background_dark + : android.R.color.system_background_light); + + view.setBackgroundColor(color); } } diff --git a/app/src/main/java/eu/faircode/email/FragmentFolders.java b/app/src/main/java/eu/faircode/email/FragmentFolders.java index 8d3ac1ecbf..2eb0a78b2d 100644 --- a/app/src/main/java/eu/faircode/email/FragmentFolders.java +++ b/app/src/main/java/eu/faircode/email/FragmentFolders.java @@ -443,7 +443,6 @@ public class FragmentFolders extends FragmentBase { }); // Initialize - FragmentDialogTheme.setBackground(getContext(), view, false); grpReady.setVisibility(View.GONE); pbWait.setVisibility(View.VISIBLE); fabAdd.hide(); diff --git a/app/src/main/java/eu/faircode/email/FragmentIdentities.java b/app/src/main/java/eu/faircode/email/FragmentIdentities.java index 7fa7fdba72..86f6e2f642 100644 --- a/app/src/main/java/eu/faircode/email/FragmentIdentities.java +++ b/app/src/main/java/eu/faircode/email/FragmentIdentities.java @@ -183,7 +183,6 @@ public class FragmentIdentities extends FragmentBase { animator = Helper.getFabAnimator(fab, getViewLifecycleOwner()); // Initialize - FragmentDialogTheme.setBackground(getContext(), view, false); grpReady.setVisibility(View.GONE); pbWait.setVisibility(View.VISIBLE); diff --git a/app/src/main/java/eu/faircode/email/FragmentIdentity.java b/app/src/main/java/eu/faircode/email/FragmentIdentity.java index 4980ed4960..2c37f92dab 100644 --- a/app/src/main/java/eu/faircode/email/FragmentIdentity.java +++ b/app/src/main/java/eu/faircode/email/FragmentIdentity.java @@ -577,7 +577,6 @@ public class FragmentIdentity extends FragmentBase { // Initialize Helper.setViewsEnabled(view, false); - FragmentDialogTheme.setBackground(getContext(), view, false); btnAutoConfig.setEnabled(false); pbAutoConfig.setVisibility(View.GONE); diff --git a/app/src/main/java/eu/faircode/email/FragmentLegend.java b/app/src/main/java/eu/faircode/email/FragmentLegend.java index adb6f6c33d..32042b178b 100644 --- a/app/src/main/java/eu/faircode/email/FragmentLegend.java +++ b/app/src/main/java/eu/faircode/email/FragmentLegend.java @@ -19,6 +19,7 @@ package eu.faircode.email; Copyright 2018-2024 by Marcel Bokhorst (M66B) */ +import android.content.Context; import android.os.Bundle; import android.view.LayoutInflater; import android.view.View; @@ -71,8 +72,6 @@ public class FragmentLegend extends FragmentBase { } } - FragmentDialogTheme.setBackground(getContext(), view, false); - return view; } @@ -82,7 +81,10 @@ public class FragmentLegend extends FragmentBase { layout = savedInstanceState.getInt("fair:layout"); if (layout < 0) { + final Context context = getContext(); + TabLayout tabLayout = view.findViewById(R.id.tab_layout); + tabLayout.setBackgroundColor(Helper.resolveColor(context, R.attr.colorCardBackground)); tabLayout.setupWithViewPager(pager); Bundle args = getArguments(); diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java index 776ec929fd..0ac895aba4 100644 --- a/app/src/main/java/eu/faircode/email/FragmentMessages.java +++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java @@ -1998,7 +1998,6 @@ public class FragmentMessages extends FragmentBase setBackPressedCallback(backPressedCallback); // Initialize - FragmentDialogTheme.setBackground(getContext(), view, false); grpAirplane.setVisibility(View.GONE); grpNotifications.setVisibility(View.GONE); grpBatteryOptimizations.setVisibility(View.GONE); diff --git a/app/src/main/java/eu/faircode/email/FragmentOptions.java b/app/src/main/java/eu/faircode/email/FragmentOptions.java index cc1d7791fd..30d561ea76 100644 --- a/app/src/main/java/eu/faircode/email/FragmentOptions.java +++ b/app/src/main/java/eu/faircode/email/FragmentOptions.java @@ -256,10 +256,12 @@ public class FragmentOptions extends FragmentBase { @Override public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) { + final Context context = getContext(); + TabLayout tabLayout = view.findViewById(R.id.tab_layout); + tabLayout.setBackgroundColor(Helper.resolveColor(context, R.attr.colorCardBackground)); tabLayout.setupWithViewPager(pager); - final Context context = getContext(); int colorAccent = Helper.resolveColor(context, androidx.appcompat.R.attr.colorAccent); for (int i = 0; i < tabLayout.getTabCount(); i++) { Drawable d = ContextCompat.getDrawable(context, PAGE_ICONS[i]); diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsBackup.java b/app/src/main/java/eu/faircode/email/FragmentOptionsBackup.java index 7413f3545d..704dc134df 100644 --- a/app/src/main/java/eu/faircode/email/FragmentOptionsBackup.java +++ b/app/src/main/java/eu/faircode/email/FragmentOptionsBackup.java @@ -284,7 +284,6 @@ public class FragmentOptionsBackup extends FragmentBase implements SharedPrefere }); // Initialize - FragmentDialogTheme.setBackground(getContext(), view, false); Helper.linkPro(tvExportPro); cardCloud.setVisibility(!BuildConfig.PLAY_STORE_RELEASE && !TextUtils.isEmpty(BuildConfig.CLOUD_URI) diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsBehavior.java b/app/src/main/java/eu/faircode/email/FragmentOptionsBehavior.java index e00cf06c38..5003443325 100644 --- a/app/src/main/java/eu/faircode/email/FragmentOptionsBehavior.java +++ b/app/src/main/java/eu/faircode/email/FragmentOptionsBehavior.java @@ -635,8 +635,6 @@ public class FragmentOptionsBehavior extends FragmentBase implements SharedPrefe }); // Initialize - FragmentDialogTheme.setBackground(getContext(), view, false); - PreferenceManager.getDefaultSharedPreferences(getContext()).registerOnSharedPreferenceChangeListener(this); return view; diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsConnection.java b/app/src/main/java/eu/faircode/email/FragmentOptionsConnection.java index c0c63c1ccf..8b70c77e3e 100644 --- a/app/src/main/java/eu/faircode/email/FragmentOptionsConnection.java +++ b/app/src/main/java/eu/faircode/email/FragmentOptionsConnection.java @@ -643,7 +643,6 @@ public class FragmentOptionsConnection extends FragmentBase implements SharedPre }); // Initialize - FragmentDialogTheme.setBackground(getContext(), view, false); tvNetworkMetered.setVisibility(View.GONE); tvNetworkRoaming.setVisibility(View.GONE); grpCustomDns.setVisibility(debug || BuildConfig.DEBUG ? View.VISIBLE : View.GONE); diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java b/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java index 2008f17ee1..00c24ba04a 100644 --- a/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java +++ b/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java @@ -1467,7 +1467,6 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer }); // Initialize - FragmentDialogTheme.setBackground(getContext(), view, false); swFaviconsPartial.setText(getString(R.string.title_advanced_favicons_partial, Helper.humanReadableByteCount(ContactInfo.FAVICON_READ_BYTES, false))); grpAvatar.setVisibility(BuildConfig.PLAY_STORE_RELEASE ? View.GONE : View.VISIBLE); diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsEncryption.java b/app/src/main/java/eu/faircode/email/FragmentOptionsEncryption.java index cc518bd2fa..b7bde5ca2a 100644 --- a/app/src/main/java/eu/faircode/email/FragmentOptionsEncryption.java +++ b/app/src/main/java/eu/faircode/email/FragmentOptionsEncryption.java @@ -478,8 +478,6 @@ public class FragmentOptionsEncryption extends FragmentBase }); // Initialize - FragmentDialogTheme.setBackground(getContext(), view, false); - boolean debug = prefs.getBoolean("debug", false); cardDebug.setVisibility(debug || BuildConfig.DEBUG ? View.VISIBLE : View.GONE); diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsIntegrations.java b/app/src/main/java/eu/faircode/email/FragmentOptionsIntegrations.java index 31a0f416ba..b303f98d16 100644 --- a/app/src/main/java/eu/faircode/email/FragmentOptionsIntegrations.java +++ b/app/src/main/java/eu/faircode/email/FragmentOptionsIntegrations.java @@ -689,8 +689,6 @@ public class FragmentOptionsIntegrations extends FragmentBase implements SharedP }); // Initialize - FragmentDialogTheme.setBackground(getContext(), view, false); - cardVirusTotal.setVisibility(BuildConfig.PLAY_STORE_RELEASE ? View.GONE : View.VISIBLE); cardSend.setVisibility(BuildConfig.PLAY_STORE_RELEASE ? View.GONE : View.VISIBLE); cardOpenAi.setVisibility(TextUtils.isEmpty(BuildConfig.OPENAI_ENDPOINT) ? View.GONE : View.VISIBLE); diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java b/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java index aad849111b..b6abe768e8 100644 --- a/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java +++ b/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java @@ -2007,8 +2007,6 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc }); // Initialize - FragmentDialogTheme.setBackground(getContext(), view, false); - swPowerMenu.setVisibility(!BuildConfig.PLAY_STORE_RELEASE && Build.VERSION.SDK_INT >= Build.VERSION_CODES.R ? View.VISIBLE : View.GONE); diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsNotifications.java b/app/src/main/java/eu/faircode/email/FragmentOptionsNotifications.java index dd6647717a..235512c504 100644 --- a/app/src/main/java/eu/faircode/email/FragmentOptionsNotifications.java +++ b/app/src/main/java/eu/faircode/email/FragmentOptionsNotifications.java @@ -748,8 +748,6 @@ public class FragmentOptionsNotifications extends FragmentBase implements Shared }); // Initialize - FragmentDialogTheme.setBackground(getContext(), view, false); - swNotifyTransliterate.setVisibility(TextHelper.canTransliterate() ? View.VISIBLE : View.GONE); swUnseenIgnored.setVisibility(Helper.isXiaomi() ? View.GONE : View.VISIBLE); swAlertOnce.setVisibility(Helper.isXiaomi() || BuildConfig.DEBUG ? View.VISIBLE : View.GONE); diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsPrivacy.java b/app/src/main/java/eu/faircode/email/FragmentOptionsPrivacy.java index d47e24c495..13f37d1c7a 100644 --- a/app/src/main/java/eu/faircode/email/FragmentOptionsPrivacy.java +++ b/app/src/main/java/eu/faircode/email/FragmentOptionsPrivacy.java @@ -599,8 +599,6 @@ public class FragmentOptionsPrivacy extends FragmentBase implements SharedPrefer }); // Initialize - FragmentDialogTheme.setBackground(getContext(), view, false); - StringBuilder sb = new StringBuilder(); for (String value : EmailService.getId(getContext()).values()) { if (sb.length() > 0) diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsSend.java b/app/src/main/java/eu/faircode/email/FragmentOptionsSend.java index fd706a4d9b..bcce23acd7 100644 --- a/app/src/main/java/eu/faircode/email/FragmentOptionsSend.java +++ b/app/src/main/java/eu/faircode/email/FragmentOptionsSend.java @@ -796,8 +796,6 @@ public class FragmentOptionsSend extends FragmentBase implements SharedPreferenc }); // Initialize - FragmentDialogTheme.setBackground(getContext(), view, false); - String re1 = getString(R.string.title_subject_reply, ""); String re2 = getString(R.string.title_subject_reply_alt, ""); ((RadioButton) view.findViewById(R.id.rbRe1)).setText(re1); diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsSynchronize.java b/app/src/main/java/eu/faircode/email/FragmentOptionsSynchronize.java index b1e739deb9..96faebba22 100644 --- a/app/src/main/java/eu/faircode/email/FragmentOptionsSynchronize.java +++ b/app/src/main/java/eu/faircode/email/FragmentOptionsSynchronize.java @@ -573,8 +573,6 @@ public class FragmentOptionsSynchronize extends FragmentBase implements SharedPr rvBlocklist.setAdapter(badapter); // Initialize - FragmentDialogTheme.setBackground(getContext(), view, false); - swOutlookThread.setVisibility(BuildConfig.DEBUG ? View.VISIBLE : View.GONE); tvSubjectThreading.setText(getString(R.string.title_advanced_subject_threading_hint, MessageHelper.MAX_SUBJECT_AGE)); diff --git a/app/src/main/java/eu/faircode/email/FragmentPop.java b/app/src/main/java/eu/faircode/email/FragmentPop.java index 8a78eac0d7..e3dc720b34 100644 --- a/app/src/main/java/eu/faircode/email/FragmentPop.java +++ b/app/src/main/java/eu/faircode/email/FragmentPop.java @@ -363,7 +363,6 @@ public class FragmentPop extends FragmentBase { // Initialize Helper.setViewsEnabled(view, false); - FragmentDialogTheme.setBackground(getContext(), view, false); if (!DnsHelper.hasDnsSec()) { Helper.hide(cbDnsSec); diff --git a/app/src/main/java/eu/faircode/email/FragmentRules.java b/app/src/main/java/eu/faircode/email/FragmentRules.java index f6bf2679fb..91ceec486a 100644 --- a/app/src/main/java/eu/faircode/email/FragmentRules.java +++ b/app/src/main/java/eu/faircode/email/FragmentRules.java @@ -233,8 +233,6 @@ public class FragmentRules extends FragmentBase { }); // Initialize - - FragmentDialogTheme.setBackground(getContext(), view, false); grpReady.setVisibility(View.GONE); pbWait.setVisibility(View.VISIBLE); diff --git a/app/src/main/java/eu/faircode/email/FragmentSetup.java b/app/src/main/java/eu/faircode/email/FragmentSetup.java index 4917f6e784..2eb5823ebd 100644 --- a/app/src/main/java/eu/faircode/email/FragmentSetup.java +++ b/app/src/main/java/eu/faircode/email/FragmentSetup.java @@ -865,8 +865,6 @@ public class FragmentSetup extends FragmentBase implements SharedPreferences.OnS }); // Initialize - FragmentDialogTheme.setBackground(getContext(), view, false); - tvNoInternet.setVisibility(View.GONE); btnIdentity.setEnabled(false); tvNoComposable.setVisibility(View.GONE);