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

Small improvements

Browse Source
pull/210/head
M66B 2 years ago
parent 233eef9ce2
commit 3889d99903
1 changed files with 35 additions and 34 deletions
Show Stats Download Patch File Download Diff File

69
app/src/main/java/eu/faircode/email/StyleHelper.java
Unescape View File

@ -402,7 +402,7 @@ public class StyleHelper {
return false; return false;
return StyleHelper.setBlockQuote(etBody, block.first, block.second, false); return StyleHelper.setBlockQuote(etBody, block.first, block.second, false);
} else } else
return setBlockQuote(etBody, start, end, true); return setBlockQuote(etBody, start, end, false);
} else if (itemId == R.id.menu_style_mark) } else if (itemId == R.id.menu_style_mark)
return setMark(etBody, start, end, false); return setMark(etBody, start, end, false);
else if (itemId == R.id.menu_style_subscript) else if (itemId == R.id.menu_style_subscript)
@ -415,8 +415,8 @@ public class StyleHelper {
return setPassword(owner, etBody, start, end); return setPassword(owner, etBody, start, end);
else if (itemId == R.id.menu_style_code) { else if (itemId == R.id.menu_style_code) {
Log.breadcrumb("style", "action", "code"); Log.breadcrumb("style", "action", "code");
setSize(etBody, start, end, HtmlHelper.FONT_SMALL); setSize(etBody, start, end, HtmlHelper.FONT_SMALL, false);
setFont(etBody, start, end, "monospace"); setFont(etBody, start, end, "monospace", false);
return true; return true;
} else if (itemId == R.id.menu_link) } else if (itemId == R.id.menu_link)
return setLink(etBody, start, end, args); return setLink(etBody, start, end, args);
@ -439,12 +439,12 @@ public class StyleHelper {
else else
size = null; size = null;
return setSize(etBody, start, end, size); return setSize(etBody, start, end, size, false);
} }
case group_style_font_standard: case group_style_font_standard:
case group_style_font_custom: case group_style_font_custom:
return setFont(etBody, start, end, (String) args[0]); return setFont(etBody, start, end, (String) args[0], false);
case group_style_align: { case group_style_align: {
if (start == end) { if (start == end) {
@ -453,7 +453,7 @@ public class StyleHelper {
return false; return false;
return setAlignment(itemId, etBody, block.first, block.second, false); return setAlignment(itemId, etBody, block.first, block.second, false);
} else } else
return setAlignment(itemId, etBody, start, end, true); return setAlignment(itemId, etBody, start, end, false);
} }
case group_style_list: { case group_style_list: {
@ -468,9 +468,9 @@ public class StyleHelper {
return StyleHelper.setList(itemId, etBody, p.first, p.second, false); return StyleHelper.setList(itemId, etBody, p.first, p.second, false);
} else { } else {
if (level) if (level)
return setListLevel(itemId, etBody, start, end, true); return setListLevel(itemId, etBody, start, end, false);
else else
return setList(itemId, etBody, start, end, true); return setList(itemId, etBody, start, end, false);
} }
} }
@ -481,7 +481,7 @@ public class StyleHelper {
return false; return false;
return StyleHelper.setIndentation(itemId, etBody, block.first, block.second, false); return StyleHelper.setIndentation(itemId, etBody, block.first, block.second, false);
} else } else
return setIndentation(itemId, etBody, start, end, true); return setIndentation(itemId, etBody, start, end, false);
} }
} }
} }
@ -530,6 +530,8 @@ public class StyleHelper {
int s = edit.getSpanStart(span); int s = edit.getSpanStart(span);
int e = edit.getSpanEnd(span); int e = edit.getSpanEnd(span);
int f = edit.getSpanFlags(span); int f = edit.getSpanFlags(span);
if ((f & Spanned.SPAN_COMPOSING) != 0)
continue;
edit.removeSpan(span); edit.removeSpan(span);
if (splitSpan(edit, start, end, s, e, f, true, if (splitSpan(edit, start, end, s, e, f, true,
new UnderlineSpan(), new UnderlineSpan())) new UnderlineSpan(), new UnderlineSpan()))
@ -583,7 +585,7 @@ public class StyleHelper {
return true; return true;
} }
static boolean setSize(EditText etBody, int start, int end, Float size) { static boolean setSize(EditText etBody, int start, int end, Float size, boolean select) {
Log.breadcrumb("style", "action", "size"); Log.breadcrumb("style", "action", "size");
Editable edit = etBody.getText(); Editable edit = etBody.getText();
@ -602,7 +604,7 @@ public class StyleHelper {
edit.setSpan(new RelativeSizeSpan(size), start, end, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); edit.setSpan(new RelativeSizeSpan(size), start, end, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
etBody.setText(edit); etBody.setText(edit);
etBody.setSelection(start, end); etBody.setSelection(select ? start : end, end);
return true; return true;
} }
@ -626,13 +628,13 @@ public class StyleHelper {
.setPositiveButton(android.R.string.ok, new ColorPickerClickListener() { .setPositiveButton(android.R.string.ok, new ColorPickerClickListener() {
@Override @Override
public void onClick(DialogInterface dialog, int selectedColor, Integer[] allColors) { public void onClick(DialogInterface dialog, int selectedColor, Integer[] allColors) {
setBackground(etBody, start, end, selectedColor); setBackground(etBody, start, end, selectedColor, false);
} }
}) })
.setNegativeButton(R.string.title_reset, new DialogInterface.OnClickListener() { .setNegativeButton(R.string.title_reset, new DialogInterface.OnClickListener() {
@Override @Override
public void onClick(DialogInterface dialog, int which) { public void onClick(DialogInterface dialog, int which) {
setBackground(etBody, start, end, null); setBackground(etBody, start, end, null, false);
} }
}); });
@ -645,7 +647,7 @@ public class StyleHelper {
return true; return true;
} }
static void setBackground(EditText etBody, int start, int end, Integer color) { static void setBackground(EditText etBody, int start, int end, Integer color, boolean select) {
Log.breadcrumb("style", "action", "background"); Log.breadcrumb("style", "action", "background");
Editable edit = etBody.getText(); Editable edit = etBody.getText();
@ -664,7 +666,7 @@ public class StyleHelper {
edit.setSpan(new BackgroundColorSpan(color), start, end, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); edit.setSpan(new BackgroundColorSpan(color), start, end, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
etBody.setText(edit); etBody.setText(edit);
etBody.setSelection(start, end); etBody.setSelection(select ? start : end, end);
} }
static boolean selectColor(EditText etBody, int start, int end) { static boolean selectColor(EditText etBody, int start, int end) {
@ -686,13 +688,13 @@ public class StyleHelper {
.setPositiveButton(android.R.string.ok, new ColorPickerClickListener() { .setPositiveButton(android.R.string.ok, new ColorPickerClickListener() {
@Override @Override
public void onClick(DialogInterface dialog, int selectedColor, Integer[] allColors) { public void onClick(DialogInterface dialog, int selectedColor, Integer[] allColors) {
setColor(etBody, start, end, selectedColor); setColor(etBody, start, end, selectedColor, false);
} }
}) })
.setNegativeButton(R.string.title_reset, new DialogInterface.OnClickListener() { .setNegativeButton(R.string.title_reset, new DialogInterface.OnClickListener() {
@Override @Override
public void onClick(DialogInterface dialog, int which) { public void onClick(DialogInterface dialog, int which) {
setColor(etBody, start, end, null); setColor(etBody, start, end, null, false);
} }
}); });
@ -705,7 +707,7 @@ public class StyleHelper {
return true; return true;
} }
static void setColor(EditText etBody, int start, int end, Integer color) { static void setColor(EditText etBody, int start, int end, Integer color, boolean select) {
Log.breadcrumb("style", "action", "color"); Log.breadcrumb("style", "action", "color");
Editable edit = etBody.getText(); Editable edit = etBody.getText();
@ -724,7 +726,7 @@ public class StyleHelper {
edit.setSpan(new ForegroundColorSpan(color), start, end, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); edit.setSpan(new ForegroundColorSpan(color), start, end, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
etBody.setText(edit); etBody.setText(edit);
etBody.setSelection(start, end); etBody.setSelection(select ? start : end, end);
} }
static boolean selectFont(LifecycleOwner owner, View anchor, EditText etBody, int start, int end) { static boolean selectFont(LifecycleOwner owner, View anchor, EditText etBody, int start, int end) {
@ -747,7 +749,7 @@ public class StyleHelper {
popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() { popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
@Override @Override
public boolean onMenuItemClick(MenuItem item) { public boolean onMenuItemClick(MenuItem item) {
return setFont(etBody, start, end, item.getIntent().getStringExtra("face")); return setFont(etBody, start, end, item.getIntent().getStringExtra("face"), false);
} }
}); });
@ -756,7 +758,7 @@ public class StyleHelper {
return true; return true;
} }
static boolean setFont(EditText etBody, int start, int end, String face) { static boolean setFont(EditText etBody, int start, int end, String face, boolean select) {
Log.breadcrumb("style", "action", "font"); Log.breadcrumb("style", "action", "font");
Context context = etBody.getContext(); Context context = etBody.getContext();
@ -777,7 +779,7 @@ public class StyleHelper {
edit.setSpan(getTypefaceSpan(face, context), start, end, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); edit.setSpan(getTypefaceSpan(face, context), start, end, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
etBody.setText(edit); etBody.setText(edit);
etBody.setSelection(start, end); etBody.setSelection(select ? start : end, end);
return true; return true;
} }
@ -1063,19 +1065,18 @@ public class StyleHelper {
for (QuoteSpan quote : quotes) for (QuoteSpan quote : quotes)
edit.removeSpan(quote); edit.removeSpan(quote);
if (quotes.length == 1) if (quotes.length == 0) {
return true; IndentSpan[] indents = edit.getSpans(start, end, IndentSpan.class);
for (IndentSpan indent : indents)
IndentSpan[] indents = edit.getSpans(start, end, IndentSpan.class); edit.removeSpan(indent);
for (IndentSpan indent : indents)
edit.removeSpan(indent);
QuoteSpan q; QuoteSpan q;
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P)
q = new QuoteSpan(colorBlockquote); q = new QuoteSpan(colorBlockquote);
else else
q = new QuoteSpan(colorBlockquote, quoteStripe, quoteGap); q = new QuoteSpan(colorBlockquote, quoteStripe, quoteGap);
edit.setSpan(q, paragraph.first, paragraph.second, Spanned.SPAN_INCLUSIVE_EXCLUSIVE); edit.setSpan(q, paragraph.first, paragraph.second, Spanned.SPAN_INCLUSIVE_EXCLUSIVE);
}
etBody.setText(edit); etBody.setText(edit);
etBody.setSelection(select ? paragraph.first : paragraph.second, paragraph.second); etBody.setSelection(select ? paragraph.first : paragraph.second, paragraph.second);

Write Preview
Loading…
Cancel
Save