From addb9a85749073a1340f529e5f6eefbf3c85ec7c Mon Sep 17 00:00:00 2001
From: Kanguk Lee <kanguk1234@gmail.com>
Date: Tue, 9 Jan 2018 10:24:44 +0900
Subject: [PATCH] Change the way you draw guide text.

It is easier to modify the attributes of the guide text.

Using StaticLayout, you can use the guiding text for the width you want.

You can handle escape sequences (such as \ n or \ t) without any coding.
---
 .../java/io/card/payment/OverlayView.java     | 35 +++++++++++--------
 1 file changed, 21 insertions(+), 14 deletions(-)

diff --git a/card.io/src/main/java/io/card/payment/OverlayView.java b/card.io/src/main/java/io/card/payment/OverlayView.java
index 59dc1e7b..9b6b5d9a 100644
--- a/card.io/src/main/java/io/card/payment/OverlayView.java
+++ b/card.io/src/main/java/io/card/payment/OverlayView.java
@@ -104,6 +104,7 @@ class OverlayView extends View {
     private GradientDrawable mGradientDrawable;
     private final Paint mGuidePaint;
     private final Paint mLockedBackgroundPaint;
+    private final TextPaint mGuideTextPaint;
     private Path mLockedBackgroundPath;
     private Rect mCameraPreviewRect;
     private final Torch mTorch;
@@ -133,6 +134,11 @@ public OverlayView(CardIOActivity captureActivity, AttributeSet attributeSet, bo
         mLockedBackgroundPaint.clearShadowLayer();
         mLockedBackgroundPaint.setStyle(Paint.Style.FILL);
         mLockedBackgroundPaint.setColor(0xbb000000); // 75% black
+        
+        // Set up paint attributes
+        mGuideTextPaint = new TextPaint();
+        Util.setupTextPaintStyle(mGuideTextPaint);
+        mGuideTextPaint.setTextAlign(Align.CENTER);
 
         scanInstructions = LocalizedStrings.getString(StringKey.SCAN_GUIDE);
     }
@@ -338,26 +344,27 @@ public void onDraw(Canvas canvas) {
 
             if (mDInfo.numVisibleEdges() < 3) {
                 // Draw guide text
-                // Set up paint attributes
-                float guideHeight = GUIDE_LINE_HEIGHT * mScale;
                 float guideFontSize = GUIDE_FONT_SIZE * mScale;
 
-                Util.setupTextPaintStyle(mGuidePaint);
-                mGuidePaint.setTextAlign(Align.CENTER);
-                mGuidePaint.setTextSize(guideFontSize);
-
-                // Translate and rotate text
-                canvas.translate(mGuide.left + mGuide.width() / 2, mGuide.top + mGuide.height() / 2);
-                canvas.rotate(mRotationFlip * mRotation);
+                mGuideTextPaint.setTextSize(guideFontSize);
 
+                int textWidth = mRotationFlip == 1 ? mGuide.width() : mGuide.height();
                 if (scanInstructions != null && scanInstructions != "") {
-                    String[] lines = scanInstructions.split("\n");
-                    float y = -(((guideHeight * (lines.length - 1)) - guideFontSize) / 2) - 3;
+                    StaticLayout sl = new StaticLayout(scanInstructions, mGuideTextPaint, textWidth, Layout.Alignment.ALIGN_NORMAL, 1, 0, false);
+
+                    int dx = mGuide.left + (mGuide.width() / 2);
+                    int dy = mGuide.top + (mGuide.height() / 2);
 
-                    for (int i = 0; i < lines.length; i++) {
-                        canvas.drawText(lines[i], 0, y, mGuidePaint);
-                        y += guideHeight;
+                    int moveToCenter = mRotation / 90 > 1 ? 1 : -1;
+
+                    if (mRotationFlip == 1) {
+                        canvas.translate(dx, dy + (sl.getHeight() / 2) * moveToCenter);
+                    }else {
+                        canvas.translate(dx + (sl.getHeight() / 2) * moveToCenter, dy);
                     }
+
+                    canvas.rotate(mRotationFlip * mRotation);
+                    sl.draw(canvas);
                 }
             }
         }