empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fix image editor outlining on Android 12+.

Browse source
This commit is contained in:
Alex Hart 2022-04-15 10:52:34 -03:00 • committed by Greyson Parrelli
parent 2f97b80b9c
commit bfaaf20fd9
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
image-editor/lib/src/main/java/org/signal/imageeditor/core/renderers/MultiLineTextRenderer.java
View file

@ -4,8 +4,10 @@ import android.animation.ValueAnimator;
import android.graphics.Color;
import android.graphics.Matrix;
import android.graphics.Paint;
import android.graphics.Path;
import android.graphics.Rect;
import android.graphics.RectF;
import android.os.Build;
import android.os.Parcel;
import android.view.animation.Interpolator;
@ -181,6 +183,7 @@ public final class MultiLineTextRenderer extends InvalidateableRenderer implemen
private final RectF textBounds = new RectF();
private final RectF hitBounds = new RectF();
private final RectF modeBounds = new RectF();
private final Path outlinerPath = new Path();
private String text;
private int selStart;
@ -359,7 +362,15 @@ public final class MultiLineTextRenderer extends InvalidateableRenderer implemen
if (mode == Mode.OUTLINE) {
int modeAlpha = modePaint.getAlpha();
modePaint.setAlpha(rendererContext.getAlpha(alpha));
rendererContext.canvas.drawText(text, 0, 0, modePaint);
if (Build.VERSION.SDK_INT >= 31) {
outlinerPath.reset();
modePaint.getTextPath(text, 0, text.length(), 0, 0, outlinerPath);
outlinerPath.op(outlinerPath, Path.Op.INTERSECT);
rendererContext.canvas.drawPath(outlinerPath, modePaint);
} else {
rendererContext.canvas.drawText(text, 0, 0, modePaint);
}
modePaint.setAlpha(modeAlpha);
}