From c487c24b9f7c6263b081389f99c824b2243d1be5 Mon Sep 17 00:00:00 2001 From: M66B Date: Mon, 19 Dec 2022 11:06:47 +0100 Subject: [PATCH] Hide link button when both style and media bar showing --- app/src/main/java/eu/faircode/email/FragmentCompose.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java index 3231d72184..d4c22d3311 100644 --- a/app/src/main/java/eu/faircode/email/FragmentCompose.java +++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java @@ -625,6 +625,7 @@ public class FragmentCompose extends FragmentBase { return; if (hasSelection != selection) { hasSelection = selection; + ibLink.setVisibility(style /* && media */ ? View.GONE : View.VISIBLE); style_bar.setVisibility(style || hasSelection ? View.VISIBLE : View.GONE); media_bar.setVisibility(style || !etBody.hasSelection() ? View.VISIBLE : View.GONE); invalidateOptionsMenu(); @@ -632,6 +633,7 @@ public class FragmentCompose extends FragmentBase { } }, 20); } else { + ibLink.setVisibility(View.VISIBLE); // no media style_bar.setVisibility(style || selection ? View.VISIBLE : View.GONE); media_bar.setVisibility(View.GONE); } @@ -2065,6 +2067,7 @@ public class FragmentCompose extends FragmentBase { style = !style; SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext()); prefs.edit().putBoolean("compose_style", style).apply(); + ibLink.setVisibility(style && media ? View.GONE : View.VISIBLE); style_bar.setVisibility(style || etBody.hasSelection() ? View.VISIBLE : View.GONE); media_bar.setVisibility(media && (style || !etBody.hasSelection()) ? View.VISIBLE : View.GONE); invalidateOptionsMenu(); @@ -2074,6 +2077,7 @@ public class FragmentCompose extends FragmentBase { media = !media; SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext()); prefs.edit().putBoolean("compose_media", media).apply(); + ibLink.setVisibility(style && media ? View.GONE : View.VISIBLE); style_bar.setVisibility(style || etBody.hasSelection() ? View.VISIBLE : View.GONE); media_bar.setVisibility(media && (style || !etBody.hasSelection()) ? View.VISIBLE : View.GONE); invalidateOptionsMenu(); @@ -6761,6 +6765,7 @@ public class FragmentCompose extends FragmentBase { @Override protected void onPostExecute(Bundle args) { pbWait.setVisibility(View.GONE); + ibLink.setVisibility(style && media ? View.GONE : View.VISIBLE); style_bar.setVisibility(style || etBody.hasSelection() ? View.VISIBLE : View.GONE); media_bar.setVisibility(media && (style || !etBody.hasSelection()) ? View.VISIBLE : View.GONE); bottom_navigation.getMenu().findItem(R.id.action_undo).setVisible(draft.revision > 1);