Fix typo in merge

.github/workflows/android.yml

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

.travis.yml

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

CHANGELOG.md

@@ -1,10 +1,3 @@
-## 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:

app/build.gradle

@@ -10,20 +10,17 @@ android {
     compileSdkVersion 29
 
     defaultConfig {
-        applicationId "me.hackerchick.catima"
+        applicationId "protect.card_locker"
         minSdkVersion 16
         targetSdkVersion 29
-        versionCode 39
-        versionName "0.28"
+        versionCode 38
+        versionName "0.27"
     }
     buildTypes {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
-        debug {
-            applicationIdSuffix ".debug"
-        }
     }
     lintOptions {
         disable "GoogleAppIndexingWarning"
@@ -32,11 +29,6 @@ android {
         disable "MissingTranslation"
         disable "MissingPrefix"
     }
-    sourceSets {
-        test {
-            resources.srcDirs += ['src/test/resources']
-        }
-    }
 
     // Starting with Android Studio 3 Robolectric is unable to find resources.
     // The following allows it to find the resources.
@@ -49,7 +41,7 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'androidx.appcompat:appcompat:1.2.0'
+    compile 'androidx.appcompat:appcompat:1.2.0-alpha01'
     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'

app/src/main/AndroidManifest.xml

@@ -45,30 +45,14 @@
             android:configChanges="orientation|screenSize"
             android:windowSoftInputMode="stateHidden"
             android:exported="true">
-            <intent-filter android:label="@string/app_name">
+            <intent-filter android:label="@string/intent_import_card_from_url">
                 <action android:name="android.intent.action.VIEW" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
-                <!-- Accepts URIs that begin with "https://thelastproject.github.io/Catima/share" or "https://brarcher.github.io/loyalty-card-locker/share” -->
+                <!-- 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>
-            <intent-filter android:label="@string/app_name">
-                <action android:name="android.intent.action.VIEW"/>
-                <category android:name="android.intent.category.DEFAULT"/>
-                <!-- Accept pkpass files -->
-                <data android:scheme="content" android:mimeType="application/octet-stream"/>
-                <data android:scheme="content" android:mimeType="application/x-compressed"/>
-                <data android:scheme="content" android:mimeType="application/x-zip-compressed"/>
-                <data android:scheme="content" android:mimeType="application/zip"/>
-                <data android:scheme="content" android:mimeType="application/vnd.apple.pkpass"/>
-                <data android:scheme="content" android:mimeType="application/pkpass"/>
-                <data android:scheme="content" android:mimeType="application/vndapplepkpass"/>
-                <data android:scheme="content" android:mimeType="application/vnd-com.apple.pkpass"/>
             </intent-filter>
         </activity>
         <activity
@@ -86,6 +70,11 @@
             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"

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

@@ -5,7 +5,6 @@ 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;
@@ -21,7 +20,7 @@ import java.lang.ref.WeakReference;
  */
 class BarcodeImageWriterTask extends AsyncTask<Void, Void, Bitmap>
 {
-    private static final String TAG = "Catima";
+    private static final String TAG = "LoyaltyCardLocker";
 
     // When drawn in a smaller window 1D barcodes for some reason end up
     // squished, whereas 2D barcodes look fine.
@@ -29,18 +28,16 @@ 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, TextView textView)
+                                  BarcodeFormat barcodeFormat)
     {
         // Use a WeakReference to ensure the ImageView can be garbage collected
         imageViewReference = new WeakReference<>(imageView);
-        textViewReference = new WeakReference<>(textView);
 
         cardId = cardIdString;
         format = barcodeFormat;
@@ -61,11 +58,6 @@ 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)
@@ -183,25 +175,16 @@ class BarcodeImageWriterTask extends AsyncTask<Void, Void, Bitmap>
         }
 
         imageView.setImageBitmap(result);
-        TextView textView = textViewReference.get();
 
         if(result != null)
         {
             Log.i(TAG, "Displaying barcode");
             imageView.setVisibility(View.VISIBLE);
-
-            if (textView != null) {
-                textView.setVisibility(View.VISIBLE);
-                textView.setText(format.name());
-            }
         }
         else
         {
             Log.i(TAG, "Barcode generation failed, removing image from display");
             imageView.setVisibility(View.GONE);
-            if (textView != null) {
-                textView.setVisibility(View.GONE);
-            }
         }
     }
 }

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

@@ -11,13 +11,11 @@ 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;
@@ -36,7 +34,7 @@ import java.util.Map;
  */
 public class BarcodeSelectorActivity extends AppCompatActivity
 {
-    private static final String TAG = "Catima";
+    private static final String TAG = "LoyaltyCardLocker";
 
     // Result this activity will return
     public static final String BARCODE_CONTENTS = "contents";
@@ -60,7 +58,7 @@ public class BarcodeSelectorActivity extends AppCompatActivity
                 BarcodeFormat.UPC_A.name()
         ));
 
-    private Map<String, Pair<Integer, Integer>> barcodeViewMap;
+    private Map<String, Integer> barcodeViewMap;
     private LinkedList<AsyncTask> barcodeGeneratorTasks = new LinkedList<>();
 
     @Override
@@ -77,18 +75,18 @@ public class BarcodeSelectorActivity extends AppCompatActivity
             actionBar.setDisplayHomeAsUpEnabled(true);
         }
 
-        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))
+        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)
                 .build();
 
         EditText cardId = findViewById(R.id.cardId);
@@ -115,9 +113,8 @@ public class BarcodeSelectorActivity extends AppCompatActivity
                 // Update barcodes
                 for(String key : barcodeViewMap.keySet())
                 {
-                    ImageView image = findViewById(barcodeViewMap.get(key).first);
-                    TextView text = findViewById(barcodeViewMap.get(key).second);
-                    createBarcodeOption(image, key, s.toString(), text);
+                    ImageView image = findViewById(barcodeViewMap.get(key));
+                    createBarcodeOption(image, key, s.toString());
                 }
 
                 View noBarcodeButtonView = findViewById(R.id.noBarcode);
@@ -156,7 +153,7 @@ public class BarcodeSelectorActivity extends AppCompatActivity
         });
     }
 
-    private void createBarcodeOption(final ImageView image, final String formatType, final String cardId, final TextView text)
+    private void createBarcodeOption(final ImageView image, final String formatType, final String cardId)
     {
         final BarcodeFormat format = BarcodeFormat.valueOf(formatType);
         if(format == null)
@@ -201,7 +198,7 @@ public class BarcodeSelectorActivity extends AppCompatActivity
                         }
 
                         Log.d(TAG, "Generating barcode for type " + formatType);
-                        BarcodeImageWriterTask task = new BarcodeImageWriterTask(image, cardId, format, text);
+                        BarcodeImageWriterTask task = new BarcodeImageWriterTask(image, cardId, format);
                         barcodeGeneratorTasks.add(task);
                         task.execute();
                     }
@@ -210,7 +207,7 @@ public class BarcodeSelectorActivity extends AppCompatActivity
         else
         {
             Log.d(TAG, "Generating barcode for type " + formatType);
-            BarcodeImageWriterTask task = new BarcodeImageWriterTask(image, cardId, format, text);
+            BarcodeImageWriterTask task = new BarcodeImageWriterTask(image, cardId, format);
             barcodeGeneratorTasks.add(task);
             task.execute();
         }

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

@@ -17,7 +17,7 @@ import android.widget.Toast;
  */
 public class CardShortcutConfigure extends AppCompatActivity
 {
-    static final String TAG = "Catima";
+    static final String TAG = "LoyaltyCardLocker";
 
     @Override
     public void onCreate(Bundle bundle)

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

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

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

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

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

@@ -6,20 +6,15 @@ import android.content.Context;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteOpenHelper;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
 
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.io.ByteArrayOutputStream;
-import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.List;
 
 public class DBHelper extends SQLiteOpenHelper
 {
-    public static final String DATABASE_NAME = "Catima.db";
+    public static final String DATABASE_NAME = "LoyaltyCards.db";
     public static final int ORIGINAL_DATABASE_VERSION = 1;
-    public static final int DATABASE_VERSION = 4;
+    public static final int DATABASE_VERSION = 3;
 
     static class LoyaltyCardDbIds
     {
@@ -31,8 +26,6 @@ public class DBHelper extends SQLiteOpenHelper
         public static final String HEADER_TEXT_COLOR = "headertextcolor";
         public static final String CARD_ID = "cardid";
         public static final String BARCODE_TYPE = "barcodetype";
-        public static final String ICON = "icon";
-        public static final String EXTRAS = "extras";
     }
 
     public DBHelper(Context context)
@@ -40,19 +33,6 @@ public class DBHelper extends SQLiteOpenHelper
         super(context, DATABASE_NAME, null, DATABASE_VERSION);
     }
 
-    public static byte[] convertBitmapToBlob(Bitmap bitmap)
-    {
-        // https://stackoverflow.com/a/7620610
-        ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
-        bitmap.compress(Bitmap.CompressFormat.PNG, 0, byteArrayOutputStream);
-        return byteArrayOutputStream.toByteArray();
-    }
-
-    public static Bitmap convertBitmapBlobToBitmap(byte[] bytes)
-    {
-        return BitmapFactory.decodeByteArray(bytes, 0, bytes.length);
-    }
-
     @Override
     public void onCreate(SQLiteDatabase db)
     {
@@ -64,9 +44,7 @@ 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.ICON + " BLOB," +
-                LoyaltyCardDbIds.EXTRAS + " TEXT)");
+                LoyaltyCardDbIds.BARCODE_TYPE + " TEXT not null)");
     }
 
     @Override
@@ -87,21 +65,11 @@ public class DBHelper extends SQLiteOpenHelper
             db.execSQL("ALTER TABLE " + LoyaltyCardDbIds.TABLE
                     + " ADD COLUMN " + LoyaltyCardDbIds.HEADER_TEXT_COLOR + " INTEGER");
         }
-
-        // Upgrade from version 3 to version 4
-        if(oldVersion < 4 && newVersion >= 4)
-        {
-            db.execSQL("ALTER TABLE " + LoyaltyCardDbIds.TABLE
-                    + " ADD COLUMN " + LoyaltyCardDbIds.ICON + " BLOB");
-            db.execSQL("ALTER TABLE " + LoyaltyCardDbIds.TABLE
-                    + " ADD COLUMN " + LoyaltyCardDbIds.EXTRAS + " TEXT");
-        }
     }
 
     public long insertLoyaltyCard(final String store, final String note, final String cardId,
                                   final String barcodeType, final Integer headerColor,
-                                  final Integer headerTextColor, final Bitmap icon,
-                                  final ExtrasHelper extras) throws JSONException
+                                  final Integer headerTextColor)
     {
         SQLiteDatabase db = getWritableDatabase();
         ContentValues contentValues = new ContentValues();
@@ -111,8 +79,6 @@ public class DBHelper extends SQLiteOpenHelper
         contentValues.put(LoyaltyCardDbIds.BARCODE_TYPE, barcodeType);
         contentValues.put(LoyaltyCardDbIds.HEADER_COLOR, headerColor);
         contentValues.put(LoyaltyCardDbIds.HEADER_TEXT_COLOR, headerTextColor);
-        contentValues.put(LoyaltyCardDbIds.ICON, icon != null ? convertBitmapToBlob(icon) : null);
-        contentValues.put(LoyaltyCardDbIds.EXTRAS, extras.toJSON().toString());
         final long newId = db.insert(LoyaltyCardDbIds.TABLE, null, contentValues);
         return newId;
     }
@@ -120,8 +86,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 Bitmap icon,
-                                     final ExtrasHelper extras) throws JSONException
+                                     final Integer headerTextColor)
     {
         ContentValues contentValues = new ContentValues();
         contentValues.put(LoyaltyCardDbIds.ID, id);
@@ -131,8 +96,6 @@ public class DBHelper extends SQLiteOpenHelper
         contentValues.put(LoyaltyCardDbIds.BARCODE_TYPE, barcodeType);
         contentValues.put(LoyaltyCardDbIds.HEADER_COLOR, headerColor);
         contentValues.put(LoyaltyCardDbIds.HEADER_TEXT_COLOR, headerTextColor);
-        contentValues.put(LoyaltyCardDbIds.ICON, icon != null ? convertBitmapToBlob(icon) : null);
-        contentValues.put(LoyaltyCardDbIds.EXTRAS, extras.toJSON().toString());
         final long newId = db.insert(LoyaltyCardDbIds.TABLE, null, contentValues);
         return (newId != -1);
     }
@@ -140,8 +103,7 @@ public class DBHelper extends SQLiteOpenHelper
 
     public boolean updateLoyaltyCard(final int id, final String store, final String note,
                                      final String cardId, final String barcodeType,
-                                     final Integer headerColor, final Integer headerTextColor,
-                                     final Bitmap icon, final ExtrasHelper extras) throws JSONException
+                                     final Integer headerColor, final Integer headerTextColor)
     {
         SQLiteDatabase db = getWritableDatabase();
         ContentValues contentValues = new ContentValues();
@@ -151,8 +113,6 @@ public class DBHelper extends SQLiteOpenHelper
         contentValues.put(LoyaltyCardDbIds.BARCODE_TYPE, barcodeType);
         contentValues.put(LoyaltyCardDbIds.HEADER_COLOR, headerColor);
         contentValues.put(LoyaltyCardDbIds.HEADER_TEXT_COLOR, headerTextColor);
-        contentValues.put(LoyaltyCardDbIds.ICON, icon != null ? convertBitmapToBlob(icon) : null);
-        contentValues.put(LoyaltyCardDbIds.EXTRAS, extras.toJSON().toString());
         int rowsUpdated = db.update(LoyaltyCardDbIds.TABLE, contentValues,
                 LoyaltyCardDbIds.ID + "=?",
                 new String[]{Integer.toString(id)});
@@ -213,6 +173,57 @@ public class DBHelper extends SQLiteOpenHelper
         return res;
     }
 
+    /**
+     * Returns a cursor only containing the first loyalty card of the given store.
+     *
+     * @param filter
+     * @return Cursor
+     */
+    public Cursor getOneLoyaltyCardPerStoreCursor(final String filter)
+    {
+        String actualFilter = String.format("%%%s%%", filter);
+        String[] selectionArgs = { actualFilter, actualFilter };
+
+        SQLiteDatabase db = getReadableDatabase();
+
+        Cursor res = db.rawQuery("select * from " + LoyaltyCardDbIds.TABLE +
+                " WHERE " + LoyaltyCardDbIds.STORE + "  LIKE ? " +
+                " OR " + LoyaltyCardDbIds.NOTE + " LIKE ? " +
+                " GROUP BY " + LoyaltyCardDbIds.STORE +
+                " HAVING MIN(" + LoyaltyCardDbIds.ID + ")" +
+                " ORDER BY " + LoyaltyCardDbIds.STORE + " COLLATE NOCASE ASC", selectionArgs, null);
+        return res;
+    }
+
+    /**
+     * Returns a list of all loyalty cards of the given store.
+     *
+     * @param store
+     * @return List<LoyaltyCard>
+     */
+    public List<LoyaltyCard> getLoyaltyCardsForStore(String store)
+    {
+        List<LoyaltyCard> loyaltyCards = new ArrayList<>();
+
+        SQLiteDatabase db = getReadableDatabase();
+        String[] selectionArgs = { store };
+
+        Cursor res = db.rawQuery("select * from " + LoyaltyCardDbIds.TABLE +
+                " WHERE " + LoyaltyCardDbIds.STORE + "  IS ? " +
+                " ORDER BY " + LoyaltyCardDbIds.STORE + " COLLATE NOCASE ASC", selectionArgs, null);
+
+        try
+        {
+            while (res.moveToNext()) {
+                loyaltyCards.add(LoyaltyCard.toLoyaltyCard(res));
+            }
+        } finally {
+            res.close();
+        }
+
+        return loyaltyCards;
+    }
+
     public int getLoyaltyCardCount()
     {
         // An empty string will match everything

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

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

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

@@ -10,14 +10,15 @@ import android.content.pm.ResolveInfo;
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Bundle;
+import android.os.Environment;
 
 import androidx.core.app.ActivityCompat;
 import androidx.core.content.ContextCompat;
+import androidx.core.content.FileProvider;
 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;
@@ -27,21 +28,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 = "Catima";
+    private static final String TAG = "LoyaltyCardLocker";
 
     private static final int PERMISSIONS_EXTERNAL_STORAGE = 1;
-    private static final int CHOOSE_EXPORT_LOCATION = 2;
-    private static final int CHOOSE_EXPORTED_FILE = 3;
+    private static final int CHOOSE_EXPORT_FILE = 2;
 
     private ImportExportTask importExporter;
 
+    private final File sdcardDir = Environment.getExternalStorageDirectory();
+    private final File exportFile = new File(sdcardDir, "LoyaltyCardKeychain.csv");
+
     @Override
     protected void onCreate(Bundle savedInstanceState)
     {
@@ -69,11 +70,6 @@ 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()
@@ -81,7 +77,7 @@ public class ImportExportActivity extends AppCompatActivity
             @Override
             public void onClick(View v)
             {
-                chooseFileWithIntent(intentCreateDocumentAction, CHOOSE_EXPORT_LOCATION);
+                startExport();
             }
         });
 
@@ -90,13 +86,14 @@ public class ImportExportActivity extends AppCompatActivity
         intentGetContentAction.addCategory(Intent.CATEGORY_OPENABLE);
         intentGetContentAction.setType("*/*");
 
+
         Button importFilesystem = findViewById(R.id.importOptionFilesystemButton);
         importFilesystem.setOnClickListener(new View.OnClickListener()
         {
             @Override
             public void onClick(View v)
             {
-                chooseFileWithIntent(intentGetContentAction, CHOOSE_EXPORTED_FILE);
+                chooseFileWithIntent(intentGetContentAction);
             }
         });
 
@@ -117,7 +114,7 @@ public class ImportExportActivity extends AppCompatActivity
             @Override
             public void onClick(View v)
             {
-                chooseFileWithIntent(intentPickAction, CHOOSE_EXPORTED_FILE);
+                chooseFileWithIntent(intentPickAction);
             }
         });
 
@@ -128,6 +125,28 @@ public class ImportExportActivity extends AppCompatActivity
             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)
@@ -146,19 +165,19 @@ public class ImportExportActivity extends AppCompatActivity
         importExporter.execute();
     }
 
-    private void startExport(final OutputStream target, final Uri targetUri)
+    private void startExport()
     {
         ImportExportTask.TaskCompleteListener listener = new ImportExportTask.TaskCompleteListener()
         {
             @Override
             public void onTaskComplete(boolean success)
             {
-                onExportComplete(success, targetUri);
+                onExportComplete(success, exportFile);
             }
         };
 
         importExporter = new ImportExportTask(ImportExportActivity.this,
-                DataFormat.CSV, target, listener);
+                DataFormat.CSV, exportFile, listener);
         importExporter.execute();
     }
 
@@ -226,9 +245,13 @@ public class ImportExportActivity extends AppCompatActivity
             builder.setTitle(R.string.importFailedTitle);
         }
 
-        int messageId = success ? R.string.importSuccessful : R.string.importFailed;
-        final String message = getResources().getString(messageId);
+        int messageId = success ? R.string.importedFrom : R.string.importFailed;
+        final String template = 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()
         {
@@ -242,7 +265,7 @@ public class ImportExportActivity extends AppCompatActivity
         builder.create().show();
     }
 
-    private void onExportComplete(boolean success, final Uri path)
+    private void onExportComplete(boolean success, final File path)
     {
         AlertDialog.Builder builder = new AlertDialog.Builder(this);
 
@@ -255,9 +278,10 @@ public class ImportExportActivity extends AppCompatActivity
             builder.setTitle(R.string.exportFailedTitle);
         }
 
-        int messageId = success ? R.string.exportSuccessful : R.string.exportFailed;
-        final String message = getResources().getString(messageId);
+        int messageId = success ? R.string.exportedTo : R.string.exportFailed;
 
+        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()
         {
@@ -277,8 +301,9 @@ 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, path);
+                    sendIntent.putExtra(Intent.EXTRA_STREAM, outputUri);
                     sendIntent.setType("text/csv");
 
                     // set flag to give temporary permission to external app to use the FileProvider
@@ -320,11 +345,11 @@ public class ImportExportActivity extends AppCompatActivity
         return false;
     }
 
-    private void chooseFileWithIntent(Intent intent, int requestCode)
+    private void chooseFileWithIntent(Intent intent)
     {
         try
         {
-            startActivityForResult(intent, requestCode);
+            startActivityForResult(intent, CHOOSE_EXPORT_FILE);
         }
         catch (ActivityNotFoundException e)
         {
@@ -337,7 +362,7 @@ public class ImportExportActivity extends AppCompatActivity
     {
         super.onActivityResult(requestCode, resultCode, data);
 
-        if (resultCode != RESULT_OK || (requestCode != CHOOSE_EXPORT_LOCATION && requestCode != CHOOSE_EXPORTED_FILE))
+        if (resultCode != RESULT_OK || requestCode != CHOOSE_EXPORT_FILE)
         {
             Log.w(TAG, "Failed onActivityResult(), result=" + resultCode);
             return;
@@ -352,48 +377,24 @@ public class ImportExportActivity extends AppCompatActivity
 
         try
         {
-            if (requestCode == CHOOSE_EXPORT_LOCATION)
-            {
-                OutputStream writer;
-                if (uri.getScheme() != null)
-                {
-                    writer = getContentResolver().openOutputStream(uri);
-                }
-                else
-                {
-                    writer = new FileOutputStream(new File(uri.toString()));
-                }
+            InputStream reader;
 
-                Log.e(TAG, "Starting file export with: " + uri.toString());
-                startExport(writer, uri);
+            if(uri.getScheme() != null)
+            {
+                reader = getContentResolver().openInputStream(uri);
             }
             else
             {
-                InputStream reader;
-                if(uri.getScheme() != null)
-                {
-                    reader = getContentResolver().openInputStream(uri);
-                }
-                else
-                {
-                    reader = new FileInputStream(new File(uri.toString()));
-                }
-
-                Log.e(TAG, "Starting file export with: " + uri.toString());
-                startImport(reader, uri);
+                reader = new FileInputStream(new File(uri.toString()));
             }
+
+            Log.e(TAG, "Starting file import with: " + uri.toString());
+            startImport(reader, uri);
         }
         catch(FileNotFoundException e)
         {
-            Log.e(TAG, "Failed to import/export file: " + uri.toString(), e);
-            if (requestCode == CHOOSE_EXPORT_LOCATION)
-            {
-                onExportComplete(false, uri);
-            }
-            else
-            {
-                onImportComplete(false, uri);
-            }
+            Log.e(TAG, "Failed to import file: " + uri.toString(), e);
+            onImportComplete(false, uri);
         }
     }
 }

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

@@ -4,23 +4,27 @@ 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 = "Catima";
+    private static final String TAG = "LoyaltyCardLocker";
 
     private Activity activity;
     private boolean doImport;
     private DataFormat format;
-    private OutputStream outputStream;
+    private File target;
     private InputStream inputStream;
     private TaskCompleteListener listener;
 
@@ -29,14 +33,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, OutputStream output,
+    ImportExportTask(Activity activity, DataFormat format, File target,
             TaskCompleteListener listener)
     {
         super();
         this.activity = activity;
         this.doImport = false;
         this.format = format;
-        this.outputStream = output;
+        this.target = target;
         this.listener = listener;
     }
 
@@ -74,13 +78,14 @@ class ImportExportTask extends AsyncTask<Void, Void, Boolean>
         return result;
     }
 
-    private boolean performExport(OutputStream stream, DBHelper db)
+    private boolean performExport(File exportFile, DBHelper db)
     {
         boolean result = false;
 
         try
         {
-            OutputStreamWriter writer = new OutputStreamWriter(stream, Charset.forName("UTF-8"));
+            FileOutputStream fileWriter = new FileOutputStream(exportFile);
+            OutputStreamWriter writer = new OutputStreamWriter(fileWriter, Charset.forName("UTF-8"));
             result = MultiFormatExporter.exportData(db, writer, format);
             writer.close();
         }
@@ -89,7 +94,7 @@ class ImportExportTask extends AsyncTask<Void, Void, Boolean>
             Log.e(TAG, "Unable to export file", e);
         }
 
-        Log.i(TAG, "Export result: " + result);
+        Log.i(TAG, "Export of '" + exportFile.getAbsolutePath() + "' result: " + result);
 
         return result;
     }
@@ -122,7 +127,7 @@ class ImportExportTask extends AsyncTask<Void, Void, Boolean>
         }
         else
         {
-            result = performExport(outputStream, db);
+            result = performExport(target, db);
         }
 
         return result;

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

@@ -2,13 +2,7 @@ package protect.card_locker;
 
 import android.content.Context;
 import android.content.Intent;
-import android.graphics.Bitmap;
 import android.net.Uri;
-import android.util.Base64;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
 import java.io.InvalidObjectException;
 
 public class ImportURIHelper {
@@ -18,27 +12,21 @@ public class ImportURIHelper {
     private static final String BARCODE_TYPE = DBHelper.LoyaltyCardDbIds.BARCODE_TYPE;
     private static final String HEADER_COLOR = DBHelper.LoyaltyCardDbIds.HEADER_COLOR;
     private static final String HEADER_TEXT_COLOR = DBHelper.LoyaltyCardDbIds.HEADER_TEXT_COLOR;
-    private static final String ICON = DBHelper.LoyaltyCardDbIds.ICON;
-    private static final String EXTRAS = DBHelper.LoyaltyCardDbIds.EXTRAS;
 
     private final Context context;
     private final String host;
     private final String path;
-    private final String oldHost;
-    private final String oldPath;
     private final String shareText;
 
     public ImportURIHelper(Context context) {
         this.context = context;
         host = context.getResources().getString(R.string.intent_import_card_from_url_host);
         path = context.getResources().getString(R.string.intent_import_card_from_url_path_prefix);
-        oldHost = context.getResources().getString(R.string.intent_import_card_from_url_host_old);
-        oldPath = context.getResources().getString(R.string.intent_import_card_from_url_path_prefix_old);
         shareText = context.getResources().getString(R.string.intent_import_card_from_url_share_text);
     }
 
-    public boolean isImportUri(Uri uri) {
-        return (uri.getHost().equals(host) && uri.getPath().equals(path)) || (uri.getHost().equals(oldHost) && uri.getPath().equals(oldPath));
+    private boolean isImportUri(Uri uri) {
+        return uri.getHost().equals(host) && uri.getPath().equals(path);
     }
 
     public LoyaltyCard parse(Uri uri) throws InvalidObjectException {
@@ -65,36 +53,14 @@ public class ImportURIHelper {
             {
                 headerTextColor = Integer.parseInt(unparsedHeaderTextColor);
             }
-            String iconData = uri.getQueryParameter(ICON);
-            Bitmap icon = null;
-
-            if(iconData != null && !iconData.isEmpty())
-            {
-                byte[] iconBytes = Base64.decode(iconData, Base64.URL_SAFE);
-                icon = DBHelper.convertBitmapBlobToBitmap(iconBytes);
-            }
-
-            String extrasData = uri.getQueryParameter(EXTRAS);
-            ExtrasHelper extras = new ExtrasHelper();
-            if(extrasData != null && !extrasData.isEmpty())
-            {
-                extras.fromJSON(new JSONObject(uri.getQueryParameter(EXTRAS)));
-            }
-
-            return new LoyaltyCard(-1, store, note, cardId, barcodeType, headerColor, headerTextColor, icon, extras);
-        } catch (NullPointerException | NumberFormatException | JSONException ex) {
+            return new LoyaltyCard(-1, store, note, cardId, barcodeType, headerColor, headerTextColor);
+        } catch (NullPointerException | NumberFormatException ex) {
             throw new InvalidObjectException("Not a valid import URI");
         }
     }
 
     // Protected for usage in tests
-    protected Uri toUri(LoyaltyCard loyaltyCard) throws JSONException {
-        String icon = "";
-        if(loyaltyCard.icon != null)
-        {
-            icon = Base64.encodeToString(DBHelper.convertBitmapToBlob(loyaltyCard.icon), Base64.URL_SAFE);
-        }
-
+    protected Uri toUri(LoyaltyCard loyaltyCard) {
         Uri.Builder uriBuilder = new Uri.Builder();
         uriBuilder.scheme("https");
         uriBuilder.authority(host);
@@ -111,8 +77,6 @@ public class ImportURIHelper {
         {
             uriBuilder.appendQueryParameter(HEADER_TEXT_COLOR, loyaltyCard.headerTextColor.toString());
         }
-        uriBuilder.appendQueryParameter(ICON, icon);
-        uriBuilder.appendQueryParameter(EXTRAS, loyaltyCard.extras.toJSON().toString());
 
         return uriBuilder.build();
     }
@@ -127,14 +91,7 @@ public class ImportURIHelper {
         context.startActivity(shareIntent);
     }
 
-    public boolean startShareIntent(LoyaltyCard loyaltyCard) {
-        try
-        {
-            startShareIntent(toUri(loyaltyCard));
-            return true;
-        }
-        catch (JSONException ex) {}
-
-        return false;
+    public void startShareIntent(LoyaltyCard loyaltyCard) {
+        startShareIntent(toUri(loyaltyCard));
     }
 }

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

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

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

@@ -2,7 +2,6 @@ package protect.card_locker;
 
 import android.content.Context;
 import android.database.Cursor;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -15,11 +14,13 @@ import protect.card_locker.preferences.Settings;
 class LoyaltyCardCursorAdapter extends CursorAdapter
 {
     Settings settings;
+    DBHelper dbHelper;
 
     public LoyaltyCardCursorAdapter(Context context, Cursor cursor)
     {
         super(context, cursor, 0);
         settings = new Settings(context);
+        dbHelper = new DBHelper(context);
     }
 
     // The newView method is used to inflate a new view and return it,
@@ -43,15 +44,25 @@ class LoyaltyCardCursorAdapter extends CursorAdapter
         // Extract properties from cursor
         LoyaltyCard loyaltyCard = LoyaltyCard.toLoyaltyCard(cursor);
 
+        // Get amount of cards for this store
+        int cardCount = dbHelper.getLoyaltyCardsForStore(loyaltyCard.store).size();
+
         // Populate fields with extracted properties
         storeField.setText(loyaltyCard.store);
 
         storeField.setTextSize(settings.getCardTitleListFontSize());
 
-        if(loyaltyCard.note.isEmpty() == false)
+        if(cardCount > 1 || !loyaltyCard.note.isEmpty())
         {
             noteField.setVisibility(View.VISIBLE);
-            noteField.setText(loyaltyCard.note);
+            if(cardCount > 1)
+            {
+                noteField.setText(context.getResources().getString(R.string.cardCount, cardCount));
+            }
+            else
+            {
+                noteField.setText(loyaltyCard.note);
+            }
             noteField.setTextSize(settings.getCardNoteListFontSize());
         }
         else
@@ -62,18 +73,10 @@ class LoyaltyCardCursorAdapter extends CursorAdapter
         int tileLetterFontSize = context.getResources().getDimensionPixelSize(R.dimen.tileLetterFontSize);
         int pixelSize = context.getResources().getDimensionPixelSize(R.dimen.cardThumbnailSize);
 
-
-        if(loyaltyCard.icon == null)
-        {
-            Integer letterBackgroundColor = loyaltyCard.headerColor;
-            Integer letterTextColor = loyaltyCard.headerTextColor;
-            LetterBitmap letterBitmap = new LetterBitmap(context, loyaltyCard.store, loyaltyCard.store,
-                    tileLetterFontSize, pixelSize, pixelSize, letterBackgroundColor, letterTextColor);
-            thumbnail.setImageBitmap(letterBitmap.getLetterTile());
-        }
-        else
-        {
-            thumbnail.setImageBitmap(loyaltyCard.icon);
-        }
+        Integer letterBackgroundColor = loyaltyCard.headerColor;
+        Integer letterTextColor = loyaltyCard.headerTextColor;
+        LetterBitmap letterBitmap = new LetterBitmap(context, loyaltyCard.store, loyaltyCard.store,
+                tileLetterFontSize, pixelSize, pixelSize, letterBackgroundColor, letterTextColor);
+        thumbnail.setImageBitmap(letterBitmap.getLetterTile());
     }
 }

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

@@ -4,7 +4,6 @@ import android.app.Activity;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.res.TypedArray;
-import android.graphics.Bitmap;
 import android.graphics.Color;
 import android.net.Uri;
 import android.os.Build;
@@ -33,19 +32,16 @@ import com.google.zxing.integration.android.IntentResult;
 import com.jaredrummler.android.colorpicker.ColorPickerDialog;
 import com.jaredrummler.android.colorpicker.ColorPickerDialogListener;
 
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.io.IOException;
 import java.io.InvalidObjectException;
 
 public class LoyaltyCardEditActivity extends AppCompatActivity
 {
-    private static final String TAG = "Catima";
+    private static final String TAG = "CardLocker";
     protected static final String NO_BARCODE = "_NO_BARCODE_";
 
     protected static final int SELECT_BARCODE_REQUEST = 1;
 
+    FloatingActionButton fabSave;
     EditText storeFieldEdit;
     EditText noteFieldEdit;
     ImageView headingColorSample;
@@ -65,54 +61,26 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
 
     int loyaltyCardId;
     boolean updateLoyaltyCard;
+    String loyaltyCardStorePrefill = "";
     Uri importLoyaltyCardUri = null;
-    String importLoyaltyCardType = null;
     Integer headingColorValue = null;
     Integer headingStoreTextColorValue = null;
-    Bitmap icon = null;
-    ExtrasHelper extras = new ExtrasHelper();
 
     DBHelper db;
     ImportURIHelper importUriHelper;
-    PkpassImporter pkpassImporter;
 
     private void extractIntentFields(Intent intent)
     {
         final Bundle b = intent.getExtras();
         loyaltyCardId = b != null ? b.getInt("id") : 0;
         updateLoyaltyCard = b != null && b.getBoolean("update", false);
-        importLoyaltyCardType = intent.getType();
+        loyaltyCardStorePrefill = b != null ? b.getString("store", "") : "";
         importLoyaltyCardUri = intent.getData();
 
         Log.d(TAG, "View activity: id=" + loyaltyCardId
                 + ", updateLoyaltyCard=" + Boolean.toString(updateLoyaltyCard));
     }
 
-    private LoyaltyCard importCard(String type, Uri uri)
-    {
-        // Import URI
-        if(importUriHelper.isImportUri(uri))
-        {
-            try
-            {
-                return importUriHelper.parse(importLoyaltyCardUri);
-            }
-            catch (InvalidObjectException ex)
-            {
-                return null;
-            }
-        }
-
-        // Pkpass
-        try
-        {
-            return pkpassImporter.fromURI(uri);
-        }
-        catch (IOException | JSONException ex) {}
-
-        return null;
-    }
-
     @Override
     protected void onCreate(Bundle savedInstanceState)
     {
@@ -131,8 +99,8 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
 
         db = new DBHelper(this);
         importUriHelper = new ImportURIHelper(this);
-        pkpassImporter = new PkpassImporter(this);
 
+        fabSave = findViewById(R.id.fabSave);
         storeFieldEdit = findViewById(R.id.storeNameEdit);
         noteFieldEdit = findViewById(R.id.noteEdit);
         headingColorSample = findViewById(R.id.headingColorSample);
@@ -142,7 +110,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.barcodeTypeView);
+        barcodeTypeField = findViewById(R.id.barcodeType);
         barcodeImage = findViewById(R.id.barcode);
         barcodeImageLayout = findViewById(R.id.barcodeLayout);
         barcodeCaptureLayout = findViewById(R.id.barcodeCaptureLayout);
@@ -173,6 +141,14 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
 
         Log.i(TAG, "To view card: " + loyaltyCardId);
 
+        fabSave.setOnClickListener(new View.OnClickListener()
+        {
+            @Override
+            public void onClick(View view) {
+                doSave();
+            }
+        });
+
         if(updateLoyaltyCard)
         {
             final LoyaltyCard loyaltyCard = db.getLoyaltyCard(loyaltyCardId);
@@ -201,7 +177,7 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
 
             if(barcodeTypeField.getText().length() == 0)
             {
-                barcodeTypeField.setText(loyaltyCard.barcodeType.isEmpty() ? LoyaltyCardEditActivity.NO_BARCODE : loyaltyCard.barcodeType);
+                barcodeTypeField.setText(loyaltyCard.barcodeType);
             }
 
             if(headingColorValue == null)
@@ -222,17 +198,15 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
                 }
             }
 
-            extras = loyaltyCard.extras;
-
             setTitle(R.string.editCardTitle);
         }
         else if(importLoyaltyCardUri != null)
         {
             // Try to parse
-            LoyaltyCard importCard = importCard(importLoyaltyCardType, importLoyaltyCardUri);
-
-            if(importCard == null)
-            {
+            LoyaltyCard importCard;
+            try {
+                importCard = importUriHelper.parse(importLoyaltyCardUri);
+            } catch (InvalidObjectException ex) {
                 Toast.makeText(this, R.string.failedParsingImportUriError, Toast.LENGTH_LONG).show();
                 finish();
                 return;
@@ -244,13 +218,16 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
             barcodeTypeField.setText(importCard.barcodeType);
             headingColorValue = importCard.headerColor;
             headingStoreTextColorValue = importCard.headerTextColor;
-            icon = importCard.icon;
-            extras = importCard.extras;
         }
         else
         {
             setTitle(R.string.addCardTitle);
-            hideBarcode();
+        }
+
+        // Set prefill values if nothing is set
+        if(storeFieldEdit.getText().length() == 0 && !loyaltyCardStorePrefill.isEmpty())
+        {
+            storeFieldEdit.setText(loyaltyCardStorePrefill);
         }
 
         if(headingColorValue == null)
@@ -273,9 +250,9 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
 
         if(cardIdFieldView.getText().length() > 0 && barcodeTypeField.getText().length() > 0)
         {
-            if(barcodeTypeField.getText().toString().equals(NO_BARCODE))
+            if(barcodeTypeField.getText().equals(NO_BARCODE))
             {
-                hideBarcode();
+                barcodeImageLayout.setVisibility(View.GONE);
             }
             else
             {
@@ -314,7 +291,7 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
                     new BarcodeImageWriterTask(barcodeImage, cardIdString, format).execute();
                 }
 
-                showBarcode();
+                barcodeImageLayout.setVisibility(View.VISIBLE);
             }
         }
 
@@ -366,18 +343,6 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
             cardIdTableRow.setVisibility(View.GONE);
             enterButton.setText(R.string.enterCard);
         }
-
-        FloatingActionButton saveButton = findViewById(R.id.fabSave);
-        saveButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                try {
-                    doSave();
-                } catch (JSONException ex) {
-                    Toast.makeText(getApplicationContext(), R.string.failedSavingCard, Toast.LENGTH_LONG).show();
-                }
-            }
-        });
     }
 
     class ColorSelectListener implements View.OnClickListener
@@ -422,7 +387,7 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
         }
     }
 
-    private void doSave() throws JSONException
+    private void doSave()
     {
         String store = storeFieldEdit.getText().toString();
         String note = noteFieldEdit.getText().toString();
@@ -450,12 +415,12 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
 
         if(updateLoyaltyCard)
         {
-            db.updateLoyaltyCard(loyaltyCardId, store, note, cardId, barcodeType, headingColorValue, headingStoreTextColorValue, icon, extras);
+            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, icon, extras);
+            loyaltyCardId = (int)db.insertLoyaltyCard(store, note, cardId, barcodeType, headingColorValue, headingStoreTextColorValue);
         }
 
         finish();
@@ -468,10 +433,6 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
         {
             getMenuInflater().inflate(R.menu.card_update_menu, menu);
         }
-        else
-        {
-            getMenuInflater().inflate(R.menu.card_add_menu, menu);
-        }
 
         return super.onCreateOptionsMenu(menu);
     }
@@ -558,21 +519,10 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
             TextView cardIdView = findViewById(R.id.cardIdView);
             cardIdView.setText(contents);
 
+            final TextView barcodeTypeField = findViewById(R.id.barcodeType);
             // Set special NO_BARCODE value to prevent onResume from overwriting it
             barcodeTypeField.setText(format.isEmpty() ? LoyaltyCardEditActivity.NO_BARCODE : format);
             onResume();
         }
     }
-
-    private void showBarcode() {
-        barcodeImageLayout.setVisibility(View.VISIBLE);
-        findViewById(R.id.barcodeTypeDivider).setVisibility(View.VISIBLE);
-        findViewById(R.id.barcodeTypeTableRow).setVisibility(View.VISIBLE);
-    }
-
-    private void hideBarcode() {
-        barcodeImageLayout.setVisibility(View.GONE);
-        findViewById(R.id.barcodeTypeDivider).setVisibility(View.GONE);
-        findViewById(R.id.barcodeTypeTableRow).setVisibility(View.GONE);
-    }
 }

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

@@ -1,7 +1,6 @@
 package protect.card_locker;
 
 
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
 import android.graphics.Color;
@@ -9,10 +8,11 @@ import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.os.Bundle;
 
-import androidx.appcompat.app.AlertDialog;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.core.graphics.ColorUtils;
 import androidx.core.graphics.drawable.DrawableCompat;
+import androidx.core.view.GestureDetectorCompat;
+import androidx.core.view.MotionEventCompat;
 import androidx.core.widget.TextViewCompat;
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AppCompatActivity;
@@ -20,8 +20,10 @@ import androidx.appcompat.content.res.AppCompatResources;
 import androidx.appcompat.widget.Toolbar;
 import android.util.Log;
 import android.util.TypedValue;
+import android.view.GestureDetector;
 import android.view.Menu;
 import android.view.MenuItem;
+import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewTreeObserver;
@@ -32,22 +34,22 @@ import android.widget.TextView;
 import android.widget.Toast;
 
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import com.google.android.material.tabs.TabLayout;
 import com.google.zxing.BarcodeFormat;
 
-import org.json.JSONException;
-
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
+import java.util.List;
 
 import protect.card_locker.preferences.Settings;
 
 
-public class LoyaltyCardViewActivity extends AppCompatActivity
+public class LoyaltyCardViewActivity extends AppCompatActivity implements GestureDetector.OnGestureListener
 {
-    private static final String TAG = "Catima";
+    private static final String TAG = "CardLocker";
     private static final double LUMINANCE_MIDPOINT = 0.5;
 
+    FloatingActionButton FabAdd;
+    TabLayout tabLayout;
+    TabLayout.OnTabSelectedListener onTabSelectedListener;
     TextView cardIdFieldView;
     TextView noteView;
     View noteViewDivider;
@@ -56,6 +58,8 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
     View collapsingToolbarLayout;
     int loyaltyCardId;
     LoyaltyCard loyaltyCard;
+    List<LoyaltyCard> storeCards;
+    GestureDetectorCompat gestureDetector;
     boolean rotationEnabled;
     DBHelper db;
     ImportURIHelper importURIHelper;
@@ -113,6 +117,33 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
         db = new DBHelper(this);
         importURIHelper = new ImportURIHelper(this);
 
+        FabAdd = findViewById(R.id.fabAdd);
+        FabAdd.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view)
+            {
+                Intent intent = new Intent(getApplicationContext(), LoyaltyCardEditActivity.class);
+                Bundle bundle = new Bundle();
+                bundle.putString("store", loyaltyCard.store);
+                intent.putExtras(bundle);
+                startActivity(intent);
+                finish();
+            }
+        });
+        tabLayout = findViewById(R.id.tabLayout);
+        onTabSelectedListener = new TabLayout.OnTabSelectedListener() {
+            @Override
+            public void onTabSelected(TabLayout.Tab tab) {
+                loyaltyCardId = storeCards.get(tab.getPosition()).id;
+                onResume();
+            }
+
+            @Override
+            public void onTabUnselected(TabLayout.Tab tab) {}
+
+            @Override
+            public void onTabReselected(TabLayout.Tab tab) {}
+        };
         cardIdFieldView = findViewById(R.id.cardIdView);
         noteView = findViewById(R.id.noteView);
         noteViewDivider = findViewById(R.id.noteViewDivider);
@@ -122,6 +153,23 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
 
         rotationEnabled = true;
 
+        gestureDetector = new GestureDetectorCompat(this, this);
+
+        // Restore active card id after rotation
+        if(savedInstanceState != null)
+        {
+            loyaltyCardId = savedInstanceState.getInt("id");
+            onResume();
+        }
+    }
+
+    @Override
+    public void onSaveInstanceState(Bundle savedInstanceState) {
+        // Save active card id before rotation
+        savedInstanceState.putInt("id", loyaltyCardId);
+
+        super.onSaveInstanceState(savedInstanceState);
+
         // Allow making barcode fullscreen on tap
         barcodeImage.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -183,6 +231,38 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
             return;
         }
 
+        storeCards = db.getLoyaltyCardsForStore(loyaltyCard.store);
+        tabLayout.removeOnTabSelectedListener(onTabSelectedListener);
+        tabLayout.removeAllTabs();
+        for(int i = 0; i < storeCards.size(); i++)
+        {
+            LoyaltyCard storeCard = storeCards.get(i);
+
+            // Use only first line of note
+            String loyaltyCardText = storeCard.note.split("\\r?\\n")[0].trim();
+            if(loyaltyCardText.isEmpty())
+            {
+                loyaltyCardText = String.valueOf(i + 1);
+            }
+            else if(loyaltyCardText.length() > 15)
+            {
+                // Shorten long notes
+                loyaltyCardText = loyaltyCardText.substring(0, 15).trim() + "…";
+            }
+
+            tabLayout.addTab(tabLayout.newTab().setText(loyaltyCardText));
+
+            if(storeCard.id == loyaltyCardId)
+            {
+                tabLayout.getTabAt(i).select();
+            }
+        }
+        tabLayout.addOnTabSelectedListener(onTabSelectedListener);
+        if(tabLayout.getTabCount() > 1)
+        {
+            tabLayout.setVisibility(View.VISIBLE);
+        }
+
         String formatString = loyaltyCard.barcodeType;
         format = !formatString.isEmpty() ? BarcodeFormat.valueOf(formatString) : null;
         cardIdString = loyaltyCard.cardId;
@@ -198,6 +278,8 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
             TextViewCompat.setAutoSizeTextTypeUniformWithConfiguration(noteView,
                     getResources().getInteger(R.integer.settings_card_note_min_font_size_sp)-1,
                     settings.getCardNoteFontSize(), 1, TypedValue.COMPLEX_UNIT_SP);
+            noteView.setVisibility(View.VISIBLE);
+            noteViewDivider.setVisibility(View.VISIBLE);
         }
         else
         {
@@ -281,22 +363,8 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
         }
         else
         {
-            findViewById(R.id.barcode).setVisibility(View.GONE);
+            findViewById(R.id.barcode).setVisibility(View.INVISIBLE);
         }
-
-        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
@@ -325,14 +393,8 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
             item.setVisible(false);
         }
 
-        if(loyaltyCard != null && !loyaltyCard.extras.getAllValues(new String[]{Locale.getDefault().getLanguage(), "en", ""}).isEmpty())
-        {
-            MenuItem extraItem = menu.findItem(R.id.action_view_extras);
-            extraItem.setIcon(getIcon(R.drawable.ic_info_outline_white, backgroundNeedsDarkIcons));
-            extraItem.setVisible(true);
-        }
-
         menu.findItem(R.id.action_share).setIcon(getIcon(R.drawable.ic_share_white, backgroundNeedsDarkIcons));
+        menu.findItem(R.id.action_edit).setIcon(getIcon(R.drawable.ic_mode_edit_white_24dp, backgroundNeedsDarkIcons));
 
         return super.onCreateOptionsMenu(menu);
     }
@@ -352,6 +414,16 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
                 importURIHelper.startShareIntent(loyaltyCard);
                 return true;
 
+            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();
+                return true;
+
             case R.id.action_lock_unlock:
                 if(rotationEnabled)
                 {
@@ -363,18 +435,6 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
                 }
                 rotationEnabled = !rotationEnabled;
                 return true;
-
-            case R.id.action_view_extras:
-                try
-                {
-                    displayExtrasDialog();
-                }
-                catch (JSONException ex)
-                {
-                    Toast.makeText(this, R.string.failedShowingExtras, Toast.LENGTH_LONG).show();
-                    finish();
-                }
-                return true;
         }
 
         return super.onOptionsItemSelected(item);
@@ -397,27 +457,53 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
         }
     }
 
-    private void displayExtrasDialog() throws JSONException
-    {
-        StringBuilder items = new StringBuilder();
+    // Gesture detection
+    @Override
+    public boolean onDown(MotionEvent motionEvent) {
+        return false;
+    }
 
-        HashMap<String, String> extraValues = loyaltyCard.extras.getAllValues(new String[]{Locale.getDefault().getLanguage(), "en", ""});
-        for(Map.Entry<String, String> entry : extraValues.entrySet())
+    @Override
+    public void onShowPress(MotionEvent motionEvent) {}
+
+    @Override
+    public boolean onSingleTapUp(MotionEvent motionEvent) {
+        return false;
+    }
+
+    @Override
+    public boolean onScroll(MotionEvent motionEvent, MotionEvent motionEvent1, float v, float v1) {
+        return false;
+    }
+
+    @Override
+    public void onLongPress(MotionEvent motionEvent) { }
+
+    @Override
+    public boolean onFling(MotionEvent motionEvent, MotionEvent motionEvent1, float v, float v1) {
+        int currentTab = tabLayout.getSelectedTabPosition();
+
+        if (motionEvent1.getX() > motionEvent.getX())
         {
-            items.append(entry.getValue() + "\n");
+            // Swipe left
+            int nextTab = currentTab == 0 ? tabLayout.getTabCount() - 1 : currentTab - 1;
+            tabLayout.getTabAt(nextTab).select();
+        }
+        else
+        {
+            // Swipe right
+            int nextTab = currentTab < (tabLayout.getTabCount() - 1) ? currentTab + 1 : 0;
+            tabLayout.getTabAt(nextTab).select();
         }
 
-        new AlertDialog.Builder(this)
-            .setMessage(items.toString())
-            .setCancelable(true)
-            .setPositiveButton(R.string.ok, new DialogInterface.OnClickListener()
-            {
-                public void onClick(DialogInterface dialog, int which)
-                {
-                    dialog.dismiss();
-                }
-            })
-            .show();
+        return true;
+    }
+
+    @Override
+    public boolean onTouchEvent(MotionEvent motionEvent)
+    {
+        gestureDetector.onTouchEvent(motionEvent);
+        return super.onTouchEvent(motionEvent);
     }
 
     /**
@@ -459,9 +545,6 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
             // Move barcode to top
             barcodeImage.setScaleType(ImageView.ScaleType.FIT_START);
 
-            // Prevent centering
-            barcodeImage.setAdjustViewBounds(false);
-
             // Set current state
             barcodeIsFullscreen = true;
         }
@@ -486,9 +569,6 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
             // Turn barcode back to normal
             barcodeImage.setLayoutParams(barcodeImageState);
 
-            // Fix barcode centering
-            barcodeImage.setAdjustViewBounds(true);
-
             // Set current state
             barcodeIsFullscreen = false;
         }

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

@@ -14,6 +14,7 @@ import android.database.Cursor;
 import android.os.Bundle;
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatDelegate;
 import androidx.appcompat.widget.SearchView;
 import androidx.appcompat.widget.Toolbar;
 import android.util.Log;
@@ -34,14 +35,16 @@ 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 = "Catima";
+    private static final String TAG = "LoyaltyCardLocker";
     private static final int MAIN_REQUEST_CODE = 1;
 
     private Menu menu;
+    private FloatingActionButton fabAdd;
     protected String filter = "";
 
     @Override
@@ -52,7 +55,22 @@ public class MainActivity extends AppCompatActivity
         Toolbar toolbar = findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
 
+        fabAdd = findViewById(R.id.fabAdd);
+        fabAdd.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                Intent i = new Intent(getApplicationContext(), LoyaltyCardEditActivity.class);
+                startActivityForResult(i, MAIN_REQUEST_CODE);
+            }
+        });
+
         updateLoyaltyCardList("");
+
+        SharedPreferences prefs = getSharedPreferences("protect.card_locker", MODE_PRIVATE);
+        if (prefs.getBoolean("firstrun", true)) {
+            startIntro();
+            prefs.edit().putBoolean("firstrun", false).commit();
+        }
     }
 
     @Override
@@ -69,15 +87,6 @@ public class MainActivity extends AppCompatActivity
         }
 
         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
@@ -147,7 +156,7 @@ public class MainActivity extends AppCompatActivity
             noMatchingCardsText.setVisibility(View.GONE);
         }
 
-        Cursor cardCursor = db.getLoyaltyCardCursor(filterText);
+        Cursor cardCursor = db.getOneLoyaltyCardPerStoreCursor(filterText);
 
         final LoyaltyCardCursorAdapter adapter = new LoyaltyCardCursorAdapter(this, cardCursor);
         cardList.setAdapter(adapter);
@@ -209,10 +218,7 @@ public class MainActivity extends AppCompatActivity
             else if(item.getItemId() == R.id.action_share)
             {
                 final ImportURIHelper importURIHelper = new ImportURIHelper(this);
-                if(importURIHelper.startShareIntent(card))
-                {
-                    Toast.makeText(this, R.string.failedSharingCard, Toast.LENGTH_LONG).show();
-                }
+                importURIHelper.startShareIntent(card);
                 return true;
             }
         }
@@ -278,6 +284,12 @@ public class MainActivity extends AppCompatActivity
             return true;
         }
 
+        if(id == R.id.action_intro)
+        {
+            startIntro();
+            return true;
+        }
+
         if(id == R.id.action_about)
         {
             displayAboutDialog();
@@ -346,6 +358,7 @@ public class MainActivity extends AppCompatActivity
         String html =
             "<meta http-equiv=\"content-type\" content=\"text/html; charset=utf-8\" />" +
             css +
+            "<img src=\"file:///android_res/mipmap/ic_launcher.png\" alt=\"" + appName + "\"/>" +
             "<h1>" +
             String.format(getString(R.string.about_title_fmt),
                     "<a href=\"" + getString(R.string.app_webpage_url)) + "\">" +
@@ -358,12 +371,10 @@ public class MainActivity extends AppCompatActivity
             "</p><p>" +
             String.format(getString(R.string.app_revision_fmt),
                     "<a href=\"" + getString(R.string.app_revision_url) + "\">" +
-                            "GitHub" +
+                            getString(R.string.app_revision_url) +
                             "</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>" +
@@ -384,4 +395,10 @@ public class MainActivity extends AppCompatActivity
             })
             .show();
     }
+
+    private void startIntro()
+    {
+        Intent intent = new Intent(this, IntroActivity.class);
+        startActivityForResult(intent, MAIN_REQUEST_CODE);
+    }
 }

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 = "Catima";
+    private static final String TAG = "LoyaltyCardLocker";
 
     /**
      * Attempts to export data to the output stream in the

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -70,236 +70,137 @@
                 android:layout_height="wrap_content"
                 android:text="@string/barcodeNoBarcode"
                 android:enabled="false" />
-            <LinearLayout android:orientation="vertical"
+            <LinearLayout android:orientation="horizontal"
                           android:padding="10.0dp"
                           android:layout_width="fill_parent"
                           android:layout_height="wrap_content">
                 <ImageView
-                    android:layout_width="match_parent"
+                    android:layout_width="0dp"
                     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="vertical"
+            <LinearLayout android:orientation="horizontal"
                           android:padding="10.0dp"
                           android:layout_width="fill_parent"
                           android:layout_height="wrap_content">
                 <ImageView
-                    android:layout_width="match_parent"
+                    android:layout_width="0dp"
                     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="vertical"
+            <LinearLayout android:orientation="horizontal"
                           android:padding="10.0dp"
                           android:layout_width="fill_parent"
                           android:layout_height="wrap_content">
                 <ImageView
-                    android:layout_width="match_parent"
+                    android:layout_width="0dp"
                     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="vertical"
+            <LinearLayout android:orientation="horizontal"
                           android:padding="10.0dp"
                           android:layout_width="fill_parent"
                           android:layout_height="wrap_content">
                 <ImageView
-                    android:layout_width="match_parent"
+                    android:layout_width="0dp"
                     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="vertical"
+            <LinearLayout android:orientation="horizontal"
                           android:padding="10.0dp"
                           android:layout_width="fill_parent"
                           android:layout_height="wrap_content">
                 <ImageView
-                    android:layout_width="match_parent"
+                    android:layout_width="0dp"
                     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="vertical"
+            <LinearLayout android:orientation="horizontal"
                           android:padding="10.0dp"
                           android:layout_width="fill_parent"
                           android:layout_height="wrap_content">
                 <ImageView
-                    android:layout_width="match_parent"
+                    android:layout_width="0dp"
                     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="vertical"
+            <LinearLayout android:orientation="horizontal"
                           android:padding="10.0dp"
                           android:layout_width="fill_parent"
                           android:layout_height="wrap_content">
                 <ImageView
-                    android:layout_width="match_parent"
+                    android:layout_width="0dp"
                     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="vertical"
+            <LinearLayout android:orientation="horizontal"
                           android:padding="10.0dp"
                           android:layout_width="fill_parent"
                           android:layout_height="wrap_content">
                 <ImageView
-                    android:layout_width="match_parent"
+                    android:layout_width="0dp"
                     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="vertical"
+            <LinearLayout android:orientation="horizontal"
                           android:padding="10.0dp"
                           android:layout_width="fill_parent"
                           android:layout_height="wrap_content">
                 <ImageView
-                    android:layout_width="match_parent"
+                    android:layout_width="0dp"
                     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="vertical"
+            <LinearLayout android:orientation="horizontal"
                           android:padding="10.0dp"
                           android:layout_width="fill_parent"
                           android:layout_height="wrap_content">
                 <ImageView
-                    android:layout_width="match_parent"
+                    android:layout_width="0dp"
                     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="vertical"
+            <LinearLayout android:orientation="horizontal"
                           android:padding="10.0dp"
                           android:layout_width="fill_parent"
                           android:layout_height="wrap_content">
                 <ImageView
-                    android:layout_width="match_parent"
+                    android:layout_width="0dp"
                     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>

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

@@ -99,6 +99,7 @@
                 android:layout_marginTop="8dp"
                 android:text="@string/importOptionFilesystemButton" />
 
+
             <View
                 android:id="@+id/dividerImportApplication"
                 android:layout_width="fill_parent"
@@ -128,6 +129,36 @@
                 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>
 

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -344,66 +344,16 @@
                         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"

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

@@ -9,12 +9,12 @@
     >
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
-        android:id="@+id/fabEdit"
+        android:id="@+id/fabAdd"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="end|bottom"
-        android:src="@drawable/ic_mode_edit_white_24dp"
-        android:contentDescription="@string/edit"
+        android:src="@drawable/ic_add_white_24dp"
+        android:contentDescription="@string/action_add"
         android:layout_margin="16dp" />
 
     <FrameLayout
@@ -44,12 +44,12 @@
                 android:layout_marginBottom="10.0dip"
                 android:layout_marginStart="15.0dip"
                 android:layout_marginEnd="15.0dip"
+                app:layout_constraintTop_toTopOf="parent"
                 android:padding="10.0dp"
                 android:background="#ffffff"
                 app:layout_constraintBottom_toTopOf="@+id/centerGuideline"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
                 android:contentDescription="@string/barcodeImageDescription"/>
 
             <TextView
@@ -150,6 +150,15 @@
                 android:layout_height="?actionBarSize"
                 app:contentInsetStart="72.0dip"
                 app:layout_collapseMode="pin" />
+            <com.google.android.material.tabs.TabLayout
+                android:visibility="gone"
+                android:id="@+id/tabLayout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="bottom"
+                app:tabGravity="fill"
+                app:tabIndicatorAnimationDuration="0"
+                app:tabMode="scrollable"/>
         </com.google.android.material.appbar.CollapsingToolbarLayout>
     </com.google.android.material.appbar.AppBarLayout>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>

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

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-      xmlns:app="http://schemas.android.com/apk/res-auto">
-</menu>

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

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
       xmlns:app="http://schemas.android.com/apk/res-auto">
+
     <item
         android:id="@+id/action_delete"
         android:icon="@drawable/ic_delete_white_24dp"

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

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

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

@@ -17,6 +17,10 @@
         android:id="@+id/action_settings"
         android:title="@string/settings"
         app:showAsAction="never"/>
+    <item
+        android:id="@+id/action_intro"
+        android:title="@string/startIntro"
+        app:showAsAction="never"/>
     <item
         android:id="@+id/action_about"
         android:title="@string/about"

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

@@ -1,12 +1,14 @@
 <resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 
+    <string name="app_name">Loyalty Card Keychain</string>
     <string name="action_add">Přidat</string>
 
     <string name="noGiftCards">ZAtím némáte žádné věrnostní karty. Klikněte na tlačítko "+" (plus) nahoře a začněte.\n\nLoyalty Card Locker umožňuje nosit své věrnostní karty v telefonu, takže jsou vždy na dosah.</string>
     <string name="storeName">Obchod</string>
     <string name="note">Poznámka</string>
     <string name="cardId">ID karty</string>
+    <string name="barcodeType">Typ čárového kódu</string>
     <string name="cancel">Zrušit</string>
     <string name="save">Uložit</string>
     <string name="capture">Naskenovat kartu</string>
@@ -21,6 +23,7 @@
     <string name="sendLabel">Odeslat&#8230;</string>
     <string name="editCardTitle">Editovat věrnostní kartu</string>
     <string name="addCardTitle">Přidat věrnostní kartu</string>
+    <string name="viewCardTitle">Zobrazit věrnostní kartu</string>
     <string name="scanCardBarcode">Oskenujte kód karty</string>
     <string name="barcodeImageDescription">Obrázek kódu karty</string>
 
@@ -28,23 +31,31 @@
     <string name="noCardIdError">Nebylo zadáno ID karty</string>
     <string name="cardIdFormat">%1$s: %2$s</string>
     <string name="importExport">Import/Export</string>
+    <string name="importName">Import</string>
     <string name="exportName">Export</string>
     <string name="importExportHelp">Zálohování dat vám umožní přesunout vaše uložené karty na jiné zařízení.</string>
+    <string name="importedFrom">Importováno z: %1$s</string>
+    <string name="exportedTo">Exportováno do: %1$s</string>
+    <string name="fileMissing">Doubor chybí: %1$s</string>
     <string name="importSuccessfulTitle">Import proběhl úspěšně</string>
     <string name="importFailedTitle">Import selhal</string>
-    <string name="importFailed">Import selhal</string>
+    <string name="importFailed">Import selhal: %1$s</string>
     <string name="exportSuccessfulTitle">Export proběhl úspěšně</string>
     <string name="exportFailedTitle">Export selhal</string>
-    <string name="exportFailed">Export selhal</string>
+    <string name="exportFailed">Export selhal: %1$s</string>
     <string name="importing">Importuji&#8230;</string>
     <string name="exporting">Exportuji&#8230;</string>
     <string name="noExternalStoragePermissionError">Nelze importovat nebo exportovat karty bez přístupu k externímu uložišti</string>
+    <string name="exportOptionExplanation">Data jsou zapsána do kořenové složky externího uložiště.</string>
     <string name="importOptionFilesystemTitle">Import ze souborového systému</string>
     <string name="importOptionFilesystemExplanation">Vyberte konkrétní soubor v uložišti.</string>
     <string name="importOptionFilesystemButton">Ze souborového systému</string>
     <string name="importOptionApplicationTitle">Použít externí aplikaci</string>
     <string name="importOptionApplicationExplanation">K otevření souboru použije externí aplikaci jako Dropbox, Google Drive, nebo vámi preferovaný prohlížeč souborů.</string>
     <string name="importOptionApplicationButton">Použít externí aplikaci</string>
+    <string name="importOptionFixedTitle">Import z umístění exportu</string>
+    <string name="importOptionFixedExplanation">Import ze stejné složky souborového systému do níž se zapisuje při exportu.</string>
+    <string name="importOptionFixedButton">Použít složku exportu</string>
 
     <string name="about">O aplikaci</string>
     <string name="app_copyright_fmt">Copyright 2016-<xliff:g>%d</xliff:g> Branden Archer</string>

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

@@ -1,6 +1,7 @@
 <resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 
+    <string name="app_name">Loyalty Card Keychain</string>
     <string name="action_search">Suche</string>
     <string name="action_add">Neu</string>
 
@@ -10,6 +11,7 @@
     <string name="storeName">Geschäft</string>
     <string name="note">Notiz</string>
     <string name="cardId">Kartennummer</string>
+    <string name="barcodeType">Barcodeart</string>
     <string name="cancel">Abbrechen</string>
     <string name="save">Speichern</string>
     <string name="capture">Karte scannen</string>
@@ -25,8 +27,11 @@
     <string name="ok">Ok</string>
     <string name="copy_to_clipboard">Kopiere die Nummer in die Zwischenablage</string>
     <string name="sendLabel">Senden&#8230;</string>
+    <string name="addedShortcut">Zum Home Screen hinzugefügt</string>
+
     <string name="editCardTitle">Kundenkarte bearbeiten</string>
     <string name="addCardTitle">Neue Kundenkarte</string>
+    <string name="viewCardTitle">Kundenkarte anzeigen</string>
     <string name="scanCardBarcode">Barcode scannen</string>
     <string name="cardShortcut">Shortcut zu einer Karte</string>
     <string name="noCardsMessage">Es ist noch keine Karte vorhanden, bitte zuerst eine hinzufügen</string>
@@ -38,23 +43,31 @@
     <string name="noCardExistsError">Karte konnte nicht gefunden werden</string>
     <string name="cardIdFormat">%1$s: %2$s</string>
     <string name="importExport">Import/Export</string>
+    <string name="importName">Import</string>
     <string name="exportName">Exportieren</string>
     <string name="importExportHelp">Gesicherte Daten ermöglichen das Verschieben der Kundenkarten auf ein anderes Gerät.</string>
+    <string name="importedFrom">Importiert von: %1$s</string>
+    <string name="exportedTo">Exportiert nach: %1$s</string>
+    <string name="fileMissing">Datei fehlt: %1$s</string>
     <string name="importSuccessfulTitle">Import erfolgreich</string>
     <string name="importFailedTitle">Import fehlgeschlagen</string>
-    <string name="importFailed">Import fehlgeschlagen</string>
+    <string name="importFailed">Import fehlgeschlagen: %1$s</string>
     <string name="exportSuccessfulTitle">Export erfolgreich</string>
     <string name="exportFailedTitle">Export fehlgeschlagen</string>
-    <string name="exportFailed">Export fehlgeschlagen</string>
+    <string name="exportFailed">Export fehlgeschlagen: %1$s</string>
     <string name="importing">Importiere…</string>
     <string name="exporting">Exportiere…</string>
     <string name="noExternalStoragePermissionError">Ohne die Berechtigung für den externen Speicher kann kein Import oder Export erfolgen.</string>
+    <string name="exportOptionExplanation">Die Datei wird ins Rootverzeichnis des externen Speichers geschrieben.</string>
     <string name="importOptionFilesystemTitle">Importiere aus Dateisystem</string>
     <string name="importOptionFilesystemExplanation">Wähle eine Datei aus dem Speicher aus.</string>
     <string name="importOptionFilesystemButton">Aus Dateisystem</string>
     <string name="importOptionApplicationTitle">Externe App verwenden</string>
     <string name="importOptionApplicationExplanation">Wählen Sie eine Datei aus einer App wie Dropbox, Google Drive, oder Ihrem bevorzugten Dateisystem aus.</string>
     <string name="importOptionApplicationButton">Nutze eine externe App</string>
+    <string name="importOptionFixedTitle">Importiere aus Export-Pfad</string>
+    <string name="importOptionFixedExplanation">Nutze den Export-Pfad, um Karten zu importieren (dies stellt zuvor gesicherte Daten wieder her).</string>
+    <string name="importOptionFixedButton">Export-Pfad verwenden</string>
 
     <string name="about">Über</string>
     <string name="app_copyright_fmt">Copyright 2016-<xliff:g>%d</xliff:g> Branden Archer</string>
@@ -70,6 +83,20 @@
 
     <string name="thumbnailDescription">Vorschaubild für die Karte</string>
 
+    <string name="startIntro">Starte Einführung</string>
+    <string name="intro1Title">Willkommen zu Loyalty Card Keychain\n</string>
+    <string name="intro1Description">Verwalten Sie Ihre Barcode-Kundenkarten auf Ihrem Smartphone!\n\n</string>
+    <string name="intro2Title">Karten hinzufügen\n</string>
+    <string name="intro2Description">Fügen Sie neue Karten hinzu indem Sie das "+" Symbol in der Liste berühren.\n\n</string>
+    <string name="intro3Title">Karten hinzufügen\n</string>
+    <string name="intro3Description">Um einen Barcode hinzuzufügen, verwenden Sie die Kamera oder geben Sie den Code manuell ein.\n\n</string>
+    <string name="intro4Title">Karte anzeigen\n</string>
+    <string name="intro4Description">Um eine Karte anzuzeigen, den entsprechenen Namen in der Hauptansicht anwählen.\n\n</string>
+    <string name="intro5Title">Backup\n</string>
+    <string name="intro5Description">Sie können selbstverständlich Backups anlegen. Um Karten zu exportieren oder importieren wählen Sie Import/Export im Menü auf dem Hauptbildschirm.\n\n</string>
+    <string name="intro6Title">Feedback\n</string>
+    <string name="intro6Description">Diese App enthält keine Werbung, und ist freie und quelloffene Software. Für Details berühren Sie Über im Menü auf der Hauptseite.\n\nHinterlassen Sie uns ein Feedback im App-Store (:</string>
+
     <string name="change">Anpassen</string>
     <string name="storeTextColorTitle">Textfarbe</string>
     <string name="storeTextBackgroundColorTitle">Hintergrundfarbe</string>

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

@@ -1,12 +1,14 @@
 <resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 
+    <string name="app_name">Loyalty Card Keychain</string>
     <string name="action_add">Προσθήκη</string>
 
     <string name="noGiftCards">Δεν έχετε κάρτες προς το παρόν. Πατήστε το κουμπί \"+\" (συν) στο πάνω μέρος για να ξεκινήσετε.\n\nΤο Loyalty Card Keychain σας δίνει τη δυνατότητα να έχετε τις κάρτες σας στο τηλέφωνο σας, έτσι ώστε να τις έχετε πάντα μαζί σας.</string>
     <string name="storeName">Κατάστημα</string>
     <string name="note">Σημείωση</string>
     <string name="cardId">Κωδικός Κάρτας</string>
+    <string name="barcodeType">Τύπος Barcode</string>
     <string name="cancel">Άκυρο</string>
     <string name="save">Αποθήκευση</string>
     <string name="capture">Φωτογράφιση Κάρτας</string>
@@ -22,8 +24,11 @@
     <string name="ok">OK</string>
     <string name="copy_to_clipboard">Αντιγραφή κωδικού στο πρόχειρο</string>
     <string name="sendLabel">Αποστολή&#8230;</string>
+    <string name="addedShortcut">Προστέθηκε στην Αρχική Οθόνη</string>
+
     <string name="editCardTitle">Επεξεργασία Κάρτας</string>
     <string name="addCardTitle">Προσθήκη Κάρτας</string>
+    <string name="viewCardTitle">Εμφάνιση Κάρτας</string>
     <string name="scanCardBarcode">Σαρώστε τον κωδικό της κάρτας</string>
     <string name="cardShortcut">Συντόμευση Κάρτας</string>
     <string name="noCardsMessage">Δεν υπάρχουν κάρτες. προσθέστε μία πρώτα</string>
@@ -35,23 +40,31 @@
     <string name="noCardExistsError">Δεν ήταν δυνατό να εντοπιστεί κάρτα</string>
     <string name="cardIdFormat">%1$s: %2$s</string>
     <string name="importExport">Εισαγωγή/Εξαγωγή</string>
+    <string name="importName">Εισαγωγή</string>
     <string name="exportName">Εξαγωγή</string>
     <string name="importExportHelp">Τα εφεδρικά δεδομένα σας δίνουν την δυνατότητα να μεταφέρετε τις κάρτες σας σε μία άλλη συσκευή.</string>
+    <string name="importedFrom">Εισαγωγή από: %1$s</string>
+    <string name="exportedTo">Εξαγωγή σε: %1$s</string>
+    <string name="fileMissing">Το αρχείο λείπει: %1$s</string>
     <string name="importSuccessfulTitle">Εισαγωγή επιτυχής</string>
     <string name="importFailedTitle">Εισαγωγή ανεπιτυχής</string>
-    <string name="importFailed">Δεν εισήχθει</string>
+    <string name="importFailed">Δεν εισήχθει: %1$s</string>
     <string name="exportSuccessfulTitle">Εξαγωγή επιτυχής</string>
     <string name="exportFailedTitle">Εξαγωγή ανεπιτυχής</string>
-    <string name="exportFailed">Δεν εξήχθη</string>
+    <string name="exportFailed">Δεν εξήχθη: %1$s</string>
     <string name="importing">Γίνεται εισαγωγή του&#8230;</string>
     <string name="exporting">Γίνεται εξαγωγή του&#8230;</string>
     <string name="noExternalStoragePermissionError">Δεν είναι δυνατή η εισαγωγή ή εξαγωγή καρτών χωρίς την άδεια πρόσβασης στον εξωτερικό χώρο αποθήκευσης</string>
+    <string name="exportOptionExplanation">Τα δεδομένα αποθηκεύονται στον αρχικό φάκελο του εξωτερικού χώρου αποθήκευσης.</string>
     <string name="importOptionFilesystemTitle">Εισαγωγή από το σύστημα αρχείων</string>
     <string name="importOptionFilesystemExplanation">Επιλέξτε ένα συγκεκριμένο αρχείο από το σύστημα αρχείων.</string>
     <string name="importOptionFilesystemButton">Από το σύστημα αρχείων</string>
     <string name="importOptionApplicationTitle">Χρήση εξωτερικής εφαρμογής</string>
     <string name="importOptionApplicationExplanation">Κάντε χρήση μίας εξωτερικής εφαρμογής όπως είναι τα Dropbox, Google Drive ή ο αγαπημένος σας διαχειριστής αρχείων για να ανοίξετε ένα αρχείο.</string>
     <string name="importOptionApplicationButton">Χρήση εξωτερικής εφαρμογής</string>
+    <string name="importOptionFixedTitle">Εισαγωγή από τοποθεσία εξαγωγής</string>
+    <string name="importOptionFixedExplanation">Εισαγωγή από την ίδια τοποθεσία στο σύστημα αρχείων, στην οποία γίνεται αποθήκευση κατά την εξαγωγή.</string>
+    <string name="importOptionFixedButton">Χρήση τοποθεσίας εξαγωγής</string>
 
     <string name="about">Σχετικά</string>
     <string name="app_copyright_fmt">Copyright 2016-<xliff:g>%d</xliff:g> Branden Archer</string>
@@ -67,6 +80,20 @@
 
     <string name="thumbnailDescription">Μικρογραφία κάρτας</string>
 
+    <string name="startIntro">Έναρξη Επεξήγησης</string>
+    <string name="intro1Title">Καλώς ήλθατε στο Loyalty Card Keychain\n</string>
+    <string name="intro1Description">Διαχειριστείτε τις κάρτες σας που βασίζονται σε barcodes μέσα από το κινητό σας!\n\n</string>
+    <string name="intro2Title">Προσθήκη Καρτών\n</string>
+    <string name="intro2Description">Προσθέστε μία νέα κάρτα πατώντας το συν από την λίστα καρτών.\n\n</string>
+    <string name="intro3Title">Προσθήκη Καρτών\n</string>
+    <string name="intro3Description">Για να προσθέσετε το barcode, είτε φωτογραφίστε με την κάμερα είτε γράψτε το χειροκίνητα.\n\n</string>
+    <string name="intro4Title">Εμφάνιση Κάρτας\n</string>
+    <string name="intro4Description">Για να εμφανίσετε μία κάρτα, πατήστε πάνω στο όνομα του καταστήματος, στην κεντρική οθόνη της εφαρμογής\n\n</string>
+    <string name="intro5Title">Αντίγραφα Ασφαλείας\n</string>
+    <string name="intro5Description">Μπορείτε να δημιουργήσετε αντίγραφα ασφαλείας των καρτών. Για εξαγωγή ή εισαγωγή των δεδομένων των καρτών πατήστε Εισαγωγή/Εξαγωγή στο μενού στην κεντρική οθόνη της εφαρμογής.\n\n</string>
+    <string name="intro6Title">Σχόλια\n</string>
+    <string name="intro6Description">Αυτή η εφαρμογή είναι δωρεάν, χωρίς διαφημίσεις και open source. Δείτε λεπτομέρειες πατώντας το Σχετικά στο μενού στην κεντρική οθόνη της εφαρμογής.\n\nΠαρακαλώ αφήστε σχόλια στο app store! (:</string>
+
     <string name="change">Αλλαγή</string>
     <string name="storeTextColorTitle">Χρώμα Κειμένου Καταστήματος</string>
     <string name="storeTextBackgroundColorTitle">Χρώμα Κεφαλίδας</string>

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

@@ -1,12 +1,14 @@
 <resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 
+    <string name="app_name">Cartera para Tarjetas de Fidelización.</string>
     <string name="action_add">Añadir</string>
 
     <string name="noGiftCards">Actualmente no tienes ninguna tarjeta guardada. Presiona el botón \"+\" para comenzar.\n\nEsta cartera te permite llevar tus tarjetas de fidelización en tu teléfono para que estén siempre a tu alcance.</string>
     <string name="storeName">Tienda</string>
     <string name="note">Nota</string>
     <string name="cardId">ID de la Tarjeta</string>
+    <string name="barcodeType">Tipo de Código de Barras</string>
     <string name="cancel">Cancelar</string>
     <string name="save">Guardar</string>
     <string name="capture">Escanear Tarjeta</string>
@@ -22,8 +24,11 @@
     <string name="ok">OK</string>
     <string name="copy_to_clipboard">Copiar ID al portapapeles</string>
     <string name="sendLabel">Enviar&#8230;</string>
+    <string name="addedShortcut">Añadido a la Pantalla de Inicio</string>
+
     <string name="editCardTitle">Editar Tarjeta de Fidelización</string>
     <string name="addCardTitle">Añadir Tarjeta de Fidelización</string>
+    <string name="viewCardTitle">Ver Tarjeta de Fidelización</string>
     <string name="scanCardBarcode">Escanear el Código de Barras de la Tarjeta</string>
     <string name="cardShortcut">Atajo de Tarjeta</string>
     <string name="noCardsMessage">No hay ninguna tarjeta, añade una primero</string>
@@ -35,23 +40,31 @@
     <string name="noCardExistsError">No se ha podido encontrar la tarjeta de fidelización</string>
     <string name="cardIdFormat">%1$s: %2$s</string>
     <string name="importExport">Importar/Exportar</string>
+    <string name="importName">Importar</string>
     <string name="exportName">Exportar</string>
     <string name="importExportHelp">La copia de seguridad te permite transferir tus tarjetas a otro dispositivo.</string>
+    <string name="importedFrom">Importar desde: %1$s</string>
+    <string name="exportedTo">Exportar a: %1$s</string>
+    <string name="fileMissing">Archivo perdido: %1$s</string>
     <string name="importSuccessfulTitle">Datos importados correctamente</string>
     <string name="importFailedTitle">Ha ocurrido un error al importar los datos</string>
-    <string name="importFailed">Error al importar</string>
+    <string name="importFailed">Error al importar: %1$s</string>
     <string name="exportSuccessfulTitle">Datos exportados correctamente</string>
     <string name="exportFailedTitle">Ha ocurrido un error al exportar los datos</string>
-    <string name="exportFailed">Error al exportar</string>
+    <string name="exportFailed">Error al exportar: %1$s</string>
     <string name="importing">Importando&#8230;</string>
     <string name="exporting">Exportando&#8230;</string>
     <string name="noExternalStoragePermissionError">No se pueden importar o exportar tarjetas sin el permiso de almacenamiento</string>
+    <string name="exportOptionExplanation">Los datos son guardados en la carpeta base del almacenamiento externo.</string>
     <string name="importOptionFilesystemTitle">Importar desde el sistema de archivos</string>
     <string name="importOptionFilesystemExplanation">Seleccionar un archivo del sistema de archivos</string>
     <string name="importOptionFilesystemButton">Desde el sistema de archivos</string>
     <string name="importOptionApplicationTitle">Usar una applicación externa</string>
     <string name="importOptionApplicationExplanation">Use una aplicación externa como Dropbox, Google Drive o tu gestor de archivos favoritos para abrir un archivo.</string>
     <string name="importOptionApplicationButton">Usar aplicación externa</string>
+    <string name="importOptionFixedTitle">Importar desde el lugar donde los datos son exportados</string>
+    <string name="importOptionFixedExplanation">Importar desde el mismo lugar en el sistema de archivos donde los datos son exportados.</string>
+    <string name="importOptionFixedButton">Utilizar el lugar donde los datos son exportados</string>
 
     <string name="about">Acerca de</string>
     <string name="app_copyright_fmt">Copyright 2016-<xliff:g>%d</xliff:g> Branden Archer</string>
@@ -67,6 +80,20 @@
 
     <string name="thumbnailDescription">Miniatura para la tarjeta</string>
 
+    <string name="startIntro">Empezar Introducción</string>
+    <string name="intro1Title">Bienvenido a la Cartera para Tarjetas de Fidelización\n</string>
+    <string name="intro1Description">Gestiona las tarjetas de fidelización o tarjetas cliente con codigo de barras desde tu teléfono!\n\n</string>
+    <string name="intro2Title">Añadir Tarjetas\n</string>
+    <string name="intro2Description">Añade una nueva tarjeta presionando el signo + en la lista de tarjetas.\n\n</string>
+    <string name="intro3Title">Añadir Tarjetas\n</string>
+    <string name="intro3Description">Para añadir el código de barras, escanea la tarjeta con tu cámara o introduce el código manualmente.\n\n</string>
+    <string name="intro4Title">Mostrar Tarjeta\n</string>
+    <string name="intro4Description">Para mostrar una tarjeta, presiona en el nombre de la tienda desde la pantalla principal\n\n</string>
+    <string name="intro5Title">Copias de Seguridad\n</string>
+    <string name="intro5Description">Puedes hacer una copia de seguridad de tus tarjetas. Para exportar o importar los datos presiona Importar/Exportar en el menú de la pagina principal.\n\n</string>
+    <string name="intro6Title">Tu Opinión\n</string>
+    <string name="intro6Description">Esta aplicación es gratuita, libre de publicidad y de código libre. Para más detalles presiona en Acerca De en el menu principal.\n\nPor favor deja tu opinión en la tienda de applicaciones! (:</string>
+
     <string name="change">Cambiar</string>
     <string name="storeTextColorTitle">Color del Texto de la Tienda</string>
     <string name="storeTextBackgroundColorTitle">Color Principal</string>

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

@@ -1,12 +1,14 @@
 <resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 
+    <string name="app_name">Loyalty Card Keychain</string>
     <string name="action_add">Ajouter</string>
 
     <string name="noGiftCards">Aucune carte de fidélité enregistrée. Appuyez sur le bouton \"+\" (plus) pour commencer.\n\nLoyalty Card Locker vous permet d\'enregistrer vos cartes de fidélité sur votre téléphone pour toujours les avoir à portée de main.</string>
     <string name="storeName">Nom</string>
     <string name="note">Note</string>
     <string name="cardId">Numéro</string>
+    <string name="barcodeType">Type de code-barres</string>
     <string name="cancel">Annuler</string>
     <string name="save">Enregistrer</string>
     <string name="capture">Mode capture</string>
@@ -22,8 +24,11 @@
     <string name="ok">OK</string>
     <string name="copy_to_clipboard">Copier le numéro dans le presse-papier</string>
     <string name="sendLabel">Envoyer&#8230;</string>
+    <string name="addedShortcut">Ajouter à l\'écran d\'accueil</string>
+
     <string name="editCardTitle">Modifier la carte de fidélité</string>
     <string name="addCardTitle">Ajouter une carte de fidélité</string>
+    <string name="viewCardTitle">Voir la carte de fidélité</string>
     <string name="scanCardBarcode">Flasher le code-barres de la carte</string>
     <string name="cardShortcut">Raccourci de carte</string>
     <string name="noCardsMessage">Il n\'y a aucune carte. Ajoutez en une d\'abord.</string>
@@ -35,23 +40,31 @@
     <string name="noCardExistsError">N\'a pas pu retrouver la carte de fidélité</string>
     <string name="cardIdFormat">%1$s: %2$s</string>
     <string name="importExport">Importer/Exporter</string>
+    <string name="importName">Importer</string>
     <string name="exportName">Exporter</string>
     <string name="importExportHelp">Exporter vos données vous permet de récupérer vos cartes sur un autre appareil.</string>
+    <string name="importedFrom">Importé depuis : %1$s</string>
+    <string name="exportedTo">Exporté vers : %1$s</string>
+    <string name="fileMissing">Fichier manquant : %1$s</string>
     <string name="importSuccessfulTitle">Importé avec succès</string>
     <string name="importFailedTitle">Échec de l\'import</string>
-    <string name="importFailed">Échec de l\'import </string>
+    <string name="importFailed">Échec de l\'import : %1$s</string>
     <string name="exportSuccessfulTitle">Exporté avec succès</string>
     <string name="exportFailedTitle">Échec de l\'export</string>
-    <string name="exportFailed">Échec de l\'export </string>
+    <string name="exportFailed">Échec de l\'export : %1$s</string>
     <string name="importing">Import &#8230;</string>
     <string name="exporting">Export &#8230;</string>
     <string name="noExternalStoragePermissionError">Impossible d\'importer ou d\'exporter les données sans l\'autorisation d\'accès au stockage externe</string>
+    <string name="exportOptionExplanation">Les données sont sauvegardées à la racine du stockage externe.</string>
     <string name="importOptionFilesystemTitle">Importer depuis le système de fichiers.</string>
     <string name="importOptionFilesystemExplanation">Choisissez le fichier à importer.</string>
     <string name="importOptionFilesystemButton">Système de fichiers</string>
     <string name="importOptionApplicationTitle">Application externe</string>
     <string name="importOptionApplicationExplanation">Utilisez une application externe comme Dropbox, Google Drive, ou votre gestionnaire de fichiers favori pour ouvrir un fichier.</string>
     <string name="importOptionApplicationButton">Application externe</string>
+    <string name="importOptionFixedTitle">Importer depuis le même emplacement que pour l\'export</string>
+    <string name="importOptionFixedExplanation">Importe les données depuis le même emplacement que celui défini pour l\'export.</string>
+    <string name="importOptionFixedButton">Utiliser l\'emplacement de l\'export</string>
 
     <string name="about">À propos</string>
     <string name="app_copyright_fmt">Copyright 2016-<xliff:g>%d</xliff:g> Branden Archer</string>
@@ -67,6 +80,20 @@
 
     <string name="thumbnailDescription">Miniature pour la carte</string>
 
+    <string name="startIntro">Présentation</string>
+    <string name="intro1Title">Bienvenue dans\nLoyalty Card Keychain\n</string>
+    <string name="intro1Description">Gérez vos cartes de fidélité\nsur votre téléphone !\n\n</string>
+    <string name="intro2Title">Ajouter une carte\n</string>
+    <string name="intro2Description">Ajoutez une nouvelle carte en appuyant sur le bouton \"+\" depuis la liste des cartes.\n\n</string>
+    <string name="intro3Title">Ajouter une carte\n</string>
+    <string name="intro3Description">Pour enregistrer le code-barres, utilisez l\'appareil-photo ou entrez-le manuellement.\n\n</string>
+    <string name="intro4Title">Afficher une carte\n</string>
+    <string name="intro4Description">Pour afficher une carte, appuyez sur le nom du magasin depuis l\'écran principal\n\n</string>
+    <string name="intro5Title">Sauvegarde\n</string>
+    <string name="intro5Description">Les cartes peuvent être sauvegardées. Appuyez sur \"Importer/Exporter\" depuis l\'écran principal pour restaurer ou sauvegarder les cartes.\n\n</string>
+    <string name="intro6Title">Commentaire\n</string>
+    <string name="intro6Description">Cette application est gratuite, sans pub, et son code est ouvert. Plus de détails en appuyant sur \"À propos\" depuis l\'écran principal.\n\nMerci de laisser un commentaire sur le Play Store (:</string>
+
     <string name="change">Modifier</string>
     <string name="storeTextColorTitle">Couleur du texte du magasin</string>
     <string name="storeTextBackgroundColorTitle">Couleur du titre</string>

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

@@ -4,6 +4,7 @@
     <string name="action_add">הוספה</string>
 
     <string name="cardId">מזהה כרטיס</string>
+    <string name="barcodeType">סוג ברקוד</string>
     <string name="cancel">ביטול</string>
     <string name="save">שמור</string>
     <string name="capture">צלם כרטיס</string>

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

@@ -1,6 +1,7 @@
 <resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 
+    <string name="app_name">Carte fedeltà</string>
     <string name="action_search">Cerca</string>
     <string name="action_add">Aggiungi</string>
 
@@ -10,6 +11,7 @@
     <string name="storeName">Negozio</string>
     <string name="note">Note</string>
     <string name="cardId">Codice</string>
+    <string name="barcodeType">Tipo codice a barre</string>
     <string name="barcodeNoBarcode">Questa carta non ha un codice a barre</string>
 
     <string name="cancel">Annulla</string>
@@ -28,8 +30,11 @@
     <string name="copy_to_clipboard">Copia ID negli appunti</string>
     <string name="share">Condividi</string>
     <string name="sendLabel">Invia&#8230;</string>
+    <string name="addedShortcut">Aggiunto al launcher</string>
+
     <string name="editCardTitle">Modifica carta</string>
     <string name="addCardTitle">Aggiungi carta</string>
+    <string name="viewCardTitle">Mostra carta</string>
     <string name="scanCardBarcode">Scansiona codice carta</string>
     <string name="cardShortcut">Scorciatoia per la carta</string>
     <string name="noCardsMessage">Non ci sono carte. Aggiungine prima una</string>
@@ -40,25 +45,34 @@
     <string name="noCardIdError">Nessun codice carta inserito</string>
     <string name="noCardExistsError">Impossibile trovare la carta</string>
     <string name="failedParsingImportUriError">Impossibile analizzare l\'URI</string>
+
     <string name="cardIdFormat">%1$s: %2$s</string>
     <string name="importExport">Importa/Esporta</string>
+    <string name="importName">Importa</string>
     <string name="exportName">Esporta</string>
     <string name="importExportHelp">Fare il backup dei dati ti permette di spostare le tue carte da un dispositivo ad un altro.</string>
+    <string name="importedFrom">Importato da: %1$s</string>
+    <string name="exportedTo">Esportato in: %1$s</string>
+    <string name="fileMissing">File mancante: %1$s</string>
     <string name="importSuccessfulTitle">Importazione avvenuta con successo</string>
     <string name="importFailedTitle">Importazione fallita</string>
-    <string name="importFailed">Impossibile importare</string>
+    <string name="importFailed">Impossibile importare: %1$s</string>
     <string name="exportSuccessfulTitle">Esportazione avvenuta con successo</string>
     <string name="exportFailedTitle">Esportazione fallita</string>
-    <string name="exportFailed">Impossibile esportare</string>
+    <string name="exportFailed">Impossibile esportare: %1$s</string>
     <string name="importing">Importazione in corso&#8230;</string>
     <string name="exporting">Esportazione in corso&#8230;</string>
     <string name="noExternalStoragePermissionError">Impossibile importare o esportare i dati senza il permesso per l\'uso della memoria esterna.</string>
+    <string name="exportOptionExplanation">I dati sono stati scritti nella cartella principale della memoria esterna.</string>
     <string name="importOptionFilesystemTitle">Importa dal file system</string>
     <string name="importOptionFilesystemExplanation">Scegli un file dal file system.</string>
     <string name="importOptionFilesystemButton">Dal file system</string>
     <string name="importOptionApplicationTitle">Usa un\'applicazione esterna</string>
     <string name="importOptionApplicationExplanation">Usa un\'applicazione esterna come Dropbox, Google Drive o il tuo file manager preferito per aprire il file.</string>
     <string name="importOptionApplicationButton">Usa un\'applicazione esterna</string>
+    <string name="importOptionFixedTitle">Importa da un altro posto</string>
+    <string name="importOptionFixedExplanation">Importa dallo stesso posto del file system dove si è esportato.</string>
+    <string name="importOptionFixedButton">Usa luogo dell\'esportazione</string>
 
     <string name="about">Informazioni</string>
     <string name="app_copyright_fmt">Copyright 2016-<xliff:g>%d</xliff:g> Branden Archer</string>
@@ -76,6 +90,20 @@
 
     <string name="thumbnailDescription">Miniatura carta</string>
 
+    <string name="startIntro">Introduzione</string>
+    <string name="intro1Title">Benvenuto in Carte Fedeltà\n</string>
+    <string name="intro1Description">Gestisci le tue carte direttamente dal telefono!\n\n</string>
+    <string name="intro2Title">Aggiungi carte\n</string>
+    <string name="intro2Description">Aggiungi una nuova carta premendo il + dall\'elenco delle carte.\n\n</string>
+    <string name="intro3Title">Aggiungi carte\n</string>
+    <string name="intro3Description">Per aggiungere il codice a barre, catturalo con la fotocamera o inseriscilo manualmente.\n\n</string>
+    <string name="intro4Title">Mostra carta\n</string>
+    <string name="intro4Description">Per mostrare una carta, premi sul nome del negozio dalla schermata principale\n\n</string>
+    <string name="intro5Title">Backup\n</string>
+    <string name="intro5Description">I dati delle tessere possono essere salvati. Per esportare o importare tessere premi Importa/Esporta nel menù nella schermata principale.\n\n</string>
+    <string name="intro6Title">Feedback\n</string>
+    <string name="intro6Description">Questa app è gratuita, priva di pubblicità e open source. Guarda i dettagli premendo su \"Informazioni\" nella schermata principale.\n\nPer favore, lascia un feedback nell\'app store! (:</string>
+
     <string name="change">Cambia</string>
     <string name="storeTextColorTitle">Colore titolo</string>
     <string name="storeTextBackgroundColorTitle">Colore scheda</string>
@@ -95,5 +123,6 @@
     <string name="settings_card_note_font_size">Dimensione testo delle note carta</string>
     <string name="settings_display_barcode_max_brightness">Aumenta luminosità dello schermo quando apro un codice a barre</string>
     <string name="settings_lock_barcode_orientation">Blocca orientamento del codice a barre</string>
+    <string name="intent_import_card_from_url">Importa carte fedeltà</string>
     <string name="intent_import_card_from_url_share_text">Voglio condividere una carta fedeltà con te</string>
     </resources>

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

@@ -1,12 +1,14 @@
 <resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 
+    <string name="app_name">Loyalty Card Keychain</string>
     <string name="action_add">Pridėti</string>
 
     <string name="noGiftCards">Šiuo metu neturite nė vienos įvestos lojalumo kortelės. Paspauskite "+" (pliuso) pliuso mygtuką, kad pradėtumėte.\n\nLoyalty Card Locker leidžia Jums visada nešiotis lojalumo kortelių informaciją savo telefone ar planšetėje, taip jos visada pasiekiamos.</string>
     <string name="storeName">Parduotuvė</string>
     <string name="note">Užrašas</string>
     <string name="cardId">Kortelės ID</string>
+    <string name="barcodeType">Brūkšninio kodo tipas</string>
     <string name="cancel">Atšaukti</string>
     <string name="save">Išsaugoti</string>
     <string name="capture">Nufotografuoti kortelę</string>
@@ -20,6 +22,7 @@
     <string name="copy_to_clipboard">Nukopijuoti ID į iškarpinę</string>
     <string name="editCardTitle">Redaguoti lojalumo kortelę</string>
     <string name="addCardTitle">Pridėti lojalumo kortelę</string>
+    <string name="viewCardTitle">Paeržiūrėti lojalumo kortelę</string>
     <string name="scanCardBarcode">Nuskanuokite kortelės brūkšninį kodą</string>
     <string name="barcodeImageDescription">Kortelės brūkšninio kodo paveikslėlis</string>
 
@@ -27,9 +30,13 @@
     <string name="noCardIdError">Neįvestas kortelės ID</string>
     <string name="cardIdFormat">%1$s: %2$s</string>
     <string name="importExport">Importuoti/Exportuoti</string>
+    <string name="importName">Importuoti</string>
     <string name="exportName">Exportuoti</string>
-    <string name="importFailed">Nepavyko importuoti</string>
-    <string name="exportFailed">Nepavyko eksportuoti</string>
+    <string name="importedFrom">Importuota iš: %1$s</string>
+    <string name="exportedTo">Eksportuota į: %1$s</string>
+    <string name="fileMissing">Failas nerastas: %1$s</string>
+    <string name="importFailed">Nepavyko importuoti: %1$s</string>
+    <string name="exportFailed">Nepavyko eksportuoti: %1$s</string>
     <string name="importing">Importuoja&#8230;</string>
     <string name="exporting">Eksportuoja&#8230;</string>
     <string name="noExternalStoragePermissionError">Negalima importuoti/eksportuoti kortelių be išorinės atminties leidimo</string>

app/src/main/res/values-nb-rNO/strings.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name">Kundekortknippe</string>
     <string name="action_add">Legg til</string>
     <string name="noGiftCards">Du har ingen kundekort for øyeblikket. Klikk på \"+\" (pluss)-knappen øverst for å komme igang.\n\nDa har du dem alltid hendig.</string>
     <string name="storeName">Butikk</string>
@@ -24,6 +25,7 @@
     <string name="addedShortcut">Lagt til på hjemmeskjerm</string>
     <string name="editCardTitle">Rediger kundekort</string>
     <string name="addCardTitle">Legg til kundekort</string>
+    <string name="viewCardTitle">Vis kundekort</string>
     <string name="scanCardBarcode">Skann kortets strekkode</string>
     <string name="cardShortcut">Kort-snarvei</string>
     <string name="noCardsMessage">Legg til et kort først</string>
@@ -33,14 +35,18 @@
     <string name="noCardExistsError">Kunne ikke finne kundekort</string>
     <string name="cardIdFormat">%1$s: %2$s</string>
     <string name="importExport">Import/eksport</string>
+    <string name="importName">Importer</string>
     <string name="exportName">Eksporter</string>
     <string name="importExportHelp">Sikkerhetskopiering av data lar deg flytte kortene til en annen enhet.</string>
+    <string name="importedFrom">Importert fra: %1$s</string>
+    <string name="exportedTo">Exportert til: %1$s</string>
+    <string name="fileMissing">Fil mangler: %1$s</string>
     <string name="importSuccessfulTitle">Importert</string>
     <string name="importFailedTitle">Kunne ikke importere</string>
-    <string name="importFailed">Klarte ikke å importere</string>
+    <string name="importFailed">Klarte ikke å importere: %1$s</string>
     <string name="exportSuccessfulTitle">Eksportert</string>
     <string name="exportFailedTitle">Kunne ikke eksportere</string>
-    <string name="exportFailed">Klarte ikke å eksportere</string>
+    <string name="exportFailed">Klarte ikke å eksportere: %1$s</string>
     <string name="importing">Importerer…</string>
     <string name="exporting">Exporterer…</string>
     <string name="noExternalStoragePermissionError">Kan ikke importere eller eksportere kort uten tilgang til ekstern lagring</string>
@@ -51,6 +57,9 @@
     <string name="importOptionApplicationTitle">Brukt eksternt program</string>
     <string name="importOptionApplicationExplanation">Bruk eksternt program som Nextcloud, eller din favorittfilbehandler til å åpne ei fil.</string>
     <string name="importOptionApplicationButton">Bruk eksternt program</string>
+    <string name="importOptionFixedTitle">Importer fra eksporteringsområde</string>
+    <string name="importOptionFixedExplanation">Importer fra området i filsystemet eksporter skrives til.</string>
+    <string name="importOptionFixedButton">Bruk eksporteringsplassering</string>
     <string name="about">Om</string>
     <string name="app_copyright_fmt">Kopirett 2016-<xliff:g>%d</xliff:g> Branden Archer</string>
     <string name="app_license">Lisensiert GPLv3+.</string>
@@ -69,6 +78,27 @@
     <string name="enterBarcodeInstructions">Skriv inn strekkodeverdien og velg så bildet som representerer strekkoden du ønsker å bruke.</string>
     <string name="copy_to_clipboard_toast">Kort-ID kopiert til utklippstavle</string>
     <string name="thumbnailDescription">Miniatyrbilde for kort</string>
+    <string name="startIntro">Start intro</string>
+    <string name="intro1Title">Velkommen til Kundekortknippe\n</string>
+    <string name="intro1Description">Håndter strekkodekodekundekort på din enhet.\n\n</string>
+    <string name="intro2Title">Tillegg av kort\n</string>
+    <string name="intro2Description">Legg til et nytt kort ved å trykke på + i kortlisten.
+\n
+\n</string>
+    <string name="intro3Title">Tillegg av kort\n</string>
+    <string name="intro3Description">Legg til strekkoder med kamera eller skriv dem inn manuelt.
+\n
+\n</string>
+    <string name="intro4Title">Vis kort\n</string>
+    <string name="intro4Description">For å vise et kort, klikk på butikknavnet fra hovedskjermen\n\n</string>
+    <string name="intro5Title">Sikkerhetskopi\n</string>
+    <string name="intro5Description">Kortene kan sikkerhetskopieres. For å eksportere eller importere kortdata, trykk på \"Importer/eksporter\" i hovedsidemenyen.
+\n
+\n</string>
+    <string name="intro6Title">Tilbakemeldinger\n</string>
+    <string name="intro6Description">Dette programmet er reklamefri og gratis genenslig fri programvare. Se flere detaljer ved å trykke på \"Om\"-skjermen på hovedsiden.
+\n
+\nLevn en vurdering i programbutikken. (:</string>
     <string name="change">Endre</string>
     <string name="storeTextColorTitle">Skriftstørrelse for butikktekst</string>
     <string name="storeTextBackgroundColorTitle">Overskriftsfarge</string>

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

@@ -2,9 +2,9 @@
 <!-- Palette generated by Material IO https://material.io/color/#!/?view.left=0&view.right=0&primary.color=3F51B5&secondary.color=FFC107 -->
 <!-- Colors manually flipped to dark variants -->
 <resources>
-    <color name="colorPrimary">#B53F3F</color>
-    <color name="colorPrimaryLight">#E87575</color>
-    <color name="colorPrimaryDark">#840000</color>
+    <color name="colorPrimary">#3f51b5</color>
+    <color name="colorPrimaryLight">#757de8</color>
+    <color name="colorPrimaryDark">#002984</color>
     <color name="colorSecondary">#ffc107</color>
     <color name="colorSecondaryLight">#fff350</color>
     <color name="colorSecondaryDark">#c79100</color>

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

@@ -1,6 +1,7 @@
 <resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 
+    <string name="app_name">Klantenkaartkluis</string>
     <string name="action_search">Zoeken</string>
     <string name="action_add">Toevoegen</string>
 
@@ -29,9 +30,11 @@
     <string name="copy_to_clipboard">Kaartnummer kopiëren naar klembord</string>
     <string name="share">Delen</string>
     <string name="sendLabel">Versturen&#8230;</string>
-    <string name="addedShortcut">Snelkoppeling is toegevoegd</string>
+    <string name="addedShortcut">Toegevoegd aan startscherm</string>
+
     <string name="editCardTitle">Klantenkaart bewerken</string>
     <string name="addCardTitle">Klantenkaart toevoegen</string>
+    <string name="viewCardTitle">Klantenkaart tonen</string>
     <string name="scanCardBarcode">Scan de barcode van de kaart</string>
     <string name="cardShortcut">Kaartsnelkoppeling</string>
     <string name="noCardsMessage">Je hebt nog geen kaarten toegevoegd.</string>
@@ -42,26 +45,34 @@
     <string name="noCardIdError">Geen kaartnummer ingevoerd</string>
     <string name="noCardExistsError">De klantenkaart kan niet worden opgevraagd</string>
     <string name="failedParsingImportUriError">Kan de import-uri niet verwerken</string>
+
     <string name="cardIdFormat">%1$s: %2$s</string>
     <string name="importExport">Importeren/Exporteren</string>
+    <string name="importName">Importeren</string>
     <string name="exportName">Exporteren</string>
     <string name="importExportHelp">Door de gegevens te back-uppen kun je je kaarten overzetten naar een ander apparaat.</string>
+    <string name="importedFrom">Geïmporteerd uit: %1$s</string>
+    <string name="exportedTo">Geëxporteerd naar: %1$s</string>
+    <string name="fileMissing">Bestand ontbreekt: %1$s</string>
     <string name="importSuccessfulTitle">Importeren voltooid</string>
     <string name="importFailedTitle">Importeren mislukt</string>
-    <string name="importFailed">Het importeren is mislukt</string>
+    <string name="importFailed">Het importeren is mislukt: %1$s</string>
     <string name="exportSuccessfulTitle">Exporteren voltooid</string>
     <string name="exportFailedTitle">Exporteren mislukt</string>
-    <string name="exportFailed">Het exporteren is mislukt</string>
+    <string name="exportFailed">Het exporteren is mislukt: %1$s</string>
     <string name="importing">Bezig met importeren&#8230;...</string>
     <string name="exporting">Bezig met exporteren&#8230;...</string>
     <string name="noExternalStoragePermissionError">Het importeren of exporteren van kaarten is niet mogelijk zonder de machtiging \'externe opslag\'.</string>
-    <string name="exportOptionExplanation">De gegevens worden weggeschreven op een locatie naar keuze.</string>
+    <string name="exportOptionExplanation">De gegevens worden weggeschreven naar de hoogste map op de externe opslag.</string>
     <string name="importOptionFilesystemTitle">Importeren uit bestandssysteem</string>
     <string name="importOptionFilesystemExplanation">Kies een specifiek bestand uit het bestandssysteem.</string>
     <string name="importOptionFilesystemButton">Uit bestandssysteem</string>
     <string name="importOptionApplicationTitle">Externe app gebruiken</string>
     <string name="importOptionApplicationExplanation">Open een bestand middels een externe app, zoals Dropbox, Google Drive of je favoriete bestandsbeheerder.</string>
     <string name="importOptionApplicationButton">Externe app gebruiken</string>
+    <string name="importOptionFixedTitle">Importeren uit exportlocatie</string>
+    <string name="importOptionFixedExplanation">Importeer uit dezelfde locatie op het bestandssysteem waar tijdens het exporteren naar weggeschreven is.</string>
+    <string name="importOptionFixedButton">Exportlocatie gebruiken</string>
 
     <string name="about">Over</string>
     <string name="app_copyright_fmt">Copyright 2016-<xliff:g>%d</xliff:g> Branden Archer</string>
@@ -79,6 +90,20 @@
 
     <string name="thumbnailDescription">Miniatuurvoorbeeld van kaart</string>
 
+    <string name="startIntro">Rondleiding starten</string>
+    <string name="intro1Title">Welkom bij Klantenkaartkluis\n</string>
+    <string name="intro1Description">Beheer je op barcodes gebaseerde klantenkaarten op je telefoon!\n\n</string>
+    <string name="intro2Title">Kaarten toevoegen\n</string>
+    <string name="intro2Description">Voeg een kaart toe door in de lijst met kaarten op de plus-knop te drukken.\n\n</string>
+    <string name="intro3Title">Kaarten toevoegen\n</string>
+    <string name="intro3Description">De barcode kan worden toegevoegd door deze handmatig in te voeren of te scannen met de camera.\n\n</string>
+    <string name="intro4Title">Kaart tonen\n</string>
+    <string name="intro4Description">Toon een kaart door op het kaartoverzicht op de naam van de winkel te drukken.\n\n</string>
+    <string name="intro5Title">Back-uppen\n</string>
+    <string name="intro5Description">Je kunt je kaarten back-uppen: druk in het menu op het kaartoverzicht op Importeren/Exporteren.\n\n</string>
+    <string name="intro6Title">Feedback\n</string>
+    <string name="intro6Description">Deze app is gratis, reclamevrij en open source. Bekijk alle details door op \'Over\' te drukken in het menu op het kaartoverzicht.\n\nGeef feedback in de app-winkel! (:</string>
+
     <string name="change">Aanpassen</string>
     <string name="storeTextColorTitle">Tekstkleur van winkelnaam</string>
     <string name="storeTextBackgroundColorTitle">Kopkleur</string>
@@ -98,5 +123,6 @@
     <string name="settings_card_note_font_size">Lettergrootte van aantekeningen</string>
     <string name="settings_display_barcode_max_brightness">Scherm helderder maken bij tonen van barcode</string>
     <string name="settings_lock_barcode_orientation">Barcode-oriëntatie vergrendelen</string>
+    <string name="intent_import_card_from_url">Klantenkaart importeren</string>
     <string name="intent_import_card_from_url_share_text">Ik wil een klantenkaart met je delen</string>
     </resources>

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

@@ -1,6 +1,7 @@
 <resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 
+    <string name="app_name">Loyalty Card Keychain</string>
     <string name="action_search">Szukaj</string>
     <string name="action_add">Dodaj</string>
 
@@ -10,6 +11,7 @@
     <string name="storeName">Sklep</string>
     <string name="note">Notatka</string>
     <string name="cardId">Identyfikator karty</string>
+    <string name="barcodeType">Typ kodu kreskowego</string>
     <string name="barcodeNoBarcode">Ta karta nie ma kodu kreskowego</string>
 
     <string name="cancel">Anuluj</string>
@@ -28,8 +30,11 @@
     <string name="copy_to_clipboard">Skopiuj identyfikator do schowka</string>
     <string name="share">Udostępnij</string>
     <string name="sendLabel">Wyślij&#8230;</string>
+    <string name="addedShortcut">Dodano do ekranu głównego</string>
+
     <string name="editCardTitle">Edytuj kartę lojalnościową</string>
     <string name="addCardTitle">Dodaj kartę lojalnościową</string>
+    <string name="viewCardTitle">Pokaż kartę lojalnościową</string>
     <string name="scanCardBarcode">Zeskanuj kod kreskowy karty lojalnościowej</string>
     <string name="cardShortcut">Skrót karty</string>
     <string name="noCardsMessage">Nie ma kart, należy dodać pierwszą</string>
@@ -40,25 +45,34 @@
     <string name="noCardIdError">Nie wprowadzono identyfikatora karty</string>
     <string name="noCardExistsError">Nie można wyszukać karty lojalnościowej</string>
     <string name="failedParsingImportUriError">Nie można przeanalizować identyfikatora importu URI</string>
+
     <string name="cardIdFormat">%1$s: %2$s</string>
     <string name="importExport">Importuj/Eksportuj</string>
+    <string name="importName">Importuj</string>
     <string name="exportName">Eksportuj</string>
     <string name="importExportHelp">Zarchiwizowane dane umożliwiają przeniesienie kart na inne urządzenie.</string>
+    <string name="importedFrom">Zaimportowano z: %1$s</string>
+    <string name="exportedTo">Wyeksportowano do: %1$s</string>
+    <string name="fileMissing">Brak pliku: %1$s</string>
     <string name="importSuccessfulTitle">Zaimportowano pomyślnie</string>
     <string name="importFailedTitle">Import nie powiódł się</string>
-    <string name="importFailed">Nie udało się zaimportować</string>
+    <string name="importFailed">Nie udało się zaimportować: %1$s</string>
     <string name="exportSuccessfulTitle">Wyeksportowano pomyślnie</string>
     <string name="exportFailedTitle">Eksport nie powiódł się</string>
-    <string name="exportFailed">Nie udało się wyeksportować</string>
+    <string name="exportFailed">Nie udało się wyeksportować: %1$s</string>
     <string name="importing">Importowanie&#8230;</string>
     <string name="exporting">Eksportowanie&#8230;</string>
     <string name="noExternalStoragePermissionError">Nie można importować ani eksportować kart bez uprawnień do pamięci zewnętrznej</string>
+    <string name="exportOptionExplanation">Dane zapisywane są w głównym katalogu pamięci zewnętrznej.</string>
     <string name="importOptionFilesystemTitle">Importuj z systemu plików</string>
     <string name="importOptionFilesystemExplanation">Wybierz określony plik z systemu plików.</string>
     <string name="importOptionFilesystemButton">Z systemu plików</string>
     <string name="importOptionApplicationTitle">Użyj zewnętrznej aplikacji</string>
     <string name="importOptionApplicationExplanation">Użyj zewnętrznej aplikacji jak Dropbox, Google Drive, bądź ulubiony menedżer plików, aby otworzyć plik.</string>
     <string name="importOptionApplicationButton">Użyj zewnętrznej aplikacji</string>
+    <string name="importOptionFixedTitle">Importuj z lokalizacji eksportowania</string>
+    <string name="importOptionFixedExplanation">Importuj z tej samej lokalizacji w systemie plików, do którego zapisano przy eksporcie.</string>
+    <string name="importOptionFixedButton">Użyj lokalizacji eksportu</string>
 
     <string name="about">O aplikacji</string>
     <string name="app_copyright_fmt">© 2016 — <xliff:g>%d</xliff:g> Branden Archer.</string>
@@ -76,6 +90,20 @@
 
     <string name="thumbnailDescription">Miniaturka karty</string>
 
+    <string name="startIntro">Pokaż ekran powitalny</string>
+    <string name="intro1Title">Witaj w Loyalty Card Keychain\n</string>
+    <string name="intro1Description">Zarządzaj kartami sklepowymi/lojalnościowymi opartymi na kodzie kreskowym na swoim telefonie!\n\n</string>
+    <string name="intro2Title">Dodawanie kart\n</string>
+    <string name="intro2Description">Dodaj nową kartę, dotykając znaku plus z listy kart. \n\n</string>
+    <string name="intro3Title">Dodawanie kart\n</string>
+    <string name="intro3Description">Aby dodać kod kreskowy, wykonaj zdjęcie aparatem lub wpisz ręcznie. \n\n</string>
+    <string name="intro4Title">Pokaż kartę\n</string>
+    <string name="intro4Description">Aby wyświetlić kartę, na głównym ekranie kliknij nazwę sklepu \n\n</string>
+    <string name="intro5Title">Kopia zapasowa\n</string>
+    <string name="intro5Description">Karty można zarchiwizować. Aby wyeksportować lub zaimportować dane karty, dotknij opcji Importuj/eksportuj w menu na stronie głównej. \n\n</string>
+    <string name="intro6Title">Informacje zwrotne\n</string>
+    <string name="intro6Description">Ta aplikacja jest darmowa, bez reklam i z otwartym kodem źródłowym. Zobacz szczegóły, klikając Informacje w menu na stronie głównej. \n\n Proszę zostawić opinię o programie w sklepie z aplikacjami! (:</string>
+
     <string name="change">Zmień</string>
     <string name="storeTextColorTitle">Kolor tekstu nazwy sklepu</string>
     <string name="storeTextBackgroundColorTitle">Kolor nagłówka</string>
@@ -95,5 +123,6 @@
     <string name="settings_card_note_font_size">Rozmiar czcionki notatki karty</string>
     <string name="settings_display_barcode_max_brightness">Rozjaśnij widok kodu kreskowego</string>
     <string name="settings_lock_barcode_orientation">Zablokuj autoobracanie kodów kreskowych</string>
+    <string name="intent_import_card_from_url">Importuj kartę lojalnościową</string>
     <string name="intent_import_card_from_url_share_text">Chcę udostępnić Ci kartę lojalnościową</string>
     </resources>

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

@@ -1,6 +1,7 @@
 <resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 
+    <string name="app_name">Карты лояльности</string>
     <string name="action_search">Поиск</string>
     <string name="action_add">Добавить карту</string>
 
@@ -10,7 +11,7 @@
     <string name="storeName">Магазин</string>
     <string name="note">Примечание</string>
     <string name="cardId">Номер карты</string>
-    <string name="barcodeType">Тип штрихкода</string>
+    <string name="barcodeType">Тип штрих-кода</string>
     <string name="barcodeNoBarcode">Эта карта без штрихкода</string>
 
     <string name="cancel">Отменить</string>
@@ -29,9 +30,11 @@
     <string name="copy_to_clipboard">Скопировать номер карты в буфер обмена</string>
     <string name="share">Переслать</string>
     <string name="sendLabel">Отправить&#8230;</string>
-    <string name="addedShortcut">Добавленный ярлык</string>
+    <string name="addedShortcut">Карта добавлена на главный экран.</string>
+
     <string name="editCardTitle">Редактировать карту</string>
     <string name="addCardTitle">Добавить карту</string>
+    <string name="viewCardTitle">Посмотреть карту</string>
     <string name="scanCardBarcode">Отсканируйте штрих-код</string>
     <string name="cardShortcut">Ярлык карты</string>
     <string name="noCardsMessage">Карт нет, добавьте одну для начала</string>
@@ -42,26 +45,34 @@
     <string name="noCardIdError">Номер карты не указан</string>
     <string name="noCardExistsError">Карта не найдена</string>
     <string name="failedParsingImportUriError">Не удалось разобрать импортируемый URI</string>
+
     <string name="cardIdFormat">%1$s: %2$s</string>
     <string name="importExport">Импорт/Экспорт</string>
+    <string name="importName">Импорт</string>
     <string name="exportName">Экспорт</string>
     <string name="importExportHelp">Сохранение карт позволяет перенести их на другое устройство.</string>
+    <string name="importedFrom">Импортировано из: %1$s</string>
+    <string name="exportedTo">Экспортировано в: %1$s</string>
+    <string name="fileMissing">Файл не найден: %1$s</string>
     <string name="importSuccessfulTitle">Успешный импорт</string>
     <string name="importFailedTitle">Импорт не удался</string>
-    <string name="importFailed">Не удалось импортировать</string>
+    <string name="importFailed">Не удалось импортировать: %1$s</string>
     <string name="exportSuccessfulTitle">Успешный экспорт</string>
     <string name="exportFailedTitle">Экспорт не удался</string>
-    <string name="exportFailed">Не удалось экспортировать</string>
+    <string name="exportFailed">Не удалось экспортировать: %1$s</string>
     <string name="importing">Импорт&#8230;</string>
     <string name="exporting">Экспорт&#8230;</string>
     <string name="noExternalStoragePermissionError">Импорт или экспорт невозможен без разрешения на доступ к хранилищу</string>
-    <string name="exportOptionExplanation">Данные будут записаны в выбранное место.</string>
+    <string name="exportOptionExplanation">Данные сохраняются в корневой каталог хранилища.</string>
     <string name="importOptionFilesystemTitle">Импорт из файловой системы</string>
     <string name="importOptionFilesystemExplanation">Выберете файл на файловой системе.</string>
     <string name="importOptionFilesystemButton">Выбрать файл</string>
     <string name="importOptionApplicationTitle">Использование другого приложения</string>
     <string name="importOptionApplicationExplanation">Использовать другое приложение такое как Dropbox, Google Drive, или ваш любимый файловый менеджер чтобы открыть файл.</string>
     <string name="importOptionApplicationButton">Использовать другое приложение</string>
+    <string name="importOptionFixedTitle">Импорт из файла экспорта</string>
+    <string name="importOptionFixedExplanation">Импорт из того же файла, куда сохраняется экспорт.</string>
+    <string name="importOptionFixedButton">Использовать файл экспорта</string>
 
     <string name="about">О программе</string>
     <string name="app_copyright_fmt">Все права защищены 2016-<xliff:g>%d</xliff:g> Branden Archer</string>
@@ -79,6 +90,20 @@
 
     <string name="thumbnailDescription">Логотип карты</string>
 
+    <string name="startIntro">Введение</string>
+    <string name="intro1Title">Добро пожаловать в Карты лояльности\n</string>
+    <string name="intro1Description">Храните все карты лояльности/магазинов со штрих-кодом в телефоне!\n\n</string>
+    <string name="intro2Title">Добавление карт\n</string>
+    <string name="intro2Description">Добавьте новую карту, нажав на плюс на экране со списком карт.\n\n</string>
+    <string name="intro3Title">Добавление карт\n</string>
+    <string name="intro3Description">Для добавления штрих-кода отсканируйте карту камерой или введите номер вручную.\n\n</string>
+    <string name="intro4Title">Показ карты\n</string>
+    <string name="intro4Description">Для показа карты, нажмите на название магазина на главном экране.\n\n</string>
+    <string name="intro5Title">Резервное копирование\n</string>
+    <string name="intro5Description">Можно сделать резервную копию карт. Для этого нажмите Импорт/Экспорт в меню на главном экране.\n\n</string>
+    <string name="intro6Title">Отзыв\n</string>
+    <string name="intro6Description">Это бесплатное приложение, без рекламы и с открытым исходным кодом. Подробнее в разделе «О программе» в меню на главном экране.\n\nПожалуйста, оставьте отзыв в маркете приложений! (:</string>
+
     <string name="change">Изменить</string>
     <string name="storeTextColorTitle">Цвет текста</string>
     <string name="storeTextBackgroundColorTitle">Цвет фона</string>
@@ -98,5 +123,6 @@
     <string name="settings_card_note_font_size">Размер шрифта примечания</string>
     <string name="settings_display_barcode_max_brightness">Максимальная яркость при показе карты</string>
     <string name="settings_lock_barcode_orientation">Портретная ориентация экрана при показе карты</string>
+    <string name="intent_import_card_from_url">Импортировать карту</string>
     <string name="intent_import_card_from_url_share_text">Я хочу поделиться картой с вами</string>
     </resources>

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

@@ -1,12 +1,14 @@
 <resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 
+    <string name="app_name">Vernostné karty</string>
     <string name="action_add">Pridať</string>
 
     <string name="noGiftCards">Zatiaľ nemáte žiadne vernostné karty. Kliknite na tlačidlo \"+\" (plus) vyššie a začnite.\n\nAplikácia Vernostné karty umožňuje nosiť svoje vernostné karty v telefóne, kde sú vždy na dosah.</string>
     <string name="storeName">Obchod</string>
     <string name="note">Poznámka</string>
     <string name="cardId">ID karty</string>
+    <string name="barcodeType">Typ čiarového kódu</string>
     <string name="cancel">Zrušiť</string>
     <string name="save">Uložiť</string>
     <string name="capture">Zosnímať kartu</string>
@@ -22,8 +24,11 @@
     <string name="ok">Áno</string>
     <string name="copy_to_clipboard">Kopírovať ID do schránky</string>
     <string name="sendLabel">Odoslať&#8230;</string>
+    <string name="addedShortcut">Pridané na domovskú obrazovku</string>
+
     <string name="editCardTitle">Upraviť kartu</string>
     <string name="addCardTitle">Pridať kartu</string>
+    <string name="viewCardTitle">Zobraziť kartu</string>
     <string name="scanCardBarcode">Zosnímajte čiarový kód na karte</string>
     <string name="cardShortcut">Skratka</string>
     <string name="noCardsMessage">Nie sú uložené žiadne karty, vložte prvú</string>
@@ -35,23 +40,31 @@
     <string name="noCardExistsError">Nie je možné vyhľadať vernostnú kartu</string>
     <string name="cardIdFormat">%1$s: %2$s</string>
     <string name="importExport">Import/Export</string>
+    <string name="importName">Import</string>
     <string name="exportName">Export</string>
     <string name="importExportHelp">Zálohovanie dát Vám umožní presunúť Vaše uložené karty na iné zariadenie.</string>
+    <string name="importedFrom">Importované z: %1$s</string>
+    <string name="exportedTo">Exportované do: %1$s</string>
+    <string name="fileMissing">Chýbajúci súbor: %1$s</string>
     <string name="importSuccessfulTitle">Import bol úspešný</string>
     <string name="importFailedTitle">Import zlyhal</string>
-    <string name="importFailed">Zlyhal import</string>
+    <string name="importFailed">Zlyhal import: %1$s</string>
     <string name="exportSuccessfulTitle">Export bol úspešný</string>
     <string name="exportFailedTitle">Export zlyhal</string>
-    <string name="exportFailed">Zlyhal export</string>
+    <string name="exportFailed">Zlyhal export: %1$s</string>
     <string name="importing">Importujem&#8230;</string>
     <string name="exporting">Exportujem&#8230;</string>
     <string name="noExternalStoragePermissionError">Nie je možné importovať a exportovať karty bez prístupu k externému úložisku</string>
+    <string name="exportOptionExplanation">Dáta sú zapísané do koreňového adresára na externom úložisku.</string>
     <string name="importOptionFilesystemTitle">Import zo súborového systému.</string>
     <string name="importOptionFilesystemExplanation">Vyberte súbor zo súborového systému.</string>
     <string name="importOptionFilesystemButton">Zo súborového systému</string>
     <string name="importOptionApplicationTitle">Použite externú aplikáciu</string>
     <string name="importOptionApplicationExplanation">Na otvorenie súboru použite externú aplikáciu, ako Dropbox, Disk Google, alebo Vášho obľúbeného správcu súborov.</string>
     <string name="importOptionApplicationButton">Použiť externú aplikáciu</string>
+    <string name="importOptionFixedTitle">Importujte z exportovacieho umiestnenia.</string>
+    <string name="importOptionFixedExplanation">Importujte z rovnakého umiestnenia v súborovom systéme, na ktorý je zapisovaný export.</string>
+    <string name="importOptionFixedButton">Použite exportovacie umiestnenie</string>
 
     <string name="about">O aplikácii</string>
     <string name="app_copyright_fmt">Copyright 2016-<xliff:g>%d</xliff:g> Branden Archer</string>
@@ -67,6 +80,20 @@
 
     <string name="thumbnailDescription">Náhľad karty</string>
 
+    <string name="startIntro">Zobraz úvod</string>
+    <string name="intro1Title">Vitajte v aplikácii Vernostné karty\n</string>
+    <string name="intro1Description">Používajte Vaše vernostné karty s čiarovými kódmi na Vašom mobilnom zariadení!\n\n</string>
+    <string name="intro2Title">Pridávanie kariet\n</string>
+    <string name="intro2Description">Pridajte novú kartu stlačením \"+\" v zozname kariet.\n\n</string>
+    <string name="intro3Title">Pridávanie kariet\n</string>
+    <string name="intro3Description">Čiarový kód nasnímajte kamerou, alebo ho vypíšte ručne.\n\n</string>
+    <string name="intro4Title">Zobrazenie karty\n</string>
+    <string name="intro4Description">Pre zobrazenie vernostnej karty stlačte názov obchodu v zozname kariet.\n\n</string>
+    <string name="intro5Title">Záloha\n</string>
+    <string name="intro5Description">Vaše uložené karty môžu byť zálohované. Pre export a import kariet stlačte \"Import/Export\" v menu aplikácie.\n\n</string>
+    <string name="intro6Title">Spätná väzba\n</string>
+    <string name="intro6Description">Táto aplikácia je slobodná, neobsahuje reklamu a má otvorený zdrojový kód. Ďalšie informácie nájdete v položke menu O aplikácii na hlavnej stránke.\n\n Prosíme, zanechajte spätnú väzbu v obchode s aplikáciami. (:</string>
+
     <string name="change">Upraviť</string>
     <string name="storeTextColorTitle">Farba textu</string>
     <string name="storeTextBackgroundColorTitle">Farba hlavičky</string>

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

@@ -1,12 +1,14 @@
 <resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 
+    <string name="app_name">Kartice zvestobe</string>
     <string name="action_add">Dodaj</string>
 
     <string name="noGiftCards">Trenutno nimate shranjene nobene kartice zvestobe. Kliknite  \"+\" (plus) na vrhu, da jih dodate.\n\n Aplikacija Kartice zvestobe Vam omogoča, da imate kartice zvestobe shranjene na Vašem telefonu in vedno v dosegu roke.</string>
     <string name="storeName">Shrani</string>
     <string name="note">Zabeležka</string>
     <string name="cardId">Št. kartice</string>
+    <string name="barcodeType">Vrsta črne kode</string>
     <string name="cancel">Prekliči</string>
     <string name="save">Shrani</string>
     <string name="capture">Slikaj kartico</string>
@@ -22,8 +24,11 @@
     <string name="ok">Vredu</string>
     <string name="copy_to_clipboard">Kopirajte številko kartice</string>
     <string name="sendLabel">Pošlji#8230;</string>
+    <string name="addedShortcut">Dodajte na domači zaslon</string>
+
     <string name="editCardTitle">Uredi kartico zvestobe</string>
     <string name="addCardTitle">Dodaj kartico zvestobe</string>
+    <string name="viewCardTitle">Prikaži kartico zvestobe</string>
     <string name="scanCardBarcode">Skeniraj črtno kodo</string>
     <string name="cardShortcut">Bližnjica do kartice</string>
     <string name="noCardsMessage">Trenutno ni na voljo nobene kartice. Najprej jih je potrebno dodati.</string>
@@ -35,23 +40,31 @@
     <string name="noCardExistsError">Te kartice zvestobe ni bilo moč najti</string>
     <string name="cardIdFormat">%1$s:%2$s</string>
     <string name="importExport">Uvozi/izvozi</string>
+    <string name="importName">Uvozi</string>
     <string name="exportName">Izvozi</string>
     <string name="importExportHelp">Varnostna kopija omogoča varen prenos kartic na druge telefonske naprave.</string>
+    <string name="importedFrom">Uvoženo iz: %1$s</string>
+    <string name="exportedTo">Izvoženo v:%1$s</string>
+    <string name="fileMissing">Manjkajoča datoteka: %1$s</string>
     <string name="importSuccessfulTitle">Uvoz je bil uspešen</string>
     <string name="importFailedTitle">Uvoz ni uspel</string>
-    <string name="importFailed">Napaka pri uvozu</string>
+    <string name="importFailed">Napaka pri uvozu: %1$s</string>
     <string name="exportSuccessfulTitle">Izvoz je uspel</string>
     <string name="exportFailedTitle">Izvoz ni uspel</string>
-    <string name="exportFailed">Napaka pri izvozu</string>
+    <string name="exportFailed">Napaka pri izvozu: %1$s</string>
     <string name="importing">Uvažanje&#8230;</string>
     <string name="exporting">Izvažanje&#8230;</string>
     <string name="noExternalStoragePermissionError">Izvažanje in uvažanje je nemogoče brez omogočenega dostopa do zunanje shrambe</string>
+    <string name="exportOptionExplanation">Podati so bili zapisani v prvo mapo v zunanji shrambi</string>
     <string name="importOptionFilesystemTitle">Uvozi iz datotečnega sistema</string>
     <string name="importOptionFilesystemExplanation">Izberite specifično datoteko iz datotečnega sistema</string>
     <string name="importOptionFilesystemButton">Iz datotečnega sistema</string>
     <string name="importOptionApplicationTitle">Uporabi zunanjo aplikacijo</string>
     <string name="importOptionApplicationExplanation">Uporabi zunanjo aplikacijo, kot npr. Dropbox, Google Drive ali ostale upravljalnike datotek, za odpiranje datoteko.</string>
     <string name="importOptionApplicationButton">Uporabi zunanjo aplikacijo</string>
+    <string name="importOptionFixedTitle">Uvozi iz zunanje aplikacije</string>
+    <string name="importOptionFixedExplanation">Uvozi iz iste lokacije, ki je namenjena izvozu</string>
+    <string name="importOptionFixedButton">Uporabi lokacijo izvoza</string>
 
     <string name="about">Več o aplikaciji</string>
     <string name="app_copyright_fmt">Copyright 2016-<xliff:g>%d</xliff:g> Branden Archer</string>
@@ -67,6 +80,20 @@
 
     <string name="thumbnailDescription">Ikona kartice</string>
 
+    <string name="startIntro">Uvodnik</string>
+    <string name="intro1Title">Dobrodošli v aplikacijo Kartice zvestobe\n</string>
+    <string name="intro1Description">Urejajte vaše črtne kode oziroma kartice na Vašem telefonu!\n\n</string>
+    <string name="intro2Title">Dodajanje kartic\n</string>
+    <string name="intro2Description">Dodajte kartico s klikom na plus na seznamu kartic.\n\n</string>
+    <string name="intro3Title">Dodajanje kartic\n</string>
+    <string name="intro3Description">Če želite dodati črtno kodo jo ali slikajte s fotoaparatom ali jo vnesite ročno.\n\n</string>
+    <string name="intro4Title">Prikaži kartico\n</string>
+    <string name="intro4Description">Za prikaz kartice je potreben klik na ime trgovine na glavnem zaslonu\n\n</string>
+    <string name="intro5Title">Varnostna kopija\n</string>
+    <string name="intro5Description">Kartice lahko shranite s pomočjo varnostne kopije. Za uvoz ali izvoz kartic je potrebno klikniti Uvozi/Izvozi v meniju na glavni strani.\n\n</string>
+    <string name="intro6Title">Povratne informacije razvijalcem\n</string>
+    <string name="intro6Description">Aplikacija je brezplačna, brez oglasov in odprtokodna.  Če želite izvedeti več podrobnosti, kliknite na Več o aplikaciji v meniju na glavni strani.\n\nProsim, napišite Vaše mnenje o aplikaciji v spletni trgovini (:</string>
+
     <string name="change">Spremeni</string>
     <string name="storeTextColorTitle">Barva besedila trgovine</string>
     <string name="storeTextBackgroundColorTitle">Barva naslova</string>

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

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Palette generated by Material IO https://material.io/color/#!/?view.left=0&view.right=0&primary.color=3F51B5&secondary.color=FFC107 -->
 <resources>
-    <color name="colorPrimary">#B53F3F</color>
-    <color name="colorPrimaryLight">#E87575</color>
-    <color name="colorPrimaryDark">#840000</color>
+    <color name="colorPrimary">#3f51b5</color>
+    <color name="colorPrimaryLight">#757de8</color>
+    <color name="colorPrimaryDark">#002984</color>
     <color name="colorSecondary">#ffc107</color>
     <color name="colorSecondaryLight">#fff350</color>
     <color name="colorSecondaryDark">#c79100</color>

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_revision_url" translatable="false">https://github.com/TheLastProject/Catima/releases</string>
-    <string name="app_webpage_url" translatable="false">https://github.com/TheLastProject/Catima</string>
+    <string name="app_revision_url" translatable="false">https://github.com/brarcher/loyalty-card-locker/releases</string>
+    <string name="app_webpage_url" translatable="false">https://github.com/brarcher/loyalty-card-locker</string>
 </resources>

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

@@ -1,17 +1,18 @@
 <resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 
-    <string name="app_name" translatable="false">Catima</string>
+    <string name="app_name">Loyalty Card Keychain</string>
     <string name="action_search">Search</string>
     <string name="action_add">Add</string>
 
-    <string name="noGiftCards">You don\'t have any cards at the moment. Click the "+" (plus) button to get started.\n\nCatima lets you carry your cards on your phone, so they are always within reach.</string>
-    <string name="noMatchingGiftCards">No cards match the search filter. Please try some different terms.</string>
+    <string name="noGiftCards">You don\'t have any loyalty cards at the moment. Click the "+" (plus) button up top to get started.\n\nLoyalty Card Locker lets you carry your loyalty cards on your phone, so they are always within reach.</string>
+    <string name="noMatchingGiftCards">No loyalty cards match the search filter. Please try some different terms.</string>
+    <string name="cardCount">%1$d cards</string>
 
     <string name="storeName">Store</string>
     <string name="note">Note</string>
     <string name="cardId">Card ID</string>
-    <string name="barcodeType">Barcode type</string>
+    <string name="barcodeType">Barcode Type</string>
     <string name="barcodeNoBarcode">This card has no barcode</string>
 
     <string name="cancel">Cancel</string>
@@ -20,20 +21,21 @@
     <string name="enterCard">Enter Card</string>
     <string name="editCard">Edit Card</string>
     <string name="edit">Edit</string>
-    <string name="moreInfo">More Info</string>
     <string name="delete">Delete</string>
     <string name="confirm">Confirm</string>
     <string name="lockScreen">Block Rotation</string>
     <string name="unlockScreen">Unblock Rotation</string>
-    <string name="deleteTitle">Remove Card</string>
+    <string name="deleteTitle">Remove Loyalty Card</string>
     <string name="deleteConfirmation">Please confirm that you want to delete this card.</string>
     <string name="ok">OK</string>
     <string name="copy_to_clipboard">Copy ID to clipboard</string>
     <string name="share">Share</string>
     <string name="sendLabel">Send&#8230;</string>
-    <string name="addedShortcut">Added shortcut</string>
-    <string name="editCardTitle">Edit Card</string>
-    <string name="addCardTitle">Add Card</string>
+    <string name="addedShortcut">Added to Home Screen</string>
+
+    <string name="editCardTitle">Edit Loyalty Card</string>
+    <string name="addCardTitle">Add Loyalty Card</string>
+    <string name="viewCardTitle">View Loyalty Card</string>
     <string name="scanCardBarcode">Scan Card\'s Barcode</string>
     <string name="cardShortcut">Card Shortcut</string>
     <string name="noCardsMessage">There are no cards, add one first</string>
@@ -43,34 +45,40 @@
     <string name="noStoreError">No Store entered</string>
     <string name="noCardIdError">No Card ID entered</string>
     <string name="noCardExistsError">Could not lookup loyalty card</string>
-    <string name="failedSharingCard">Could not share card</string>
-    <string name="failedShowingExtras">Could not show extra information: data not correctly formatted</string>
-    <string name="failedSavingCard">Could not save card</string>
     <string name="failedParsingImportUriError">Could not parse the import URI</string>
+
     <string name="cardIdFormat">%1$s: %2$s</string>
+    <string name="storeNameAndNoteFormat" translatable="false">%1$s - %2$s</string>
+
     <string name="importExport">Import/Export</string>
+    <string name="importName">Import</string>
     <string name="exportName">Export</string>
     <string name="importExportHelp">Backed up data can allow you to move your cards to another device.</string>
+    <string name="importedFrom">Imported from: %1$s</string>
+    <string name="exportedTo">Exported to: %1$s</string>
+    <string name="fileMissing">File missing: %1$s</string>
     <string name="importSuccessfulTitle">Import successful</string>
     <string name="importFailedTitle">Import failed</string>
-    <string name="importFailed">Failed to import</string>
+    <string name="importFailed">Failed to import: %1$s</string>
     <string name="exportSuccessfulTitle">Export successful</string>
     <string name="exportFailedTitle">Export failed</string>
-    <string name="exportFailed">Failed to export</string>
+    <string name="exportFailed">Failed to export: %1$s</string>
     <string name="importing">Importing&#8230;</string>
     <string name="exporting">Exporting&#8230;</string>
     <string name="noExternalStoragePermissionError">Unable to import or export cards without the external storage permission</string>
-    <string name="exportOptionExplanation">Data will be written to a location of your choice.</string>
+    <string name="exportOptionExplanation">Data is written to the top directory in external storage.</string>
     <string name="importOptionFilesystemTitle">Import from filesystem</string>
     <string name="importOptionFilesystemExplanation">Choose a specific file from the filesystem.</string>
     <string name="importOptionFilesystemButton">From filesystem</string>
-    <string name="importOptionApplicationTitle">Use external ap1plication</string>
+    <string name="importOptionApplicationTitle">Use external application</string>
     <string name="importOptionApplicationExplanation">Use an external application like Dropbox, Google Drive, or your favorite file manager to open a file.</string>
     <string name="importOptionApplicationButton">Use external application</string>
+    <string name="importOptionFixedTitle">Import from export location</string>
+    <string name="importOptionFixedExplanation">Import from the same location on the filesystem that is written to on export.</string>
+    <string name="importOptionFixedButton">Use export location</string>
 
     <string name="about">About</string>
-    <string name="app_copyright_fmt">Copyright 2019-<xliff:g>%d</xliff:g> Sylvia van Os.</string>
-    <string name="app_copyright_old">Based on Loyalty Card Keychain, copyright 2016-2020 Branden Archer.</string>
+    <string name="app_copyright_fmt">Copyright 2016-<xliff:g>%d</xliff:g> Branden Archer</string>
     <string name="app_license">Licensed under the GPLv3.</string>
     <string name="about_title_fmt">About <xliff:g id="app_name">%s</xliff:g></string>
     <string name="debug_version_fmt">Version: <xliff:g id="version">%s</xliff:g></string>
@@ -85,6 +93,20 @@
 
     <string name="thumbnailDescription">Thumbnail for card</string>
 
+    <string name="startIntro">Start Intro</string>
+    <string name="intro1Title">Welcome to Loyalty Card Keychain\n</string>
+    <string name="intro1Description">Manage your barcode-based store/loyalty cards on your phone!\n\n</string>
+    <string name="intro2Title">Adding Cards\n</string>
+    <string name="intro2Description">Add a new card by touching the plus from the card list.\n\n</string>
+    <string name="intro3Title">Adding Cards\n</string>
+    <string name="intro3Description">To add the barcode, either capture with the camera or type in manually.\n\n</string>
+    <string name="intro4Title">Show Card\n</string>
+    <string name="intro4Description">To display a card, click on the store name from the main screen\n\n</string>
+    <string name="intro5Title">Backup\n</string>
+    <string name="intro5Description">The cards can be backed-up. To export or import card data touch Import/Export in the menu on the main page.\n\n</string>
+    <string name="intro6Title">Feedback\n</string>
+    <string name="intro6Description">This app is free, ad-free, and open source. See details by touching About in the menu on the main page.\n\nPlease leave feedback in the app store! (:</string>
+
     <string name="change">Change</string>
     <string name="storeTextColorTitle">Store Text Color</string>
     <string name="storeTextBackgroundColorTitle">Heading Color</string>
@@ -116,11 +138,8 @@
     <string name="settings_lock_barcode_orientation">Lock barcode orientation</string>
     <string name="settings_key_lock_barcode_orientation" translatable="false">pref_lock_barcode_orientation</string>
 
-    <string name="intent_import_card_from_url_share_text">I want to share a card with you</string>
-    <string name="intent_import_card_from_url_host" translatable="false">thelastproject.github.io</string>
-    <string name="intent_import_card_from_url_path_prefix" translatable="false">/Catima/share</string>
-    <string name="intent_import_card_from_url_host_old" translatable="false">brarcher.github.io</string>
-    <string name="intent_import_card_from_url_path_prefix_old" translatable="false">/loyalty-card-locker/share</string>
-    <string name="importSuccessful">Successfully imported loyalty card data</string>
-    <string name="exportSuccessful">Successfully exported loyalty card data</string>
+    <string name="intent_import_card_from_url">Import loyalty card</string>
+    <string name="intent_import_card_from_url_share_text">I want to share a loyalty card with you</string>
+    <string name="intent_import_card_from_url_host" translatable="false">brarcher.github.io</string>
+    <string name="intent_import_card_from_url_path_prefix" translatable="false">/loyalty-card-locker/share</string>
 </resources>

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

@@ -2,17 +2,12 @@ package protect.card_locker;
 
 import android.app.Activity;
 import android.content.ContentValues;
-import android.content.res.Resources;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
 import android.graphics.Color;
 
 import com.google.zxing.BarcodeFormat;
 
-import org.json.JSONException;
-import org.json.JSONObject;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -33,24 +28,19 @@ public class DatabaseTest
 
     private static final Integer DEFAULT_HEADER_COLOR = Color.BLACK;
     private static final Integer DEFAULT_HEADER_TEXT_COLOR = Color.WHITE;
-    private static Bitmap DEFAULT_ICON = BitmapFactory.decodeResource(Resources.getSystem(), R.mipmap.ic_launcher);
-    private static ExtrasHelper DEFAULT_EXTRAS;
 
     @Before
-    public void setUp() throws JSONException
+    public void setUp()
     {
-        DEFAULT_EXTRAS = new ExtrasHelper();
-        DEFAULT_EXTRAS.addLanguageValue("en", "key", "value");
-
         Activity activity = Robolectric.setupActivity(MainActivity.class);
         db = new DBHelper(activity);
     }
 
     @Test
-    public void addRemoveOneGiftCard() throws JSONException
+    public void addRemoveOneGiftCard()
     {
         assertEquals(0, db.getLoyaltyCardCount());
-        long id = db.insertLoyaltyCard("store", "note", "cardId", BarcodeFormat.UPC_A.toString(), DEFAULT_HEADER_COLOR, DEFAULT_HEADER_TEXT_COLOR, DEFAULT_ICON, DEFAULT_EXTRAS);
+        long id = db.insertLoyaltyCard("store", "note", "cardId", BarcodeFormat.UPC_A.toString(), DEFAULT_HEADER_COLOR, DEFAULT_HEADER_TEXT_COLOR);
         boolean result = (id != -1);
         assertTrue(result);
         assertEquals(1, db.getLoyaltyCardCount());
@@ -69,14 +59,14 @@ public class DatabaseTest
     }
 
     @Test
-    public void updateGiftCard() throws JSONException
+    public void updateGiftCard()
     {
-        long id = db.insertLoyaltyCard("store", "note", "cardId", BarcodeFormat.UPC_A.toString(), DEFAULT_HEADER_COLOR, DEFAULT_HEADER_TEXT_COLOR, DEFAULT_ICON, DEFAULT_EXTRAS);
+        long id = db.insertLoyaltyCard("store", "note", "cardId", BarcodeFormat.UPC_A.toString(), DEFAULT_HEADER_COLOR, DEFAULT_HEADER_TEXT_COLOR);
         boolean result = (id != -1);
         assertTrue(result);
         assertEquals(1, db.getLoyaltyCardCount());
 
-        result = db.updateLoyaltyCard(1, "store1", "note1", "cardId1", BarcodeFormat.AZTEC.toString(), DEFAULT_HEADER_COLOR, DEFAULT_HEADER_TEXT_COLOR, DEFAULT_ICON, DEFAULT_EXTRAS);
+        result = db.updateLoyaltyCard(1, "store1", "note1", "cardId1", BarcodeFormat.AZTEC.toString(), DEFAULT_HEADER_COLOR, DEFAULT_HEADER_TEXT_COLOR);
         assertTrue(result);
         assertEquals(1, db.getLoyaltyCardCount());
 
@@ -86,24 +76,23 @@ public class DatabaseTest
         assertEquals("note1", loyaltyCard.note);
         assertEquals("cardId1", loyaltyCard.cardId);
         assertEquals(BarcodeFormat.AZTEC.toString(), loyaltyCard.barcodeType);
-        assertEquals(DEFAULT_EXTRAS.toJSON().toString(), loyaltyCard.extras.toJSON().toString());
     }
 
     @Test
-    public void updateMissingGiftCard() throws JSONException
+    public void updateMissingGiftCard()
     {
         assertEquals(0, db.getLoyaltyCardCount());
 
         boolean result = db.updateLoyaltyCard(1, "store1", "note1", "cardId1",
-                BarcodeFormat.UPC_A.toString(), DEFAULT_HEADER_COLOR, DEFAULT_HEADER_TEXT_COLOR, DEFAULT_ICON, DEFAULT_EXTRAS);
+                BarcodeFormat.UPC_A.toString(), DEFAULT_HEADER_COLOR, DEFAULT_HEADER_TEXT_COLOR);
         assertEquals(false, result);
         assertEquals(0, db.getLoyaltyCardCount());
     }
 
     @Test
-    public void emptyGiftCardValues() throws JSONException
+    public void emptyGiftCardValues()
     {
-        long id = db.insertLoyaltyCard("", "", "", "", null, null, null, new ExtrasHelper());
+        long id = db.insertLoyaltyCard("", "", "", "", null, null);
         boolean result = (id != -1);
         assertTrue(result);
         assertEquals(1, db.getLoyaltyCardCount());
@@ -114,11 +103,10 @@ public class DatabaseTest
         assertEquals("", loyaltyCard.note);
         assertEquals("", loyaltyCard.cardId);
         assertEquals("", loyaltyCard.barcodeType);
-        assertEquals("{}", loyaltyCard.extras.toJSON().toString());
     }
 
     @Test
-    public void giftCardsViaCursor() throws JSONException
+    public void giftCardsViaCursor()
     {
         final int CARDS_TO_ADD = 10;
 
@@ -127,7 +115,7 @@ public class DatabaseTest
         for(int index = CARDS_TO_ADD-1; index >= 0; index--)
         {
             long id = db.insertLoyaltyCard("store" + index, "note" + index, "cardId" + index,
-                    BarcodeFormat.UPC_A.toString(), index, index*2, DEFAULT_ICON, DEFAULT_EXTRAS);
+                    BarcodeFormat.UPC_A.toString(), index, index*2);
             boolean result = (id != -1);
             assertTrue(result);
         }
@@ -150,7 +138,6 @@ public class DatabaseTest
             assertEquals(BarcodeFormat.UPC_A.toString(), cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.BARCODE_TYPE)));
             assertEquals(index, cursor.getInt(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.HEADER_COLOR)));
             assertEquals(index*2, cursor.getInt(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.HEADER_TEXT_COLOR)));
-            assertEquals("{\"en\":{\"key\":\"value\"}}", cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.EXTRAS)));
 
             cursor.moveToNext();
         }
@@ -185,7 +172,7 @@ public class DatabaseTest
     }
 
     @Test
-    public void databaseUpgradeFromVersion1() throws JSONException
+    public void databaseUpgradeFromVersion1()
     {
         SQLiteDatabase database = db.getWritableDatabase();
 
@@ -206,7 +193,6 @@ public class DatabaseTest
         assertEquals("", card.note);
         assertEquals(null, card.headerColor);
         assertEquals(null, card.headerTextColor);
-        assertEquals("{}", card.extras.toJSON().toString());
 
         database.close();
     }

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

@@ -84,6 +84,12 @@ public class ImportExportActivityTest
             checkVisibility(activity, View.GONE, R.id.dividerImportApplication,
                     R.id.importOptionApplicationTitle, R.id.importOptionApplicationExplanation,
                     R.id.importOptionApplicationButton);
+
+            // Import from file system should always be present
+
+            checkVisibility(activity, View.VISIBLE, R.id.dividerImportFixed,
+                    R.id.importOptionFixedTitle, R.id.importOptionFixedExplanation,
+                    R.id.importOptionFixedButton);
         }
     }
 
@@ -109,6 +115,12 @@ public class ImportExportActivityTest
             checkVisibility(activity, View.GONE, R.id.dividerImportFilesystem,
                     R.id.importOptionFilesystemTitle, R.id.importOptionFilesystemExplanation,
                     R.id.importOptionFilesystemButton);
+
+            // Import from file system should always be present
+
+            checkVisibility(activity, View.VISIBLE, R.id.dividerImportFixed,
+                    R.id.importOptionFixedTitle, R.id.importOptionFixedExplanation,
+                    R.id.importOptionFixedButton);
         }
     }
 
@@ -127,5 +139,9 @@ public class ImportExportActivityTest
         checkVisibility(activity, View.VISIBLE, R.id.dividerImportFilesystem,
                 R.id.importOptionFilesystemTitle, R.id.importOptionFilesystemExplanation,
                 R.id.importOptionFilesystemButton);
+
+        checkVisibility(activity, View.VISIBLE, R.id.dividerImportFixed,
+                R.id.importOptionFixedTitle, R.id.importOptionFixedExplanation,
+                R.id.importOptionFixedButton);
     }
 }

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

@@ -3,14 +3,11 @@ package protect.card_locker;
 import android.app.Activity;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
-import android.net.Uri;
 import android.os.Environment;
 
 import com.google.zxing.BarcodeFormat;
 
 import org.apache.tools.ant.filters.StringInputStream;
-import org.json.JSONException;
-import org.json.JSONObject;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -23,11 +20,9 @@ import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
-import java.net.URI;
 import java.nio.charset.StandardCharsets;
 import java.util.Calendar;
 
@@ -48,14 +43,10 @@ public class ImportExportTest
 
     private final String BARCODE_DATA = "428311627547";
     private final String BARCODE_TYPE = BarcodeFormat.UPC_A.name();
-    private ExtrasHelper EXTRAS;
 
     @Before
-    public void setUp() throws JSONException
+    public void setUp()
     {
-        EXTRAS = new ExtrasHelper();
-        EXTRAS.addLanguageValue("en", "key", "value");
-
         activity = Robolectric.setupActivity(MainActivity.class);
         db = new DBHelper(activity);
         nowMs = System.currentTimeMillis();
@@ -70,14 +61,14 @@ public class ImportExportTest
      * an index in the store name.
      * @param cardsToAdd
      */
-    private void addLoyaltyCards(int cardsToAdd) throws JSONException
+    private void addLoyaltyCards(int cardsToAdd)
     {
         // Add in reverse order to test sorting
         for(int index = cardsToAdd; index > 0; index--)
         {
             String storeName = String.format("store, \"%4d", index);
             String note = String.format("note, \"%4d", index);
-            long id = db.insertLoyaltyCard(storeName, note, BARCODE_DATA, BARCODE_TYPE, index, index*2, null, EXTRAS);
+            long id = db.insertLoyaltyCard(storeName, note, BARCODE_DATA, BARCODE_TYPE, index, index*2);
             boolean result = (id != -1);
             assertTrue(result);
         }
@@ -90,7 +81,7 @@ public class ImportExportTest
      * specified in addLoyaltyCards(), and are in sequential order
      * where the smallest card's index is 1
      */
-    private void checkLoyaltyCards() throws JSONException
+    private void checkLoyaltyCards()
     {
         Cursor cursor = db.getLoyaltyCardCursor();
         int index = 1;
@@ -108,7 +99,6 @@ public class ImportExportTest
             assertEquals(BARCODE_TYPE, card.barcodeType);
             assertEquals(Integer.valueOf(index), card.headerColor);
             assertEquals(Integer.valueOf(index*2), card.headerTextColor);
-            assertEquals("{\"en\":{\"key\":\"value\"}}", card.extras.toJSON().toString());
 
             index++;
         }
@@ -128,7 +118,7 @@ public class ImportExportTest
     }
 
     @Test
-    public void multipleCardsExportImport() throws IOException, JSONException
+    public void multipleCardsExportImport() throws IOException
     {
         final int NUM_CARDS = 10;
 
@@ -163,7 +153,7 @@ public class ImportExportTest
     }
 
     @Test
-    public void importExistingCardsNotReplace() throws IOException, JSONException
+    public void importExistingCardsNotReplace() throws IOException
     {
         final int NUM_CARDS = 10;
 
@@ -196,7 +186,7 @@ public class ImportExportTest
     }
 
     @Test
-    public void corruptedImportNothingSaved() throws IOException, JSONException
+    public void corruptedImportNothingSaved() throws IOException
     {
         final int NUM_CARDS = 10;
 
@@ -241,7 +231,7 @@ public class ImportExportTest
     }
 
     @Test
-    public void useImportExportTask() throws FileNotFoundException, JSONException
+    public void useImportExportTask() throws FileNotFoundException
     {
         final int NUM_CARDS = 10;
 
@@ -255,8 +245,7 @@ public class ImportExportTest
             TestTaskCompleteListener listener = new TestTaskCompleteListener();
 
             // Export to the file
-            FileOutputStream fileOutputStream = new FileOutputStream(exportFile);
-            ImportExportTask task = new ImportExportTask(activity, format, fileOutputStream, listener);
+            ImportExportTask task = new ImportExportTask(activity, format, exportFile, listener);
             task.execute();
 
             // Actually run the task to completion

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

@@ -1,25 +1,17 @@
 package protect.card_locker;
 
 import android.app.Activity;
-import android.content.res.Resources;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
 import android.graphics.Color;
 import android.net.Uri;
-
 import com.google.zxing.BarcodeFormat;
-
-import org.json.JSONException;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.Robolectric;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
-
 import java.io.InvalidObjectException;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 import static protect.card_locker.DBHelper.LoyaltyCardDbIds;
@@ -39,18 +31,13 @@ public class ImportURITest {
     }
 
     @Test
-    public void ensureNoDataLoss() throws InvalidObjectException, JSONException
+    public void ensureNoDataLoss() throws InvalidObjectException
     {
         // Generate card
-        Bitmap icon = BitmapFactory.decodeResource(Resources.getSystem(), R.mipmap.ic_launcher);
-        assertNotNull(icon);
-        ExtrasHelper extrasHelper = new ExtrasHelper();
-        extrasHelper.addLanguageValue("en", "key", "value");
-        db.insertLoyaltyCard("store", "note", BarcodeFormat.UPC_A.toString(), LoyaltyCardDbIds.BARCODE_TYPE, Color.BLACK, Color.WHITE, icon, extrasHelper);
+        db.insertLoyaltyCard("store", "note", BarcodeFormat.UPC_A.toString(), LoyaltyCardDbIds.BARCODE_TYPE, Color.BLACK, Color.WHITE);
 
         // Get card
         LoyaltyCard card = db.getLoyaltyCard(1);
-        assertNotNull(card.icon);
 
         // Card to URI
         Uri cardUri = importURIHelper.toUri(card);
@@ -65,23 +52,13 @@ public class ImportURITest {
         assertEquals(card.headerTextColor, parsedCard.headerTextColor);
         assertEquals(card.note, parsedCard.note);
         assertEquals(card.store, parsedCard.store);
-        assertEquals(card.icon.getWidth(), parsedCard.icon.getWidth());
-        assertEquals(card.icon.getHeight(), parsedCard.icon.getHeight());
-        for(int i = 0; i < card.icon.getWidth(); i++)
-        {
-            for(int j = 0; j < card.icon.getHeight(); j++)
-            {
-                assertEquals(card.icon.getPixel(i, j), parsedCard.icon.getPixel(i, j));
-            }
-        }
-        assertEquals(card.extras.toJSON().toString(), parsedCard.extras.toJSON().toString());
     }
 
     @Test
-    public void ensureNoCrashOnMissingHeaderFields() throws InvalidObjectException, JSONException
+    public void ensureNoCrashOnMissingHeaderFields() throws InvalidObjectException
     {
         // Generate card
-        db.insertLoyaltyCard("store", "note", BarcodeFormat.UPC_A.toString(), LoyaltyCardDbIds.BARCODE_TYPE, null, null, null, new ExtrasHelper());
+        db.insertLoyaltyCard("store", "note", BarcodeFormat.UPC_A.toString(), LoyaltyCardDbIds.BARCODE_TYPE, null, null);
 
         // Get card
         LoyaltyCard card = db.getLoyaltyCard(1);

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

@@ -10,8 +10,6 @@ import android.widget.TextView;
 
 import com.google.zxing.BarcodeFormat;
 
-import org.json.JSONException;
-import org.json.JSONObject;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -83,9 +81,9 @@ public class LoyaltyCardCursorAdapterTest
 
 
     @Test
-    public void TestCursorAdapterEmptyNote() throws JSONException
+    public void TestCursorAdapterEmptyNote()
     {
-        db.insertLoyaltyCard("store", "", "cardId", BarcodeFormat.UPC_A.toString(), Color.BLACK, Color.WHITE, null, new ExtrasHelper());
+        db.insertLoyaltyCard("store", "", "cardId", BarcodeFormat.UPC_A.toString(), Color.BLACK, Color.WHITE);
         LoyaltyCard card = db.getLoyaltyCard(1);
 
         Cursor cursor = db.getLoyaltyCardCursor();
@@ -97,9 +95,9 @@ public class LoyaltyCardCursorAdapterTest
     }
 
     @Test
-    public void TestCursorAdapterWithNote() throws JSONException
+    public void TestCursorAdapterWithNote()
     {
-        db.insertLoyaltyCard("store", "note", "cardId", BarcodeFormat.UPC_A.toString(), Color.BLACK, Color.WHITE, null, new ExtrasHelper());
+        db.insertLoyaltyCard("store", "note", "cardId", BarcodeFormat.UPC_A.toString(), Color.BLACK, Color.WHITE);
         LoyaltyCard card = db.getLoyaltyCard(1);
 
         Cursor cursor = db.getLoyaltyCardCursor();
@@ -111,9 +109,9 @@ public class LoyaltyCardCursorAdapterTest
     }
 
     @Test
-    public void TestCursorAdapterFontSizes() throws JSONException
+    public void TestCursorAdapterFontSizes()
     {
-        db.insertLoyaltyCard("store", "note", "cardId", BarcodeFormat.UPC_A.toString(), Color.BLACK, Color.WHITE, null, new ExtrasHelper());
+        db.insertLoyaltyCard("store", "note", "cardId", BarcodeFormat.UPC_A.toString(), Color.BLACK, Color.WHITE);
         LoyaltyCard card = db.getLoyaltyCard(1);
 
         Cursor cursor = db.getLoyaltyCardCursor();

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

@@ -5,7 +5,6 @@ import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.robolectric.Shadows.shadowOf;
-import static protect.card_locker.LoyaltyCardEditActivity.NO_BARCODE;
 
 import android.app.Activity;
 import android.content.Intent;
@@ -27,9 +26,10 @@ import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.TextView;
 import androidx.core.widget.TextViewCompat;
+
+import com.google.android.material.tabs.TabLayout;
 import com.google.zxing.BarcodeFormat;
 import com.google.zxing.client.android.Intents;
-import org.json.JSONException;
 import java.io.IOException;
 import org.junit.Before;
 import org.junit.Test;
@@ -112,7 +112,7 @@ public class LoyaltyCardViewActivityTest
         final EditText storeField = activity.findViewById(R.id.storeNameEdit);
         final EditText noteField = activity.findViewById(R.id.noteEdit);
         final TextView cardIdField = activity.findViewById(R.id.cardIdView);
-        final TextView barcodeTypeField = activity.findViewById(R.id.barcodeTypeView);
+        final TextView barcodeTypeField = activity.findViewById(R.id.barcodeType);
 
         storeField.setText(store);
         noteField.setText(note);
@@ -131,7 +131,7 @@ public class LoyaltyCardViewActivityTest
         assertEquals(cardId, card.cardId);
 
         // The special "No barcode" string shouldn't actually be written to the loyalty card
-        if(barcodeType.equals(NO_BARCODE))
+        if(barcodeType.equals(LoyaltyCardEditActivity.NO_BARCODE))
         {
             assertEquals("", card.barcodeType);
         }
@@ -242,7 +242,7 @@ public class LoyaltyCardViewActivityTest
             checkFieldProperties(activity, R.id.cardIdView, View.VISIBLE, cardId);
             checkFieldProperties(activity, R.id.cardIdDivider, cardId.isEmpty() ? View.GONE : View.VISIBLE, null);
             checkFieldProperties(activity, R.id.cardIdTableRow, cardId.isEmpty() ? View.GONE : View.VISIBLE, null);
-            checkFieldProperties(activity, R.id.barcodeTypeView, View.VISIBLE, barcodeType);
+            checkFieldProperties(activity, R.id.barcodeType, View.GONE, barcodeType);
             checkFieldProperties(activity, R.id.captureButton, captureVisibility, null);
             checkFieldProperties(activity, R.id.barcode, View.VISIBLE, null);
         }
@@ -259,7 +259,6 @@ public class LoyaltyCardViewActivityTest
         Activity activity = (Activity)activityController.get();
 
         checkAllFields(activity, ViewMode.ADD_CARD, "", "", "", "");
-        assertEquals(View.GONE, activity.findViewById(R.id.barcodeTypeTableRow).getVisibility());
     }
 
     @Test
@@ -277,7 +276,6 @@ public class LoyaltyCardViewActivityTest
 
         final EditText storeField = activity.findViewById(R.id.storeNameEdit);
         final EditText noteField = activity.findViewById(R.id.noteEdit);
-        final TextView cardIdField = activity.findViewById(R.id.cardIdView);
 
         activity.findViewById(R.id.fabSave).performClick();
         assertEquals(0, db.getLoyaltyCardCount());
@@ -395,13 +393,13 @@ public class LoyaltyCardViewActivityTest
     }
 
     @Test
-    public void startWithLoyaltyCardEditModeCheckDisplay() throws IOException, JSONException
+    public void startWithLoyaltyCardEditModeCheckDisplay() throws IOException
     {
         ActivityController activityController = createActivityWithLoyaltyCard(true);
         Activity activity = (Activity)activityController.get();
         DBHelper db = new DBHelper(activity);
 
-        db.insertLoyaltyCard("store", "note", BARCODE_DATA, BARCODE_TYPE, Color.BLACK, Color.WHITE, null, new ExtrasHelper());
+        db.insertLoyaltyCard("store", "note", BARCODE_DATA, BARCODE_TYPE, Color.BLACK, Color.WHITE);
 
         activityController.start();
         activityController.visible();
@@ -411,13 +409,13 @@ public class LoyaltyCardViewActivityTest
     }
 
     @Test
-    public void startWithLoyaltyCardViewModeCheckDisplay() throws IOException, JSONException
+    public void startWithLoyaltyCardViewModeCheckDisplay() throws IOException
     {
         ActivityController activityController = createActivityWithLoyaltyCard(false);
         Activity activity = (Activity)activityController.get();
         DBHelper db = new DBHelper(activity);
 
-        db.insertLoyaltyCard("store", "note", BARCODE_DATA, BARCODE_TYPE, Color.BLACK, Color.WHITE, null, new ExtrasHelper());
+        db.insertLoyaltyCard("store", "note", BARCODE_DATA, BARCODE_TYPE, Color.BLACK, Color.WHITE);
 
         activityController.start();
         activityController.visible();
@@ -427,13 +425,13 @@ public class LoyaltyCardViewActivityTest
     }
 
     @Test
-    public void startWithLoyaltyCardWithBarcodeUpdateBarcode() throws IOException, JSONException
+    public void startWithLoyaltyCardWithBarcodeUpdateBarcode() throws IOException
     {
         ActivityController activityController = createActivityWithLoyaltyCard(true);
         Activity activity = (Activity)activityController.get();
         DBHelper db = new DBHelper(activity);
 
-        db.insertLoyaltyCard("store", "note", EAN_BARCODE_DATA, EAN_BARCODE_TYPE, Color.BLACK, Color.WHITE, null, new ExtrasHelper());
+        db.insertLoyaltyCard("store", "note", EAN_BARCODE_DATA, EAN_BARCODE_TYPE, Color.BLACK, Color.WHITE);
 
         activityController.start();
         activityController.visible();
@@ -448,13 +446,13 @@ public class LoyaltyCardViewActivityTest
     }
 
     @Test
-    public void startWithLoyaltyCardWithReceiptUpdateReceiptCancel() throws IOException, JSONException
+    public void startWithLoyaltyCardWithReceiptUpdateReceiptCancel() throws IOException
     {
         ActivityController activityController = createActivityWithLoyaltyCard(true);
         Activity activity = (Activity)activityController.get();
         DBHelper db = new DBHelper(activity);
 
-        db.insertLoyaltyCard("store", "note", EAN_BARCODE_DATA, EAN_BARCODE_TYPE, Color.BLACK, Color.WHITE, null, new ExtrasHelper());
+        db.insertLoyaltyCard("store", "note", EAN_BARCODE_DATA, EAN_BARCODE_TYPE, Color.BLACK, Color.WHITE);
 
         activityController.start();
         activityController.visible();
@@ -474,13 +472,13 @@ public class LoyaltyCardViewActivityTest
     }
 
     @Test
-    public void checkMenu() throws IOException, JSONException
+    public void checkMenu() throws IOException
     {
         ActivityController activityController = createActivityWithLoyaltyCard(false);
         Activity activity = (Activity)activityController.get();
         DBHelper db = new DBHelper(activity);
 
-        db.insertLoyaltyCard("store", "note", BARCODE_DATA, BARCODE_TYPE, Color.BLACK, Color.WHITE, null, new ExtrasHelper());
+        db.insertLoyaltyCard("store", "note", BARCODE_DATA, BARCODE_TYPE, Color.BLACK, Color.WHITE);
 
         activityController.start();
         activityController.visible();
@@ -489,12 +487,12 @@ public class LoyaltyCardViewActivityTest
         final Menu menu = shadowOf(activity).getOptionsMenu();
         assertTrue(menu != null);
 
-        // The rotation,share and info button should be present
+        // The share, settings and add button should be present
         assertEquals(menu.size(), 3);
 
         assertEquals("Block Rotation", menu.findItem(R.id.action_lock_unlock).getTitle().toString());
         assertEquals("Share", menu.findItem(R.id.action_share).getTitle().toString());
-        assertEquals("More Info", menu.findItem(R.id.action_view_extras).getTitle().toString());
+        assertEquals("Edit", menu.findItem(R.id.action_edit).getTitle().toString());
     }
 
     @Test
@@ -518,13 +516,13 @@ public class LoyaltyCardViewActivityTest
     }
 
     @Test
-    public void startWithoutParametersViewBack() throws JSONException
+    public void startWithoutParametersViewBack()
     {
         ActivityController activityController = createActivityWithLoyaltyCard(false);
 
         Activity activity = (Activity)activityController.get();
         DBHelper db = new DBHelper(activity);
-        db.insertLoyaltyCard("store", "note", BARCODE_DATA, BARCODE_TYPE, Color.BLACK, Color.WHITE, null, new ExtrasHelper());
+        db.insertLoyaltyCard("store", "note", BARCODE_DATA, BARCODE_TYPE, Color.BLACK, Color.WHITE);
 
         activityController.start();
         activityController.visible();
@@ -536,13 +534,13 @@ public class LoyaltyCardViewActivityTest
     }
 
     @Test
-    public void startWithoutColors() throws JSONException
+    public void startWithoutColors()
     {
         ActivityController activityController = createActivityWithLoyaltyCard(false);
 
         Activity activity = (Activity)activityController.get();
         DBHelper db = new DBHelper(activity);
-        db.insertLoyaltyCard("store", "note", BARCODE_DATA, BARCODE_TYPE, null, null, null, new ExtrasHelper());
+        db.insertLoyaltyCard("store", "note", BARCODE_DATA, BARCODE_TYPE, null, null);
 
         activityController.start();
         activityController.visible();
@@ -554,13 +552,13 @@ public class LoyaltyCardViewActivityTest
     }
 
     @Test
-    public void startLoyaltyCardWithoutColorsSave() throws IOException, JSONException
+    public void startLoyaltyCardWithoutColorsSave() throws IOException
     {
         ActivityController activityController = createActivityWithLoyaltyCard(true);
 
         Activity activity = (Activity)activityController.get();
         DBHelper db = new DBHelper(activity);
-        db.insertLoyaltyCard("store", "note", BARCODE_DATA, BARCODE_TYPE, null, null, null, new ExtrasHelper());
+        db.insertLoyaltyCard("store", "note", BARCODE_DATA, BARCODE_TYPE, null, null);
 
         activityController.start();
         activityController.visible();
@@ -571,30 +569,30 @@ public class LoyaltyCardViewActivityTest
     }
 
     @Test
-    public void startLoyaltyCardWithExplicitNoBarcodeSave() throws IOException, JSONException
+    public void startLoyaltyCardWithExplicitNoBarcodeSave() throws IOException
     {
         ActivityController activityController = createActivityWithLoyaltyCard(true);
 
         Activity activity = (Activity)activityController.get();
         DBHelper db = new DBHelper(activity);
-        db.insertLoyaltyCard("store", "note", BARCODE_DATA, "", Color.BLACK, Color.WHITE, null, new ExtrasHelper());
+        db.insertLoyaltyCard("store", "note", BARCODE_DATA, "", Color.BLACK, Color.WHITE);
 
         activityController.start();
         activityController.visible();
         activityController.resume();
 
         // Save and check the loyalty card
-        saveLoyaltyCardWithArguments(activity, "store", "note", BARCODE_DATA, NO_BARCODE, false);
+        saveLoyaltyCardWithArguments(activity, "store", "note", BARCODE_DATA, LoyaltyCardEditActivity.NO_BARCODE, false);
     }
 
     @Test
-    public void removeBarcodeFromLoyaltyCard() throws IOException, JSONException
+    public void removeBarcodeFromLoyaltyCard() throws IOException
     {
         ActivityController activityController = createActivityWithLoyaltyCard(true);
         Activity activity = (Activity)activityController.get();
         DBHelper db = new DBHelper(activity);
 
-        db.insertLoyaltyCard("store", "note", BARCODE_DATA, BARCODE_TYPE, Color.BLACK, Color.WHITE, null, new ExtrasHelper());
+        db.insertLoyaltyCard("store", "note", BARCODE_DATA, BARCODE_TYPE, Color.BLACK, Color.WHITE);
 
         activityController.start();
         activityController.visible();
@@ -607,21 +605,20 @@ public class LoyaltyCardViewActivityTest
         selectBarcodeWithResult(activity, R.id.enterButton, BARCODE_DATA, "", true);
 
         // Check if the barcode type is NO_BARCODE as expected
-        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", BARCODE_DATA, NO_BARCODE);
-        assertEquals(View.GONE, activity.findViewById(R.id.barcodeTypeTableRow).getVisibility());
+        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", BARCODE_DATA, LoyaltyCardEditActivity.NO_BARCODE);
 
         // Check if the special NO_BARCODE string doesn't get saved
-        saveLoyaltyCardWithArguments(activity, "store", "note", BARCODE_DATA, NO_BARCODE, false);
+        saveLoyaltyCardWithArguments(activity, "store", "note", BARCODE_DATA, LoyaltyCardEditActivity.NO_BARCODE, false);
     }
 
     @Test
-    public void startCheckFontSizes() throws JSONException
+    public void startCheckFontSizes()
     {
         ActivityController activityController = createActivityWithLoyaltyCard(false);
 
         Activity activity = (Activity)activityController.get();
         DBHelper db = new DBHelper(activity);
-        db.insertLoyaltyCard("store", "note", BARCODE_DATA, BARCODE_TYPE, Color.BLACK, Color.WHITE, null, new ExtrasHelper());
+        db.insertLoyaltyCard("store", "note", BARCODE_DATA, BARCODE_TYPE, Color.BLACK, Color.WHITE);
 
         final int STORE_FONT_SIZE = 50;
         final int CARD_FONT_SIZE = 40;
@@ -655,7 +652,7 @@ public class LoyaltyCardViewActivityTest
     }
 
     @Test
-    public void checkScreenOrientationLockSetting() throws JSONException
+    public void checkScreenOrientationLockSetting()
     {
         for(boolean locked : new boolean[] {false, true})
         {
@@ -663,7 +660,7 @@ public class LoyaltyCardViewActivityTest
 
             Activity activity = (Activity)activityController.get();
             DBHelper db = new DBHelper(activity);
-            db.insertLoyaltyCard("store", "note", BARCODE_DATA, BARCODE_TYPE, Color.BLACK, Color.WHITE, null, new ExtrasHelper());
+            db.insertLoyaltyCard("store", "note", BARCODE_DATA, BARCODE_TYPE, Color.BLACK, Color.WHITE);
 
             SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences(activity);
             settings.edit()
@@ -692,54 +689,56 @@ public class LoyaltyCardViewActivityTest
     }
 
     @Test
-    public void checkMoreInfoNoExtras() throws JSONException
+    public void checkNoTabViewOnSingleCardFromStore()
     {
         ActivityController activityController = createActivityWithLoyaltyCard(false);
-
         Activity activity = (Activity)activityController.get();
         DBHelper db = new DBHelper(activity);
-        db.insertLoyaltyCard("store", "note", BARCODE_DATA, BARCODE_TYPE, Color.BLACK, Color.WHITE, null, new ExtrasHelper());
+
+        db.insertLoyaltyCard("store", "note", BARCODE_DATA, BARCODE_TYPE, Color.BLACK, Color.WHITE);
 
         activityController.start();
-        activityController.resume();
         activityController.visible();
+        activityController.resume();
 
-        assertEquals(false, activity.isFinishing());
-
-        MenuItem item = shadowOf(activity).getOptionsMenu().findItem(R.id.action_view_extras);
-        assertEquals(false, item.isVisible());
+        final TabLayout tabLayout = activity.findViewById(R.id.tabLayout);
+        assertEquals(1, tabLayout.getTabCount());
+        assertEquals(View.GONE, tabLayout.getVisibility());
     }
 
     @Test
-    public void checkMoreInfoExtras() throws JSONException
+    public void checkTabViewOnMultipleCardsFromSameStore()
     {
         ActivityController activityController = createActivityWithLoyaltyCard(false);
-
         Activity activity = (Activity)activityController.get();
         DBHelper db = new DBHelper(activity);
-        ExtrasHelper extrasHelper = new ExtrasHelper();
-        extrasHelper.addLanguageValue("en", "key", "value");
 
-        db.insertLoyaltyCard("store", "note", BARCODE_DATA, BARCODE_TYPE, Color.BLACK, Color.WHITE, null, extrasHelper);
+        db.insertLoyaltyCard("store", "note", BARCODE_DATA, BARCODE_TYPE, Color.BLACK, Color.WHITE);
+        db.insertLoyaltyCard("store", "note2", BARCODE_DATA, BARCODE_TYPE, Color.BLACK, Color.WHITE);
 
         activityController.start();
-        activityController.resume();
         activityController.visible();
+        activityController.resume();
 
-        assertEquals(false, activity.isFinishing());
+        final TabLayout tabLayout = activity.findViewById(R.id.tabLayout);
+        assertEquals(2, tabLayout.getTabCount());
+        assertEquals(View.VISIBLE, tabLayout.getVisibility());
+        checkAllFields(activity, ViewMode.VIEW_CARD, "store", "note", BARCODE_DATA, BARCODE_TYPE);
 
-        MenuItem item = shadowOf(activity).getOptionsMenu().findItem(R.id.action_view_extras);
-        assertEquals(true, item.isVisible());
+        // Check if the card switches correctly
+        tabLayout.getTabAt(1).select();
+
+        checkAllFields(activity, ViewMode.VIEW_CARD, "store", "note2", BARCODE_DATA, BARCODE_TYPE);
     }
-
+  
     @Test
-    public void checkBarcodeFullscreenWorkflow() throws JSONException
+    public void checkBarcodeFullscreenWorkflow()
     {
         ActivityController activityController = createActivityWithLoyaltyCard(false);
 
         Activity activity = (Activity)activityController.get();
         DBHelper db = new DBHelper(activity);
-        db.insertLoyaltyCard("store", "note", BARCODE_DATA, BARCODE_TYPE, Color.BLACK, Color.WHITE, null, new ExtrasHelper());
+        db.insertLoyaltyCard("store", "note", BARCODE_DATA, BARCODE_TYPE, Color.BLACK, Color.WHITE);
 
         activityController.start();
         activityController.visible();
@@ -798,28 +797,7 @@ public class LoyaltyCardViewActivityTest
     @Test
     public void importCard()
     {
-        Uri importUri = Uri.parse("https://thelastproject.github.io/Catima/share?store=Example%20Store&note=&cardid=123456&barcodetype=AZTEC&headercolor=-416706&headertextcolor=-1&icon=&extras={}");
-
-        Intent intent = new Intent();
-        intent.setData(importUri);
-
-        ActivityController activityController = Robolectric.buildActivity(LoyaltyCardEditActivity.class, intent).create();
-
-        activityController.start();
-        activityController.visible();
-        activityController.resume();
-
-        Activity activity = (Activity)activityController.get();
-
-        checkAllFields(activity, ViewMode.ADD_CARD, "Example Store", "", "123456", "AZTEC");
-        assertEquals(-416706, ((ColorDrawable) activity.findViewById(R.id.headingColorSample).getBackground()).getColor());
-        assertEquals(-1, ((ColorDrawable) activity.findViewById(R.id.headingStoreTextColorSample).getBackground()).getColor());
-    }
-
-    @Test
-    public void importCardOldURL()
-    {
-        Uri importUri = Uri.parse("https://thelastproject.github.io/Catima/share?store=Example%20Store&note=&cardid=123456&barcodetype=AZTEC&headercolor=-416706&headertextcolor=-1");
+        Uri importUri = Uri.parse("https://brarcher.github.io/loyalty-card-locker/share?store=Example%20Store&note=&cardid=123456&barcodetype=AZTEC&headercolor=-416706&headertextcolor=-1");
 
         Intent intent = new Intent();
         intent.setData(importUri);

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

@@ -7,7 +7,9 @@ import android.content.Intent;
 import android.content.SharedPreferences;
 import android.database.Cursor;
 import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
+import androidx.appcompat.widget.SearchView;
 import android.view.Menu;
 import android.view.View;
 import android.widget.ListView;
@@ -15,15 +17,16 @@ import android.widget.TextView;
 
 import com.google.zxing.BarcodeFormat;
 
-import org.json.JSONException;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.Robolectric;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
+import org.robolectric.Shadows;
 import org.robolectric.annotation.Config;
 import org.robolectric.android.controller.ActivityController;
+import org.robolectric.shadows.ShadowListView;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -37,6 +40,14 @@ public class MainActivityTest
 {
     private SharedPreferences prefs;
 
+    @Before
+    public void setUp()
+    {
+        // Assume that this is not the first launch
+        prefs = RuntimeEnvironment.application.getSharedPreferences("protect.card_locker", Context.MODE_PRIVATE);
+        prefs.edit().putBoolean("firstrun", false).commit();
+    }
+
     @Test
     public void initiallyNoLoyaltyCards() throws Exception
     {
@@ -62,9 +73,11 @@ public class MainActivityTest
         assertTrue(menu != null);
 
         // The settings, search and add button should be present
-        assertEquals(menu.size(), 4);
+        assertEquals(menu.size(), 5);
+
         assertEquals("Search", menu.findItem(R.id.action_search).getTitle().toString());
         assertEquals("Import/Export", menu.findItem(R.id.action_import_export).getTitle().toString());
+        assertEquals("Start Intro", menu.findItem(R.id.action_intro).getTitle().toString());
         assertEquals("About", menu.findItem(R.id.action_about).getTitle().toString());
         assertEquals("Settings", menu.findItem(R.id.action_settings).getTitle().toString());
     }
@@ -83,7 +96,7 @@ public class MainActivityTest
     }
 
     @Test
-    public void addOneLoyaltyCard() throws JSONException
+    public void addOneLoyaltyCard()
     {
         ActivityController activityController = Robolectric.buildActivity(MainActivity.class).create();
 
@@ -98,7 +111,7 @@ public class MainActivityTest
         assertEquals(0, list.getCount());
 
         DBHelper db = new DBHelper(mainActivity);
-        db.insertLoyaltyCard("store", "note", "cardId", BarcodeFormat.UPC_A.toString(), Color.BLACK, Color.WHITE, null, new ExtrasHelper());
+        db.insertLoyaltyCard("store", "note", "cardId", BarcodeFormat.UPC_A.toString(), Color.BLACK, Color.WHITE);
 
         assertEquals(View.VISIBLE, helpText.getVisibility());
         assertEquals(View.GONE, noMatchingCardsText.getVisibility());
@@ -116,8 +129,51 @@ public class MainActivityTest
         assertNotNull(cursor);
     }
 
+    public void AddTwoLoyaltyCardsFromSameStore()
+    {
+        ActivityController activityController = Robolectric.buildActivity(MainActivity.class).create();
+
+        Activity mainActivity = (Activity)activityController.get();
+        activityController.start();
+        activityController.resume();
+
+        TextView helpText = mainActivity.findViewById(R.id.helpText);
+        TextView noMatchingCardsText = mainActivity.findViewById(R.id.noMatchingCardsText);
+        ListView list = mainActivity.findViewById(R.id.list);
+
+        assertEquals(0, list.getCount());
+
+        DBHelper db = new DBHelper(mainActivity);
+        db.insertLoyaltyCard("store", "note", "cardId", BarcodeFormat.UPC_A.toString(), Color.BLACK, Color.WHITE);
+        db.insertLoyaltyCard("store", "note2", "cardId2", BarcodeFormat.MAXICODE.toString(), Color.YELLOW, Color.GRAY);
+        db.insertLoyaltyCard("store2", "note2", "cardId2", BarcodeFormat.UPC_E.toString(), Color.BLUE, Color.MAGENTA);
+
+        assertEquals(View.VISIBLE, helpText.getVisibility());
+        assertEquals(View.GONE, noMatchingCardsText.getVisibility());
+        assertEquals(View.GONE, list.getVisibility());
+
+        activityController.pause();
+        activityController.resume();
+
+        assertEquals(View.GONE, helpText.getVisibility());
+        assertEquals(View.GONE, noMatchingCardsText.getVisibility());
+        assertEquals(View.VISIBLE, list.getVisibility());
+
+        // We expect to see only 2 "cards" because the first store should be merged
+        assertEquals(2, list.getAdapter().getCount());
+        Cursor cursor = (Cursor)list.getAdapter().getItem(0);
+        assertNotNull(cursor);
+
+        // Check if this returns the first loyalty card
+        LoyaltyCard card = LoyaltyCard.toLoyaltyCard(cursor);
+        assertEquals("store", card.store);
+        assertEquals("note", card.note);
+        assertEquals("cardId", card.cardId);
+        assertEquals(BarcodeFormat.UPC_A.toString(), card.barcodeType);
+    }
+
     @Test
-    public void testFiltering() throws JSONException
+    public void testFiltering()
     {
         ActivityController activityController = Robolectric.buildActivity(MainActivity.class).create();
 
@@ -130,8 +186,8 @@ public class MainActivityTest
         ListView list = mainActivity.findViewById(R.id.list);
 
         DBHelper db = new DBHelper(mainActivity);
-        db.insertLoyaltyCard("The First Store", "Initial note", "cardId", BarcodeFormat.UPC_A.toString(), Color.BLACK, Color.WHITE, null, new ExtrasHelper());
-        db.insertLoyaltyCard("The Second Store", "Secondary note", "cardId", BarcodeFormat.UPC_A.toString(), Color.BLACK, Color.WHITE, null, new ExtrasHelper());
+        db.insertLoyaltyCard("The First Store", "Initial note", "cardId", BarcodeFormat.UPC_A.toString(), Color.BLACK, Color.WHITE);
+        db.insertLoyaltyCard("The Second Store", "Secondary note", "cardId", BarcodeFormat.UPC_A.toString(), Color.BLACK, Color.WHITE);
 
         activityController.pause();
         activityController.resume();
@@ -208,4 +264,120 @@ public class MainActivityTest
 
         assertEquals(2, list.getCount());
     }
+
+    @Test
+    public void testFilteringWithGroupedCards()
+    {
+        ActivityController activityController = Robolectric.buildActivity(MainActivity.class).create();
+
+        MainActivity mainActivity = (MainActivity)activityController.get();
+        activityController.start();
+        activityController.resume();
+
+        TextView helpText = mainActivity.findViewById(R.id.helpText);
+        TextView noMatchingCardsText = mainActivity.findViewById(R.id.noMatchingCardsText);
+        ListView list = mainActivity.findViewById(R.id.list);
+
+        DBHelper db = new DBHelper(mainActivity);
+        db.insertLoyaltyCard("The First Store", "Initial note", "cardId", BarcodeFormat.UPC_A.toString(), Color.BLACK, Color.WHITE);
+        db.insertLoyaltyCard("The First Store", "Tertiary note", "cardId", BarcodeFormat.UPC_A.toString(), Color.BLACK, Color.WHITE);
+        db.insertLoyaltyCard("The Second Store", "Secondary note", "cardId", BarcodeFormat.UPC_A.toString(), Color.BLACK, Color.WHITE);
+
+        activityController.pause();
+        activityController.resume();
+
+        assertEquals(View.GONE, helpText.getVisibility());
+        assertEquals(View.GONE, noMatchingCardsText.getVisibility());
+        assertEquals(View.VISIBLE, list.getVisibility());
+
+        assertEquals(2, list.getCount());
+
+        mainActivity.filter = "store";
+
+        activityController.pause();
+        activityController.resume();
+
+        assertEquals(View.GONE, helpText.getVisibility());
+        assertEquals(View.GONE, noMatchingCardsText.getVisibility());
+        assertEquals(View.VISIBLE, list.getVisibility());
+
+        assertEquals(2, list.getCount());
+
+        mainActivity.filter = "first";
+
+        activityController.pause();
+        activityController.resume();
+
+        assertEquals(View.GONE, helpText.getVisibility());
+        assertEquals(View.GONE, noMatchingCardsText.getVisibility());
+        assertEquals(View.VISIBLE, list.getVisibility());
+
+        assertEquals(1, list.getCount());
+
+        mainActivity.filter = "initial";
+
+        activityController.pause();
+        activityController.resume();
+
+        assertEquals(View.GONE, helpText.getVisibility());
+        assertEquals(View.GONE, noMatchingCardsText.getVisibility());
+        assertEquals(View.VISIBLE, list.getVisibility());
+
+        assertEquals(1, list.getCount());
+
+        mainActivity.filter = "second";
+
+        activityController.pause();
+        activityController.resume();
+
+        assertEquals(View.GONE, helpText.getVisibility());
+        assertEquals(View.GONE, noMatchingCardsText.getVisibility());
+        assertEquals(View.VISIBLE, list.getVisibility());
+
+        assertEquals(1, list.getCount());
+
+        mainActivity.filter = "company";
+
+        activityController.pause();
+        activityController.resume();
+
+        assertEquals(View.GONE, helpText.getVisibility());
+        assertEquals(View.VISIBLE, noMatchingCardsText.getVisibility());
+        assertEquals(View.VISIBLE, list.getVisibility());
+
+        assertEquals(0, list.getCount());
+
+        mainActivity.filter = "";
+
+        activityController.pause();
+        activityController.resume();
+
+        assertEquals(View.GONE, helpText.getVisibility());
+        assertEquals(View.GONE, noMatchingCardsText.getVisibility());
+        assertEquals(View.VISIBLE, list.getVisibility());
+
+        assertEquals(2, list.getCount());
+    }
+
+    @Test
+    public void testFirstRunStartsIntro()
+    {
+        prefs.edit().remove("firstrun").commit();
+
+        ActivityController controller = Robolectric.buildActivity(MainActivity.class).create();
+        Activity activity = (Activity)controller.get();
+
+        assertTrue(activity.isFinishing() == false);
+
+        Intent next = shadowOf(activity).getNextStartedActivity();
+
+        ComponentName componentName = next.getComponent();
+        String name = componentName.flattenToShortString();
+        assertEquals("protect.card_locker/.intro.IntroActivity", name);
+
+        Bundle extras = next.getExtras();
+        assertNull(extras);
+
+        assertEquals(false, prefs.getBoolean("firstrun", true));
+    }
 }

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

@@ -1,384 +0,0 @@
-package protect.card_locker;
-
-import android.app.Activity;
-import android.graphics.Color;
-import android.net.Uri;
-
-import com.google.zxing.BarcodeFormat;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.Robolectric;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowContentResolver;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.Iterator;
-import java.util.Map;
-
-import static org.junit.Assert.assertEquals;
-
-@RunWith(RobolectricTestRunner.class)
-@Config(sdk = 23)
-public class PkpassTest {
-    private PkpassImporter pkpassImporter;
-
-    @Before
-    public void setUp()
-    {
-        Activity activity = Robolectric.setupActivity(MainActivity.class);
-        pkpassImporter = new PkpassImporter(activity);
-    }
-
-    @Test
-    public void parseGenericExample() throws IOException, JSONException
-    {
-        // https://github.com/keefmoon/Passbook-Example-Code/blob/master/Pass-Example-Generic/Pass-Example-Generic.pkpass
-        InputStream inputStream = getClass().getResourceAsStream("Pass-Example-Generic.pkpass");
-
-        LoyaltyCard card = pkpassImporter.fromInputStream(inputStream);
-
-        // Compare everything
-        assertEquals(BarcodeFormat.QR_CODE.name(), card.barcodeType);
-        assertEquals("0000001", card.cardId);
-        assertEquals("Staff Pass for Employee Number 001", card.note);
-        assertEquals("Passbook Example Company", card.store);
-        assertEquals(String.valueOf(Color.rgb(90, 90, 90)), card.headerColor.toString());
-        assertEquals(String.valueOf(Color.rgb(255, 255, 255)), card.headerTextColor.toString());
-
-        // Check if all the extras got parsed correctly
-        ExtrasHelper extras = card.extras;
-        // Expecting no English entries
-        assertEquals(0, extras.getAllValues("en").keySet().size());
-        // Expecting 7 untranslated entries
-        assertEquals(7, extras.getAllValues("").keySet().size());
-        // Untranslated and English + untranslated fallback should return the same
-        assertEquals(extras.getAllValues(""), extras.getAllValues(new String[]{"en", ""}));
-
-        // Check all 7 values
-        Iterator<Map.Entry<String, String>> extrasKeys = extras.getAllValues("").entrySet().iterator();
-
-        // 1
-        Map.Entry<String, String> entry = extrasKeys.next();
-        assertEquals("staffNumber", entry.getKey());
-        assertEquals("Staff Number: 001", entry.getValue());
-
-        // 2
-        entry = extrasKeys.next();
-        assertEquals("staffName", entry.getKey());
-        assertEquals("Name: Peter Brooke", entry.getValue());
-
-        // 3
-        entry = extrasKeys.next();
-        assertEquals("telephoneExt", entry.getKey());
-        assertEquals("Extension: 9779", entry.getValue());
-
-        // 4
-        entry = extrasKeys.next();
-        assertEquals("jobTitle", entry.getKey());
-        assertEquals("Job Title: Chief Pass Creator", entry.getValue());
-
-        // 5
-        entry = extrasKeys.next();
-        assertEquals("expiryDate", entry.getKey());
-        assertEquals("Expiry Date: 2013-12-31T00:00-23:59", entry.getValue());
-
-        // 6
-        entry = extrasKeys.next();
-        assertEquals("managersName", entry.getKey());
-        assertEquals("Manager's Name: Paul Bailey", entry.getValue());
-
-        // 7
-        entry = extrasKeys.next();
-        assertEquals("managersExt", entry.getKey());
-        assertEquals("Manager's Extension: 9673", entry.getValue());
-    }
-
-    @Test
-    public void parseEurowingsTicket() throws IOException, JSONException
-    {
-        // https://github.com/brarcher/loyalty-card-locker/issues/309#issuecomment-563465333
-        InputStream inputStream = getClass().getResourceAsStream("Eurowings.pkpass");
-
-        LoyaltyCard card = pkpassImporter.fromInputStream(inputStream);
-
-        // Compare everything
-        assertEquals(BarcodeFormat.AZTEC.name(), card.barcodeType);
-        assertEquals("M1DOE/JOHN         JBZPPP CGNDBVEW 0954 251A016E0073 148>5181W 9250BEW 00000000000002A0000000000000 0                          N", card.cardId);
-        assertEquals("Eurowings Boarding Pass", card.note);
-        assertEquals("EUROWINGS", card.store);
-
-        // Violates the spec, but we want to support it anyway...
-        assertEquals(String.valueOf(Color.parseColor("#FFFFFF")), card.headerColor.toString());
-        assertEquals(String.valueOf(Color.parseColor("#AA0061")), card.headerTextColor.toString());
-
-        // Check if all the extras got parsed correctly
-        ExtrasHelper extras = card.extras;
-
-        // Expect 18 English values
-        assertEquals(18, extras.getAllValues("en").size());
-
-        // Expect 18 German values
-        assertEquals(18, extras.getAllValues("de").size());
-
-        // Expect 18 untranslated values
-        assertEquals(18, extras.getAllValues("").size());
-
-        // Expect no French values
-        assertEquals(0, extras.getAllValues("fr").size());
-
-        // Check all 18 English, German and untranslated values
-        Iterator<Map.Entry<String, String>> englishKeys = extras.getAllValues("en").entrySet().iterator();
-        Iterator<Map.Entry<String, String>> germanKeys = extras.getAllValues("de").entrySet().iterator();
-        Iterator<Map.Entry<String, String>> untranslatedKeys = extras.getAllValues("").entrySet().iterator();
-
-        // 1
-        Map.Entry<String, String> englishEntry = englishKeys.next();
-        Map.Entry<String, String> germanEntry = germanKeys.next();
-        Map.Entry<String, String> untranslatedEntry = untranslatedKeys.next();
-        assertEquals("gate", englishEntry.getKey());
-        assertEquals("gate", germanEntry.getKey());
-        assertEquals("gate", untranslatedEntry.getKey());
-        assertEquals("Gate: B61", englishEntry.getValue());
-        assertEquals("Gate: B61", germanEntry.getValue());
-        assertEquals("gate_str: B61", untranslatedEntry.getValue());
-
-        // 2
-        englishEntry = englishKeys.next();
-        germanEntry = germanKeys.next();
-        untranslatedEntry = untranslatedKeys.next();
-        assertEquals("seat", englishEntry.getKey());
-        assertEquals("seat", germanEntry.getKey());
-        assertEquals("seat", untranslatedEntry.getKey());
-        assertEquals("Seat: 16E", englishEntry.getValue());
-        assertEquals("Sitz: 16E", germanEntry.getValue());
-        assertEquals("seat_str: 16E", untranslatedEntry.getValue());
-
-        // 3
-        englishEntry = englishKeys.next();
-        germanEntry = germanKeys.next();
-        untranslatedEntry = untranslatedKeys.next();
-        assertEquals("origin", englishEntry.getKey());
-        assertEquals("origin", germanEntry.getKey());
-        assertEquals("origin", untranslatedEntry.getKey());
-        assertEquals("Cologne-Bonn: CGN", englishEntry.getValue());
-        assertEquals("Cologne-Bonn: CGN", germanEntry.getValue());
-        assertEquals("Cologne-Bonn: CGN", untranslatedEntry.getValue());
-
-        // 4
-        englishEntry = englishKeys.next();
-        germanEntry = germanKeys.next();
-        untranslatedEntry = untranslatedKeys.next();
-        assertEquals("destination", englishEntry.getKey());
-        assertEquals("destination", germanEntry.getKey());
-        assertEquals("destination", untranslatedEntry.getKey());
-        assertEquals("Dubrovnik: DBV", englishEntry.getValue());
-        assertEquals("Dubrovnik: DBV", germanEntry.getValue());
-        assertEquals("Dubrovnik: DBV", untranslatedEntry.getValue());
-
-        // 5
-        englishEntry = englishKeys.next();
-        germanEntry = germanKeys.next();
-        untranslatedEntry = untranslatedKeys.next();
-        assertEquals("name", englishEntry.getKey());
-        assertEquals("name", germanEntry.getKey());
-        assertEquals("name", untranslatedEntry.getKey());
-        assertEquals("Name: John Doe", englishEntry.getValue());
-        assertEquals("Name: John Doe", germanEntry.getValue());
-        assertEquals("name_str: John Doe", untranslatedEntry.getValue());
-
-        // 6
-        englishEntry = englishKeys.next();
-        germanEntry = germanKeys.next();
-        untranslatedEntry = untranslatedKeys.next();
-        assertEquals("status", englishEntry.getKey());
-        assertEquals("status", germanEntry.getKey());
-        assertEquals("status", untranslatedEntry.getKey());
-        assertEquals("Status: -", englishEntry.getValue());
-        assertEquals("Status: -", germanEntry.getValue());
-        assertEquals("status_str: -", untranslatedEntry.getValue());
-
-        // 7
-        englishEntry = englishKeys.next();
-        germanEntry = germanKeys.next();
-        untranslatedEntry = untranslatedKeys.next();
-        assertEquals("boardinggroup", englishEntry.getKey());
-        assertEquals("boardinggroup", germanEntry.getKey());
-        assertEquals("boardinggroup", untranslatedEntry.getKey());
-        assertEquals("Group: GROUP 1", englishEntry.getValue());
-        assertEquals("Gruppe: GROUP 1", germanEntry.getValue());
-        assertEquals("boardinggroup_str: GROUP 1", untranslatedEntry.getValue());
-
-        // 8
-        englishEntry = englishKeys.next();
-        germanEntry = germanKeys.next();
-        untranslatedEntry = untranslatedKeys.next();
-        assertEquals("tarif", englishEntry.getKey());
-        assertEquals("tarif", germanEntry.getKey());
-        assertEquals("tarif", untranslatedEntry.getKey());
-        assertEquals("Fare: SMART", englishEntry.getValue());
-        assertEquals("Tarif: SMART", germanEntry.getValue());
-        assertEquals("fare_str: SMART", untranslatedEntry.getValue());
-
-        // 9
-        englishEntry = englishKeys.next();
-        germanEntry = germanKeys.next();
-        untranslatedEntry = untranslatedKeys.next();
-        assertEquals("flightNumber", englishEntry.getKey());
-        assertEquals("flightNumber", germanEntry.getKey());
-        assertEquals("flightNumber", untranslatedEntry.getKey());
-        assertEquals("Flight: EW 954", englishEntry.getValue());
-        assertEquals("Flug: EW 954", germanEntry.getValue());
-        assertEquals("flight_str: EW 954", untranslatedEntry.getValue());
-
-        // 10
-        englishEntry = englishKeys.next();
-        germanEntry = germanKeys.next();
-        untranslatedEntry = untranslatedKeys.next();
-        assertEquals("departureDate", englishEntry.getKey());
-        assertEquals("departureDate", germanEntry.getKey());
-        assertEquals("departureDate", untranslatedEntry.getKey());
-        assertEquals("Date: 08/09/2019", englishEntry.getValue());
-        assertEquals("Datum: 08/09/2019", germanEntry.getValue());
-        assertEquals("date_str: 08/09/2019", untranslatedEntry.getValue());
-
-        // 11
-        englishEntry = englishKeys.next();
-        germanEntry = germanKeys.next();
-        untranslatedEntry = untranslatedKeys.next();
-        assertEquals("boarding", englishEntry.getKey());
-        assertEquals("boarding", germanEntry.getKey());
-        assertEquals("boarding", untranslatedEntry.getKey());
-        assertEquals("Boarding: 05:00", englishEntry.getValue());
-        assertEquals("Boarding: 05:00", germanEntry.getValue());
-        assertEquals("boarding_str: 05:00", untranslatedEntry.getValue());
-
-        // 12
-        englishEntry = englishKeys.next();
-        germanEntry = germanKeys.next();
-        untranslatedEntry = untranslatedKeys.next();
-        assertEquals("closure", englishEntry.getKey());
-        assertEquals("closure", germanEntry.getKey());
-        assertEquals("closure", untranslatedEntry.getKey());
-        assertEquals("Gate closure: 05:15", englishEntry.getValue());
-        assertEquals("Gate Schließt: 05:15", germanEntry.getValue());
-        assertEquals("closure_str: 05:15", untranslatedEntry.getValue());
-
-        // 13
-        englishEntry = englishKeys.next();
-        germanEntry = germanKeys.next();
-        untranslatedEntry = untranslatedKeys.next();
-        assertEquals("info", englishEntry.getKey());
-        assertEquals("info", germanEntry.getKey());
-        assertEquals("info", untranslatedEntry.getKey());
-        assertEquals("Eurowings wishes you a pleasant flight .\r\n" +
-                "\r\n" +
-                "We kindly ask you to be present at your departure gate on time.", englishEntry.getValue());
-        assertEquals("Eurowings wünscht Ihnen einen angenehmen Flug.\r\n" +
-                "\r\n" +
-                "Wir bitten Sie, sich zur angegeben Boarding Zeit am Gate einzufinden.", germanEntry.getValue());
-        assertEquals("info_content_str", untranslatedEntry.getValue());
-
-        // 14
-        englishEntry = englishKeys.next();
-        germanEntry = germanKeys.next();
-        untranslatedEntry = untranslatedKeys.next();
-        assertEquals("recordlocator", englishEntry.getKey());
-        assertEquals("recordlocator", germanEntry.getKey());
-        assertEquals("recordlocator", untranslatedEntry.getKey());
-        assertEquals("Booking code: JBZPPP", englishEntry.getValue());
-        assertEquals("Buchungscode: JBZPPP", germanEntry.getValue());
-        assertEquals("recordlocator_str: JBZPPP", untranslatedEntry.getValue());
-
-        // 15
-        englishEntry = englishKeys.next();
-        germanEntry = germanKeys.next();
-        untranslatedEntry = untranslatedKeys.next();
-        assertEquals("sequence", englishEntry.getKey());
-        assertEquals("sequence", germanEntry.getKey());
-        assertEquals("sequence", untranslatedEntry.getKey());
-        assertEquals("Sequence: 73", englishEntry.getValue());
-        assertEquals("Sequenz: 73", germanEntry.getValue());
-        assertEquals("sequence_str: 73", untranslatedEntry.getValue());
-
-        // 16
-        englishEntry = englishKeys.next();
-        germanEntry = germanKeys.next();
-        untranslatedEntry = untranslatedKeys.next();
-        assertEquals("notice", englishEntry.getKey());
-        assertEquals("notice", germanEntry.getKey());
-        assertEquals("notice", untranslatedEntry.getKey());
-        assertEquals("Notice: Please note that although your flight may be delayed, you will still need to check in and go to your departure gate on time as scheduled.\r\n" +
-                "\r\n" +
-                "Carry on one item of hand luggage (8 kg, 55 x 40 x 23 cm) for free.", englishEntry.getValue());
-        assertEquals("Hinweis: Bitte beachten Sie, dass obwohl Ihr Flug verspätet sein mag, Sie dennoch wie geplant pünktlich am Check-in und am Abfluggate erscheinen müssen.\r\n" +
-                "\r\n" +
-                "Kostenlose Mitnahme eines Handgepäckstücks (8 Kg, 55 x 40 x 23cm).", germanEntry.getValue());
-        assertEquals("notice_str: notice_content_str", untranslatedEntry.getValue());
-
-        // 17
-        englishEntry = englishKeys.next();
-        germanEntry = germanKeys.next();
-        untranslatedEntry = untranslatedKeys.next();
-        assertEquals("baggage", englishEntry.getKey());
-        assertEquals("baggage", germanEntry.getKey());
-        assertEquals("baggage", untranslatedEntry.getKey());
-        assertEquals("Carrying liquids in hand luggage: In addition to other restrictions on hand luggage, there are still restrictions on liquids and gels brought by the passenger or purchased before the security control on all departures within the European Union, as well as to many other countries (including Switzerland, Russia, Iceland, Croatia, Israel, Egypt, Morocco, Tunisia and Norway):\r\n" +
-                "\r\n" +
-                "- All liquids (such as toiletries and cosmetics, gels, pastes, creams, lotions, mixtures of liquids and solids, perfumes, pressurised containers, cans, water bottles etc) as well as wax and gel-like substances may only be carried on board in amounts less than 100ml or 100g.\r\n" +
-                "\r\n" +
-                "- These liquids or substances must be packed in closed containers in a transparent, re-sealable plastic bag (max. contents 1 kg).\r\n" +
-                "\r\n" +
-                "- It is the passenger’s responsibility to purchase this bag before departure. They are available in many supermarkets, e.g. as freezer bags. It is currently not possible for passengers to obtain or purchase the required bags from Eurowings check-in.\r\n" +
-                "\r\n" +
-                "- Prescription medicines and baby food may still be carried in hand baggage. The passenger must prove that such medicines and/or baby food are needed during the flight.\r\n" +
-                "\r\n" +
-                "- Products and bags which do not meet the requirements or are only sealed with a rubber band or similar will unfortunately have to be surrendered by passengers\r\n" +
-                "\r\n" +
-                "In order to pass through the airport as quickly as possible, you are strongly advised to pack any liquids or gels which are not essential for your journey on board the aircraft in your checked baggage if possible.\r\n" +
-                "\r\n" +
-                "As a matter of course, liquids from the Travel Value / Duty Free shops which have been purchased after you have passed through security are still allowed on board.\r\n" +
-                "\r\n" +
-                "Eurowings shall not be liable for any items which passengers are prohibited from carrying in their hand baggage for security reasons and are required to surrender at the security checkpoint.", englishEntry.getValue());
-        assertEquals("Mitnahme von Flüssigkeiten im Handgepäck: Neben den sonstigen Beschränkungen für das Handgepäck ist für alle Abflüge innerhalb der Europäischen Union sowie vielen weiteren Ländern (u.a. Schweiz, Russland, Island, Kroatien, Israel, Ägypten, Marokko, Tunesien, Norwegen)  die Mitnahme von vor der Fluggastkontrolle erworbenen bzw. mitgebrachten Flüssigkeiten und Gels nur noch eingeschränkt erlaubt:\r\n" +
-                "\r\n" +
-                "- Sämtliche Flüssigkeiten (wie Kosmetik- und Toilettenartikel, Gels, Pasten, Cremes, Lotionen, Gemische aus flüssigen und festen Stoffen, Parfums, Behälter unter Druck, Dosen, Wasserflaschen etc.) sowie wachs- oder gelartige Stoffe dürfen nur noch in Behältnissen bis zu 100 ml bzw. 100 g mit an Bord genommen werden.\r\n" +
-                "\r\n" +
-                "- Diese Flüssigkeiten bzw. Stoffe müssen in einem transparenten, wiederverschließbaren Plastikbeutel (max. 1 kg Inhalt) vollständig geschlossen, verpackt sein.\r\n" +
-                "\r\n" +
-                "- Diese Beutel müssen Fluggäste selbst vor dem Abflug erwerben. Sie sind in vielen Supermärkten z. B. als Gefrierbeutel erhältlich. Es besteht zurzeit keine Möglichkeit, entsprechende Plastikbeutel am Eurowings Check-In zu erwerben bzw. auszugeben.\r\n" +
-                "\r\n" +
-                "- Verschreibungspflichtige Medikamente sowie Babynahrung dürfen weiterhin im Handgepäck transportiert werden. Der Fluggast muss nachweisen, dass die Medikamente und Babynahrung während des Fluges benötigt werden.\r\n" +
-                "\r\n" +
-                "- Produkte und Beutel, die nicht den Maßgaben entsprechen oder die nur mit Gummiband oder ähnlichem verschlossen sind, müssen leider abgegeben werden.\r\n" +
-                "\r\n" +
-                "Flüssigkeiten und Gels, die Sie nicht zwingend während Ihres Aufenthalts an Bord benötigen, sollten zur raschen Fluggastabfertigung nach Möglichkeit im aufzugebenden Gepäck untergebracht werden.\r\n" +
-                "\r\n" +
-                "Selbstverständlich ist die Mitnahme von allen Flüssigkeiten/Gels/Getränken aus Travel-Value oder Duty Free-Shops, die nach der Fluggastkontrolle erworben werden, weiterhin erlaubt.\r\n" +
-                "\r\n" +
-                "Eurowings übernimmt keine Haftung für Gegenstände, die der Fluggast nicht im Handgepäck mitführen darf und deshalb aus Sicherheitsgründen an der Fluggastkontrolle abgeben muss.", germanEntry.getValue());
-        assertEquals("baggage_str: baggage_content_str", untranslatedEntry.getValue());
-
-        // 18
-        englishEntry = englishKeys.next();
-        germanEntry = germanKeys.next();
-        untranslatedEntry = untranslatedKeys.next();
-        assertEquals("contact", englishEntry.getKey());
-        assertEquals("contact", germanEntry.getKey());
-        assertEquals("contact", untranslatedEntry.getKey());
-        assertEquals("Contact: https://mobile.eurowings.com/booking/StaticContactInfo.aspx?culture=en-GB&back=home", englishEntry.getValue());
-        assertEquals("Kontakt: Sie erreichen das deutsche Call Center unter der Telefonnummer\r\n" +
-                "\r\n" +
-                "0180 6 320 320 ( 0:00 Uhr - 24:00 Uhr )\r\n" +
-                "\r\n" +
-                "(0,20 € pro Anruf aus dem Festnetz der Deutschen Telekom - Mobilfunk maximal 0,60 € pro Anruf).", germanEntry.getValue());
-        assertEquals("contact_str: contact_content_str", untranslatedEntry.getValue());
-    }
-}