From 649daf43dfb43679614088f7d958b0e51630a1ee Mon Sep 17 00:00:00 2001
From: Sergio <sergio.paredes25@gmail.com>
Date: Mon, 6 Jan 2020 21:30:10 +0100
Subject: [PATCH] Revert "#308 Display barcode format on display loyalty card
 view"

This reverts commit c194a9dd
---
 .../card_locker/LoyaltyCardViewActivity.java  |  7 ----
 .../res/layout/loyalty_card_view_layout.xml   | 34 +------------------
 app/src/main/res/values/strings.xml           |  1 -
 3 files changed, 1 insertion(+), 41 deletions(-)

diff --git a/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java b/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java
index 9ef3c191b..78affe0fe 100644
--- a/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java
+++ b/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java
@@ -42,8 +42,6 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
     TextView cardIdFieldView;
     TextView noteView;
     View noteViewDivider;
-    TextView barcodeFormatView;
-    View barcodeFormatViewDivider;
     TextView storeName;
     ImageView barcodeImage;
     View collapsingToolbarLayout;
@@ -109,8 +107,6 @@ 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);
@@ -273,13 +269,10 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
                 Log.d(TAG, "ImageView size known known, creating barcode");
                 new BarcodeImageWriterTask(barcodeImage, cardIdString, format, null).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 ebb300cab..e224353cf 100644
--- a/app/src/main/res/layout/loyalty_card_view_layout.xml
+++ b/app/src/main/res/layout/loyalty_card_view_layout.xml
@@ -27,13 +27,6 @@
                 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"
@@ -85,7 +78,7 @@
                 app:layout_constraintTop_toBottomOf="@id/noteViewDivider"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintBottom_toTopOf="@id/footerGuideline"
+                app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintLeft_toLeftOf="parent"
                 app:layout_constraintRight_toRightOf="parent"
                 app:autoSizeTextType="uniform"
@@ -94,31 +87,6 @@
                 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 f23f690eb..7453d86e9 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -12,7 +12,6 @@
     <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>