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

Update for v0.22

.travis.yml

@@ -4,8 +4,8 @@ sudo: true
 install:
 - echo y | android update sdk -u -a -t tools
 - echo y | android update sdk -u -a -t platform-tools
-- echo y | android update sdk -u -a -t build-tools-25.0.2
-- echo y | android update sdk -u -a -t android-25
+- echo y | android update sdk -u -a -t build-tools-26.0.2
+- yes | sdkmanager "platforms;android-27"
 - echo y | android update sdk -u -a -t extra-google-m2repository
 - echo y | android update sdk -u -a -t extra-android-m2repository
 

CHANGELOG.md

@@ -1,3 +1,79 @@
+## 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:
+- Workaround crash during install on some Android versions (likely Android 5 and below). (https://github.com/brarcher/loyalty-card-locker/pull/184)
+
+## v0.18 (2018-01-19)
+
+Changes:
+- Fix crash when importing certain types of corrupted CSV files. (https://github.com/brarcher/loyalty-card-locker/pull/177)
+- Fix importing backups directly from the file system. (https://github.com/brarcher/loyalty-card-locker/pull/180)
+- Fix importing backups from certain types of content providers. (https://github.com/brarcher/loyalty-card-locker/pull/179)
+
+## v0.17 (2018-01-11)
+
+Changes:
+- Fix issue on Android SDK 24+ where using the file chooser import option would cause a crash. (https://github.com/brarcher/loyalty-card-locker/pull/170)
+- New icon and color scheme. (https://github.com/brarcher/loyalty-card-locker/pull/171)
+
+## v0.16 (2017-11-29)
+
+Changes:
+- Add support for adding loyalty card shortcuts from the launcher/homescreen. (https://github.com/brarcher/loyalty-card-locker/pull/161)
+- Remove support for adding loyalty card shortcuts from the app itself. This removes the need for the shortcut permission. (https://github.com/brarcher/loyalty-card-locker/pull/163)
+
+## v0.15 (2017-11-25)
+
+Changes:
+- Add support for adding shortcuts to home screen when adding or editing a card. (https://github.com/brarcher/loyalty-card-locker/pull/155)
+- Remove widget, as it was a poor substitute for shortcuts. (https://github.com/brarcher/loyalty-card-locker/pull/155)
+- Fix exporting backups on Android 7+. (https://github.com/brarcher/loyalty-card-locker/pull/153)
+- Report more accurate mime type when exporting backup data. (https://github.com/brarcher/loyalty-card-locker/pull/156)
+- Fix bug where a card could not be edited. (https://github.com/brarcher/loyalty-card-locker/pull/155)
+
+## v0.14 (2017-10-26)
+
+Changes:
+- Add support for app shortcuts (Android 7.1+), where the most recently used cards will appear as shortcuts. (https://github.com/brarcher/loyalty-card-locker/pull/145)
+- Add a widget which works like a pinned app shortcut, to support devices which run below Android 7.1. (https://github.com/brarcher/loyalty-card-locker/pull/142)
+
+## v0.13 (2017-07-25)
+
+Changes:
+- Add screen rotation lock menu option when displaying a card. If locked, the screen will transition to its "natural" orientation and further screen rotation will be blocked. (https://github.com/brarcher/loyalty-card-locker/pull/128)
+- If a card is selected from the main screen but cannot be loaded, the application fails gracefully and posts a message. (https://github.com/brarcher/loyalty-card-locker/pull/132)
+- Fix case where layout IDs for intro wizard could not be found. (https://github.com/brarcher/loyalty-card-locker/pull/128)
+
+## v0.12 (2017-07-16)
+
+Changes:
+
+- A change in v0.11 reduced the memory usage of barcode drawing, but affected the barcode dimensions. This is now changed to maintain the barcode dimensions while reducing memory usage. (https://github.com/brarcher/loyalty-card-locker/pull/126)
+- Update German and French translations. (https://github.com/brarcher/loyalty-card-locker/pull/122, https://github.com/brarcher/loyalty-card-locker/pull/124, https://github.com/brarcher/loyalty-card-locker/pull/125)
+
+## v0.11.1 (2017-06-29)
+
+Changes:
+- Prevent a crash when rotation the screen in the first run intro wizard.
+
 ## v0.11 (2017-06-26)
 
 Improvements:

CONTRIBUTING.md

@@ -0,0 +1,91 @@
+How to Submit Patches to the Loyalty Card Keychain Project
+===============================================================================
+https://github.com/brarcher/budget-watch
+
+This document is intended to act as a guide to help you contribute to the
+Loyalty Card Keychain project.  It is not perfect, and there will always be exceptions
+to the rules described here, but by following the instructions below you
+should have a much easier time getting your work merged with the upstream
+project.
+
+## Test Your Code
+
+There are four possible tests you can run to verify your code.  The first
+is unit tests, which check the basic functionality of the application, and
+can be run by gradle using:
+
+    # ./gradlew testReleaseUnitTest
+
+The second and third check for common problems using static analysis.
+These are the Android lint checker, run using:
+
+    # ./gradlew lintRelease
+
+and FindBugs, run using:
+
+    # ./gradlew findbugs
+
+The final check is by testing the application on a live device and verifying
+the basic functionality works as expected.
+
+## Make Sure Your Code is Tested
+
+The Loyalty Card Keychain code uses a fair number of unit tests to verify that
+the basic functionality is working. Submissions which add functionality
+or significantly change the existing code should include additional tests
+to verify the proper operation of the proposed changes.
+
+## Explain Your Work
+
+At the top of every patch you should include a description of the problem you
+are trying to solve, how you solved it, and why you chose the solution you
+implemented.  If you are submitting a bug fix, it is also incredibly helpful
+if you can describe/include a reproducer for the problem in the description as
+well as instructions on how to test for the bug and verify that it has been
+fixed.
+
+## Sign Your Work
+
+The sign-off is a simple line at the end of the patch description, which
+certifies that you wrote it or otherwise have the right to pass it on as an
+open-source patch.  The "Developer's Certificate of Origin" pledge is taken
+from the Linux Kernel and the rules are pretty simple:
+
+	Developer's Certificate of Origin 1.1
+
+	By making a contribution to this project, I certify that:
+
+	(a) The contribution was created in whole or in part by me and I
+	    have the right to submit it under the open source license
+	    indicated in the file; or
+
+	(b) The contribution is based upon previous work that, to the best
+	    of my knowledge, is covered under an appropriate open source
+	    license and I have the right under that license to submit that
+	    work with modifications, whether created in whole or in part
+	    by me, under the same open source license (unless I am
+	    permitted to submit under a different license), as indicated
+	    in the file; or
+
+	(c) The contribution was provided directly to me by some other
+	    person who certified (a), (b) or (c) and I have not modified
+	    it.
+
+	(d) I understand and agree that this project and the contribution
+	    are public and that a record of the contribution (including all
+	    personal information I submit with it, including my sign-off) is
+	    maintained indefinitely and may be redistributed consistent with
+	    this project or the open source license(s) involved.
+
+... then you just add a line to the bottom of your patch description, with
+your real name, saying:
+
+	Signed-off-by: Random J Developer <random@developer.example.org>
+
+## Submit Patch(es) for Review
+
+Finally, you will need to submit your patches so that they can be reviewed
+and potentially merged into the main Loyalty Card Keychain repository. The preferred
+way to do this is to submit a Pull Request to the Loyalty Card Keychain project.
+Changes need to apply cleanly onto the master branch and pass all
+unit tests and produce no errors during static analysis.

README.md

@@ -25,13 +25,13 @@ proposed changes.
 
 # Screenshots
 
-[<img src="https://user-images.githubusercontent.com/5264535/27416124-79b09162-56d9-11e7-967b-8923177dc228.png" width=250>](https://user-images.githubusercontent.com/5264535/27416124-79b09162-56d9-11e7-967b-8923177dc228.png)
-[<img src="https://user-images.githubusercontent.com/5264535/27416127-7baea332-56d9-11e7-8a10-5be90bb02225.png" width=250>](https://user-images.githubusercontent.com/5264535/27416127-7baea332-56d9-11e7-8a10-5be90bb02225.png)
-[<img src="https://user-images.githubusercontent.com/5264535/27416128-7d50f7b2-56d9-11e7-9833-1dd962f9cf66.png" width=250>](https://user-images.githubusercontent.com/5264535/27416128-7d50f7b2-56d9-11e7-9833-1dd962f9cf66.png)
+[<img src="https://github.com/brarcher/loyalty-card-locker/raw/master/metadata/en-US/images/phoneScreenshots/screenshot-01.png" width=250>](https://github.com/brarcher/loyalty-card-locker/raw/master/metadata/en-US/images/phoneScreenshots/screenshot-01.png)
+[<img src="https://github.com/brarcher/loyalty-card-locker/raw/master/metadata/en-US/images/phoneScreenshots/screenshot-03.png" width=250>](https://github.com/brarcher/loyalty-card-locker/raw/master/metadata/en-US/images/phoneScreenshots/screenshot-03.png)
+[<img src="https://github.com/brarcher/loyalty-card-locker/raw/master/metadata/en-US/images/phoneScreenshots/screenshot-02.png" width=250>](https://github.com/brarcher/loyalty-card-locker/raw/master/metadata/en-US/images/phoneScreenshots/screenshot-02.png)
 
-[<img src="https://user-images.githubusercontent.com/5264535/27416132-7ea6272c-56d9-11e7-9a52-d73424bf902c.png" width=250>](https://user-images.githubusercontent.com/5264535/27416132-7ea6272c-56d9-11e7-9a52-d73424bf902c.png)
-[<img src="https://user-images.githubusercontent.com/5264535/27416137-800aee90-56d9-11e7-9cc9-2a7dc63bb4fb.png" width=250>](https://user-images.githubusercontent.com/5264535/27416137-800aee90-56d9-11e7-9cc9-2a7dc63bb4fb.png)
-[<img src="https://user-images.githubusercontent.com/5264535/27416140-82d8211a-56d9-11e7-8031-c71d3077bdc6.png" width=250>](https://user-images.githubusercontent.com/5264535/27416140-82d8211a-56d9-11e7-8031-c71d3077bdc6.png)
+[<img src="https://github.com/brarcher/loyalty-card-locker/raw/master/metadata/en-US/images/phoneScreenshots/screenshot-04.png" width=250>](https://github.com/brarcher/loyalty-card-locker/raw/master/metadata/en-US/images/phoneScreenshots/screenshot-04.png)
+[<img src="https://github.com/brarcher/loyalty-card-locker/raw/master/metadata/en-US/images/phoneScreenshots/screenshot-05.png" width=250>](https://github.com/brarcher/loyalty-card-locker/raw/master/metadata/en-US/images/phoneScreenshots/screenshot-05.png)
+[<img src="https://github.com/brarcher/loyalty-card-locker/raw/master/metadata/en-US/images/phoneScreenshots/screenshot-06.png" width=250>](https://github.com/brarcher/loyalty-card-locker/raw/master/metadata/en-US/images/phoneScreenshots/screenshot-06.png)
 
 # Building
 
@@ -48,6 +48,10 @@ Windows:
 ./gradlew.bat build
 ```
 
+# Translating
+
+If you are interested in translating this application to another language, create a pull request with changes or find the project listing on  [Transifex](https://www.transifex.com/na-243/loyalty-card-locker).
+
 # Thanks
 
 This application uses the following image:

app/build.gradle

@@ -7,15 +7,14 @@ findbugs {
 }
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion "25.0.2"
+    compileSdkVersion 27
 
     defaultConfig {
         applicationId "protect.card_locker"
         minSdkVersion 17
-        targetSdkVersion 23
-        versionCode 11
-        versionName "0.11"
+        targetSdkVersion 27
+        versionCode 24
+        versionName "0.22"
     }
     buildTypes {
         release {
@@ -27,6 +26,16 @@ android {
         disable "GoogleAppIndexingWarning"
         disable "ButtonStyle"
         disable "AlwaysShowAction"
+        disable "MissingTranslation"
+        disable "MissingPrefix"
+    }
+
+    // Starting with Android Studio 3 Robolectric is unable to find resources.
+    // The following allows it to find the resources.
+    testOptions {
+        unitTests {
+            includeAndroidResources = true
+        }
     }
 
     // This is for Robolectric support for SDK 23
@@ -35,18 +44,22 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:appcompat-v7:25.3.1'
-    compile 'com.android.support:design:25.3.1'
+    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.2'
+    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"
 }
 
-task findbugs(type: FindBugs, dependsOn: assembleDebug) {
+task findbugs(type: FindBugs, dependsOn: 'assembleDebug') {
 
     description 'Run findbugs'
     group 'verification'

app/proguard-rules.pro

@@ -15,3 +15,10 @@
 #-keepclassmembers class fqcn.of.javascript.interface.for.webview {
 #   public *;
 #}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+-keepattributes SourceFile,LineNumberTable
+
+# This keep the class and method names the same, for debugging stack traces
+-dontobfuscate

app/src/main/AndroidManifest.xml

@@ -35,23 +35,54 @@
         <activity
             android:name=".LoyaltyCardViewActivity"
             android:theme="@style/AppTheme.NoActionBar"
+            android:label=""
+            android:windowSoftInputMode="stateHidden"
+            android:exported="true"/>
+        <activity
+            android:name=".LoyaltyCardEditActivity"
+            android:theme="@style/AppTheme.NoActionBar"
             android:configChanges="orientation|screenSize"
-            android:windowSoftInputMode="stateHidden"/>
+            android:windowSoftInputMode="stateHidden"
+            android:exported="true"/>
         <activity
             android:name=".BarcodeSelectorActivity"
             android:label="@string/selectBarcodeTitle"
             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"
             android:configChanges="orientation|screenSize"
             android:theme="@style/AppTheme.NoActionBar"/>
         <activity
-            android:name=".IntroActivity"
+            android:name=".intro.IntroActivity"
             android:label=""
+            android:configChanges="orientation|screenSize"
             android:theme="@style/AppTheme.NoActionBar"/>
+        <activity
+            android:name=".CardShortcutConfigure"
+            android:label="@string/cardShortcut"
+            android:configChanges="orientation|screenSize"
+            android:theme="@style/AppTheme.NoActionBar">
+            <intent-filter>
+                <action android:name="android.intent.action.CREATE_SHORTCUT"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </activity>
+        <provider
+            android:name="android.support.v4.content.FileProvider"
+            android:grantUriPermissions="true"
+            android:exported="false"
+            android:authorities="${applicationId}">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/file_provider_paths"/>
+        </provider>
     </application>
 
 </manifest>

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 = 600;
+
+    // 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;
@@ -29,7 +33,7 @@ class BarcodeImageWriterTask extends AsyncTask<Void, Void, Bitmap>
     private final int imageHeight;
     private final int imageWidth;
 
-    public BarcodeImageWriterTask(ImageView imageView, String cardIdString,
+    BarcodeImageWriterTask(ImageView imageView, String cardIdString,
                                   BarcodeFormat barcodeFormat)
     {
         // Use a WeakReference to ensure the ImageView can be garbage collected
@@ -37,11 +41,51 @@ class BarcodeImageWriterTask extends AsyncTask<Void, Void, Bitmap>
 
         cardId = cardIdString;
         format = barcodeFormat;
-        imageHeight = imageView.getHeight();
 
-        // No matter how long the window is, there is only so much space
-        // needed for the barcode. Put a limit on it to reduce memory usage
-        imageWidth = Math.min(imageView.getWidth(), MAX_WIDTH);
+        final int MAX_WIDTH = getMaxWidth(format);
+
+        if(imageView.getWidth() < MAX_WIDTH)
+        {
+            imageHeight = imageView.getHeight();
+            imageWidth = imageView.getWidth();
+        }
+        else
+        {
+            // Scale down the image to reduce the memory needed to produce it
+            imageWidth = MAX_WIDTH;
+            double ratio = (double)MAX_WIDTH / (double)imageView.getWidth();
+            imageHeight = (int)(imageView.getHeight() * ratio);
+        }
+    }
+
+    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)

app/src/main/java/protect/card_locker/BarcodeSelectorActivity.java

@@ -67,7 +67,7 @@ public class BarcodeSelectorActivity extends AppCompatActivity
         super.onCreate(savedInstanceState);
 
         setContentView(R.layout.barcode_selector_activity);
-        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+        Toolbar toolbar = findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
         ActionBar actionBar = getSupportActionBar();
         if(actionBar != null)
@@ -89,7 +89,7 @@ public class BarcodeSelectorActivity extends AppCompatActivity
                 .put(BarcodeFormat.UPC_A.name(), R.id.upcaBarcode)
                 .build();
 
-        EditText cardId = (EditText) findViewById(R.id.cardId);
+        EditText cardId = findViewById(R.id.cardId);
         cardId.addTextChangedListener(new TextWatcher()
         {
             @Override
@@ -113,7 +113,7 @@ public class BarcodeSelectorActivity extends AppCompatActivity
                 // Update barcodes
                 for(String key : barcodeViewMap.keySet())
                 {
-                    ImageView image = (ImageView)findViewById(barcodeViewMap.get(key));
+                    ImageView image = findViewById(barcodeViewMap.get(key));
                     createBarcodeOption(image, key, s.toString());
                 }
             }

app/src/main/java/protect/card_locker/CardShortcutConfigure.java

@@ -0,0 +1,83 @@
+package protect.card_locker;
+
+import android.content.Intent;
+import android.database.Cursor;
+import android.os.Bundle;
+import android.os.Parcelable;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.Toolbar;
+import android.util.Log;
+import android.view.View;
+import android.widget.AdapterView;
+import android.widget.ListView;
+import android.widget.Toast;
+
+/**
+ * The configuration screen for creating a shortcut.
+ */
+public class CardShortcutConfigure extends AppCompatActivity
+{
+    static final String TAG = "LoyaltyCardLocker";
+
+    @Override
+    public void onCreate(Bundle bundle)
+    {
+        super.onCreate(bundle);
+
+        // Set the result to CANCELED.  This will cause nothing to happen if the
+        // aback button is pressed.
+        setResult(RESULT_CANCELED);
+
+        setContentView(R.layout.main_activity);
+        Toolbar toolbar = findViewById(R.id.toolbar);
+        toolbar.setVisibility(View.GONE);
+
+        final DBHelper db = new DBHelper(this);
+
+        // If there are no cards, bail
+        if(db.getLoyaltyCardCount() == 0)
+        {
+            Toast.makeText(this, R.string.noCardsMessage, Toast.LENGTH_LONG).show();
+            finish();
+        }
+
+        final ListView cardList = findViewById(R.id.list);
+        cardList.setVisibility(View.VISIBLE);
+
+        Cursor cardCursor = db.getLoyaltyCardCursor();
+
+        final LoyaltyCardCursorAdapter adapter = new LoyaltyCardCursorAdapter(this, cardCursor);
+        cardList.setAdapter(adapter);
+
+        cardList.setOnItemClickListener(new AdapterView.OnItemClickListener()
+        {
+            @Override
+            public void onItemClick(AdapterView<?> parent, View view, int position, long id)
+            {
+                Cursor selected = (Cursor) parent.getItemAtPosition(position);
+                LoyaltyCard loyaltyCard = LoyaltyCard.toLoyaltyCard(selected);
+
+                Log.d(TAG, "Creating shortcut for card " + loyaltyCard.store + "," + loyaltyCard.id);
+
+                Intent shortcutIntent = new Intent(CardShortcutConfigure.this, LoyaltyCardViewActivity.class);
+                shortcutIntent.setAction(Intent.ACTION_MAIN);
+                // Prevent instances of the view activity from piling up; if one exists let this
+                // one replace it.
+                shortcutIntent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
+                Bundle bundle = new Bundle();
+                bundle.putInt("id", loyaltyCard.id);
+                bundle.putBoolean("view", true);
+                shortcutIntent.putExtras(bundle);
+
+                Parcelable icon = Intent.ShortcutIconResource.fromContext(CardShortcutConfigure.this, R.mipmap.ic_launcher);
+                Intent intent = new Intent();
+                intent.putExtra(Intent.EXTRA_SHORTCUT_INTENT, shortcutIntent);
+                intent.putExtra(Intent.EXTRA_SHORTCUT_NAME, loyaltyCard.store);
+                intent.putExtra(Intent.EXTRA_SHORTCUT_ICON_RESOURCE, icon);
+                setResult(RESULT_OK, intent);
+
+                finish();
+            }
+        });
+    }
+}

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())

app/src/main/java/protect/card_locker/CsvDatabaseImporter.java

@@ -40,7 +40,7 @@ public class CsvDatabaseImporter implements DatabaseImporter
             parser.close();
             database.setTransactionSuccessful();
         }
-        catch(IllegalArgumentException e)
+        catch(IllegalArgumentException|IllegalStateException e)
         {
             throw new FormatException("Issue parsing CSV data", e);
         }
@@ -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);
     }
 }

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 boolean insertLoyaltyCard(final String store, final String note, final String cardId,
-                                     final String barcodeType)
+    public long insertLoyaltyCard(final String store, final String note, final String cardId,
+                                  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 != -1);
+        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)});

app/src/main/java/protect/card_locker/ImportExportActivity.java

@@ -7,12 +7,15 @@ import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
+import android.database.Cursor;
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.Environment;
+import android.provider.OpenableColumns;
 import android.support.v4.app.ActivityCompat;
 import android.support.v4.content.ContextCompat;
+import android.support.v4.content.FileProvider;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.AlertDialog;
 import android.support.v7.app.AppCompatActivity;
@@ -24,6 +27,9 @@ import android.widget.Button;
 import android.widget.Toast;
 
 import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.InputStream;
 import java.util.List;
 
 public class ImportExportActivity extends AppCompatActivity
@@ -43,7 +49,7 @@ public class ImportExportActivity extends AppCompatActivity
     {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.import_export_activity);
-        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+        Toolbar toolbar = findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
         ActionBar actionBar = getSupportActionBar();
         if(actionBar != null)
@@ -66,7 +72,7 @@ public class ImportExportActivity extends AppCompatActivity
         }
 
 
-        Button exportButton = (Button)findViewById(R.id.exportButton);
+        Button exportButton = findViewById(R.id.exportButton);
         exportButton.setOnClickListener(new View.OnClickListener()
         {
             @Override
@@ -79,9 +85,8 @@ public class ImportExportActivity extends AppCompatActivity
 
         // Check that there is an activity that can bring up a file chooser
         final Intent intentPickAction = new Intent(Intent.ACTION_PICK);
-        intentPickAction.setData(Uri.parse("file://"));
 
-        Button importFilesystem = (Button) findViewById(R.id.importOptionFilesystemButton);
+        Button importFilesystem = findViewById(R.id.importOptionFilesystemButton);
         importFilesystem.setOnClickListener(new View.OnClickListener()
         {
             @Override
@@ -105,7 +110,7 @@ public class ImportExportActivity extends AppCompatActivity
         intentGetContentAction.addCategory(Intent.CATEGORY_OPENABLE);
         intentGetContentAction.setType("*/*");
 
-        Button importApplication = (Button) findViewById(R.id.importOptionApplicationButton);
+        Button importApplication = findViewById(R.id.importOptionApplicationButton);
         importApplication.setOnClickListener(new View.OnClickListener()
         {
             @Override
@@ -126,30 +131,40 @@ public class ImportExportActivity extends AppCompatActivity
 
         // This option, to import from the fixed location, should always be present
 
-        Button importButton = (Button)findViewById(R.id.importOptionFixedButton);
+        Button importButton = findViewById(R.id.importOptionFixedButton);
         importButton.setOnClickListener(new View.OnClickListener()
         {
             @Override
             public void onClick(View v)
             {
-                startImport(exportFile);
+                Uri uri = Uri.fromFile(exportFile);
+                try
+                {
+                    FileInputStream stream = new FileInputStream(exportFile);
+                    startImport(stream, uri);
+                }
+                catch(FileNotFoundException e)
+                {
+                    Log.e(TAG, "Could not import file " + exportFile.getAbsolutePath(), e);
+                    onImportComplete(false, uri);
+                }
             }
         });
     }
 
-    private void startImport(File target)
+    private void startImport(final InputStream target, final Uri targetUri)
     {
         ImportExportTask.TaskCompleteListener listener = new ImportExportTask.TaskCompleteListener()
         {
             @Override
-            public void onTaskComplete(boolean success, File file)
+            public void onTaskComplete(boolean success)
             {
-                onImportComplete(success, file);
+                onImportComplete(success, targetUri);
             }
         };
 
         importExporter = new ImportExportTask(ImportExportActivity.this,
-                true, DataFormat.CSV, target, listener);
+                DataFormat.CSV, target, listener);
         importExporter.execute();
     }
 
@@ -158,14 +173,14 @@ public class ImportExportActivity extends AppCompatActivity
         ImportExportTask.TaskCompleteListener listener = new ImportExportTask.TaskCompleteListener()
         {
             @Override
-            public void onTaskComplete(boolean success, File file)
+            public void onTaskComplete(boolean success)
             {
-                onExportComplete(success, file);
+                onExportComplete(success, exportFile);
             }
         };
 
         importExporter = new ImportExportTask(ImportExportActivity.this,
-                false, DataFormat.CSV, exportFile, listener);
+                DataFormat.CSV, exportFile, listener);
         importExporter.execute();
     }
 
@@ -220,7 +235,7 @@ public class ImportExportActivity extends AppCompatActivity
         return super.onOptionsItemSelected(item);
     }
 
-    private void onImportComplete(boolean success, File path)
+    private void onImportComplete(boolean success, Uri path)
     {
         AlertDialog.Builder builder = new AlertDialog.Builder(this);
 
@@ -234,9 +249,12 @@ public class ImportExportActivity extends AppCompatActivity
         }
 
         int messageId = success ? R.string.importedFrom : R.string.importFailed;
-
         final String template = getResources().getString(messageId);
-        final String message = String.format(template, path.getAbsolutePath());
+
+        // Get the filename of the file being imported
+        String filename = path.toString();
+
+        final String message = String.format(template, filename);
         builder.setMessage(message);
         builder.setNeutralButton(R.string.ok, new DialogInterface.OnClickListener()
         {
@@ -286,10 +304,13 @@ public class ImportExportActivity extends AppCompatActivity
                 @Override
                 public void onClick(DialogInterface dialog, int which)
                 {
-                    Uri outputUri = Uri.fromFile(path);
+                    Uri outputUri = FileProvider.getUriForFile(ImportExportActivity.this, BuildConfig.APPLICATION_ID, path);
                     Intent sendIntent = new Intent(Intent.ACTION_SEND);
                     sendIntent.putExtra(Intent.EXTRA_STREAM, outputUri);
-                    sendIntent.setType("text/plain");
+                    sendIntent.setType("text/csv");
+
+                    // set flag to give temporary permission to external app to use the FileProvider
+                    sendIntent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
 
                     ImportExportActivity.this.startActivity(Intent.createChooser(sendIntent,
                             sendLabel));
@@ -344,34 +365,39 @@ public class ImportExportActivity extends AppCompatActivity
     {
         super.onActivityResult(requestCode, resultCode, data);
 
-        if (resultCode == RESULT_OK && requestCode == CHOOSE_EXPORT_FILE)
+        if (resultCode != RESULT_OK || requestCode != CHOOSE_EXPORT_FILE)
         {
-            String path = null;
+            Log.w(TAG, "Failed onActivityResult(), result=" + resultCode);
+            return;
+        }
 
-            Uri uri = data.getData();
-            if(uri != null && uri.toString().startsWith("/"))
-            {
-                uri = Uri.parse("file://" + uri.toString());
-            }
+        Uri uri = data.getData();
+        if(uri == null)
+        {
+            Log.e(TAG, "Activity returned a NULL URI");
+            return;
+        }
 
-            if(uri != null)
-            {
-                path = uri.getPath();
-            }
+        try
+        {
+            InputStream reader;
 
-            if(path != null)
+            if(uri.getScheme() != null)
             {
-                Log.e(TAG, "Starting file import with: " + uri.toString());
-                startImport(new File(path));
+                reader = getContentResolver().openInputStream(uri);
             }
             else
             {
-                Log.e(TAG, "Fail to make sense of URI returned from activity: " + (uri != null ? uri.toString() : "null"));
+                reader = new FileInputStream(new File(uri.toString()));
             }
+
+            Log.e(TAG, "Starting file import with: " + uri.toString());
+            startImport(reader, uri);
         }
-        else
+        catch(FileNotFoundException e)
         {
-            Log.w(TAG, "Failed onActivityResult(), result=" + resultCode);
+            Log.e(TAG, "Failed to import file: " + uri.toString(), e);
+            onImportComplete(false, uri);
         }
     }
 }

app/src/main/java/protect/card_locker/ImportExportTask.java

@@ -12,6 +12,7 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
 import java.nio.charset.Charset;
@@ -24,29 +25,46 @@ class ImportExportTask extends AsyncTask<Void, Void, Boolean>
     private boolean doImport;
     private DataFormat format;
     private File target;
+    private InputStream inputStream;
     private TaskCompleteListener listener;
 
     private ProgressDialog progress;
 
-    public ImportExportTask(Activity activity, boolean doImport, DataFormat format, File target,
+    /**
+     * Constructor which will setup a task for exporting to the given file
+     */
+    ImportExportTask(Activity activity, DataFormat format, File target,
             TaskCompleteListener listener)
     {
         super();
         this.activity = activity;
-        this.doImport = doImport;
+        this.doImport = false;
         this.format = format;
         this.target = target;
         this.listener = listener;
     }
 
-    private boolean performImport(File importFile, DBHelper db)
+    /**
+     * Constructor which will setup a task for importing from the given InputStream.
+     */
+    ImportExportTask(Activity activity, DataFormat format, InputStream input,
+                            TaskCompleteListener listener)
+    {
+        super();
+        this.activity = activity;
+        this.doImport = true;
+        this.format = format;
+        this.inputStream = input;
+        this.listener = listener;
+    }
+
+    private boolean performImport(InputStream stream, DBHelper db)
     {
         boolean result = false;
 
         try
         {
-            FileInputStream fileReader = new FileInputStream(importFile);
-            InputStreamReader reader = new InputStreamReader(fileReader, Charset.forName("UTF-8"));
+            InputStreamReader reader = new InputStreamReader(stream, Charset.forName("UTF-8"));
             result = MultiFormatImporter.importData(db, reader, format);
             reader.close();
         }
@@ -55,7 +73,7 @@ class ImportExportTask extends AsyncTask<Void, Void, Boolean>
             Log.e(TAG, "Unable to import file", e);
         }
 
-        Log.i(TAG, "Import of '" + importFile.getAbsolutePath() + "' result: " + result);
+        Log.i(TAG, "Import result: " + result);
 
         return result;
     }
@@ -105,7 +123,7 @@ class ImportExportTask extends AsyncTask<Void, Void, Boolean>
 
         if(doImport)
         {
-            result = performImport(target, db);
+            result = performImport(inputStream, db);
         }
         else
         {
@@ -117,7 +135,7 @@ class ImportExportTask extends AsyncTask<Void, Void, Boolean>
 
     protected void onPostExecute(Boolean result)
     {
-        listener.onTaskComplete(result, target);
+        listener.onTaskComplete(result);
 
         progress.dismiss();
         Log.i(TAG, (doImport ? "Import" : "Export") + " Complete");
@@ -130,7 +148,7 @@ class ImportExportTask extends AsyncTask<Void, Void, Boolean>
     }
     interface TaskCompleteListener
     {
-        void onTaskComplete(boolean success, File file);
+        void onTaskComplete(boolean success);
     }
 
 }

app/src/main/java/protect/card_locker/IntroActivity.java

@@ -1,43 +0,0 @@
-package protect.card_locker;
-
-import android.os.Bundle;
-import android.support.annotation.LayoutRes;
-import android.support.v4.app.Fragment;
-
-import com.github.paolorotolo.appintro.AppIntro;
-
-
-public class IntroActivity extends AppIntro
-{
-    @Override
-    public void init(Bundle savedInstanceState)
-    {
-        addIntroSlide(R.layout.intro1_layout);
-        addIntroSlide(R.layout.intro2_layout);
-        addIntroSlide(R.layout.intro3_layout);
-        addIntroSlide(R.layout.intro4_layout);
-        addIntroSlide(R.layout.intro5_layout);
-        addIntroSlide(R.layout.intro6_layout);
-    }
-
-    private void addIntroSlide(@LayoutRes int layout)
-    {
-        Fragment slide = new IntroSlide();
-        Bundle args = new Bundle();
-        args.putInt("layout", layout);
-        slide.setArguments(args);
-        addSlide(slide);
-    }
-
-    @Override
-    public void onSkipPressed(Fragment fragment) {
-        finish();
-    }
-
-    @Override
-    public void onDonePressed(Fragment fragment) {
-        finish();
-    }
-}
-
-

app/src/main/java/protect/card_locker/LetterBitmap.java

@@ -0,0 +1,140 @@
+package protect.card_locker;
+
+import android.content.Context;
+import android.content.res.Resources;
+import android.content.res.TypedArray;
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.graphics.Rect;
+import android.graphics.Typeface;
+import android.text.TextPaint;
+
+/**
+ * Original from https://github.com/andOTP/andOTP/blob/master/app/src/main/java/org/shadowice/flocke/andotp/Utilities/LetterBitmap.java
+ * which was originally from http://stackoverflow.com/questions/23122088/colored-boxed-with-letters-a-la-gmail
+ * Used to create a {@link Bitmap} that contains a letter used in the English
+ * alphabet or digit, if there is no letter or digit available, a default image
+ * is shown instead.
+ */
+class LetterBitmap
+{
+
+    /**
+     * The number of available tile colors
+     */
+    private static final int NUM_OF_TILE_COLORS = 8;
+    /**
+     * The letter bitmap
+     */
+    private final Bitmap mBitmap;
+    /**
+     * The background color of the letter bitmap
+     */
+    private final Integer mColor;
+
+    /**
+     * Constructor for <code>LetterTileProvider</code>
+     *
+     * @param context The {@link Context} to use
+     * @param displayName The name used to create the letter for the tile
+     * @param key         The key used to generate the background color for the tile
+     * @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, Integer backgroundColor, Integer textColor)
+    {
+        TextPaint paint = new TextPaint();
+        paint.setTypeface(Typeface.create("sans-serif-light", Typeface.BOLD));
+
+        if(textColor != null)
+        {
+            paint.setColor(textColor);
+        }
+        else
+        {
+            paint.setColor(Color.WHITE);
+        }
+
+        paint.setTextAlign(Paint.Align.CENTER);
+        paint.setAntiAlias(true);
+
+        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);
+
+        final Canvas c = new Canvas();
+        c.setBitmap(mBitmap);
+        c.drawColor(mColor);
+
+        char [] firstCharArray = new char[1];
+        firstCharArray[0] = firstChar.toUpperCase().charAt(0);
+        paint.setTextSize(tileLetterFontSize);
+
+        // The bounds that enclose the letter
+        Rect bounds = new Rect();
+
+        paint.getTextBounds(firstCharArray, 0, 1, bounds);
+        c.drawText(firstCharArray, 0, 1, width / 2.0f, height / 2.0f
+                + (bounds.bottom - bounds.top) / 2.0f, paint);
+    }
+
+    /**
+     * @return A {@link Bitmap} that contains a letter used in the English
+     * alphabet or digit, if there is no letter or digit available, a
+     * default image is shown instead
+     */
+    public Bitmap getLetterTile()
+    {
+        return mBitmap;
+    }
+
+    /**
+     * @return background color used for letter title.
+     */
+    public int getBackgroundColor()
+    {
+        return mColor;
+    }
+
+    /**
+     * @param key The key used to generate the tile color
+     * @return A new or previously chosen color for <code>key</code> used as the
+     * tile background color
+     */
+    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;
+    }
+}

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

app/src/main/java/protect/card_locker/LoyaltyCardCursorAdapter.java

@@ -6,13 +6,19 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 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,
@@ -29,25 +35,36 @@ class LoyaltyCardCursorAdapter extends CursorAdapter
     public void bindView(View view, Context context, Cursor cursor)
     {
         // Find fields to populate in inflated template
+        ImageView thumbnail = view.findViewById(R.id.thumbnail);
         TextView storeField = (TextView) view.findViewById(R.id.store);
-        TextView cardIdField = (TextView) view.findViewById(R.id.cardId);
+        TextView noteField = (TextView) view.findViewById(R.id.note);
 
         // Extract properties from cursor
         LoyaltyCard loyaltyCard = LoyaltyCard.toLoyaltyCard(cursor);
 
         // Populate fields with extracted properties
-        String storeAndNote = loyaltyCard.store;
+        storeField.setText(loyaltyCard.store);
+
+        storeField.setTextSize(settings.getCardTitleListFontSize());
+
         if(loyaltyCard.note.isEmpty() == false)
         {
-            String storeNameAndNoteFormat = view.getResources().getString(R.string.storeNameAndNoteFormat);
-            storeAndNote = String.format(storeNameAndNoteFormat, loyaltyCard.store, loyaltyCard.note);
+            noteField.setVisibility(View.VISIBLE);
+            noteField.setText(loyaltyCard.note);
+            noteField.setTextSize(settings.getCardNoteListFontSize());
+        }
+        else
+        {
+            noteField.setVisibility(View.GONE);
         }
 
-        storeField.setText(storeAndNote);
+        int tileLetterFontSize = context.getResources().getDimensionPixelSize(R.dimen.tileLetterFontSize);
+        int pixelSize = context.getResources().getDimensionPixelSize(R.dimen.cardThumbnailSize);
 
-        String cardIdFormat = view.getResources().getString(R.string.cardIdFormat);
-        String cardIdLabel = view.getResources().getString(R.string.cardId);
-        String cardIdText = String.format(cardIdFormat, cardIdLabel, loyaltyCard.cardId);
-        cardIdField.setText(cardIdText);
+        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());
     }
 }

app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java

@@ -0,0 +1,473 @@
+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;
+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.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewTreeObserver;
+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 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
+{
+    private static final String TAG = "CardLocker";
+
+    private static final int SELECT_BARCODE_REQUEST = 1;
+
+    EditText storeFieldEdit;
+    EditText noteFieldEdit;
+    ImageView headingColorSample;
+    Button headingColorSelectButton;
+    ImageView headingStoreTextColorSample;
+    Button headingStoreTextColorSelectButton;
+    TextView cardIdFieldView;
+    View cardIdDivider;
+    View cardIdTableRow;
+    TextView barcodeTypeField;
+    ImageView barcodeImage;
+    View barcodeImageLayout;
+    View barcodeCaptureLayout;
+
+    Button captureButton;
+    Button enterButton;
+
+    int loyaltyCardId;
+    boolean updateLoyaltyCard;
+    Integer headingColorValue = null;
+    Integer headingStoreTextColorValue = null;
+
+    DBHelper db;
+
+    private void extractIntentFields(Intent intent)
+    {
+        final Bundle b = intent.getExtras();
+        loyaltyCardId = b != null ? b.getInt("id") : 0;
+        updateLoyaltyCard = b != null && b.getBoolean("update", false);
+
+        Log.d(TAG, "View activity: id=" + loyaltyCardId
+                + ", updateLoyaltyCard=" + Boolean.toString(updateLoyaltyCard));
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState)
+    {
+        super.onCreate(savedInstanceState);
+
+        setContentView(R.layout.loyalty_card_edit_activity);
+        Toolbar toolbar = findViewById(R.id.toolbar);
+        setSupportActionBar(toolbar);
+        ActionBar actionBar = getSupportActionBar();
+        if(actionBar != null)
+        {
+            actionBar.setDisplayHomeAsUpEnabled(true);
+        }
+
+        extractIntentFields(getIntent());
+
+        db = new DBHelper(this);
+
+        storeFieldEdit = findViewById(R.id.storeNameEdit);
+        noteFieldEdit = findViewById(R.id.noteEdit);
+        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);
+        barcodeTypeField = findViewById(R.id.barcodeType);
+        barcodeImage = findViewById(R.id.barcode);
+        barcodeImageLayout = findViewById(R.id.barcodeLayout);
+        barcodeCaptureLayout = findViewById(R.id.barcodeCaptureLayout);
+
+        captureButton = findViewById(R.id.captureButton);
+        enterButton = findViewById(R.id.enterButton);
+    }
+
+    @Override
+    public void onNewIntent(Intent intent)
+    {
+        Log.i(TAG, "Received new intent");
+        extractIntentFields(intent);
+
+        // Reset these fields, so they are re-populated in onResume().
+        storeFieldEdit.setText("");
+        noteFieldEdit.setText("");
+        cardIdFieldView.setText("");
+        barcodeTypeField.setText("");
+    }
+
+    @Override
+    public void onResume()
+    {
+        super.onResume();
+
+        Log.i(TAG, "To view card: " + loyaltyCardId);
+
+        if(updateLoyaltyCard)
+        {
+            final LoyaltyCard loyaltyCard = db.getLoyaltyCard(loyaltyCardId);
+            if(loyaltyCard == null)
+            {
+                Log.w(TAG, "Could not lookup loyalty card " + loyaltyCardId);
+                Toast.makeText(this, R.string.noCardExistsError, Toast.LENGTH_LONG).show();
+                finish();
+                return;
+            }
+
+            if(storeFieldEdit.getText().length() == 0)
+            {
+                storeFieldEdit.setText(loyaltyCard.store);
+            }
+
+            if(noteFieldEdit.getText().length() == 0)
+            {
+                noteFieldEdit.setText(loyaltyCard.note);
+            }
+
+            if(cardIdFieldView.getText().length() == 0)
+            {
+                cardIdFieldView.setText(loyaltyCard.cardId);
+            }
+
+            if(barcodeTypeField.getText().length() == 0)
+            {
+                barcodeTypeField.setText(loyaltyCard.barcodeType);
+            }
+
+            if(headingColorValue == null)
+            {
+                headingColorValue = loyaltyCard.headerColor;
+                if(headingColorValue == null)
+                {
+                    headingColorValue = LetterBitmap.getDefaultColor(this, loyaltyCard.store);
+                }
+                headingColorSample.setBackgroundColor(headingColorValue);
+            }
+
+            if(headingStoreTextColorValue == null)
+            {
+                headingStoreTextColorValue = loyaltyCard.headerTextColor;
+                if(headingStoreTextColorValue == null)
+                {
+                    headingStoreTextColorValue = Color.WHITE;
+                }
+                headingStoreTextColorSample.setBackgroundColor(headingStoreTextColorValue);
+            }
+
+            setTitle(R.string.editCardTitle);
+        }
+        else
+        {
+            setTitle(R.string.addCardTitle);
+        }
+
+        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();
+            final BarcodeFormat format = BarcodeFormat.valueOf(formatString);
+            final String cardIdString = cardIdFieldView.getText().toString();
+
+            if(barcodeImage.getHeight() == 0)
+            {
+                Log.d(TAG, "ImageView size is not known known at start, waiting for load");
+                // The size of the ImageView is not yet available as it has not
+                // yet been drawn. Wait for it to be drawn so the size is available.
+                barcodeImage.getViewTreeObserver().addOnGlobalLayoutListener(
+                        new ViewTreeObserver.OnGlobalLayoutListener()
+                        {
+                            @Override
+                            public void onGlobalLayout()
+                            {
+                                if (Build.VERSION.SDK_INT < 16)
+                                {
+                                    barcodeImage.getViewTreeObserver().removeGlobalOnLayoutListener(this);
+                                }
+                                else
+                                {
+                                    barcodeImage.getViewTreeObserver().removeOnGlobalLayoutListener(this);
+                                }
+
+                                Log.d(TAG, "ImageView size now known");
+                                new BarcodeImageWriterTask(barcodeImage, cardIdString, format).execute();
+                            }
+                        });
+            }
+            else
+            {
+                Log.d(TAG, "ImageView size known known, creating barcode");
+                new BarcodeImageWriterTask(barcodeImage, cardIdString, format).execute();
+            }
+
+            barcodeImageLayout.setVisibility(View.VISIBLE);
+        }
+
+        View.OnClickListener captureCallback = new View.OnClickListener()
+        {
+            @Override
+            public void onClick(View v)
+            {
+                IntentIntegrator integrator = new IntentIntegrator(LoyaltyCardEditActivity.this);
+                integrator.setDesiredBarcodeFormats(BarcodeSelectorActivity.SUPPORTED_BARCODE_TYPES);
+
+                String prompt = getResources().getString(R.string.scanCardBarcode);
+                integrator.setPrompt(prompt);
+                integrator.initiateScan();
+            }
+        };
+
+        captureButton.setOnClickListener(captureCallback);
+
+        enterButton.setOnClickListener(new View.OnClickListener()
+        {
+            @Override
+            public void onClick(View v)
+            {
+                Intent i = new Intent(getApplicationContext(), BarcodeSelectorActivity.class);
+
+                String cardId = cardIdFieldView.getText().toString();
+                if(cardId.length() > 0)
+                {
+                    final Bundle b = new Bundle();
+                    b.putString("initialCardId", cardId);
+                    i.putExtras(b);
+                }
+
+                startActivityForResult(i, SELECT_BARCODE_REQUEST);
+            }
+        });
+
+        if(cardIdFieldView.getText().length() > 0)
+        {
+            cardIdDivider.setVisibility(View.VISIBLE);
+            cardIdTableRow.setVisibility(View.VISIBLE);
+            enterButton.setText(R.string.editCard);
+        }
+        else
+        {
+            cardIdDivider.setVisibility(View.GONE);
+            cardIdTableRow.setVisibility(View.GONE);
+            enterButton.setText(R.string.enterCard);
+        }
+    }
+
+    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();
+        String note = noteFieldEdit.getText().toString();
+        String cardId = cardIdFieldView.getText().toString();
+        String barcodeType = barcodeTypeField.getText().toString();
+
+        if(store.isEmpty())
+        {
+            Snackbar.make(storeFieldEdit, R.string.noStoreError, Snackbar.LENGTH_LONG).show();
+            return;
+        }
+
+        if(cardId.isEmpty() || barcodeType.isEmpty())
+        {
+            Snackbar.make(cardIdFieldView, R.string.noCardIdError, Snackbar.LENGTH_LONG).show();
+            return;
+        }
+
+        if(updateLoyaltyCard)
+        {
+            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, headingColorValue, headingStoreTextColorValue);
+        }
+
+        finish();
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu)
+    {
+        if(updateLoyaltyCard)
+        {
+            getMenuInflater().inflate(R.menu.card_update_menu, menu);
+        }
+        else
+        {
+            getMenuInflater().inflate(R.menu.card_add_menu, menu);
+        }
+
+        return super.onCreateOptionsMenu(menu);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item)
+    {
+        int id = item.getItemId();
+
+        switch(id)
+        {
+            case android.R.id.home:
+                finish();
+                break;
+
+            case R.id.action_delete:
+                AlertDialog.Builder builder = new AlertDialog.Builder(this);
+                builder.setTitle(R.string.deleteTitle);
+                builder.setMessage(R.string.deleteConfirmation);
+                builder.setPositiveButton(R.string.confirm, new DialogInterface.OnClickListener()
+                {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which)
+                    {
+                        Log.e(TAG, "Deleting card: " + loyaltyCardId);
+
+                        DBHelper db = new DBHelper(LoyaltyCardEditActivity.this);
+                        db.deleteLoyaltyCard(loyaltyCardId);
+
+                        ShortcutHelper.removeShortcut(LoyaltyCardEditActivity.this, loyaltyCardId);
+
+                        finish();
+                        dialog.dismiss();
+                    }
+                });
+                builder.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener()
+                {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which)
+                    {
+                        dialog.dismiss();
+                    }
+                });
+                AlertDialog dialog = builder.create();
+                dialog.show();
+
+                return true;
+
+            case R.id.action_save:
+                doSave();
+                return true;
+        }
+
+        return super.onOptionsItemSelected(item);
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent intent)
+    {
+        String contents = null;
+        String format = null;
+
+        IntentResult result =
+                IntentIntegrator.parseActivityResult(requestCode, resultCode, intent);
+        if (result != null)
+        {
+            Log.i(TAG, "Received barcode information from capture");
+            contents = result.getContents();
+            format = result.getFormatName();
+        }
+
+        if(requestCode == SELECT_BARCODE_REQUEST && resultCode == Activity.RESULT_OK)
+        {
+            Log.i(TAG, "Received barcode information from capture");
+
+            contents = intent.getStringExtra(BarcodeSelectorActivity.BARCODE_CONTENTS);
+            format = intent.getStringExtra(BarcodeSelectorActivity.BARCODE_FORMAT);
+        }
+
+        if(contents != null && contents.isEmpty() == false &&
+                format != null && format.isEmpty() == false)
+        {
+            Log.i(TAG, "Read barcode id: " + contents);
+            Log.i(TAG, "Read format: " + format);
+
+            TextView cardIdView = findViewById(R.id.cardIdView);
+            cardIdView.setText(contents);
+
+            final TextView barcodeTypeField = findViewById(R.id.barcodeType);
+            barcodeTypeField.setText(format);
+            onResume();
+        }
+    }
+}

app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java

@@ -1,67 +1,66 @@
 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 com.google.zxing.integration.android.IntentIntegrator;
-import com.google.zxing.integration.android.IntentResult;
+
+import protect.card_locker.preferences.Settings;
 
 
 public class LoyaltyCardViewActivity extends AppCompatActivity
 {
     private static final String TAG = "CardLocker";
 
-    private static final int SELECT_BARCODE_REQUEST = 1;
-
-    EditText storeFieldEdit;
-    TextView storeFieldView;
-    EditText noteFieldEdit;
-    TextView noteFieldView;
     TextView cardIdFieldView;
-    View cardIdDivider;
-    View cardIdTableRow;
-    TextView barcodeTypeField;
+    TextView noteView;
+    View noteViewDivider;
+    TextView storeName;
     ImageView barcodeImage;
-    View barcodeImageLayout;
-    View barcodeCaptureLayout;
-
-    Button captureButton;
-    Button enterButton;
-
+    View collapsingToolbarLayout;
     int loyaltyCardId;
-    boolean updateLoyaltyCard;
-    boolean viewLoyaltyCard;
-
+    boolean rotationEnabled;
     DBHelper db;
+    Settings settings;
+
+    private void extractIntentFields(Intent intent)
+    {
+        final Bundle b = intent.getExtras();
+        loyaltyCardId = b != null ? b.getInt("id") : 0;
+        Log.d(TAG, "View activity: id=" + loyaltyCardId);
+    }
 
     @Override
     protected void onCreate(Bundle savedInstanceState)
     {
         super.onCreate(savedInstanceState);
 
-        setContentView(R.layout.loyalty_card_view_activity);
-        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+        settings = new Settings(this);
+
+        extractIntentFields(getIntent());
+
+        setContentView(R.layout.loyalty_card_view_layout);
+
+        Toolbar toolbar = findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
         ActionBar actionBar = getSupportActionBar();
         if(actionBar != null)
@@ -69,12 +68,21 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
             actionBar.setDisplayHomeAsUpEnabled(true);
         }
 
-        final Bundle b = getIntent().getExtras();
-        loyaltyCardId = b != null ? b.getInt("id") : 0;
-        updateLoyaltyCard = b != null && b.getBoolean("update", false);
-        viewLoyaltyCard = b != null && b.getBoolean("view", false);
-
         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);
+        collapsingToolbarLayout = findViewById(R.id.collapsingToolbarLayout);
+    }
+
+    @Override
+    public void onNewIntent(Intent intent)
+    {
+        Log.i(TAG, "Received new intent");
+        extractIntentFields(intent);
     }
 
     @Override
@@ -84,98 +92,80 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
 
         Log.i(TAG, "To view card: " + loyaltyCardId);
 
-        if(viewLoyaltyCard)
+        // The brightness value is on a scale from [0, ..., 1], where
+        // '1' is the brightest. We attempt to maximize the brightness
+        // to help barcode readers scan the barcode.
+        Window window = getWindow();
+        if(window != null)
         {
-            // The brightness value is on a scale from [0, ..., 1], where
-            // '1' is the brightest. We attempt to maximize the brightness
-            // to help barcode readers scan the barcode.
-            Window window = getWindow();
-            if(window != null)
-            {
-                WindowManager.LayoutParams attributes = window.getAttributes();
-                attributes.screenBrightness = 1F;
-                window.setAttributes(attributes);
-            }
+            WindowManager.LayoutParams attributes = window.getAttributes();
+            attributes.screenBrightness = 1F;
+            window.setAttributes(attributes);
         }
 
-        storeFieldEdit = (EditText) findViewById(R.id.storeNameEdit);
-        storeFieldView = (TextView) findViewById(R.id.storeNameView);
-        noteFieldEdit = (EditText) findViewById(R.id.noteEdit);
-        noteFieldView = (TextView) findViewById(R.id.noteView);
-        cardIdFieldView = (TextView) findViewById(R.id.cardIdView);
-        cardIdDivider = findViewById(R.id.cardIdDivider);
-        cardIdTableRow = findViewById(R.id.cardIdTableRow);
-        barcodeTypeField = (TextView) findViewById(R.id.barcodeType);
-        barcodeImage = (ImageView) findViewById(R.id.barcode);
-        barcodeImageLayout = findViewById(R.id.barcodeLayout);
-        barcodeCaptureLayout = findViewById(R.id.barcodeCaptureLayout);
-
-        captureButton = (Button) findViewById(R.id.captureButton);
-        enterButton = (Button) findViewById(R.id.enterButton);
-
-        if(updateLoyaltyCard || viewLoyaltyCard)
+        final LoyaltyCard loyaltyCard = db.getLoyaltyCard(loyaltyCardId);
+        if(loyaltyCard == null)
         {
-            final LoyaltyCard loyaltyCard = db.getLoyaltyCard(loyaltyCardId);
+            Log.w(TAG, "Could not lookup loyalty card " + loyaltyCardId);
+            Toast.makeText(this, R.string.noCardExistsError, Toast.LENGTH_LONG).show();
+            finish();
+            return;
+        }
 
-            if(storeFieldEdit.getText().length() == 0)
-            {
-                storeFieldEdit.setText(loyaltyCard.store);
-                storeFieldView.setText(loyaltyCard.store);
-            }
+        String formatString = loyaltyCard.barcodeType;
+        final BarcodeFormat format = BarcodeFormat.valueOf(formatString);
+        final String cardIdString = loyaltyCard.cardId;
 
-            if(noteFieldEdit.getText().length() == 0)
-            {
-                noteFieldEdit.setText(loyaltyCard.note);
-                noteFieldView.setText(loyaltyCard.note);
-            }
+        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);
 
-            if(cardIdFieldView.getText().length() == 0)
-            {
-                cardIdFieldView.setText(loyaltyCard.cardId);
-            }
-
-            if(barcodeTypeField.getText().length() == 0)
-            {
-                barcodeTypeField.setText(loyaltyCard.barcodeType);
-            }
-
-            if(updateLoyaltyCard)
-            {
-                setTitle(R.string.editCardTitle);
-
-                storeFieldView.setVisibility(View.GONE);
-                noteFieldView.setVisibility(View.GONE);
-            }
-            else
-            {
-                barcodeCaptureLayout.setVisibility(View.GONE);
-                captureButton.setVisibility(View.GONE);
-                setTitle(R.string.viewCardTitle);
-
-                storeFieldEdit.setVisibility(View.GONE);
-                noteFieldEdit.setVisibility(View.GONE);
-            }
+        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
         {
-            setTitle(R.string.addCardTitle);
-
-            storeFieldView.setVisibility(View.GONE);
-            noteFieldView.setVisibility(View.GONE);
+            noteView.setVisibility(View.GONE);
+            noteViewDivider.setVisibility(View.GONE);
         }
 
-        if(cardIdFieldView.getText().length() > 0 && barcodeTypeField.getText().length() > 0)
-        {
-            String formatString = barcodeTypeField.getText().toString();
-            final BarcodeFormat format = BarcodeFormat.valueOf(formatString);
-            final String cardIdString = cardIdFieldView.getText().toString();
+        storeName.setText(loyaltyCard.store);
+        storeName.setTextSize(settings.getCardTitleFontSize());
 
-            if(barcodeImage.getHeight() == 0)
-            {
-                Log.d(TAG, "ImageView size is not known known at start, waiting for load");
-                // The size of the ImageView is not yet available as it has not
-                // yet been drawn. Wait for it to be drawn so the size is available.
-                barcodeImage.getViewTreeObserver().addOnGlobalLayoutListener(
+        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)
+        {
+            Log.d(TAG, "ImageView size is not known known at start, waiting for load");
+            // The size of the ImageView is not yet available as it has not
+            // yet been drawn. Wait for it to be drawn so the size is available.
+            barcodeImage.getViewTreeObserver().addOnGlobalLayoutListener(
                     new ViewTreeObserver.OnGlobalLayoutListener()
                     {
                         @Override
@@ -194,116 +184,21 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
                             new BarcodeImageWriterTask(barcodeImage, cardIdString, format).execute();
                         }
                     });
-            }
-            else
-            {
-                Log.d(TAG, "ImageView size known known, creating barcode");
-                new BarcodeImageWriterTask(barcodeImage, cardIdString, format).execute();
-            }
-
-            barcodeImageLayout.setVisibility(View.VISIBLE);
-        }
-
-        View.OnClickListener captureCallback = new View.OnClickListener()
-        {
-            @Override
-            public void onClick(View v)
-            {
-                IntentIntegrator integrator = new IntentIntegrator(LoyaltyCardViewActivity.this);
-                integrator.setDesiredBarcodeFormats(BarcodeSelectorActivity.SUPPORTED_BARCODE_TYPES);
-
-                String prompt = getResources().getString(R.string.scanCardBarcode);
-                integrator.setPrompt(prompt);
-                integrator.initiateScan();
-            }
-        };
-
-        captureButton.setOnClickListener(captureCallback);
-
-        enterButton.setOnClickListener(new View.OnClickListener()
-        {
-            @Override
-            public void onClick(View v)
-            {
-                Intent i = new Intent(getApplicationContext(), BarcodeSelectorActivity.class);
-
-                String cardId = cardIdFieldView.getText().toString();
-                if(cardId.length() > 0)
-                {
-                    final Bundle b = new Bundle();
-                    b.putString("initialCardId", cardId);
-                    i.putExtras(b);
-                }
-
-                startActivityForResult(i, SELECT_BARCODE_REQUEST);
-            }
-        });
-
-        if(cardIdFieldView.getText().length() > 0)
-        {
-            cardIdDivider.setVisibility(View.VISIBLE);
-            cardIdTableRow.setVisibility(View.VISIBLE);
-            enterButton.setText(R.string.editCard);
         }
         else
         {
-            cardIdDivider.setVisibility(View.GONE);
-            cardIdTableRow.setVisibility(View.GONE);
-            enterButton.setText(R.string.enterCard);
-        }
-    }
-
-    private void doSave()
-    {
-        String store = storeFieldEdit.getText().toString();
-        String note = noteFieldEdit.getText().toString();
-        String cardId = cardIdFieldView.getText().toString();
-        String barcodeType = barcodeTypeField.getText().toString();
-
-        if(store.isEmpty())
-        {
-            Snackbar.make(storeFieldEdit, R.string.noStoreError, Snackbar.LENGTH_LONG).show();
-            return;
+            Log.d(TAG, "ImageView size known known, creating barcode");
+            new BarcodeImageWriterTask(barcodeImage, cardIdString, format).execute();
         }
 
-        if(cardId.isEmpty() || barcodeType.isEmpty())
-        {
-            Snackbar.make(cardIdFieldView, R.string.noCardIdError, Snackbar.LENGTH_LONG).show();
-            return;
-        }
-
-        if(updateLoyaltyCard)
-        {
-            db.updateLoyaltyCard(loyaltyCardId, store, note, cardId, barcodeType);
-            Log.i(TAG, "Updated " + loyaltyCardId + " to " + cardId);
-        }
-        else
-        {
-            db.insertLoyaltyCard(store, note, cardId, barcodeType);
-        }
-
-        finish();
     }
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu)
     {
-        final Bundle b = getIntent().getExtras();
-        final boolean updateLoyaltyCard = b != null && b.getBoolean("update", false);
-        final boolean viewLoyaltyCard = b != null && b.getBoolean("view", false);
+        getMenuInflater().inflate(R.menu.card_view_menu, menu);
 
-        if(viewLoyaltyCard)
-        {
-            getMenuInflater().inflate(R.menu.card_view_menu, menu);
-        }
-        else if(updateLoyaltyCard)
-        {
-            getMenuInflater().inflate(R.menu.card_update_menu, menu);
-        }
-        else
-        {
-            getMenuInflater().inflate(R.menu.card_add_menu, menu);
-        }
+        rotationEnabled = true;
 
         return super.onCreateOptionsMenu(menu);
     }
@@ -313,46 +208,14 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
     {
         int id = item.getItemId();
 
-        final Bundle b = getIntent().getExtras();
-        final int loyaltyCardId = b != null ? b.getInt("id") : 0;
-
         switch(id)
         {
             case android.R.id.home:
                 finish();
                 break;
 
-            case R.id.action_delete:
-                AlertDialog.Builder builder = new AlertDialog.Builder(this);
-                builder.setTitle(R.string.deleteTitle);
-                builder.setMessage(R.string.deleteConfirmation);
-                builder.setPositiveButton(R.string.confirm, new DialogInterface.OnClickListener()
-                {
-                    @Override
-                    public void onClick(DialogInterface dialog, int which)
-                    {
-                        Log.e(TAG, "Deleting card: " + loyaltyCardId);
-
-                        DBHelper db = new DBHelper(LoyaltyCardViewActivity.this);
-                        db.deleteLoyaltyCard(loyaltyCardId);
-                        finish();
-                        dialog.dismiss();
-                    }
-                });
-                builder.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener()
-                {
-                    @Override
-                    public void onClick(DialogInterface dialog, int which)
-                    {
-                        dialog.dismiss();
-                    }
-                });
-                AlertDialog dialog = builder.create();
-                dialog.show();
-
-                return true;
             case R.id.action_edit:
-                Intent intent = new Intent(getApplicationContext(), LoyaltyCardViewActivity.class);
+                Intent intent = new Intent(getApplicationContext(), LoyaltyCardEditActivity.class);
                 Bundle bundle = new Bundle();
                 bundle.putInt("id", loyaltyCardId);
                 bundle.putBoolean("update", true);
@@ -361,49 +224,23 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
                 finish();
                 return true;
 
-            case R.id.action_save:
-                doSave();
+            case R.id.action_lock_unlock:
+                if(rotationEnabled)
+                {
+                    item.setIcon(R.drawable.ic_lock_outline_white_24dp);
+                    item.setTitle(R.string.unlockScreen);
+                    setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_NOSENSOR);
+                }
+                else
+                {
+                    item.setIcon(R.drawable.ic_lock_open_white_24dp);
+                    item.setTitle(R.string.lockScreen);
+                    setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_SENSOR);
+                }
+                rotationEnabled = !rotationEnabled;
                 return true;
         }
 
         return super.onOptionsItemSelected(item);
     }
-
-    @Override
-    public void onActivityResult(int requestCode, int resultCode, Intent intent)
-    {
-        String contents = null;
-        String format = null;
-
-        IntentResult result =
-                IntentIntegrator.parseActivityResult(requestCode, resultCode, intent);
-        if (result != null)
-        {
-            Log.i(TAG, "Received barcode information from capture");
-            contents = result.getContents();
-            format = result.getFormatName();
-        }
-
-        if(requestCode == SELECT_BARCODE_REQUEST && resultCode == Activity.RESULT_OK)
-        {
-            Log.i(TAG, "Received barcode information from capture");
-
-            contents = intent.getStringExtra(BarcodeSelectorActivity.BARCODE_CONTENTS);
-            format = intent.getStringExtra(BarcodeSelectorActivity.BARCODE_FORMAT);
-        }
-
-        if(contents != null && contents.isEmpty() == false &&
-                format != null && format.isEmpty() == false)
-        {
-            Log.i(TAG, "Read barcode id: " + contents);
-            Log.i(TAG, "Read format: " + format);
-
-            TextView cardIdView = (TextView)findViewById(R.id.cardIdView);
-            cardIdView.setText(contents);
-
-            final TextView barcodeTypeField = (TextView) findViewById(R.id.barcodeType);
-            barcodeTypeField.setText(format);
-            onResume();
-        }
-    }
 }

app/src/main/java/protect/card_locker/MainActivity.java

@@ -29,6 +29,9 @@ import com.google.common.collect.ImmutableMap;
 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
 {
     private static final String TAG = "LoyaltyCardLocker";
@@ -38,7 +41,7 @@ public class MainActivity extends AppCompatActivity
     {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.main_activity);
-        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+        Toolbar toolbar = findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
 
         updateLoyaltyCardList();
@@ -60,8 +63,8 @@ public class MainActivity extends AppCompatActivity
 
     private void updateLoyaltyCardList()
     {
-        final ListView cardList = (ListView) findViewById(R.id.list);
-        final TextView helpText = (TextView) findViewById(R.id.helpText);
+        final ListView cardList = findViewById(R.id.list);
+        final TextView helpText = findViewById(R.id.helpText);
         final DBHelper db = new DBHelper(this);
 
         if(db.getLoyaltyCardCount() > 0)
@@ -91,10 +94,13 @@ public class MainActivity extends AppCompatActivity
                 LoyaltyCard loyaltyCard = LoyaltyCard.toLoyaltyCard(selected);
 
                 Intent i = new Intent(view.getContext(), LoyaltyCardViewActivity.class);
+                i.setAction("");
                 final Bundle b = new Bundle();
                 b.putInt("id", loyaltyCard.id);
-                b.putBoolean("view", true);
                 i.putExtras(b);
+
+                ShortcutHelper.updateShortcuts(MainActivity.this, loyaltyCard, i);
+
                 startActivity(i);
             }
         });
@@ -115,7 +121,7 @@ public class MainActivity extends AppCompatActivity
     public boolean onContextItemSelected(MenuItem item)
     {
         AdapterView.AdapterContextMenuInfo info = (AdapterView.AdapterContextMenuInfo) item.getMenuInfo();
-        ListView listView = (ListView) findViewById(R.id.list);
+        ListView listView = findViewById(R.id.list);
 
         Cursor cardCursor = (Cursor)listView.getItemAtPosition(info.position);
         LoyaltyCard card = LoyaltyCard.toLoyaltyCard(cardCursor);
@@ -147,7 +153,7 @@ public class MainActivity extends AppCompatActivity
 
         if (id == R.id.action_add)
         {
-            Intent i = new Intent(getApplicationContext(), LoyaltyCardViewActivity.class);
+            Intent i = new Intent(getApplicationContext(), LoyaltyCardEditActivity.class);
             startActivity(i);
             return true;
         }
@@ -159,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();
@@ -176,13 +189,19 @@ public class MainActivity extends AppCompatActivity
 
     private void displayAboutDialog()
     {
-        final Map<String, String> USED_LIBRARIES = ImmutableMap.of
+        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
         (
-            "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"
+            "Save by Bernar Novalyi", "https://thenounproject.com/term/save/716011"
         );
 
         StringBuilder libs = new StringBuilder().append("<ul>");
@@ -192,6 +211,13 @@ public class MainActivity extends AppCompatActivity
         }
         libs.append("</ul>");
 
+        StringBuilder resources = new StringBuilder().append("<ul>");
+        for (Map.Entry<String, String> entry : USED_ASSETS.entrySet())
+        {
+            resources.append("<li><a href=\"").append(entry.getValue()).append("\">").append(entry.getKey()).append("</a></li>");
+        }
+        resources.append("</ul>");
+
         String appName = getString(R.string.app_name);
         int year = Calendar.getInstance().get(Calendar.YEAR);
 
@@ -229,7 +255,9 @@ public class MainActivity extends AppCompatActivity
             "</p><hr/><p>" +
             getString(R.string.app_license) +
             "</p><hr/><p>" +
-            String.format(getString(R.string.app_libraries), appName, libs.toString());
+            String.format(getString(R.string.app_libraries), appName, libs.toString()) +
+            "</p><hr/><p>" +
+            String.format(getString(R.string.app_resources), appName, resources.toString());
 
         wv.loadDataWithBaseURL("file:///android_res/drawable/", html, "text/html", "utf-8", null);
         new AlertDialog.Builder(this)

app/src/main/java/protect/card_locker/ShortcutHelper.java

@@ -0,0 +1,153 @@
+package protect.card_locker;
+
+import android.annotation.TargetApi;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.ShortcutInfo;
+import android.content.pm.ShortcutManager;
+import android.graphics.drawable.Icon;
+import android.os.Build;
+
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.LinkedList;
+import java.util.List;
+
+class ShortcutHelper
+{
+    // Android documentation says that no more than 5 shortcuts
+    // are supported. However, that may be too many, as not all
+    // launcher will show all 5. Instead, the number is limited
+    // to 3 here, so that the most recent shortcut has a good
+    // chance of being shown.
+    private static final int MAX_SHORTCUTS = 3;
+
+    /**
+     * Add a card to the app shortcuts, and maintain a list of the most
+     * recently used cards. If there is already a shortcut for the card,
+     * the card is marked as the most recently used card. If adding this
+     * card exceeds the max number of shortcuts, then the least recently
+     * used card shortcut is discarded.
+     */
+    @TargetApi(25)
+    static void updateShortcuts(Context context, LoyaltyCard card, Intent intent)
+    {
+        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.N_MR1)
+        {
+            ShortcutManager shortcutManager = context.getSystemService(ShortcutManager.class);
+            LinkedList<ShortcutInfo> list = new LinkedList<>(shortcutManager.getDynamicShortcuts());
+
+            String shortcutId = Integer.toString(card.id);
+
+            // Sort the shortcuts by rank, so working with the relative order will be easier.
+            // This sorts so that the lowest rank is first.
+            Collections.sort(list, new Comparator<ShortcutInfo>()
+            {
+                @Override
+                public int compare(ShortcutInfo o1, ShortcutInfo o2)
+                {
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1)
+                    {
+                        return o1.getRank() - o2.getRank();
+                    }
+                    else
+                    {
+                        return 0;
+                    }
+                }
+            });
+
+            Integer foundIndex = null;
+
+            for(int index = 0; index < list.size(); index++)
+            {
+                if(list.get(index).getId().equals(shortcutId))
+                {
+                    // Found the item already
+                    foundIndex = index;
+                    break;
+                }
+            }
+
+            if(foundIndex != null)
+            {
+                // If the item is already found, then the list needs to be
+                // reordered, so that the selected item now has the lowest
+                // rank, thus letting it survive longer.
+                ShortcutInfo found = list.remove(foundIndex.intValue());
+                list.addFirst(found);
+            }
+            else
+            {
+                // The item is new to the list. First, we need to trim the list
+                // until it is able to accept a new item, then the item is
+                // inserted.
+                while(list.size() >= MAX_SHORTCUTS)
+                {
+                    list.pollLast();
+                }
+
+                ShortcutInfo shortcut = new ShortcutInfo.Builder(context, Integer.toString(card.id))
+                    .setShortLabel(card.store)
+                    .setLongLabel(card.store)
+                    .setIntent(intent)
+                    .build();
+
+                list.addFirst(shortcut);
+            }
+
+            LinkedList<ShortcutInfo> finalList = new LinkedList<>();
+
+            // The ranks are now updated; the order in the list is the rank.
+            for(int index = 0; index < list.size(); index++)
+            {
+                ShortcutInfo prevShortcut = list.get(index);
+
+                Intent shortcutIntent = prevShortcut.getIntent();
+
+                // Prevent instances of the view activity from piling up; if one exists let this
+                // one replace it.
+                shortcutIntent.setFlags(shortcutIntent.getFlags() | Intent.FLAG_ACTIVITY_SINGLE_TOP);
+
+                ShortcutInfo updatedShortcut = new ShortcutInfo.Builder(context, prevShortcut.getId())
+                        .setShortLabel(prevShortcut.getShortLabel())
+                        .setLongLabel(prevShortcut.getLongLabel())
+                        .setIntent(shortcutIntent)
+                        .setIcon(Icon.createWithResource(context, R.drawable.circle))
+                        .setRank(index)
+                        .build();
+
+                finalList.addLast(updatedShortcut);
+            }
+
+            shortcutManager.setDynamicShortcuts(finalList);
+        }
+    }
+
+    /**
+     * Remove the given card id from the app shortcuts, if such a
+     * shortcut exists.
+     */
+    @TargetApi(25)
+    static void removeShortcut(Context context, int cardId)
+    {
+        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.N_MR1)
+        {
+            ShortcutManager shortcutManager = context.getSystemService(ShortcutManager.class);
+            List<ShortcutInfo> list = shortcutManager.getDynamicShortcuts();
+
+            String shortcutId = Integer.toString(cardId);
+
+            for(int index = 0; index < list.size(); index++)
+            {
+                if(list.get(index).getId().equals(shortcutId))
+                {
+                    list.remove(index);
+                    break;
+                }
+            }
+
+            shortcutManager.setDynamicShortcuts(list);
+        }
+    }
+}

app/src/main/java/protect/card_locker/intro/IntroActivity.java

@@ -0,0 +1,33 @@
+package protect.card_locker.intro;
+
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+
+import com.github.paolorotolo.appintro.AppIntro;
+
+
+public class IntroActivity extends AppIntro
+{
+    @Override
+    public void init(Bundle savedInstanceState)
+    {
+        addSlide(new IntroSlide1());
+        addSlide(new IntroSlide2());
+        addSlide(new IntroSlide3());
+        addSlide(new IntroSlide4());
+        addSlide(new IntroSlide5());
+        addSlide(new IntroSlide6());
+    }
+
+    @Override
+    public void onSkipPressed(Fragment fragment) {
+        finish();
+    }
+
+    @Override
+    public void onDonePressed(Fragment fragment) {
+        finish();
+    }
+}
+
+

app/src/main/java/protect/card_locker/intro/IntroSlide1.java

@@ -0,0 +1,19 @@
+package protect.card_locker.intro;
+
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import protect.card_locker.R;
+
+public class IntroSlide1 extends Fragment
+{
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState)
+    {
+        View v = inflater.inflate(R.layout.intro1_layout, container, false);
+        return v;
+    }
+}

app/src/main/java/protect/card_locker/intro/IntroSlide2.java

@@ -1,4 +1,4 @@
-package protect.card_locker;
+package protect.card_locker.intro;
 
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
@@ -6,20 +6,15 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
-public class IntroSlide extends Fragment
-{
-    int _layout;
+import protect.card_locker.R;
 
-    @Override
-    public void setArguments(Bundle bundle)
-    {
-        _layout = bundle.getInt("layout");
-    }
+public class IntroSlide2 extends Fragment
+{
 
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState)
     {
-        View v = inflater.inflate(_layout, container, false);
+        View v = inflater.inflate(R.layout.intro2_layout, container, false);
         return v;
     }
 }

app/src/main/java/protect/card_locker/intro/IntroSlide3.java

@@ -0,0 +1,19 @@
+package protect.card_locker.intro;
+
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import protect.card_locker.R;
+
+public class IntroSlide3 extends Fragment
+{
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState)
+    {
+        View v = inflater.inflate(R.layout.intro3_layout, container, false);
+        return v;
+    }
+}

app/src/main/java/protect/card_locker/intro/IntroSlide4.java

@@ -0,0 +1,19 @@
+package protect.card_locker.intro;
+
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import protect.card_locker.R;
+
+public class IntroSlide4 extends Fragment
+{
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState)
+    {
+        View v = inflater.inflate(R.layout.intro4_layout, container, false);
+        return v;
+    }
+}

app/src/main/java/protect/card_locker/intro/IntroSlide5.java

@@ -0,0 +1,19 @@
+package protect.card_locker.intro;
+
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import protect.card_locker.R;
+
+public class IntroSlide5 extends Fragment
+{
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState)
+    {
+        View v = inflater.inflate(R.layout.intro5_layout, container, false);
+        return v;
+    }
+}

app/src/main/java/protect/card_locker/intro/IntroSlide6.java

@@ -0,0 +1,19 @@
+package protect.card_locker.intro;
+
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import protect.card_locker.R;
+
+public class IntroSlide6 extends Fragment
+{
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState)
+    {
+        View v = inflater.inflate(R.layout.intro6_layout, container, false);
+        return v;
+    }
+}

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

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

app/src/main/res/layout/loyalty_card_edit_activity.xml

@@ -65,20 +65,13 @@
 
                         <EditText
                             android:id="@+id/storeNameEdit"
+                            android:inputType="textCapWords"
                             android:layout_height="wrap_content"
                             android:layout_width="match_parent"
                             android:padding="@dimen/inputPadding"
                             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
@@ -121,20 +114,12 @@
 
                         <EditText
                             android:id="@+id/noteEdit"
+                            android:inputType="textCapSentences"
                             android:layout_height="wrap_content"
                             android:layout_width="match_parent"
                             android:padding="@dimen/inputPadding"
                             android:textSize="@dimen/inputSize"
                             android:layout_toEndOf="@id/noteField"/>
-
-                        <TextView
-                            android:id="@+id/noteView"
-                            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/noteField"/>
                     </RelativeLayout>
 
                     <View
@@ -144,6 +129,148 @@
                         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/headingField"
+                            android:text="@string/storeTextBackgroundColorTitle"
+                            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/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"
+                        android:layout_height="match_parent"
+                        android:layout_width="@dimen/inputBorderThickness"
+                        android:background="@color/inputBorder" />
+                </TableRow>
+
                 <!-- Card ID -->
                 <View
                     android:id="@+id/cardIdDivider"

app/src/main/res/layout/loyalty_card_layout.xml

@@ -1,32 +1,56 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout android:orientation="vertical"
-              android:padding="10.0dp"
-              android:layout_width="fill_parent"
-              android:layout_height="fill_parent"
-              xmlns:android="http://schemas.android.com/apk/res/android">
-    <LinearLayout android:orientation="horizontal"
-                  android:padding="5.0dp"
-                  android:layout_width="fill_parent"
-                  android:layout_height="wrap_content"
-                  android:baselineAligned="true">
-        <TextView android:textSize="20.0sp"
-                  android:id="@+id/store"
-                  android:layout_width="0dp"
-                  android:layout_height="wrap_content"
-                  android:layout_weight="1.0"
-                  android:maxLines="1"/>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="horizontal"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="center_vertical"
+    android:baselineAligned="false"
+    android:padding="@dimen/activity_margin">
+
+    <ImageView
+        android:id="@+id/thumbnail"
+        android:layout_width="@dimen/cardThumbnailSize"
+        android:layout_height="@dimen/cardThumbnailSize"
+        android:layout_marginEnd="@dimen/activity_margin"
+        android:src="@mipmap/ic_launcher"
+        android:contentDescription="@string/thumbnailDescription"/>
+
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_width="0dip"
+        android:layout_height="wrap_content"
+        android:layout_weight="1">
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" >
+
+            <LinearLayout
+                android:id="@+id/valueLayout"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:visibility="visible">
+
+                <TextView
+                    android:id="@+id/store"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textColor="?android:attr/textColorSecondary"
+                    android:textSize="@dimen/storeNameTextSize"
+                    android:textStyle="bold"/>
+
+            </LinearLayout>
+
+        </LinearLayout>
+
+        <TextView
+            android:id="@+id/note"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:maxLines="1"
+            android:ellipsize="end"
+            android:textSize="@dimen/noteTextSize"/>
     </LinearLayout>
 
-    <LinearLayout android:orientation="horizontal"
-                  android:padding="5.0dp"
-                  android:layout_width="fill_parent"
-                  android:layout_height="wrap_content"
-                  android:baselineAligned="true">
-        <TextView android:textSize="20.0sp"
-                  android:layout_gravity="start"
-                  android:id="@+id/cardId"
-                  android:layout_width="wrap_content"
-                  android:layout_height="wrap_content" />
-    </LinearLayout>
-
-</LinearLayout>
+</LinearLayout>

app/src/main/res/layout/loyalty_card_view_layout.xml

@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.design.widget.CoordinatorLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/coordinator_layout"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:fitsSystemWindows="true"
+    >
+
+    <FrameLayout
+        android:clipChildren="false"
+        android:clipToPadding="false"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
+
+        <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="0dp"
+                android:layout_height="0dp"
+                android:layout_marginTop="20.0dip"
+                android:layout_marginBottom="10.0dip"
+                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:layout_width="0dp"
+                android:layout_height="0dp"
+                android:layout_marginLeft="10.0dip"
+                android:layout_marginRight="10.0dip"
+                app:layout_constraintTop_toBottomOf="@id/centerGuideline"
+                app:layout_constraintBottom_toTopOf="@+id/noteViewDivider"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                android:textAlignment="center"
+                app:autoSizeTextType="uniform"
+                app:autoSizeMinTextSize="@dimen/singleCardCardIdTextSizeMin"
+                app:autoSizeMaxTextSize="@dimen/singleCardCardIdTextSizeMax"
+                android:ellipsize="end"
+                android:textIsSelectable="true"/>
+
+            <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"
+            android:layout_width="fill_parent"
+            android:layout_height="5.0dip"
+            android:layout_gravity="top"/>
+    </FrameLayout>
+
+    <android.support.design.widget.AppBarLayout
+        android:id="@+id/app_bar_layout"
+        android:background="@android:color/transparent"
+        android:clipChildren="false"
+        android:clipToPadding="false"
+        android:layout_width="fill_parent"
+        android:layout_height="224.0dip"
+        android:weightSum="1.0"
+        android:fitsSystemWindows="true">
+        <android.support.design.widget.CollapsingToolbarLayout
+            android:id="@+id/collapsingToolbarLayout"
+            android:clipChildren="false"
+            android:clipToPadding="false"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:minHeight="56.0dip"
+            android:layout_weight="1.0"
+            app:expandedTitleMarginStart="48dp"
+            app:expandedTitleMarginEnd="64dp"
+            app:contentScrim="?colorPrimary"
+            app:expandedTitleGravity="top">
+            <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"/>
+            <android.support.v7.widget.Toolbar
+                android:id="@id/toolbar"
+                android:background="@android:color/transparent"
+                android:theme="@style/CardView.ActionBarTheme"
+                android:layout_width="fill_parent"
+                android:layout_height="?actionBarSize"
+                app:contentInsetStart="72.0dip"
+                app:layout_collapseMode="pin" />
+        </android.support.design.widget.CollapsingToolbarLayout>
+    </android.support.design.widget.AppBarLayout>
+</android.support.design.widget.CoordinatorLayout>

app/src/main/res/menu/card_view_menu.xml

@@ -2,6 +2,11 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
       xmlns:app="http://schemas.android.com/apk/res-auto">
 
+    <item
+        android:id="@+id/action_lock_unlock"
+        android:icon="@drawable/ic_lock_open_white_24dp"
+        android:title="@string/lockScreen"
+        app:showAsAction="always"/>
     <item
         android:id="@+id/action_edit"
         android:icon="@drawable/ic_mode_edit_white_24dp"

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"

app/src/main/res/values-cs/strings.xml

@@ -15,7 +15,6 @@
     <string name="save">Uložit</string>
     <string name="capture">Naskenovat kartu</string>
     <string name="enterCard">Vložit vlastnoručně</string>
-    <!-- NEEDS TRANSLATED --><string name="editCard">Edit Card</string>
     <string name="edit">Editovat</string>
     <string name="delete">Smazat</string>
     <string name="confirm">Potvrdit</string>
@@ -23,48 +22,32 @@
     <string name="deleteConfirmation">Opravdu chcete smazat tuto věrnostní kartu?</string>
     <string name="ok">Ano</string>
     <string name="copy_to_clipboard">Kopírovat ID do schránky</string>
-
+    <string name="sendLabel">Odeslat&#8230;</string>
     <string name="editCardTitle">Editovat věrnostní kartu</string>
     <string name="addCardTitle">Přidat věrnostní kartu</string>
     <string name="viewCardTitle">Zobrazit věrnostní kartu</string>
     <string name="scanCardBarcode">Oskenujte kód karty</string>
-
     <string name="barcodeImageDescription">Obrázek kódu karty</string>
 
     <string name="noStoreError">Nebyl zadán Obchod</string>
     <string name="noCardIdError">Nebylo zadáno ID karty</string>
-
     <string name="cardIdFormat">%1$s: %2$s</string>
-
     <string name="importExport">Import/Export</string>
     <string name="importName">Import</string>
     <string name="exportName">Export</string>
+    <string name="importExportHelp">Zálohování dat vám umožní přesunout vaše uložené karty na jiné zařízení.</string>
     <string name="importedFrom">Importováno z: %1$s</string>
     <string name="exportedTo">Exportováno do: %1$s</string>
     <string name="fileMissing">Doubor chybí: %1$s</string>
+    <string name="importSuccessfulTitle">Import proběhl úspěšně</string>
+    <string name="importFailedTitle">Import selhal</string>
     <string name="importFailed">Import selhal: %1$s</string>
+    <string name="exportSuccessfulTitle">Export proběhl úspěšně</string>
+    <string name="exportFailedTitle">Export selhal</string>
     <string name="exportFailed">Export selhal: %1$s</string>
     <string name="importing">Importuji&#8230;</string>
     <string name="exporting">Exportuji&#8230;</string>
     <string name="noExternalStoragePermissionError">Nelze importovat nebo exportovat karty bez přístupu k externímu uložišti</string>
-
-    <string name="about">O aplikaci</string>
-    <string name="app_copyright_fmt">Copyright 2016-<xliff:g>%s</xliff:g> Branden Archer</string>
-    <string name="app_license">Licensed under the GPLv3.</string>
-    <string name="about_title_fmt">O aplikaci <xliff:g id="app_name">%s</xliff:g></string>
-    <string name="debug_version_fmt">Verze: <xliff:g id="version">%s</xliff:g></string>
-    <string name="app_revision_fmt">Revizní informace: <xliff:g id="app_revision_url">%s</xliff:g></string>
-    <string name="app_libraries"><xliff:g id="app_name">%s</xliff:g> používá tyto knihovny třetích stran: <xliff:g id="app_libraries_list">%s</xliff:g></string>
-
-    <string name="selectBarcodeTitle">Vyberte čárový kód</string>
-    <string name="enterBarcodeInstructions">Zadejte hodnotu čárového kódu a potm vyberte kód, který představuje čárový kód, který je na kartě.</string>
-
-    <string name="copy_to_clipboard_toast">ID karty zkopírováno do schránky</string>
-    <string name="importExportHelp">Zálohování dat vám umožní přesunout vaše uložené karty na jiné zařízení.</string>
-    <string name="importSuccessfulTitle">Import proběhl úspěšně</string>
-    <string name="importFailedTitle">Import selhal</string>
-    <string name="exportSuccessfulTitle">Export proběhl úspěšně</string>
-    <string name="exportFailedTitle">Export selhal</string>
     <string name="exportOptionExplanation">Data jsou zapsána do kořenové složky externího uložiště.</string>
     <string name="importOptionFilesystemTitle">Import ze souborového systému</string>
     <string name="importOptionFilesystemExplanation">Vyberte konkrétní soubor v uložišti.</string>
@@ -75,19 +58,17 @@
     <string name="importOptionFixedTitle">Import z umístění exportu</string>
     <string name="importOptionFixedExplanation">Import ze stejné složky souborového systému do níž se zapisuje při exportu.</string>
     <string name="importOptionFixedButton">Použít složku exportu</string>
-    <string name="sendLabel">Odeslat&#8230;</string>
 
-    <!-- NEEDS TRANSLATED --><string name="startIntro">Start Intro</string>
-    <!-- NEEDS TRANSLATED --><string name="intro1Title">Welcome to Loyalty Card Keychain\n</string>
-    <!-- NEEDS TRANSLATED --><string name="intro1Description">Manage your barcode-based store/loyalty cards on your phone!\n\n</string>
-    <!-- NEEDS TRANSLATED --><string name="intro2Title">Adding Cards\n</string>
-    <!-- NEEDS TRANSLATED --><string name="intro2Description">Add a new card by touching the plus from the card list.\n\n</string>
-    <!-- NEEDS TRANSLATED --><string name="intro3Title">Adding Cards\n</string>
-    <!-- NEEDS TRANSLATED --><string name="intro3Description">To add the barcode, either capture with the camera or type in manually.\n\n</string>
-    <!-- NEEDS TRANSLATED --><string name="intro4Title">Show Card\n</string>
-    <!-- NEEDS TRANSLATED --><string name="intro4Description">To display a card, click on the store name from the main screen\n\n</string>
-    <!-- NEEDS TRANSLATED --><string name="intro5Title">Backup\n</string>
-    <!-- NEEDS TRANSLATED --><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>
-    <!-- NEEDS TRANSLATED --><string name="intro6Title">Feedback\n</string>
-    <!-- NEEDS TRANSLATED --><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="about">O aplikaci</string>
+    <string name="app_copyright_fmt">Copyright 2016-<xliff:g>%d</xliff:g> Branden Archer</string>
+    <string name="app_license">Licensed under the GPLv3.</string>
+    <string name="about_title_fmt">O aplikaci <xliff:g id="app_name">%s</xliff:g></string>
+    <string name="debug_version_fmt">Verze: <xliff:g id="version">%s</xliff:g></string>
+    <string name="app_revision_fmt">Revizní informace: <xliff:g id="app_revision_url">%s</xliff:g></string>
+    <string name="app_libraries"><xliff:g id="app_name">%s</xliff:g> používá tyto knihovny třetích stran: <xliff:g id="app_libraries_list">%s</xliff:g></string>
+    <string name="selectBarcodeTitle">Vyberte čárový kód</string>
+    <string name="enterBarcodeInstructions">Zadejte hodnotu čárového kódu a potm vyberte kód, který představuje čárový kód, který je na kartě.</string>
+
+    <string name="copy_to_clipboard_toast">ID karty zkopírováno do schránky</string>
+
 </resources>

app/src/main/res/values-de/strings.xml

@@ -1,82 +1,100 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<resources
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
     <string name="app_name">Loyalty Card Keychain</string>
-    <string name="about">Über</string>
-    <string name="about_title_fmt">Über <xliff:g id="app_name">%s</xliff:g></string>
     <string name="action_add">Neu</string>
-    <string name="addCardTitle">Neue Kundenkarte</string>
-    <string name="app_copyright_fmt">Copyright 2016-<xliff:g>%s</xliff:g> Branden Archer</string>
-    <string name="app_license">Lizensiert unter der GPLv3.</string>
-    <string name="app_libraries"><xliff:g id="app_name">%s</xliff:g> benutzt die folgenden Fremdbibliotheken: <xliff:g id="app_libraries_list">%s</xliff:g></string>
-    <string name="viewCardTitle">Kundenkarte anzeigen</string>
-    <string name="ok">Ok</string>
+
+    <string name="noGiftCards">Sie haben noch keine Kundenkarte angelegt. Über den "+" Button oben rechts, können welche angelegt werden.\n\nDiese App ermöglicht es, Kundenkarten immer mit zu führen.</string>
+
+    <string name="storeName">Geschäft</string>
     <string name="note">Notiz</string>
+    <string name="cardId">Kartennummer</string>
+    <string name="barcodeType">Barcodeart</string>
+
+    <string name="cancel">Abbrechen</string>
     <string name="save">Speichern</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="selectBarcodeTitle">Barcode auswählen</string>
-    <string name="storeName">Firma</string>
-    <string name="noStoreError">Keine Firma angegeben</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>
     <string name="exportName">Exportieren</string>
+    <string name="importExportHelp">Gesicherte Daten ermöglichen das Verschieben der Kundenkarten auf ein anderes Gerät.</string>
+    <string name="importedFrom">Importiert von: %1$s</string>
     <string name="exportedTo">Exportiert nach: %1$s</string>
     <string name="fileMissing">Datei fehlt: %1$s</string>
-    <string name="importExport">Import/Export</string>
-    <string name="importFailed">Import fehlgeschlagen: %1$s</string>
-    <string name="importName">Import</string>
-    <string name="importedFrom">Importiert von: %1$s</string>
-    <string name="noCardIdError">Keine Kartennummer angegeben</string>
-    <string name="noExternalStoragePermissionError">Ohne die Berechtigung für den externen Speicher kann kein Import oder Export erfolgen.</string>
-    <string name="noGiftCards">Du hast noch keine Kundenkarte angelegt. Über den "+" Button oben rechts, kannst du welche anlegen.\n\nDiese App ermöglicht es dir, deine Kundenkarten immer mit dir zu führen.</string>
-    <string name="cancel">Abrechen</string>
-    <string name="capture">Karte aufnehmen</string>
-    <string name="cardId">Kartennummer</string>
-    <string name="cardIdFormat">%1$s: %2$s</string>
-    <string name="confirm">Bestätigen</string>
-    <string name="copy_to_clipboard">Kopiere die Nummer in die Zwischenablage</string>
-    <string name="delete">Löschen</string>
-    <string name="deleteConfirmation">Bitte bestätige, dass du die Karte löschen möchtest.</string>
-    <string name="deleteTitle">Lösche die Kundenkarte</string>
-    <string name="edit">Bearbeiten</string>
-    <string name="editCardTitle">Kundenkarte bearbeiten</string>
-    <string name="enterCard">Karte einfügen</string>
-    <!-- NEEDS TRANSLATED --><string name="editCard">Edit Card</string>
-    <string name="exportFailed">Export fehlgeschlagen: %1$s</string>
-    <string name="barcodeType">Barcodeart</string>
-    <string name="barcodeImageDescription">Bild des Barcodes</string>
-    <string name="copy_to_clipboard_toast">Nummer in die Zwischenablage kopiert</string>
-    <string name="debug_version_fmt">Version: <xliff:g id="version">%s</xliff:g></string>
-    <string name="enterBarcodeInstructions">Füge die Kundennummer ein, anschließend wähle die korrekte Barcodeart aus.</string>
-    <string name="app_revision_fmt">Versions Information: <xliff:g id="app_revision_url">%s</xliff:g></string>
-    <string name="importing">Importiere…</string>
-    <string name="exporting">Exportiere…</string>
-
-    <string name="importExportHelp">Gesicherte Daten ermöglichen das Verschieben der Kundenkarten auf ein anderes Gerät.</string>
     <string name="importSuccessfulTitle">Import erfolgreich</string>
     <string name="importFailedTitle">Import fehlgeschlagen</string>
+    <string name="importFailed">Import fehlgeschlagen: %1$s</string>
     <string name="exportSuccessfulTitle">Export erfolgreich</string>
     <string name="exportFailedTitle">Export fehlgeschlagen</string>
-    <string name="exportOptionExplanation">Die Datei wird ins Wurzelverzeichnis des externen Speichers geschrieben.</string>
+    <string name="exportFailed">Export fehlgeschlagen: %1$s</string>
+    <string name="importing">Importiere…</string>
+    <string name="exporting">Exportiere…</string>
+    <string name="noExternalStoragePermissionError">Ohne die Berechtigung für den externen Speicher kann kein Import oder Export erfolgen.</string>
+    <string name="exportOptionExplanation">Die Datei wird ins Rootverzeichnis des externen Speichers geschrieben.</string>
     <string name="importOptionFilesystemTitle">Importiere vom Dateisystem</string>
     <string name="importOptionFilesystemExplanation">Wähle eine Datei im Speicher aus.</string>
     <string name="importOptionFilesystemButton">Vom Dateisystem</string>
     <string name="importOptionApplicationTitle">Nutze eine externe App</string>
-    <string name="importOptionApplicationExplanation">Wähle eine Datei aus einer App wie Dropbox, Google Drive, oder deinem bevorzugten Dateisystem aus.</string>
+    <string name="importOptionApplicationExplanation">Wählen Sie eine Datei aus einer App wie Dropbox, Google Drive, oder Ihrem bevorzugten Dateisystem aus.</string>
     <string name="importOptionApplicationButton">Nutze eine externe App</string>
-    <string name="importOptionFixedTitle">Importiere vom Export Ort</string>
-    <string name="importOptionFixedExplanation">Importiere von derselben Stelle, wo die exportiere Datei liegen würde.</string>
-    <string name="importOptionFixedButton">Verwende die exportierte Stelle</string>
-    <string name="sendLabel">Senden&#8230;</string>
+    <string name="importOptionFixedTitle">Importiere vom Export-Pfad</string>
+    <string name="importOptionFixedExplanation">Importiere vom Export-Pfad.</string>
+    <string name="importOptionFixedButton">Verwende den Export-Pfad.</string>
 
-    <!-- NEEDS TRANSLATED --><string name="startIntro">Start Intro</string>
-    <!-- NEEDS TRANSLATED --><string name="intro1Title">Welcome to Loyalty Card Keychain\n</string>
-    <!-- NEEDS TRANSLATED --><string name="intro1Description">Manage your barcode-based store/loyalty cards on your phone!\n\n</string>
-    <!-- NEEDS TRANSLATED --><string name="intro2Title">Adding Cards\n</string>
-    <!-- NEEDS TRANSLATED --><string name="intro2Description">Add a new card by touching the plus from the card list.\n\n</string>
-    <!-- NEEDS TRANSLATED --><string name="intro3Title">Adding Cards\n</string>
-    <!-- NEEDS TRANSLATED --><string name="intro3Description">To add the barcode, either capture with the camera or type in manually.\n\n</string>
-    <!-- NEEDS TRANSLATED --><string name="intro4Title">Show Card\n</string>
-    <!-- NEEDS TRANSLATED --><string name="intro4Description">To display a card, click on the store name from the main screen\n\n</string>
-    <!-- NEEDS TRANSLATED --><string name="intro5Title">Backup\n</string>
-    <!-- NEEDS TRANSLATED --><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>
-    <!-- NEEDS TRANSLATED --><string name="intro6Title">Feedback\n</string>
-    <!-- NEEDS TRANSLATED --><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>
-</resources>
+    <string name="about">Über</string>
+    <string name="app_copyright_fmt">Copyright 2016-<xliff:g>%d</xliff:g> Branden Archer</string>
+    <string name="app_license">Lizensiert unter der GPLv3.</string>
+    <string name="about_title_fmt">Über <xliff:g id="app_name">%s</xliff:g></string>
+    <string name="debug_version_fmt">Version: <xliff:g id="version">%s</xliff:g></string>
+    <string name="app_revision_fmt">Versions Information: <xliff:g id="app_revision_url">%s</xliff:g></string>
+    <string name="app_libraries"><xliff:g id="app_name">%s</xliff:g> benutzt die folgenden Fremdbibliotheken: <xliff:g id="app_libraries_list">%s</xliff:g></string>
+    <string name="app_resources"><xliff:g id="app_name">%s</xliff:g> verwendet folgenden Dritt-Ressourcen: <xliff:g id="app_resources_list">%s</xliff:g></string>
+
+    <string name="selectBarcodeTitle">Barcode auswählen</string>
+    <string name="enterBarcodeInstructions">Fügen Sie die Kundennummer ein, anschließend wählen Sie die korrekte Barcodeart aus.</string>
+
+    <string name="copy_to_clipboard_toast">Nummer in die Zwischenablage kopiert</string>
+
+    <string name="startIntro">Starte Einführung</string>
+    <string name="intro1Title">Willkommen zu Loyalty Card Keychain\n</string>
+    <string name="intro1Description">Verwalten Sie Ihre Barcode-Kundenkarten auf Ihrem Smartphone!\n\n</string>
+    <string name="intro2Title">Karten hinzufügen\n</string>
+    <string name="intro2Description">Fügen Sie neue Karten hinzu indem Sie das "+" Symbol in der Liste berühren.\n\n</string>
+    <string name="intro3Title">Karten hinzufügen\n</string>
+    <string name="intro3Description">Um einen Barcode hinzuzufügen, verwenden Sie die Kamera oder geben Sie den Code manuell ein.\n\n</string>
+    <string name="intro4Title">Karte anzeigen\n</string>
+    <string name="intro4Description">Um eine Karte anzuzeigen, den entsprechenen Namen in der Hauptansicht anwählen.\n\n</string>
+    <string name="intro5Title">Backup\n</string>
+    <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>

app/src/main/res/values-fr/strings.xml

@@ -19,53 +19,45 @@
     <string name="edit">Modifier</string>
     <string name="delete">Supprimer</string>
     <string name="confirm">Confirmer</string>
+    <string name="lockScreen">Désactiver la rotation</string>
+    <string name="unlockScreen">Activer la rotation</string>
     <string name="deleteTitle">Supprimer la carte de fidélité</string>
     <string name="deleteConfirmation">Confirmez que vous souhaitez supprimer cette carte</string>
     <string name="ok">OK</string>
     <string name="copy_to_clipboard">Copier le numéro dans le presse-papier</string>
+    <string name="sendLabel">Envoyer&#8230;</string>
+    <string name="addedShortcut">Ajouter à l\'écran d\'accueil</string>
 
     <string name="editCardTitle">Modifier la carte de fidélité</string>
     <string name="addCardTitle">Ajouter une carte de fidélité</string>
     <string name="viewCardTitle">Voir la carte de fidélité</string>
     <string name="scanCardBarcode">Flasher le code-barres de la carte</string>
+    <string name="cardShortcut">Raccourci de carte</string>
+    <string name="noCardsMessage">Il n\'y a aucune carte. Ajoutez en une d\'abord.</string>
 
     <string name="barcodeImageDescription">Image du code-barres de la carte</string>
 
     <string name="noStoreError">Aucun nom n\'a été saisi</string>
     <string name="noCardIdError">Aucun numéro n\'a été saisi</string>
+    <string name="noCardExistsError">N\'a pas pu retrouver la carte de fidélité</string>
 
     <string name="cardIdFormat">%1$s: %2$s</string>
-
     <string name="importExport">Importer/Exporter</string>
     <string name="importName">Importer</string>
     <string name="exportName">Exporter</string>
+    <string name="importExportHelp">Exporter vos données vous permet de récupérer vos cartes sur un autre appareil.</string>
     <string name="importedFrom">Importé depuis : %1$s</string>
     <string name="exportedTo">Exporté vers : %1$s</string>
     <string name="fileMissing">Fichier manquant : %1$s</string>
+    <string name="importSuccessfulTitle">Importé avec succès</string>
+    <string name="importFailedTitle">Échec de l\'import</string>
     <string name="importFailed">Échec de l\'import : %1$s</string>
+    <string name="exportSuccessfulTitle">Exporté avec succès</string>
+    <string name="exportFailedTitle">Échec de l\'export</string>
     <string name="exportFailed">Échec de l\'export : %1$s</string>
     <string name="importing">Import &#8230;</string>
     <string name="exporting">Export &#8230;</string>
     <string name="noExternalStoragePermissionError">Impossible d\'importer ou d\'exporter les données sans l\'autorisation d\'accès au stockage externe</string>
-
-    <string name="about">À propos</string>
-    <string name="app_copyright_fmt">Copyright 2016-<xliff:g>%s</xliff:g> Branden Archer</string>
-    <string name="app_license">Licence GPLv3.</string>
-    <string name="about_title_fmt">À propos de <xliff:g id="app_name">%s</xliff:g></string>
-    <string name="debug_version_fmt">Version : <xliff:g id="version">%s</xliff:g></string>
-    <string name="app_revision_fmt">Notes sur les versions : <xliff:g id="app_revision_url">%s</xliff:g></string>
-    <string name="app_libraries"><xliff:g id="app_name">%s</xliff:g> utilise les bibliothèques-tierces suivantes : <xliff:g id="app_libraries_list">%s</xliff:g></string>
-
-    <string name="selectBarcodeTitle">Choisissez le code-barre</string>
-    <string name="enterBarcodeInstructions">Saisissez les chiffres du code-barres et sélectionnez l\'image qui le représente</string>
-
-    <string name="copy_to_clipboard_toast">Numéro de carte copié dans le presse-papier</string>
-
-    <string name="importExportHelp">Exporter vos données vous permet de récupérer vos cartes sur un autre appareil.</string>
-    <string name="importSuccessfulTitle">Importé avec succès</string>
-    <string name="importFailedTitle">Échec de l\'import</string>
-    <string name="exportSuccessfulTitle">Exporté avec succès</string>
-    <string name="exportFailedTitle">Échec de l\'export</string>
     <string name="exportOptionExplanation">Les données sont sauvegardées à la racine du stockage externe.</string>
     <string name="importOptionFilesystemTitle">Importer depuis le système de fichiers.</string>
     <string name="importOptionFilesystemExplanation">Choisissez le fichier à importer.</string>
@@ -76,13 +68,28 @@
     <string name="importOptionFixedTitle">Importer depuis le même emplacement que pour l\'export</string>
     <string name="importOptionFixedExplanation">Importe les données depuis le même emplacement que celui défini pour l\'export.</string>
     <string name="importOptionFixedButton">Utiliser l\'emplacement de l\'export</string>
-    <string name="sendLabel">Envoyer&#8230;</string>
 
-    <string name="startIntro">Démarrer la présentation</string>
-    <string name="intro1Title">Bienvenue dans Loyalty Card Keychain\n</string>
-    <string name="intro1Description">Gérez vos cartes de fidélité à codes-barres sur votre téléphone !\n\n</string>
+    <string name="about">À propos</string>
+    <string name="app_copyright_fmt">Copyright 2016-<xliff:g>%d</xliff:g> Branden Archer</string>
+    <string name="app_license">Licence GPLv3.</string>
+    <string name="about_title_fmt">À propos de <xliff:g id="app_name">%s</xliff:g></string>
+    <string name="debug_version_fmt">Version : <xliff:g id="version">%s</xliff:g></string>
+    <string name="app_revision_fmt">Notes sur les versions : <xliff:g id="app_revision_url">%s</xliff:g></string>
+    <string name="app_libraries"><xliff:g id="app_name">%s</xliff:g> utilise les bibliothèques-tierces suivantes : <xliff:g id="app_libraries_list">%s</xliff:g></string>
+    <string name="app_resources"><xliff:g id="app_name">%s</xliff:g> utilise les ressources-tierces suivantes : <xliff:g id="app_resources_list">%s</xliff:g></string>
+
+    <string name="selectBarcodeTitle">Choisissez le code-barre</string>
+    <string name="enterBarcodeInstructions">Saisissez les chiffres du code-barres et sélectionnez l\'image qui le représente</string>
+
+    <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>
     <string name="intro2Title">Ajouter une carte\n</string>
-    <string name="intro2Description">Touchez le signe \'+\' en haut de la liste des cartes pour en ajouter une.\n\n</string>
+    <string name="intro2Description">Touchez le signe \'+\' en haut de l\'écran pour ajouter une carte.\n\n</string>
     <string name="intro3Title">Ajouter une carte\n</string>
     <string name="intro3Description">Pour enregistrer le code-barres, utilisez l\'appareil-photo ou entrez-le manuellement.\n\n</string>
     <string name="intro4Title">Afficher une carte\n</string>
@@ -91,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>

app/src/main/res/values-he-rIL/strings.xml

@@ -0,0 +1,14 @@
+<resources
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+    <string name="action_add">הוספה</string>
+
+    <string name="cardId">מזהה כרטיס</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>
+</resources>

app/src/main/res/values-it/strings.xml

@@ -7,61 +7,55 @@
     <string name="noGiftCards">Non hai ancora alcuna tessera fedeltà al momento. Premi sul bottone "+" (più) in alto per incominciare.\n\nL\'app ti permette di portare con te le tue tessere fedeltà, così da averle sempre a disposizione.</string>
 
     <string name="storeName">Negozio</string>
+    <string name="note">Note</string>
     <string name="cardId">Codice</string>
     <string name="barcodeType">Tipo codice a barre</string>
 
     <string name="cancel">Annulla</string>
     <string name="save">Salva</string>
     <string name="capture">Scansione carta</string>
+    <string name="enterCard">Inserisci carta</string>
+    <string name="editCard">Modifica carta</string>
     <string name="edit">Modifica</string>
     <string name="delete">Elimina</string>
+    <string name="confirm">Conferma</string>
+    <string name="lockScreen">Blocca rotazione</string>
+    <string name="unlockScreen">Sblocca rotazione</string>
+    <string name="deleteTitle">Rimuovi carta fedeltà</string>
+    <string name="deleteConfirmation">Conferma che vuoi eliminare questa carta.</string>
+    <string name="ok">Ok</string>
+    <string name="copy_to_clipboard">Copia ID negli appunti</string>
+    <string name="sendLabel">Invia&#8230;</string>
+    <string name="addedShortcut">Aggiunto al launcher</string>
 
     <string name="editCardTitle">Modifica carta</string>
     <string name="addCardTitle">Aggiungi carta</string>
     <string name="viewCardTitle">Mostra carta</string>
     <string name="scanCardBarcode">Scansiona codice carta</string>
+    <string name="cardShortcut">Scorciatoia per la carta</string>
+    <string name="noCardsMessage">Non ci sono carte. Aggiungine prima una</string>
 
     <string name="barcodeImageDescription">Immagine del codice a barre della carta</string>
 
     <string name="noStoreError">Nessun negozio inserito</string>
     <string name="noCardIdError">Nessun codice carta inserito</string>
-
     <string name="cardIdFormat">%1$s: %2$s</string>
-    <string name="note">Note</string>
-
     <string name="importExport">Importa/Esporta</string>
     <string name="importName">Importa</string>
     <string name="exportName">Esporta</string>
+    <string name="importExportHelp">Fare il backup dei dati ti permette di spostare le tue tessere da un dispositivo ad un altro.</string>
     <string name="importedFrom">Importato da: %1$s</string>
     <string name="exportedTo">Esportato in: %1$s</string>
     <string name="fileMissing">File mancante: %1$s</string>
+    <string name="importSuccessfulTitle">Importazione avvenuta con successo</string>
+    <string name="importFailedTitle">Importazione fallita</string>
     <string name="importFailed">Impossibile importare: %1$s</string>
+    <string name="exportSuccessfulTitle">Esportazione avvenuta con successo</string>
+    <string name="exportFailedTitle">Esportazione fallita</string>
     <string name="exportFailed">Impossibile esportare: %1$s</string>
     <string name="importing">Importazione in corso&#8230;</string>
     <string name="exporting">Esportazione in corso&#8230;</string>
     <string name="noExternalStoragePermissionError">Impossibile importare o esportare i dati senza il permesso per l\'uso della memoria esterna.</string>
-    <string name="about">Informazioni</string>
-    <string name="app_copyright_fmt">Copyright 2016-<xliff:g>%s</xliff:g> Branden Archer</string>
-    <string name="app_license">Pubblicato sotto licenza GPLv3.</string>
-    <string name="about_title_fmt">Informazioni su <xliff:g id="app_name">%s</xliff:g></string>
-    <string name="debug_version_fmt">Versione: <xliff:g id="version">%s</xliff:g></string>
-    <string name="app_revision_fmt">Informazione sulla revisione: <xliff:g id="app_revision_url">%s</xliff:g></string>
-    <string name="app_libraries"><xliff:g id="app_name">%s</xliff:g> usa le seguenti librerie di terze parti: <xliff:g id="app_libraries_list">%s</xliff:g></string>
-    <string name="ok">Ok</string>
-    <string name="enterCard">Inserisci carta</string>
-    <string name="editCard">Modifica carta</string>
-    <string name="selectBarcodeTitle">Seleziona codice a barre</string>
-    <string name="enterBarcodeInstructions">Digita il valore del codice a barre, quindi seleziona l\'immagine che rappresenta il codice a barre che vuoi usare.</string>
-    <string name="copy_to_clipboard">Copia ID negli appunti</string>
-    <string name="copy_to_clipboard_toast">ID della carta copiato negli appunti</string>
-    <string name="confirm">Conferma</string>
-    <string name="deleteTitle">Rimuovi carta fedeltà</string>
-    <string name="deleteConfirmation">Conferma che vuoi eliminare questa carta.</string>
-    <string name="importExportHelp">Fare il backup dei dati ti permette di spostare le tue tessere da un dispositivo ad un altro.</string>
-    <string name="importSuccessfulTitle">Importazione avvenuta con successo</string>
-    <string name="importFailedTitle">Importazione fallita</string>
-    <string name="exportSuccessfulTitle">Esportazione avvenuta con successo</string>
-    <string name="exportFailedTitle">Esportazione fallita</string>
     <string name="exportOptionExplanation">I dati sono stati scritti nella cartella principale della memoria esterna.</string>
     <string name="importOptionFilesystemTitle">Importa dal file system</string>
     <string name="importOptionFilesystemExplanation">Scegli un file dal file system.</string>
@@ -72,7 +66,20 @@
     <string name="importOptionFixedTitle">Importa da un altro posto</string>
     <string name="importOptionFixedExplanation">Importa dallo stesso posto del file system dove si è esportato.</string>
     <string name="importOptionFixedButton">Usa luogo dell\'esportazione</string>
-    <string name="sendLabel">Invia&#8230;</string>
+
+    <string name="about">Informazioni</string>
+    <string name="app_copyright_fmt">Copyright 2016-<xliff:g>%d</xliff:g> Branden Archer</string>
+    <string name="app_license">Pubblicato sotto licenza GPLv3.</string>
+    <string name="about_title_fmt">Informazioni su <xliff:g id="app_name">%s</xliff:g></string>
+    <string name="debug_version_fmt">Versione: <xliff:g id="version">%s</xliff:g></string>
+    <string name="app_revision_fmt">Informazione sulla revisione: <xliff:g id="app_revision_url">%s</xliff:g></string>
+    <string name="app_libraries"><xliff:g id="app_name">%s</xliff:g> usa le seguenti librerie di terze parti: <xliff:g id="app_libraries_list">%s</xliff:g></string>
+    <string name="app_resources"><xliff:g id="app_name">%s</xliff:g> usa le seguenti risorse di terze parti: <xliff:g id="app_resources_list">%s</xliff:g></string>
+
+    <string name="selectBarcodeTitle">Seleziona codice a barre</string>
+    <string name="enterBarcodeInstructions">Digita il valore del codice a barre, quindi seleziona l\'immagine che rappresenta il codice a barre che vuoi usare.</string>
+
+    <string name="copy_to_clipboard_toast">ID della carta copiato negli appunti</string>
 
     <string name="startIntro">Incomincia introduzione</string>
     <string name="intro1Title">Benvenuto in Carte fedeltà\n</string>
@@ -87,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>

app/src/main/res/values-lt/strings.xml

@@ -15,7 +15,6 @@
     <string name="save">Išsaugoti</string>
     <string name="capture">Nufotografuoti kortelę</string>
     <string name="enterCard">Įvesti kortelę</string>
-    <!-- NEEDS TRANSLATED --><string name="editCard">Edit Card</string>
     <string name="edit">Redaguoti</string>
     <string name="delete">Ištrinti</string>
     <string name="confirm">Patvirtinti</string>
@@ -23,19 +22,15 @@
     <string name="deleteConfirmation">Prašome patvirtinti jog Jūs norite panaikinti šią lojalumo kortelę.</string>
     <string name="ok">Gerai</string>
     <string name="copy_to_clipboard">Nukopijuoti ID į iškarpinę</string>
-
     <string name="editCardTitle">Redaguoti lojalumo kortelę</string>
     <string name="addCardTitle">Pridėti lojalumo kortelę</string>
     <string name="viewCardTitle">Paeržiūrėti lojalumo kortelę</string>
     <string name="scanCardBarcode">Nuskanuokite kortelės brūkšninį kodą</string>
-
     <string name="barcodeImageDescription">Kortelės brūkšninio kodo paveikslėlis</string>
 
     <string name="noStoreError">Parduotuvė neįvesta</string>
     <string name="noCardIdError">Neįvestas kortelės ID</string>
-
     <string name="cardIdFormat">%1$s: %2$s</string>
-
     <string name="importExport">Importuoti/Exportuoti</string>
     <string name="importName">Importuoti</string>
     <string name="exportName">Exportuoti</string>
@@ -47,48 +42,16 @@
     <string name="importing">Importuoja&#8230;</string>
     <string name="exporting">Eksportuoja&#8230;</string>
     <string name="noExternalStoragePermissionError">Negalima importuoti/eksportuoti kortelių be išorinės atminties leidimo</string>
-
     <string name="about">Apie</string>
-    <string name="app_copyright_fmt">Visos teisės saugomos 2016-<xliff:g>%s</xliff:g> Branden Archer</string>
+    <string name="app_copyright_fmt">Visos teisės saugomos 2016-<xliff:g>%d</xliff:g> Branden Archer</string>
     <string name="app_license">Licenzijuota pagal GPLv3.</string>
     <string name="about_title_fmt">Apie <xliff:g id="app_name">%s</xliff:g></string>
     <string name="debug_version_fmt">Versija: <xliff:g id="version">%s</xliff:g></string>
     <string name="app_revision_fmt">Revizijos informacija: <xliff:g id="app_revision_url">%s</xliff:g></string>
     <string name="app_libraries"><xliff:g id="app_name">%s</xliff:g> naudoja šias trečiosios šalies bibliotekas: <xliff:g id="app_libraries_list">%s</xliff:g></string>
-
     <string name="selectBarcodeTitle">Pasirinkite brūkšninį kodą</string>
     <string name="enterBarcodeInstructions">Enter the barcode value then select the image which represents the barcode you want to use</string>
 
     <string name="copy_to_clipboard_toast">Kortelės ID nukopijuota į iškarpinę</string>
-    
-    <!-- needs translated --><string name="importExportHelp">Backed up data can allow you to move your cards to another device.</string>
-    <!-- needs translated --><string name="importSuccessfulTitle">Import successful</string>
-    <!-- needs translated --><string name="importFailedTitle">Import failed</string>
-    <!-- needs translated --><string name="exportSuccessfulTitle">Export successful</string>
-    <!-- needs translated --><string name="exportFailedTitle">Export failed</string>
-    <!-- needs translated --><string name="exportOptionExplanation">Data is written to the top directory in external storage.</string>
-    <!-- needs translated --><string name="importOptionFilesystemTitle">Import from filesystem</string>
-    <!-- needs translated --><string name="importOptionFilesystemExplanation">Choose a specific file from the filesystem.</string>
-    <!-- needs translated --><string name="importOptionFilesystemButton">From filesystem</string>
-    <!-- needs translated --><string name="importOptionApplicationTitle">Use external application</string>
-    <!-- needs translated --><string name="importOptionApplicationExplanation">Use an external application like Dropbox, Google Drive, or your favorite file manager to open a file.</string>
-    <!-- needs translated --><string name="importOptionApplicationButton">Use external application</string>
-    <!-- needs translated --><string name="importOptionFixedTitle">Import from export location</string>
-    <!-- needs translated --><string name="importOptionFixedExplanation">Import from the same location on the filesystem that is written to on export.</string>
-    <!-- needs translated --><string name="importOptionFixedButton">Use export location</string>
-    <!-- needs translated --> <string name="sendLabel">Send&#8230;</string>
 
-    <!-- NEEDS TRANSLATED --><string name="startIntro">Start Intro</string>
-    <!-- NEEDS TRANSLATED --><string name="intro1Title">Welcome to Loyalty Card Keychain\n</string>
-    <!-- NEEDS TRANSLATED --><string name="intro1Description">Manage your barcode-based store/loyalty cards on your phone!\n\n</string>
-    <!-- NEEDS TRANSLATED --><string name="intro2Title">Adding Cards\n</string>
-    <!-- NEEDS TRANSLATED --><string name="intro2Description">Add a new card by touching the plus from the card list.\n\n</string>
-    <!-- NEEDS TRANSLATED --><string name="intro3Title">Adding Cards\n</string>
-    <!-- NEEDS TRANSLATED --><string name="intro3Description">To add the barcode, either capture with the camera or type in manually.\n\n</string>
-    <!-- NEEDS TRANSLATED --><string name="intro4Title">Show Card\n</string>
-    <!-- NEEDS TRANSLATED --><string name="intro4Description">To display a card, click on the store name from the main screen\n\n</string>
-    <!-- NEEDS TRANSLATED --><string name="intro5Title">Backup\n</string>
-    <!-- NEEDS TRANSLATED --><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>
-    <!-- NEEDS TRANSLATED --><string name="intro6Title">Feedback\n</string>
-    <!-- NEEDS TRANSLATED --><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>
 </resources>

app/src/main/res/values-nl/strings.xml

@@ -7,62 +7,57 @@
     <string name="noGiftCards">Er zijn momenteel geen klantenkaarten toegevoegd. Klik de knop met "+" (plus) om te beginnen.\n\nKlantenkaartenkluis beheert klantenkaarten op een smartphone of tablet, zodat ze altijd binnen handbereik zijn.</string>
 
     <string name="storeName">Winkel</string>
+    <string name="note">Notitie</string>
     <string name="cardId">Kaart-ID</string>
     <string name="barcodeType">Barcodetype</string>
 
     <string name="cancel">Annuleer</string>
     <string name="save">Sla op</string>
     <string name="capture">Scan kaart</string>
+    <string name="enterCard">Voer kaart in</string>
+    <string name="editCard">Bewerk kaart</string>
     <string name="edit">Bewerk</string>
     <string name="delete">Verwijder</string>
+    <string name="confirm">Bevestig</string>
+    <string name="lockScreen">Blokkeer rotatie</string>
+    <string name="unlockScreen">Deblokkeer rotatie</string>
+    <string name="deleteTitle">Verwijder kaart</string>
+    <string name="deleteConfirmation">Bevestig deze kaart te verwijderen.</string>
+    <string name="ok">Oké</string>
+    <string name="copy_to_clipboard">Kopieer het ID naar het klembord</string>
+    <string name="sendLabel">Verzend&#8230;</string>
+    <string name="addedShortcut">Toegevoegd aan hoofdscherm</string>
 
     <string name="editCardTitle">Bewerk klantenkaart</string>
     <string name="addCardTitle">Voeg klantenkaart toe</string>
     <string name="viewCardTitle">Bekijk klantenkaart</string>
     <string name="scanCardBarcode">Scan barcode klantenkaart</string>
+    <string name="cardShortcut">Kaartsnelkoppeling</string>
+    <string name="noCardsMessage">Er zijn geen kaarten, voeg er eerst een toe</string>
 
     <string name="barcodeImageDescription">Afbeelding barcode klantenkaart</string>
 
     <string name="noStoreError">Geen winkel toegevoegd</string>
     <string name="noCardIdError">Geen kaart-ID toegevoegd</string>
+    <string name="noCardExistsError">Kon klantenkaart niet vinden</string>
 
     <string name="cardIdFormat">%1$s: %2$s</string>
-    <string name="note">Notitie</string>
-
     <string name="importExport">Importeer/Exporteer</string>
     <string name="importName">Importeer</string>
     <string name="exportName">Exporteer</string>
+    <string name="importExportHelp">Data die is geback-upt maakt het mogelijk om je klantenkaarten naar een ander apparaat te verplaatsen.</string>
     <string name="importedFrom">Geïmporteerd van: %1$s</string>
     <string name="exportedTo">Geëxporteerd naar: %1$s</string>
     <string name="fileMissing">Bestand niet gevonden: %1$s</string>
+    <string name="importSuccessfulTitle">Importeren succesvol</string>
+    <string name="importFailedTitle">Importeren mislukte</string>
     <string name="importFailed">Importeren mislukte: %1$s</string>
+    <string name="exportSuccessfulTitle">Exporteren succesvol</string>
+    <string name="exportFailedTitle">Exporteren mislukt</string>
     <string name="exportFailed">Exporteren mislukte: %1$s</string>
     <string name="importing">Importerende&#8230;</string>
     <string name="exporting">Exporterende&#8230;</string>
     <string name="noExternalStoragePermissionError">Niet mogelijk te importeren of exporteren zonder rechten op externe opslag</string>
-    <string name="about">Over</string>
-    <string name="app_copyright_fmt">Auteursrecht 2016-<xliff:g>%s</xliff:g> Branden Archer</string>
-    <string name="app_license">Gelicenseerd met GPLv3.</string>
-    <string name="about_title_fmt">Over <xliff:g id="app_name">%s</xliff:g></string>
-    <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="ok">Oké</string>
-    <string name="enterCard">Voer kaart in</string>
-    <!-- NEEDS TRANSLATED --><string name="editCard">Edit Card</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>
-    <string name="copy_to_clipboard">Kopieer het ID naar het klembord</string>
-    <string name="copy_to_clipboard_toast">Het ID is naar het klembord gekopieerd</string>
-    <string name="confirm">Bevestig</string>
-    <string name="deleteConfirmation">Bevestig deze kaart te verwijderen.</string>
-    <string name="deleteTitle">Verwijder kaart</string>
-
-    <string name="importExportHelp">Data die is geback-upt maakt het mogelijk om je klantenkaarten naar een ander apparaat te verplaatsen.</string>
-    <string name="importSuccessfulTitle">Importeren succesvol</string>
-    <string name="importFailedTitle">Importeren mislukte</string>
-    <string name="exportSuccessfulTitle">Exporteren succesvol</string>
-    <string name="exportFailedTitle">Exporteren mislukt</string>
     <string name="exportOptionExplanation">Data is weggeschreven naar de hoogste map in externe opslag.</string>
     <string name="importOptionFilesystemTitle">Importeer van filesysteem</string>
     <string name="importOptionFilesystemExplanation">Kies een specifiek bestand van het filesysteem.</string>
@@ -73,19 +68,33 @@
     <string name="importOptionFixedTitle">Importeer van exporteerlocatie</string>
     <string name="importOptionFixedExplanation">Importeer van zelfde locatie op het filesysteem waar tijdens exporteren naar geschreven is.</string>
     <string name="importOptionFixedButton">gebruik exporteerlocaite</string>
-    <string name="sendLabel">Verzend&#8230;</string>
 
-    <!-- NEEDS TRANSLATED --><string name="startIntro">Start Intro</string>
-    <!-- NEEDS TRANSLATED --><string name="intro1Title">Welcome to Loyalty Card Keychain\n</string>
-    <!-- NEEDS TRANSLATED --><string name="intro1Description">Manage your barcode-based store/loyalty cards on your phone!\n\n</string>
-    <!-- NEEDS TRANSLATED --><string name="intro2Title">Adding Cards\n</string>
-    <!-- NEEDS TRANSLATED --><string name="intro2Description">Add a new card by touching the plus from the card list.\n\n</string>
-    <!-- NEEDS TRANSLATED --><string name="intro3Title">Adding Cards\n</string>
-    <!-- NEEDS TRANSLATED --><string name="intro3Description">To add the barcode, either capture with the camera or type in manually.\n\n</string>
-    <!-- NEEDS TRANSLATED --><string name="intro4Title">Show Card\n</string>
-    <!-- NEEDS TRANSLATED --><string name="intro4Description">To display a card, click on the store name from the main screen\n\n</string>
-    <!-- NEEDS TRANSLATED --><string name="intro5Title">Backup\n</string>
-    <!-- NEEDS TRANSLATED --><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>
-    <!-- NEEDS TRANSLATED --><string name="intro6Title">Feedback\n</string>
-    <!-- NEEDS TRANSLATED --><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>
-</resources>
+    <string name="about">Over</string>
+    <string name="app_copyright_fmt">Auteursrecht 2016-<xliff:g>%d</xliff:g> Branden Archer</string>
+    <string name="app_license">Gelicenseerd met GPLv3.</string>
+    <string name="about_title_fmt">Over <xliff:g id="app_name">%s</xliff:g></string>
+    <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="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>
+
+<string name="copy_to_clipboard_toast">Het ID is naar het klembord gekopieerd</string>
+
+<string name="startIntro">Start inleiding</string>
+<string name="intro1Title">Welkom bij Loyalty Card Keychain\n</string>
+<string name="intro1Description">Beheer je barcodegebaseerde klantenkaarten op je telefoon!\n\n</string>
+<string name="intro2Title">Kaarten toevoegen\n</string>
+<string name="intro2Description">Voeg een nieuwe kaart toe door in de lijst met kaarten de plus aan te raken.\n\n</string>
+<string name="intro3Title">Kaarten toevoegen\n</string>
+<string name="intro3Description">Om een barcode toe te voegen, scan deze met je camera of voer ze handmatig in.\n\n</string>
+<string name="intro4Title">Toon kaart\n</string>
+<string name="intro4Description">Om een kaart te tonen, klik in het hoofdscherm op de naam van de winkel\n\n</string>
+<string name="intro5Title">Backup\n</string>
+<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>

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>

app/src/main/res/values/colors.xml

@@ -1,9 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Palette generated by Material Palette -materialpalette.com/grey/blue-grey -->
+<!-- Palette generated by Material IO https://material.io/color/#!/?view.left=0&view.right=0&primary.color=3F51B5&secondary.color=FFC107 -->
 <resources>
-    <color name="colorPrimary">#9E9E9E</color>
-    <color name="colorPrimaryDark">#616161</color>
-    <color name="colorAccent">#607D8B</color>
+    <color name="colorPrimary">#3f51b5</color>
+    <color name="colorPrimaryLight">#757de8</color>
+    <color name="colorPrimaryDark">#002984</color>
+    <color name="colorSecondary">#ffc107</color>
+    <color name="colorSecondaryLight">#fff350</color>
+    <color name="colorSecondaryDark">#c79100</color>
+    <color name="colorPrimaryText">#ffffff</color>
+    <color name="colorSecondaryText">#000000</color>
 
     <color name="inputContrastBackground">#F8F8F8</color>
     <color name="inputBackground">#FFFFFF</color>

app/src/main/res/values/dimens.xml

@@ -11,9 +11,27 @@
     <dimen name="text_size_medium">18sp</dimen>
     <dimen name="text_size_large">22sp</dimen>
 
+    <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>
+    <dimen name="cardThumbnailSizeLarge">200dp</dimen>
+
+    <dimen name="activity_margin_small">8dp</dimen>
+    <dimen name="activity_margin">16dp</dimen>
+
+    <!-- The default letter tile text size -->
+    <dimen name="tileLetterFontSize">33sp</dimen>
+    <dimen name="cardViewLetterFontSize">100sp</dimen>
 </resources>

app/src/main/res/values/settings.xml

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <array name="letter_tile_colors">
+        <item>#f16364</item>
+        <item>#f58559</item>
+        <item>#f9a43e</item>
+        <item>#e4c62e</item>
+        <item>#67bf74</item>
+        <item>#59a2be</item>
+        <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>

app/src/main/res/values/strings.xml

@@ -19,21 +19,27 @@
     <string name="edit">Edit</string>
     <string name="delete">Delete</string>
     <string name="confirm">Confirm</string>
+    <string name="lockScreen">Block Rotation</string>
+    <string name="unlockScreen">Unblock Rotation</string>
     <string name="deleteTitle">Remove Loyalty Card</string>
     <string name="deleteConfirmation">Please confirm that you want to delete this card.</string>
     <string name="ok">OK</string>
     <string name="copy_to_clipboard">Copy ID to clipboard</string>
     <string name="sendLabel">Send&#8230;</string>
+    <string name="addedShortcut">Added to Home Screen</string>
 
     <string name="editCardTitle">Edit Loyalty Card</string>
     <string name="addCardTitle">Add Loyalty Card</string>
     <string name="viewCardTitle">View Loyalty Card</string>
     <string name="scanCardBarcode">Scan Card\'s Barcode</string>
+    <string name="cardShortcut">Card Shortcut</string>
+    <string name="noCardsMessage">There are no cards, add one first</string>
 
     <string name="barcodeImageDescription">Image of card\'s barcode</string>
 
     <string name="noStoreError">No Store entered</string>
     <string name="noCardIdError">No Card ID entered</string>
+    <string name="noCardExistsError">Could not lookup loyalty card</string>
 
     <string name="cardIdFormat">%1$s: %2$s</string>
     <string name="storeNameAndNoteFormat" translatable="false">%1$s - %2$s</string>
@@ -66,18 +72,21 @@
     <string name="importOptionFixedButton">Use export location</string>
 
     <string name="about">About</string>
-    <string name="app_copyright_fmt">Copyright 2016-<xliff:g>%s</xliff:g> Branden Archer</string>
+    <string name="app_copyright_fmt">Copyright 2016-<xliff:g>%d</xliff:g> Branden Archer</string>
     <string name="app_license">Licensed under the GPLv3.</string>
     <string name="about_title_fmt">About <xliff:g id="app_name">%s</xliff:g></string>
     <string name="debug_version_fmt">Version: <xliff:g id="version">%s</xliff:g></string>
     <string name="app_revision_fmt">Revision Information: <xliff:g id="app_revision_url">%s</xliff:g></string>
     <string name="app_libraries"><xliff:g id="app_name">%s</xliff:g> uses the following third-party libraries: <xliff:g id="app_libraries_list">%s</xliff:g></string>
+    <string name="app_resources"><xliff:g id="app_name">%s</xliff:g> uses the following third-party resources: <xliff:g id="app_resources_list">%s</xliff:g></string>
 
     <string name="selectBarcodeTitle">Select Barcode</string>
     <string name="enterBarcodeInstructions">Enter the barcode value then select the image which represents the barcode you want to use</string>
 
     <string name="copy_to_clipboard_toast">Card ID copied to clipboard</string>
 
+    <string name="thumbnailDescription">Thumbnail for card</string>
+
     <string name="startIntro">Start Intro</string>
     <string name="intro1Title">Welcome to Loyalty Card Keychain\n</string>
     <string name="intro1Description">Manage your barcode-based store/loyalty cards on your phone!\n\n</string>
@@ -91,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>

app/src/main/res/values/styles.xml

@@ -5,7 +5,7 @@
         <!-- Customize your theme here. -->
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/colorAccent</item>
+        <item name="colorAccent">@color/colorSecondary</item>
     </style>
 
     <style name="AppTheme.NoActionBar">
@@ -17,6 +17,11 @@
 
     <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light"/>
 
+    <style name="CardView.ActionBarTheme" parent="@style/ThemeOverlay.AppCompat.ActionBar">
+        <!-- THIS is where you can color the arrow! -->
+        <item name="colorControlNormal">@android:color/white</item>
+    </style>
+
     <style name="AppTheme.TextView.NoData" parent="AppTheme">
         <item name="android:layout_centerHorizontal">true</item>
         <item name="android:layout_centerVertical">true</item>

app/src/main/res/xml/file_provider_paths.xml

@@ -0,0 +1,3 @@
+<paths>
+    <external-path name="exportPath" path="/" />
+</paths>

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>

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,8 @@ public class DatabaseTest
     public void addRemoveOneGiftCard()
     {
         assertEquals(0, db.getLoyaltyCardCount());
-        boolean result = 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());
 
@@ -56,11 +61,12 @@ public class DatabaseTest
     @Test
     public void updateGiftCard()
     {
-        boolean result = 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());
 
@@ -78,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());
     }
@@ -86,7 +92,8 @@ public class DatabaseTest
     @Test
     public void emptyGiftCardValues()
     {
-        boolean result = db.insertLoyaltyCard("", "", "", "");
+        long id = db.insertLoyaltyCard("", "", "", "", null, null);
+        boolean result = (id != -1);
         assertTrue(result);
         assertEquals(1, db.getLoyaltyCardCount());
 
@@ -107,8 +114,9 @@ public class DatabaseTest
         // that they are sorted
         for(int index = CARDS_TO_ADD-1; index >= 0; index--)
         {
-            boolean result = db.insertLoyaltyCard("store" + index, "note" + index, "cardId" + index,
-                    BarcodeFormat.UPC_A.toString());
+            long id = db.insertLoyaltyCard("store" + index, "note" + index, "cardId" + index,
+                    BarcodeFormat.UPC_A.toString(), index, index*2);
+            boolean result = (id != -1);
             assertTrue(result);
         }
 
@@ -126,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();
         }
@@ -180,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();
     }

app/src/test/java/protect/card_locker/ImportExportActivityTest.java

@@ -40,10 +40,6 @@ public class ImportExportActivityTest
         info.activityInfo.exported = true;
 
         Intent intent = new Intent(handler);
-        if(handler.equals(Intent.ACTION_PICK))
-        {
-            intent.setData(Uri.parse("file://"));
-        }
 
         if(handler.equals(Intent.ACTION_GET_CONTENT))
         {

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;
@@ -17,13 +18,17 @@ import org.robolectric.annotation.Config;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
+import java.io.FileInputStream;
+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)
@@ -63,7 +68,8 @@ public class ImportExportTest
         {
             String storeName = String.format("store, \"%4d", index);
             String note = String.format("note, \"%4d", index);
-            boolean result = 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);
         }
 
@@ -91,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++;
         }
@@ -195,7 +203,11 @@ public class ImportExportTest
 
             clearDatabase();
 
-            String corruptEntry = "ThisStringIsLikelyNotPartOfAnyFormat";
+            // commons-csv would throw a RuntimeException if an entry was quotes but had
+            // content after. For example:
+            //   abc,def,""abc,abc
+            //             ^ after the quote there should only be a , \n or EOF
+            String corruptEntry = "ThisStringIsLikelyNotPartOfAnyFormat,\"\"a";
 
             ByteArrayInputStream inData = new ByteArrayInputStream((outData.toString() + corruptEntry).getBytes());
             InputStreamReader inStream = new InputStreamReader(inData);
@@ -211,17 +223,15 @@ public class ImportExportTest
     class TestTaskCompleteListener implements ImportExportTask.TaskCompleteListener
     {
         Boolean success;
-        File file;
 
-        public void onTaskComplete(boolean success, File file)
+        public void onTaskComplete(boolean success)
         {
             this.success = success;
-            this.file = file;
         }
     }
 
     @Test
-    public void useImportExportTask()
+    public void useImportExportTask() throws FileNotFoundException
     {
         final int NUM_CARDS = 10;
 
@@ -235,7 +245,7 @@ public class ImportExportTest
             TestTaskCompleteListener listener = new TestTaskCompleteListener();
 
             // Export to the file
-            ImportExportTask task = new ImportExportTask(activity, false, format, exportFile, listener);
+            ImportExportTask task = new ImportExportTask(activity, format, exportFile, listener);
             task.execute();
 
             // Actually run the task to completion
@@ -244,8 +254,6 @@ public class ImportExportTest
             // Check that the listener was executed
             assertNotNull(listener.success);
             assertEquals(true, listener.success);
-            assertNotNull(listener.file);
-            assertEquals(exportFile, listener.file);
 
             clearDatabase();
 
@@ -253,7 +261,9 @@ public class ImportExportTest
 
             listener = new TestTaskCompleteListener();
 
-            task = new ImportExportTask(activity, true, format, exportFile, listener);
+            FileInputStream fileStream = new FileInputStream(exportFile);
+
+            task = new ImportExportTask(activity, format, fileStream, listener);
             task.execute();
 
             // Actually run the task to completion
@@ -262,8 +272,6 @@ public class ImportExportTest
             // Check that the listener was executed
             assertNotNull(listener.success);
             assertEquals(true, listener.success);
-            assertNotNull(listener.file);
-            assertEquals(exportFile, listener.file);
 
             assertEquals(NUM_CARDS, db.getLoyaltyCardCount());
 
@@ -273,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());
+    }
 }

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,20 +53,37 @@ public class LoyaltyCardCursorAdapterTest
         return view;
     }
 
-    private void checkView(final View view, final String store, final String cardId)
+    private void checkView(final View view, final String store, final String note, boolean checkFontSizes)
     {
-        final TextView storeField = (TextView) view.findViewById(R.id.store);
-        assertEquals(store, storeField.getText().toString());
+        final TextView storeField = view.findViewById(R.id.store);
+        final TextView noteField = view.findViewById(R.id.note);
 
-        final TextView cardIdField = (TextView) view.findViewById(R.id.cardId);
-        assertEquals(cardId, cardIdField.getText().toString());
+        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());
+            assertEquals(note, noteField.getText().toString());
+        }
+        else
+        {
+            assertEquals(View.GONE, noteField.getVisibility());
+        }
     }
 
 
     @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();
@@ -61,17 +91,13 @@ public class LoyaltyCardCursorAdapterTest
 
         View view = createView(cursor);
 
-        final String cardIdLabel = activity.getResources().getString(R.string.cardId);
-        final String cardIdFormat = activity.getResources().getString(R.string.cardIdFormat);
-        String cardIdText = String.format(cardIdFormat, cardIdLabel, card.cardId);
-
-        checkView(view, card.store, cardIdText);
+        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();
@@ -79,13 +105,24 @@ public class LoyaltyCardCursorAdapterTest
 
         View view = createView(cursor);
 
-        final String storeNameAndNoteFormat = activity.getResources().getString(R.string.storeNameAndNoteFormat);
-        String storeAndNoteText = String.format(storeNameAndNoteFormat, card.store, card.note);
+        checkView(view, card.store, card.note, false);
+    }
 
-        final String cardIdLabel = activity.getResources().getString(R.string.cardId);
-        final String cardIdFormat = activity.getResources().getString(R.string.cardIdFormat);
-        String cardIdText = String.format(cardIdFormat, cardIdLabel, card.cardId);
+    @Test
+    public void TestCursorAdapterFontSizes()
+    {
+        db.insertLoyaltyCard("store", "note", "cardId", BarcodeFormat.UPC_A.toString(), Color.BLACK, Color.WHITE);
+        LoyaltyCard card = db.getLoyaltyCard(1);
 
-        checkView(view, storeAndNoteText, cardIdText);
+        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);
     }
 }

app/src/test/java/protect/card_locker/LoyaltyCardViewActivityTest.java

@@ -2,10 +2,15 @@ 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;
 import android.widget.EditText;
@@ -24,12 +29,13 @@ import org.robolectric.annotation.Config;
 import org.robolectric.res.builder.RobolectricPackageManager;
 import org.robolectric.shadows.ShadowActivity;
 import org.robolectric.shadows.ShadowLog;
-import org.robolectric.util.ActivityController;
+import org.robolectric.android.controller.ActivityController;
 
 import java.io.IOException;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 import static org.robolectric.Shadows.shadowOf;
 
 @RunWith(RobolectricTestRunner.class)
@@ -99,10 +105,10 @@ public class LoyaltyCardViewActivityTest
             assertEquals(1, db.getLoyaltyCardCount());
         }
 
-        final EditText storeField = (EditText) activity.findViewById(R.id.storeNameEdit);
-        final EditText noteField = (EditText) activity.findViewById(R.id.noteEdit);
-        final TextView cardIdField = (TextView) activity.findViewById(R.id.cardIdView);
-        final TextView barcodeTypeField = (TextView) activity.findViewById(R.id.barcodeType);
+        final EditText storeField = activity.findViewById(R.id.storeNameEdit);
+        final EditText noteField = activity.findViewById(R.id.noteEdit);
+        final TextView cardIdField = activity.findViewById(R.id.cardIdView);
+        final TextView barcodeTypeField = activity.findViewById(R.id.barcodeType);
 
         storeField.setText(store);
         noteField.setText(note);
@@ -120,6 +126,8 @@ public class LoyaltyCardViewActivityTest
         assertEquals(note, card.note);
         assertEquals(cardId, card.cardId);
         assertEquals(barcodeType, card.barcodeType);
+        assertNotNull(card.headerColor);
+        assertNotNull(card.headerTextColor);
     }
 
     /**
@@ -129,7 +137,7 @@ public class LoyaltyCardViewActivityTest
     private void captureBarcodeWithResult(final Activity activity, final int buttonId, final boolean success) throws IOException
     {
         // Start image capture
-        final Button captureButton = (Button) activity.findViewById(buttonId);
+        final Button captureButton = activity.findViewById(buttonId);
         captureButton.performClick();
 
         ShadowActivity.IntentForResult intentForResult = shadowOf(activity).peekNextStartedActivityForResult();
@@ -174,27 +182,31 @@ public class LoyaltyCardViewActivityTest
     private void checkAllFields(final Activity activity, ViewMode mode,
                                 final String store, final String note, final String cardId, final String barcodeType)
     {
-        int captureVisibility = (mode == ViewMode.UPDATE_CARD || mode == ViewMode.ADD_CARD) ? View.VISIBLE : View.GONE;
+        if(mode == ViewMode.VIEW_CARD)
+        {
+            checkFieldProperties(activity, R.id.cardIdView, View.VISIBLE, cardId);
+        }
+        else
+        {
+            int captureVisibility = (mode == ViewMode.UPDATE_CARD || mode == ViewMode.ADD_CARD) ? View.VISIBLE : View.GONE;
 
-        int viewVisibility = (mode == ViewMode.VIEW_CARD) ? View.VISIBLE : View.GONE;
-        int editVisibility = (mode != ViewMode.VIEW_CARD) ? View.VISIBLE : 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);
-        checkFieldProperties(activity, R.id.barcodeType, View.GONE, barcodeType);
-        checkFieldProperties(activity, R.id.captureButton, captureVisibility, null);
-        checkFieldProperties(activity, R.id.barcode, View.VISIBLE, null);
+            checkFieldProperties(activity, R.id.storeNameEdit, editVisibility, store);
+            checkFieldProperties(activity, R.id.noteEdit, editVisibility, 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);
+            checkFieldProperties(activity, R.id.barcodeType, View.GONE, barcodeType);
+            checkFieldProperties(activity, R.id.captureButton, captureVisibility, null);
+            checkFieldProperties(activity, R.id.barcode, View.VISIBLE, null);
+        }
     }
 
     @Test
     public void startWithoutParametersCheckFieldsAvailable()
     {
-        ActivityController activityController = Robolectric.buildActivity(LoyaltyCardViewActivity.class).create();
+        ActivityController activityController = Robolectric.buildActivity(LoyaltyCardEditActivity.class).create();
         activityController.start();
         activityController.visible();
         activityController.resume();
@@ -207,7 +219,7 @@ public class LoyaltyCardViewActivityTest
     @Test
     public void startWithoutParametersCannotCreateLoyaltyCard()
     {
-        ActivityController activityController = Robolectric.buildActivity(LoyaltyCardViewActivity.class).create();
+        ActivityController activityController = Robolectric.buildActivity(LoyaltyCardEditActivity.class).create();
         activityController.start();
         activityController.visible();
         activityController.resume();
@@ -217,9 +229,9 @@ public class LoyaltyCardViewActivityTest
         DBHelper db = new DBHelper(activity);
         assertEquals(0, db.getLoyaltyCardCount());
 
-        final EditText storeField = (EditText) activity.findViewById(R.id.storeNameEdit);
-        final EditText noteField = (EditText) activity.findViewById(R.id.noteEdit);
-        final TextView cardIdField = (TextView) activity.findViewById(R.id.cardIdView);
+        final EditText storeField = activity.findViewById(R.id.storeNameEdit);
+        final EditText noteField = activity.findViewById(R.id.noteEdit);
+        final TextView cardIdField = activity.findViewById(R.id.cardIdView);
 
         shadowActivity.clickMenuItem(R.id.action_save);
         assertEquals(0, db.getLoyaltyCardCount());
@@ -240,7 +252,7 @@ public class LoyaltyCardViewActivityTest
     @Test
     public void startWithoutParametersBack()
     {
-        ActivityController activityController = Robolectric.buildActivity(LoyaltyCardViewActivity.class).create();
+        ActivityController activityController = Robolectric.buildActivity(LoyaltyCardEditActivity.class).create();
         activityController.start();
         activityController.visible();
         activityController.resume();
@@ -257,7 +269,7 @@ public class LoyaltyCardViewActivityTest
     {
         registerMediaStoreIntentHandler();
 
-        ActivityController activityController = Robolectric.buildActivity(LoyaltyCardViewActivity.class).create();
+        ActivityController activityController = Robolectric.buildActivity(LoyaltyCardEditActivity.class).create();
         activityController.start();
         activityController.visible();
         activityController.resume();
@@ -278,7 +290,7 @@ public class LoyaltyCardViewActivityTest
     @Test
     public void startWithoutParametersCaptureBarcodeFailure() throws IOException
     {
-        ActivityController activityController = Robolectric.buildActivity(LoyaltyCardViewActivity.class).create();
+        ActivityController activityController = Robolectric.buildActivity(LoyaltyCardEditActivity.class).create();
         activityController.start();
         activityController.visible();
         activityController.resume();
@@ -296,7 +308,7 @@ public class LoyaltyCardViewActivityTest
     @Test
     public void startWithoutParametersCaptureBarcodeCancel() throws IOException
     {
-        ActivityController activityController = Robolectric.buildActivity(LoyaltyCardViewActivity.class).create();
+        ActivityController activityController = Robolectric.buildActivity(LoyaltyCardEditActivity.class).create();
         activityController.start();
         activityController.visible();
         activityController.resume();
@@ -322,18 +334,22 @@ public class LoyaltyCardViewActivityTest
         final Bundle bundle = new Bundle();
         bundle.putInt("id", 1);
 
+        Class clazz;
+
         if(editMode)
         {
             bundle.putBoolean("update", true);
+            clazz = LoyaltyCardEditActivity.class;
         }
         else
         {
             bundle.putBoolean("view", true);
+            clazz = LoyaltyCardViewActivity.class;
         }
 
         intent.putExtras(bundle);
 
-        return Robolectric.buildActivity(LoyaltyCardViewActivity.class).withIntent(intent).create();
+        return Robolectric.buildActivity(clazz).withIntent(intent).create();
     }
 
     @Test
@@ -343,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();
@@ -359,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();
@@ -375,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();
@@ -396,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();
@@ -414,4 +430,140 @@ public class LoyaltyCardViewActivityTest
         shadowOf(activity).clickMenuItem(android.R.id.home);
         assertEquals(true, activity.isFinishing());
     }
+
+    @Test
+    public void checkMenu() throws IOException
+    {
+        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);
+
+        activityController.start();
+        activityController.visible();
+        activityController.resume();
+
+        final Menu menu = shadowOf(activity).getOptionsMenu();
+        assertTrue(menu != null);
+
+        // The settings and add button should be present
+        assertEquals(menu.size(), 2);
+
+        assertEquals("Block Rotation", menu.findItem(R.id.action_lock_unlock).getTitle().toString());
+        assertEquals("Edit", menu.findItem(R.id.action_edit).getTitle().toString());
+    }
+
+    @Test
+    public void startWithMissingLoyaltyCard() throws IOException
+    {
+        ActivityController activityController = createActivityWithLoyaltyCard(true);
+        Activity activity = (Activity)activityController.get();
+
+        activityController.start();
+        activityController.visible();
+        activityController.resume();
+
+        // The activity should find that the card is missing and shut down
+
+        assertTrue(activity.isFinishing());
+
+        // Make sure the activity can close down
+        activityController.pause();
+        activityController.stop();
+        activityController.destroy();
+    }
+
+    @Test
+    public void startWithoutParametersViewBack()
+    {
+        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);
+
+        activityController.start();
+        activityController.visible();
+        activityController.resume();
+
+        assertEquals(false, activity.isFinishing());
+        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());
+    }
 }

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;
@@ -21,7 +22,7 @@ import org.robolectric.Robolectric;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
-import org.robolectric.util.ActivityController;
+import org.robolectric.android.controller.ActivityController;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -49,10 +50,10 @@ public class MainActivityTest
         Activity activity = Robolectric.setupActivity(MainActivity.class);
         assertTrue(activity != null);
 
-        TextView helpText = (TextView)activity.findViewById(R.id.helpText);
+        TextView helpText = activity.findViewById(R.id.helpText);
         assertEquals(View.VISIBLE, helpText.getVisibility());
 
-        ListView list = (ListView)activity.findViewById(R.id.list);
+        ListView list = activity.findViewById(R.id.list);
         assertEquals(View.GONE, list.getVisibility());
     }
 
@@ -65,16 +66,17 @@ 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
-    public void clickAddLaunchesLoyaltyCardViewActivity()
+    public void clickAddLaunchesLoyaltyCardEditActivity()
     {
         final MainActivity activity = Robolectric.setupActivity(MainActivity.class);
 
@@ -82,7 +84,7 @@ public class MainActivityTest
 
         Intent intent = shadowOf(activity).peekNextStartedActivityForResult().intent;
 
-        assertEquals(new ComponentName(activity, LoyaltyCardViewActivity.class), intent.getComponent());
+        assertEquals(new ComponentName(activity, LoyaltyCardEditActivity.class), intent.getComponent());
         assertNull(intent.getExtras());
     }
 
@@ -95,13 +97,13 @@ public class MainActivityTest
         activityController.start();
         activityController.resume();
 
-        TextView helpText = (TextView)mainActivity.findViewById(R.id.helpText);
-        ListView list = (ListView)mainActivity.findViewById(R.id.list);
+        TextView helpText = mainActivity.findViewById(R.id.helpText);
+        ListView list = mainActivity.findViewById(R.id.list);
 
         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());
@@ -131,7 +133,7 @@ public class MainActivityTest
 
         ComponentName componentName = next.getComponent();
         String name = componentName.flattenToShortString();
-        assertEquals("protect.card_locker/.IntroActivity", name);
+        assertEquals("protect.card_locker/.intro.IntroActivity", name);
 
         Bundle extras = next.getExtras();
         assertNull(extras);

build.gradle

@@ -3,9 +3,12 @@
 buildscript {
     repositories {
         jcenter()
+
+        // For the Android Gradle plugin
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.3'
+        classpath 'com.android.tools.build:gradle:3.0.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -16,6 +19,7 @@ allprojects {
     repositories {
         jcenter()
         maven { url 'https://jitpack.io' }
+        google()
     }
 }