From b5d41b0ab2f09c4a3f8389e1615b468b70f87cca Mon Sep 17 00:00:00 2001
From: Sergio <sergio.paredes25@gmail.com>
Date: Fri, 27 Dec 2019 01:56:40 +0100
Subject: [PATCH] #308 Display barcode format on display loyalty card view

---
 .../card_locker/LoyaltyCardViewActivity.java  |  7 ++++
 .../res/layout/loyalty_card_view_layout.xml   | 34 ++++++++++++++++++-
 app/src/main/res/values/strings.xml           |  1 +
 3 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java b/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java
index f91014d68..28b4057a5 100644
--- a/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java
+++ b/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java
@@ -42,6 +42,8 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
     TextView cardIdFieldView;
     TextView noteView;
     View noteViewDivider;
+    TextView barcodeFormatView;
+    View barcodeFormatViewDivider;
     TextView storeName;
     ImageView barcodeImage;
     View collapsingToolbarLayout;
@@ -107,6 +109,8 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
         cardIdFieldView = findViewById(R.id.cardIdView);
         noteView = findViewById(R.id.noteView);
         noteViewDivider = findViewById(R.id.noteViewDivider);
+        barcodeFormatView = findViewById(R.id.barcodeFormatView);
+        barcodeFormatViewDivider = findViewById(R.id.barcodeFormatViewDivider);
         storeName = findViewById(R.id.storeName);
         barcodeImage = findViewById(R.id.barcode);
         collapsingToolbarLayout = findViewById(R.id.collapsingToolbarLayout);
@@ -269,10 +273,13 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
                 Log.d(TAG, "ImageView size known known, creating barcode");
                 new BarcodeImageWriterTask(barcodeImage, cardIdString, format).execute();
             }
+            barcodeFormatView.setText(getString(R.string.barcodeTypePlaceholder, format));
         }
         else
         {
             findViewById(R.id.barcode).setVisibility(View.GONE);
+            barcodeFormatView.setVisibility(View.GONE);
+            barcodeFormatViewDivider.setVisibility(View.GONE);
         }
     }
 
diff --git a/app/src/main/res/layout/loyalty_card_view_layout.xml b/app/src/main/res/layout/loyalty_card_view_layout.xml
index e224353cf..ebb300cab 100644
--- a/app/src/main/res/layout/loyalty_card_view_layout.xml
+++ b/app/src/main/res/layout/loyalty_card_view_layout.xml
@@ -27,6 +27,13 @@
                 android:orientation="horizontal"
                 app:layout_constraintGuide_percent="0.5"/>
 
+            <androidx.constraintlayout.widget.Guideline
+                android:id="@+id/footerGuideline"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                app:layout_constraintGuide_percent="0.9"/>
+
             <ImageView
                 android:id="@+id/barcode"
                 android:layout_width="0dp"
@@ -78,7 +85,7 @@
                 app:layout_constraintTop_toBottomOf="@id/noteViewDivider"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintBottom_toTopOf="@id/footerGuideline"
                 app:layout_constraintLeft_toLeftOf="parent"
                 app:layout_constraintRight_toRightOf="parent"
                 app:autoSizeTextType="uniform"
@@ -87,6 +94,31 @@
                 android:textIsSelectable="true"
                 android:scrollbars="vertical"/>
 
+            <View
+                android:id="@+id/barcodeFormatViewDivider"
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:background="@android:color/black"
+                app:layout_constraintTop_toBottomOf="@id/footerGuideline"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintBottom_toBottomOf="@+id/barcodeFormatView"
+                />
+
+
+            <TextView
+                android:id="@id/barcodeFormatView"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_margin="10.0dip"
+                android:layout_gravity="bottom"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintRight_toRightOf="parent"
+                />
+
         </androidx.constraintlayout.widget.ConstraintLayout>
 
         <View
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7453d86e9..f23f690eb 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -12,6 +12,7 @@
     <string name="note">Note</string>
     <string name="cardId">Card ID</string>
     <string name="barcodeType">Barcode Type</string>
+    <string name="barcodeTypePlaceholder">Barcode Type: %1$s</string>
     <string name="barcodeNoBarcode">This card has no barcode</string>
 
     <string name="cancel">Cancel</string>