Release v0.29

Fix README
Add logo
2025-12-24 15:47:53 -05:00 · 2020-10-29 19:31:42 +01:00 · 2020-10-29 19:30:37 +01:00 · 2020-10-29 19:29:39 +01:00 · 2020-10-28 18:49:07 +01:00 · 2020-10-27 13:51:20 -07:00
188 changed files with 4042 additions and 1541 deletions
--- a/.github/workflows/android.yml
+++ b/.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
--- a/.github/workflows/calibreapp-image-actions.yml
+++ b/.github/workflows/calibreapp-image-actions.yml
@@ -0,0 +1,31 @@
+name: Compress Images on Push to Master
+on:
+  push:
+    branches:
+      - master
+    paths:
+      - '**.jpg'
+      - '**.jpeg'
+      - '**.png'
+      - '**.webp'
+jobs:
+  build:
+    name: calibreapp/image-actions
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Repo
+        uses: actions/checkout@master
+      - name: Compress Images
+        id: calibre
+        uses: calibreapp/image-actions@master
+        with:
+          githubToken: ${{ secrets.GITHUB_TOKEN }}
+          compressOnly: true
+      - name: Create New Pull Request If Needed
+        if: steps.calibre.outputs.markdown != ''
+        uses: peter-evans/create-pull-request@master
+        with:
+          title: Compressed Images
+          branch-suffix: timestamp
+          commit-message: Compressed Images
+          body: ${{ steps.calibre.outputs.markdown }}
--- a/.travis.yml
+++ b/.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
--- a/.tx/config
+++ b/.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
+
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,106 @@
+## v0.29 (2020-10-29)
+
+Changes:
+- Rebrand to Catima
+- Removed intro
+- Add floating action buttons
+- Fix Android 5 crash when opening About screen
+- Add favourites support
+- Fix disabled auto-rotate being ignored
+
+## 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:
--- a/README.md
+++ b/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)
--- a/app/build.gradle
+++ b/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 40
+        versionName "0.29"
    }
    buildTypes {
        release {
            minifyEnabled false
            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
        }
+        debug {
+            applicationIdSuffix ".debug"
+        }
    }
    lintOptions {
        disable "GoogleAppIndexingWarning"
@@ -41,19 +44,22 @@ 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 +67,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()

--- a/app/src/androidTest/java/protect/card_locker/ApplicationTest.java
+++ b/app/src/androidTest/java/protect/card_locker/ApplicationTest.java
@@ -12,4 +12,4 @@ public class ApplicationTest extends ApplicationTestCase<Application>
    {
        super(Application.class);
    }
-}
+}
--- a/app/src/main/AndroidManifest.xml
+++ b/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"
@@ -41,33 +42,36 @@
        <activity
            android:name=".LoyaltyCardEditActivity"
            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://github.com/brarcher/loyalty-card-locker/” -->
+                <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>
+        </activity>
        <activity
            android:name=".BarcodeSelectorActivity"
            android:label="@string/selectBarcodeTitle"
            android:theme="@style/AppTheme.NoActionBar"
-            android:configChanges="orientation|screenSize"
            android:windowSoftInputMode="stateHidden"/>
        <activity
            android:name=".preferences.SettingsActivity"
-            android:label="@string/settings"
-            android:configChanges="orientation|screenSize"/>
+            android:label="@string/settings"/>
        <activity
            android:name=".ImportExportActivity"
            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"
-            android:configChanges="orientation|screenSize"
            android:theme="@style/AppTheme.NoActionBar">
            <intent-filter>
                <action android:name="android.intent.action.CREATE_SHORTCUT"/>
@@ -75,7 +79,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}">
--- a/app/src/main/ic_launcher-playstore.png
+++ b/app/src/main/ic_launcher-playstore.png
--- a/app/src/main/java/protect/card_locker/BarcodeImageWriterTask.java
+++ b/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);
+            }
        }
    }
-}
+}
--- a/app/src/main/java/protect/card_locker/BarcodeSelectorActivity.java
+++ b/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();
        }
--- a/app/src/main/java/protect/card_locker/CardShortcutConfigure.java
+++ b/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)
--- a/app/src/main/java/protect/card_locker/CsvDatabaseExporter.java
+++ b/app/src/main/java/protect/card_locker/CsvDatabaseExporter.java
@@ -25,7 +25,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.STAR_STATUS);

        Cursor cursor = db.getLoyaltyCardCursor();

@@ -39,7 +40,8 @@ public class CsvDatabaseExporter implements DatabaseExporter
                    card.cardId,
                    card.headerColor,
                    card.headerTextColor,
-                    card.barcodeType);
+                    card.barcodeType,
+                    card.starStatus);

            if(Thread.currentThread().isInterrupted())
            {
--- a/app/src/main/java/protect/card_locker/CsvDatabaseImporter.java
+++ b/app/src/main/java/protect/card_locker/CsvDatabaseImporter.java
@@ -131,10 +131,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 +142,14 @@ public class CsvDatabaseImporter implements DatabaseImporter
            headerTextColor = extractInt(DBHelper.LoyaltyCardDbIds.HEADER_TEXT_COLOR, record, true);
        }

-        helper.insertLoyaltyCard(database, id, store, note, cardId, barcodeType, headerColor, headerTextColor);
+        int starStatus = 0;
+        try {
+            starStatus = extractInt(DBHelper.LoyaltyCardDbIds.STAR_STATUS, record, false);
+        } catch (FormatException _ ) {
+            // This field did not exist in versions 0.28 and before
+            // We catch this exception so we can still import old backups
+        }
+        if (starStatus != 1) starStatus = 0;
+        helper.insertLoyaltyCard(database, id, store, note, cardId, barcodeType, headerColor, headerTextColor, starStatus);
    }
 }
--- a/app/src/main/java/protect/card_locker/DBHelper.java
+++ b/app/src/main/java/protect/card_locker/DBHelper.java
@@ -9,9 +9,9 @@ import android.database.sqlite.SQLiteOpenHelper;

 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 +23,7 @@ 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 STAR_STATUS = "starstatus";
    }

    public DBHelper(Context context)
@@ -41,7 +42,8 @@ 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.STAR_STATUS + " INTEGER DEFAULT '0' )");
    }

    @Override
@@ -62,11 +64,18 @@ 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.STAR_STATUS + " INTEGER DEFAULT '0'");
+
+        }
    }

    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 int starStatus)
    {
        SQLiteDatabase db = getWritableDatabase();
        ContentValues contentValues = new ContentValues();
@@ -76,6 +85,7 @@ 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.STAR_STATUS, starStatus);
        final long newId = db.insert(LoyaltyCardDbIds.TABLE, null, contentValues);
        return newId;
    }
@@ -83,7 +93,7 @@ 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 int starStatus)
    {
        ContentValues contentValues = new ContentValues();
        contentValues.put(LoyaltyCardDbIds.ID, id);
@@ -93,6 +103,7 @@ 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.STAR_STATUS,starStatus);
        final long newId = db.insert(LoyaltyCardDbIds.TABLE, null, contentValues);
        return (newId != -1);
    }
@@ -116,6 +127,17 @@ public class DBHelper extends SQLiteOpenHelper
        return (rowsUpdated == 1);
    }

+    public boolean updateLoyaltyCardStarStatus(final int id, final int starStatus)
+    {
+        SQLiteDatabase db = getWritableDatabase();
+        ContentValues contentValues = new ContentValues();
+        contentValues.put(LoyaltyCardDbIds.STAR_STATUS,starStatus);
+        int rowsUpdated = db.update(LoyaltyCardDbIds.TABLE, contentValues,
+                LoyaltyCardDbIds.ID + "=?",
+                new String[]{Integer.toString(id)});
+        return (rowsUpdated == 1);
+    }
+
    public LoyaltyCard getLoyaltyCard(final int id)
    {
        SQLiteDatabase db = getReadableDatabase();
@@ -146,16 +168,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.STAR_STATUS + " DESC," + 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;

--- a/app/src/main/java/protect/card_locker/ImportExportActivity.java
+++ b/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);
+            }
        }
    }
 }
--- a/app/src/main/java/protect/card_locker/ImportExportTask.java
+++ b/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;
--- a/app/src/main/java/protect/card_locker/ImportURIHelper.java
+++ b/app/src/main/java/protect/card_locker/ImportURIHelper.java
@@ -0,0 +1,107 @@
+package protect.card_locker;
+
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+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 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 = "brarcher.github.io";
+        oldPath = "/loyalty-card-locker/share";
+        shareText = context.getResources().getString(R.string.intent_import_card_from_url_share_text);
+    }
+
+    private 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);
+            if (store == null || note == null || cardId == null || barcodeType == null) throw new InvalidObjectException("Not a valid import URI");
+
+            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);
+            }
+
+            return new LoyaltyCard(-1, store, note, cardId, barcodeType, headerColor, headerTextColor, 0);
+        } catch (NullPointerException | NumberFormatException ex) {
+            throw new InvalidObjectException("Not a valid import URI");
+        }
+    }
+
+    // Protected for usage in tests
+    protected Uri toUri(LoyaltyCard loyaltyCard) {
+        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());
+        }
+        //StarStatus will not be exported
+        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 void startShareIntent(LoyaltyCard loyaltyCard) {
+        startShareIntent(toUri(loyaltyCard));
+    }
+}
--- a/app/src/main/java/protect/card_locker/LoyaltyCard.java
+++ b/app/src/main/java/protect/card_locker/LoyaltyCard.java
@@ -1,7 +1,7 @@
 package protect.card_locker;

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

 public class LoyaltyCard
 {
@@ -17,8 +17,10 @@ public class LoyaltyCard
    @Nullable
    public final Integer headerTextColor;

+    public final int starStatus;
+
    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 int starStatus)
    {
        this.id = id;
        this.store = store;
@@ -27,6 +29,7 @@ public class LoyaltyCard
        this.barcodeType = barcodeType;
        this.headerColor = headerColor;
        this.headerTextColor = headerTextColor;
+        this.starStatus = starStatus;
    }

    public static LoyaltyCard toLoyaltyCard(Cursor cursor)
@@ -36,6 +39,8 @@ public class LoyaltyCard
        String note = cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.NOTE));
        String cardId = cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.CARD_ID));
        String barcodeType = cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.BARCODE_TYPE));
+        int starred = cursor.getInt(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.STAR_STATUS));
+

        int headerColorColumn = cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.HEADER_COLOR);
        int headerTextColorColumn = cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.HEADER_TEXT_COLOR);
@@ -53,6 +58,6 @@ public class LoyaltyCard
            headerTextColor = cursor.getInt(headerTextColorColumn);
        }

-        return new LoyaltyCard(id, store, note, cardId, barcodeType, headerColor, headerTextColor);
+        return new LoyaltyCard(id, store, note, cardId, barcodeType, headerColor, headerTextColor, starred);
    }
 }
--- a/app/src/main/java/protect/card_locker/LoyaltyCardCursorAdapter.java
+++ b/app/src/main/java/protect/card_locker/LoyaltyCardCursorAdapter.java
@@ -2,23 +2,27 @@ package protect.card_locker;

 import android.content.Context;
 import android.database.Cursor;
+import android.graphics.Color;
+import android.graphics.PorterDuff;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.CursorAdapter;
 import android.widget.ImageView;
 import android.widget.TextView;
-
 import protect.card_locker.preferences.Settings;

 class LoyaltyCardCursorAdapter extends CursorAdapter
 {
    Settings settings;
+    boolean darkModeEnabled;

    public LoyaltyCardCursorAdapter(Context context, Cursor cursor)
    {
        super(context, cursor, 0);
        settings = new Settings(context);
+        darkModeEnabled= MainActivity.isDarkModeEnabled(context);
+
    }

    // The newView method is used to inflate a new view and return it,
@@ -36,8 +40,14 @@ class LoyaltyCardCursorAdapter extends CursorAdapter
    {
        // Find fields to populate in inflated template
        ImageView thumbnail = view.findViewById(R.id.thumbnail);
-        TextView storeField = (TextView) view.findViewById(R.id.store);
-        TextView noteField = (TextView) view.findViewById(R.id.note);
+        TextView storeField = view.findViewById(R.id.store);
+        TextView noteField = view.findViewById(R.id.note);
+        ImageView star = view.findViewById(R.id.star);
+
+        if(darkModeEnabled)
+        {
+            star.setColorFilter(Color.WHITE, PorterDuff.Mode.SRC_ATOP);
+        }

        // Extract properties from cursor
        LoyaltyCard loyaltyCard = LoyaltyCard.toLoyaltyCard(cursor);
@@ -47,7 +57,7 @@ class LoyaltyCardCursorAdapter extends CursorAdapter

        storeField.setTextSize(settings.getCardTitleListFontSize());

-        if(loyaltyCard.note.isEmpty() == false)
+        if(!loyaltyCard.note.isEmpty())
        {
            noteField.setVisibility(View.VISIBLE);
            noteField.setText(loyaltyCard.note);
@@ -58,6 +68,9 @@ class LoyaltyCardCursorAdapter extends CursorAdapter
            noteField.setVisibility(View.GONE);
        }

+        if (loyaltyCard.starStatus!=0) star.setVisibility(View.VISIBLE);
+            else star.setVisibility(View.GONE);
+
        int tileLetterFontSize = context.getResources().getDimensionPixelSize(R.dimen.tileLetterFontSize);
        int pixelSize = context.getResources().getDimensionPixelSize(R.dimen.cardThumbnailSize);

--- a/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java
+++ b/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java
@@ -5,13 +5,16 @@ import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.res.TypedArray;
 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 +32,14 @@ import com.google.zxing.integration.android.IntentResult;
 import com.jaredrummler.android.colorpicker.ColorPickerDialog;
 import com.jaredrummler.android.colorpicker.ColorPickerDialogListener;

+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,16 +60,19 @@ public class LoyaltyCardEditActivity extends AppCompatActivity

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

    DBHelper db;
+    ImportURIHelper importUriHelper;

    private void extractIntentFields(Intent intent)
    {
        final Bundle b = intent.getExtras();
        loyaltyCardId = b != null ? b.getInt("id") : 0;
        updateLoyaltyCard = b != null && b.getBoolean("update", false);
+        importLoyaltyCardUri = intent.getData();

        Log.d(TAG, "View activity: id=" + loyaltyCardId
                + ", updateLoyaltyCard=" + Boolean.toString(updateLoyaltyCard));
@@ -86,6 +95,7 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
        extractIntentFields(getIntent());

        db = new DBHelper(this);
+        importUriHelper = new ImportURIHelper(this);

        storeFieldEdit = findViewById(R.id.storeNameEdit);
        noteFieldEdit = findViewById(R.id.noteEdit);
@@ -96,7 +106,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 +118,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 +165,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 +175,6 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
                {
                    headingColorValue = LetterBitmap.getDefaultColor(this, loyaltyCard.store);
                }
-                headingColorSample.setBackgroundColor(headingColorValue);
            }

            if(headingStoreTextColorValue == null)
@@ -173,14 +184,33 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
                {
                    headingStoreTextColorValue = Color.WHITE;
                }
-                headingStoreTextColorSample.setBackgroundColor(headingStoreTextColorValue);
            }

            setTitle(R.string.editCardTitle);
        }
+        else if(importLoyaltyCardUri != null)
+        {
+            // Try to parse
+            LoyaltyCard importCard;
+            try {
+                importCard = importUriHelper.parse(importLoyaltyCardUri);
+            } catch (InvalidObjectException ex) {
+                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;
+        }
        else
        {
            setTitle(R.string.addCardTitle);
+            hideBarcode();
        }

        if(headingColorValue == null)
@@ -190,57 +220,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 +326,14 @@ 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) {
+                doSave();
+            }
+        });
    }

    class ColorSelectListener implements View.OnClickListener
@@ -342,26 +385,33 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
        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;
        }

        if(updateLoyaltyCard)
-        {
+        {   //update of "starStatus" not necessary, since it cannot be changed in this activity (only in ViewActivity)
            db.updateLoyaltyCard(loyaltyCardId, store, note, cardId, barcodeType, headingColorValue, headingStoreTextColorValue);
            Log.i(TAG, "Updated " + loyaltyCardId + " to " + cardId);
        }
        else
        {
-            loyaltyCardId = (int)db.insertLoyaltyCard(store, note, cardId, barcodeType, headingColorValue, headingStoreTextColorValue);
+            loyaltyCardId = (int)db.insertLoyaltyCard(store, note, cardId, barcodeType, headingColorValue, headingStoreTextColorValue, 0);
        }

        finish();
@@ -425,10 +475,6 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
                dialog.show();

                return true;
-
-            case R.id.action_save:
-                doSave();
-                return true;
        }

        return super.onOptionsItemSelected(item);
@@ -437,6 +483,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 +499,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 +514,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);
+    }
 }
--- a/app/src/main/java/protect/card_locker/LoyaltyCardLockerApplication.java
+++ b/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());
+    }
+}
--- a/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java
+++ b/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java
@@ -4,17 +4,24 @@ package protect.card_locker;
 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.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,6 +29,7 @@ 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 protect.card_locker.preferences.Settings;
@@ -29,7 +37,8 @@ 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 +47,20 @@ 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 starred;
+    boolean backgroundNeedsDarkIcons;
+    boolean barcodeIsFullscreen = false;
+    ViewGroup.LayoutParams barcodeImageState;
+
    private void extractIntentFields(Intent intent)
    {
        final Bundle b = intent.getExtras();
@@ -49,6 +68,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 +104,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 +112,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 +147,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 +177,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 +224,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,11 +309,38 @@ 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);
+        }
+
+        loyaltyCard = db.getLoyaltyCard(loyaltyCardId);
+        starred = loyaltyCard.starStatus != 0;
+
+        menu.findItem(R.id.action_share).setIcon(getIcon(R.drawable.ic_share_white, backgroundNeedsDarkIcons));

        return super.onCreateOptionsMenu(menu);
    }

+
+    @Override
+    public boolean onPrepareOptionsMenu(Menu menu) {
+        super.onPrepareOptionsMenu(menu);
+        if (starred) {
+            menu.findItem(R.id.action_star_unstar).setIcon(getIcon(R.drawable.ic_starred_white, backgroundNeedsDarkIcons));
+            menu.findItem(R.id.action_star_unstar).setTitle(R.string.unstar);
+        }
+        else {
+            menu.findItem(R.id.action_star_unstar).setIcon(getIcon(R.drawable.ic_unstarred_white, backgroundNeedsDarkIcons));
+            menu.findItem(R.id.action_star_unstar).setTitle(R.string.star);
+        }
+        return true;
+    }
+
    @Override
    public boolean onOptionsItemSelected(MenuItem item)
    {
@@ -214,33 +352,121 @@ 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_star_unstar:
+                starred = !starred;
+                db.updateLoyaltyCardStarStatus(loyaltyCardId, starred ? 1 : 0);
+                invalidateOptionsMenu();
+                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_UNSPECIFIED);
+        }
+    }
+
+    /**
+     * 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;
+        }
+    }
+}
--- a/app/src/main/java/protect/card_locker/MainActivity.java
+++ b/app/src/main/java/protect/card_locker/MainActivity.java
@@ -1,17 +1,16 @@
 package protect.card_locker;

+import android.app.SearchManager;
 import android.content.ClipData;
+import android.content.ClipboardManager;
+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 android.util.Log;
 import android.view.ContextMenu;
 import android.view.Menu;
@@ -23,18 +22,23 @@ import android.widget.AdapterView;
 import android.widget.ListView;
 import android.widget.TextView;
 import android.widget.Toast;
-
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.SearchView;
+import androidx.appcompat.widget.Toolbar;
+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 +48,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 +166,7 @@ public class MainActivity extends AppCompatActivity

                ShortcutHelper.updateShortcuts(MainActivity.this, loyaltyCard, i);

-                startActivity(i);
+                startActivityForResult(i, MAIN_REQUEST_CODE);
            }
        });
    }
@@ -126,7 +191,7 @@ 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(item.getItemId() == R.id.action_clipboard)
        {
            ClipboardManager clipboard = (ClipboardManager) getSystemService(CLIPBOARD_SERVICE);
            ClipData clip = ClipData.newPlainText(card.store, card.cardId);
@@ -135,6 +200,12 @@ public class MainActivity extends AppCompatActivity
            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);
+            importURIHelper.startShareIntent(card);
+            return true;
+        }

        return super.onContextItemSelected(item);
    }
@@ -142,7 +213,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 +254,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 +323,17 @@ public class MainActivity extends AppCompatActivity
        }

        WebView wv = new WebView(this);
+
+        // Set CSS for dark mode if dark mode
+        String css = "";
+        if(isDarkModeEnabled(this))
+        {
+            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 +346,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>" +
@@ -273,9 +373,11 @@ public class MainActivity extends AppCompatActivity
            .show();
    }

-    private void startIntro()
+    protected static boolean isDarkModeEnabled(Context inputContext)
    {
-        Intent intent = new Intent(this, IntroActivity.class);
-        startActivity(intent);
+        Configuration config = inputContext.getResources().getConfiguration();
+        int currentNightMode = config.uiMode & Configuration.UI_MODE_NIGHT_MASK;
+        return (currentNightMode == Configuration.UI_MODE_NIGHT_YES);
    }
+
 }
--- a/app/src/main/java/protect/card_locker/MultiFormatExporter.java
+++ b/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
--- a/app/src/main/java/protect/card_locker/MultiFormatImporter.java
+++ b/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
--- a/app/src/main/java/protect/card_locker/intro/IntroActivity.java
+++ b/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();
-    }
-}
-
-
--- a/app/src/main/java/protect/card_locker/intro/IntroSlide1.java
+++ b/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;
-    }
-}
--- a/app/src/main/java/protect/card_locker/intro/IntroSlide2.java
+++ b/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;
-    }
-}
--- a/app/src/main/java/protect/card_locker/intro/IntroSlide3.java
+++ b/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;
-    }
-}
--- a/app/src/main/java/protect/card_locker/intro/IntroSlide4.java
+++ b/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;
-    }
-}
--- a/app/src/main/java/protect/card_locker/intro/IntroSlide5.java
+++ b/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;
-    }
-}
--- a/app/src/main/java/protect/card_locker/intro/IntroSlide6.java
+++ b/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;
-    }
-}
--- a/app/src/main/java/protect/card_locker/preferences/Settings.java
+++ b/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);
+    }
 }
--- a/app/src/main/java/protect/card_locker/preferences/SettingsActivity.java
+++ b/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;
+                }
+            });
        }
    }
 }
--- a/app/src/main/res/drawable-hdpi/app_icon_intro.png
+++ b/app/src/main/res/drawable-hdpi/app_icon_intro.png
--- a/app/src/main/res/drawable-hdpi/ic_arrow_back_white.png
+++ b/app/src/main/res/drawable-hdpi/ic_arrow_back_white.png
--- a/app/src/main/res/drawable-hdpi/ic_search_white.png
+++ b/app/src/main/res/drawable-hdpi/ic_search_white.png
--- a/app/src/main/res/drawable-hdpi/ic_share_white.png
+++ b/app/src/main/res/drawable-hdpi/ic_share_white.png
--- a/app/src/main/res/drawable-hdpi/ic_starred_white.png
+++ b/app/src/main/res/drawable-hdpi/ic_starred_white.png
--- a/app/src/main/res/drawable-hdpi/ic_unstarred_white.png
+++ b/app/src/main/res/drawable-hdpi/ic_unstarred_white.png
--- a/app/src/main/res/drawable-hdpi/intro2_image.png
+++ b/app/src/main/res/drawable-hdpi/intro2_image.png
--- a/app/src/main/res/drawable-hdpi/intro3_image.png
+++ b/app/src/main/res/drawable-hdpi/intro3_image.png
--- a/app/src/main/res/drawable-hdpi/intro4_image.png
+++ b/app/src/main/res/drawable-hdpi/intro4_image.png
--- a/app/src/main/res/drawable-hdpi/intro5_image.png
+++ b/app/src/main/res/drawable-hdpi/intro5_image.png
--- a/app/src/main/res/drawable-hdpi/save_24dp.png
+++ b/app/src/main/res/drawable-hdpi/save_24dp.png
--- a/app/src/main/res/drawable-mdpi/app_icon_intro.png
+++ b/app/src/main/res/drawable-mdpi/app_icon_intro.png
--- a/app/src/main/res/drawable-mdpi/ic_arrow_back_white.png
+++ b/app/src/main/res/drawable-mdpi/ic_arrow_back_white.png
--- a/app/src/main/res/drawable-mdpi/ic_search_white.png
+++ b/app/src/main/res/drawable-mdpi/ic_search_white.png
--- a/app/src/main/res/drawable-mdpi/ic_share_white.png
+++ b/app/src/main/res/drawable-mdpi/ic_share_white.png
--- a/app/src/main/res/drawable-mdpi/ic_starred_white.png
+++ b/app/src/main/res/drawable-mdpi/ic_starred_white.png
--- a/app/src/main/res/drawable-mdpi/ic_unstarred_white.png
+++ b/app/src/main/res/drawable-mdpi/ic_unstarred_white.png
--- a/app/src/main/res/drawable-mdpi/intro2_image.png
+++ b/app/src/main/res/drawable-mdpi/intro2_image.png
--- a/app/src/main/res/drawable-mdpi/intro3_image.png
+++ b/app/src/main/res/drawable-mdpi/intro3_image.png
--- a/app/src/main/res/drawable-mdpi/intro4_image.png
+++ b/app/src/main/res/drawable-mdpi/intro4_image.png
--- a/app/src/main/res/drawable-mdpi/intro5_image.png
+++ b/app/src/main/res/drawable-mdpi/intro5_image.png
--- a/app/src/main/res/drawable-mdpi/save_24dp.png
+++ b/app/src/main/res/drawable-mdpi/save_24dp.png
--- a/app/src/main/res/drawable-nodpi/circle.png
+++ b/app/src/main/res/drawable-nodpi/circle.png
--- a/app/src/main/res/drawable-xhdpi/app_icon_intro.png
+++ b/app/src/main/res/drawable-xhdpi/app_icon_intro.png
--- a/app/src/main/res/drawable-xhdpi/ic_arrow_back_white.png
+++ b/app/src/main/res/drawable-xhdpi/ic_arrow_back_white.png
--- a/app/src/main/res/drawable-xhdpi/ic_search_white.png
+++ b/app/src/main/res/drawable-xhdpi/ic_search_white.png
--- a/app/src/main/res/drawable-xhdpi/ic_share_white.png
+++ b/app/src/main/res/drawable-xhdpi/ic_share_white.png
--- a/app/src/main/res/drawable-xhdpi/ic_starred_white.png
+++ b/app/src/main/res/drawable-xhdpi/ic_starred_white.png
--- a/app/src/main/res/drawable-xhdpi/ic_unstarred_white.png
+++ b/app/src/main/res/drawable-xhdpi/ic_unstarred_white.png
--- a/app/src/main/res/drawable-xhdpi/intro2_image.png
+++ b/app/src/main/res/drawable-xhdpi/intro2_image.png
--- a/app/src/main/res/drawable-xhdpi/intro3_image.png
+++ b/app/src/main/res/drawable-xhdpi/intro3_image.png
--- a/app/src/main/res/drawable-xhdpi/intro4_image.png
+++ b/app/src/main/res/drawable-xhdpi/intro4_image.png
--- a/app/src/main/res/drawable-xhdpi/intro5_image.png
+++ b/app/src/main/res/drawable-xhdpi/intro5_image.png
--- a/app/src/main/res/drawable-xhdpi/save_24dp.png
+++ b/app/src/main/res/drawable-xhdpi/save_24dp.png
--- a/app/src/main/res/drawable-xxhdpi/app_icon_intro.png
+++ b/app/src/main/res/drawable-xxhdpi/app_icon_intro.png
--- a/app/src/main/res/drawable-xxhdpi/ic_arrow_back_white.png
+++ b/app/src/main/res/drawable-xxhdpi/ic_arrow_back_white.png
--- a/app/src/main/res/drawable-xxhdpi/ic_search_white.png
+++ b/app/src/main/res/drawable-xxhdpi/ic_search_white.png
--- a/app/src/main/res/drawable-xxhdpi/ic_share_white.png
+++ b/app/src/main/res/drawable-xxhdpi/ic_share_white.png
--- a/app/src/main/res/drawable-xxhdpi/ic_starred_white.png
+++ b/app/src/main/res/drawable-xxhdpi/ic_starred_white.png
--- a/app/src/main/res/drawable-xxhdpi/ic_unstarred_white.png
+++ b/app/src/main/res/drawable-xxhdpi/ic_unstarred_white.png
--- a/app/src/main/res/drawable-xxhdpi/intro2_image.png
+++ b/app/src/main/res/drawable-xxhdpi/intro2_image.png
--- a/app/src/main/res/drawable-xxhdpi/intro3_image.png
+++ b/app/src/main/res/drawable-xxhdpi/intro3_image.png
--- a/app/src/main/res/drawable-xxhdpi/intro4_image.png
+++ b/app/src/main/res/drawable-xxhdpi/intro4_image.png
--- a/app/src/main/res/drawable-xxhdpi/intro5_image.png
+++ b/app/src/main/res/drawable-xxhdpi/intro5_image.png
--- a/app/src/main/res/drawable-xxhdpi/save_24dp.png
+++ b/app/src/main/res/drawable-xxhdpi/save_24dp.png
--- a/app/src/main/res/drawable-xxxhdpi/app_icon_intro.png
+++ b/app/src/main/res/drawable-xxxhdpi/app_icon_intro.png
--- a/app/src/main/res/drawable-xxxhdpi/intro2_image.png
+++ b/app/src/main/res/drawable-xxxhdpi/intro2_image.png
--- a/app/src/main/res/drawable-xxxhdpi/intro3_image.png
+++ b/app/src/main/res/drawable-xxxhdpi/intro3_image.png
--- a/app/src/main/res/drawable-xxxhdpi/intro4_image.png
+++ b/app/src/main/res/drawable-xxxhdpi/intro4_image.png
--- a/app/src/main/res/drawable-xxxhdpi/intro5_image.png
+++ b/app/src/main/res/drawable-xxxhdpi/intro5_image.png
--- a/app/src/main/res/drawable-xxxhdpi/save_24dp.png
+++ b/app/src/main/res/drawable-xxxhdpi/save_24dp.png
--- a/app/src/main/res/drawable/ic_android_launcher.xml
+++ b/app/src/main/res/drawable/ic_android_launcher.xml
@@ -0,0 +1,66 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="192dp"
+    android:height="192dp"
+    android:viewportWidth="50.8"
+    android:viewportHeight="50.8">
+  <path
+      android:pathData="M14.3354,20.1954l20.7318,-9.2304l5.7612,12.9398l-20.7318,9.2304z"
+      android:strokeLineJoin="miter"
+      android:strokeWidth="0.529167"
+      android:fillColor="#f0f0f0"
+      android:strokeColor="#c80000"/>
+  <path
+      android:pathData="M14.8755,10.9648l23.2041,10.3311l-6.8874,15.4694l-23.2041,-10.3311z"
+      android:strokeLineJoin="miter"
+      android:strokeWidth="0.529167"
+      android:fillColor="#f0f0f0"
+      android:strokeColor="#c80000"/>
+  <path
+      android:pathData="M16.5599,16.1348l26.5459,7.6119l-4.5489,15.8639l-26.5459,-7.6119z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="1.5875"
+      android:fillColor="#c80000"
+      android:strokeColor="#c80000"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M12.011,15.4955h27.6157v16.5032h-27.6157z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="1.5875"
+      android:fillColor="#ff0000"
+      android:strokeColor="#ff0000"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M7.8471,23.7471a4.3659,8.5899 0,1 0,8.7317 0a4.3659,8.5899 0,1 0,-8.7317 0z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="0.91078"
+      android:fillColor="#ff0000"
+      android:strokeColor="#ff0000"/>
+  <path
+      android:pathData="m24.4983,25.781a1.6711,1.6711 0,0 1,-1.3809 1.6457,1.6711 1.6711,0 0,1 -1.8605,-1.0741"
+      android:strokeLineJoin="round"
+      android:strokeWidth="0.529167"
+      android:fillColor="#00000000"
+      android:strokeColor="#f0f0f0"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="m27.7991,26.333a1.6711,1.6711 0,0 1,-1.8605 1.0741,1.6711 1.6711,0 0,1 -1.3809,-1.6457"
+      android:strokeLineJoin="round"
+      android:strokeWidth="0.529167"
+      android:fillColor="#00000000"
+      android:strokeColor="#f0f0f0"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="m16.0606,22.271 l2.6458,-2.6458 2.6458,2.6458"
+      android:strokeLineJoin="miter"
+      android:strokeWidth="0.529167"
+      android:fillColor="#00000000"
+      android:strokeColor="#f0f0f0"
+      android:strokeLineCap="butt"/>
+  <path
+      android:pathData="m27.7023,22.271 l2.6458,-2.6458 2.6458,2.6458"
+      android:strokeLineJoin="miter"
+      android:strokeWidth="0.529167"
+      android:fillColor="#00000000"
+      android:strokeColor="#f0f0f0"
+      android:strokeLineCap="butt"/>
+</vector>
--- a/app/src/main/res/drawable/ic_launcher_foreground.xml
+++ b/app/src/main/res/drawable/ic_launcher_foreground.xml
@@ -0,0 +1,71 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+  <group android:scaleX="1.5307087"
+      android:scaleY="1.5307087"
+      android:translateX="15.12"
+      android:translateY="15.12">
+    <path
+        android:pathData="M14.3354,20.1954l20.7318,-9.2304l5.7612,12.9398l-20.7318,9.2304z"
+        android:strokeLineJoin="miter"
+        android:strokeWidth="0.529167"
+        android:fillColor="#f0f0f0"
+        android:strokeColor="#c80000"/>
+    <path
+        android:pathData="M14.8755,10.9648l23.2041,10.3311l-6.8874,15.4694l-23.2041,-10.3311z"
+        android:strokeLineJoin="miter"
+        android:strokeWidth="0.529167"
+        android:fillColor="#f0f0f0"
+        android:strokeColor="#c80000"/>
+    <path
+        android:pathData="M16.5599,16.1348l26.5459,7.6119l-4.5489,15.8639l-26.5459,-7.6119z"
+        android:strokeLineJoin="round"
+        android:strokeWidth="1.5875"
+        android:fillColor="#c80000"
+        android:strokeColor="#c80000"
+        android:fillType="evenOdd"/>
+    <path
+        android:pathData="M12.011,15.4955h27.6157v16.5032h-27.6157z"
+        android:strokeLineJoin="round"
+        android:strokeWidth="1.5875"
+        android:fillColor="#ff0000"
+        android:strokeColor="#ff0000"
+        android:fillType="evenOdd"/>
+    <path
+        android:pathData="M7.8471,23.7471a4.3659,8.5899 0,1 0,8.7317 0a4.3659,8.5899 0,1 0,-8.7317 0z"
+        android:strokeLineJoin="round"
+        android:strokeWidth="0.91078"
+        android:fillColor="#ff0000"
+        android:strokeColor="#ff0000"/>
+    <path
+        android:pathData="m24.4983,25.781a1.6711,1.6711 0,0 1,-1.3809 1.6457,1.6711 1.6711,0 0,1 -1.8605,-1.0741"
+        android:strokeLineJoin="round"
+        android:strokeWidth="0.529167"
+        android:fillColor="#00000000"
+        android:strokeColor="#f0f0f0"
+        android:strokeLineCap="round"/>
+    <path
+        android:pathData="m27.7991,26.333a1.6711,1.6711 0,0 1,-1.8605 1.0741,1.6711 1.6711,0 0,1 -1.3809,-1.6457"
+        android:strokeLineJoin="round"
+        android:strokeWidth="0.529167"
+        android:fillColor="#00000000"
+        android:strokeColor="#f0f0f0"
+        android:strokeLineCap="round"/>
+    <path
+        android:pathData="m16.0606,22.271 l2.6458,-2.6458 2.6458,2.6458"
+        android:strokeLineJoin="miter"
+        android:strokeWidth="0.529167"
+        android:fillColor="#00000000"
+        android:strokeColor="#f0f0f0"
+        android:strokeLineCap="butt"/>
+    <path
+        android:pathData="m27.7023,22.271 l2.6458,-2.6458 2.6458,2.6458"
+        android:strokeLineJoin="miter"
+        android:strokeWidth="0.529167"
+        android:fillColor="#00000000"
+        android:strokeColor="#f0f0f0"
+        android:strokeLineCap="butt"/>
+  </group>
+</vector>
--- a/app/src/main/res/layout/barcode_selector_activity.xml
+++ b/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>
--- a/app/src/main/res/layout/content_main.xml
+++ b/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"
--- a/app/src/main/res/layout/import_export_activity.xml
+++ b/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>
--- a/app/src/main/res/layout/intro1_layout.xml
+++ b/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>
--- a/app/src/main/res/layout/intro2_layout.xml
+++ b/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>
--- a/app/src/main/res/layout/intro3_layout.xml
+++ b/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>
--- a/app/src/main/res/layout/intro4_layout.xml
+++ b/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>
--- a/app/src/main/res/layout/intro5_layout.xml
+++ b/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>
--- a/app/src/main/res/layout/intro6_layout.xml
+++ b/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>
--- a/app/src/main/res/layout/loyalty_card_edit_activity.xml
+++ b/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>
--- a/app/src/main/res/layout/loyalty_card_layout.xml
+++ b/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"/>

@@ -53,5 +52,12 @@
            android:ellipsize="end"
            android:textSize="@dimen/noteTextSize"/>
    </LinearLayout>
-
+    <ImageView
+        android:id="@+id/star"
+        android:layout_width="@dimen/cardThumbnailSize"
+        android:layout_height="@dimen/cardThumbnailSize"
+        android:layout_marginLeft="@dimen/activity_margin"
+        android:src="@drawable/ic_starred_white"
+        android:tint="#000000"
+        android:contentDescription="@string/starImage"/>
 </LinearLayout>
--- a/Show More
+++ b/Show More