Fix comment

Improve export/import dialog messages

.github/workflows/android.yml

@@ -0,0 +1,27 @@
+name: Android CI
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: set up JDK 1.8
+      uses: actions/setup-java@v1
+      with:
+        java-version: 1.8
+    - name: Build
+      run: ./gradlew assembleRelease
+    - name: Check lint
+      run: ./gradlew lintRelease
+    - name: Run unit tests
+      run: ./gradlew testReleaseUnitTest
+    - name: FindBugs
+      run: ./gradlew findbugs

.travis.yml

@@ -1,16 +0,0 @@
-language: android
-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-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
-
-script: ./gradlew assembleRelease testReleaseUnitTest lintRelease findbugs
-
-after_failure:
-- cat app/build/reports/findbugs/findbugs.html
-- cat app/build/reports/tests/debug/index.html

.tx/config

@@ -0,0 +1,10 @@
+[main]
+host = https://www.transifex.com
+
+[loyalty-card-locker.stringsxml]
+file_filter = app/src/main/res/values-<lang>/strings.xml
+minimum_perc = 0
+source_file = app/src/main/res/values/strings.xml
+source_lang = en
+type = ANDROID
+

CHANGELOG.md

@@ -1,3 +1,96 @@
+## v0.28 (2020-03-09)
+
+Changes:
+- Fix barcode centering when exiting full screen ([#351](https://github.com/brarcher/loyalty-card-locker/pull/351))
+- Allow backup export location to be selected ([#352](https://github.com/brarcher/loyalty-card-locker/pull/352))
+- Update translations ([#357](https://github.com/brarcher/loyalty-card-locker/pull/357)) & ([#362](https://github.com/brarcher/loyalty-card-locker/pull/362))
+
+## v0.27 (2020-01-26)
+
+Changes:
+- Tapping on a barcode now moves it to the top of the screen ([#348](https://github.com/brarcher/loyalty-card-locker/pull/348))
+- Add white space around barcodes to improve scanning in dark mode ([#328](https://github.com/brarcher/loyalty-card-locker/issues/328))
+- Fix swapped import buttons. ([#346](https://github.com/brarcher/loyalty-card-locker/pull/346))
+
+## v0.26.1 (2020-01-09)
+
+Changes:
+- Fix issue with sharing cards without background color ([#343](https://github.com/brarcher/loyalty-card-locker/pull/343))
+
+## v0.26 (2020-01-05)
+
+Changes:
+- Add ability to search for a card ([#320](https://github.com/brarcher/loyalty-card-locker/pull/320))
+- Add ability to share and receive loyalty cards ([#321](https://github.com/brarcher/loyalty-card-locker/pull/321))
+- Dark mode support ([#322](https://github.com/brarcher/loyalty-card-locker/pull/322))
+- Loyalty cards can now be barcodeless (e.g. not have a barcode) ([#324](https://github.com/brarcher/loyalty-card-locker/pull/324))
+- Notes can span multiple lines ([#326](https://github.com/brarcher/loyalty-card-locker/pull/326))
+- Improvements with the sizing of notes ([#319](https://github.com/brarcher/loyalty-card-locker/pull/319))
+- Improve notification and app icon visibility ([#330](https://github.com/brarcher/loyalty-card-locker/pull/330))
+- Update target SDK to Android 10
+- Improve the following translations:
+  * German
+  * Italian
+  * Dutch
+  * Polish
+  * Russian
+
+## v0.25.4 (2019-10-04)
+
+Changes
+- Enable app backups
+- Update French and Slovenian translations
+
+## v0.25.3 (2019-03-02)
+
+Changes
+- Update Russian translations
+
+## v0.25.2 (2019-01-05)
+  
+Changes
+- Update and add translations
+
+## v0.25.1 (2018-10-14)
+
+Changes:
+- Fix creating new card by manually entering barcode (https://github.com/brarcher/loyalty-card-locker/issues/272)
+
+## v0.25 (2018-10-07)
+
+Changes:
+- Sort card list case insensitive (https://github.com/brarcher/loyalty-card-locker/pull/266)
+- Add setting to lock orientation for all cards (https://github.com/brarcher/loyalty-card-locker/pull/269)
+
+## v0.24 (2018-07-31)
+
+Changes:
+- Add a setting to control screen brightness when displaying a barcode (https://github.com/brarcher/loyalty-card-locker/pull/259)
+- Add Greek translations (https://github.com/brarcher/loyalty-card-locker/pull/252)
+- Add Slovenian translations (https://github.com/brarcher/loyalty-card-locker/pull/260)
+- Update translations (https://github.com/brarcher/loyalty-card-locker/pull/260, https://github.com/brarcher/loyalty-card-locker/pull/254)
+
+## v0.23.4 (2018-05-12)
+
+Changes: 
+- Fix Spanish translations (https://github.com/brarcher/loyalty-card-locker/pull/244)
+- Update translations (https://github.com/brarcher/loyalty-card-locker/pull/244)
+
+## v0.23.3 (2018-05-05)
+
+Changes:
+- Added translations
+  * Polish (https://github.com/brarcher/loyalty-card-locker/pull/232)
+  * Spanish (https://github.com/brarcher/loyalty-card-locker/pull/232)
+  * Slovak (https://github.com/brarcher/loyalty-card-locker/pull/232)
+- Updated translations (https://github.com/brarcher/loyalty-card-locker/pull/239)
+
+## v0.23.2 (2018-03-11)
+
+Changes:
+- Reduce min SDK from 17 to 15. (https://github.com/brarcher/loyalty-card-locker/pull/226)
+- Remove usage of legacy apache library, used only in unit tests but no longer needed. (https://github.com/brarcher/loyalty-card-locker/pull/225)
+
 ## v0.23.1 (2018-03-07)
 
 Changes:

README.md

@@ -1,58 +0,0 @@
-# Loyalty Card Keychain
-[![Build Status](https://travis-ci.org/brarcher/loyalty-card-locker.svg?branch=master)](https://travis-ci.org/brarcher/loyalty-card-locker)
-
-<a href="https://f-droid.org/repository/browse/?fdid=protect.card_locker" target="_blank">
-<img src="https://f-droid.org/badge/get-it-on.png" alt="Get it on F-Droid" height="90"/></a>
-<a href="https://play.google.com/store/apps/details?id=protect.card_locker" target="_blank">
-<img src="https://play.google.com/intl/en_us/badges/images/generic/en-play-badge.png" alt="Get it on Google Play" height="90"/></a>
-
-Stores all of your store loyalty cards on your phone, removing the need to carry them around.  Currently the following barcode types are supported:
-
-- AZTEC
-- CODABAR
-- CODE_39
-- CODE_128
-- DATA_MATRIX
-- EAN_8
-- EAN_13
-- ITF
-- PDF_417
-- QR_CODE
-- UPC_A
-
-If there is any interest in improving this project, kindly submit a pull request with
-proposed changes.
-
-# Screenshots
-
-[<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://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
-
-To build, use the gradle wrapper scripts provided in the top level directory of the project. The following will
-compile the application and run all unit tests:
-
-GNU/Linux, OSX, UNIX:
-```
-./gradlew build
-```
-
-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:
-- [Save](https://thenounproject.com/term/save/716011) by [Bernar Novalyi](https://thenounproject.com/bernar.novalyi)

app/build.gradle

@@ -7,20 +7,23 @@ findbugs {
 }
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 29
 
     defaultConfig {
-        applicationId "protect.card_locker"
-        minSdkVersion 15
-        targetSdkVersion 27
-        versionCode 27
-        versionName "0.23.2"
+        applicationId "me.hackerchick.catima"
+        minSdkVersion 16
+        targetSdkVersion 29
+        versionCode 39
+        versionName "0.28"
     }
     buildTypes {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
+        debug {
+            applicationIdSuffix ".debug"
+        }
     }
     lintOptions {
         disable "GoogleAppIndexingWarning"
@@ -29,6 +32,11 @@ android {
         disable "MissingTranslation"
         disable "MissingPrefix"
     }
+    sourceSets {
+        test {
+            resources.srcDirs += ['src/test/resources']
+        }
+    }
 
     // Starting with Android Studio 3 Robolectric is unable to find resources.
     // The following allows it to find the resources.
@@ -41,19 +49,19 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:appcompat-v7:27.0.2'
-    compile 'com.android.support:design:27.0.2'
-    compile 'com.android.support:support-v4:27.0.2'
+    compile 'androidx.appcompat:appcompat:1.2.0'
+    compile 'com.google.android.material:material:1.2.0-alpha03'
+    compile 'androidx.legacy:legacy-support-v4:1.0.0'
     compile 'com.journeyapps:zxing-android-embedded:3.5.0@aar'
     compile 'com.google.zxing:core:3.3.0'
     compile 'org.apache.commons:commons-csv:1.5'
-    compile 'com.android.support.constraint:constraint-layout:1.0.2'
+    compile 'androidx.constraintlayout:constraintlayout:1.1.3'
     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"
+    testCompile "org.robolectric:robolectric:4.0.2"
 }
 
 task findbugs(type: FindBugs, dependsOn: 'assembleDebug') {
@@ -61,7 +69,7 @@ task findbugs(type: FindBugs, dependsOn: 'assembleDebug') {
     description 'Run findbugs'
     group 'verification'
 
-    classes = fileTree('build/intermediates/classes/debug/')
+    classes = fileTree('build/intermediates/javac/debug/compileDebugJavaWithJavac/classes')
     source = fileTree('src/main/java')
     classpath = files()
 

app/src/main/AndroidManifest.xml

@@ -17,7 +17,8 @@
         android:required="false" />
 
     <application
-        android:allowBackup="false"
+        android:name=".LoyaltyCardLockerApplication"
+        android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:supportsRtl="true"
@@ -43,7 +44,33 @@
             android:theme="@style/AppTheme.NoActionBar"
             android:configChanges="orientation|screenSize"
             android:windowSoftInputMode="stateHidden"
-            android:exported="true"/>
+            android:exported="true">
+            <intent-filter android:label="@string/app_name">
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <!-- Accepts URIs that begin with "https://thelastproject.github.io/Catima/share" or "https://brarcher.github.io/loyalty-card-locker/share” -->
+                <data android:scheme="https"
+                    android:host="@string/intent_import_card_from_url_host"
+                    android:pathPrefix="@string/intent_import_card_from_url_path_prefix" />
+                <data android:scheme="https"
+                    android:host="@string/intent_import_card_from_url_host_old"
+                    android:pathPrefix="@string/intent_import_card_from_url_path_prefix_old" />
+            </intent-filter>
+            <intent-filter android:label="@string/app_name">
+                <action android:name="android.intent.action.VIEW"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <!-- Accept pkpass files -->
+                <data android:scheme="content" android:mimeType="application/octet-stream"/>
+                <data android:scheme="content" android:mimeType="application/x-compressed"/>
+                <data android:scheme="content" android:mimeType="application/x-zip-compressed"/>
+                <data android:scheme="content" android:mimeType="application/zip"/>
+                <data android:scheme="content" android:mimeType="application/vnd.apple.pkpass"/>
+                <data android:scheme="content" android:mimeType="application/pkpass"/>
+                <data android:scheme="content" android:mimeType="application/vndapplepkpass"/>
+                <data android:scheme="content" android:mimeType="application/vnd-com.apple.pkpass"/>
+            </intent-filter>
+        </activity>
         <activity
             android:name=".BarcodeSelectorActivity"
             android:label="@string/selectBarcodeTitle"
@@ -59,11 +86,6 @@
             android:label="@string/importExport"
             android:configChanges="orientation|screenSize"
             android:theme="@style/AppTheme.NoActionBar"/>
-        <activity
-            android:name=".intro.IntroActivity"
-            android:label=""
-            android:configChanges="orientation|screenSize"
-            android:theme="@style/AppTheme.NoActionBar"/>
         <activity
             android:name=".CardShortcutConfigure"
             android:label="@string/cardShortcut"
@@ -75,7 +97,7 @@
             </intent-filter>
         </activity>
         <provider
-            android:name="android.support.v4.content.FileProvider"
+            android:name="androidx.core.content.FileProvider"
             android:grantUriPermissions="true"
             android:exported="false"
             android:authorities="${applicationId}">

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

@@ -5,6 +5,7 @@ import android.os.AsyncTask;
 import android.util.Log;
 import android.view.View;
 import android.widget.ImageView;
+import android.widget.TextView;
 
 import com.google.zxing.BarcodeFormat;
 import com.google.zxing.MultiFormatWriter;
@@ -20,7 +21,7 @@ import java.lang.ref.WeakReference;
  */
 class BarcodeImageWriterTask extends AsyncTask<Void, Void, Bitmap>
 {
-    private static final String TAG = "LoyaltyCardLocker";
+    private static final String TAG = "Catima";
 
     // When drawn in a smaller window 1D barcodes for some reason end up
     // squished, whereas 2D barcodes look fine.
@@ -28,16 +29,18 @@ class BarcodeImageWriterTask extends AsyncTask<Void, Void, Bitmap>
     private static final int MAX_WIDTH_2D = 500;
 
     private final WeakReference<ImageView> imageViewReference;
+    private final WeakReference<TextView> textViewReference;
     private final String cardId;
     private final BarcodeFormat format;
     private final int imageHeight;
     private final int imageWidth;
 
     BarcodeImageWriterTask(ImageView imageView, String cardIdString,
-                                  BarcodeFormat barcodeFormat)
+                           BarcodeFormat barcodeFormat, TextView textView)
     {
         // Use a WeakReference to ensure the ImageView can be garbage collected
         imageViewReference = new WeakReference<>(imageView);
+        textViewReference = new WeakReference<>(textView);
 
         cardId = cardIdString;
         format = barcodeFormat;
@@ -58,6 +61,11 @@ class BarcodeImageWriterTask extends AsyncTask<Void, Void, Bitmap>
         }
     }
 
+    BarcodeImageWriterTask(ImageView imageView, String cardIdString, BarcodeFormat barcodeFormat)
+    {
+        this(imageView, cardIdString, barcodeFormat, null);
+    }
+
     private int getMaxWidth(BarcodeFormat format)
     {
         switch(format)
@@ -90,6 +98,11 @@ class BarcodeImageWriterTask extends AsyncTask<Void, Void, Bitmap>
 
     public Bitmap doInBackground(Void... params)
     {
+        if (cardId.isEmpty())
+        {
+            return null;
+        }
+
         MultiFormatWriter writer = new MultiFormatWriter();
         BitMatrix bitMatrix;
         try
@@ -170,16 +183,25 @@ class BarcodeImageWriterTask extends AsyncTask<Void, Void, Bitmap>
         }
 
         imageView.setImageBitmap(result);
+        TextView textView = textViewReference.get();
 
         if(result != null)
         {
             Log.i(TAG, "Displaying barcode");
             imageView.setVisibility(View.VISIBLE);
+
+            if (textView != null) {
+                textView.setVisibility(View.VISIBLE);
+                textView.setText(format.name());
+            }
         }
         else
         {
             Log.i(TAG, "Barcode generation failed, removing image from display");
             imageView.setVisibility(View.GONE);
+            if (textView != null) {
+                textView.setVisibility(View.GONE);
+            }
         }
     }
-}
+}

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

@@ -5,17 +5,19 @@ import android.content.Intent;
 import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.util.Log;
+import android.util.Pair;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewTreeObserver;
 import android.widget.EditText;
 import android.widget.ImageView;
+import android.widget.TextView;
 
 import com.google.common.collect.ImmutableMap;
 import com.google.zxing.BarcodeFormat;
@@ -34,7 +36,7 @@ import java.util.Map;
  */
 public class BarcodeSelectorActivity extends AppCompatActivity
 {
-    private static final String TAG = "LoyaltyCardLocker";
+    private static final String TAG = "Catima";
 
     // Result this activity will return
     public static final String BARCODE_CONTENTS = "contents";
@@ -58,7 +60,7 @@ public class BarcodeSelectorActivity extends AppCompatActivity
                 BarcodeFormat.UPC_A.name()
         ));
 
-    private Map<String, Integer> barcodeViewMap;
+    private Map<String, Pair<Integer, Integer>> barcodeViewMap;
     private LinkedList<AsyncTask> barcodeGeneratorTasks = new LinkedList<>();
 
     @Override
@@ -75,18 +77,18 @@ public class BarcodeSelectorActivity extends AppCompatActivity
             actionBar.setDisplayHomeAsUpEnabled(true);
         }
 
-        barcodeViewMap = ImmutableMap.<String, Integer>builder()
-                .put(BarcodeFormat.AZTEC.name(), R.id.aztecBarcode)
-                .put(BarcodeFormat.CODE_39.name(), R.id.code39Barcode)
-                .put(BarcodeFormat.CODE_128.name(), R.id.code128Barcode)
-                .put(BarcodeFormat.CODABAR.name(), R.id.codabarBarcode)
-                .put(BarcodeFormat.DATA_MATRIX.name(), R.id.datamatrixBarcode)
-                .put(BarcodeFormat.EAN_8.name(), R.id.ean8Barcode)
-                .put(BarcodeFormat.EAN_13.name(), R.id.ean13Barcode)
-                .put(BarcodeFormat.ITF.name(), R.id.itfBarcode)
-                .put(BarcodeFormat.PDF_417.name(), R.id.pdf417Barcode)
-                .put(BarcodeFormat.QR_CODE.name(), R.id.qrcodeBarcode)
-                .put(BarcodeFormat.UPC_A.name(), R.id.upcaBarcode)
+        barcodeViewMap = ImmutableMap.<String, Pair<Integer, Integer>>builder()
+                .put(BarcodeFormat.AZTEC.name(), new Pair<>(R.id.aztecBarcode, R.id.aztecBarcodeText))
+                .put(BarcodeFormat.CODE_39.name(), new Pair<>(R.id.code39Barcode, R.id.code39BarcodeText))
+                .put(BarcodeFormat.CODE_128.name(), new Pair<>(R.id.code128Barcode, R.id.code128BarcodeText))
+                .put(BarcodeFormat.CODABAR.name(), new Pair<>(R.id.codabarBarcode, R.id.codabarBarcodeText))
+                .put(BarcodeFormat.DATA_MATRIX.name(), new Pair<>(R.id.datamatrixBarcode, R.id.datamatrixBarcodeText))
+                .put(BarcodeFormat.EAN_8.name(), new Pair<>(R.id.ean8Barcode, R.id.ean8BarcodeText))
+                .put(BarcodeFormat.EAN_13.name(), new Pair<>(R.id.ean13Barcode, R.id.ean13BarcodeText))
+                .put(BarcodeFormat.ITF.name(), new Pair<>(R.id.itfBarcode, R.id.itfBarcodeText))
+                .put(BarcodeFormat.PDF_417.name(), new Pair<>(R.id.pdf417Barcode, R.id.pdf417BarcodeText))
+                .put(BarcodeFormat.QR_CODE.name(), new Pair<>(R.id.qrcodeBarcode, R.id.qrcodeBarcodeText))
+                .put(BarcodeFormat.UPC_A.name(), new Pair<>(R.id.upcaBarcode, R.id.upcaBarcodeText))
                 .build();
 
         EditText cardId = findViewById(R.id.cardId);
@@ -113,9 +115,14 @@ public class BarcodeSelectorActivity extends AppCompatActivity
                 // Update barcodes
                 for(String key : barcodeViewMap.keySet())
                 {
-                    ImageView image = findViewById(barcodeViewMap.get(key));
-                    createBarcodeOption(image, key, s.toString());
+                    ImageView image = findViewById(barcodeViewMap.get(key).first);
+                    TextView text = findViewById(barcodeViewMap.get(key).second);
+                    createBarcodeOption(image, key, s.toString(), text);
                 }
+
+                View noBarcodeButtonView = findViewById(R.id.noBarcode);
+                setButtonListener(noBarcodeButtonView, s.toString());
+                noBarcodeButtonView.setEnabled(s.length() > 0);
             }
 
             @Override
@@ -134,7 +141,22 @@ public class BarcodeSelectorActivity extends AppCompatActivity
         }
     }
 
-    private void createBarcodeOption(final ImageView image, final String formatType, final String cardId)
+    private void setButtonListener(final View button, final String cardId)
+    {
+        button.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                Log.d(TAG, "Selected no barcode");
+                Intent result = new Intent();
+                result.putExtra(BARCODE_FORMAT, "");
+                result.putExtra(BARCODE_CONTENTS, cardId);
+                BarcodeSelectorActivity.this.setResult(RESULT_OK, result);
+                finish();
+            }
+        });
+    }
+
+    private void createBarcodeOption(final ImageView image, final String formatType, final String cardId, final TextView text)
     {
         final BarcodeFormat format = BarcodeFormat.valueOf(formatType);
         if(format == null)
@@ -179,7 +201,7 @@ public class BarcodeSelectorActivity extends AppCompatActivity
                         }
 
                         Log.d(TAG, "Generating barcode for type " + formatType);
-                        BarcodeImageWriterTask task = new BarcodeImageWriterTask(image, cardId, format);
+                        BarcodeImageWriterTask task = new BarcodeImageWriterTask(image, cardId, format, text);
                         barcodeGeneratorTasks.add(task);
                         task.execute();
                     }
@@ -188,7 +210,7 @@ public class BarcodeSelectorActivity extends AppCompatActivity
         else
         {
             Log.d(TAG, "Generating barcode for type " + formatType);
-            BarcodeImageWriterTask task = new BarcodeImageWriterTask(image, cardId, format);
+            BarcodeImageWriterTask task = new BarcodeImageWriterTask(image, cardId, format, text);
             barcodeGeneratorTasks.add(task);
             task.execute();
         }

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

@@ -4,8 +4,8 @@ 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 androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
 import android.util.Log;
 import android.view.View;
 import android.widget.AdapterView;
@@ -17,7 +17,7 @@ import android.widget.Toast;
  */
 public class CardShortcutConfigure extends AppCompatActivity
 {
-    static final String TAG = "LoyaltyCardLocker";
+    static final String TAG = "Catima";
 
     @Override
     public void onCreate(Bundle bundle)

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

@@ -4,6 +4,7 @@ import android.database.Cursor;
 
 import org.apache.commons.csv.CSVFormat;
 import org.apache.commons.csv.CSVPrinter;
+import org.json.JSONException;
 
 import java.io.IOException;
 import java.io.OutputStreamWriter;
@@ -25,7 +26,8 @@ public class CsvDatabaseExporter implements DatabaseExporter
                 DBHelper.LoyaltyCardDbIds.CARD_ID,
                 DBHelper.LoyaltyCardDbIds.HEADER_COLOR,
                 DBHelper.LoyaltyCardDbIds.HEADER_TEXT_COLOR,
-                DBHelper.LoyaltyCardDbIds.BARCODE_TYPE);
+                DBHelper.LoyaltyCardDbIds.BARCODE_TYPE,
+                DBHelper.LoyaltyCardDbIds.EXTRAS);
 
         Cursor cursor = db.getLoyaltyCardCursor();
 
@@ -33,13 +35,23 @@ public class CsvDatabaseExporter implements DatabaseExporter
         {
             LoyaltyCard card = LoyaltyCard.toLoyaltyCard(cursor);
 
+            String extras;
+            try {
+                extras = card.extras.toJSON().toString();
+            }
+            catch (JSONException ex)
+            {
+                throw new IOException(ex);
+            }
+
             printer.printRecord(card.id,
                     card.store,
                     card.note,
                     card.cardId,
                     card.headerColor,
                     card.headerTextColor,
-                    card.barcodeType);
+                    card.barcodeType,
+                    extras);
 
             if(Thread.currentThread().isInterrupted())
             {

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

@@ -1,13 +1,17 @@
 package protect.card_locker;
 
 import android.database.sqlite.SQLiteDatabase;
+import android.graphics.Bitmap;
 
 import org.apache.commons.csv.CSVFormat;
 import org.apache.commons.csv.CSVParser;
 import org.apache.commons.csv.CSVRecord;
+import org.json.JSONException;
+import org.json.JSONObject;
 
 import java.io.IOException;
 import java.io.InputStreamReader;
+import java.text.Normalizer;
 
 /**
  * Class for importing a database from CSV (Comma Separate Values)
@@ -131,10 +135,6 @@ public class CsvDatabaseImporter implements DatabaseImporter
         }
 
         String barcodeType = extractString(DBHelper.LoyaltyCardDbIds.BARCODE_TYPE, record, "");
-        if(barcodeType.isEmpty())
-        {
-            throw new FormatException("No barcode type listed, but is required");
-        }
 
         Integer headerColor = null;
         Integer headerTextColor = null;
@@ -146,6 +146,23 @@ public class CsvDatabaseImporter implements DatabaseImporter
             headerTextColor = extractInt(DBHelper.LoyaltyCardDbIds.HEADER_TEXT_COLOR, record, true);
         }
 
-        helper.insertLoyaltyCard(database, id, store, note, cardId, barcodeType, headerColor, headerTextColor);
+        Bitmap icon = null;
+        String iconData = extractString(DBHelper.LoyaltyCardDbIds.ICON, record, "");
+        if(!iconData.isEmpty())
+        {
+            icon = DBHelper.convertBitmapBlobToBitmap(iconData.getBytes("UTF-8"));
+        }
+
+        ExtrasHelper extras = new ExtrasHelper();
+
+        try
+        {
+            extras.fromJSON(new JSONObject(extractString(DBHelper.LoyaltyCardDbIds.EXTRAS, record, "{}")));
+            helper.insertLoyaltyCard(database, id, store, note, cardId, barcodeType, headerColor, headerTextColor, icon, extras);
+        }
+        catch (JSONException ex)
+        {
+            throw new FormatException("Invalid JSON in extras field: " + ex);
+        }
     }
 }

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

@@ -6,12 +6,20 @@ import android.content.Context;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteOpenHelper;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.io.ByteArrayOutputStream;
+import java.nio.ByteBuffer;
 
 public class DBHelper extends SQLiteOpenHelper
 {
-    public static final String DATABASE_NAME = "LoyaltyCards.db";
+    public static final String DATABASE_NAME = "Catima.db";
     public static final int ORIGINAL_DATABASE_VERSION = 1;
-    public static final int DATABASE_VERSION = 3;
+    public static final int DATABASE_VERSION = 4;
 
     static class LoyaltyCardDbIds
     {
@@ -23,6 +31,8 @@ public class DBHelper extends SQLiteOpenHelper
         public static final String HEADER_TEXT_COLOR = "headertextcolor";
         public static final String CARD_ID = "cardid";
         public static final String BARCODE_TYPE = "barcodetype";
+        public static final String ICON = "icon";
+        public static final String EXTRAS = "extras";
     }
 
     public DBHelper(Context context)
@@ -30,6 +40,19 @@ public class DBHelper extends SQLiteOpenHelper
         super(context, DATABASE_NAME, null, DATABASE_VERSION);
     }
 
+    public static byte[] convertBitmapToBlob(Bitmap bitmap)
+    {
+        // https://stackoverflow.com/a/7620610
+        ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+        bitmap.compress(Bitmap.CompressFormat.PNG, 0, byteArrayOutputStream);
+        return byteArrayOutputStream.toByteArray();
+    }
+
+    public static Bitmap convertBitmapBlobToBitmap(byte[] bytes)
+    {
+        return BitmapFactory.decodeByteArray(bytes, 0, bytes.length);
+    }
+
     @Override
     public void onCreate(SQLiteDatabase db)
     {
@@ -41,7 +64,9 @@ public class DBHelper extends SQLiteOpenHelper
                 LoyaltyCardDbIds.HEADER_COLOR + " INTEGER," +
                 LoyaltyCardDbIds.HEADER_TEXT_COLOR + " INTEGER," +
                 LoyaltyCardDbIds.CARD_ID + " TEXT not null," +
-                LoyaltyCardDbIds.BARCODE_TYPE + " TEXT not null)");
+                LoyaltyCardDbIds.BARCODE_TYPE + " TEXT not null," +
+                LoyaltyCardDbIds.ICON + " BLOB," +
+                LoyaltyCardDbIds.EXTRAS + " TEXT)");
     }
 
     @Override
@@ -62,11 +87,21 @@ public class DBHelper extends SQLiteOpenHelper
             db.execSQL("ALTER TABLE " + LoyaltyCardDbIds.TABLE
                     + " ADD COLUMN " + LoyaltyCardDbIds.HEADER_TEXT_COLOR + " INTEGER");
         }
+
+        // Upgrade from version 3 to version 4
+        if(oldVersion < 4 && newVersion >= 4)
+        {
+            db.execSQL("ALTER TABLE " + LoyaltyCardDbIds.TABLE
+                    + " ADD COLUMN " + LoyaltyCardDbIds.ICON + " BLOB");
+            db.execSQL("ALTER TABLE " + LoyaltyCardDbIds.TABLE
+                    + " ADD COLUMN " + LoyaltyCardDbIds.EXTRAS + " TEXT");
+        }
     }
 
     public long insertLoyaltyCard(final String store, final String note, final String cardId,
                                   final String barcodeType, final Integer headerColor,
-                                  final Integer headerTextColor)
+                                  final Integer headerTextColor, final Bitmap icon,
+                                  final ExtrasHelper extras) throws JSONException
     {
         SQLiteDatabase db = getWritableDatabase();
         ContentValues contentValues = new ContentValues();
@@ -76,6 +111,8 @@ public class DBHelper extends SQLiteOpenHelper
         contentValues.put(LoyaltyCardDbIds.BARCODE_TYPE, barcodeType);
         contentValues.put(LoyaltyCardDbIds.HEADER_COLOR, headerColor);
         contentValues.put(LoyaltyCardDbIds.HEADER_TEXT_COLOR, headerTextColor);
+        contentValues.put(LoyaltyCardDbIds.ICON, icon != null ? convertBitmapToBlob(icon) : null);
+        contentValues.put(LoyaltyCardDbIds.EXTRAS, extras.toJSON().toString());
         final long newId = db.insert(LoyaltyCardDbIds.TABLE, null, contentValues);
         return newId;
     }
@@ -83,7 +120,8 @@ public class DBHelper extends SQLiteOpenHelper
     public boolean insertLoyaltyCard(final SQLiteDatabase db, final int id,
                                      final String store, final String note, final String cardId,
                                      final String barcodeType, final Integer headerColor,
-                                     final Integer headerTextColor)
+                                     final Integer headerTextColor, final Bitmap icon,
+                                     final ExtrasHelper extras) throws JSONException
     {
         ContentValues contentValues = new ContentValues();
         contentValues.put(LoyaltyCardDbIds.ID, id);
@@ -93,6 +131,8 @@ public class DBHelper extends SQLiteOpenHelper
         contentValues.put(LoyaltyCardDbIds.BARCODE_TYPE, barcodeType);
         contentValues.put(LoyaltyCardDbIds.HEADER_COLOR, headerColor);
         contentValues.put(LoyaltyCardDbIds.HEADER_TEXT_COLOR, headerTextColor);
+        contentValues.put(LoyaltyCardDbIds.ICON, icon != null ? convertBitmapToBlob(icon) : null);
+        contentValues.put(LoyaltyCardDbIds.EXTRAS, extras.toJSON().toString());
         final long newId = db.insert(LoyaltyCardDbIds.TABLE, null, contentValues);
         return (newId != -1);
     }
@@ -100,7 +140,8 @@ public class DBHelper extends SQLiteOpenHelper
 
     public boolean updateLoyaltyCard(final int id, final String store, final String note,
                                      final String cardId, final String barcodeType,
-                                     final Integer headerColor, final Integer headerTextColor)
+                                     final Integer headerColor, final Integer headerTextColor,
+                                     final Bitmap icon, final ExtrasHelper extras) throws JSONException
     {
         SQLiteDatabase db = getWritableDatabase();
         ContentValues contentValues = new ContentValues();
@@ -110,6 +151,8 @@ public class DBHelper extends SQLiteOpenHelper
         contentValues.put(LoyaltyCardDbIds.BARCODE_TYPE, barcodeType);
         contentValues.put(LoyaltyCardDbIds.HEADER_COLOR, headerColor);
         contentValues.put(LoyaltyCardDbIds.HEADER_TEXT_COLOR, headerTextColor);
+        contentValues.put(LoyaltyCardDbIds.ICON, icon != null ? convertBitmapToBlob(icon) : null);
+        contentValues.put(LoyaltyCardDbIds.EXTRAS, extras.toJSON().toString());
         int rowsUpdated = db.update(LoyaltyCardDbIds.TABLE, contentValues,
                 LoyaltyCardDbIds.ID + "=?",
                 new String[]{Integer.toString(id)});
@@ -146,16 +189,52 @@ public class DBHelper extends SQLiteOpenHelper
 
     public Cursor getLoyaltyCardCursor()
     {
+        // An empty string will match everything
+        return getLoyaltyCardCursor("");
+    }
+
+    /**
+     * Returns a cursor to all loyalty cards with the filter text in either the store or note.
+     *
+     * @param filter
+     * @return Cursor
+     */
+    public Cursor getLoyaltyCardCursor(final String filter)
+    {
+        String actualFilter = String.format("%%%s%%", filter);
+        String[] selectionArgs = { actualFilter, actualFilter };
+
         SQLiteDatabase db = getReadableDatabase();
-        Cursor res =  db.rawQuery("select * from " + LoyaltyCardDbIds.TABLE +
-                " ORDER BY " + LoyaltyCardDbIds.STORE, null);
+
+        Cursor res = db.rawQuery("select * from " + LoyaltyCardDbIds.TABLE +
+                " WHERE " + LoyaltyCardDbIds.STORE + "  LIKE ? " +
+                " OR " + LoyaltyCardDbIds.NOTE + " LIKE ? " +
+                " ORDER BY " + LoyaltyCardDbIds.STORE + " COLLATE NOCASE ASC", selectionArgs, null);
         return res;
     }
 
     public int getLoyaltyCardCount()
     {
+        // An empty string will match everything
+        return getLoyaltyCardCount("");
+    }
+
+    /**
+     * Returns the amount of loyalty cards with the filter text in either the store or note.
+     *
+     * @param filter
+     * @return Integer
+     */
+    public int getLoyaltyCardCount(String filter)
+    {
+        String actualFilter = String.format("%%%s%%", filter);
+        String[] selectionArgs = { actualFilter, actualFilter };
+
         SQLiteDatabase db = getReadableDatabase();
-        Cursor data =  db.rawQuery("SELECT Count(*) FROM " + LoyaltyCardDbIds.TABLE, null);
+        Cursor data =  db.rawQuery("SELECT Count(*) FROM " + LoyaltyCardDbIds.TABLE +
+                " WHERE " + LoyaltyCardDbIds.STORE + "  LIKE ? " +
+                " OR " + LoyaltyCardDbIds.NOTE + " LIKE ? "
+                , selectionArgs, null);
 
         int numItems = 0;
 

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

@@ -0,0 +1,77 @@
+package protect.card_locker;
+
+import androidx.annotation.NonNull;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+
+public class ExtrasHelper {
+    private HashMap<String, LinkedHashMap<String, String>> extras = new HashMap<>();
+
+    public ExtrasHelper fromJSON(JSONObject json) throws JSONException
+    {
+        Iterator<String> languages = json.keys();
+
+        while(languages.hasNext())
+        {
+            String language = languages.next();
+            Iterator<String> keys = json.getJSONObject(language).keys();
+
+            while(keys.hasNext())
+            {
+                String key = keys.next();
+                addLanguageValue(language, key, json.getJSONObject(language).getString(key));
+            }
+        }
+
+        return this;
+    }
+
+    public JSONObject toJSON() throws JSONException
+    {
+        return new JSONObject(extras);
+    }
+
+    public void addLanguageValue(String language, String key, String value)
+    {
+        if(!extras.containsKey(language))
+        {
+            extras.put(language, new LinkedHashMap<String, String>());
+        }
+
+        LinkedHashMap<String, String> values = extras.get(language);
+        values.put(key, value);
+
+        extras.put(language, values);
+    }
+
+    @NonNull
+    public LinkedHashMap<String, String> getAllValues(String language)
+    {
+        return getAllValues(new String[]{language});
+    }
+
+    @NonNull
+    public LinkedHashMap<String, String> getAllValues(String[] languages)
+    {
+        LinkedHashMap<String, String> values = new LinkedHashMap<>();
+
+        // Get least preferred language (last in list) first
+        // Then go further and further to the start of the list (preferred language)
+        for(int i = (languages.length - 1); i >= 0; i--)
+        {
+            LinkedHashMap<String, String> languageValues = extras.get(languages[i]);
+
+            if(languageValues != null)
+            {
+                values.putAll(languageValues);
+            }
+        }
+
+        return values;
+    }
+}

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

@@ -7,19 +7,17 @@ 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;
-import android.support.v7.widget.Toolbar;
+
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+
 import android.util.Log;
 import android.view.MenuItem;
 import android.view.View;
@@ -29,21 +27,21 @@ import android.widget.Toast;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
 import java.io.InputStream;
+import java.io.OutputStream;
 import java.util.List;
 
 public class ImportExportActivity extends AppCompatActivity
 {
-    private static final String TAG = "LoyaltyCardLocker";
+    private static final String TAG = "Catima";
 
     private static final int PERMISSIONS_EXTERNAL_STORAGE = 1;
-    private static final int CHOOSE_EXPORT_FILE = 2;
+    private static final int CHOOSE_EXPORT_LOCATION = 2;
+    private static final int CHOOSE_EXPORTED_FILE = 3;
 
     private ImportExportTask importExporter;
 
-    private final File sdcardDir = Environment.getExternalStorageDirectory();
-    private final File exportFile = new File(sdcardDir, "LoyaltyCardKeychain.csv");
-
     @Override
     protected void onCreate(Bundle savedInstanceState)
     {
@@ -71,6 +69,11 @@ public class ImportExportActivity extends AppCompatActivity
                     PERMISSIONS_EXTERNAL_STORAGE);
         }
 
+        // Check that there is a file manager available
+        final Intent intentCreateDocumentAction = new Intent(Intent.ACTION_CREATE_DOCUMENT);
+        intentCreateDocumentAction.addCategory(Intent.CATEGORY_OPENABLE);
+        intentCreateDocumentAction.setType("text/csv");
+        intentCreateDocumentAction.putExtra(Intent.EXTRA_TITLE, "Catima.csv");
 
         Button exportButton = findViewById(R.id.exportButton);
         exportButton.setOnClickListener(new View.OnClickListener()
@@ -78,13 +81,14 @@ public class ImportExportActivity extends AppCompatActivity
             @Override
             public void onClick(View v)
             {
-                startExport();
+                chooseFileWithIntent(intentCreateDocumentAction, CHOOSE_EXPORT_LOCATION);
             }
         });
 
-
-        // Check that there is an activity that can bring up a file chooser
-        final Intent intentPickAction = new Intent(Intent.ACTION_PICK);
+        // Check that there is a file manager available
+        final Intent intentGetContentAction = new Intent(Intent.ACTION_GET_CONTENT);
+        intentGetContentAction.addCategory(Intent.CATEGORY_OPENABLE);
+        intentGetContentAction.setType("*/*");
 
         Button importFilesystem = findViewById(R.id.importOptionFilesystemButton);
         importFilesystem.setOnClickListener(new View.OnClickListener()
@@ -92,11 +96,11 @@ public class ImportExportActivity extends AppCompatActivity
             @Override
             public void onClick(View v)
             {
-                chooseFileWithIntent(intentPickAction);
+                chooseFileWithIntent(intentGetContentAction, CHOOSE_EXPORTED_FILE);
             }
         });
 
-        if(isCallable(getApplicationContext(), intentPickAction) == false)
+        if(isCallable(getApplicationContext(), intentGetContentAction) == false)
         {
             findViewById(R.id.dividerImportFilesystem).setVisibility(View.GONE);
             findViewById(R.id.importOptionFilesystemTitle).setVisibility(View.GONE);
@@ -104,11 +108,8 @@ public class ImportExportActivity extends AppCompatActivity
             importFilesystem.setVisibility(View.GONE);
         }
 
-
-        // Check that there is an application that can find content
-        final Intent intentGetContentAction = new Intent(Intent.ACTION_GET_CONTENT);
-        intentGetContentAction.addCategory(Intent.CATEGORY_OPENABLE);
-        intentGetContentAction.setType("*/*");
+        // Check that there is an app that data can be imported from
+        final Intent intentPickAction = new Intent(Intent.ACTION_PICK);
 
         Button importApplication = findViewById(R.id.importOptionApplicationButton);
         importApplication.setOnClickListener(new View.OnClickListener()
@@ -116,40 +117,17 @@ public class ImportExportActivity extends AppCompatActivity
             @Override
             public void onClick(View v)
             {
-                chooseFileWithIntent(intentGetContentAction);
+                chooseFileWithIntent(intentPickAction, CHOOSE_EXPORTED_FILE);
             }
         });
 
-        if(isCallable(getApplicationContext(), intentGetContentAction) == false)
+        if(isCallable(getApplicationContext(), intentPickAction) == false)
         {
             findViewById(R.id.dividerImportApplication).setVisibility(View.GONE);
             findViewById(R.id.importOptionApplicationTitle).setVisibility(View.GONE);
             findViewById(R.id.importOptionApplicationExplanation).setVisibility(View.GONE);
             importApplication.setVisibility(View.GONE);
         }
-
-
-        // This option, to import from the fixed location, should always be present
-
-        Button importButton = findViewById(R.id.importOptionFixedButton);
-        importButton.setOnClickListener(new View.OnClickListener()
-        {
-            @Override
-            public void onClick(View v)
-            {
-                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(final InputStream target, final Uri targetUri)
@@ -168,19 +146,19 @@ public class ImportExportActivity extends AppCompatActivity
         importExporter.execute();
     }
 
-    private void startExport()
+    private void startExport(final OutputStream target, final Uri targetUri)
     {
         ImportExportTask.TaskCompleteListener listener = new ImportExportTask.TaskCompleteListener()
         {
             @Override
             public void onTaskComplete(boolean success)
             {
-                onExportComplete(success, exportFile);
+                onExportComplete(success, targetUri);
             }
         };
 
         importExporter = new ImportExportTask(ImportExportActivity.this,
-                DataFormat.CSV, exportFile, listener);
+                DataFormat.CSV, target, listener);
         importExporter.execute();
     }
 
@@ -248,13 +226,9 @@ public class ImportExportActivity extends AppCompatActivity
             builder.setTitle(R.string.importFailedTitle);
         }
 
-        int messageId = success ? R.string.importedFrom : R.string.importFailed;
-        final String template = getResources().getString(messageId);
+        int messageId = success ? R.string.importSuccessful : R.string.importFailed;
+        final String message = getResources().getString(messageId);
 
-        // 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()
         {
@@ -268,7 +242,7 @@ public class ImportExportActivity extends AppCompatActivity
         builder.create().show();
     }
 
-    private void onExportComplete(boolean success, final File path)
+    private void onExportComplete(boolean success, final Uri path)
     {
         AlertDialog.Builder builder = new AlertDialog.Builder(this);
 
@@ -281,10 +255,9 @@ public class ImportExportActivity extends AppCompatActivity
             builder.setTitle(R.string.exportFailedTitle);
         }
 
-        int messageId = success ? R.string.exportedTo : R.string.exportFailed;
+        int messageId = success ? R.string.exportSuccessful : R.string.exportFailed;
+        final String message = getResources().getString(messageId);
 
-        final String template = getResources().getString(messageId);
-        final String message = String.format(template, path.getAbsolutePath());
         builder.setMessage(message);
         builder.setNeutralButton(R.string.ok, new DialogInterface.OnClickListener()
         {
@@ -304,9 +277,8 @@ public class ImportExportActivity extends AppCompatActivity
                 @Override
                 public void onClick(DialogInterface dialog, int which)
                 {
-                    Uri outputUri = FileProvider.getUriForFile(ImportExportActivity.this, BuildConfig.APPLICATION_ID, path);
                     Intent sendIntent = new Intent(Intent.ACTION_SEND);
-                    sendIntent.putExtra(Intent.EXTRA_STREAM, outputUri);
+                    sendIntent.putExtra(Intent.EXTRA_STREAM, path);
                     sendIntent.setType("text/csv");
 
                     // set flag to give temporary permission to external app to use the FileProvider
@@ -348,11 +320,11 @@ public class ImportExportActivity extends AppCompatActivity
         return false;
     }
 
-    private void chooseFileWithIntent(Intent intent)
+    private void chooseFileWithIntent(Intent intent, int requestCode)
     {
         try
         {
-            startActivityForResult(intent, CHOOSE_EXPORT_FILE);
+            startActivityForResult(intent, requestCode);
         }
         catch (ActivityNotFoundException e)
         {
@@ -365,7 +337,7 @@ 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_LOCATION && requestCode != CHOOSE_EXPORTED_FILE))
         {
             Log.w(TAG, "Failed onActivityResult(), result=" + resultCode);
             return;
@@ -380,24 +352,48 @@ public class ImportExportActivity extends AppCompatActivity
 
         try
         {
-            InputStream reader;
-
-            if(uri.getScheme() != null)
+            if (requestCode == CHOOSE_EXPORT_LOCATION)
             {
-                reader = getContentResolver().openInputStream(uri);
+                OutputStream writer;
+                if (uri.getScheme() != null)
+                {
+                    writer = getContentResolver().openOutputStream(uri);
+                }
+                else
+                {
+                    writer = new FileOutputStream(new File(uri.toString()));
+                }
+
+                Log.e(TAG, "Starting file export with: " + uri.toString());
+                startExport(writer, uri);
             }
             else
             {
-                reader = new FileInputStream(new File(uri.toString()));
-            }
+                InputStream reader;
+                if(uri.getScheme() != null)
+                {
+                    reader = getContentResolver().openInputStream(uri);
+                }
+                else
+                {
+                    reader = new FileInputStream(new File(uri.toString()));
+                }
 
-            Log.e(TAG, "Starting file import with: " + uri.toString());
-            startImport(reader, uri);
+                Log.e(TAG, "Starting file export with: " + uri.toString());
+                startImport(reader, uri);
+            }
         }
         catch(FileNotFoundException e)
         {
-            Log.e(TAG, "Failed to import file: " + uri.toString(), e);
-            onImportComplete(false, uri);
+            Log.e(TAG, "Failed to import/export file: " + uri.toString(), e);
+            if (requestCode == CHOOSE_EXPORT_LOCATION)
+            {
+                onExportComplete(false, uri);
+            }
+            else
+            {
+                onImportComplete(false, uri);
+            }
         }
     }
 }

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

@@ -4,27 +4,23 @@ import android.app.Activity;
 import android.app.ProgressDialog;
 import android.content.DialogInterface;
 import android.os.AsyncTask;
-import android.os.Environment;
 import android.util.Log;
-import android.widget.Toast;
 
-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.OutputStream;
 import java.io.OutputStreamWriter;
 import java.nio.charset.Charset;
 
 class ImportExportTask extends AsyncTask<Void, Void, Boolean>
 {
-    private static final String TAG = "LoyaltyCardLocker";
+    private static final String TAG = "Catima";
 
     private Activity activity;
     private boolean doImport;
     private DataFormat format;
-    private File target;
+    private OutputStream outputStream;
     private InputStream inputStream;
     private TaskCompleteListener listener;
 
@@ -33,14 +29,14 @@ class ImportExportTask extends AsyncTask<Void, Void, Boolean>
     /**
      * Constructor which will setup a task for exporting to the given file
      */
-    ImportExportTask(Activity activity, DataFormat format, File target,
+    ImportExportTask(Activity activity, DataFormat format, OutputStream output,
             TaskCompleteListener listener)
     {
         super();
         this.activity = activity;
         this.doImport = false;
         this.format = format;
-        this.target = target;
+        this.outputStream = output;
         this.listener = listener;
     }
 
@@ -78,14 +74,13 @@ class ImportExportTask extends AsyncTask<Void, Void, Boolean>
         return result;
     }
 
-    private boolean performExport(File exportFile, DBHelper db)
+    private boolean performExport(OutputStream stream, DBHelper db)
     {
         boolean result = false;
 
         try
         {
-            FileOutputStream fileWriter = new FileOutputStream(exportFile);
-            OutputStreamWriter writer = new OutputStreamWriter(fileWriter, Charset.forName("UTF-8"));
+            OutputStreamWriter writer = new OutputStreamWriter(stream, Charset.forName("UTF-8"));
             result = MultiFormatExporter.exportData(db, writer, format);
             writer.close();
         }
@@ -94,7 +89,7 @@ class ImportExportTask extends AsyncTask<Void, Void, Boolean>
             Log.e(TAG, "Unable to export file", e);
         }
 
-        Log.i(TAG, "Export of '" + exportFile.getAbsolutePath() + "' result: " + result);
+        Log.i(TAG, "Export result: " + result);
 
         return result;
     }
@@ -127,7 +122,7 @@ class ImportExportTask extends AsyncTask<Void, Void, Boolean>
         }
         else
         {
-            result = performExport(target, db);
+            result = performExport(outputStream, db);
         }
 
         return result;

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

@@ -0,0 +1,140 @@
+package protect.card_locker;
+
+import android.content.Context;
+import android.content.Intent;
+import android.graphics.Bitmap;
+import android.net.Uri;
+import android.util.Base64;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.io.InvalidObjectException;
+
+public class ImportURIHelper {
+    private static final String STORE = DBHelper.LoyaltyCardDbIds.STORE;
+    private static final String NOTE = DBHelper.LoyaltyCardDbIds.NOTE;
+    private static final String CARD_ID = DBHelper.LoyaltyCardDbIds.CARD_ID;
+    private static final String BARCODE_TYPE = DBHelper.LoyaltyCardDbIds.BARCODE_TYPE;
+    private static final String HEADER_COLOR = DBHelper.LoyaltyCardDbIds.HEADER_COLOR;
+    private static final String HEADER_TEXT_COLOR = DBHelper.LoyaltyCardDbIds.HEADER_TEXT_COLOR;
+    private static final String ICON = DBHelper.LoyaltyCardDbIds.ICON;
+    private static final String EXTRAS = DBHelper.LoyaltyCardDbIds.EXTRAS;
+
+    private final Context context;
+    private final String host;
+    private final String path;
+    private final String oldHost;
+    private final String oldPath;
+    private final String shareText;
+
+    public ImportURIHelper(Context context) {
+        this.context = context;
+        host = context.getResources().getString(R.string.intent_import_card_from_url_host);
+        path = context.getResources().getString(R.string.intent_import_card_from_url_path_prefix);
+        oldHost = context.getResources().getString(R.string.intent_import_card_from_url_host_old);
+        oldPath = context.getResources().getString(R.string.intent_import_card_from_url_path_prefix_old);
+        shareText = context.getResources().getString(R.string.intent_import_card_from_url_share_text);
+    }
+
+    public boolean isImportUri(Uri uri) {
+        return (uri.getHost().equals(host) && uri.getPath().equals(path)) || (uri.getHost().equals(oldHost) && uri.getPath().equals(oldPath));
+    }
+
+    public LoyaltyCard parse(Uri uri) throws InvalidObjectException {
+        if(!isImportUri(uri)) {
+            throw new InvalidObjectException("Not an import URI");
+        }
+
+        try {
+            // These values are allowed to be null
+            Integer headerColor = null;
+            Integer headerTextColor = null;
+
+            String store = uri.getQueryParameter(STORE);
+            String note = uri.getQueryParameter(NOTE);
+            String cardId = uri.getQueryParameter(CARD_ID);
+            String barcodeType = uri.getQueryParameter(BARCODE_TYPE);
+            String unparsedHeaderColor = uri.getQueryParameter(HEADER_COLOR);
+            if(unparsedHeaderColor != null)
+            {
+                headerColor = Integer.parseInt(unparsedHeaderColor);
+            }
+            String unparsedHeaderTextColor = uri.getQueryParameter(HEADER_TEXT_COLOR);
+            if(unparsedHeaderTextColor != null)
+            {
+                headerTextColor = Integer.parseInt(unparsedHeaderTextColor);
+            }
+            String iconData = uri.getQueryParameter(ICON);
+            Bitmap icon = null;
+
+            if(iconData != null && !iconData.isEmpty())
+            {
+                byte[] iconBytes = Base64.decode(iconData, Base64.URL_SAFE);
+                icon = DBHelper.convertBitmapBlobToBitmap(iconBytes);
+            }
+
+            String extrasData = uri.getQueryParameter(EXTRAS);
+            ExtrasHelper extras = new ExtrasHelper();
+            if(extrasData != null && !extrasData.isEmpty())
+            {
+                extras.fromJSON(new JSONObject(uri.getQueryParameter(EXTRAS)));
+            }
+
+            return new LoyaltyCard(-1, store, note, cardId, barcodeType, headerColor, headerTextColor, icon, extras);
+        } catch (NullPointerException | NumberFormatException | JSONException ex) {
+            throw new InvalidObjectException("Not a valid import URI");
+        }
+    }
+
+    // Protected for usage in tests
+    protected Uri toUri(LoyaltyCard loyaltyCard) throws JSONException {
+        String icon = "";
+        if(loyaltyCard.icon != null)
+        {
+            icon = Base64.encodeToString(DBHelper.convertBitmapToBlob(loyaltyCard.icon), Base64.URL_SAFE);
+        }
+
+        Uri.Builder uriBuilder = new Uri.Builder();
+        uriBuilder.scheme("https");
+        uriBuilder.authority(host);
+        uriBuilder.path(path);
+        uriBuilder.appendQueryParameter(STORE, loyaltyCard.store);
+        uriBuilder.appendQueryParameter(NOTE, loyaltyCard.note);
+        uriBuilder.appendQueryParameter(CARD_ID, loyaltyCard.cardId);
+        uriBuilder.appendQueryParameter(BARCODE_TYPE, loyaltyCard.barcodeType);
+        if(loyaltyCard.headerColor != null)
+        {
+            uriBuilder.appendQueryParameter(HEADER_COLOR, loyaltyCard.headerColor.toString());
+        }
+        if(loyaltyCard.headerTextColor != null)
+        {
+            uriBuilder.appendQueryParameter(HEADER_TEXT_COLOR, loyaltyCard.headerTextColor.toString());
+        }
+        uriBuilder.appendQueryParameter(ICON, icon);
+        uriBuilder.appendQueryParameter(EXTRAS, loyaltyCard.extras.toJSON().toString());
+
+        return uriBuilder.build();
+    }
+
+    private void startShareIntent(Uri uri) {
+        Intent sendIntent = new Intent();
+        sendIntent.setAction(Intent.ACTION_SEND);
+        sendIntent.putExtra(Intent.EXTRA_TEXT, shareText + "\n" + uri.toString());
+        sendIntent.setType("text/plain");
+
+        Intent shareIntent = Intent.createChooser(sendIntent, null);
+        context.startActivity(shareIntent);
+    }
+
+    public boolean startShareIntent(LoyaltyCard loyaltyCard) {
+        try
+        {
+            startShareIntent(toUri(loyaltyCard));
+            return true;
+        }
+        catch (JSONException ex) {}
+
+        return false;
+    }
+}

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

@@ -1,7 +1,12 @@
 package protect.card_locker;
 
 import android.database.Cursor;
-import android.support.annotation.Nullable;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import androidx.annotation.Nullable;
+
+import org.json.JSONException;
+import org.json.JSONObject;
 
 public class LoyaltyCard
 {
@@ -17,8 +22,15 @@ public class LoyaltyCard
     @Nullable
     public final Integer headerTextColor;
 
+    @Nullable
+    public final Bitmap icon;
+
+    @Nullable
+    public final ExtrasHelper extras;
+
     public LoyaltyCard(final int id, final String store, final String note, final String cardId,
-                       final String barcodeType, final Integer headerColor, final Integer headerTextColor)
+                       final String barcodeType, final Integer headerColor, final Integer headerTextColor,
+                       final Bitmap icon, final ExtrasHelper extras)
     {
         this.id = id;
         this.store = store;
@@ -27,6 +39,8 @@ public class LoyaltyCard
         this.barcodeType = barcodeType;
         this.headerColor = headerColor;
         this.headerTextColor = headerTextColor;
+        this.icon = icon;
+        this.extras = extras;
     }
 
     public static LoyaltyCard toLoyaltyCard(Cursor cursor)
@@ -53,6 +67,32 @@ public class LoyaltyCard
             headerTextColor = cursor.getInt(headerTextColorColumn);
         }
 
-        return new LoyaltyCard(id, store, note, cardId, barcodeType, headerColor, headerTextColor);
+        int iconColumn = cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.ICON);
+        Bitmap icon = null;
+
+        if(cursor.isNull(iconColumn) == false)
+        {
+            byte[] iconData = cursor.getBlob(iconColumn);
+            icon = BitmapFactory.decodeByteArray(iconData, 0, iconData.length);
+        }
+
+        int extrasColumn = cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.EXTRAS);
+        ExtrasHelper extras = new ExtrasHelper();
+
+        if(cursor.isNull(extrasColumn) == false)
+        {
+            try
+            {
+                extras = extras.fromJSON(new JSONObject(cursor.getString(extrasColumn)));
+            }
+            catch (JSONException ex)
+            {
+                // That this is actually JSON is an implementation detail
+                // The important part is that the DB is in a bad state
+                throw new IllegalArgumentException(ex);
+            }
+        }
+
+        return new LoyaltyCard(id, store, note, cardId, barcodeType, headerColor, headerTextColor, icon, extras);
     }
 }

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

@@ -2,6 +2,7 @@ package protect.card_locker;
 
 import android.content.Context;
 import android.database.Cursor;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -61,10 +62,18 @@ class LoyaltyCardCursorAdapter extends CursorAdapter
         int tileLetterFontSize = context.getResources().getDimensionPixelSize(R.dimen.tileLetterFontSize);
         int pixelSize = context.getResources().getDimensionPixelSize(R.dimen.cardThumbnailSize);
 
-        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());
+
+        if(loyaltyCard.icon == null)
+        {
+            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());
+        }
+        else
+        {
+            thumbnail.setImageBitmap(loyaltyCard.icon);
+        }
     }
 }

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

@@ -4,14 +4,18 @@ import android.app.Activity;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.res.TypedArray;
+import android.graphics.Bitmap;
 import android.graphics.Color;
+import android.net.Uri;
 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 com.google.android.material.floatingactionbutton.FloatingActionButton;
+import com.google.android.material.snackbar.Snackbar;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -29,11 +33,18 @@ import com.google.zxing.integration.android.IntentResult;
 import com.jaredrummler.android.colorpicker.ColorPickerDialog;
 import com.jaredrummler.android.colorpicker.ColorPickerDialogListener;
 
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.io.IOException;
+import java.io.InvalidObjectException;
+
 public class LoyaltyCardEditActivity extends AppCompatActivity
 {
-    private static final String TAG = "CardLocker";
+    private static final String TAG = "Catima";
+    protected static final String NO_BARCODE = "_NO_BARCODE_";
 
-    private static final int SELECT_BARCODE_REQUEST = 1;
+    protected static final int SELECT_BARCODE_REQUEST = 1;
 
     EditText storeFieldEdit;
     EditText noteFieldEdit;
@@ -54,21 +65,54 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
 
     int loyaltyCardId;
     boolean updateLoyaltyCard;
+    Uri importLoyaltyCardUri = null;
+    String importLoyaltyCardType = null;
     Integer headingColorValue = null;
     Integer headingStoreTextColorValue = null;
+    Bitmap icon = null;
+    ExtrasHelper extras = new ExtrasHelper();
 
     DBHelper db;
+    ImportURIHelper importUriHelper;
+    PkpassImporter pkpassImporter;
 
     private void extractIntentFields(Intent intent)
     {
         final Bundle b = intent.getExtras();
         loyaltyCardId = b != null ? b.getInt("id") : 0;
         updateLoyaltyCard = b != null && b.getBoolean("update", false);
+        importLoyaltyCardType = intent.getType();
+        importLoyaltyCardUri = intent.getData();
 
         Log.d(TAG, "View activity: id=" + loyaltyCardId
                 + ", updateLoyaltyCard=" + Boolean.toString(updateLoyaltyCard));
     }
 
+    private LoyaltyCard importCard(String type, Uri uri)
+    {
+        // Import URI
+        if(importUriHelper.isImportUri(uri))
+        {
+            try
+            {
+                return importUriHelper.parse(importLoyaltyCardUri);
+            }
+            catch (InvalidObjectException ex)
+            {
+                return null;
+            }
+        }
+
+        // Pkpass
+        try
+        {
+            return pkpassImporter.fromURI(uri);
+        }
+        catch (IOException | JSONException ex) {}
+
+        return null;
+    }
+
     @Override
     protected void onCreate(Bundle savedInstanceState)
     {
@@ -86,6 +130,8 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
         extractIntentFields(getIntent());
 
         db = new DBHelper(this);
+        importUriHelper = new ImportURIHelper(this);
+        pkpassImporter = new PkpassImporter(this);
 
         storeFieldEdit = findViewById(R.id.storeNameEdit);
         noteFieldEdit = findViewById(R.id.noteEdit);
@@ -96,7 +142,7 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
         cardIdFieldView = findViewById(R.id.cardIdView);
         cardIdDivider = findViewById(R.id.cardIdDivider);
         cardIdTableRow = findViewById(R.id.cardIdTableRow);
-        barcodeTypeField = findViewById(R.id.barcodeType);
+        barcodeTypeField = findViewById(R.id.barcodeTypeView);
         barcodeImage = findViewById(R.id.barcode);
         barcodeImageLayout = findViewById(R.id.barcodeLayout);
         barcodeCaptureLayout = findViewById(R.id.barcodeCaptureLayout);
@@ -108,6 +154,8 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
     @Override
     public void onNewIntent(Intent intent)
     {
+        super.onNewIntent(intent);
+
         Log.i(TAG, "Received new intent");
         extractIntentFields(intent);
 
@@ -153,7 +201,7 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
 
             if(barcodeTypeField.getText().length() == 0)
             {
-                barcodeTypeField.setText(loyaltyCard.barcodeType);
+                barcodeTypeField.setText(loyaltyCard.barcodeType.isEmpty() ? LoyaltyCardEditActivity.NO_BARCODE : loyaltyCard.barcodeType);
             }
 
             if(headingColorValue == null)
@@ -163,7 +211,6 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
                 {
                     headingColorValue = LetterBitmap.getDefaultColor(this, loyaltyCard.store);
                 }
-                headingColorSample.setBackgroundColor(headingColorValue);
             }
 
             if(headingStoreTextColorValue == null)
@@ -173,14 +220,37 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
                 {
                     headingStoreTextColorValue = Color.WHITE;
                 }
-                headingStoreTextColorSample.setBackgroundColor(headingStoreTextColorValue);
             }
 
+            extras = loyaltyCard.extras;
+
             setTitle(R.string.editCardTitle);
         }
+        else if(importLoyaltyCardUri != null)
+        {
+            // Try to parse
+            LoyaltyCard importCard = importCard(importLoyaltyCardType, importLoyaltyCardUri);
+
+            if(importCard == null)
+            {
+                Toast.makeText(this, R.string.failedParsingImportUriError, Toast.LENGTH_LONG).show();
+                finish();
+                return;
+            }
+
+            storeFieldEdit.setText(importCard.store);
+            noteFieldEdit.setText(importCard.note);
+            cardIdFieldView.setText(importCard.cardId);
+            barcodeTypeField.setText(importCard.barcodeType);
+            headingColorValue = importCard.headerColor;
+            headingStoreTextColorValue = importCard.headerTextColor;
+            icon = importCard.icon;
+            extras = importCard.extras;
+        }
         else
         {
             setTitle(R.string.addCardTitle);
+            hideBarcode();
         }
 
         if(headingColorValue == null)
@@ -190,57 +260,62 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
             final int color = (int)(Math.random() * colors.length());
             headingColorValue = colors.getColor(color, Color.BLACK);
             colors.recycle();
-
-            headingColorSample.setBackgroundColor(headingColorValue);
         }
 
-        if(headingStoreTextColorValue == null)
-        {
+        if(headingStoreTextColorValue == null) {
             headingStoreTextColorValue = Color.WHITE;
-            headingStoreTextColorSample.setBackgroundColor(headingStoreTextColorValue);
         }
 
+        headingColorSample.setBackgroundColor(headingColorValue);
+        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)
+            if(barcodeTypeField.getText().toString().equals(NO_BARCODE))
             {
-                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();
-                            }
-                        });
+                hideBarcode();
             }
             else
             {
-                Log.d(TAG, "ImageView size known known, creating barcode");
-                new BarcodeImageWriterTask(barcodeImage, cardIdString, format).execute();
-            }
+                String formatString = barcodeTypeField.getText().toString();
+                final BarcodeFormat format = BarcodeFormat.valueOf(formatString);
+                final String cardIdString = cardIdFieldView.getText().toString();
 
-            barcodeImageLayout.setVisibility(View.VISIBLE);
+                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();
+                }
+
+                showBarcode();
+            }
         }
 
         View.OnClickListener captureCallback = new View.OnClickListener()
@@ -291,6 +366,18 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
             cardIdTableRow.setVisibility(View.GONE);
             enterButton.setText(R.string.enterCard);
         }
+
+        FloatingActionButton saveButton = findViewById(R.id.fabSave);
+        saveButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                try {
+                    doSave();
+                } catch (JSONException ex) {
+                    Toast.makeText(getApplicationContext(), R.string.failedSavingCard, Toast.LENGTH_LONG).show();
+                }
+            }
+        });
     }
 
     class ColorSelectListener implements View.OnClickListener
@@ -335,20 +422,27 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
         }
     }
 
-    private void doSave()
+    private void doSave() throws JSONException
     {
         String store = storeFieldEdit.getText().toString();
         String note = noteFieldEdit.getText().toString();
         String cardId = cardIdFieldView.getText().toString();
         String barcodeType = barcodeTypeField.getText().toString();
 
+        // We do not want to save the no barcode string to the database
+        // it is simply an empty there for no barcode
+        if(barcodeType.equals(NO_BARCODE))
+        {
+            barcodeType = "";
+        }
+
         if(store.isEmpty())
         {
             Snackbar.make(storeFieldEdit, R.string.noStoreError, Snackbar.LENGTH_LONG).show();
             return;
         }
 
-        if(cardId.isEmpty() || barcodeType.isEmpty())
+        if(cardId.isEmpty())
         {
             Snackbar.make(cardIdFieldView, R.string.noCardIdError, Snackbar.LENGTH_LONG).show();
             return;
@@ -356,12 +450,12 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
 
         if(updateLoyaltyCard)
         {
-            db.updateLoyaltyCard(loyaltyCardId, store, note, cardId, barcodeType, headingColorValue, headingStoreTextColorValue);
+            db.updateLoyaltyCard(loyaltyCardId, store, note, cardId, barcodeType, headingColorValue, headingStoreTextColorValue, icon, extras);
             Log.i(TAG, "Updated " + loyaltyCardId + " to " + cardId);
         }
         else
         {
-            loyaltyCardId = (int)db.insertLoyaltyCard(store, note, cardId, barcodeType, headingColorValue, headingStoreTextColorValue);
+            loyaltyCardId = (int)db.insertLoyaltyCard(store, note, cardId, barcodeType, headingColorValue, headingStoreTextColorValue, icon, extras);
         }
 
         finish();
@@ -425,10 +519,6 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
                 dialog.show();
 
                 return true;
-
-            case R.id.action_save:
-                doSave();
-                return true;
         }
 
         return super.onOptionsItemSelected(item);
@@ -437,6 +527,8 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent intent)
     {
+        super.onActivityResult(requestCode, resultCode, intent);
+
         String contents = null;
         String format = null;
 
@@ -451,14 +543,14 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
 
         if(requestCode == SELECT_BARCODE_REQUEST && resultCode == Activity.RESULT_OK)
         {
-            Log.i(TAG, "Received barcode information from capture");
+            Log.i(TAG, "Received barcode information from typing it");
 
             contents = intent.getStringExtra(BarcodeSelectorActivity.BARCODE_CONTENTS);
             format = intent.getStringExtra(BarcodeSelectorActivity.BARCODE_FORMAT);
         }
 
         if(contents != null && contents.isEmpty() == false &&
-                format != null && format.isEmpty() == false)
+                format != null)
         {
             Log.i(TAG, "Read barcode id: " + contents);
             Log.i(TAG, "Read format: " + format);
@@ -466,9 +558,21 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
             TextView cardIdView = findViewById(R.id.cardIdView);
             cardIdView.setText(contents);
 
-            final TextView barcodeTypeField = findViewById(R.id.barcodeType);
-            barcodeTypeField.setText(format);
+            // Set special NO_BARCODE value to prevent onResume from overwriting it
+            barcodeTypeField.setText(format.isEmpty() ? LoyaltyCardEditActivity.NO_BARCODE : format);
             onResume();
         }
     }
+
+    private void showBarcode() {
+        barcodeImageLayout.setVisibility(View.VISIBLE);
+        findViewById(R.id.barcodeTypeDivider).setVisibility(View.VISIBLE);
+        findViewById(R.id.barcodeTypeTableRow).setVisibility(View.VISIBLE);
+    }
+
+    private void hideBarcode() {
+        barcodeImageLayout.setVisibility(View.GONE);
+        findViewById(R.id.barcodeTypeDivider).setVisibility(View.GONE);
+        findViewById(R.id.barcodeTypeTableRow).setVisibility(View.GONE);
+    }
 }

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

@@ -0,0 +1,15 @@
+package protect.card_locker;
+
+import android.app.Application;
+import androidx.appcompat.app.AppCompatDelegate;
+
+import protect.card_locker.preferences.Settings;
+
+public class LoyaltyCardLockerApplication extends Application {
+    public void onCreate() {
+        super.onCreate();
+
+        Settings settings = new Settings(getApplicationContext());
+        AppCompatDelegate.setDefaultNightMode(settings.getTheme());
+    }
+}

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

@@ -1,20 +1,29 @@
 package protect.card_locker;
 
 
+import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
 import android.graphics.Color;
+import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.v4.widget.TextViewCompat;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
+
+import androidx.appcompat.app.AlertDialog;
+import androidx.constraintlayout.widget.ConstraintLayout;
+import androidx.core.graphics.ColorUtils;
+import androidx.core.graphics.drawable.DrawableCompat;
+import androidx.core.widget.TextViewCompat;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.content.res.AppCompatResources;
+import androidx.appcompat.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.ViewGroup;
 import android.view.ViewTreeObserver;
 import android.view.Window;
 import android.view.WindowManager;
@@ -22,14 +31,22 @@ import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.google.zxing.BarcodeFormat;
 
+import org.json.JSONException;
+
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
+
 import protect.card_locker.preferences.Settings;
 
 
 public class LoyaltyCardViewActivity extends AppCompatActivity
 {
-    private static final String TAG = "CardLocker";
+    private static final String TAG = "Catima";
+    private static final double LUMINANCE_MIDPOINT = 0.5;
 
     TextView cardIdFieldView;
     TextView noteView;
@@ -38,10 +55,19 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
     ImageView barcodeImage;
     View collapsingToolbarLayout;
     int loyaltyCardId;
+    LoyaltyCard loyaltyCard;
     boolean rotationEnabled;
     DBHelper db;
+    ImportURIHelper importURIHelper;
     Settings settings;
 
+    String cardIdString;
+    BarcodeFormat format;
+
+    boolean backgroundNeedsDarkIcons;
+    boolean barcodeIsFullscreen = false;
+    ViewGroup.LayoutParams barcodeImageState;
+
     private void extractIntentFields(Intent intent)
     {
         final Bundle b = intent.getExtras();
@@ -49,6 +75,22 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
         Log.d(TAG, "View activity: id=" + loyaltyCardId);
     }
 
+    private Drawable getIcon(int icon, boolean dark)
+    {
+        Drawable unwrappedIcon = AppCompatResources.getDrawable(this, icon);
+        Drawable wrappedIcon = DrawableCompat.wrap(unwrappedIcon);
+        if(dark)
+        {
+            DrawableCompat.setTint(wrappedIcon, Color.BLACK);
+        }
+        else
+        {
+            DrawableCompat.setTintList(wrappedIcon, null);
+        }
+
+        return wrappedIcon;
+    }
+
     @Override
     protected void onCreate(Bundle savedInstanceState)
     {
@@ -69,6 +111,7 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
         }
 
         db = new DBHelper(this);
+        importURIHelper = new ImportURIHelper(this);
 
         cardIdFieldView = findViewById(R.id.cardIdView);
         noteView = findViewById(R.id.noteView);
@@ -76,11 +119,30 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
         storeName = findViewById(R.id.storeName);
         barcodeImage = findViewById(R.id.barcode);
         collapsingToolbarLayout = findViewById(R.id.collapsingToolbarLayout);
+
+        rotationEnabled = true;
+
+        // Allow making barcode fullscreen on tap
+        barcodeImage.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if(barcodeIsFullscreen)
+                {
+                    setFullscreen(false);
+                }
+                else
+                {
+                    setFullscreen(true);
+                }
+            }
+        });
     }
 
     @Override
     public void onNewIntent(Intent intent)
     {
+        super.onNewIntent(intent);
+
         Log.i(TAG, "Received new intent");
         extractIntentFields(intent);
     }
@@ -92,18 +154,27 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
 
         Log.i(TAG, "To view card: " + loyaltyCardId);
 
+        if(barcodeIsFullscreen)
+        {
+            // Completely reset state
+            //
+            // This prevents the barcode from taking up the entire screen
+            // on resume and thus being stretched out of proportion.
+            recreate();
+        }
+
         // 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)
+        if(window != null && settings.useMaxBrightnessDisplayingBarcode())
         {
             WindowManager.LayoutParams attributes = window.getAttributes();
             attributes.screenBrightness = 1F;
             window.setAttributes(attributes);
         }
 
-        final LoyaltyCard loyaltyCard = db.getLoyaltyCard(loyaltyCardId);
+        loyaltyCard = db.getLoyaltyCard(loyaltyCardId);
         if(loyaltyCard == null)
         {
             Log.w(TAG, "Could not lookup loyalty card " + loyaltyCardId);
@@ -113,8 +184,8 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
         }
 
         String formatString = loyaltyCard.barcodeType;
-        final BarcodeFormat format = BarcodeFormat.valueOf(formatString);
-        final String cardIdString = loyaltyCard.cardId;
+        format = !formatString.isEmpty() ? BarcodeFormat.valueOf(formatString) : null;
+        cardIdString = loyaltyCard.cardId;
 
         cardIdFieldView.setText(loyaltyCard.cardId);
         TextViewCompat.setAutoSizeTextTypeUniformWithConfiguration(cardIdFieldView,
@@ -160,37 +231,84 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
 
         collapsingToolbarLayout.setBackgroundColor(backgroundHeaderColor);
 
-        if(barcodeImage.getHeight() == 0)
+        // If the background is very bright, we should use dark icons
+        backgroundNeedsDarkIcons = (ColorUtils.calculateLuminance(backgroundHeaderColor) > LUMINANCE_MIDPOINT);
+        ActionBar actionBar = getSupportActionBar();
+        if(actionBar != null)
         {
-            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()
+            actionBar.setHomeAsUpIndicator(getIcon(R.drawable.ic_arrow_back_white, backgroundNeedsDarkIcons));
+        }
+
+        // Make notification area light if dark icons are needed
+        if(Build.VERSION.SDK_INT >= 23)
+        {
+            window.getDecorView().setSystemUiVisibility(backgroundNeedsDarkIcons ? View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR : 0);
+        }
+        if(Build.VERSION.SDK_INT >= 21)
+        {
+            window.setStatusBarColor(Color.TRANSPARENT);
+        }
+
+        // Set shadow colour of store text so even same color on same color would be readable
+        storeName.setShadowLayer(1, 1, 1, backgroundNeedsDarkIcons ? Color.BLACK : Color.WHITE);
+
+        if(format != null)
+        {
+            findViewById(R.id.barcode).setVisibility(View.VISIBLE);
+            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()
                         {
-                            if (Build.VERSION.SDK_INT < 16)
-                            {
-                                barcodeImage.getViewTreeObserver().removeGlobalOnLayoutListener(this);
-                            }
-                            else
+                            @Override
+                            public void onGlobalLayout()
                             {
                                 barcodeImage.getViewTreeObserver().removeOnGlobalLayoutListener(this);
-                            }
 
-                            Log.d(TAG, "ImageView size now known");
-                            new BarcodeImageWriterTask(barcodeImage, cardIdString, format).execute();
-                        }
-                    });
+                                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();
+            }
         }
         else
         {
-            Log.d(TAG, "ImageView size known known, creating barcode");
-            new BarcodeImageWriterTask(barcodeImage, cardIdString, format).execute();
+            findViewById(R.id.barcode).setVisibility(View.GONE);
         }
 
+        FloatingActionButton editButton = findViewById(R.id.fabEdit);
+        editButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Intent intent = new Intent(getApplicationContext(), LoyaltyCardEditActivity.class);
+                Bundle bundle = new Bundle();
+                bundle.putInt("id", loyaltyCardId);
+                bundle.putBoolean("update", true);
+                intent.putExtras(bundle);
+                startActivity(intent);
+                finish();
+            }
+        });
+    }
+
+    @Override
+    public void onBackPressed() {
+        if (barcodeIsFullscreen)
+        {
+            setFullscreen(false);
+            return;
+        }
+
+        super.onBackPressed();
+        return;
     }
 
     @Override
@@ -198,7 +316,23 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
     {
         getMenuInflater().inflate(R.menu.card_view_menu, menu);
 
-        rotationEnabled = true;
+        // Always calculate lockscreen icon, it may need a black color
+        boolean lockBarcodeScreenOrientation = settings.getLockBarcodeScreenOrientation();
+        MenuItem item = menu.findItem(R.id.action_lock_unlock);
+        setOrientatonLock(item, lockBarcodeScreenOrientation);
+        if(lockBarcodeScreenOrientation)
+        {
+            item.setVisible(false);
+        }
+
+        if(loyaltyCard != null && !loyaltyCard.extras.getAllValues(new String[]{Locale.getDefault().getLanguage(), "en", ""}).isEmpty())
+        {
+            MenuItem extraItem = menu.findItem(R.id.action_view_extras);
+            extraItem.setIcon(getIcon(R.drawable.ic_info_outline_white, backgroundNeedsDarkIcons));
+            extraItem.setVisible(true);
+        }
+
+        menu.findItem(R.id.action_share).setIcon(getIcon(R.drawable.ic_share_white, backgroundNeedsDarkIcons));
 
         return super.onCreateOptionsMenu(menu);
     }
@@ -214,33 +348,149 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
                 finish();
                 break;
 
-            case R.id.action_edit:
-                Intent intent = new Intent(getApplicationContext(), LoyaltyCardEditActivity.class);
-                Bundle bundle = new Bundle();
-                bundle.putInt("id", loyaltyCardId);
-                bundle.putBoolean("update", true);
-                intent.putExtras(bundle);
-                startActivity(intent);
-                finish();
+            case R.id.action_share:
+                importURIHelper.startShareIntent(loyaltyCard);
                 return true;
 
             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);
+                    setOrientatonLock(item, true);
                 }
                 else
                 {
-                    item.setIcon(R.drawable.ic_lock_open_white_24dp);
-                    item.setTitle(R.string.lockScreen);
-                    setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_SENSOR);
+                    setOrientatonLock(item, false);
                 }
                 rotationEnabled = !rotationEnabled;
                 return true;
+
+            case R.id.action_view_extras:
+                try
+                {
+                    displayExtrasDialog();
+                }
+                catch (JSONException ex)
+                {
+                    Toast.makeText(this, R.string.failedShowingExtras, Toast.LENGTH_LONG).show();
+                    finish();
+                }
+                return true;
         }
 
         return super.onOptionsItemSelected(item);
     }
-}
+
+    private void setOrientatonLock(MenuItem item, boolean lock)
+    {
+        if(lock)
+        {
+
+            item.setIcon(getIcon(R.drawable.ic_lock_outline_white_24dp, backgroundNeedsDarkIcons));
+            item.setTitle(R.string.unlockScreen);
+            setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_NOSENSOR);
+        }
+        else
+        {
+            item.setIcon(getIcon(R.drawable.ic_lock_open_white_24dp, backgroundNeedsDarkIcons));
+            item.setTitle(R.string.lockScreen);
+            setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_SENSOR);
+        }
+    }
+
+    private void displayExtrasDialog() throws JSONException
+    {
+        StringBuilder items = new StringBuilder();
+
+        HashMap<String, String> extraValues = loyaltyCard.extras.getAllValues(new String[]{Locale.getDefault().getLanguage(), "en", ""});
+        for(Map.Entry<String, String> entry : extraValues.entrySet())
+        {
+            items.append(entry.getValue() + "\n");
+        }
+
+        new AlertDialog.Builder(this)
+            .setMessage(items.toString())
+            .setCancelable(true)
+            .setPositiveButton(R.string.ok, new DialogInterface.OnClickListener()
+            {
+                public void onClick(DialogInterface dialog, int which)
+                {
+                    dialog.dismiss();
+                }
+            })
+            .show();
+    }
+
+    /**
+     * When enabled, hides the status bar and moves the barcode to the top of the screen.
+     *
+     * The purpose of this function is to make sure the barcode can be scanned from the phone
+     * by machines which offer no space to insert the complete device.
+     */
+    private void setFullscreen(boolean enable)
+    {
+        ActionBar actionBar = getSupportActionBar();
+        if(enable && !barcodeIsFullscreen)
+        {
+            // Save previous barcodeImage state
+            barcodeImageState = barcodeImage.getLayoutParams();
+
+            // Hide actionbar
+            if(actionBar != null)
+            {
+                actionBar.hide();
+            }
+
+            // Hide collapsingToolbar
+            collapsingToolbarLayout.setVisibility(View.GONE);
+
+            // Set Android to fullscreen mode
+            getWindow().getDecorView().setSystemUiVisibility(
+                getWindow().getDecorView().getSystemUiVisibility()
+                | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY
+                | View.SYSTEM_UI_FLAG_FULLSCREEN
+            );
+
+            // Make barcode take all space
+            barcodeImage.setLayoutParams(new ConstraintLayout.LayoutParams(
+                ConstraintLayout.LayoutParams.MATCH_PARENT,
+                ConstraintLayout.LayoutParams.MATCH_PARENT
+            ));
+
+            // Move barcode to top
+            barcodeImage.setScaleType(ImageView.ScaleType.FIT_START);
+
+            // Prevent centering
+            barcodeImage.setAdjustViewBounds(false);
+
+            // Set current state
+            barcodeIsFullscreen = true;
+        }
+        else if(!enable && barcodeIsFullscreen)
+        {
+            // Show actionbar
+            if(actionBar != null)
+            {
+                actionBar.show();
+            }
+
+            // Show collapsingToolbar
+            collapsingToolbarLayout.setVisibility(View.VISIBLE);
+
+            // Unset fullscreen mode
+            getWindow().getDecorView().setSystemUiVisibility(
+                getWindow().getDecorView().getSystemUiVisibility()
+                & ~View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY
+                & ~View.SYSTEM_UI_FLAG_FULLSCREEN
+            );
+
+            // Turn barcode back to normal
+            barcodeImage.setLayoutParams(barcodeImageState);
+
+            // Fix barcode centering
+            barcodeImage.setAdjustViewBounds(true);
+
+            // Set current state
+            barcodeIsFullscreen = false;
+        }
+    }
+}

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

@@ -1,17 +1,21 @@
 package protect.card_locker;
 
+import android.app.SearchManager;
 import android.content.ClipData;
+import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.ClipboardManager;
 import android.content.SharedPreferences;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
+import android.content.res.Configuration;
 import android.database.Cursor;
 import android.os.Bundle;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.SearchView;
+import androidx.appcompat.widget.Toolbar;
 import android.util.Log;
 import android.view.ContextMenu;
 import android.view.Menu;
@@ -24,17 +28,21 @@ import android.widget.ListView;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
 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";
+    private static final String TAG = "Catima";
+    private static final int MAIN_REQUEST_CODE = 1;
+
+    private Menu menu;
+    protected String filter = "";
 
     @Override
     protected void onCreate(Bundle savedInstanceState)
@@ -44,41 +52,102 @@ public class MainActivity extends AppCompatActivity
         Toolbar toolbar = findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
 
-        updateLoyaltyCardList();
+        updateLoyaltyCardList("");
+    }
 
-        SharedPreferences prefs = getSharedPreferences("protect.card_locker", MODE_PRIVATE);
-        if (prefs.getBoolean("firstrun", true)) {
-            startIntro();
-            prefs.edit().putBoolean("firstrun", false).commit();
+    @Override
+    protected void onResume() {
+        super.onResume();
+
+        if (menu != null)
+        {
+            SearchView searchView = (SearchView) menu.findItem(R.id.action_search).getActionView();
+
+            if (!searchView.isIconified()) {
+                filter = searchView.getQuery().toString();
+            }
+        }
+
+        updateLoyaltyCardList(filter);
+
+        FloatingActionButton addButton = findViewById(R.id.fabAdd);
+        addButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Intent i = new Intent(getApplicationContext(), LoyaltyCardEditActivity.class);
+                startActivityForResult(i, MAIN_REQUEST_CODE);
+            }
+        });
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+
+        if (requestCode == MAIN_REQUEST_CODE)
+        {
+            // We're coming back from another view so clear the search
+            // We only do this now to prevent a flash of all entries right after picking one
+            filter = "";
+            if (menu != null)
+            {
+                MenuItem searchItem = menu.findItem(R.id.action_search);
+                searchItem.collapseActionView();
+            }
+
+            // In case the theme changed
+            recreate();
         }
     }
 
     @Override
-    protected void onResume()
-    {
-        super.onResume();
+    public void onBackPressed() {
+        if (menu == null)
+        {
+            super.onBackPressed();
+            return;
+        }
 
-        updateLoyaltyCardList();
+        SearchView searchView = (SearchView) menu.findItem(R.id.action_search).getActionView();
+
+        if (!searchView.isIconified()) {
+            searchView.setIconified(true);
+        } else {
+            super.onBackPressed();
+        }
     }
 
-    private void updateLoyaltyCardList()
+    private void updateLoyaltyCardList(String filterText)
     {
         final ListView cardList = findViewById(R.id.list);
         final TextView helpText = findViewById(R.id.helpText);
+        final TextView noMatchingCardsText = findViewById(R.id.noMatchingCardsText);
         final DBHelper db = new DBHelper(this);
 
         if(db.getLoyaltyCardCount() > 0)
         {
+            // We want the cardList to be visible regardless of the filtered match count
+            // to ensure that the noMatchingCardsText doesn't end up being shown below
+            // the keyboard
             cardList.setVisibility(View.VISIBLE);
             helpText.setVisibility(View.GONE);
+            if(db.getLoyaltyCardCount(filterText) > 0)
+            {
+                noMatchingCardsText.setVisibility(View.GONE);
+            }
+            else
+            {
+                noMatchingCardsText.setVisibility(View.VISIBLE);
+            }
         }
         else
         {
             cardList.setVisibility(View.GONE);
             helpText.setVisibility(View.VISIBLE);
+            noMatchingCardsText.setVisibility(View.GONE);
         }
 
-        Cursor cardCursor = db.getLoyaltyCardCursor();
+        Cursor cardCursor = db.getLoyaltyCardCursor(filterText);
 
         final LoyaltyCardCursorAdapter adapter = new LoyaltyCardCursorAdapter(this, cardCursor);
         cardList.setAdapter(adapter);
@@ -101,7 +170,7 @@ public class MainActivity extends AppCompatActivity
 
                 ShortcutHelper.updateShortcuts(MainActivity.this, loyaltyCard, i);
 
-                startActivity(i);
+                startActivityForResult(i, MAIN_REQUEST_CODE);
             }
         });
     }
@@ -126,14 +195,26 @@ public class MainActivity extends AppCompatActivity
         Cursor cardCursor = (Cursor)listView.getItemAtPosition(info.position);
         LoyaltyCard card = LoyaltyCard.toLoyaltyCard(cardCursor);
 
-        if(card != null && item.getItemId() == R.id.action_clipboard)
+        if(card != null)
         {
-            ClipboardManager clipboard = (ClipboardManager) getSystemService(CLIPBOARD_SERVICE);
-            ClipData clip = ClipData.newPlainText(card.store, card.cardId);
-            clipboard.setPrimaryClip(clip);
+            if(item.getItemId() == R.id.action_clipboard)
+            {
+                ClipboardManager clipboard = (ClipboardManager) getSystemService(CLIPBOARD_SERVICE);
+                ClipData clip = ClipData.newPlainText(card.store, card.cardId);
+                clipboard.setPrimaryClip(clip);
 
-            Toast.makeText(this, R.string.copy_to_clipboard_toast, Toast.LENGTH_LONG).show();
-            return true;
+                Toast.makeText(this, R.string.copy_to_clipboard_toast, Toast.LENGTH_LONG).show();
+                return true;
+            }
+            else if(item.getItemId() == R.id.action_share)
+            {
+                final ImportURIHelper importURIHelper = new ImportURIHelper(this);
+                if(importURIHelper.startShareIntent(card))
+                {
+                    Toast.makeText(this, R.string.failedSharingCard, Toast.LENGTH_LONG).show();
+                }
+                return true;
+            }
         }
 
         return super.onContextItemSelected(item);
@@ -142,7 +223,39 @@ public class MainActivity extends AppCompatActivity
     @Override
     public boolean onCreateOptionsMenu(Menu menu)
     {
+        this.menu = menu;
+
         getMenuInflater().inflate(R.menu.main_menu, menu);
+
+        SearchManager searchManager = (SearchManager) getSystemService(Context.SEARCH_SERVICE);
+        if (searchManager != null) {
+            SearchView searchView = (SearchView) menu.findItem(R.id.action_search).getActionView();
+            searchView.setSearchableInfo(searchManager.getSearchableInfo(getComponentName()));
+            searchView.setSubmitButtonEnabled(false);
+
+            searchView.setOnCloseListener(new SearchView.OnCloseListener() {
+                @Override
+                public boolean onClose() {
+                    invalidateOptionsMenu();
+                    return false;
+                }
+            });
+
+            searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
+                @Override
+                public boolean onQueryTextSubmit(String query) {
+                    return false;
+                }
+
+                @Override
+                public boolean onQueryTextChange(String newText) {
+                    filter = newText;
+                    updateLoyaltyCardList(newText);
+                    return true;
+                }
+            });
+        }
+
         return super.onCreateOptionsMenu(menu);
     }
 
@@ -151,30 +264,17 @@ public class MainActivity extends AppCompatActivity
     {
         int id = item.getItemId();
 
-        if (id == R.id.action_add)
-        {
-            Intent i = new Intent(getApplicationContext(), LoyaltyCardEditActivity.class);
-            startActivity(i);
-            return true;
-        }
-
         if(id == R.id.action_import_export)
         {
             Intent i = new Intent(getApplicationContext(), ImportExportActivity.class);
-            startActivity(i);
+            startActivityForResult(i, MAIN_REQUEST_CODE);
             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();
+            startActivityForResult(i, MAIN_REQUEST_CODE);
             return true;
         }
 
@@ -233,9 +333,19 @@ public class MainActivity extends AppCompatActivity
         }
 
         WebView wv = new WebView(this);
+
+        // Set CSS for dark mode if dark mode
+        String css = "";
+        Configuration config = getResources().getConfiguration();
+        int currentNightMode = config.uiMode & Configuration.UI_MODE_NIGHT_MASK;
+        if(currentNightMode == Configuration.UI_MODE_NIGHT_YES)
+        {
+            css = "<style>body {color:white; background-color:black;}</style>";
+        }
+
         String html =
             "<meta http-equiv=\"content-type\" content=\"text/html; charset=utf-8\" />" +
-            "<img src=\"file:///android_res/mipmap/ic_launcher.png\" alt=\"" + appName + "\"/>" +
+            css +
             "<h1>" +
             String.format(getString(R.string.about_title_fmt),
                     "<a href=\"" + getString(R.string.app_webpage_url)) + "\">" +
@@ -248,10 +358,12 @@ public class MainActivity extends AppCompatActivity
             "</p><p>" +
             String.format(getString(R.string.app_revision_fmt),
                     "<a href=\"" + getString(R.string.app_revision_url) + "\">" +
-                            getString(R.string.app_revision_url) +
+                            "GitHub" +
                             "</a>") +
             "</p><hr/><p>" +
             String.format(getString(R.string.app_copyright_fmt), year) +
+            "</p><p>" +
+            getString(R.string.app_copyright_old) +
             "</p><hr/><p>" +
             getString(R.string.app_license) +
             "</p><hr/><p>" +
@@ -272,10 +384,4 @@ public class MainActivity extends AppCompatActivity
             })
             .show();
     }
-
-    private void startIntro()
-    {
-        Intent intent = new Intent(this, IntroActivity.class);
-        startActivity(intent);
-    }
 }

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

@@ -7,7 +7,7 @@ import java.io.OutputStreamWriter;
 
 public class MultiFormatExporter
 {
-    private static final String TAG = "LoyaltyCardLocker";
+    private static final String TAG = "Catima";
 
     /**
      * Attempts to export data to the output stream in the

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

@@ -7,7 +7,7 @@ import java.io.InputStreamReader;
 
 public class MultiFormatImporter
 {
-    private static final String TAG = "LoyaltyCardLocker";
+    private static final String TAG = "Catima";
 
     /**
      * Attempts to import data from the input stream of the

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

@@ -0,0 +1,319 @@
+package protect.card_locker;
+
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.Color;
+import android.net.Uri;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.google.zxing.BarcodeFormat;
+
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
+
+public class PkpassImporter {
+    private Context context;
+
+    private Bitmap icon = null;
+
+    private HashMap<String, HashMap<String, String>> translations = new HashMap<>();
+
+    public PkpassImporter(Context context)
+    {
+        this.context = context;
+    }
+
+    private ByteArrayOutputStream readZipInputStream(ZipInputStream zipInputStream) throws IOException
+    {
+        byte[] buffer = new byte[2048];
+        ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+        int size;
+
+        while((size = zipInputStream.read(buffer, 0, buffer.length)) != -1)
+        {
+            byteArrayOutputStream.write(buffer, 0, size);
+        }
+
+        return byteArrayOutputStream;
+    }
+
+    private void loadBitmap(ByteArrayOutputStream byteArrayOutputStream)
+    {
+        byte[] bytes = byteArrayOutputStream.toByteArray();
+        // Only keep the largest icon
+        if(icon != null && bytes.length < icon.getByteCount())
+        {
+            return;
+        }
+        icon = BitmapFactory.decodeByteArray(bytes, 0, bytes.length);
+    }
+
+    // FIXME: Probably very fragile
+    private void parseTranslations(String language, String iOSTranslationFileContent)
+    {
+        if(!translations.containsKey(language))
+        {
+            translations.put(language, new HashMap<String, String>());
+        }
+
+        HashMap<String, String> values = translations.get(language);
+
+        for (String entry : iOSTranslationFileContent.trim().split(";"))
+        {
+            String[] parts = entry.split(" = ", 2);
+
+            // Remove all spaces around the key and value
+            String key = parts[0].trim();
+            String value = parts[1].trim();
+
+            // iOS .string files quote everything in double quotes, we don't need to keep those
+            values.put(key.substring(1, key.length()-1), value.substring(1, value.length()-1));
+        }
+
+        translations.put(language, values);
+    }
+
+    private ExtrasHelper appendData(ExtrasHelper extrasHelper, JSONObject pkpassJSON, String styleKey, String arrayName) throws JSONException
+    {
+        // https://developer.apple.com/library/archive/documentation/UserExperience/Reference/PassKit_Bundle/Chapters/FieldDictionary.html#//apple_ref/doc/uid/TP40012026-CH4-SW1
+
+        JSONArray fields;
+        // These are all optional, so don't throw an exception if they don't exist
+        try
+        {
+            fields = pkpassJSON.getJSONObject(styleKey).getJSONArray(arrayName);
+        }
+        catch (JSONException ex)
+        {
+            return extrasHelper;
+        }
+
+        for(int i = 0; i < fields.length(); i++)
+        {
+            JSONObject fieldObject = fields.getJSONObject(i);
+            String key = fieldObject.getString("key");
+            String label = fieldObject.getString("label");
+            String value = fieldObject.getString("value");
+
+            // Label is optional
+            if(label == null)
+            {
+                label = key;
+            }
+
+            // Add the completely untranslated stuff as fallback
+            String formattedUntranslatedValue = value;
+            if(!label.isEmpty())
+            {
+                formattedUntranslatedValue = label + ": " + value;
+            }
+            extrasHelper.addLanguageValue("", key, formattedUntranslatedValue);
+
+            // Try to find translations
+            for(Map.Entry<String, HashMap<String, String>> language : translations.entrySet())
+            {
+                String translatedLabel = label;
+                if(language.getValue().containsKey(label))
+                {
+                    translatedLabel = language.getValue().get(label);
+                }
+
+                String translatedValue = value;
+                if(language.getValue().containsKey(value))
+                {
+                    translatedValue = language.getValue().get(value);
+                }
+
+                String formattedValue = translatedValue;
+
+                if(!translatedLabel.isEmpty())
+                {
+                    formattedValue = translatedLabel + ": " + translatedValue;
+                }
+
+                extrasHelper.addLanguageValue(language.getKey(), key, formattedValue);
+            }
+        }
+
+        return extrasHelper;
+    }
+
+    public LoyaltyCard fromURI(Uri uri) throws IOException, JSONException {
+        return fromInputStream(context.getContentResolver().openInputStream(uri));
+    }
+
+    public LoyaltyCard fromInputStream(InputStream inputStream) throws IOException, JSONException
+    {
+        String passJSONString = null;
+
+        ZipInputStream zipInputStream = new ZipInputStream(inputStream);
+
+        ZipEntry entry;
+
+        // We first want to parse the translations
+        while((entry = zipInputStream.getNextEntry()) != null) {
+            if(entry.getName().endsWith("pass.strings"))
+            {
+                // Example: en.lproj/pass.strings
+                String language = entry.getName().substring(0, entry.getName().indexOf("."));
+
+                parseTranslations(language, readZipInputStream(zipInputStream).toString("UTF-8"));
+            }
+            else if(entry.getName().equals("pass.json"))
+            {
+                passJSONString = readZipInputStream(zipInputStream).toString("UTF-8");
+            }
+            else if(entry.getName().equals("icon.png") || entry.getName().equals("icon@2x.png"))
+            {
+                loadBitmap(readZipInputStream(zipInputStream));
+            }
+        }
+
+        if(passJSONString == null)
+        {
+            return null;
+        }
+
+        return fromPassJSON(new JSONObject(passJSONString));
+    }
+
+    public LoyaltyCard fromPassJSON(JSONObject json) throws JSONException
+    {
+        String store = json.getString("organizationName");
+        String note = json.getString("description");
+
+        // https://developer.apple.com/library/archive/documentation/UserExperience/Reference/PassKit_Bundle/Chapters/TopLevel.html#//apple_ref/doc/uid/TP40012026-CH2-SW1
+        // barcodes is the new field
+        // barcode is deprecated, but used on old iOS versions, so we do fall back to it
+        JSONObject barcode = null;
+        JSONArray barcodes = null;
+
+        try {
+            barcodes = json.getJSONArray("barcodes");
+        } catch (JSONException ex) {
+        }
+
+        if (barcodes != null) {
+            barcode = barcodes.getJSONObject(0);
+        } else {
+            barcode = json.getJSONObject("barcode");
+        }
+
+        if (barcode == null) {
+            return null;
+        }
+
+        String cardId = barcode.getString("message");
+
+        // https://developer.apple.com/library/archive/documentation/UserExperience/Reference/PassKit_Bundle/Chapters/LowerLevel.html#//apple_ref/doc/uid/TP40012026-CH3-SW3
+        // Required. Barcode format. For the barcode dictionary, you can use only the following values: PKBarcodeFormatQR, PKBarcodeFormatPDF417, or PKBarcodeFormatAztec. For dictionaries in the barcodes array, you may also use PKBarcodeFormatCode128.
+        ImmutableMap<String, String> supportedBarcodeTypes = ImmutableMap.<String, String>builder()
+                .put("PKBarcodeFormatQR", BarcodeFormat.QR_CODE.name())
+                .put("PKBarcodeFormatPDF417", BarcodeFormat.PDF_417.name())
+                .put("PKBarcodeFormatAztec", BarcodeFormat.AZTEC.name())
+                .put("PKBarcodeFormatCode128", BarcodeFormat.CODE_128.name())
+                .build();
+
+        String barcodeType = supportedBarcodeTypes.get(barcode.getString("format"));
+
+        if(barcodeType == null)
+        {
+            return null;
+        }
+
+        // Prepare to parse colors
+        Pattern rgbPattern = Pattern.compile("^rgb\\(\\s*(\\d{1,3})\\s*,\\s*(\\d{1,3})\\s*,\\s*(\\d{1,3})\\s*\\)$");
+
+        // Optional. Background color of the pass, specified as an CSS-style RGB triple. For example, rgb(23, 187, 82).
+        Integer headerColor = null;
+        Matcher headerColorMatcher = rgbPattern.matcher(json.getString("backgroundColor"));
+        if(headerColorMatcher.find())
+        {
+            headerColor = Color.rgb(
+                    Integer.parseInt(headerColorMatcher.group(1)),
+                    Integer.parseInt(headerColorMatcher.group(2)),
+                    Integer.parseInt(headerColorMatcher.group(3)));
+        }
+        if(headerColor == null)
+        {
+            // Maybe they violate the spec, let's parse it in a format Android understands
+            // Necessary for at least Eurowings
+            try
+            {
+                headerColor = Color.parseColor(json.getString("backgroundColor"));
+            }
+            catch (IllegalArgumentException ex) {}
+        }
+
+
+        // Optional. Color of the label text, specified as a CSS-style RGB triple. For example, rgb(255, 255, 255).
+        Integer headerTextColor = null;
+        Matcher headerTextColorMatcher = rgbPattern.matcher(json.getString("labelColor"));
+        if(headerTextColorMatcher.find())
+        {
+            headerTextColor = Color.rgb(
+                Integer.parseInt(headerTextColorMatcher.group(1)),
+                Integer.parseInt(headerTextColorMatcher.group(2)),
+                Integer.parseInt(headerTextColorMatcher.group(3)));
+        }
+        if(headerTextColor == null)
+        {
+            // Maybe they violate the spec, let's parse it in a format Android understands
+            // Necessary for at least Eurowings
+            try
+            {
+                headerTextColor = Color.parseColor(json.getString("labelColor"));
+            }
+            catch (IllegalArgumentException ex) {}
+        }
+
+        // https://developer.apple.com/library/archive/documentation/UserExperience/Reference/PassKit_Bundle/Chapters/TopLevel.html#//apple_ref/doc/uid/TP40012026-CH2-SW6
+        // There needs to be exactly one style key
+
+        String styleKey = null;
+        ImmutableList<String> possibleStyleKeys = ImmutableList.<String>builder()
+                .add("boardingPass")
+                .add("coupon")
+                .add("eventTicket")
+                .add("generic")
+                .add("storeCard")
+                .build();
+        for(int i = 0; i < possibleStyleKeys.size(); i++)
+        {
+            String possibleStyleKey = possibleStyleKeys.get(i);
+            if(json.has(possibleStyleKey))
+            {
+                styleKey = possibleStyleKey;
+                break;
+            }
+        }
+
+        if(styleKey == null)
+        {
+            return null;
+        }
+
+        // https://developer.apple.com/library/archive/documentation/UserExperience/Reference/PassKit_Bundle/Chapters/LowerLevel.html#//apple_ref/doc/uid/TP40012026-CH3-SW14
+        ExtrasHelper extras = new ExtrasHelper();
+        extras = appendData(extras, json, styleKey, "headerFields");
+        extras = appendData(extras, json, styleKey, "primaryFields");
+        extras = appendData(extras, json, styleKey, "secondaryFields");
+        extras = appendData(extras, json, styleKey, "auxiliaryFields");
+        extras = appendData(extras, json, styleKey, "backFields");
+
+        return new LoyaltyCard(-1, store, note, cardId, barcodeType, headerColor, headerTextColor, icon, extras);
+    }
+}

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

@@ -1,33 +0,0 @@
-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

@@ -1,19 +0,0 @@
-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,20 +0,0 @@
-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 IntroSlide2 extends Fragment
-{
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState)
-    {
-        View v = inflater.inflate(R.layout.intro2_layout, container, false);
-        return v;
-    }
-}

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

@@ -1,19 +0,0 @@
-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

@@ -1,19 +0,0 @@
-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

@@ -1,19 +0,0 @@
-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

@@ -1,19 +0,0 @@
-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

@@ -3,8 +3,9 @@ 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 androidx.annotation.IntegerRes;
+import androidx.annotation.StringRes;
+import androidx.appcompat.app.AppCompatDelegate;
 
 import protect.card_locker.R;
 
@@ -29,11 +30,37 @@ public class Settings
         return context.getResources().getInteger(resId);
     }
 
+    private String getString(@StringRes int keyId, String defaultValue)
+    {
+        return settings.getString(getResString(keyId), defaultValue);
+    }
+
     private int getInt(@StringRes int keyId, @IntegerRes int defaultId)
     {
         return settings.getInt(getResString(keyId), getResInt(defaultId));
     }
 
+    private boolean getBoolean(@StringRes int keyId, boolean defaultValue)
+    {
+        return settings.getBoolean(getResString(keyId), defaultValue);
+    }
+
+    public int getTheme()
+    {
+        String value = getString(R.string.settings_key_theme, getResString(R.string.settings_key_system_theme));
+
+        if(value.equals(getResString(R.string.settings_key_light_theme)))
+        {
+            return AppCompatDelegate.MODE_NIGHT_NO;
+        }
+        else if(value.equals(getResString(R.string.settings_key_dark_theme)))
+        {
+            return AppCompatDelegate.MODE_NIGHT_YES;
+        }
+
+        return AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM;
+    }
+
     public int getCardTitleListFontSize()
     {
         return getInt(R.string.settings_key_card_title_list_font_size, R.integer.settings_card_title_list_font_size_sp);
@@ -58,4 +85,14 @@ public class Settings
     {
         return getInt(R.string.settings_key_card_note_font_size, R.integer.settings_card_note_font_size_sp);
     }
+
+    public boolean useMaxBrightnessDisplayingBarcode()
+    {
+        return getBoolean(R.string.settings_key_display_barcode_max_brightness, true);
+    }
+
+    public boolean getLockBarcodeScreenOrientation()
+    {
+        return getBoolean(R.string.settings_key_lock_barcode_orientation, false);
+    }
 }

app/src/main/java/protect/card_locker/preferences/SettingsActivity.java

@@ -1,9 +1,11 @@
 package protect.card_locker.preferences;
 
 import android.os.Bundle;
+import android.preference.Preference;
 import android.preference.PreferenceFragment;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatDelegate;
 import android.view.MenuItem;
 
 import protect.card_locker.R;
@@ -44,12 +46,35 @@ public class SettingsActivity extends AppCompatActivity
     public static class SettingsFragment extends PreferenceFragment
     {
         @Override
-        public void onCreate(Bundle savedInstanceState)
+        public void onCreate(final Bundle savedInstanceState)
         {
             super.onCreate(savedInstanceState);
 
             // Load the preferences from an XML resource
             addPreferencesFromResource(R.xml.preferences);
+
+            findPreference(getResources().getString(R.string.settings_key_theme)).setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener()
+            {
+                @Override
+                public boolean onPreferenceChange(Preference preference, Object o)
+                {
+                    if(o.toString().equals(getResources().getString(R.string.settings_key_light_theme)))
+                    {
+                        AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
+                    }
+                    else if(o.toString().equals(getResources().getString(R.string.settings_key_dark_theme)))
+                    {
+                        AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
+                    }
+                    else
+                    {
+                        AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM);
+                    }
+
+                    getActivity().recreate();
+                    return true;
+                }
+            });
         }
     }
 }

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

@@ -1,23 +1,23 @@
 <?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:layout_width="match_parent"
-                                                 android:layout_height="match_parent"
-                                                 android:fitsSystemWindows="true">
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                                                     xmlns:app="http://schemas.android.com/apk/res-auto"
+                                                     android:layout_width="match_parent"
+                                                     android:layout_height="match_parent"
+                                                     android:fitsSystemWindows="true">
 
-    <android.support.design.widget.AppBarLayout
+    <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:theme="@style/AppTheme.AppBarOverlay">
 
-        <android.support.v7.widget.Toolbar
+        <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
             android:background="?attr/colorPrimary"
             app:popupTheme="@style/AppTheme.PopupOverlay" />
 
-    </android.support.design.widget.AppBarLayout>
+    </com.google.android.material.appbar.AppBarLayout>
 
     <ScrollView
         android:layout_width="fill_parent"
@@ -64,142 +64,243 @@
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:id="@+id/barcodesLayout"/>
-            <LinearLayout android:orientation="horizontal"
+            <Button
+                android:id="@+id/noBarcode"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/barcodeNoBarcode"
+                android:enabled="false" />
+            <LinearLayout android:orientation="vertical"
                           android:padding="10.0dp"
                           android:layout_width="fill_parent"
                           android:layout_height="wrap_content">
                 <ImageView
-                    android:layout_width="0dp"
+                    android:layout_width="match_parent"
                     android:layout_height="@dimen/barcode_disp_height"
                     android:layout_gravity="center_horizontal"
                     android:id="@+id/aztecBarcode"
                     android:contentDescription="@string/barcodeImageDescription"
                     android:layout_weight="1.0"/>
+                <TextView
+                    android:id="@+id/aztecBarcodeText"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="10.0dip"
+                    android:gravity="center"
+                    android:textSize="@dimen/text_size_medium"
+                    android:textStyle="bold"
+                    android:layout_weight="1.0" />
             </LinearLayout>
-            <LinearLayout android:orientation="horizontal"
+            <LinearLayout android:orientation="vertical"
                           android:padding="10.0dp"
                           android:layout_width="fill_parent"
                           android:layout_height="wrap_content">
                 <ImageView
-                    android:layout_width="0dp"
+                    android:layout_width="match_parent"
                     android:layout_height="@dimen/barcode_disp_height"
                     android:layout_gravity="center_horizontal"
                     android:id="@+id/code39Barcode"
                     android:contentDescription="@string/barcodeImageDescription"
                     android:layout_weight="1.0"/>
+                <TextView
+                    android:id="@+id/code39BarcodeText"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="10.0dip"
+                    android:gravity="center"
+                    android:textSize="@dimen/text_size_medium"
+                    android:textStyle="bold"
+                    android:layout_weight="1.0" />
             </LinearLayout>
-            <LinearLayout android:orientation="horizontal"
+            <LinearLayout android:orientation="vertical"
                           android:padding="10.0dp"
                           android:layout_width="fill_parent"
                           android:layout_height="wrap_content">
                 <ImageView
-                    android:layout_width="0dp"
+                    android:layout_width="match_parent"
                     android:layout_height="@dimen/barcode_disp_height"
                     android:layout_gravity="center_horizontal"
                     android:id="@+id/code128Barcode"
                     android:contentDescription="@string/barcodeImageDescription"
                     android:layout_weight="1.0"/>
+                <TextView
+                    android:id="@+id/code128BarcodeText"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="10.0dip"
+                    android:gravity="center"
+                    android:textSize="@dimen/text_size_medium"
+                    android:textStyle="bold"
+                    android:layout_weight="1.0" />
             </LinearLayout>
-            <LinearLayout android:orientation="horizontal"
+            <LinearLayout android:orientation="vertical"
                           android:padding="10.0dp"
                           android:layout_width="fill_parent"
                           android:layout_height="wrap_content">
                 <ImageView
-                    android:layout_width="0dp"
+                    android:layout_width="match_parent"
                     android:layout_height="@dimen/barcode_disp_height"
                     android:layout_gravity="center_horizontal"
                     android:id="@+id/codabarBarcode"
                     android:contentDescription="@string/barcodeImageDescription"
                     android:layout_weight="1.0"/>
+                <TextView
+                    android:id="@+id/codabarBarcodeText"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="10.0dip"
+                    android:gravity="center"
+                    android:textSize="@dimen/text_size_medium"
+                    android:textStyle="bold"
+                    android:layout_weight="1.0" />
             </LinearLayout>
-            <LinearLayout android:orientation="horizontal"
+            <LinearLayout android:orientation="vertical"
                           android:padding="10.0dp"
                           android:layout_width="fill_parent"
                           android:layout_height="wrap_content">
                 <ImageView
-                    android:layout_width="0dp"
+                    android:layout_width="match_parent"
                     android:layout_height="@dimen/barcode_disp_height"
                     android:layout_gravity="center_horizontal"
                     android:id="@+id/datamatrixBarcode"
                     android:contentDescription="@string/barcodeImageDescription"
                     android:layout_weight="1.0"/>
+                <TextView
+                    android:id="@+id/datamatrixBarcodeText"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="10.0dip"
+                    android:gravity="center"
+                    android:textSize="@dimen/text_size_medium"
+                    android:textStyle="bold"
+                    android:layout_weight="1.0" />
             </LinearLayout>
-            <LinearLayout android:orientation="horizontal"
+            <LinearLayout android:orientation="vertical"
                           android:padding="10.0dp"
                           android:layout_width="fill_parent"
                           android:layout_height="wrap_content">
                 <ImageView
-                    android:layout_width="0dp"
+                    android:layout_width="match_parent"
                     android:layout_height="@dimen/barcode_disp_height"
                     android:layout_gravity="center_horizontal"
                     android:id="@+id/ean8Barcode"
                     android:contentDescription="@string/barcodeImageDescription"
                     android:layout_weight="1.0"/>
+                <TextView
+                    android:id="@+id/ean8BarcodeText"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="10.0dip"
+                    android:gravity="center"
+                    android:textSize="@dimen/text_size_medium"
+                    android:textStyle="bold"
+                    android:layout_weight="1.0" />
             </LinearLayout>
-            <LinearLayout android:orientation="horizontal"
+            <LinearLayout android:orientation="vertical"
                           android:padding="10.0dp"
                           android:layout_width="fill_parent"
                           android:layout_height="wrap_content">
                 <ImageView
-                    android:layout_width="0dp"
+                    android:layout_width="match_parent"
                     android:layout_height="@dimen/barcode_disp_height"
                     android:layout_gravity="center_horizontal"
                     android:id="@+id/ean13Barcode"
                     android:contentDescription="@string/barcodeImageDescription"
                     android:layout_weight="1.0"/>
+                <TextView
+                    android:id="@+id/ean13BarcodeText"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="10.0dip"
+                    android:gravity="center"
+                    android:textSize="@dimen/text_size_medium"
+                    android:textStyle="bold"
+                    android:layout_weight="1.0" />
             </LinearLayout>
-            <LinearLayout android:orientation="horizontal"
+            <LinearLayout android:orientation="vertical"
                           android:padding="10.0dp"
                           android:layout_width="fill_parent"
                           android:layout_height="wrap_content">
                 <ImageView
-                    android:layout_width="0dp"
+                    android:layout_width="match_parent"
                     android:layout_height="@dimen/barcode_disp_height"
                     android:layout_gravity="center_horizontal"
                     android:id="@+id/itfBarcode"
                     android:contentDescription="@string/barcodeImageDescription"
                     android:layout_weight="1.0"/>
+                <TextView
+                    android:id="@+id/itfBarcodeText"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="10.0dip"
+                    android:gravity="center"
+                    android:textSize="@dimen/text_size_medium"
+                    android:textStyle="bold"
+                    android:layout_weight="1.0" />
             </LinearLayout>
-            <LinearLayout android:orientation="horizontal"
+            <LinearLayout android:orientation="vertical"
                           android:padding="10.0dp"
                           android:layout_width="fill_parent"
                           android:layout_height="wrap_content">
                 <ImageView
-                    android:layout_width="0dp"
+                    android:layout_width="match_parent"
                     android:layout_height="@dimen/barcode_disp_height"
                     android:layout_gravity="center_horizontal"
                     android:id="@+id/pdf417Barcode"
                     android:contentDescription="@string/barcodeImageDescription"
                     android:layout_weight="1.0"/>
+                <TextView
+                    android:id="@+id/pdf417BarcodeText"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="10.0dip"
+                    android:gravity="center"
+                    android:textSize="@dimen/text_size_medium"
+                    android:textStyle="bold"
+                    android:layout_weight="1.0" />
             </LinearLayout>
-            <LinearLayout android:orientation="horizontal"
+            <LinearLayout android:orientation="vertical"
                           android:padding="10.0dp"
                           android:layout_width="fill_parent"
                           android:layout_height="wrap_content">
                 <ImageView
-                    android:layout_width="0dp"
+                    android:layout_width="match_parent"
                     android:layout_height="@dimen/barcode_disp_height"
                     android:layout_gravity="center_horizontal"
                     android:id="@+id/qrcodeBarcode"
                     android:contentDescription="@string/barcodeImageDescription"
                     android:layout_weight="1.0"/>
+                <TextView
+                    android:id="@+id/qrcodeBarcodeText"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="10.0dip"
+                    android:gravity="center"
+                    android:textSize="@dimen/text_size_medium"
+                    android:textStyle="bold"
+                    android:layout_weight="1.0" />
             </LinearLayout>
-            <LinearLayout android:orientation="horizontal"
+            <LinearLayout android:orientation="vertical"
                           android:padding="10.0dp"
                           android:layout_width="fill_parent"
                           android:layout_height="wrap_content">
                 <ImageView
-                    android:layout_width="0dp"
+                    android:layout_width="match_parent"
                     android:layout_height="@dimen/barcode_disp_height"
                     android:layout_gravity="center_horizontal"
                     android:id="@+id/upcaBarcode"
                     android:contentDescription="@string/barcodeImageDescription"
                     android:layout_weight="1.0"/>
+                <TextView
+                    android:id="@+id/upcaBarcodeText"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="10.0dip"
+                    android:gravity="center"
+                    android:textSize="@dimen/text_size_medium"
+                    android:textStyle="bold"
+                    android:layout_weight="1.0" />
             </LinearLayout>
         </LinearLayout>
     </ScrollView>
-
-
-
-
-</android.support.design.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>

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

@@ -17,6 +17,14 @@
         android:text="@string/noGiftCards"
         android:visibility="gone"/>
 
+    <TextView
+        style="@style/AppTheme.TextView.NoData"
+        android:id="@+id/noMatchingCardsText"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/noMatchingGiftCards"
+        android:visibility="gone"/>
+
     <ListView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"

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

@@ -1,23 +1,23 @@
 <?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:layout_width="match_parent"
-                                                 android:layout_height="match_parent"
-                                                 android:fitsSystemWindows="true">
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                                                     xmlns:app="http://schemas.android.com/apk/res-auto"
+                                                     android:layout_width="match_parent"
+                                                     android:layout_height="match_parent"
+                                                     android:fitsSystemWindows="true">
 
-    <android.support.design.widget.AppBarLayout
+    <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:theme="@style/AppTheme.AppBarOverlay">
 
-        <android.support.v7.widget.Toolbar
+        <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
             android:background="?attr/colorPrimary"
             app:popupTheme="@style/AppTheme.PopupOverlay" />
 
-    </android.support.design.widget.AppBarLayout>
+    </com.google.android.material.appbar.AppBarLayout>
 
     <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
                 android:layout_width="match_parent"
@@ -99,7 +99,6 @@
                 android:layout_marginTop="8dp"
                 android:text="@string/importOptionFilesystemButton" />
 
-
             <View
                 android:id="@+id/dividerImportApplication"
                 android:layout_width="fill_parent"
@@ -129,38 +128,8 @@
                 android:layout_gravity="center_horizontal"
                 android:layout_marginTop="8dp"
                 android:text="@string/importOptionApplicationButton" />
-
-            <View
-                android:id="@+id/dividerImportFixed"
-                android:layout_width="fill_parent"
-                android:layout_height="1dp"
-                android:layout_margin="16dp"
-                android:background="?android:attr/listDivider"/>
-
-            <TextView
-                android:id="@+id/importOptionFixedTitle"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:textSize="@dimen/text_size_large"
-                android:text="@string/importOptionFixedTitle"/>
-
-            <TextView
-                android:id="@+id/importOptionFixedExplanation"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="4dp"
-                android:textSize="@dimen/text_size_medium"
-                android:text="@string/importOptionFixedExplanation"/>
-
-            <Button
-                android:id="@+id/importOptionFixedButton"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:layout_marginTop="8dp"
-                android:text="@string/importOptionFixedButton" />
         </LinearLayout>
     </ScrollView>
 
 
-</android.support.design.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>

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

@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:orientation="vertical" android:layout_width="match_parent"
-              android:layout_height="match_parent"
-              android:background="#222222"
-              android:layout_weight="10"
-              android:id="@+id/main">
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="0dp"
-        android:layout_gravity="center"
-        android:gravity="center"
-        android:paddingLeft="32dp"
-        android:layout_weight="3"
-        android:fontFamily="sans-serif-thin"
-        android:textColor="#ffffff"
-        android:paddingRight="32dp"
-        android:textSize="28sp"
-        android:text="@string/intro1Title"/>
-
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="0dp"
-        android:orientation="vertical"
-        android:gravity="center"
-        android:layout_weight="5">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:paddingLeft="16dp"
-            android:paddingRight="16dp"
-            android:src="@drawable/app_icon_intro"/>
-    </LinearLayout>
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="0dp"
-        android:layout_weight="3"
-        android:layout_gravity="center"
-        android:gravity="center"
-        android:textColor="#ffffff"
-        android:paddingLeft="64dp"
-        android:paddingRight="64dp"
-        android:textSize="16sp"
-        android:text="@string/intro1Description"/>
-    <TextView
-        android:layout_width="fill_parent"
-        android:layout_height="64dp" />
-</LinearLayout>

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

@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:orientation="vertical" android:layout_width="match_parent"
-              android:layout_height="match_parent"
-              android:background="#222222"
-              android:layout_weight="10"
-              android:id="@+id/main">
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="0dp"
-        android:layout_gravity="center"
-        android:gravity="center"
-        android:paddingLeft="32dp"
-        android:layout_weight="3"
-        android:fontFamily="sans-serif-thin"
-        android:textColor="#ffffff"
-        android:paddingRight="32dp"
-        android:textSize="28sp"
-        android:text="@string/intro2Title"/>
-
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="0dp"
-        android:orientation="vertical"
-        android:gravity="center"
-        android:layout_weight="5">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:paddingLeft="16dp"
-            android:paddingRight="16dp"
-            android:src="@drawable/intro2_image"/>
-    </LinearLayout>
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="0dp"
-        android:layout_weight="3"
-        android:layout_gravity="center"
-        android:gravity="center"
-        android:textColor="#ffffff"
-        android:paddingLeft="64dp"
-        android:paddingRight="64dp"
-        android:textSize="16sp"
-        android:text="@string/intro2Description"/>
-    <TextView
-        android:layout_width="fill_parent"
-        android:layout_height="64dp" />
-</LinearLayout>

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

@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:orientation="vertical" android:layout_width="match_parent"
-              android:layout_height="match_parent"
-              android:background="#222222"
-              android:layout_weight="10"
-              android:id="@+id/main">
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="0dp"
-        android:layout_gravity="center"
-        android:gravity="center"
-        android:paddingLeft="32dp"
-        android:layout_weight="3"
-        android:fontFamily="sans-serif-thin"
-        android:textColor="#ffffff"
-        android:paddingRight="32dp"
-        android:textSize="28sp"
-        android:text="@string/intro3Title"/>
-
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="0dp"
-        android:orientation="vertical"
-        android:gravity="center"
-        android:layout_weight="5">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:paddingLeft="16dp"
-            android:paddingRight="16dp"
-            android:src="@drawable/intro3_image"/>
-    </LinearLayout>
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="0dp"
-        android:layout_weight="3"
-        android:layout_gravity="center"
-        android:gravity="center"
-        android:textColor="#ffffff"
-        android:paddingLeft="64dp"
-        android:paddingRight="64dp"
-        android:textSize="16sp"
-        android:text="@string/intro3Description"/>
-    <TextView
-        android:layout_width="fill_parent"
-        android:layout_height="64dp" />
-</LinearLayout>

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

@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:orientation="vertical" android:layout_width="match_parent"
-              android:layout_height="match_parent"
-              android:background="#222222"
-              android:layout_weight="10"
-              android:id="@+id/main">
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="0dp"
-        android:layout_gravity="center"
-        android:gravity="center"
-        android:paddingLeft="32dp"
-        android:layout_weight="3"
-        android:fontFamily="sans-serif-thin"
-        android:textColor="#ffffff"
-        android:paddingRight="32dp"
-        android:textSize="28sp"
-        android:text="@string/intro4Title"/>
-
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="0dp"
-        android:orientation="vertical"
-        android:gravity="center"
-        android:layout_weight="5">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:paddingLeft="16dp"
-            android:paddingRight="16dp"
-            android:src="@drawable/intro4_image"/>
-    </LinearLayout>
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="0dp"
-        android:layout_weight="3"
-        android:layout_gravity="center"
-        android:gravity="center"
-        android:textColor="#ffffff"
-        android:paddingLeft="64dp"
-        android:paddingRight="64dp"
-        android:textSize="16sp"
-        android:text="@string/intro4Description"/>
-    <TextView
-        android:layout_width="fill_parent"
-        android:layout_height="64dp" />
-</LinearLayout>

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

@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:orientation="vertical" android:layout_width="match_parent"
-              android:layout_height="match_parent"
-              android:background="#222222"
-              android:layout_weight="10"
-              android:id="@+id/main">
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="0dp"
-        android:layout_gravity="center"
-        android:gravity="center"
-        android:paddingLeft="32dp"
-        android:layout_weight="3"
-        android:fontFamily="sans-serif-thin"
-        android:textColor="#ffffff"
-        android:paddingRight="32dp"
-        android:textSize="28sp"
-        android:text="@string/intro5Title"/>
-
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="0dp"
-        android:orientation="vertical"
-        android:gravity="center"
-        android:layout_weight="5">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:paddingLeft="16dp"
-            android:paddingRight="16dp"
-            android:src="@drawable/intro5_image"/>
-    </LinearLayout>
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="0dp"
-        android:layout_weight="3"
-        android:layout_gravity="center"
-        android:gravity="center"
-        android:textColor="#ffffff"
-        android:paddingLeft="64dp"
-        android:paddingRight="64dp"
-        android:textSize="16sp"
-        android:text="@string/intro5Description"/>
-    <TextView
-        android:layout_width="fill_parent"
-        android:layout_height="64dp" />
-</LinearLayout>

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

@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:orientation="vertical" android:layout_width="match_parent"
-              android:layout_height="match_parent"
-              android:background="#222222"
-              android:layout_weight="10"
-              android:id="@+id/main">
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="0dp"
-        android:layout_gravity="center"
-        android:gravity="center"
-        android:paddingLeft="32dp"
-        android:layout_weight="3"
-        android:fontFamily="sans-serif-thin"
-        android:textColor="#ffffff"
-        android:paddingRight="32dp"
-        android:textSize="28sp"
-        android:text="@string/intro6Title"/>
-
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="0dp"
-        android:orientation="vertical"
-        android:gravity="center"
-        android:layout_weight="5">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:paddingLeft="16dp"
-            android:paddingRight="16dp"
-            android:src="@drawable/app_icon_intro"/>
-    </LinearLayout>
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="0dp"
-        android:layout_weight="3"
-        android:layout_gravity="center"
-        android:gravity="center"
-        android:textColor="#ffffff"
-        android:paddingLeft="64dp"
-        android:paddingRight="64dp"
-        android:textSize="16sp"
-        android:text="@string/intro6Description"/>
-    <TextView
-        android:layout_width="fill_parent"
-        android:layout_height="64dp" />
-</LinearLayout>

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

@@ -1,28 +1,37 @@
 <?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:layout_width="match_parent"
-                                                 android:layout_height="match_parent"
-                                                 android:fitsSystemWindows="true">
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                                                     xmlns:app="http://schemas.android.com/apk/res-auto"
+                                                     android:layout_width="match_parent"
+                                                     android:layout_height="match_parent"
+                                                     android:fitsSystemWindows="true">
 
-    <android.support.design.widget.AppBarLayout
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        android:id="@+id/fabSave"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="end|bottom"
+        android:src="@drawable/save_24dp"
+        android:contentDescription="@string/save"
+        android:layout_margin="16dp" />
+
+    <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:theme="@style/AppTheme.AppBarOverlay">
 
-        <android.support.v7.widget.Toolbar
+        <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
             android:background="?attr/colorPrimary"
             app:popupTheme="@style/AppTheme.PopupOverlay" />
 
-    </android.support.design.widget.AppBarLayout>
+    </com.google.android.material.appbar.AppBarLayout>
 
     <ScrollView android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:background="@color/inputContrastBackground"
-                app:layout_behavior="android.support.design.widget.AppBarLayout$ScrollingViewBehavior">
+                app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -119,7 +128,7 @@
 
                         <EditText
                             android:id="@+id/noteEdit"
-                            android:inputType="textCapSentences"
+                            android:inputType="textMultiLine"
                             android:layout_height="wrap_content"
                             android:layout_width="match_parent"
                             android:padding="@dimen/inputPadding"
@@ -151,7 +160,7 @@
                         android:layout_width="@dimen/inputBorderThickness"
                         android:background="@color/inputBorder" />
 
-                    <android.support.constraint.ConstraintLayout
+                    <androidx.constraintlayout.widget.ConstraintLayout
                         android:layout_weight="1"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
@@ -167,7 +176,7 @@
                             android:padding="@dimen/inputPadding"
                             app:layout_constraintStart_toStartOf="parent"/>
 
-                        <android.support.constraint.ConstraintLayout
+                        <androidx.constraintlayout.widget.ConstraintLayout
                             android:id="@+id/headingColorSampleBorder"
                             android:layout_width="0dp"
                             android:layout_height="0dp"
@@ -188,7 +197,7 @@
                                 app:layout_constraintBottom_toBottomOf="parent"
                                 android:background="@android:color/white"
                                 android:contentDescription="@string/storeNameBackgroundColorDescription"/>
-                        </android.support.constraint.ConstraintLayout>
+                        </androidx.constraintlayout.widget.ConstraintLayout>
 
                        <Button
                            android:id="@+id/headingColorSelectButton"
@@ -199,7 +208,7 @@
                            android:layout_toEndOf="@id/headingColorSampleBorder"
                            android:layout_toRightOf="@id/headingColorSampleBorder"
                            app:layout_constraintEnd_toEndOf="parent"/>
-                    </android.support.constraint.ConstraintLayout>
+                    </androidx.constraintlayout.widget.ConstraintLayout>
 
                     <View
                         android:gravity="end"
@@ -223,7 +232,7 @@
                         android:layout_width="@dimen/inputBorderThickness"
                         android:background="@color/inputBorder" />
 
-                    <android.support.constraint.ConstraintLayout
+                    <androidx.constraintlayout.widget.ConstraintLayout
                         android:layout_weight="1"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
@@ -239,7 +248,7 @@
                             android:padding="@dimen/inputPadding"
                             app:layout_constraintStart_toStartOf="parent"/>
 
-                        <android.support.constraint.ConstraintLayout
+                        <androidx.constraintlayout.widget.ConstraintLayout
                             android:id="@+id/headingStoreTextColorSampleBorder"
                             android:layout_width="0dp"
                             android:layout_height="0dp"
@@ -260,7 +269,7 @@
                                 app:layout_constraintBottom_toBottomOf="parent"
                                 android:background="@android:color/white"
                                 android:contentDescription="@string/storeNameColorDescription"/>
-                        </android.support.constraint.ConstraintLayout>
+                        </androidx.constraintlayout.widget.ConstraintLayout>
 
                         <Button
                             android:id="@+id/headingStoreTextColorSelectButton"
@@ -271,7 +280,7 @@
                             android:layout_toEndOf="@id/headingStoreTextColorSampleBorder"
                             android:layout_toRightOf="@id/headingStoreTextColorSampleBorder"
                             app:layout_constraintEnd_toEndOf="parent"/>
-                    </android.support.constraint.ConstraintLayout>
+                    </androidx.constraintlayout.widget.ConstraintLayout>
 
                     <View
                         android:gravity="end"
@@ -335,16 +344,66 @@
                         android:background="@color/inputBorder" />
                 </TableRow>
 
+                <!-- Barcode Type -->
+                <View
+                    android:id="@+id/barcodeTypeDivider"
+                    android:layout_height="@dimen/inputBorderThickness"
+                    android:layout_width="match_parent"
+                    android:background="@color/inputBorder" />
+                <TableRow
+                    android:id="@+id/barcodeTypeTableRow"
+                    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" />
+
+                    <RelativeLayout
+                        android:orientation="horizontal"
+                        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/barcodeTypeField"
+                            android:text="@string/barcodeType"
+                            android:layout_height="match_parent"
+                            android:layout_width="wrap_content"
+                            android:textSize="@dimen/inputSize"
+                            android:padding="@dimen/inputPadding"
+                            android:layout_alignParentStart="true"
+                            android:layout_alignParentLeft="true"
+                            />
+
+                        <TextView
+                            android:id="@+id/barcodeTypeView"
+                            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/barcodeTypeField"
+                            android:layout_toRightOf="@id/barcodeTypeField"
+                            />
+                    </RelativeLayout>
+
+                    <View
+                        android:gravity="end"
+                        android:layout_height="match_parent"
+                        android:layout_width="@dimen/inputBorderThickness"
+                        android:background="@color/inputBorder" />
+                </TableRow>
+
                 <View
                     android:layout_height="@dimen/inputBorderThickness"
                     android:layout_width="match_parent"
                     android:background="@color/inputBorder" />
 
-                <TextView android:id="@+id/barcodeType"
-                          android:layout_width="fill_parent"
-                          android:layout_height="wrap_content"
-                          android:visibility="gone"/>
-
                 <LinearLayout android:orientation="horizontal"
                               android:padding="10.0dip"
                               android:layout_width="fill_parent"
@@ -355,6 +414,8 @@
                         android:layout_width="0dp"
                         android:layout_height="@dimen/barcode_disp_height"
                         android:layout_gravity="center_horizontal"
+                        android:padding="10.0dp"
+                        android:background="#ffffff"
                         android:id="@+id/barcode"
                         android:contentDescription="@string/barcodeImageDescription"
                         android:layout_weight="1.0"/>
@@ -362,7 +423,8 @@
 
                 <LinearLayout android:orientation="vertical"
                               android:layout_width="fill_parent"
-                              android:layout_height="wrap_content">
+                              android:layout_height="wrap_content"
+                              android:background="@color/inputBackground">
 
                     <LinearLayout android:orientation="horizontal"
                                   android:padding="10.0dip"
@@ -386,4 +448,4 @@
         </LinearLayout>
     </ScrollView>
 
-</android.support.design.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>

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

@@ -37,7 +37,6 @@
                     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"/>
 

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout
+<androidx.coordinatorlayout.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"
@@ -8,6 +8,15 @@
     android:fitsSystemWindows="true"
     >
 
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        android:id="@+id/fabEdit"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="end|bottom"
+        android:src="@drawable/ic_mode_edit_white_24dp"
+        android:contentDescription="@string/edit"
+        android:layout_margin="16dp" />
+
     <FrameLayout
         android:clipChildren="false"
         android:clipToPadding="false"
@@ -15,12 +24,12 @@
         android:layout_height="fill_parent"
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
-        <android.support.constraint.ConstraintLayout
+        <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="fill_parent"
             android:layout_height="match_parent"
             android:orientation="vertical">
 
-            <android.support.constraint.Guideline
+            <androidx.constraintlayout.widget.Guideline
                 android:id="@+id/centerGuideline"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -35,6 +44,8 @@
                 android:layout_marginBottom="10.0dip"
                 android:layout_marginStart="15.0dip"
                 android:layout_marginEnd="15.0dip"
+                android:padding="10.0dp"
+                android:background="#ffffff"
                 app:layout_constraintBottom_toTopOf="@+id/centerGuideline"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
@@ -47,7 +58,7 @@
                 android:layout_height="0dp"
                 android:layout_marginLeft="10.0dip"
                 android:layout_marginRight="10.0dip"
-                app:layout_constraintTop_toBottomOf="@id/centerGuideline"
+                app:layout_constraintTop_toBottomOf="@+id/barcode"
                 app:layout_constraintBottom_toTopOf="@+id/noteViewDivider"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
@@ -71,21 +82,23 @@
 
             <TextView
                 android:id="@id/noteView"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                android:layout_width="0dp"
+                android:layout_height="0dp"
                 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:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintRight_toRightOf="parent"
                 app:autoSizeTextType="uniform"
                 app:autoSizeMinTextSize="@dimen/singleCardNoteTextSizeMin"
                 app:autoSizeMaxTextSize="@dimen/singleCardNoteTextSizeMax"
-                android:textIsSelectable="true"/>
+                android:textIsSelectable="true"
+                android:scrollbars="vertical"/>
 
-        </android.support.constraint.ConstraintLayout>
+        </androidx.constraintlayout.widget.ConstraintLayout>
 
         <View
             android:id="@+id/drop_shadow_actionbar"
@@ -94,7 +107,7 @@
             android:layout_gravity="top"/>
     </FrameLayout>
 
-    <android.support.design.widget.AppBarLayout
+    <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/app_bar_layout"
         android:background="@android:color/transparent"
         android:clipChildren="false"
@@ -103,7 +116,7 @@
         android:layout_height="wrap_content"
         android:weightSum="1.0"
         android:fitsSystemWindows="true">
-        <android.support.design.widget.CollapsingToolbarLayout
+        <com.google.android.material.appbar.CollapsingToolbarLayout
             android:id="@+id/collapsingToolbarLayout"
             android:clipChildren="false"
             android:clipToPadding="false"
@@ -129,7 +142,7 @@
                 android:layout_marginBottom="?actionBarSize"
                 app:layout_collapseMode="parallax"
                 android:fitsSystemWindows="true"/>
-            <android.support.v7.widget.Toolbar
+            <androidx.appcompat.widget.Toolbar
                 android:id="@id/toolbar"
                 android:background="@android:color/transparent"
                 android:theme="@style/CardView.ActionBarTheme"
@@ -137,6 +150,6 @@
                 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>
+        </com.google.android.material.appbar.CollapsingToolbarLayout>
+    </com.google.android.material.appbar.AppBarLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout
+<androidx.coordinatorlayout.widget.CoordinatorLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
@@ -8,20 +8,29 @@
     android:fitsSystemWindows="true"
     tools:context="protect.card_locker.MainActivity">
 
-    <android.support.design.widget.AppBarLayout
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        android:id="@+id/fabAdd"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="end|bottom"
+        android:src="@drawable/ic_add_white_24dp"
+        android:contentDescription="@string/action_add"
+        android:layout_margin="16dp" />
+
+    <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:theme="@style/AppTheme.AppBarOverlay">
 
-        <android.support.v7.widget.Toolbar
+        <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
             android:background="?attr/colorPrimary"
             app:popupTheme="@style/AppTheme.PopupOverlay"/>
 
-    </android.support.design.widget.AppBarLayout>
+    </com.google.android.material.appbar.AppBarLayout>
 
     <include layout="@layout/content_main"/>
 
-</android.support.design.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>

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

@@ -1,10 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
       xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <item
-        android:id="@+id/action_save"
-        android:icon="@drawable/save_24dp"
-        android:title="@string/save"
-        app:showAsAction="always"/>
 </menu>

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

@@ -6,4 +6,8 @@
         android:id="@+id/action_clipboard"
         android:title="@string/copy_to_clipboard"
         app:showAsAction="always"/>
+    <item
+        android:id="@+id/action_share"
+        android:title="@string/share"
+        app:showAsAction="always"/>
 </menu>

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

@@ -1,16 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
       xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <item
-        android:id="@+id/action_save"
-        android:icon="@drawable/save_24dp"
-        android:title="@string/save"
-        app:showAsAction="always"/>
-
     <item
         android:id="@+id/action_delete"
         android:icon="@drawable/ic_delete_white_24dp"
         android:title="@string/delete"
-        app:showAsAction="never"/>
+        app:showAsAction="always"/>
 </menu>

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

@@ -8,8 +8,14 @@
         android:title="@string/lockScreen"
         app:showAsAction="always"/>
     <item
-        android:id="@+id/action_edit"
-        android:icon="@drawable/ic_mode_edit_white_24dp"
-        android:title="@string/edit"
+        android:id="@+id/action_share"
+        android:icon="@drawable/ic_share_white"
+        android:title="@string/share"
         app:showAsAction="always"/>
+    <item
+        android:id="@+id/action_view_extras"
+        android:icon="@drawable/ic_info_outline_white"
+        android:title="@string/moreInfo"
+        app:showAsAction="always"
+        android:visible="false"/>
 </menu>

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

@@ -3,10 +3,11 @@
       xmlns:tools="http://schemas.android.com/tools"
       tools:context="protect.card_locker.MainActivity">
     <item
-        android:id="@+id/action_add"
-        android:icon="@drawable/ic_add_white_24dp"
-        android:title="@string/action_add"
-        app:showAsAction="always"/>
+        android:id="@+id/action_search"
+        android:title="@string/action_search"
+        android:icon="@drawable/ic_search_white"
+        app:actionViewClass="androidx.appcompat.widget.SearchView"
+        app:showAsAction="always|collapseActionView"/>
     <item
         android:id="@+id/action_import_export"
         android:icon="@drawable/ic_import_export_white_24dp"
@@ -16,10 +17,6 @@
         android:id="@+id/action_settings"
         android:title="@string/settings"
         app:showAsAction="never"/>
-    <item
-        android:id="@+id/action_intro"
-        android:title="@string/startIntro"
-        app:showAsAction="never"/>
     <item
         android:id="@+id/action_about"
         android:title="@string/about"

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

@@ -1,16 +1,12 @@
 <resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 
-    <string name="app_name">Loyalty Card Keychain</string>
     <string name="action_add">Přidat</string>
 
     <string name="noGiftCards">ZAtím némáte žádné věrnostní karty. Klikněte na tlačítko "+" (plus) nahoře a začněte.\n\nLoyalty Card Locker umožňuje nosit své věrnostní karty v telefonu, takže jsou vždy na dosah.</string>
-
     <string name="storeName">Obchod</string>
     <string name="note">Poznámka</string>
     <string name="cardId">ID karty</string>
-    <string name="barcodeType">Typ čárového kódu</string>
-
     <string name="cancel">Zrušit</string>
     <string name="save">Uložit</string>
     <string name="capture">Naskenovat kartu</string>
@@ -25,7 +21,6 @@
     <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>
 
@@ -33,31 +28,23 @@
     <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="importFailed">Import selhal</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="exportFailed">Export selhal</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="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>
     <string name="importOptionFilesystemButton">Ze souborového systému</string>
     <string name="importOptionApplicationTitle">Použít externí aplikaci</string>
     <string name="importOptionApplicationExplanation">K otevření souboru použije externí aplikaci jako Dropbox, Google Drive, nebo vámi preferovaný prohlížeč souborů.</string>
     <string name="importOptionApplicationButton">Použít externí aplikaci</string>
-    <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="about">O aplikaci</string>
     <string name="app_copyright_fmt">Copyright 2016-<xliff:g>%d</xliff:g> Branden Archer</string>
@@ -67,8 +54,6 @@
     <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>
+    </resources>

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

@@ -1,16 +1,15 @@
 <resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 
-    <string name="app_name">Loyalty Card Keychain</string>
+    <string name="action_search">Suche</string>
     <string name="action_add">Neu</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="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="noMatchingGiftCards">Es passen keine Kundenkarten zum Suchfilter. Bitte probiere verschiedene Begriffe aus.</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>
@@ -26,11 +25,8 @@
     <string name="ok">Ok</string>
     <string name="copy_to_clipboard">Kopiere die Nummer in die Zwischenablage</string>
     <string name="sendLabel">Senden&#8230;</string>
-    <string name="addedShortcut">Zum Home Screen hinzugefügt</string>
-
     <string name="editCardTitle">Kundenkarte bearbeiten</string>
     <string name="addCardTitle">Neue Kundenkarte</string>
-    <string name="viewCardTitle">Kundenkarte anzeigen</string>
     <string name="scanCardBarcode">Barcode scannen</string>
     <string name="cardShortcut">Shortcut zu einer Karte</string>
     <string name="noCardsMessage">Es ist noch keine Karte vorhanden, bitte zuerst eine hinzufügen</string>
@@ -40,61 +36,53 @@
     <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="importSuccessfulTitle">Import erfolgreich</string>
     <string name="importFailedTitle">Import fehlgeschlagen</string>
-    <string name="importFailed">Import fehlgeschlagen: %1$s</string>
+    <string name="importFailed">Import fehlgeschlagen</string>
     <string name="exportSuccessfulTitle">Export erfolgreich</string>
     <string name="exportFailedTitle">Export fehlgeschlagen</string>
-    <string name="exportFailed">Export fehlgeschlagen: %1$s</string>
+    <string name="exportFailed">Export fehlgeschlagen</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="importOptionFilesystemTitle">Importiere aus Dateisystem</string>
+    <string name="importOptionFilesystemExplanation">Wähle eine Datei aus dem Speicher aus.</string>
+    <string name="importOptionFilesystemButton">Aus Dateisystem</string>
+    <string name="importOptionApplicationTitle">Externe App verwenden</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-Pfad</string>
-    <string name="importOptionFixedExplanation">Importiere vom Export-Pfad.</string>
-    <string name="importOptionFixedButton">Verwende den Export-Pfad.</string>
 
     <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_revision_fmt">Informationen zu dieser Version: <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>
+    <string name="thumbnailDescription">Vorschaubild für die Karte</string>
 
-</resources>
+    <string name="change">Anpassen</string>
+    <string name="storeTextColorTitle">Textfarbe</string>
+    <string name="storeTextBackgroundColorTitle">Hintergrundfarbe</string>
+    <string name="storeNameBackgroundColorDescription">Hintergrundfarbe für den Geschäftsnamen</string>
+    <string name="storeNameColorDescription">Farbe für den Geschäftsnamen</string>
+
+    <string name="settings">Einstellungen</string>
+    <string name="settings_category_title_ui">Benutzeroberfläche</string>
+    <string name="settings_card_title_list_font_size">Schriftgröße des Titels in der Listenansicht</string>
+    <string name="settings_card_note_list_font_size">Schriftgröße der Notiz in der Listenansicht</string>
+    <string name="settings_card_title_font_size">Schriftgröße des Titels</string>
+    <string name="settings_card_id_font_size">Schriftgröße der Kartennummer</string>
+    <string name="settings_card_note_font_size">Schriftgröße der Notiz</string>
+    <string name="settings_display_barcode_max_brightness">Helligkeit bei Barcode Ansicht erhöhen</string>
+    <string name="settings_lock_barcode_orientation">Barcodeausrichtung sperren</string>
+    </resources>

app/src/main/res/values-el-rGR/strings.xml

@@ -0,0 +1,83 @@
+<resources
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+    <string name="action_add">Προσθήκη</string>
+
+    <string name="noGiftCards">Δεν έχετε κάρτες προς το παρόν. Πατήστε το κουμπί \"+\" (συν) στο πάνω μέρος για να ξεκινήσετε.\n\nΤο Loyalty Card Keychain σας δίνει τη δυνατότητα να έχετε τις κάρτες σας στο τηλέφωνο σας, έτσι ώστε να τις έχετε πάντα μαζί σας.</string>
+    <string name="storeName">Κατάστημα</string>
+    <string name="note">Σημείωση</string>
+    <string name="cardId">Κωδικός Κάρτας</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="lockScreen">Αποκλεισμός Περιστροφής</string>
+    <string name="unlockScreen">Περιστροφή</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="editCardTitle">Επεξεργασία Κάρτας</string>
+    <string name="addCardTitle">Προσθήκη Κάρτας</string>
+    <string name="scanCardBarcode">Σαρώστε τον κωδικό της κάρτας</string>
+    <string name="cardShortcut">Συντόμευση Κάρτας</string>
+    <string name="noCardsMessage">Δεν υπάρχουν κάρτες. προσθέστε μία πρώτα</string>
+
+    <string name="barcodeImageDescription">Εικόνα του barcode της κάρτας</string>
+
+    <string name="noStoreError">Δεν δώσατε κατάστημα</string>
+    <string name="noCardIdError">Δεν δώσατε κωδικό κάρτας</string>
+    <string name="noCardExistsError">Δεν ήταν δυνατό να εντοπιστεί κάρτα</string>
+    <string name="cardIdFormat">%1$s: %2$s</string>
+    <string name="importExport">Εισαγωγή/Εξαγωγή</string>
+    <string name="exportName">Εξαγωγή</string>
+    <string name="importExportHelp">Τα εφεδρικά δεδομένα σας δίνουν την δυνατότητα να μεταφέρετε τις κάρτες σας σε μία άλλη συσκευή.</string>
+    <string name="importSuccessfulTitle">Εισαγωγή επιτυχής</string>
+    <string name="importFailedTitle">Εισαγωγή ανεπιτυχής</string>
+    <string name="importFailed">Δεν εισήχθει</string>
+    <string name="exportSuccessfulTitle">Εξαγωγή επιτυχής</string>
+    <string name="exportFailedTitle">Εξαγωγή ανεπιτυχής</string>
+    <string name="exportFailed">Δεν εξήχθη</string>
+    <string name="importing">Γίνεται εισαγωγή του&#8230;</string>
+    <string name="exporting">Γίνεται εξαγωγή του&#8230;</string>
+    <string name="noExternalStoragePermissionError">Δεν είναι δυνατή η εισαγωγή ή εξαγωγή καρτών χωρίς την άδεια πρόσβασης στον εξωτερικό χώρο αποθήκευσης</string>
+    <string name="importOptionFilesystemTitle">Εισαγωγή από το σύστημα αρχείων</string>
+    <string name="importOptionFilesystemExplanation">Επιλέξτε ένα συγκεκριμένο αρχείο από το σύστημα αρχείων.</string>
+    <string name="importOptionFilesystemButton">Από το σύστημα αρχείων</string>
+    <string name="importOptionApplicationTitle">Χρήση εξωτερικής εφαρμογής</string>
+    <string name="importOptionApplicationExplanation">Κάντε χρήση μίας εξωτερικής εφαρμογής όπως είναι τα Dropbox, Google Drive ή ο αγαπημένος σας διαχειριστής αρχείων για να ανοίξετε ένα αρχείο.</string>
+    <string name="importOptionApplicationButton">Χρήση εξωτερικής εφαρμογής</string>
+
+    <string name="about">Σχετικά</string>
+    <string name="app_copyright_fmt">Copyright 2016-<xliff:g>%d</xliff:g> Branden Archer</string>
+    <string name="app_license">Άδεια χρήσης υπό το GPLv3.</string>
+    <string name="about_title_fmt">Σχετικά με <xliff:g id="app_name">%s</xliff:g></string>
+    <string name="debug_version_fmt">Έκδοση: <xliff:g id="version">%s</xliff:g></string>
+    <string name="app_revision_fmt">Πληροφορίες Αναθεώρησης: <xliff:g id="app_revision_url">%s</xliff:g></string>
+    <string name="app_libraries">Το <xliff:g id="app_name">%s</xliff:g> χρησιμοποιεί τις ακόλουθες βιβλιοθήκες τρίτων: <xliff:g id="app_libraries_list">%s</xliff:g></string>
+    <string name="app_resources">Το <xliff:g id="app_name">%s</xliff:g> χρησιμοποιεί τους παρακάτω πόρους τρίτων: <xliff:g id="app_resources_list">%s</xliff:g></string>
+
+    <string name="selectBarcodeTitle">Επιλέξτε Barcode</string>
+    <string name="copy_to_clipboard_toast">Ο κωδικός της κάρτας αντιγράφτηκε στο πρόχειρο</string>
+
+    <string name="thumbnailDescription">Μικρογραφία κάρτας</string>
+
+    <string name="change">Αλλαγή</string>
+    <string name="storeTextColorTitle">Χρώμα Κειμένου Καταστήματος</string>
+    <string name="storeTextBackgroundColorTitle">Χρώμα Κεφαλίδας</string>
+    <string name="storeNameBackgroundColorDescription">Χρώμα για το υπόβαθρο του καταστήματος</string>
+    <string name="storeNameColorDescription">Χρώμα για το κείμενο του καταστήματος</string>
+
+    <string name="settings">Ρυθμίσεις</string>
+    <string name="settings_category_title_ui">Διεπαφή χρήστη</string>
+    <string name="settings_card_title_list_font_size">Μέγεθος κειμένου λίστας καρτών</string>
+    <string name="settings_card_note_list_font_size">Μέγεθος κειμένου λίστας σημειώσεων καρτών</string>
+    <string name="settings_card_title_font_size">Μέγεθος κειμένου τίτλου κάρτας</string>
+    <string name="settings_card_id_font_size">Μέγεθος κειμένου κωδικού κάρτας</string>
+    <string name="settings_card_note_font_size">Μέγεθος κειμένου σημείωσης κάρτας</string>
+    </resources>

app/src/main/res/values-es-rAR/strings.xml

@@ -0,0 +1,4 @@
+<resources
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+    </resources>

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

@@ -0,0 +1,83 @@
+<resources
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+    <string name="action_add">Añadir</string>
+
+    <string name="noGiftCards">Actualmente no tienes ninguna tarjeta guardada. Presiona el botón \"+\" para comenzar.\n\nEsta cartera te permite llevar tus tarjetas de fidelización en tu teléfono para que estén siempre a tu alcance.</string>
+    <string name="storeName">Tienda</string>
+    <string name="note">Nota</string>
+    <string name="cardId">ID de la Tarjeta</string>
+    <string name="cancel">Cancelar</string>
+    <string name="save">Guardar</string>
+    <string name="capture">Escanear Tarjeta</string>
+    <string name="enterCard">Introducir Tarjeta</string>
+    <string name="editCard">Editar Tarjeta</string>
+    <string name="edit">Editar</string>
+    <string name="delete">Eliminar</string>
+    <string name="confirm">Confirmar</string>
+    <string name="lockScreen">Bloquear Rotación de Pantalla</string>
+    <string name="unlockScreen">Rotación de Pantalla Automática</string>
+    <string name="deleteTitle">Eliminar Tarjeta de Fidelización</string>
+    <string name="deleteConfirmation">Por favor, confirma si quieres eliminar esta tarjeta.</string>
+    <string name="ok">OK</string>
+    <string name="copy_to_clipboard">Copiar ID al portapapeles</string>
+    <string name="sendLabel">Enviar&#8230;</string>
+    <string name="editCardTitle">Editar Tarjeta de Fidelización</string>
+    <string name="addCardTitle">Añadir Tarjeta de Fidelización</string>
+    <string name="scanCardBarcode">Escanear el Código de Barras de la Tarjeta</string>
+    <string name="cardShortcut">Atajo de Tarjeta</string>
+    <string name="noCardsMessage">No hay ninguna tarjeta, añade una primero</string>
+
+    <string name="barcodeImageDescription">Imagen del código de barras de la tarjeta</string>
+
+    <string name="noStoreError">Establecimiento no especificado</string>
+    <string name="noCardIdError">ID de la Tarjeta no especificado</string>
+    <string name="noCardExistsError">No se ha podido encontrar la tarjeta de fidelización</string>
+    <string name="cardIdFormat">%1$s: %2$s</string>
+    <string name="importExport">Importar/Exportar</string>
+    <string name="exportName">Exportar</string>
+    <string name="importExportHelp">La copia de seguridad te permite transferir tus tarjetas a otro dispositivo.</string>
+    <string name="importSuccessfulTitle">Datos importados correctamente</string>
+    <string name="importFailedTitle">Ha ocurrido un error al importar los datos</string>
+    <string name="importFailed">Error al importar</string>
+    <string name="exportSuccessfulTitle">Datos exportados correctamente</string>
+    <string name="exportFailedTitle">Ha ocurrido un error al exportar los datos</string>
+    <string name="exportFailed">Error al exportar</string>
+    <string name="importing">Importando&#8230;</string>
+    <string name="exporting">Exportando&#8230;</string>
+    <string name="noExternalStoragePermissionError">No se pueden importar o exportar tarjetas sin el permiso de almacenamiento</string>
+    <string name="importOptionFilesystemTitle">Importar desde el sistema de archivos</string>
+    <string name="importOptionFilesystemExplanation">Seleccionar un archivo del sistema de archivos</string>
+    <string name="importOptionFilesystemButton">Desde el sistema de archivos</string>
+    <string name="importOptionApplicationTitle">Usar una applicación externa</string>
+    <string name="importOptionApplicationExplanation">Use una aplicación externa como Dropbox, Google Drive o tu gestor de archivos favoritos para abrir un archivo.</string>
+    <string name="importOptionApplicationButton">Usar aplicación externa</string>
+
+    <string name="about">Acerca de</string>
+    <string name="app_copyright_fmt">Copyright 2016-<xliff:g>%d</xliff:g> Branden Archer</string>
+    <string name="app_license">Licencia GPLv3</string>
+    <string name="about_title_fmt">Acerca de <xliff:g id="app_name">%s</xliff:g></string>
+    <string name="debug_version_fmt">Versión: <xliff:g id="version">%s</xliff:g></string>
+    <string name="app_revision_fmt">Información sobre la Revisión: <xliff:g id="app_revision_url">%s</xliff:g></string>
+    <string name="app_libraries"><xliff:g id="app_name">%s</xliff:g> utiliza las siguientes librerías de terceros: <xliff:g id="app_libraries_list">%s</xliff:g></string>
+    <string name="app_resources"><xliff:g id="app_name">%s</xliff:g> utiliza los siguientes recursos de terceros: <xliff:g id="app_resources_list">%s</xliff:g></string>
+
+    <string name="selectBarcodeTitle">Selecciona el Código de Barras</string>
+    <string name="copy_to_clipboard_toast">ID de la Tarjeta copiado al portapapeles</string>
+
+    <string name="thumbnailDescription">Miniatura para la tarjeta</string>
+
+    <string name="change">Cambiar</string>
+    <string name="storeTextColorTitle">Color del Texto de la Tienda</string>
+    <string name="storeTextBackgroundColorTitle">Color Principal</string>
+    <string name="storeNameBackgroundColorDescription">Color de fondo para el texto de la tienda</string>
+    <string name="storeNameColorDescription">Color del texto de la tienda</string>
+
+    <string name="settings">Configuración</string>
+    <string name="settings_category_title_ui">Interfaz de Usuario</string>
+    <string name="settings_card_title_list_font_size">Tamaño de la letra para el título (lista)</string>
+    <string name="settings_card_note_list_font_size">Tamaño de la letra para notas (lista)</string>
+    <string name="settings_card_title_font_size">Tamaño de la letra para el título</string>
+    <string name="settings_card_id_font_size">Tamaño de la letra para el ID de la tarjeta</string>
+    <string name="settings_card_note_font_size">Tamaño de la letra para notas</string>
+    </resources>

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

@@ -1,19 +1,15 @@
 <resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 
-    <string name="app_name">Loyalty Card Keychain</string>
     <string name="action_add">Ajouter</string>
 
-    <string name="noGiftCards">Pas de carte de fidélité enregistrée. Cliquez sur le bouton "+" (plus) pour commencer.\n\nLoyalty Card Locker vous permet d\'enregistrer vos cartes de fidélité sur votre téléphone pour toujours les avoir à portée de main.</string>
-
+    <string name="noGiftCards">Aucune carte de fidélité enregistrée. Appuyez sur le bouton \"+\" (plus) pour commencer.\n\nLoyalty Card Locker vous permet d\'enregistrer vos cartes de fidélité sur votre téléphone pour toujours les avoir à portée de main.</string>
     <string name="storeName">Nom</string>
     <string name="note">Note</string>
     <string name="cardId">Numéro</string>
-    <string name="barcodeType">Type de code-barres</string>
-
     <string name="cancel">Annuler</string>
     <string name="save">Enregistrer</string>
-    <string name="capture">Flasher</string>
+    <string name="capture">Mode capture</string>
     <string name="enterCard">Mode manuel</string>
     <string name="editCard">Modifier</string>
     <string name="edit">Modifier</string>
@@ -26,11 +22,8 @@
     <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>
@@ -40,34 +33,25 @@
     <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="importFailed">Échec de l\'import </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="exportFailed">Échec de l\'export </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="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>
     <string name="importOptionFilesystemButton">Système de fichiers</string>
     <string name="importOptionApplicationTitle">Application externe</string>
     <string name="importOptionApplicationExplanation">Utilisez une application externe comme Dropbox, Google Drive, ou votre gestionnaire de fichiers favori pour ouvrir un fichier.</string>
     <string name="importOptionApplicationButton">Application externe</string>
-    <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="about">À propos</string>
     <string name="app_copyright_fmt">Copyright 2016-<xliff:g>%d</xliff:g> Branden Archer</string>
@@ -79,24 +63,23 @@
     <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="thumbnailDescription">Miniature 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 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>
-    <string name="intro4Description">Pour afficher une carte, touchez le nom du magasin sur l\'écran principal\n\n</string>
-    <string name="intro5Title">Sauvegarde\n</string>
-    <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>
+    <string name="change">Modifier</string>
+    <string name="storeTextColorTitle">Couleur du texte du magasin</string>
+    <string name="storeTextBackgroundColorTitle">Couleur du titre</string>
+    <string name="storeNameBackgroundColorDescription">Couleur de fond du texte du magasin</string>
+    <string name="storeNameColorDescription">Couleur pour le nom du magasin</string>
 
-</resources>
+    <string name="settings">Paramètres</string>
+    <string name="settings_category_title_ui">Interface</string>
+    <string name="settings_card_title_list_font_size">Taille de police pour les titres de carte en liste</string>
+    <string name="settings_card_note_list_font_size">Taille de police pour les notes de carte en liste</string>
+    <string name="settings_card_title_font_size">Taille de police pour les titres de carte</string>
+    <string name="settings_card_id_font_size">Taille de police pour les numéros de carte</string>
+    <string name="settings_card_note_font_size">Taille de police pour les notes de carte</string>
+    <string name="settings_display_barcode_max_brightness">Augmenter la luminosité du code-barres</string>
+    <string name="settings_lock_barcode_orientation">Verrouiller l\'orientation du code-barres</string>
+    </resources>