From 4027df2119d78e80581b133e54ecc81c3951ceed Mon Sep 17 00:00:00 2001
From: Katharine <kwchuiaa@connect.ust.hk>
Date: Wed, 27 Oct 2021 09:37:06 +0800
Subject: [PATCH] refactor centerGuideLine resizing logic -sylvia

---
 .../card_locker/LoyaltyCardViewActivity.java  | 22 +++++++++++++------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java b/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java
index 1249dfc63..95e4104a3 100644
--- a/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java
+++ b/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java
@@ -212,6 +212,17 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
         return wrappedIcon;
     }
 
+    private void setCenterGuideline(int zoomLevel) {
+        float scale = zoomLevel / 100f;
+
+        if (format != null && format.isSquare()) {
+            centerGuideline.setGuidelinePercent(0.75f * scale);
+        } else {
+            centerGuideline.setGuidelinePercent(0.5f * scale);
+        }
+
+    }
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -259,15 +270,11 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
                 float scale = (float) progress / (float) barcodeScaler.getMax();
                 Log.d(TAG, "Scaling to " + scale);
 
-                if(isFullscreen){
+                if (isFullscreen){
                     loyaltyCard.zoomLevel = progress;
                     db.updateLoyaltyCardZoomLevel(loyaltyCardId, loyaltyCard.zoomLevel);
-                }
 
-                if (format != null && format.isSquare()) {
-                    centerGuideline.setGuidelinePercent(0.75f * scale);
-                } else {
-                    centerGuideline.setGuidelinePercent(0.5f * scale);
+                    setCenterGuideline(loyaltyCard.zoomLevel);
                 }
 
                 drawMainImage(mainImageIndex, true);
@@ -795,6 +802,7 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
             drawMainImage(mainImageIndex, true);
 
             barcodeScaler.setProgress(loyaltyCard.zoomLevel);
+            setCenterGuideline(loyaltyCard.zoomLevel);
 
             // Hide maximize and show minimize button and scaler
             maximizeButton.setVisibility(View.GONE);
@@ -831,7 +839,7 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
             Log.d(TAG, "Move out of fullscreen");
 
             // Reset center guideline
-            barcodeScaler.setProgress(100);
+            setCenterGuideline(100);
 
             drawMainImage(mainImageIndex, true);