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

Toolbar behavior fixes

Browse Source
pull/210/head
M66B 2 years ago
parent 6988d4c552
commit ec8a14485b
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File

27
app/src/main/java/eu/faircode/email/FragmentCompose.java
Unescape View File

@ -611,7 +611,7 @@ public class FragmentCompose extends FragmentBase {
}); });
etBody.setSelectionListener(new EditTextCompose.ISelection() { etBody.setSelectionListener(new EditTextCompose.ISelection() {
private boolean styling = false; private boolean hasSelection = false;
@Override @Override
public void onSelected(final boolean selection) { public void onSelected(final boolean selection) {
@ -621,16 +621,18 @@ public class FragmentCompose extends FragmentBase {
public void run() { public void run() {
if (!getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED)) if (!getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED))
return; return;
if (styling != selection) { if (hasSelection != selection) {
styling = selection; hasSelection = selection;
style_bar.setVisibility(style || styling ? View.VISIBLE : View.GONE); style_bar.setVisibility(style || hasSelection ? View.VISIBLE : View.GONE);
media_bar.setVisibility(!style && styling ? View.GONE : View.VISIBLE); media_bar.setVisibility(style || !etBody.hasSelection() ? View.VISIBLE : View.GONE);
invalidateOptionsMenu(); invalidateOptionsMenu();
} }
} }
}, 20); }, 20);
} else } else {
style_bar.setVisibility(selection ? View.VISIBLE : View.GONE); style_bar.setVisibility(selection ? View.VISIBLE : View.GONE);
media_bar.setVisibility(View.GONE);
}
} }
}); });
@ -2055,8 +2057,8 @@ public class FragmentCompose extends FragmentBase {
style = !style; style = !style;
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext()); SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
prefs.edit().putBoolean("compose_style", style).apply(); prefs.edit().putBoolean("compose_style", style).apply();
style_bar.setVisibility(style ? View.VISIBLE : View.GONE); style_bar.setVisibility(style || etBody.hasSelection() ? View.VISIBLE : View.GONE);
media_bar.setVisibility(media ? View.VISIBLE : View.GONE); media_bar.setVisibility(media && (style || !etBody.hasSelection()) ? View.VISIBLE : View.GONE);
invalidateOptionsMenu(); invalidateOptionsMenu();
} }
@ -2064,9 +2066,8 @@ public class FragmentCompose extends FragmentBase {
media = !media; media = !media;
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext()); SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
prefs.edit().putBoolean("compose_media", media).apply(); prefs.edit().putBoolean("compose_media", media).apply();
etBody.setSelection(etBody.getSelectionStart()); style_bar.setVisibility(style || etBody.hasSelection() ? View.VISIBLE : View.GONE);
style_bar.setVisibility(style ? View.VISIBLE : View.GONE); media_bar.setVisibility(media && (style || !etBody.hasSelection()) ? View.VISIBLE : View.GONE);
media_bar.setVisibility(media ? View.VISIBLE : View.GONE);
invalidateOptionsMenu(); invalidateOptionsMenu();
} }
@ -6753,8 +6754,8 @@ public class FragmentCompose extends FragmentBase {
@Override @Override
protected void onPostExecute(Bundle args) { protected void onPostExecute(Bundle args) {
pbWait.setVisibility(View.GONE); pbWait.setVisibility(View.GONE);
style_bar.setVisibility(style ? View.VISIBLE : View.GONE); style_bar.setVisibility(style || etBody.hasSelection() ? View.VISIBLE : View.GONE);
media_bar.setVisibility(media ? 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); bottom_navigation.getMenu().findItem(R.id.action_undo).setVisible(draft.revision > 1);
bottom_navigation.getMenu().findItem(R.id.action_redo).setVisible(draft.revision < draft.revisions); bottom_navigation.getMenu().findItem(R.id.action_redo).setVisible(draft.revision < draft.revisions);
bottom_navigation.setVisibility(View.VISIBLE); bottom_navigation.setVisibility(View.VISIBLE);

Write Preview
Loading…
Cancel
Save