diff --git a/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java b/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java index d0940a0c6..7100c74f7 100644 --- a/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java +++ b/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java @@ -33,6 +33,8 @@ public class LoyaltyCardViewActivity extends AppCompatActivity private static final String TAG = "CardLocker"; TextView cardIdFieldView; + TextView noteView; + View noteViewDivider; ImageView barcodeImage; ImageView storeLogo; View collapsingToolbarLayout; @@ -67,6 +69,8 @@ public class LoyaltyCardViewActivity extends AppCompatActivity db = new DBHelper(this); cardIdFieldView = findViewById(R.id.cardIdView); + noteView = findViewById(R.id.noteView); + noteViewDivider = findViewById(R.id.noteViewDivider); barcodeImage = findViewById(R.id.barcode); storeLogo = findViewById(R.id.storeLogo); collapsingToolbarLayout = findViewById(R.id.collapsingToolbarLayout); @@ -112,6 +116,16 @@ public class LoyaltyCardViewActivity extends AppCompatActivity cardIdFieldView.setText(loyaltyCard.cardId); + if(loyaltyCard.note.length() > 0) + { + noteView.setText(loyaltyCard.note); + } + else + { + noteView.setVisibility(View.GONE); + noteViewDivider.setVisibility(View.GONE); + } + 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); 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 42c222e86..1ae0550d1 100644 --- a/app/src/main/res/layout/loyalty_card_view_layout.xml +++ b/app/src/main/res/layout/loyalty_card_view_layout.xml @@ -46,6 +46,7 @@ android:layout_marginLeft="10.0dip" android:layout_marginRight="10.0dip" app:layout_constraintTop_toBottomOf="@id/centerGuideline" + app:layout_constraintBottom_toTopOf="@+id/noteViewDivider" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" android:textAlignment="center" @@ -54,6 +55,32 @@ app:autoSizeMaxTextSize="@dimen/singleCardCardIdTextSizeMax" android:ellipsize="end"/> + + + + 15sp 50sp + 25sp + 50sp + 2dip 4dip 20dip