mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Use dimensions for bullets

This commit is contained in:
M66B 2021-05-07 14:09:16 +02:00
parent 67d72b73ea
commit ae296b489b
3 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/eu/faircode/email/HtmlHelper.java
View File

@ -2037,7 +2037,9 @@ public class HtmlHelper {
final int colorSeparator = Helper.resolveColor(context, R.attr.colorSeparator); final int colorSeparator = Helper.resolveColor(context, R.attr.colorSeparator);
final int dp3 = Helper.dp2pixels(context, 3); final int dp3 = Helper.dp2pixels(context, 3);
final int dp6 = Helper.dp2pixels(context, 6); final int dp6 = Helper.dp2pixels(context, 6);
final int dp24 = Helper.dp2pixels(context, 24); int bulletGap = context.getResources().getDimensionPixelSize(R.dimen.bullet_gap_size);
int bulletRadius = context.getResources().getDimensionPixelSize(R.dimen.bullet_radius_size);
int bulletIndent = context.getResources().getDimensionPixelSize(R.dimen.bullet_indent_size);
int message_zoom = prefs.getInt("message_zoom", 100); int message_zoom = prefs.getInt("message_zoom", 100);
float textSize = Helper.getTextSize(context, 0) * message_zoom / 100f; float textSize = Helper.getTextSize(context, 0) * message_zoom / 100f;
@ -2396,9 +2398,9 @@ public class HtmlHelper {
if (type == null || "ul".equals(type.tagName())) { if (type == null || "ul".equals(type.tagName())) {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P)
setSpan(ssb, new BulletSpanEx(dp24, dp6, colorAccent, level), start, ssb.length()); setSpan(ssb, new BulletSpanEx(bulletIndent, bulletGap, colorAccent, level), start, ssb.length());
else else
setSpan(ssb, new BulletSpanEx(dp24, dp6, colorAccent, dp3, level), start, ssb.length()); setSpan(ssb, new BulletSpanEx(bulletIndent, bulletGap, colorAccent, bulletRadius, level), start, ssb.length());
} else { } else {
// https://developer.mozilla.org/en-US/docs/Web/HTML/Element/ol // https://developer.mozilla.org/en-US/docs/Web/HTML/Element/ol
int index = 0; int index = 0;
@ -2414,7 +2416,7 @@ public class HtmlHelper {
} }
} }
setSpan(ssb, new NumberSpan(dp24, dp6, colorAccent, textSize, level, index), start, ssb.length()); setSpan(ssb, new NumberSpan(bulletIndent, bulletGap, colorAccent, textSize, level, index), start, ssb.length());
} }
break; break;

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

@ -290,9 +290,9 @@ public class StyleHelper {
Context context = etBody.getContext(); Context context = etBody.getContext();
int colorAccent = Helper.resolveColor(context, R.attr.colorAccent); int colorAccent = Helper.resolveColor(context, R.attr.colorAccent);
int dp3 = Helper.dp2pixels(context, 3); int bulletGap = context.getResources().getDimensionPixelSize(R.dimen.bullet_gap_size);
int dp6 = Helper.dp2pixels(context, 6); int bulletRadius = context.getResources().getDimensionPixelSize(R.dimen.bullet_radius_size);
int dp24 = Helper.dp2pixels(context, 24); int bulletIndent = context.getResources().getDimensionPixelSize(R.dimen.bullet_indent_size);
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
int message_zoom = prefs.getInt("message_zoom", 100); int message_zoom = prefs.getInt("message_zoom", 100);
@ -315,11 +315,11 @@ public class StyleHelper {
Log.i("Insert " + i + "..." + (j + 1) + " size=" + e); Log.i("Insert " + i + "..." + (j + 1) + " size=" + e);
if (item.getItemId() == R.id.menu_style_list_bullets) if (item.getItemId() == R.id.menu_style_list_bullets)
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P)
edit.setSpan(new BulletSpanEx(dp24, dp6, colorAccent, 0), i, j + 1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE | Spanned.SPAN_PARAGRAPH); edit.setSpan(new BulletSpanEx(bulletIndent, bulletGap, colorAccent, 0), i, j + 1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE | Spanned.SPAN_PARAGRAPH);
else else
edit.setSpan(new BulletSpanEx(dp24, dp6, colorAccent, dp3, 0), i, j + 1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE | Spanned.SPAN_PARAGRAPH); edit.setSpan(new BulletSpanEx(bulletIndent, bulletGap, colorAccent, bulletRadius, 0), i, j + 1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE | Spanned.SPAN_PARAGRAPH);
else else
edit.setSpan(new NumberSpan(dp24, dp6, colorAccent, textSize, 0, index++), i, j + 1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE | Spanned.SPAN_PARAGRAPH); edit.setSpan(new NumberSpan(bulletIndent, bulletGap, colorAccent, textSize, 0, index++), i, j + 1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE | Spanned.SPAN_PARAGRAPH);
i = j + 1; i = j + 1;
} }
@ -525,27 +525,27 @@ public class StyleHelper {
return (T) new QuoteSpan(q.getColor(), q.getStripeWidth(), q.getGapWidth()); return (T) new QuoteSpan(q.getColor(), q.getStripeWidth(), q.getGapWidth());
} else if (NumberSpan.class.isAssignableFrom(type)) { } else if (NumberSpan.class.isAssignableFrom(type)) {
NumberSpan n = (NumberSpan) span; NumberSpan n = (NumberSpan) span;
int dp6 = Helper.dp2pixels(context, 6); int bulletGap = context.getResources().getDimensionPixelSize(R.dimen.bullet_gap_size);
int dp24 = Helper.dp2pixels(context, 24); int bulletIndent = context.getResources().getDimensionPixelSize(R.dimen.bullet_indent_size);
int colorAccent = Helper.resolveColor(context, R.attr.colorAccent); int colorAccent = Helper.resolveColor(context, R.attr.colorAccent);
return (T) new NumberSpan(dp24, dp6, colorAccent, n.getTextSize(), n.getLevel(), n.getIndex() + 1); return (T) new NumberSpan(bulletIndent, bulletGap, colorAccent, n.getTextSize(), n.getLevel(), n.getIndex() + 1);
} else if (BulletSpanEx.class.isAssignableFrom(type)) { } else if (BulletSpanEx.class.isAssignableFrom(type)) {
BulletSpanEx b = (BulletSpanEx) span; BulletSpanEx b = (BulletSpanEx) span;
int dp24 = Helper.dp2pixels(context, 24); int bulletIndent = context.getResources().getDimensionPixelSize(R.dimen.bullet_indent_size);
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) { if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) {
int dp6 = Helper.dp2pixels(context, 6);
int colorAccent = Helper.resolveColor(context, R.attr.colorAccent); int colorAccent = Helper.resolveColor(context, R.attr.colorAccent);
return (T) new BulletSpanEx(dp24, dp6, colorAccent, b.getLevel()); int bulletGap = context.getResources().getDimensionPixelSize(R.dimen.bullet_gap_size);
return (T) new BulletSpanEx(bulletIndent, bulletGap, colorAccent, b.getLevel());
} else } else
return (T) new BulletSpanEx(dp24, b.getGapWidth(), b.getColor(), b.getBulletRadius(), b.getLevel()); return (T) new BulletSpanEx(bulletIndent, b.getGapWidth(), b.getColor(), b.getBulletRadius(), b.getLevel());
} else } else
throw new IllegalArgumentException(type.getName()); throw new IllegalArgumentException(type.getName());
} }
static void renumber(Editable text, boolean clean, Context context) { static void renumber(Editable text, boolean clean, Context context) {
int dp6 = Helper.dp2pixels(context, 6); int bulletGap = context.getResources().getDimensionPixelSize(R.dimen.bullet_gap_size);
int dp24 = Helper.dp2pixels(context, 24); int bulletIndent = context.getResources().getDimensionPixelSize(R.dimen.bullet_indent_size);
int colorAccent = Helper.resolveColor(context, R.attr.colorAccent); int colorAccent = Helper.resolveColor(context, R.attr.colorAccent);
Log.i("Renumber clean=" + clean + " text=" + text); Log.i("Renumber clean=" + clean + " text=" + text);
@ -595,7 +595,7 @@ public class StyleHelper {
if (index != ns.getIndex()) { if (index != ns.getIndex()) {
text.removeSpan(span); text.removeSpan(span);
// Text size needs measuring // Text size needs measuring
NumberSpan clone = new NumberSpan(dp24, dp6, colorAccent, ns.getTextSize(), level, index); NumberSpan clone = new NumberSpan(bulletIndent, bulletGap, colorAccent, ns.getTextSize(), level, index);
text.setSpan(clone, start, end, flags); text.setSpan(clone, start, end, flags);
} }

3
app/src/main/res/values/dimen.xml
View File

@ -5,4 +5,7 @@
<dimen name="design_bottom_navigation_active_text_size" tools:override="true">12sp</dimen> <dimen name="design_bottom_navigation_active_text_size" tools:override="true">12sp</dimen>
<dimen name="fastscroll_default_thickness" tools:override="true">6dp</dimen> <dimen name="fastscroll_default_thickness" tools:override="true">6dp</dimen>
<dimen name="menu_item_icon_size">24dp</dimen> <dimen name="menu_item_icon_size">24dp</dimen>
<dimen name="bullet_gap_size">6dp</dimen>
<dimen name="bullet_radius_size">3dp</dimen>
<dimen name="bullet_indent_size">24dp</dimen>
</resources> </resources>