fix(android): deprecation warning in TSpanView

software-mansion · Dec 9, 2019 · 6035d2d · 6035d2d
1 parent 80a747c
commit 6035d2d
Showing 1 changed file with 19 additions and 15 deletions.
diff --git a/android/src/main/java/com/horcrux/svg/TSpanView.java b/android/src/main/java/com/horcrux/svg/TSpanView.java
@@ -142,39 +142,43 @@ private void drawWrappedText(Canvas canvas, Paint paint) {
                 break;
         }
 
-        StaticLayout layout;
         boolean includeFontPadding = true;
         SpannableString text = new SpannableString(mContent);
         final double width = PropHelper.fromRelative(mInlineSize, canvas.getWidth(), 0, mScale, fontSize);
+        StaticLayout layout = getStaticLayout(tp, align, includeFontPadding, text, (int) width);
+
+        int lineAscent = layout.getLineAscent(0);
+
+        float dx = (float) gc.nextX(0);
+        float dy = (float) (gc.nextY() + lineAscent);
+        popGlyphContext();
+
+        canvas.save();
+        canvas.translate(dx, dy);
+        layout.draw(canvas);
+        canvas.restore();
+    }
+
+    @SuppressWarnings("deprecation")
+    private StaticLayout getStaticLayout(TextPaint tp, Layout.Alignment align, boolean includeFontPadding, SpannableString text, int width) {
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
-            layout = new StaticLayout(
+            return new StaticLayout(
                     text,
                     tp,
-                    (int)width,
+                    width,
                     align,
                     1.f,
                     0.f,
                     includeFontPadding);
         } else {
-            layout = StaticLayout.Builder.obtain(text, 0, text.length(), tp, (int)width)
+            return StaticLayout.Builder.obtain(text, 0, text.length(), tp, width)
                     .setAlignment(align)
                     .setLineSpacing(0.f, 1.f)
                     .setIncludePad(includeFontPadding)
                     .setBreakStrategy(Layout.BREAK_STRATEGY_HIGH_QUALITY)
                     .setHyphenationFrequency(Layout.HYPHENATION_FREQUENCY_NORMAL)
                     .build();
         }
-
-        int lineAscent = layout.getLineAscent(0);
-
-        float dx = (float) gc.nextX(0);
-        float dy = (float) (gc.nextY() + lineAscent);
-        popGlyphContext();
-
-        canvas.save();
-        canvas.translate(dx, dy);
-        layout.draw(canvas);
-        canvas.restore();
     }