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

Simplify text direction

This commit is contained in:
M66B 2021-04-29 17:26:02 +02:00
parent c16da8ca17
commit 4a216a719a
2 changed files with 2 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
app/src/main/java/eu/faircode/email/Helper.java
View File

@ -957,31 +957,6 @@ public class Helper {
}
// https://issuetracker.google.com/issues/37054851
static boolean isRtl(String text) {
if (TextUtils.isEmpty(text))
return false;
int rtl = 0;
int ltr = 0;
for (int i = 0; i < text.length(); i++)
switch (Character.getDirectionality(text.charAt(i))) {
case java.lang.Character.DIRECTIONALITY_RIGHT_TO_LEFT:
case java.lang.Character.DIRECTIONALITY_RIGHT_TO_LEFT_ARABIC:
case java.lang.Character.DIRECTIONALITY_RIGHT_TO_LEFT_EMBEDDING:
case java.lang.Character.DIRECTIONALITY_RIGHT_TO_LEFT_OVERRIDE:
rtl++;
break;
case java.lang.Character.DIRECTIONALITY_LEFT_TO_RIGHT:
case java.lang.Character.DIRECTIONALITY_LEFT_TO_RIGHT_EMBEDDING:
case java.lang.Character.DIRECTIONALITY_LEFT_TO_RIGHT_OVERRIDE:
ltr++;
break;
}
return (rtl > ltr);
}
static DateFormat getTimeInstance(Context context) {
return getTimeInstance(context, SimpleDateFormat.MEDIUM);
}

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

@ -36,6 +36,7 @@ import android.text.Layout;
import android.text.Spannable;
import android.text.SpannableStringBuilder;
import android.text.Spanned;
import android.text.TextDirectionHeuristics;
import android.text.TextPaint;
import android.text.TextUtils;
import android.text.style.AlignmentSpan;
@ -2260,7 +2261,7 @@ public class HtmlHelper {
case "text-align":
// https://developer.mozilla.org/en-US/docs/Web/CSS/text-align
Layout.Alignment alignment = null;
boolean rtl = Helper.isRtl(ssb.subSequence(start, ssb.length()).toString());
boolean rtl = TextDirectionHeuristics.FIRSTSTRONG_LTR.isRtl(ssb, start, ssb.length() - start);
switch (value) {
case "left":
case "start":