Merge pull request #210 from brarcher/pre-v0.22

Update for v0.22
2025-12-24 15:47:53 -05:00 · 2018-02-19 10:29:16 -05:00 · 2018-02-18 23:30:04 -05:00 · 2018-02-18 23:24:52 -05:00 · 2018-02-18 23:14:51 -05:00 · 2018-02-18 23:14:51 -05:00
40 changed files with 1080 additions and 125 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,21 @@
+## v0.21 (2018-02-17)
+
+Changes
+- Add quiet space at the start/end of barcodes. (https://github.com/brarcher/loyalty-card-locker/pull/200)
+- Add options to configure the colors used for the store name font and background. (https://github.com/brarcher/loyalty-card-locker/pull/203)
+- Add options to adjust font sizes on the card listing page and single card page. (https://github.com/brarcher/loyalty-card-locker/pull/204)
+
+## v0.20 (2018-02-10)
+
+Changes:
+- Changes to Card view to display the note, allow the card ID to take multiple lines, and show the store name. (https://github.com/brarcher/loyalty-card-locker/pull/197)
+
+## v0.19 (2018-02-01)
+
+Changes:
+- Improved layout for card list. (https://github.com/brarcher/loyalty-card-locker/pull/188)
+- Improved layout when viewing a card. (https://github.com/brarcher/loyalty-card-locker/pull/190)
+
 ## v0.18.1 (2018-01-24)

 Changes:
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -13,8 +13,8 @@ android {
        applicationId "protect.card_locker"
        minSdkVersion 17
        targetSdkVersion 27
-        versionCode 21
-        versionName "0.19"
+        versionCode 24
+        versionName "0.22"
    }
    buildTypes {
        release {
@@ -27,6 +27,7 @@ android {
        disable "ButtonStyle"
        disable "AlwaysShowAction"
        disable "MissingTranslation"
+        disable "MissingPrefix"
    }

    // Starting with Android Studio 3 Robolectric is unable to find resources.
@@ -45,11 +46,15 @@ dependencies {
    compile fileTree(dir: 'libs', include: ['*.jar'])
    compile 'com.android.support:appcompat-v7:27.0.2'
    compile 'com.android.support:design:27.0.2'
+    compile 'com.android.support:support-v4:27.0.2'
    compile 'com.journeyapps:zxing-android-embedded:3.5.0@aar'
    compile 'com.google.zxing:core:3.3.0'
    compile 'org.apache.commons:commons-csv:1.5'
+    compile 'com.android.support.constraint:constraint-layout:1.0.2'
+    compile 'com.jaredrummler:colorpicker:1.0.2'
    compile group: 'com.google.guava', name: 'guava', version: '20.0'
    compile 'com.github.apl-devs:appintro:v4.2.0'
+    compile "com.vanniktech:vntnumberpickerpreference:1.0.0"
    testCompile 'junit:junit:4.12'
    testCompile "org.robolectric:robolectric:3.3.2"
 }
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -36,7 +36,6 @@
            android:name=".LoyaltyCardViewActivity"
            android:theme="@style/AppTheme.NoActionBar"
            android:label=""
-            android:configChanges="orientation|screenSize"
            android:windowSoftInputMode="stateHidden"
            android:exported="true"/>
        <activity
@@ -51,6 +50,10 @@
            android:theme="@style/AppTheme.NoActionBar"
            android:configChanges="orientation|screenSize"
            android:windowSoftInputMode="stateHidden"/>
+        <activity
+            android:name=".preferences.SettingsActivity"
+            android:label="@string/settings"
+            android:configChanges="orientation|screenSize"/>
        <activity
            android:name=".ImportExportActivity"
            android:label="@string/importExport"
--- a/app/src/main/java/protect/card_locker/BarcodeImageWriterTask.java
+++ b/app/src/main/java/protect/card_locker/BarcodeImageWriterTask.java
@@ -21,7 +21,11 @@ import java.lang.ref.WeakReference;
 class BarcodeImageWriterTask extends AsyncTask<Void, Void, Bitmap>
 {
    private static final String TAG = "LoyaltyCardLocker";
-    private static final int MAX_WIDTH = 500;
+
+    // When drawn in a smaller window 1D barcodes for some reason end up
+    // squished, whereas 2D barcodes look fine.
+    private static final int MAX_WIDTH_1D = 1500;
+    private static final int MAX_WIDTH_2D = 500;

    private final WeakReference<ImageView> imageViewReference;
    private final String cardId;
@@ -38,6 +42,8 @@ class BarcodeImageWriterTask extends AsyncTask<Void, Void, Bitmap>
        cardId = cardIdString;
        format = barcodeFormat;

+        final int MAX_WIDTH = getMaxWidth(format);
+
        if(imageView.getWidth() < MAX_WIDTH)
        {
            imageHeight = imageView.getHeight();
@@ -52,6 +58,36 @@ class BarcodeImageWriterTask extends AsyncTask<Void, Void, Bitmap>
        }
    }

+    private int getMaxWidth(BarcodeFormat format)
+    {
+        switch(format)
+        {
+            // 2D barcodes
+            case AZTEC:
+            case DATA_MATRIX:
+            case MAXICODE:
+            case PDF_417:
+            case QR_CODE:
+                return MAX_WIDTH_2D;
+
+            // 1D barcodes:
+            case CODABAR:
+            case CODE_39:
+            case CODE_93:
+            case CODE_128:
+            case EAN_8:
+            case EAN_13:
+            case ITF:
+            case UPC_A:
+            case UPC_E:
+            case RSS_14:
+            case RSS_EXPANDED:
+            case UPC_EAN_EXTENSION:
+            default:
+                return MAX_WIDTH_1D;
+        }
+    }
+
    public Bitmap doInBackground(Void... params)
    {
        MultiFormatWriter writer = new MultiFormatWriter();
--- a/app/src/main/java/protect/card_locker/CsvDatabaseExporter.java
+++ b/app/src/main/java/protect/card_locker/CsvDatabaseExporter.java
@@ -23,6 +23,8 @@ public class CsvDatabaseExporter implements DatabaseExporter
                DBHelper.LoyaltyCardDbIds.STORE,
                DBHelper.LoyaltyCardDbIds.NOTE,
                DBHelper.LoyaltyCardDbIds.CARD_ID,
+                DBHelper.LoyaltyCardDbIds.HEADER_COLOR,
+                DBHelper.LoyaltyCardDbIds.HEADER_TEXT_COLOR,
                DBHelper.LoyaltyCardDbIds.BARCODE_TYPE);

        Cursor cursor = db.getLoyaltyCardCursor();
@@ -35,6 +37,8 @@ public class CsvDatabaseExporter implements DatabaseExporter
                    card.store,
                    card.note,
                    card.cardId,
+                    card.headerColor,
+                    card.headerTextColor,
                    card.barcodeType);

            if(Thread.currentThread().isInterrupted())
--- a/app/src/main/java/protect/card_locker/CsvDatabaseImporter.java
+++ b/app/src/main/java/protect/card_locker/CsvDatabaseImporter.java
@@ -83,7 +83,7 @@ public class CsvDatabaseImporter implements DatabaseImporter
     * "key" as the key. If no such key exists, or the data is not a valid
     * int, a FormatException is thrown.
     */
-    private int extractInt(String key, CSVRecord record)
+    private Integer extractInt(String key, CSVRecord record, boolean nullIsOk)
            throws FormatException
    {
        if(record.isMapped(key) == false)
@@ -91,6 +91,12 @@ public class CsvDatabaseImporter implements DatabaseImporter
            throw new FormatException("Field not used but expected: " + key);
        }

+        String value = record.get(key);
+        if(value.isEmpty() && nullIsOk)
+        {
+            return null;
+        }
+
        try
        {
            return Integer.parseInt(record.get(key));
@@ -108,7 +114,7 @@ public class CsvDatabaseImporter implements DatabaseImporter
    private void importLoyaltyCard(SQLiteDatabase database, DBHelper helper, CSVRecord record)
            throws IOException, FormatException
    {
-        int id = extractInt(DBHelper.LoyaltyCardDbIds.ID, record);
+        int id = extractInt(DBHelper.LoyaltyCardDbIds.ID, record, false);

        String store = extractString(DBHelper.LoyaltyCardDbIds.STORE, record, "");
        if(store.isEmpty())
@@ -130,6 +136,16 @@ public class CsvDatabaseImporter implements DatabaseImporter
            throw new FormatException("No barcode type listed, but is required");
        }

-        helper.insertLoyaltyCard(database, id, store, note, cardId, barcodeType);
+        Integer headerColor = null;
+        Integer headerTextColor = null;
+
+        if(record.isMapped(DBHelper.LoyaltyCardDbIds.HEADER_COLOR) &&
+           record.isMapped(DBHelper.LoyaltyCardDbIds.HEADER_TEXT_COLOR))
+        {
+            headerColor = extractInt(DBHelper.LoyaltyCardDbIds.HEADER_COLOR, record, true);
+            headerTextColor = extractInt(DBHelper.LoyaltyCardDbIds.HEADER_TEXT_COLOR, record, true);
+        }
+
+        helper.insertLoyaltyCard(database, id, store, note, cardId, barcodeType, headerColor, headerTextColor);
    }
 }
--- a/app/src/main/java/protect/card_locker/DBHelper.java
+++ b/app/src/main/java/protect/card_locker/DBHelper.java
@@ -11,7 +11,7 @@ public class DBHelper extends SQLiteOpenHelper
 {
    public static final String DATABASE_NAME = "LoyaltyCards.db";
    public static final int ORIGINAL_DATABASE_VERSION = 1;
-    public static final int DATABASE_VERSION = 2;
+    public static final int DATABASE_VERSION = 3;

    static class LoyaltyCardDbIds
    {
@@ -19,6 +19,8 @@ public class DBHelper extends SQLiteOpenHelper
        public static final String ID = "_id";
        public static final String STORE = "store";
        public static final String NOTE = "note";
+        public static final String HEADER_COLOR = "headercolor";
+        public static final String HEADER_TEXT_COLOR = "headertextcolor";
        public static final String CARD_ID = "cardid";
        public static final String BARCODE_TYPE = "barcodetype";
    }
@@ -36,6 +38,8 @@ public class DBHelper extends SQLiteOpenHelper
                LoyaltyCardDbIds.ID + " INTEGER primary key autoincrement," +
                LoyaltyCardDbIds.STORE + " TEXT not null," +
                LoyaltyCardDbIds.NOTE + " TEXT not null," +
+                LoyaltyCardDbIds.HEADER_COLOR + " INTEGER," +
+                LoyaltyCardDbIds.HEADER_TEXT_COLOR + " INTEGER," +
                LoyaltyCardDbIds.CARD_ID + " TEXT not null," +
                LoyaltyCardDbIds.BARCODE_TYPE + " TEXT not null)");
    }
@@ -49,10 +53,20 @@ public class DBHelper extends SQLiteOpenHelper
            db.execSQL("ALTER TABLE " + LoyaltyCardDbIds.TABLE
                    + " ADD COLUMN " + LoyaltyCardDbIds.NOTE + " TEXT not null default ''");
        }
+
+        // Upgrade from version 2 to version 3
+        if(oldVersion < 3 && newVersion >= 3)
+        {
+            db.execSQL("ALTER TABLE " + LoyaltyCardDbIds.TABLE
+                    + " ADD COLUMN " + LoyaltyCardDbIds.HEADER_COLOR + " INTEGER");
+            db.execSQL("ALTER TABLE " + LoyaltyCardDbIds.TABLE
+                    + " ADD COLUMN " + LoyaltyCardDbIds.HEADER_TEXT_COLOR + " INTEGER");
+        }
    }

    public long insertLoyaltyCard(final String store, final String note, final String cardId,
-                                     final String barcodeType)
+                                  final String barcodeType, final Integer headerColor,
+                                  final Integer headerTextColor)
    {
        SQLiteDatabase db = getWritableDatabase();
        ContentValues contentValues = new ContentValues();
@@ -60,13 +74,16 @@ public class DBHelper extends SQLiteOpenHelper
        contentValues.put(LoyaltyCardDbIds.NOTE, note);
        contentValues.put(LoyaltyCardDbIds.CARD_ID, cardId);
        contentValues.put(LoyaltyCardDbIds.BARCODE_TYPE, barcodeType);
+        contentValues.put(LoyaltyCardDbIds.HEADER_COLOR, headerColor);
+        contentValues.put(LoyaltyCardDbIds.HEADER_TEXT_COLOR, headerTextColor);
        final long newId = db.insert(LoyaltyCardDbIds.TABLE, null, contentValues);
        return newId;
    }

    public boolean insertLoyaltyCard(final SQLiteDatabase db, final int id,
                                     final String store, final String note, final String cardId,
-                                     final String barcodeType)
+                                     final String barcodeType, final Integer headerColor,
+                                     final Integer headerTextColor)
    {
        ContentValues contentValues = new ContentValues();
        contentValues.put(LoyaltyCardDbIds.ID, id);
@@ -74,13 +91,16 @@ public class DBHelper extends SQLiteOpenHelper
        contentValues.put(LoyaltyCardDbIds.NOTE, note);
        contentValues.put(LoyaltyCardDbIds.CARD_ID, cardId);
        contentValues.put(LoyaltyCardDbIds.BARCODE_TYPE, barcodeType);
+        contentValues.put(LoyaltyCardDbIds.HEADER_COLOR, headerColor);
+        contentValues.put(LoyaltyCardDbIds.HEADER_TEXT_COLOR, headerTextColor);
        final long newId = db.insert(LoyaltyCardDbIds.TABLE, null, contentValues);
        return (newId != -1);
    }


    public boolean updateLoyaltyCard(final int id, final String store, final String note,
-                                     final String cardId, final String barcodeType)
+                                     final String cardId, final String barcodeType,
+                                     final Integer headerColor, final Integer headerTextColor)
    {
        SQLiteDatabase db = getWritableDatabase();
        ContentValues contentValues = new ContentValues();
@@ -88,6 +108,8 @@ public class DBHelper extends SQLiteOpenHelper
        contentValues.put(LoyaltyCardDbIds.NOTE, note);
        contentValues.put(LoyaltyCardDbIds.CARD_ID, cardId);
        contentValues.put(LoyaltyCardDbIds.BARCODE_TYPE, barcodeType);
+        contentValues.put(LoyaltyCardDbIds.HEADER_COLOR, headerColor);
+        contentValues.put(LoyaltyCardDbIds.HEADER_TEXT_COLOR, headerTextColor);
        int rowsUpdated = db.update(LoyaltyCardDbIds.TABLE, contentValues,
                LoyaltyCardDbIds.ID + "=?",
                new String[]{Integer.toString(id)});
--- a/app/src/main/java/protect/card_locker/LetterBitmap.java
+++ b/app/src/main/java/protect/card_locker/LetterBitmap.java
@@ -4,7 +4,6 @@ import android.content.Context;
 import android.content.res.Resources;
 import android.content.res.TypedArray;
 import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.Paint;
@@ -44,20 +43,35 @@ class LetterBitmap
     * @param tileLetterFontSize The font size used to display the letter
     * @param width       The desired width of the tile
     * @param height      The desired height of the tile
+     * @param backgroundColor  (optional) color to use for background.
+     * @param textColor  (optional) color to use for text.
     */
-    public LetterBitmap(Context context, String displayName, String key, int tileLetterFontSize, int width, int height)
+    public LetterBitmap(Context context, String displayName, String key, int tileLetterFontSize,
+                        int width, int height, Integer backgroundColor, Integer textColor)
    {
-        final Resources res = context.getResources();
-
        TextPaint paint = new TextPaint();
        paint.setTypeface(Typeface.create("sans-serif-light", Typeface.BOLD));
-        paint.setColor(Color.WHITE);
+
+        if(textColor != null)
+        {
+            paint.setColor(textColor);
+        }
+        else
+        {
+            paint.setColor(Color.WHITE);
+        }
+
        paint.setTextAlign(Paint.Align.CENTER);
        paint.setAntiAlias(true);

-        TypedArray colors = res.obtainTypedArray(R.array.letter_tile_colors);
-        mColor = pickColor(key, colors);
-        colors.recycle();
+        if(backgroundColor == null)
+        {
+            mColor = getDefaultColor(context, key);
+        }
+        else
+        {
+            mColor = backgroundColor;
+        }

        mBitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
        String firstChar = displayName.substring(0, 1);
@@ -101,11 +115,26 @@ class LetterBitmap
     * @return A new or previously chosen color for <code>key</code> used as the
     * tile background color
     */
-    private int pickColor(String key, TypedArray colors)
+    private static int pickColor(String key, TypedArray colors)
    {
        // String.hashCode() is not supposed to change across java versions, so
        // this should guarantee the same key always maps to the same color
        final int color = Math.abs(key.hashCode()) % NUM_OF_TILE_COLORS;
        return colors.getColor(color, Color.BLACK);
    }
+
+    /**
+     * Determine the color which the letter tile will use if no default
+     * color is provided.
+     */
+    public static int getDefaultColor(Context context, String key)
+    {
+        final Resources res = context.getResources();
+
+        TypedArray colors = res.obtainTypedArray(R.array.letter_tile_colors);
+        int color = pickColor(key, colors);
+        colors.recycle();
+
+        return color;
+    }
 }
--- a/app/src/main/java/protect/card_locker/LoyaltyCard.java
+++ b/app/src/main/java/protect/card_locker/LoyaltyCard.java
@@ -1,6 +1,7 @@
 package protect.card_locker;

 import android.database.Cursor;
+import android.support.annotation.Nullable;

 public class LoyaltyCard
 {
@@ -10,13 +11,22 @@ public class LoyaltyCard
    public final String cardId;
    public final String barcodeType;

-    public LoyaltyCard(final int id, final String store, final String note, final String cardId, final String barcodeType)
+    @Nullable
+    public final Integer headerColor;
+
+    @Nullable
+    public final Integer headerTextColor;
+
+    public LoyaltyCard(final int id, final String store, final String note, final String cardId,
+                       final String barcodeType, final Integer headerColor, final Integer headerTextColor)
    {
        this.id = id;
        this.store = store;
        this.note = note;
        this.cardId = cardId;
        this.barcodeType = barcodeType;
+        this.headerColor = headerColor;
+        this.headerTextColor = headerTextColor;
    }

    public static LoyaltyCard toLoyaltyCard(Cursor cursor)
@@ -27,6 +37,22 @@ public class LoyaltyCard
        String cardId = cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.CARD_ID));
        String barcodeType = cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.BARCODE_TYPE));

-        return new LoyaltyCard(id, store, note, cardId, barcodeType);
+        int headerColorColumn = cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.HEADER_COLOR);
+        int headerTextColorColumn = cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.HEADER_TEXT_COLOR);
+
+        Integer headerColor = null;
+        Integer headerTextColor = null;
+
+        if(cursor.isNull(headerColorColumn) == false)
+        {
+            headerColor = cursor.getInt(headerColorColumn);
+        }
+
+        if(cursor.isNull(headerTextColorColumn) == false)
+        {
+            headerTextColor = cursor.getInt(headerTextColorColumn);
+        }
+
+        return new LoyaltyCard(id, store, note, cardId, barcodeType, headerColor, headerTextColor);
    }
 }
--- a/app/src/main/java/protect/card_locker/LoyaltyCardCursorAdapter.java
+++ b/app/src/main/java/protect/card_locker/LoyaltyCardCursorAdapter.java
@@ -9,11 +9,16 @@ import android.widget.CursorAdapter;
 import android.widget.ImageView;
 import android.widget.TextView;

+import protect.card_locker.preferences.Settings;
+
 class LoyaltyCardCursorAdapter extends CursorAdapter
 {
+    Settings settings;
+
    public LoyaltyCardCursorAdapter(Context context, Cursor cursor)
    {
        super(context, cursor, 0);
+        settings = new Settings(context);
    }

    // The newView method is used to inflate a new view and return it,
@@ -40,10 +45,13 @@ class LoyaltyCardCursorAdapter extends CursorAdapter
        // Populate fields with extracted properties
        storeField.setText(loyaltyCard.store);

+        storeField.setTextSize(settings.getCardTitleListFontSize());
+
        if(loyaltyCard.note.isEmpty() == false)
        {
            noteField.setVisibility(View.VISIBLE);
            noteField.setText(loyaltyCard.note);
+            noteField.setTextSize(settings.getCardNoteListFontSize());
        }
        else
        {
@@ -52,7 +60,11 @@ class LoyaltyCardCursorAdapter extends CursorAdapter

        int tileLetterFontSize = context.getResources().getDimensionPixelSize(R.dimen.tileLetterFontSize);
        int pixelSize = context.getResources().getDimensionPixelSize(R.dimen.cardThumbnailSize);
-        LetterBitmap letterBitmap = new LetterBitmap(context, loyaltyCard.store, loyaltyCard.store, tileLetterFontSize, pixelSize, pixelSize);
+
+        Integer letterBackgroundColor = loyaltyCard.headerColor;
+        Integer letterTextColor = loyaltyCard.headerTextColor;
+        LetterBitmap letterBitmap = new LetterBitmap(context, loyaltyCard.store, loyaltyCard.store,
+                tileLetterFontSize, pixelSize, pixelSize, letterBackgroundColor, letterTextColor);
        thumbnail.setImageBitmap(letterBitmap.getLetterTile());
    }
 }
--- a/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java
+++ b/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java
@@ -3,6 +3,8 @@ package protect.card_locker;
 import android.app.Activity;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.content.res.TypedArray;
+import android.graphics.Color;
 import android.os.Build;
 import android.os.Bundle;
 import android.support.design.widget.Snackbar;
@@ -24,6 +26,8 @@ import android.widget.Toast;
 import com.google.zxing.BarcodeFormat;
 import com.google.zxing.integration.android.IntentIntegrator;
 import com.google.zxing.integration.android.IntentResult;
+import com.jaredrummler.android.colorpicker.ColorPickerDialog;
+import com.jaredrummler.android.colorpicker.ColorPickerDialogListener;

 public class LoyaltyCardEditActivity extends AppCompatActivity
 {
@@ -32,9 +36,11 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
    private static final int SELECT_BARCODE_REQUEST = 1;

    EditText storeFieldEdit;
-    TextView storeFieldView;
    EditText noteFieldEdit;
-    TextView noteFieldView;
+    ImageView headingColorSample;
+    Button headingColorSelectButton;
+    ImageView headingStoreTextColorSample;
+    Button headingStoreTextColorSelectButton;
    TextView cardIdFieldView;
    View cardIdDivider;
    View cardIdTableRow;
@@ -48,6 +54,8 @@ public class LoyaltyCardEditActivity extends AppCompatActivity

    int loyaltyCardId;
    boolean updateLoyaltyCard;
+    Integer headingColorValue = null;
+    Integer headingStoreTextColorValue = null;

    DBHelper db;

@@ -80,9 +88,11 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
        db = new DBHelper(this);

        storeFieldEdit = findViewById(R.id.storeNameEdit);
-        storeFieldView = findViewById(R.id.storeNameView);
        noteFieldEdit = findViewById(R.id.noteEdit);
-        noteFieldView = findViewById(R.id.noteView);
+        headingColorSample = findViewById(R.id.headingColorSample);
+        headingColorSelectButton = findViewById(R.id.headingColorSelectButton);
+        headingStoreTextColorSample = findViewById(R.id.headingStoreTextColorSample);
+        headingStoreTextColorSelectButton = findViewById(R.id.headingStoreTextColorSelectButton);
        cardIdFieldView = findViewById(R.id.cardIdView);
        cardIdDivider = findViewById(R.id.cardIdDivider);
        cardIdTableRow = findViewById(R.id.cardIdTableRow);
@@ -129,13 +139,11 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
            if(storeFieldEdit.getText().length() == 0)
            {
                storeFieldEdit.setText(loyaltyCard.store);
-                storeFieldView.setText(loyaltyCard.store);
            }

            if(noteFieldEdit.getText().length() == 0)
            {
                noteFieldEdit.setText(loyaltyCard.note);
-                noteFieldView.setText(loyaltyCard.note);
            }

            if(cardIdFieldView.getText().length() == 0)
@@ -148,31 +156,53 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
                barcodeTypeField.setText(loyaltyCard.barcodeType);
            }

-            if(updateLoyaltyCard)
+            if(headingColorValue == null)
            {
-                setTitle(R.string.editCardTitle);
-
-                storeFieldView.setVisibility(View.GONE);
-                noteFieldView.setVisibility(View.GONE);
+                headingColorValue = loyaltyCard.headerColor;
+                if(headingColorValue == null)
+                {
+                    headingColorValue = LetterBitmap.getDefaultColor(this, loyaltyCard.store);
+                }
+                headingColorSample.setBackgroundColor(headingColorValue);
            }
-            else
+
+            if(headingStoreTextColorValue == null)
            {
-                barcodeCaptureLayout.setVisibility(View.GONE);
-                captureButton.setVisibility(View.GONE);
-                setTitle(R.string.viewCardTitle);
-
-                storeFieldEdit.setVisibility(View.GONE);
-                noteFieldEdit.setVisibility(View.GONE);
+                headingStoreTextColorValue = loyaltyCard.headerTextColor;
+                if(headingStoreTextColorValue == null)
+                {
+                    headingStoreTextColorValue = Color.WHITE;
+                }
+                headingStoreTextColorSample.setBackgroundColor(headingStoreTextColorValue);
            }
+
+            setTitle(R.string.editCardTitle);
        }
        else
        {
            setTitle(R.string.addCardTitle);
-
-            storeFieldView.setVisibility(View.GONE);
-            noteFieldView.setVisibility(View.GONE);
        }

+        if(headingColorValue == null)
+        {
+            // Select a random color to start out with.
+            TypedArray colors = getResources().obtainTypedArray(R.array.letter_tile_colors);
+            final int color = (int)(Math.random() * colors.length());
+            headingColorValue = colors.getColor(color, Color.BLACK);
+            colors.recycle();
+
+            headingColorSample.setBackgroundColor(headingColorValue);
+        }
+
+        if(headingStoreTextColorValue == null)
+        {
+            headingStoreTextColorValue = Color.WHITE;
+            headingStoreTextColorSample.setBackgroundColor(headingStoreTextColorValue);
+        }
+
+        headingColorSelectButton.setOnClickListener(new ColorSelectListener(headingColorValue, true));
+        headingStoreTextColorSelectButton.setOnClickListener(new ColorSelectListener(headingStoreTextColorValue, false));
+
        if(cardIdFieldView.getText().length() > 0 && barcodeTypeField.getText().length() > 0)
        {
            String formatString = barcodeTypeField.getText().toString();
@@ -262,6 +292,48 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
        }
    }

+    class ColorSelectListener implements View.OnClickListener
+    {
+        final int defaultColor;
+        final boolean isBackgroundColor;
+
+        ColorSelectListener(int defaultColor, boolean isBackgroundColor)
+        {
+            this.defaultColor = defaultColor;
+            this.isBackgroundColor = isBackgroundColor;
+        }
+
+        @Override
+        public void onClick(View v)
+        {
+            ColorPickerDialog dialog = ColorPickerDialog.newBuilder().setColor(defaultColor).create();
+            dialog.setColorPickerDialogListener(new ColorPickerDialogListener()
+            {
+                @Override
+                public void onColorSelected(int dialogId, int color)
+                {
+                    if(isBackgroundColor)
+                    {
+                        headingColorSample.setBackgroundColor(color);
+                        headingColorValue = color;
+                    }
+                    else
+                    {
+                        headingStoreTextColorSample.setBackgroundColor(color);
+                        headingStoreTextColorValue = color;
+                    }
+                }
+
+                @Override
+                public void onDialogDismissed(int dialogId)
+                {
+                    // Nothing to do, no change made
+                }
+            });
+            dialog.show(getFragmentManager(), "color-picker-dialog");
+        }
+    }
+
    private void doSave()
    {
        String store = storeFieldEdit.getText().toString();
@@ -283,12 +355,12 @@ public class LoyaltyCardEditActivity extends AppCompatActivity

        if(updateLoyaltyCard)
        {
-            db.updateLoyaltyCard(loyaltyCardId, store, note, cardId, barcodeType);
+            db.updateLoyaltyCard(loyaltyCardId, store, note, cardId, barcodeType, headingColorValue, headingStoreTextColorValue);
            Log.i(TAG, "Updated " + loyaltyCardId + " to " + cardId);
        }
        else
        {
-            loyaltyCardId = (int)db.insertLoyaltyCard(store, note, cardId, barcodeType);
+            loyaltyCardId = (int)db.insertLoyaltyCard(store, note, cardId, barcodeType, headingColorValue, headingStoreTextColorValue);
        }

        finish();
--- a/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java
+++ b/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java
@@ -1,44 +1,46 @@
 package protect.card_locker;


-import android.app.Activity;
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
+import android.graphics.Color;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.design.widget.Snackbar;
+import android.support.v4.widget.TextViewCompat;
 import android.support.v7.app.ActionBar;
-import android.support.v7.app.AlertDialog;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
 import android.util.Log;
+import android.util.TypedValue;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewTreeObserver;
 import android.view.Window;
 import android.view.WindowManager;
-import android.widget.Button;
-import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;

 import com.google.zxing.BarcodeFormat;

+import protect.card_locker.preferences.Settings;
+

 public class LoyaltyCardViewActivity extends AppCompatActivity
 {
    private static final String TAG = "CardLocker";

    TextView cardIdFieldView;
+    TextView noteView;
+    View noteViewDivider;
+    TextView storeName;
    ImageView barcodeImage;
-    ImageView storeLogo;
    View collapsingToolbarLayout;
    int loyaltyCardId;
    boolean rotationEnabled;
    DBHelper db;
+    Settings settings;

    private void extractIntentFields(Intent intent)
    {
@@ -52,6 +54,8 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
    {
        super.onCreate(savedInstanceState);

+        settings = new Settings(this);
+
        extractIntentFields(getIntent());

        setContentView(R.layout.loyalty_card_view_layout);
@@ -67,8 +71,10 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
        db = new DBHelper(this);

        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);
    }

@@ -111,12 +117,48 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
        final String cardIdString = loyaltyCard.cardId;

        cardIdFieldView.setText(loyaltyCard.cardId);
+        TextViewCompat.setAutoSizeTextTypeUniformWithConfiguration(cardIdFieldView,
+                getResources().getInteger(R.integer.settings_card_id_min_font_size_sp)-1, settings.getCardIdFontSize(),
+                1, TypedValue.COMPLEX_UNIT_SP);

-        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(loyaltyCard.note.length() > 0)
+        {
+            noteView.setText(loyaltyCard.note);
+            TextViewCompat.setAutoSizeTextTypeUniformWithConfiguration(noteView,
+                    getResources().getInteger(R.integer.settings_card_note_min_font_size_sp)-1,
+                    settings.getCardNoteFontSize(), 1, TypedValue.COMPLEX_UNIT_SP);
+        }
+        else
+        {
+            noteView.setVisibility(View.GONE);
+            noteViewDivider.setVisibility(View.GONE);
+        }
+
+        storeName.setText(loyaltyCard.store);
+        storeName.setTextSize(settings.getCardTitleFontSize());
+
+        int textColor;
+        if(loyaltyCard.headerTextColor != null)
+        {
+            textColor = loyaltyCard.headerTextColor;
+        }
+        else
+        {
+            textColor = Color.WHITE;
+        }
+        storeName.setTextColor(textColor);
+
+        int backgroundHeaderColor;
+        if(loyaltyCard.headerColor != null)
+        {
+            backgroundHeaderColor = loyaltyCard.headerColor;
+        }
+        else
+        {
+            backgroundHeaderColor = LetterBitmap.getDefaultColor(this, loyaltyCard.store);
+        }
+
+        collapsingToolbarLayout.setBackgroundColor(backgroundHeaderColor);

        if(barcodeImage.getHeight() == 0)
        {
--- a/app/src/main/java/protect/card_locker/MainActivity.java
+++ b/app/src/main/java/protect/card_locker/MainActivity.java
@@ -30,6 +30,7 @@ import java.util.Calendar;
 import java.util.Map;

 import protect.card_locker.intro.IntroActivity;
+import protect.card_locker.preferences.SettingsActivity;

 public class MainActivity extends AppCompatActivity
 {
@@ -164,6 +165,13 @@ public class MainActivity extends AppCompatActivity
            return true;
        }

+        if(id == R.id.action_settings)
+        {
+            Intent i = new Intent(getApplicationContext(), SettingsActivity.class);
+            startActivity(i);
+            return true;
+        }
+
        if(id == R.id.action_intro)
        {
            startIntro();
@@ -181,14 +189,15 @@ public class MainActivity extends AppCompatActivity

    private void displayAboutDialog()
    {
-        final Map<String, String> USED_LIBRARIES = ImmutableMap.of
-        (
-            "Commons CSV", "https://commons.apache.org/proper/commons-csv/",
-            "Guava", "https://github.com/google/guava",
-            "ZXing", "https://github.com/zxing/zxing",
-            "ZXing Android Embedded", "https://github.com/journeyapps/zxing-android-embedded",
-            "AppIntro", "https://github.com/apl-devs/AppIntro"
-        );
+        final Map<String, String> USED_LIBRARIES = new ImmutableMap.Builder<String, String>()
+            .put("Commons CSV", "https://commons.apache.org/proper/commons-csv/")
+            .put("Guava", "https://github.com/google/guava")
+            .put("ZXing", "https://github.com/zxing/zxing")
+            .put("ZXing Android Embedded", "https://github.com/journeyapps/zxing-android-embedded")
+            .put("AppIntro", "https://github.com/apl-devs/AppIntro")
+            .put("Color Picker", "https://github.com/jaredrummler/ColorPicker")
+            .put("VNTNumberPickerPreference", "https://github.com/vanniktech/VNTNumberPickerPreference")
+            .build();

        final Map<String, String> USED_ASSETS = ImmutableMap.of
        (
--- a/app/src/main/java/protect/card_locker/preferences/Settings.java
+++ b/app/src/main/java/protect/card_locker/preferences/Settings.java
@@ -0,0 +1,61 @@
+package protect.card_locker.preferences;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.preference.PreferenceManager;
+import android.support.annotation.IntegerRes;
+import android.support.annotation.StringRes;
+
+import protect.card_locker.R;
+
+public class Settings
+{
+    private Context context;
+    private SharedPreferences settings;
+
+    public Settings(Context context)
+    {
+        this.context = context;
+        this.settings = PreferenceManager.getDefaultSharedPreferences(context);
+    }
+
+    private String getResString(@StringRes int resId)
+    {
+        return context.getString(resId);
+    }
+
+    private int getResInt(@IntegerRes int resId)
+    {
+        return context.getResources().getInteger(resId);
+    }
+
+    private int getInt(@StringRes int keyId, @IntegerRes int defaultId)
+    {
+        return settings.getInt(getResString(keyId), getResInt(defaultId));
+    }
+
+    public int getCardTitleListFontSize()
+    {
+        return getInt(R.string.settings_key_card_title_list_font_size, R.integer.settings_card_title_list_font_size_sp);
+    }
+
+    public int getCardNoteListFontSize()
+    {
+        return getInt(R.string.settings_key_card_note_list_font_size, R.integer.settings_card_note_list_font_size_sp);
+    }
+
+    public int getCardTitleFontSize()
+    {
+        return getInt(R.string.settings_key_card_title_font_size, R.integer.settings_card_title_font_size_sp);
+    }
+
+    public int getCardIdFontSize()
+    {
+        return getInt(R.string.settings_key_card_id_font_size, R.integer.settings_card_id_font_size_sp);
+    }
+
+    public int getCardNoteFontSize()
+    {
+        return getInt(R.string.settings_key_card_note_font_size, R.integer.settings_card_note_font_size_sp);
+    }
+}
--- a/app/src/main/java/protect/card_locker/preferences/SettingsActivity.java
+++ b/app/src/main/java/protect/card_locker/preferences/SettingsActivity.java
@@ -0,0 +1,56 @@
+package protect.card_locker.preferences;
+
+import android.os.Bundle;
+import android.preference.PreferenceFragment;
+import android.support.v7.app.ActionBar;
+import android.support.v7.app.AppCompatActivity;
+import android.view.MenuItem;
+
+import protect.card_locker.R;
+
+public class SettingsActivity extends AppCompatActivity
+{
+    @Override
+    protected void onCreate(Bundle savedInstanceState)
+    {
+        super.onCreate(savedInstanceState);
+
+        ActionBar actionBar = getSupportActionBar();
+        if(actionBar != null)
+        {
+            getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+        }
+
+        // Display the fragment as the main content.
+        getFragmentManager().beginTransaction()
+                .replace(android.R.id.content, new SettingsFragment())
+                .commit();
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item)
+    {
+        int id = item.getItemId();
+
+        if(id == android.R.id.home)
+        {
+            finish();
+            return true;
+        }
+
+        return super.onOptionsItemSelected(item);
+    }
+
+    public static class SettingsFragment extends PreferenceFragment
+    {
+        @Override
+        public void onCreate(Bundle savedInstanceState)
+        {
+            super.onCreate(savedInstanceState);
+
+            // Load the preferences from an XML resource
+            addPreferencesFromResource(R.xml.preferences);
+        }
+    }
+}
+
--- a/app/src/main/res/drawable-hdpi/intro4_image.png
+++ b/app/src/main/res/drawable-hdpi/intro4_image.png
--- a/app/src/main/res/drawable-mdpi/intro4_image.png
+++ b/app/src/main/res/drawable-mdpi/intro4_image.png
--- a/app/src/main/res/drawable-xhdpi/intro4_image.png
+++ b/app/src/main/res/drawable-xhdpi/intro4_image.png
--- a/app/src/main/res/drawable-xxhdpi/intro4_image.png
+++ b/app/src/main/res/drawable-xxhdpi/intro4_image.png
--- a/app/src/main/res/drawable-xxxhdpi/intro4_image.png
+++ b/app/src/main/res/drawable-xxxhdpi/intro4_image.png
--- a/app/src/main/res/layout/loyalty_card_edit_activity.xml
+++ b/app/src/main/res/layout/loyalty_card_edit_activity.xml
@@ -72,14 +72,6 @@
                            android:textSize="@dimen/inputSize"
                            android:layout_toEndOf="@id/storeNameField"/>

-                        <TextView
-                            android:id="@+id/storeNameView"
-                            android:layout_height="wrap_content"
-                            android:layout_width="match_parent"
-                            android:padding="@dimen/inputPadding"
-                            android:textSize="@dimen/inputSize"
-                            android:textIsSelectable="true"
-                            android:layout_toEndOf="@id/storeNameField"/>
                    </RelativeLayout>

                    <View
@@ -128,16 +120,149 @@
                            android:padding="@dimen/inputPadding"
                            android:textSize="@dimen/inputSize"
                            android:layout_toEndOf="@id/noteField"/>
+                    </RelativeLayout>
+
+                    <View
+                        android:gravity="end"
+                        android:layout_height="match_parent"
+                        android:layout_width="@dimen/inputBorderThickness"
+                        android:background="@color/inputBorder" />
+                </TableRow>
+
+                <!-- Store Header Background Color -->
+                <View
+                    android:layout_height="@dimen/inputBorderThickness"
+                    android:layout_width="match_parent"
+                    android:background="@color/inputBorder" />
+                <TableRow
+                    android:background="@color/inputBackground"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+                    <View
+                        android:gravity="start"
+                        android:layout_height="match_parent"
+                        android:layout_width="@dimen/inputBorderThickness"
+                        android:background="@color/inputBorder" />
+
+                    <android.support.constraint.ConstraintLayout
+                        android:layout_weight="1"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:paddingRight="@dimen/inputPadding"
+                        android:paddingEnd="@dimen/inputPadding">

                        <TextView
-                            android:id="@+id/noteView"
-                            android:layout_height="wrap_content"
-                            android:layout_width="match_parent"
-                            android:padding="@dimen/inputPadding"
+                            android:id="@+id/headingField"
+                            android:text="@string/storeTextBackgroundColorTitle"
+                            android:layout_height="match_parent"
+                            android:layout_width="wrap_content"
                            android:textSize="@dimen/inputSize"
-                            android:textIsSelectable="true"
-                            android:layout_toEndOf="@id/noteField"/>
-                    </RelativeLayout>
+                            android:padding="@dimen/inputPadding"
+                            app:layout_constraintStart_toStartOf="parent"/>
+
+                        <android.support.constraint.ConstraintLayout
+                            android:id="@+id/headingColorSampleBorder"
+                            android:layout_width="0dp"
+                            android:layout_height="0dp"
+                            android:layout_margin="@dimen/colorSamplePadding"
+                            app:layout_constraintStart_toEndOf="@id/headingField"
+                            app:layout_constraintEnd_toStartOf="@+id/headingColorSelectButton"
+                            app:layout_constraintTop_toTopOf="parent"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            android:background="@android:color/black">
+                            <ImageView
+                                android:id="@+id/headingColorSample"
+                                android:layout_width="0dp"
+                                android:layout_height="0dp"
+                                android:layout_margin="1dp"
+                                app:layout_constraintStart_toStartOf="parent"
+                                app:layout_constraintEnd_toEndOf="parent"
+                                app:layout_constraintTop_toTopOf="parent"
+                                app:layout_constraintBottom_toBottomOf="parent"
+                                android:background="@android:color/white"
+                                android:contentDescription="@string/storeNameBackgroundColorDescription"/>
+                        </android.support.constraint.ConstraintLayout>
+
+                       <Button
+                           android:id="@+id/headingColorSelectButton"
+                           android:text="@string/change"
+                           android:padding="@dimen/inputPadding"
+                           android:layout_width="wrap_content"
+                           android:layout_height="match_parent"
+                           android:layout_toEndOf="@id/headingColorSampleBorder"
+                           app:layout_constraintEnd_toEndOf="parent"/>
+                    </android.support.constraint.ConstraintLayout>
+
+                    <View
+                        android:gravity="end"
+                        android:layout_height="match_parent"
+                        android:layout_width="@dimen/inputBorderThickness"
+                        android:background="@color/inputBorder" />
+                </TableRow>
+
+                <!-- Store Text Color -->
+                <View
+                    android:layout_height="@dimen/inputBorderThickness"
+                    android:layout_width="match_parent"
+                    android:background="@color/inputBorder" />
+                <TableRow
+                    android:background="@color/inputBackground"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+                    <View
+                        android:gravity="start"
+                        android:layout_height="match_parent"
+                        android:layout_width="@dimen/inputBorderThickness"
+                        android:background="@color/inputBorder" />
+
+                    <android.support.constraint.ConstraintLayout
+                        android:layout_weight="1"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:paddingRight="@dimen/inputPadding"
+                        android:paddingEnd="@dimen/inputPadding">
+
+                        <TextView
+                            android:id="@+id/storeTextField"
+                            android:text="@string/storeTextColorTitle"
+                            android:layout_height="match_parent"
+                            android:layout_width="wrap_content"
+                            android:textSize="@dimen/inputSize"
+                            android:padding="@dimen/inputPadding"
+                            app:layout_constraintStart_toStartOf="parent"/>
+
+                        <android.support.constraint.ConstraintLayout
+                            android:id="@+id/headingStoreTextColorSampleBorder"
+                            android:layout_width="0dp"
+                            android:layout_height="0dp"
+                            android:layout_margin="@dimen/colorSamplePadding"
+                            app:layout_constraintStart_toEndOf="@id/storeTextField"
+                            app:layout_constraintEnd_toStartOf="@+id/headingStoreTextColorSelectButton"
+                            app:layout_constraintTop_toTopOf="parent"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            android:background="@android:color/black">
+                            <ImageView
+                                android:id="@+id/headingStoreTextColorSample"
+                                android:layout_width="0dp"
+                                android:layout_height="0dp"
+                                android:layout_margin="1dp"
+                                app:layout_constraintStart_toStartOf="parent"
+                                app:layout_constraintEnd_toEndOf="parent"
+                                app:layout_constraintTop_toTopOf="parent"
+                                app:layout_constraintBottom_toBottomOf="parent"
+                                android:background="@android:color/white"
+                                android:contentDescription="@string/storeNameColorDescription"/>
+                        </android.support.constraint.ConstraintLayout>
+
+                        <Button
+                            android:id="@+id/headingStoreTextColorSelectButton"
+                            android:text="@string/change"
+                            android:padding="@dimen/inputPadding"
+                            android:layout_width="wrap_content"
+                            android:layout_height="match_parent"
+                            android:layout_toEndOf="@id/headingStoreTextColorSampleBorder"
+                            app:layout_constraintEnd_toEndOf="parent"/>
+                    </android.support.constraint.ConstraintLayout>

                    <View
                        android:gravity="end"
--- a/app/src/main/res/layout/loyalty_card_view_layout.xml
+++ b/app/src/main/res/layout/loyalty_card_view_layout.xml
@@ -15,35 +15,77 @@
        android:layout_height="fill_parent"
        app:layout_behavior="@string/appbar_scrolling_view_behavior">

-        <LinearLayout
+        <android.support.constraint.ConstraintLayout
            android:layout_width="fill_parent"
            android:layout_height="match_parent"
            android:orientation="vertical">

+            <android.support.constraint.Guideline
+                android:id="@+id/centerGuideline"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                app:layout_constraintGuide_percent="0.5"/>
+
            <ImageView
                android:id="@+id/barcode"
-                android:layout_width="fill_parent"
-                android:layout_height="0.0px"
+                android:layout_width="0dp"
+                android:layout_height="0dp"
                android:layout_marginTop="20.0dip"
                android:layout_marginBottom="10.0dip"
-                android:layout_weight="0.1"
-                android:layout_gravity="center_horizontal"
+                android:layout_marginStart="15.0dip"
+                android:layout_marginEnd="15.0dip"
+                app:layout_constraintBottom_toTopOf="@+id/centerGuideline"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
                android:contentDescription="@string/barcodeImageDescription"/>

            <TextView
                android:id="@+id/cardIdView"
-                android:textSize="42.0sp"
-                android:layout_width="match_parent"
-                android:layout_height="0px"
+                android:layout_width="0dp"
+                android:layout_height="0dp"
                android:layout_marginLeft="10.0dip"
                android:layout_marginRight="10.0dip"
-                android:maxLines="1"
-                android:layout_weight="0.1"
+                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"
+                app:autoSizeTextType="uniform"
+                app:autoSizeMinTextSize="@dimen/singleCardCardIdTextSizeMin"
+                app:autoSizeMaxTextSize="@dimen/singleCardCardIdTextSizeMax"
                android:ellipsize="end"
-                android:text="1234567890"/>
+                android:textIsSelectable="true"/>

-        </LinearLayout>
+            <View
+                android:id="@id/noteViewDivider"
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:background="@android:color/black"
+                app:layout_constraintTop_toBottomOf="@id/cardIdView"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintBottom_toBottomOf="@+id/noteView"
+                />
+
+            <TextView
+                android:id="@id/noteView"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="10.0dip"
+                android:ellipsize="end"
+                android:layout_gravity="bottom"
+                app:layout_constraintTop_toBottomOf="@id/noteViewDivider"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:autoSizeTextType="uniform"
+                app:autoSizeMinTextSize="@dimen/singleCardNoteTextSizeMin"
+                app:autoSizeMaxTextSize="@dimen/singleCardNoteTextSizeMax"
+                android:textIsSelectable="true"/>
+
+        </android.support.constraint.ConstraintLayout>

        <View
            android:id="@+id/drop_shadow_actionbar"
@@ -73,10 +115,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"/>
--- a/app/src/main/res/menu/main_menu.xml
+++ b/app/src/main/res/menu/main_menu.xml
@@ -12,6 +12,10 @@
        android:icon="@drawable/ic_import_export_white_24dp"
        android:title="@string/importExport"
        app:showAsAction="ifRoom"/>
+    <item
+        android:id="@+id/action_settings"
+        android:title="@string/settings"
+        app:showAsAction="never"/>
    <item
        android:id="@+id/action_intro"
        android:title="@string/startIntro"
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -13,24 +13,34 @@

    <string name="cancel">Abbrechen</string>
    <string name="save">Speichern</string>
-    <string name="capture">Karte erfassen</string>
-    <string name="enterCard">Karte einfügen</string>
+    <string name="capture">Karte scannen</string>
+    <string name="enterCard">Manuell eingeben</string>
    <string name="editCard">Karte bearbeiten</string>
    <string name="edit">Bearbeiten</string>
    <string name="delete">Löschen</string>
    <string name="confirm">Bestätigen</string>
+    <string name="lockScreen">Rotation blockieren</string>
+    <string name="unlockScreen">Rotation zulassen</string>
+    <string name="deleteTitle">Karte entfernen</string>
    <string name="deleteConfirmation">Bitte bestätigen Sie, dass diese Karte gelöscht werden soll.</string>
    <string name="ok">Ok</string>
    <string name="copy_to_clipboard">Kopiere die Nummer in die Zwischenablage</string>
    <string name="sendLabel">Senden&#8230;</string>
+    <string name="addedShortcut">Zum Home Screen hinzugefügt</string>
+
    <string name="editCardTitle">Kundenkarte bearbeiten</string>
    <string name="addCardTitle">Neue Kundenkarte</string>
    <string name="viewCardTitle">Kundenkarte anzeigen</string>
    <string name="scanCardBarcode">Barcode scannen</string>
+    <string name="cardShortcut">Shortcut zu einer Karte</string>
+    <string name="noCardsMessage">Es ist noch keine Karte vorhanden, bitte zuerst eine hinzufügen</string>
+
    <string name="barcodeImageDescription">Bild des Barcodes</string>

    <string name="noStoreError">Kein Geschäft angegeben</string>
    <string name="noCardIdError">Keine Kartennummer angegeben</string>
+    <string name="noCardExistsError">Karte konnte nicht gefunden werden</string>
+
    <string name="cardIdFormat">%1$s: %2$s</string>
    <string name="importExport">Import/Export</string>
    <string name="importName">Import</string>
@@ -86,4 +96,5 @@
    <string name="intro5Description">Sie können selbstverständlich Backups anlegen. Um Karten zu exportieren oder importieren wählen Sie Import/Export im Menü auf dem Hauptbildschirm.\n\n</string>
    <string name="intro6Title">Feedback\n</string>
    <string name="intro6Description">Diese App enthält keine Werbung, und ist freie und quelloffene Software. Für Details berühren Sie Über im Menü auf der Hauptseite.\n\nHinterlassen Sie uns ein Feedback im App-Store (:</string>
+
 </resources>
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -83,6 +83,8 @@

    <string name="copy_to_clipboard_toast">Numéro de carte copié dans le presse-papier</string>

+    <string name="thumbnailDescription">Vignette pour la carte</string>
+
    <string name="startIntro">Présentation</string>
    <string name="intro1Title">Bienvenue dans\nLoyalty Card Keychain\n</string>
    <string name="intro1Description">Gérez vos cartes de fidélité\nsur votre téléphone !\n\n</string>
@@ -96,4 +98,5 @@
    <string name="intro5Description">Les cartes peuvent être sauvegardées. Touchez \'Importer/Exporter\' sur l\'écran principal pour restaurer ou sauvegarder les cartes.\n\n</string>
    <string name="intro6Title">Votre avis\n</string>
    <string name="intro6Description">Cette application est gratuite, sans publicité, et son code est ouvert. Découvrez-en plus en touchant \'à propos\' sur l\'écran principal.\n\nLaissez un commentaire sur votre magasin d\'applications (:</string>
+
 </resources>
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -94,4 +94,5 @@
    <string name="intro5Description">I dati delle tessere possono essere salvati. Per esportare o importare tessere premi Importa/Esporta nel menù nella schermata principale.\n\n</string>
    <string name="intro6Title">Feedback\n</string>
    <string name="intro6Description">Questa app è gratuita, priva di pubblicità e open source. Guarda i dettagli premendo su Informazioni nella schermata principale.\n\nPer favore, lascia un feedback nell\'app store! (:</string>
+
 </resources>
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -76,7 +76,7 @@
    <string name="debug_version_fmt">Versie: <xliff:g id="version">%s</xliff:g></string>
    <string name="app_revision_fmt">Revisieïnformatie: <xliff:g id="app_revision_url">%s</xliff:g></string>
    <string name="app_libraries"><xliff:g id="app_name">%s</xliff:g> gebruikt de volgende bibliotheken van derden: <xliff:g id="app_libraries_list">%s</xliff:g></string>
-    <string name="app_resources"><xliff:g id="app_name">%s</xliff:g> gebruikt de volgende bronnen van derden: <xliff:g id="app_resources_list\">%s</xliff:g></string>
+    <string name="app_resources"><xliff:g id="app_name">%s</xliff:g> gebruikt de volgende bronnen van derden: <xliff:g id="app_resources_list">%s</xliff:g></string>

 <string name="selectBarcodeTitle">Selecteer barcode</string>
 <string name="enterBarcodeInstructions">Voer de waarde van de barcode in en kies daarna de afbeelding die de barcode die je wil gebruiken representeert</string>
@@ -96,4 +96,5 @@
 <string name="intro5Description">De kaarten kunnen worden geback-upt. Om te kaarten te exporteren of importeren, raak in het menu in het hoofdscherm Importeer/Exporteer aan.\n\n</string>
 <string name="intro6Title">Terugkoppeling\n</string>
 <string name="intro6Description">Deze app is gratis, vrije van advertenties en opensource. Zie details door Over aan te raken in het menu op het hoofdscher,.\n\nBeschrijft je ervaring in de app store! (:</string>
+
    </resources>
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -0,0 +1,45 @@
+<resources
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+    <string name="app_name">Брелок карт лояльности</string>
+    <string name="action_add">Добавить</string>
+
+    <string name="noGiftCards">На данный момент у Вас нет ни одной карты лояльности. Нажмите на кнопку «+» (плюс) вверху, чтобы добавить первую карту.\n\n «Брелок карт лояльности» позволит Вам хранить скидочные карты в Вашем телефоне, чтобы они всегда были под рукой.</string>
+
+    <string name="storeName">Организация</string>
+    <string name="note">Заметка</string>
+    <string name="cardId">ID карты</string>
+    <string name="barcodeType">Тип штрих-кода</string>
+
+    <string name="cancel">Отмена</string>
+    <string name="save">Сохранить</string>
+    <string name="capture">Просканировать карту</string>
+    <string name="enterCard">Ввести вручную</string>
+    <string name="editCard">Редактировать карту</string>
+    <string name="edit">Редактировать</string>
+    <string name="delete">Удалить</string>
+    <string name="confirm">Подтвердить</string>
+    <string name="deleteTitle">Удалить карту лояльности</string>
+    <string name="deleteConfirmation">Вы действительно хотите удалить эту карту?</string>
+    <string name="ok">OK</string>
+    <string name="copy_to_clipboard">Скопировать идентификатор в буфер обмена</string>
+    <string name="sendLabel">Отправить&#8230;</string>
+    <string name="addedShortcut">Карта добавлена на главный экран.</string>
+
+    <string name="editCardTitle">Редактировать карточку лояльности</string>
+    <string name="addCardTitle">Добавить карточку лояльности</string>
+    <string name="thumbnailDescription">Логорип карты</string>
+
+    <string name="startIntro">Введение</string>
+    <string name="intro1Title">Добро пожаловать в программу «Брелок карт лояльности»\n</string>
+    <string name="intro2Title">Добавление карт\n</string>
+    <string name="intro2Description">Добавьте новую карту, коснувшись кнопки плюса на главной странице.\n\n</string>
+    <string name="intro3Title">Добавление карт\n</string>
+    <string name="intro4Title">Показать карточку\n</string>
+    <string name="intro4Description">Чтобы перейти к просмотру карты, нажмите на название организации на главной странице.\n\n</string>
+    <string name="intro5Title">Резервное копирование\n</string>
+    <string name="intro5Description">Вы можете сохранить карты во внешнее хранилище. Чтобы экспортировать или импортировать данные карты, нажмите «Импорт/Экспорт» в меню на главной странице.\n\n</string>
+    <string name="intro6Title">Обратная связь\n</string>
+    <string name="intro6Description">Это бесплатное приложение, не обремененное рекламой и с открытым исходным кодом. Подробнее см. в разделе «О программе» в меню на главной странице.\n\nПожалуйста, оставьте отзыв в магазине приложений! (:</string>
+
+</resources>
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -14,9 +14,15 @@
    <dimen name="storeNameTextSize">28sp</dimen>
    <dimen name="noteTextSize">14sp</dimen>

+    <dimen name="singleCardCardIdTextSizeMin">15sp</dimen>
+    <dimen name="singleCardCardIdTextSizeMax">50sp</dimen>
+    <dimen name="singleCardNoteTextSizeMin">25sp</dimen>
+    <dimen name="singleCardNoteTextSizeMax">50sp</dimen>
+
    <dimen name="inputBorderThickness">2dip</dimen>
    <dimen name="inputBorderDividerThickness">4dip</dimen>
    <dimen name="inputPadding">20dip</dimen>
+    <dimen name="colorSamplePadding">10dip</dimen>
    <dimen name="inputSize">18sp</dimen>

    <dimen name="cardThumbnailSize">46dp</dimen>
--- a/app/src/main/res/values/settings.xml
+++ b/app/src/main/res/values/settings.xml
@@ -10,4 +10,23 @@
        <item>#2093cd</item>
        <item>#ad62a7</item>
    </array>
+
+    <!-- Default values -->
+    <integer name="settings_card_title_list_font_size_sp">28</integer>
+    <integer name="settings_card_note_list_font_size_sp">14</integer>
+    <integer name="settings_card_title_font_size_sp">40</integer>
+    <integer name="settings_card_id_font_size_sp">50</integer>
+    <integer name="settings_card_note_font_size_sp">50</integer>
+
+    <!-- Constraints -->
+    <integer name="settings_card_title_list_max_font_size_sp">40</integer>
+    <integer name="settings_card_title_list_min_font_size_sp">16</integer>
+    <integer name="settings_card_note_list_max_font_size_sp">25</integer>
+    <integer name="settings_card_note_list_min_font_size_sp">10</integer>
+    <integer name="settings_card_title_max_font_size_sp">50</integer>
+    <integer name="settings_card_title_min_font_size_sp">16</integer>
+    <integer name="settings_card_id_max_font_size_sp">50</integer>
+    <integer name="settings_card_id_min_font_size_sp">16</integer>
+    <integer name="settings_card_note_max_font_size_sp">50</integer>
+    <integer name="settings_card_note_min_font_size_sp">26</integer>
 </resources>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -100,4 +100,24 @@
    <string name="intro5Description">The cards can be backed-up. To export or import card data touch Import/Export in the menu on the main page.\n\n</string>
    <string name="intro6Title">Feedback\n</string>
    <string name="intro6Description">This app is free, ad-free, and open source. See details by touching About in the menu on the main page.\n\nPlease leave feedback in the app store! (:</string>
+
+    <string name="change">Change</string>
+    <string name="storeTextColorTitle">Store Text Color</string>
+    <string name="storeTextBackgroundColorTitle">Heading Color</string>
+    <string name="storeNameBackgroundColorDescription">Color for store text background</string>
+    <string name="storeNameColorDescription">Color for store text</string>
+
+    <string name="settings">Settings</string>
+    <string name="settings_category_title_ui">User interface</string>
+    <string name="settings_card_title_list_font_size">Card title list font size</string>
+    <string name="settings_key_card_title_list_font_size" translatable="false">pref_card_title_list_font_size_sp</string>
+    <string name="settings_card_note_list_font_size">Card note list font size</string>
+    <string name="settings_key_card_note_list_font_size" translatable="false">pref_card_note_list_font_size_sp</string>
+    <string name="settings_card_title_font_size">Card title font size</string>
+    <string name="settings_key_card_title_font_size" translatable="false">pref_card_title_font_size_sp</string>
+    <string name="settings_card_id_font_size">Card ID font size</string>
+    <string name="settings_key_card_id_font_size" translatable="false">pref_card_id_font_size_sp</string>
+    <string name="settings_card_note_font_size">Card note font size</string>
+    <string name="settings_key_card_note_font_size" translatable="false">pref_card_note_font_size_sp</string>
+
 </resources>
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <PreferenceCategory
+        android:title="@string/settings_category_title_ui">
+
+        <com.vanniktech.vntnumberpickerpreference.VNTNumberPickerPreference
+            android:key="@string/settings_key_card_title_list_font_size"
+            android:title="@string/settings_card_title_list_font_size"
+            android:defaultValue="@integer/settings_card_title_list_font_size_sp"
+            app:vnt_maxValue="@integer/settings_card_title_list_max_font_size_sp"
+            app:vnt_minValue="@integer/settings_card_title_list_min_font_size_sp" />
+
+        <com.vanniktech.vntnumberpickerpreference.VNTNumberPickerPreference
+            android:key="@string/settings_key_card_note_list_font_size"
+            android:title="@string/settings_card_note_list_font_size"
+            android:defaultValue="@integer/settings_card_note_list_font_size_sp"
+            app:vnt_maxValue="@integer/settings_card_note_list_max_font_size_sp"
+            app:vnt_minValue="@integer/settings_card_note_list_min_font_size_sp" />
+
+        <com.vanniktech.vntnumberpickerpreference.VNTNumberPickerPreference
+            android:key="@string/settings_key_card_title_font_size"
+            android:title="@string/settings_card_title_font_size"
+            android:defaultValue="@integer/settings_card_title_font_size_sp"
+            app:vnt_maxValue="@integer/settings_card_title_max_font_size_sp"
+            app:vnt_minValue="@integer/settings_card_title_min_font_size_sp"/>
+
+        <com.vanniktech.vntnumberpickerpreference.VNTNumberPickerPreference
+            android:key="@string/settings_key_card_id_font_size"
+            android:title="@string/settings_card_id_font_size"
+            android:defaultValue="@integer/settings_card_id_font_size_sp"
+            app:vnt_maxValue="@integer/settings_card_id_max_font_size_sp"
+            app:vnt_minValue="@integer/settings_card_id_min_font_size_sp" />
+
+        <com.vanniktech.vntnumberpickerpreference.VNTNumberPickerPreference
+            android:key="@string/settings_key_card_note_font_size"
+            android:title="@string/settings_card_note_font_size"
+            android:defaultValue="@integer/settings_card_note_font_size_sp"
+            app:vnt_maxValue="@integer/settings_card_note_max_font_size_sp"
+            app:vnt_minValue="@integer/settings_card_note_min_font_size_sp" />
+
+    </PreferenceCategory>
+
+</PreferenceScreen>
--- a/app/src/test/java/protect/card_locker/DatabaseTest.java
+++ b/app/src/test/java/protect/card_locker/DatabaseTest.java
@@ -4,6 +4,7 @@ import android.app.Activity;
 import android.content.ContentValues;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
+import android.graphics.Color;

 import com.google.zxing.BarcodeFormat;

@@ -25,6 +26,9 @@ public class DatabaseTest
 {
    private DBHelper db;

+    private static final Integer DEFAULT_HEADER_COLOR = Color.BLACK;
+    private static final Integer DEFAULT_HEADER_TEXT_COLOR = Color.WHITE;
+
    @Before
    public void setUp()
    {
@@ -36,7 +40,7 @@ public class DatabaseTest
    public void addRemoveOneGiftCard()
    {
        assertEquals(0, db.getLoyaltyCardCount());
-        long id = db.insertLoyaltyCard("store", "note", "cardId", BarcodeFormat.UPC_A.toString());
+        long id = db.insertLoyaltyCard("store", "note", "cardId", BarcodeFormat.UPC_A.toString(), DEFAULT_HEADER_COLOR, DEFAULT_HEADER_TEXT_COLOR);
        boolean result = (id != -1);
        assertTrue(result);
        assertEquals(1, db.getLoyaltyCardCount());
@@ -57,12 +61,12 @@ public class DatabaseTest
    @Test
    public void updateGiftCard()
    {
-        long id = db.insertLoyaltyCard("store", "note", "cardId", BarcodeFormat.UPC_A.toString());
+        long id = db.insertLoyaltyCard("store", "note", "cardId", BarcodeFormat.UPC_A.toString(), DEFAULT_HEADER_COLOR, DEFAULT_HEADER_TEXT_COLOR);
        boolean result = (id != -1);
        assertTrue(result);
        assertEquals(1, db.getLoyaltyCardCount());

-        result = db.updateLoyaltyCard(1, "store1", "note1", "cardId1", BarcodeFormat.AZTEC.toString());
+        result = db.updateLoyaltyCard(1, "store1", "note1", "cardId1", BarcodeFormat.AZTEC.toString(), DEFAULT_HEADER_COLOR, DEFAULT_HEADER_TEXT_COLOR);
        assertTrue(result);
        assertEquals(1, db.getLoyaltyCardCount());

@@ -80,7 +84,7 @@ public class DatabaseTest
        assertEquals(0, db.getLoyaltyCardCount());

        boolean result = db.updateLoyaltyCard(1, "store1", "note1", "cardId1",
-                BarcodeFormat.UPC_A.toString());
+                BarcodeFormat.UPC_A.toString(), DEFAULT_HEADER_COLOR, DEFAULT_HEADER_TEXT_COLOR);
        assertEquals(false, result);
        assertEquals(0, db.getLoyaltyCardCount());
    }
@@ -88,7 +92,7 @@ public class DatabaseTest
    @Test
    public void emptyGiftCardValues()
    {
-        long id = db.insertLoyaltyCard("", "", "", "");
+        long id = db.insertLoyaltyCard("", "", "", "", null, null);
        boolean result = (id != -1);
        assertTrue(result);
        assertEquals(1, db.getLoyaltyCardCount());
@@ -111,7 +115,7 @@ public class DatabaseTest
        for(int index = CARDS_TO_ADD-1; index >= 0; index--)
        {
            long id = db.insertLoyaltyCard("store" + index, "note" + index, "cardId" + index,
-                    BarcodeFormat.UPC_A.toString());
+                    BarcodeFormat.UPC_A.toString(), index, index*2);
            boolean result = (id != -1);
            assertTrue(result);
        }
@@ -130,7 +134,10 @@ public class DatabaseTest
            assertEquals("store"+index, cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.STORE)));
            assertEquals("note"+index, cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.NOTE)));
            assertEquals("cardId"+index, cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.CARD_ID)));
+            assertEquals("cardId"+index, cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.CARD_ID)));
            assertEquals(BarcodeFormat.UPC_A.toString(), cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.BARCODE_TYPE)));
+            assertEquals(index, cursor.getInt(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.HEADER_COLOR)));
+            assertEquals(index*2, cursor.getInt(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.HEADER_TEXT_COLOR)));

            cursor.moveToNext();
        }
@@ -184,6 +191,8 @@ public class DatabaseTest
        assertEquals("cardId", card.cardId);
        assertEquals(BarcodeFormat.UPC_A.toString(), card.barcodeType);
        assertEquals("", card.note);
+        assertEquals(null, card.headerColor);
+        assertEquals(null, card.headerTextColor);

        database.close();
    }
--- a/app/src/test/java/protect/card_locker/ImportExportTest.java
+++ b/app/src/test/java/protect/card_locker/ImportExportTest.java
@@ -7,6 +7,7 @@ import android.os.Environment;

 import com.google.zxing.BarcodeFormat;

+import org.apache.tools.ant.filters.StringInputStream;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -22,10 +23,12 @@ import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
+import java.nio.charset.StandardCharsets;
 import java.util.Calendar;

 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;

@RunWith(RobolectricTestRunner.class)
@@ -65,7 +68,7 @@ public class ImportExportTest
        {
            String storeName = String.format("store, \"%4d", index);
            String note = String.format("note, \"%4d", index);
-            long id = db.insertLoyaltyCard(storeName, note, BARCODE_DATA, BARCODE_TYPE);
+            long id = db.insertLoyaltyCard(storeName, note, BARCODE_DATA, BARCODE_TYPE, index, index*2);
            boolean result = (id != -1);
            assertTrue(result);
        }
@@ -94,6 +97,8 @@ public class ImportExportTest
            assertEquals(expectedNote, card.note);
            assertEquals(BARCODE_DATA, card.cardId);
            assertEquals(BARCODE_TYPE, card.barcodeType);
+            assertEquals(Integer.valueOf(index), card.headerColor);
+            assertEquals(Integer.valueOf(index*2), card.headerTextColor);

            index++;
        }
@@ -276,4 +281,86 @@ public class ImportExportTest
            clearDatabase();
        }
    }
+
+    @Test
+    public void importWithoutColors() throws IOException
+    {
+        String csvText = "";
+        csvText += DBHelper.LoyaltyCardDbIds.ID + "," +
+                       DBHelper.LoyaltyCardDbIds.STORE + "," +
+                       DBHelper.LoyaltyCardDbIds.NOTE + "," +
+                       DBHelper.LoyaltyCardDbIds.CARD_ID + "," +
+                       DBHelper.LoyaltyCardDbIds.BARCODE_TYPE + "\n";
+        csvText += "1,store,note,12345,type";
+
+        ByteArrayInputStream inputStream = new ByteArrayInputStream(csvText.getBytes(StandardCharsets.UTF_8));
+        InputStreamReader inStream = new InputStreamReader(inputStream);
+
+        // Import the CSV data
+        boolean result = MultiFormatImporter.importData(db, inStream, DataFormat.CSV);
+        assertTrue(result);
+        assertEquals(1, db.getLoyaltyCardCount());
+
+        LoyaltyCard card = db.getLoyaltyCard(1);
+
+        assertEquals("store", card.store);
+        assertEquals("note", card.note);
+        assertEquals("12345", card.cardId);
+        assertEquals("type", card.barcodeType);
+        assertNull(card.headerColor);
+        assertNull(card.headerTextColor);
+    }
+
+    @Test
+    public void importWithoutNullColors() throws IOException
+    {
+        String csvText = "";
+        csvText += DBHelper.LoyaltyCardDbIds.ID + "," +
+                DBHelper.LoyaltyCardDbIds.STORE + "," +
+                DBHelper.LoyaltyCardDbIds.NOTE + "," +
+                DBHelper.LoyaltyCardDbIds.CARD_ID + "," +
+                DBHelper.LoyaltyCardDbIds.BARCODE_TYPE + "," +
+                DBHelper.LoyaltyCardDbIds.HEADER_COLOR + "," +
+                DBHelper.LoyaltyCardDbIds.HEADER_TEXT_COLOR + "\n";
+        csvText += "1,store,note,12345,type,,";
+
+        ByteArrayInputStream inputStream = new ByteArrayInputStream(csvText.getBytes(StandardCharsets.UTF_8));
+        InputStreamReader inStream = new InputStreamReader(inputStream);
+
+        // Import the CSV data
+        boolean result = MultiFormatImporter.importData(db, inStream, DataFormat.CSV);
+        assertTrue(result);
+        assertEquals(1, db.getLoyaltyCardCount());
+
+        LoyaltyCard card = db.getLoyaltyCard(1);
+
+        assertEquals("store", card.store);
+        assertEquals("note", card.note);
+        assertEquals("12345", card.cardId);
+        assertEquals("type", card.barcodeType);
+        assertNull(card.headerColor);
+        assertNull(card.headerTextColor);
+    }
+
+    @Test
+    public void importWithoutInvalidColors() throws IOException
+    {
+        String csvText = "";
+        csvText += DBHelper.LoyaltyCardDbIds.ID + "," +
+                DBHelper.LoyaltyCardDbIds.STORE + "," +
+                DBHelper.LoyaltyCardDbIds.NOTE + "," +
+                DBHelper.LoyaltyCardDbIds.CARD_ID + "," +
+                DBHelper.LoyaltyCardDbIds.BARCODE_TYPE + "," +
+                DBHelper.LoyaltyCardDbIds.HEADER_COLOR + "," +
+                DBHelper.LoyaltyCardDbIds.HEADER_TEXT_COLOR + "\n";
+        csvText += "1,store,note,12345,type,not a number,invalid";
+
+        ByteArrayInputStream inputStream = new ByteArrayInputStream(csvText.getBytes(StandardCharsets.UTF_8));
+        InputStreamReader inStream = new InputStreamReader(inputStream);
+
+        // Import the CSV data
+        boolean result = MultiFormatImporter.importData(db, inStream, DataFormat.CSV);
+        assertEquals(false, result);
+        assertEquals(0, db.getLoyaltyCardCount());
+    }
 }
--- a/app/src/test/java/protect/card_locker/LoyaltyCardCursorAdapterTest.java
+++ b/app/src/test/java/protect/card_locker/LoyaltyCardCursorAdapterTest.java
@@ -1,7 +1,10 @@
 package protect.card_locker;

 import android.app.Activity;
+import android.content.SharedPreferences;
 import android.database.Cursor;
+import android.graphics.Color;
+import android.preference.PreferenceManager;
 import android.view.View;
 import android.widget.TextView;

@@ -22,12 +25,22 @@ public class LoyaltyCardCursorAdapterTest
 {
    private Activity activity;
    private DBHelper db;
+    private SharedPreferences settings;

    @Before
    public void setUp()
    {
        activity = Robolectric.setupActivity(MainActivity.class);
        db = new DBHelper(activity);
+        settings = PreferenceManager.getDefaultSharedPreferences(activity);
+    }
+
+    private void setFontSizes(int storeFontSize, int noteFontSize)
+    {
+        settings.edit()
+            .putInt(activity.getResources().getString(R.string.settings_key_card_title_list_font_size), storeFontSize)
+            .putInt(activity.getResources().getString(R.string.settings_key_card_note_list_font_size), noteFontSize)
+            .apply();
    }

    private View createView(Cursor cursor)
@@ -40,12 +53,21 @@ public class LoyaltyCardCursorAdapterTest
        return view;
    }

-    private void checkView(final View view, final String store, final String note)
+    private void checkView(final View view, final String store, final String note, boolean checkFontSizes)
    {
        final TextView storeField = view.findViewById(R.id.store);
-        assertEquals(store, storeField.getText().toString());
-
        final TextView noteField = view.findViewById(R.id.note);
+
+        if(checkFontSizes)
+        {
+            int storeFontSize = settings.getInt(activity.getResources().getString(R.string.settings_key_card_title_list_font_size), 0);
+            int noteFontSize = settings.getInt(activity.getResources().getString(R.string.settings_key_card_note_list_font_size), 0);
+
+            assertEquals(storeFontSize, (int)storeField.getTextSize());
+            assertEquals(noteFontSize, (int)noteField.getTextSize());
+        }
+
+        assertEquals(store, storeField.getText().toString());
        if(note.isEmpty() == false)
        {
            assertEquals(View.VISIBLE, noteField.getVisibility());
@@ -61,7 +83,7 @@ public class LoyaltyCardCursorAdapterTest
    @Test
    public void TestCursorAdapterEmptyNote()
    {
-        db.insertLoyaltyCard("store", "", "cardId", BarcodeFormat.UPC_A.toString());
+        db.insertLoyaltyCard("store", "", "cardId", BarcodeFormat.UPC_A.toString(), Color.BLACK, Color.WHITE);
        LoyaltyCard card = db.getLoyaltyCard(1);

        Cursor cursor = db.getLoyaltyCardCursor();
@@ -69,13 +91,13 @@ public class LoyaltyCardCursorAdapterTest

        View view = createView(cursor);

-        checkView(view, card.store, card.note);
+        checkView(view, card.store, card.note, false);
    }

    @Test
    public void TestCursorAdapterWithNote()
    {
-        db.insertLoyaltyCard("store", "note", "cardId", BarcodeFormat.UPC_A.toString());
+        db.insertLoyaltyCard("store", "note", "cardId", BarcodeFormat.UPC_A.toString(), Color.BLACK, Color.WHITE);
        LoyaltyCard card = db.getLoyaltyCard(1);

        Cursor cursor = db.getLoyaltyCardCursor();
@@ -83,6 +105,24 @@ public class LoyaltyCardCursorAdapterTest

        View view = createView(cursor);

-        checkView(view, card.store, card.note);
+        checkView(view, card.store, card.note, false);
+    }
+
+    @Test
+    public void TestCursorAdapterFontSizes()
+    {
+        db.insertLoyaltyCard("store", "note", "cardId", BarcodeFormat.UPC_A.toString(), Color.BLACK, Color.WHITE);
+        LoyaltyCard card = db.getLoyaltyCard(1);
+
+        Cursor cursor = db.getLoyaltyCardCursor();
+        cursor.moveToFirst();
+
+        setFontSizes(1, 2);
+        View view = createView(cursor);
+        checkView(view, card.store, card.note, true);
+
+        setFontSizes(30, 31);
+        view = createView(cursor);
+        checkView(view, card.store, card.note, true);
    }
 }
--- a/app/src/test/java/protect/card_locker/LoyaltyCardViewActivityTest.java
+++ b/app/src/test/java/protect/card_locker/LoyaltyCardViewActivityTest.java
@@ -2,10 +2,14 @@ package protect.card_locker;

 import android.app.Activity;
 import android.content.Intent;
+import android.content.SharedPreferences;
 import android.content.pm.ActivityInfo;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.ResolveInfo;
+import android.graphics.Color;
 import android.os.Bundle;
+import android.preference.PreferenceManager;
+import android.support.v4.widget.TextViewCompat;
 import android.view.Menu;
 import android.view.View;
 import android.widget.Button;
@@ -29,7 +33,6 @@ import org.robolectric.android.controller.ActivityController;

 import java.io.IOException;

-import static junit.framework.Assert.assertNull;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
@@ -123,6 +126,8 @@ public class LoyaltyCardViewActivityTest
        assertEquals(note, card.note);
        assertEquals(cardId, card.cardId);
        assertEquals(barcodeType, card.barcodeType);
+        assertNotNull(card.headerColor);
+        assertNotNull(card.headerTextColor);
    }

    /**
@@ -185,13 +190,10 @@ public class LoyaltyCardViewActivityTest
        {
            int captureVisibility = (mode == ViewMode.UPDATE_CARD || mode == ViewMode.ADD_CARD) ? View.VISIBLE : View.GONE;

-            int viewVisibility = View.GONE;
            int editVisibility = View.VISIBLE;

            checkFieldProperties(activity, R.id.storeNameEdit, editVisibility, store);
-            checkFieldProperties(activity, R.id.storeNameView, viewVisibility, store);
            checkFieldProperties(activity, R.id.noteEdit, editVisibility, note);
-            checkFieldProperties(activity, R.id.noteView, viewVisibility, note);
            checkFieldProperties(activity, R.id.cardIdView, View.VISIBLE, cardId);
            checkFieldProperties(activity, R.id.cardIdDivider, cardId.isEmpty() ? View.GONE : View.VISIBLE, null);
            checkFieldProperties(activity, R.id.cardIdTableRow, cardId.isEmpty() ? View.GONE : View.VISIBLE, null);
@@ -357,7 +359,7 @@ public class LoyaltyCardViewActivityTest
        Activity activity = (Activity)activityController.get();
        DBHelper db = new DBHelper(activity);

-        db.insertLoyaltyCard("store", "note", BARCODE_DATA, BARCODE_TYPE);
+        db.insertLoyaltyCard("store", "note", BARCODE_DATA, BARCODE_TYPE, Color.BLACK, Color.WHITE);

        activityController.start();
        activityController.visible();
@@ -373,7 +375,7 @@ public class LoyaltyCardViewActivityTest
        Activity activity = (Activity)activityController.get();
        DBHelper db = new DBHelper(activity);

-        db.insertLoyaltyCard("store", "note", BARCODE_DATA, BARCODE_TYPE);
+        db.insertLoyaltyCard("store", "note", BARCODE_DATA, BARCODE_TYPE, Color.BLACK, Color.WHITE);

        activityController.start();
        activityController.visible();
@@ -389,7 +391,7 @@ public class LoyaltyCardViewActivityTest
        Activity activity = (Activity)activityController.get();
        DBHelper db = new DBHelper(activity);

-        db.insertLoyaltyCard("store", "note", EAN_BARCODE_DATA, EAN_BARCODE_TYPE);
+        db.insertLoyaltyCard("store", "note", EAN_BARCODE_DATA, EAN_BARCODE_TYPE, Color.BLACK, Color.WHITE);

        activityController.start();
        activityController.visible();
@@ -410,7 +412,7 @@ public class LoyaltyCardViewActivityTest
        Activity activity = (Activity)activityController.get();
        DBHelper db = new DBHelper(activity);

-        db.insertLoyaltyCard("store", "note", EAN_BARCODE_DATA, EAN_BARCODE_TYPE);
+        db.insertLoyaltyCard("store", "note", EAN_BARCODE_DATA, EAN_BARCODE_TYPE, Color.BLACK, Color.WHITE);

        activityController.start();
        activityController.visible();
@@ -436,7 +438,7 @@ public class LoyaltyCardViewActivityTest
        Activity activity = (Activity)activityController.get();
        DBHelper db = new DBHelper(activity);

-        db.insertLoyaltyCard("store", "note", BARCODE_DATA, BARCODE_TYPE);
+        db.insertLoyaltyCard("store", "note", BARCODE_DATA, BARCODE_TYPE, Color.BLACK, Color.WHITE);

        activityController.start();
        activityController.visible();
@@ -479,7 +481,7 @@ public class LoyaltyCardViewActivityTest

        Activity activity = (Activity)activityController.get();
        DBHelper db = new DBHelper(activity);
-        db.insertLoyaltyCard("store", "note", BARCODE_DATA, BARCODE_TYPE);
+        db.insertLoyaltyCard("store", "note", BARCODE_DATA, BARCODE_TYPE, Color.BLACK, Color.WHITE);

        activityController.start();
        activityController.visible();
@@ -489,4 +491,79 @@ public class LoyaltyCardViewActivityTest
        shadowOf(activity).clickMenuItem(android.R.id.home);
        assertEquals(true, activity.isFinishing());
    }
+
+    @Test
+    public void startWithoutColors()
+    {
+        ActivityController activityController = createActivityWithLoyaltyCard(false);
+
+        Activity activity = (Activity)activityController.get();
+        DBHelper db = new DBHelper(activity);
+        db.insertLoyaltyCard("store", "note", BARCODE_DATA, BARCODE_TYPE, null, null);
+
+        activityController.start();
+        activityController.visible();
+        activityController.resume();
+
+        assertEquals(false, activity.isFinishing());
+        shadowOf(activity).clickMenuItem(android.R.id.home);
+        assertEquals(true, activity.isFinishing());
+    }
+
+    @Test
+    public void startLoyaltyCardWithoutColorsSave() throws IOException
+    {
+        ActivityController activityController = createActivityWithLoyaltyCard(true);
+
+        Activity activity = (Activity)activityController.get();
+        DBHelper db = new DBHelper(activity);
+        db.insertLoyaltyCard("store", "note", BARCODE_DATA, BARCODE_TYPE, null, null);
+
+        activityController.start();
+        activityController.visible();
+        activityController.resume();
+
+        // Save and check the gift card
+        saveLoyaltyCardWithArguments(activity, "store", "note", BARCODE_DATA, BARCODE_TYPE, false);
+    }
+
+    @Test
+    public void startCheckFontSizes()
+    {
+        ActivityController activityController = createActivityWithLoyaltyCard(false);
+
+        Activity activity = (Activity)activityController.get();
+        DBHelper db = new DBHelper(activity);
+        db.insertLoyaltyCard("store", "note", BARCODE_DATA, BARCODE_TYPE, Color.BLACK, Color.WHITE);
+
+        final int STORE_FONT_SIZE = 50;
+        final int CARD_FONT_SIZE = 40;
+        final int NOTE_FONT_SIZE = 30;
+
+        SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences(activity);
+        settings.edit()
+            .putInt(activity.getResources().getString(R.string.settings_key_card_title_font_size), STORE_FONT_SIZE)
+            .putInt(activity.getResources().getString(R.string.settings_key_card_id_font_size), CARD_FONT_SIZE)
+            .putInt(activity.getResources().getString(R.string.settings_key_card_note_font_size), NOTE_FONT_SIZE)
+            .apply();
+
+        activityController.start();
+        activityController.visible();
+        activityController.resume();
+
+        assertEquals(false, activity.isFinishing());
+
+        TextView storeName = activity.findViewById(R.id.storeName);
+        TextView cardIdFieldView = activity.findViewById(R.id.cardIdView);
+        TextView noteView = activity.findViewById(R.id.noteView);
+
+        TextViewCompat.getAutoSizeMaxTextSize(storeName);
+        TextViewCompat.getAutoSizeMaxTextSize(storeName);
+        assertEquals(STORE_FONT_SIZE, (int)storeName.getTextSize());
+        assertEquals(CARD_FONT_SIZE, TextViewCompat.getAutoSizeMaxTextSize(cardIdFieldView));
+        assertEquals(NOTE_FONT_SIZE, TextViewCompat.getAutoSizeMaxTextSize(noteView));
+
+        shadowOf(activity).clickMenuItem(android.R.id.home);
+        assertEquals(true, activity.isFinishing());
+    }
 }
--- a/app/src/test/java/protect/card_locker/MainActivityTest.java
+++ b/app/src/test/java/protect/card_locker/MainActivityTest.java
@@ -6,6 +6,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.database.Cursor;
+import android.graphics.Color;
 import android.os.Bundle;
 import android.view.Menu;
 import android.view.View;
@@ -65,12 +66,13 @@ public class MainActivityTest
        assertTrue(menu != null);

        // The settings and add button should be present
-        assertEquals(menu.size(), 4);
+        assertEquals(menu.size(), 5);

        assertEquals("Add", menu.findItem(R.id.action_add).getTitle().toString());
        assertEquals("Import/Export", menu.findItem(R.id.action_import_export).getTitle().toString());
        assertEquals("Start Intro", menu.findItem(R.id.action_intro).getTitle().toString());
        assertEquals("About", menu.findItem(R.id.action_about).getTitle().toString());
+        assertEquals("Settings", menu.findItem(R.id.action_settings).getTitle().toString());
    }

    @Test
@@ -101,7 +103,7 @@ public class MainActivityTest
        assertEquals(0, list.getCount());

        DBHelper db = new DBHelper(mainActivity);
-        db.insertLoyaltyCard("store", "note", "cardId", BarcodeFormat.UPC_A.toString());
+        db.insertLoyaltyCard("store", "note", "cardId", BarcodeFormat.UPC_A.toString(), Color.BLACK, Color.WHITE);

        assertEquals(View.VISIBLE, helpText.getVisibility());
        assertEquals(View.GONE, list.getVisibility());
--- a/metadata/en-US/images/featureGraphic.png
+++ b/metadata/en-US/images/featureGraphic.png
--- a/metadata/en-US/images/phoneScreenshots/screenshot-03.png
+++ b/metadata/en-US/images/phoneScreenshots/screenshot-03.png
--- a/metadata/en-US/images/phoneScreenshots/screenshot-05.png
+++ b/metadata/en-US/images/phoneScreenshots/screenshot-05.png
Author	SHA1	Message	Date
Branden Archer	79dad1b0a6	Merge pull request #210 from brarcher/pre-v0.22 Update for v0.22	2018-02-19 10:29:16 -05:00
Branden Archer	04466edb01	Update for v0.22	2018-02-18 23:30:04 -05:00
Branden Archer	af3ce5a0ff	Merge pull request #209 from brarcher/barcode-rendering Barcode rendering improvements	2018-02-18 23:24:52 -05:00
Branden Archer	3291185812	Render 1D barcodes with a larger width For some reason when 1D barcodes are rendered in a smaller width, they end up scrunched up and not using all available space. As a result, they do not scale to the entire width of the screen. In many cases the barcode is not scannable even in landscape. To resolve this, render the 1D barcodes in a larger space. The space is still bounded, to prevent OOMs on tablets or really wide screen devices.	2018-02-18 23:14:51 -05:00
Branden Archer	c9df3bd1d2	Redraw barcode when screen rotates	2018-02-18 23:14:51 -05:00
Branden Archer	057c7923a8	Merge pull request #208 from brarcher/translations Update translations	2018-02-17 23:49:45 -05:00
Branden Archer	4195d73c53	Update translations	2018-02-17 23:43:21 -05:00
Branden Archer	ed08f0577a	Merge pull request #207 from brarcher/changelog-1 Update CHANGELOG	2018-02-17 23:34:21 -05:00
Branden Archer	a1257a1692	Update CHANGELOG	2018-02-17 23:27:26 -05:00
Branden Archer	a51815a172	Merge pull request #206 from brarcher/pre-v0.21 Update for v0.21	2018-02-17 22:56:35 -05:00
Branden Archer	8eee8f6a0f	Update for v0.21	2018-02-17 22:44:49 -05:00
Branden Archer	1817c184ae	Merge pull request #205 from brarcher/fix-no-color-import Fix no color import	2018-02-17 22:44:00 -05:00
Branden Archer	773d759ef5	Fix imports with missing colors	2018-02-17 22:37:10 -05:00
Branden Archer	cbc51cfb73	Remove debug toast	2018-02-17 22:37:10 -05:00
Branden Archer	46c3d190d8	Merge pull request #204 from brarcher/custom-font-sizes Add settings for font sizes	2018-02-17 16:29:54 -05:00
Branden Archer	9951999ca4	Add settings for font sizes	2018-02-17 16:05:10 -05:00
Branden Archer	4843a1093d	Merge pull request #203 from brarcher/color-picker Custom colors	2018-02-17 16:02:54 -05:00
Branden Archer	a4bde722a6	Add config for text and background colors This adds config options for the colors used for the store text and background when displaying the store name in the single card view or the thumbnail for the card list.	2018-02-17 15:50:32 -05:00
Branden Archer	ff5e5d5833	Remove unused code handling adding a card This case is handled in another acitivity now.	2018-02-12 15:13:23 -05:00
Branden Archer	685eaec8b5	Remove views which are no longer used	2018-02-12 15:13:23 -05:00
Branden Archer	a3556cc66d	Merge pull request #200 from brarcher/barcode-space Add quite space before and after barcode	2018-02-10 22:27:45 -05:00
Branden Archer	13543ea9f6	Add quite space before and after barcode This is to help barcode scanners determine where the end of the barcode is.	2018-02-10 22:21:35 -05:00
Branden Archer	d7bf31c308	Merge pull request #199 from brarcher/changelog-1 Update CHANGELOG	2018-02-10 22:13:27 -05:00
Branden Archer	a77a968619	Update CHANGELOG	2018-02-10 22:06:35 -05:00
Branden Archer	70c6ee17cd	Merge pull request #198 from brarcher/pre-v0.20 Update for v0.20	2018-02-10 22:02:04 -05:00
Branden Archer	c233f82dc1	Update for v0.20	2018-02-10 13:50:30 -05:00
Branden Archer	be0c2507f2	Merge pull request #197 from brarcher/layout-changes Layout changes for new card view layout	2018-02-10 13:49:22 -05:00
Branden Archer	abfcf9d6cd	Disable MissingPrefix lint The autosizing TextView, which comes from the support-v4 library, adds several new attributes to TextViews. These attributes do not seem to be in the app namespace (as described in the documentation), as Android Studio and lint complains. However, funtionally the new attributes work as expected.	2018-02-10 13:43:28 -05:00
Branden Archer	4d565b3b2f	Update screenshots and wizard images	2018-02-10 13:37:17 -05:00
Branden Archer	27511a4ccd	Make card id and note text selectable	2018-02-10 13:37:17 -05:00
Branden Archer	12440346fa	Replace letter icon with store name	2018-02-10 13:37:17 -05:00
Branden Archer	870e4d0c4a	Add note text to card view layout	2018-02-10 13:37:17 -05:00
Branden Archer	6e526de087	Auto-size card id text on card view layout	2018-02-10 13:37:16 -05:00
Branden Archer	891636b51f	Use ConstraintLayout for card view layout This way the size of the barcode can be 1/2 the screen.	2018-02-10 13:37:16 -05:00
Branden Archer	017d97d08c	Merge pull request #196 from brarcher/feature-graphic add feature graphic to metadata	2018-02-09 23:30:09 -05:00
Branden Archer	63165ca1a5	add feature graphic to metadata	2018-02-09 23:21:46 -05:00
Branden Archer	48f40a51d1	Merge pull request #192 from brarcher/brarcher-patch-1 Update CHANGELOG	2018-02-01 08:13:51 -05:00
Branden Archer	3940ba5756	Update CHANGELOG	2018-02-01 08:05:10 -05:00