From 12440346faee8fdec1b97a44c9eef0cd599a1b82 Mon Sep 17 00:00:00 2001
From: Branden Archer <b.m.archer4@gmail.com>
Date: Sat, 10 Feb 2018 13:22:34 -0500
Subject: [PATCH] Replace letter icon with store name

---
 .../protect/card_locker/LoyaltyCardViewActivity.java   |  7 ++++---
 app/src/main/res/layout/loyalty_card_view_layout.xml   | 10 ++++++++--
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java b/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java
index 7100c74f7..ac62911fb 100644
--- a/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java
+++ b/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java
@@ -35,8 +35,8 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
     TextView cardIdFieldView;
     TextView noteView;
     View noteViewDivider;
+    TextView storeName;
     ImageView barcodeImage;
-    ImageView storeLogo;
     View collapsingToolbarLayout;
     int loyaltyCardId;
     boolean rotationEnabled;
@@ -71,8 +71,8 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
         cardIdFieldView = findViewById(R.id.cardIdView);
         noteView = findViewById(R.id.noteView);
         noteViewDivider = findViewById(R.id.noteViewDivider);
+        storeName = findViewById(R.id.storeName);
         barcodeImage = findViewById(R.id.barcode);
-        storeLogo = findViewById(R.id.storeLogo);
         collapsingToolbarLayout = findViewById(R.id.collapsingToolbarLayout);
     }
 
@@ -126,10 +126,11 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
             noteViewDivider.setVisibility(View.GONE);
         }
 
+        storeName.setText(loyaltyCard.store);
+
         int cardViewLetterFontSize = getResources().getDimensionPixelSize(R.dimen.cardViewLetterFontSize);
         int pixelSize = getResources().getDimensionPixelSize(R.dimen.cardThumbnailSizeLarge);
         LetterBitmap letterBitmap = new LetterBitmap(this, loyaltyCard.store, loyaltyCard.store, cardViewLetterFontSize, pixelSize, pixelSize);
-        storeLogo.setImageBitmap(letterBitmap.getLetterTile());
         collapsingToolbarLayout.setBackgroundColor(letterBitmap.getBackgroundColor());
 
         if(barcodeImage.getHeight() == 0)
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 1ae0550d1..325a1e843 100644
--- a/app/src/main/res/layout/loyalty_card_view_layout.xml
+++ b/app/src/main/res/layout/loyalty_card_view_layout.xml
@@ -111,10 +111,16 @@
             app:expandedTitleMarginEnd="64dp"
             app:contentScrim="?colorPrimary"
             app:expandedTitleGravity="top">
-            <ImageView
-                android:id="@+id/storeLogo"
+            <TextView
+                android:id="@+id/storeName"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:maxLines="1"
+                android:ellipsize="end"
+                android:textColor="@android:color/white"
+                android:textSize="40sp"
+                android:textAlignment="center"
+                android:layout_gravity="center"
                 android:layout_marginTop="?actionBarSize"
                 app:layout_collapseMode="parallax"
                 android:fitsSystemWindows="true"/>