Release v1.14

Translations update from Weblate

.github/workflows/android.yml

@@ -13,6 +13,7 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
+    - uses: gradle/wrapper-validation-action@v1
     - name: set up JDK 1.8
       uses: actions/setup-java@v1
       with:
@@ -27,7 +28,7 @@ jobs:
       run: ./gradlew spotbugsRelease
     - name: Archive test results
       if: always()
-      uses: actions/upload-artifact@v1
+      uses: actions/upload-artifact@v2
       with:
         name: test-results
         path: app/build/reports

CHANGELOG.md

@@ -1,5 +1,34 @@
 # Changelog
 
+## v1.14 (2021-06-07)
+
+Changes:
+
+- Support new PDF417 export from Voucher Vault
+- Support copying multiple barcodes at once
+- Support sharing multiple loyalty cards at once
+- Ask to update barcode value if card ID changes
+
+## v1.13 (2021-04-10)
+
+Changes:
+
+- Add option to set a separate barcode value from card ID
+- Simplify font sizing configuration
+- Several small UI fixes
+- Use letter icon for shortcuts too
+- Always show all barcode types in manual entry
+- Remove privacy policy first start dialog
+
+## v1.12 (2021-03-30)
+
+Changes:
+
+- Support importing [Fidme](https://play.google.com/store/apps/details?id=fr.snapp.fidme) exports
+- Allow importing a card from a picture stored in the user's Android gallery
+- Fix multiline note cutoff
+- Change "Thank you" text on privacy dialog to "Accept" because Huawei is overly pedantic
+
 ## v1.11 (2021-03-21)
 
 Changes:

app/build.gradle

@@ -18,8 +18,8 @@ android {
         applicationId "me.hackerchick.catima"
         minSdkVersion 19
         targetSdkVersion 29
-        versionCode 64
-        versionName "1.11"
+        versionCode 68
+        versionName "1.14"
 
         vectorDrawables.useSupportLibrary true
     }
@@ -67,20 +67,24 @@ dependencies {
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
     implementation 'androidx.preference:preference:1.1.1'
-    implementation 'com.google.android.material:material:1.2.1'
-    implementation 'io.wcm.tooling.spotbugs:io.wcm.tooling.spotbugs.annotations:1.0.0'
+    implementation 'com.google.android.material:material:1.3.0'
 
 // Third-party
     implementation 'com.journeyapps:zxing-android-embedded:4.1.0@aar'
-    implementation 'com.google.zxing:core:3.3.3' // Do not upgrade past 3.3.3! Causes a crash on versions before Android 7
+    // Do not upgrade past 3.3.3! Causes a crash on versions before Android Nougat
+    //noinspection GradleDependency
+    implementation 'com.google.zxing:core:3.3.3'
     implementation 'org.apache.commons:commons-csv:1.8'
     implementation 'com.jaredrummler:colorpicker:1.1.0'
-    implementation 'com.google.guava:guava:30.1-jre'
-    implementation 'com.github.invissvenska:NumberPickerPreference:1.0.1'
+    implementation 'com.google.guava:guava:30.1.1-jre'
+    implementation 'com.github.invissvenska:NumberPickerPreference:1.0.2'
+
+// SpotBugs
+    implementation 'io.wcm.tooling.spotbugs:io.wcm.tooling.spotbugs.annotations:1.0.0'
 
 // Testing
-    testImplementation 'androidx.test:core:1.0.0'
-    testImplementation 'junit:junit:4.13.1'
+    testImplementation 'androidx.test:core:1.3.0'
+    testImplementation 'junit:junit:4.13.2'
     testImplementation 'org.robolectric:robolectric:4.4'
 }
 

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

@@ -8,10 +8,9 @@ import android.util.Log;
 import android.view.MenuItem;
 import android.widget.TextView;
 
-import com.google.common.collect.ImmutableMap;
-
+import java.util.ArrayList;
 import java.util.Calendar;
-import java.util.Map;
+import java.util.List;
 
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AppCompatActivity;
@@ -35,30 +34,27 @@ public class AboutActivity extends AppCompatActivity
             actionBar.setDisplayHomeAsUpEnabled(true);
         }
 
-        final Map<String, String> USED_LIBRARIES = new ImmutableMap.Builder<String, String>()
-                .put("Commons CSV", "https://commons.apache.org/proper/commons-csv/")
-                .put("Guava", "https://github.com/google/guava")
-                .put("ZXing", "https://github.com/zxing/zxing")
-                .put("ZXing Android Embedded", "https://github.com/journeyapps/zxing-android-embedded")
-                .put("Color Picker", "https://github.com/jaredrummler/ColorPicker")
-                .put("NumberPickerPreference", "https://github.com/invissvenska/NumberPickerPreference")
-                .build();
+        final List<ThirdPartyInfo> USED_LIBRARIES = new ArrayList<>();
+        USED_LIBRARIES.add(new ThirdPartyInfo("Commons CSV", "https://commons.apache.org/proper/commons-csv/", "Apache 2.0"));
+        USED_LIBRARIES.add(new ThirdPartyInfo("Guava", "https://github.com/google/guava", "Apache 2.0"));
+        USED_LIBRARIES.add(new ThirdPartyInfo("ZXing", "https://github.com/zxing/zxing", "Apache 2.0"));
+        USED_LIBRARIES.add(new ThirdPartyInfo("ZXing Android Embedded", "https://github.com/journeyapps/zxing-android-embedded", "Apache 2.0"));
+        USED_LIBRARIES.add(new ThirdPartyInfo("Color Picker", "https://github.com/jaredrummler/ColorPicker", "Apache 2.0"));
+        USED_LIBRARIES.add(new ThirdPartyInfo("NumberPickerPreference", "https://github.com/invissvenska/NumberPickerPreference", "GNU LGPL 3.0"));
 
-        final Map<String, String> USED_ASSETS = ImmutableMap.of
-                (
-                        "Android icons", "https://www.apache.org/licenses/LICENSE-2.0.txt"
-                );
+        final List<ThirdPartyInfo> USED_ASSETS = new ArrayList<>();
+        USED_ASSETS.add(new ThirdPartyInfo("Android icons", "https://fonts.google.com/icons?selected=Material+Icons", "Apache 2.0"));
 
         StringBuilder libs = new StringBuilder().append("<br/>");
-        for (Map.Entry<String, String> entry : USED_LIBRARIES.entrySet())
+        for (ThirdPartyInfo entry : USED_LIBRARIES)
         {
-            libs.append("<br/><a href=\"").append(entry.getValue()).append("\">").append(entry.getKey()).append("</a><br/>");
+            libs.append("<br/><a href=\"").append(entry.url()).append("\">").append(entry.name()).append("</a> (").append(entry.license()).append(")<br/>");
         }
 
         StringBuilder resources = new StringBuilder().append("<br/>");
-        for (Map.Entry<String, String> entry : USED_ASSETS.entrySet())
+        for (ThirdPartyInfo entry : USED_ASSETS)
         {
-            resources.append("<br/><a href=\"").append(entry.getValue()).append("\">").append(entry.getKey()).append("</a><br/>");
+            resources.append("<br/><a href=\"").append(entry.url()).append("\">").append(entry.name()).append("</a> (").append(entry.license()).append(")<br/>");
         }
 
         String appName = getString(R.string.app_name);
@@ -91,9 +87,9 @@ public class AboutActivity extends AppCompatActivity
                 "<br/><br/>" +
                 getString(R.string.app_license) +
                 "<br/><br/>" +
-                String.format(getString(R.string.app_libraries), appName, libs.toString()) +
+                String.format(getString(R.string.app_libraries), libs.toString()) +
                 "<br/><br/>" +
-                String.format(getString(R.string.app_resources), appName, resources.toString()), HtmlCompat.FROM_HTML_MODE_COMPACT));
+                String.format(getString(R.string.app_resources), resources.toString()), HtmlCompat.FROM_HTML_MODE_COMPACT));
         aboutTextView.setMovementMethod(LinkMovementMethod.getInstance());
     }
 

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

@@ -1,6 +1,8 @@
 package protect.card_locker;
 
 import android.graphics.Bitmap;
+import android.graphics.Color;
+import android.graphics.PorterDuff;
 import android.os.AsyncTask;
 import android.util.Log;
 import android.view.View;
@@ -23,6 +25,9 @@ class BarcodeImageWriterTask extends AsyncTask<Void, Void, Bitmap>
 {
     private static final String TAG = "Catima";
 
+    private static final int IS_VALID = 999;
+    private boolean isSuccesful;
+
     // When drawn in a smaller window 1D barcodes for some reason end up
     // squished, whereas 2D barcodes look fine.
     private static final int MAX_WIDTH_1D = 1500;
@@ -30,14 +35,20 @@ class BarcodeImageWriterTask extends AsyncTask<Void, Void, Bitmap>
 
     private final WeakReference<ImageView> imageViewReference;
     private final WeakReference<TextView> textViewReference;
-    private final String cardId;
+    private String cardId;
     private final BarcodeFormat format;
     private final int imageHeight;
     private final int imageWidth;
+    private final boolean showFallback;
+    private final Runnable callback;
 
     BarcodeImageWriterTask(ImageView imageView, String cardIdString,
-                           BarcodeFormat barcodeFormat, TextView textView)
+                           BarcodeFormat barcodeFormat, TextView textView,
+                           boolean showFallback, Runnable callback)
     {
+        isSuccesful = true;
+        this.callback = callback;
+
         // Use a WeakReference to ensure the ImageView can be garbage collected
         imageViewReference = new WeakReference<>(imageView);
         textViewReference = new WeakReference<>(textView);
@@ -59,11 +70,8 @@ class BarcodeImageWriterTask extends AsyncTask<Void, Void, Bitmap>
             double ratio = (double)MAX_WIDTH / (double)imageView.getWidth();
             imageHeight = (int)(imageView.getHeight() * ratio);
         }
-    }
 
-    BarcodeImageWriterTask(ImageView imageView, String cardIdString, BarcodeFormat barcodeFormat)
-    {
-        this(imageView, cardIdString, barcodeFormat, null);
+        this.showFallback = showFallback;
     }
 
     private int getMaxWidth(BarcodeFormat format)
@@ -96,7 +104,41 @@ class BarcodeImageWriterTask extends AsyncTask<Void, Void, Bitmap>
         }
     }
 
-    public Bitmap doInBackground(Void... params)
+    private String getFallbackString(BarcodeFormat format)
+    {
+        switch(format)
+        {
+            // 2D barcodes
+            case AZTEC:
+                return "AZTEC";
+            case DATA_MATRIX:
+                return "DATA_MATRIX";
+            case PDF_417:
+                return "PDF_417";
+            case QR_CODE:
+                return "QR_CODE";
+
+            // 1D barcodes:
+            case CODABAR:
+                return "C0C";
+            case CODE_39:
+                return "CODE_39";
+            case CODE_128:
+                return "CODE_128";
+            case EAN_8:
+                return "32123456";
+            case EAN_13:
+                return "5901234123457";
+            case ITF:
+                return "1003";
+            case UPC_A:
+                return "123456789012";
+            default:
+                throw new IllegalArgumentException("No fallback known for this barcode type");
+        }
+    }
+
+    private Bitmap generate()
     {
         if (cardId.isEmpty())
         {
@@ -165,13 +207,30 @@ class BarcodeImageWriterTask extends AsyncTask<Void, Void, Bitmap>
         catch(OutOfMemoryError e)
         {
             Log.w(TAG, "Insufficient memory to render barcode, "
-                + imageWidth + "x" + imageHeight + ", " + format.name()
-                + ", length=" + cardId.length(), e);
+                    + imageWidth + "x" + imageHeight + ", " + format.name()
+                    + ", length=" + cardId.length(), e);
         }
 
         return null;
     }
 
+    public Bitmap doInBackground(Void... params)
+    {
+        Bitmap bitmap = generate();
+
+        if (bitmap == null) {
+            isSuccesful = false;
+
+            if (showFallback) {
+                Log.i(TAG, "Barcode generation failed, generating fallback...");
+                cardId = getFallbackString(format);
+                bitmap = generate();
+            }
+        }
+
+        return bitmap;
+    }
+
     protected void onPostExecute(Bitmap result)
     {
         Log.i(TAG, "Finished generating barcode image of type " + format + ": " + cardId);
@@ -182,6 +241,8 @@ class BarcodeImageWriterTask extends AsyncTask<Void, Void, Bitmap>
             return;
         }
 
+        imageView.setTag(isSuccesful);
+
         imageView.setImageBitmap(result);
         TextView textView = textViewReference.get();
 
@@ -190,6 +251,12 @@ class BarcodeImageWriterTask extends AsyncTask<Void, Void, Bitmap>
             Log.i(TAG, "Displaying barcode");
             imageView.setVisibility(View.VISIBLE);
 
+            if (isSuccesful) {
+                imageView.setColorFilter(null);
+            } else {
+                imageView.setColorFilter(Color.LTGRAY, PorterDuff.Mode.LIGHTEN);
+            }
+
             if (textView != null) {
                 textView.setVisibility(View.VISIBLE);
                 textView.setText(format.name());
@@ -203,5 +270,9 @@ class BarcodeImageWriterTask extends AsyncTask<Void, Void, Bitmap>
                 textView.setVisibility(View.GONE);
             }
         }
+
+        if (callback != null) {
+            callback.run();
+        }
     }
 }

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

@@ -4,9 +4,6 @@ import android.app.Activity;
 import android.content.Intent;
 import android.os.AsyncTask;
 import android.os.Bundle;
-import androidx.appcompat.app.ActionBar;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.widget.Toolbar;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.util.Log;
@@ -17,6 +14,7 @@ import android.view.ViewTreeObserver;
 import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import com.google.common.collect.ImmutableMap;
 import com.google.zxing.BarcodeFormat;
@@ -27,6 +25,10 @@ import java.util.Collections;
 import java.util.LinkedList;
 import java.util.Map;
 
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+
 /**
  * This activity is callable and will allow a user to enter
  * barcode data and generate all barcodes possible for
@@ -104,20 +106,7 @@ public class BarcodeSelectorActivity extends AppCompatActivity
             {
                 Log.d(TAG, "Entered text: " + s);
 
-                // Stop any async tasks which may not have been started yet
-                for(AsyncTask task : barcodeGeneratorTasks)
-                {
-                    task.cancel(false);
-                }
-                barcodeGeneratorTasks.clear();
-
-                // 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);
-                }
+                generateBarcodes(s.toString());
 
                 View noBarcodeButtonView = findViewById(R.id.noBarcode);
                 setButtonListener(noBarcodeButtonView, s.toString());
@@ -137,6 +126,25 @@ public class BarcodeSelectorActivity extends AppCompatActivity
         if(initialCardId != null)
         {
             cardId.setText(initialCardId);
+        } else {
+            generateBarcodes("");
+        }
+    }
+
+    private void generateBarcodes(String value) {
+        // Stop any async tasks which may not have been started yet
+        for(AsyncTask task : barcodeGeneratorTasks)
+        {
+            task.cancel(false);
+        }
+        barcodeGeneratorTasks.clear();
+
+        // Update barcodes
+        for(Map.Entry<String, Pair<Integer, Integer>> entry : barcodeViewMap.entrySet())
+        {
+            ImageView image = findViewById(entry.getValue().first);
+            TextView text = findViewById(entry.getValue().second);
+            createBarcodeOption(image, entry.getKey(), value, text);
         }
     }
 
@@ -171,6 +179,12 @@ public class BarcodeSelectorActivity extends AppCompatActivity
             public void onClick(View v)
             {
                 Log.d(TAG, "Selected barcode type " + formatType);
+
+                if (!((boolean) image.getTag())) {
+                    Toast.makeText(BarcodeSelectorActivity.this, getString(R.string.wrongValueForBarcodeType), Toast.LENGTH_LONG).show();
+                    return;
+                }
+
                 Intent result = new Intent();
                 result.putExtra(BARCODE_FORMAT, formatType);
                 result.putExtra(BARCODE_CONTENTS, cardId);
@@ -193,7 +207,7 @@ public class BarcodeSelectorActivity extends AppCompatActivity
                         image.getViewTreeObserver().removeOnGlobalLayoutListener(this);
 
                         Log.d(TAG, "Generating barcode for type " + formatType);
-                        BarcodeImageWriterTask task = new BarcodeImageWriterTask(image, cardId, format, text);
+                        BarcodeImageWriterTask task = new BarcodeImageWriterTask(image, cardId, format, text, true, null);
                         barcodeGeneratorTasks.add(task);
                         task.execute();
                     }
@@ -202,7 +216,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, text, true, null);
             barcodeGeneratorTasks.add(task);
             task.execute();
         }

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

@@ -0,0 +1,87 @@
+package protect.card_locker;
+
+import android.database.Cursor;
+
+import androidx.recyclerview.widget.RecyclerView;
+
+public abstract class BaseCursorAdapter<V extends RecyclerView.ViewHolder> extends RecyclerView.Adapter<V>
+{
+    private Cursor mCursor;
+    private boolean mDataValid;
+    private int mRowIDColumn;
+
+    public BaseCursorAdapter(Cursor inputCursor)
+    {
+        setHasStableIds(true);
+        swapCursor(inputCursor);
+    }
+
+    public abstract void onBindViewHolder(V inputHolder, Cursor inputCursor);
+
+    @Override
+    public void onBindViewHolder(V inputHolder, int inputPosition)
+    {
+        if (!mDataValid)
+        {
+            throw new IllegalStateException("Cannot bind view holder when cursor is in invalid state.");
+        }
+
+        if (!mCursor.moveToPosition(inputPosition))
+        {
+            throw new IllegalStateException("Could not move cursor to position " + inputPosition + " when trying to bind view holder");
+        }
+
+        onBindViewHolder(inputHolder, mCursor);
+    }
+
+    @Override
+    public int getItemCount()
+    {
+        if (mDataValid)
+        {
+            return mCursor.getCount();
+        }
+        else
+        {
+            return 0;
+        }
+    }
+
+    @Override
+    public long getItemId(int inputPosition)
+    {
+        if (!mDataValid)
+        {
+            throw new IllegalStateException("Cannot lookup item id when cursor is in invalid state.");
+        }
+
+        if (!mCursor.moveToPosition(inputPosition))
+        {
+            throw new IllegalStateException("Could not move cursor to position " + inputPosition + " when trying to get an item id");
+        }
+
+        return mCursor.getLong(mRowIDColumn);
+    }
+
+    public void swapCursor(Cursor inputCursor)
+    {
+        if (inputCursor == mCursor)
+        {
+            return;
+        }
+
+        if (inputCursor != null)
+        {
+            mCursor = inputCursor;
+            mDataValid = true;
+            notifyDataSetChanged();
+        }
+        else
+        {
+            notifyItemRangeRemoved(0, getItemCount());
+            mCursor = null;
+            mRowIDColumn = -1;
+            mDataValid = false;
+        }
+    }
+}

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

@@ -4,24 +4,26 @@ import android.content.Intent;
 import android.database.Cursor;
 import android.os.Bundle;
 import android.os.Parcelable;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.widget.Toolbar;
 import android.util.Log;
 import android.view.View;
-import android.widget.AdapterView;
-import android.widget.ListView;
 import android.widget.Toast;
 
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+import androidx.recyclerview.widget.RecyclerView;
+
 /**
  * The configuration screen for creating a shortcut.
  */
-public class CardShortcutConfigure extends AppCompatActivity
+public class CardShortcutConfigure extends AppCompatActivity implements LoyaltyCardCursorAdapter.CardAdapterListener
 {
     static final String TAG = "Catima";
+    final DBHelper mDb = new DBHelper(this);
 
     @Override
-    public void onCreate(Bundle bundle)
-    {
+    public void onCreate(Bundle bundle) {
         super.onCreate(bundle);
 
         // Set the result to CANCELED.  This will cause nothing to happen if the
@@ -32,52 +34,66 @@ public class CardShortcutConfigure extends AppCompatActivity
         Toolbar toolbar = findViewById(R.id.toolbar);
         toolbar.setVisibility(View.GONE);
 
+        // Hide new button because it won't work here anyway
+        FloatingActionButton newFab = findViewById(R.id.fabAdd);
+        newFab.setVisibility(View.GONE);
+
         final DBHelper db = new DBHelper(this);
 
         // If there are no cards, bail
-        if(db.getLoyaltyCardCount() == 0)
-        {
+        if (db.getLoyaltyCardCount() == 0) {
             Toast.makeText(this, R.string.noCardsMessage, Toast.LENGTH_LONG).show();
             finish();
         }
 
-        final ListView cardList = findViewById(R.id.list);
+        final RecyclerView cardList = findViewById(R.id.list);
         cardList.setVisibility(View.VISIBLE);
 
         Cursor cardCursor = db.getLoyaltyCardCursor();
 
-        final LoyaltyCardCursorAdapter adapter = new LoyaltyCardCursorAdapter(this, cardCursor);
+        final LoyaltyCardCursorAdapter adapter = new LoyaltyCardCursorAdapter(this, cardCursor, this);
         cardList.setAdapter(adapter);
+    }
 
-        cardList.setOnItemClickListener(new AdapterView.OnItemClickListener()
-        {
-            @Override
-            public void onItemClick(AdapterView<?> parent, View view, int position, long id)
-            {
-                Cursor selected = (Cursor) parent.getItemAtPosition(position);
-                LoyaltyCard loyaltyCard = LoyaltyCard.toLoyaltyCard(selected);
+    private void onClickAction(int position) {
+        Cursor selected = mDb.getLoyaltyCardCursor();
+        selected.moveToPosition(position);
+        LoyaltyCard loyaltyCard = LoyaltyCard.toLoyaltyCard(selected);
 
-                Log.d(TAG, "Creating shortcut for card " + loyaltyCard.store + "," + loyaltyCard.id);
+        Log.d(TAG, "Creating shortcut for card " + loyaltyCard.store + "," + loyaltyCard.id);
 
-                Intent shortcutIntent = new Intent(CardShortcutConfigure.this, LoyaltyCardViewActivity.class);
-                shortcutIntent.setAction(Intent.ACTION_MAIN);
-                // Prevent instances of the view activity from piling up; if one exists let this
-                // one replace it.
-                shortcutIntent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
-                Bundle bundle = new Bundle();
-                bundle.putInt("id", loyaltyCard.id);
-                bundle.putBoolean("view", true);
-                shortcutIntent.putExtras(bundle);
+        Intent shortcutIntent = new Intent(CardShortcutConfigure.this, LoyaltyCardViewActivity.class);
+        shortcutIntent.setAction(Intent.ACTION_MAIN);
+        // Prevent instances of the view activity from piling up; if one exists let this
+        // one replace it.
+        shortcutIntent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
+        Bundle bundle = new Bundle();
+        bundle.putInt("id", loyaltyCard.id);
+        bundle.putBoolean("view", true);
+        shortcutIntent.putExtras(bundle);
 
-                Parcelable icon = Intent.ShortcutIconResource.fromContext(CardShortcutConfigure.this, R.mipmap.ic_launcher);
-                Intent intent = new Intent();
-                intent.putExtra(Intent.EXTRA_SHORTCUT_INTENT, shortcutIntent);
-                intent.putExtra(Intent.EXTRA_SHORTCUT_NAME, loyaltyCard.store);
-                intent.putExtra(Intent.EXTRA_SHORTCUT_ICON_RESOURCE, icon);
-                setResult(RESULT_OK, intent);
+        Parcelable icon = Intent.ShortcutIconResource.fromContext(CardShortcutConfigure.this, R.mipmap.ic_launcher);
+        Intent intent = new Intent();
+        intent.putExtra(Intent.EXTRA_SHORTCUT_INTENT, shortcutIntent);
+        intent.putExtra(Intent.EXTRA_SHORTCUT_NAME, loyaltyCard.store);
+        intent.putExtra(Intent.EXTRA_SHORTCUT_ICON_RESOURCE, icon);
+        setResult(RESULT_OK, intent);
 
-                finish();
-            }
-        });
+        finish();
+    }
+
+    @Override
+    public void onIconClicked(int inputPosition) {
+        onClickAction(inputPosition);
+    }
+
+    @Override
+    public void onRowClicked(int inputPosition) {
+        onClickAction(inputPosition);
+    }
+
+    @Override
+    public void onRowLongClicked(int inputPosition) {
+        // do nothing
     }
 }

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

@@ -6,19 +6,20 @@ import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteException;
 import android.database.sqlite.SQLiteOpenHelper;
-import android.graphics.Color;
+
+import com.google.zxing.BarcodeFormat;
 
 import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.Currency;
 import java.util.Date;
-import java.util.ArrayList;
 import java.util.List;
 
 public class DBHelper extends SQLiteOpenHelper
 {
     public static final String DATABASE_NAME = "Catima.db";
     public static final int ORIGINAL_DATABASE_VERSION = 1;
-    public static final int DATABASE_VERSION = 8;
+    public static final int DATABASE_VERSION = 10;
 
     public static class LoyaltyCardDbGroups
     {
@@ -39,6 +40,7 @@ public class DBHelper extends SQLiteOpenHelper
         public static final String HEADER_COLOR = "headercolor";
         public static final String HEADER_TEXT_COLOR = "headertextcolor";
         public static final String CARD_ID = "cardid";
+        public static final String BARCODE_ID = "barcodeid";
         public static final String BARCODE_TYPE = "barcodetype";
         public static final String STAR_STATUS = "starstatus";
     }
@@ -73,9 +75,9 @@ public class DBHelper extends SQLiteOpenHelper
                 LoyaltyCardDbIds.BALANCE + " TEXT not null DEFAULT '0'," +
                 LoyaltyCardDbIds.BALANCE_TYPE + " TEXT," +
                 LoyaltyCardDbIds.HEADER_COLOR + " INTEGER," +
-                LoyaltyCardDbIds.HEADER_TEXT_COLOR + " INTEGER," +
                 LoyaltyCardDbIds.CARD_ID + " TEXT not null," +
-                LoyaltyCardDbIds.BARCODE_TYPE + " TEXT not null," +
+                LoyaltyCardDbIds.BARCODE_ID + " TEXT," +
+                LoyaltyCardDbIds.BARCODE_TYPE + " TEXT," +
                 LoyaltyCardDbIds.STAR_STATUS + " INTEGER DEFAULT '0' )");
 
         // create associative table for cards in groups
@@ -143,12 +145,113 @@ public class DBHelper extends SQLiteOpenHelper
             db.execSQL("ALTER TABLE " + LoyaltyCardDbIds.TABLE
                     + " ADD COLUMN " + LoyaltyCardDbIds.BALANCE_TYPE + " TEXT");
         }
+
+        if(oldVersion < 9 && newVersion >= 9)
+        {
+            db.execSQL("ALTER TABLE " + LoyaltyCardDbIds.TABLE
+                    + " ADD COLUMN " + LoyaltyCardDbIds.BARCODE_ID + " TEXT");
+        }
+
+        if(oldVersion < 10 && newVersion >= 10)
+        {
+            // SQLite doesn't support modify column
+            // So we need to create a temp column to make barcode type nullable
+            // Let's drop header text colour too while we're at it
+            // https://www.sqlite.org/faq.html#q11
+            db.beginTransaction();
+
+            db.execSQL("CREATE TEMPORARY TABLE tmp (" +
+                    LoyaltyCardDbIds.ID + " INTEGER primary key autoincrement," +
+                    LoyaltyCardDbIds.STORE + " TEXT not null," +
+                    LoyaltyCardDbIds.NOTE + " TEXT not null," +
+                    LoyaltyCardDbIds.EXPIRY + " INTEGER," +
+                    LoyaltyCardDbIds.BALANCE + " TEXT not null DEFAULT '0'," +
+                    LoyaltyCardDbIds.BALANCE_TYPE + " TEXT," +
+                    LoyaltyCardDbIds.HEADER_COLOR + " INTEGER," +
+                    LoyaltyCardDbIds.CARD_ID + " TEXT not null," +
+                    LoyaltyCardDbIds.BARCODE_ID + " TEXT," +
+                    LoyaltyCardDbIds.BARCODE_TYPE + " TEXT," +
+                    LoyaltyCardDbIds.STAR_STATUS + " INTEGER DEFAULT '0' )");
+
+            db.execSQL("INSERT INTO tmp (" +
+                    LoyaltyCardDbIds.ID + " ," +
+                    LoyaltyCardDbIds.STORE + " ," +
+                    LoyaltyCardDbIds.NOTE + " ," +
+                    LoyaltyCardDbIds.EXPIRY + " ," +
+                    LoyaltyCardDbIds.BALANCE + " ," +
+                    LoyaltyCardDbIds.BALANCE_TYPE + " ," +
+                    LoyaltyCardDbIds.HEADER_COLOR + " ," +
+                    LoyaltyCardDbIds.CARD_ID + " ," +
+                    LoyaltyCardDbIds.BARCODE_ID + " ," +
+                    LoyaltyCardDbIds.BARCODE_TYPE + " ," +
+                    LoyaltyCardDbIds.STAR_STATUS + ")" +
+                    " SELECT " +
+                    LoyaltyCardDbIds.ID + " ," +
+                    LoyaltyCardDbIds.STORE + " ," +
+                    LoyaltyCardDbIds.NOTE + " ," +
+                    LoyaltyCardDbIds.EXPIRY + " ," +
+                    LoyaltyCardDbIds.BALANCE + " ," +
+                    LoyaltyCardDbIds.BALANCE_TYPE + " ," +
+                    LoyaltyCardDbIds.HEADER_COLOR + " ," +
+                    LoyaltyCardDbIds.CARD_ID + " ," +
+                    LoyaltyCardDbIds.BARCODE_ID + " ," +
+                    " NULLIF(" + LoyaltyCardDbIds.BARCODE_TYPE + ",'') ," +
+                    LoyaltyCardDbIds.STAR_STATUS +
+                    " FROM " + LoyaltyCardDbIds.TABLE);
+
+            db.execSQL("DROP TABLE " + LoyaltyCardDbIds.TABLE);
+
+            db.execSQL("create table " + LoyaltyCardDbIds.TABLE + "(" +
+                    LoyaltyCardDbIds.ID + " INTEGER primary key autoincrement," +
+                    LoyaltyCardDbIds.STORE + " TEXT not null," +
+                    LoyaltyCardDbIds.NOTE + " TEXT not null," +
+                    LoyaltyCardDbIds.EXPIRY + " INTEGER," +
+                    LoyaltyCardDbIds.BALANCE + " TEXT not null DEFAULT '0'," +
+                    LoyaltyCardDbIds.BALANCE_TYPE + " TEXT," +
+                    LoyaltyCardDbIds.HEADER_COLOR + " INTEGER," +
+                    LoyaltyCardDbIds.CARD_ID + " TEXT not null," +
+                    LoyaltyCardDbIds.BARCODE_ID + " TEXT," +
+                    LoyaltyCardDbIds.BARCODE_TYPE + " TEXT," +
+                    LoyaltyCardDbIds.STAR_STATUS + " INTEGER DEFAULT '0' )");
+
+            db.execSQL("INSERT INTO " + LoyaltyCardDbIds.TABLE + "(" +
+                    LoyaltyCardDbIds.ID + " ," +
+                    LoyaltyCardDbIds.STORE + " ," +
+                    LoyaltyCardDbIds.NOTE + " ," +
+                    LoyaltyCardDbIds.EXPIRY + " ," +
+                    LoyaltyCardDbIds.BALANCE + " ," +
+                    LoyaltyCardDbIds.BALANCE_TYPE + " ," +
+                    LoyaltyCardDbIds.HEADER_COLOR + " ," +
+                    LoyaltyCardDbIds.CARD_ID + " ," +
+                    LoyaltyCardDbIds.BARCODE_ID + " ," +
+                    LoyaltyCardDbIds.BARCODE_TYPE + " ," +
+                    LoyaltyCardDbIds.STAR_STATUS + ")" +
+                    " SELECT " +
+                    LoyaltyCardDbIds.ID + " ," +
+                    LoyaltyCardDbIds.STORE + " ," +
+                    LoyaltyCardDbIds.NOTE + " ," +
+                    LoyaltyCardDbIds.EXPIRY + " ," +
+                    LoyaltyCardDbIds.BALANCE + " ," +
+                    LoyaltyCardDbIds.BALANCE_TYPE + " ," +
+                    LoyaltyCardDbIds.HEADER_COLOR + " ," +
+                    LoyaltyCardDbIds.CARD_ID + " ," +
+                    LoyaltyCardDbIds.BARCODE_ID + " ," +
+                    LoyaltyCardDbIds.BARCODE_TYPE + " ," +
+                    LoyaltyCardDbIds.STAR_STATUS +
+                    " FROM tmp");
+
+            db.execSQL("DROP TABLE tmp");
+
+            db.setTransactionSuccessful();
+            db.endTransaction();
+        }
     }
 
     public long insertLoyaltyCard(final String store, final String note, final Date expiry,
                                   final BigDecimal balance, final Currency balanceType,
-                                  final String cardId, final String barcodeType,
-                                  final Integer headerColor, final int starStatus)
+                                  final String cardId, final String barcodeId,
+                                  final BarcodeFormat barcodeType, final Integer headerColor,
+                                  final int starStatus)
     {
         SQLiteDatabase db = getWritableDatabase();
         ContentValues contentValues = new ContentValues();
@@ -158,19 +261,40 @@ public class DBHelper extends SQLiteOpenHelper
         contentValues.put(LoyaltyCardDbIds.BALANCE, balance.toString());
         contentValues.put(LoyaltyCardDbIds.BALANCE_TYPE, balanceType != null ? balanceType.getCurrencyCode() : null);
         contentValues.put(LoyaltyCardDbIds.CARD_ID, cardId);
-        contentValues.put(LoyaltyCardDbIds.BARCODE_TYPE, barcodeType);
+        contentValues.put(LoyaltyCardDbIds.BARCODE_ID, barcodeId);
+        contentValues.put(LoyaltyCardDbIds.BARCODE_TYPE, barcodeType != null ? barcodeType.toString() : null);
         contentValues.put(LoyaltyCardDbIds.HEADER_COLOR, headerColor);
-        contentValues.put(LoyaltyCardDbIds.HEADER_TEXT_COLOR, Color.WHITE);
         contentValues.put(LoyaltyCardDbIds.STAR_STATUS, starStatus);
         final long newId = db.insert(LoyaltyCardDbIds.TABLE, null, contentValues);
         return newId;
     }
 
+    public boolean insertLoyaltyCard(final SQLiteDatabase db, final String store,
+                                     final String note, final Date expiry, final BigDecimal balance,
+                                     final Currency balanceType, final String cardId,
+                                     final String barcodeId, final BarcodeFormat barcodeType,
+                                     final Integer headerColor, final int starStatus)
+    {
+        ContentValues contentValues = new ContentValues();
+        contentValues.put(LoyaltyCardDbIds.STORE, store);
+        contentValues.put(LoyaltyCardDbIds.NOTE, note);
+        contentValues.put(LoyaltyCardDbIds.EXPIRY, expiry != null ? expiry.getTime() : null);
+        contentValues.put(LoyaltyCardDbIds.BALANCE, balance.toString());
+        contentValues.put(LoyaltyCardDbIds.BALANCE_TYPE, balanceType != null ? balanceType.getCurrencyCode() : null);
+        contentValues.put(LoyaltyCardDbIds.CARD_ID, cardId);
+        contentValues.put(LoyaltyCardDbIds.BARCODE_ID, barcodeId);
+        contentValues.put(LoyaltyCardDbIds.BARCODE_TYPE, barcodeType != null ? barcodeType.toString() : null);
+        contentValues.put(LoyaltyCardDbIds.HEADER_COLOR, headerColor);
+        contentValues.put(LoyaltyCardDbIds.STAR_STATUS,starStatus);
+        final long newId = db.insert(LoyaltyCardDbIds.TABLE, null, contentValues);
+        return (newId != -1);
+    }
+
     public boolean insertLoyaltyCard(final SQLiteDatabase db, final int id, final String store,
                                      final String note, final Date expiry, final BigDecimal balance,
                                      final Currency balanceType, final String cardId,
-                                     final String barcodeType, final Integer headerColor,
-                                     final int starStatus)
+                                     final String barcodeId, final BarcodeFormat barcodeType,
+                                     final Integer headerColor, final int starStatus)
     {
         ContentValues contentValues = new ContentValues();
         contentValues.put(LoyaltyCardDbIds.ID, id);
@@ -180,9 +304,9 @@ public class DBHelper extends SQLiteOpenHelper
         contentValues.put(LoyaltyCardDbIds.BALANCE, balance.toString());
         contentValues.put(LoyaltyCardDbIds.BALANCE_TYPE, balanceType != null ? balanceType.getCurrencyCode() : null);
         contentValues.put(LoyaltyCardDbIds.CARD_ID, cardId);
-        contentValues.put(LoyaltyCardDbIds.BARCODE_TYPE, barcodeType);
+        contentValues.put(LoyaltyCardDbIds.BARCODE_ID, barcodeId);
+        contentValues.put(LoyaltyCardDbIds.BARCODE_TYPE, barcodeType != null ? barcodeType.toString() : null);
         contentValues.put(LoyaltyCardDbIds.HEADER_COLOR, headerColor);
-        contentValues.put(LoyaltyCardDbIds.HEADER_TEXT_COLOR, Color.WHITE);
         contentValues.put(LoyaltyCardDbIds.STAR_STATUS,starStatus);
         final long newId = db.insert(LoyaltyCardDbIds.TABLE, null, contentValues);
         return (newId != -1);
@@ -191,7 +315,8 @@ public class DBHelper extends SQLiteOpenHelper
     public boolean updateLoyaltyCard(final int id, final String store, final String note,
                                      final Date expiry, final BigDecimal balance,
                                      final Currency balanceType, final String cardId,
-                                     final String barcodeType, final Integer headerColor)
+                                     final String barcodeId, final BarcodeFormat barcodeType,
+                                     final Integer headerColor)
     {
         SQLiteDatabase db = getWritableDatabase();
         ContentValues contentValues = new ContentValues();
@@ -201,9 +326,9 @@ public class DBHelper extends SQLiteOpenHelper
         contentValues.put(LoyaltyCardDbIds.BALANCE, balance.toString());
         contentValues.put(LoyaltyCardDbIds.BALANCE_TYPE, balanceType != null ? balanceType.getCurrencyCode() : null);
         contentValues.put(LoyaltyCardDbIds.CARD_ID, cardId);
-        contentValues.put(LoyaltyCardDbIds.BARCODE_TYPE, barcodeType);
+        contentValues.put(LoyaltyCardDbIds.BARCODE_ID, barcodeId);
+        contentValues.put(LoyaltyCardDbIds.BARCODE_TYPE, barcodeType != null ? barcodeType.toString() : null);
         contentValues.put(LoyaltyCardDbIds.HEADER_COLOR, headerColor);
-        contentValues.put(LoyaltyCardDbIds.HEADER_TEXT_COLOR, Color.WHITE);
         int rowsUpdated = db.update(LoyaltyCardDbIds.TABLE, contentValues,
                 LoyaltyCardDbIds.ID + "=?",
                 new String[]{Integer.toString(id)});

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

@@ -3,6 +3,7 @@ package protect.card_locker;
 public enum DataFormat
 {
     Catima,
+    Fidme,
     VoucherVault
     ;
 }

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

@@ -50,7 +50,7 @@ class GroupCursorAdapter extends CursorAdapter
 
         countField.setText(context.getResources().getQuantityString(R.plurals.groupCardCount, groupCardCount, groupCardCount));
 
-        nameField.setTextSize(settings.getCardTitleListFontSize());
-        countField.setTextSize(settings.getCardNoteListFontSize());
+        nameField.setTextSize(settings.getFontSizeMax(settings.getMediumFont()));
+        countField.setTextSize(settings.getFontSizeMax(settings.getSmallFont()));
     }
 }

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

@@ -8,14 +8,6 @@ import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Bundle;
-
-import androidx.core.app.ActivityCompat;
-import androidx.core.content.ContextCompat;
-import androidx.appcompat.app.ActionBar;
-import androidx.appcompat.app.AlertDialog;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.widget.Toolbar;
-
 import android.util.Log;
 import android.view.MenuItem;
 import android.view.View;
@@ -29,6 +21,13 @@ import java.io.FileOutputStream;
 import java.io.InputStream;
 import java.io.OutputStream;
 
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
+
 public class ImportExportActivity extends AppCompatActivity
 {
     private static final String TAG = "Catima";
@@ -39,6 +38,8 @@ public class ImportExportActivity extends AppCompatActivity
 
     private ImportExportTask importExporter;
 
+    private String importAlertTitle;
+    private String importAlertMessage;
     private DataFormat importDataFormat;
 
     @Override
@@ -120,18 +121,43 @@ public class ImportExportActivity extends AppCompatActivity
                     switch (which) {
                         // Catima
                         case 0:
-                        // Loyalty Card Keychain
+                            importAlertTitle = getString(R.string.importCatima);
+                            importAlertMessage = getString(R.string.importCatimaMessage);
+                            importDataFormat = DataFormat.Catima;
+                            break;
+                        // Fidme
                         case 1:
+                            importAlertTitle = getString(R.string.importFidme);
+                            importAlertMessage = getString(R.string.importFidmeMessage);
+                            importDataFormat = DataFormat.Fidme;
+                            break;
+                        // Loyalty Card Keychain
+                        case 2:
+                            importAlertTitle = getString(R.string.importLoyaltyCardKeychain);
+                            importAlertMessage = getString(R.string.importLoyaltyCardKeychainMessage);
                             importDataFormat = DataFormat.Catima;
                             break;
                         // Voucher Vault
-                        case 2:
+                        case 3:
+                            importAlertTitle = getString(R.string.importVoucherVault);
+                            importAlertMessage = getString(R.string.importVoucherVaultMessage);
                             importDataFormat = DataFormat.VoucherVault;
                             break;
                         default:
                             throw new IllegalArgumentException("Unknown DataFormat");
                     }
-                    chooseFileWithIntent(baseIntent, IMPORT);
+
+                    new AlertDialog.Builder(this)
+                            .setTitle(importAlertTitle)
+                            .setMessage(importAlertMessage)
+                            .setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
+                                        @Override
+                                        public void onClick(DialogInterface dialog, int which) {
+                                            chooseFileWithIntent(baseIntent, IMPORT);
+                                        }
+                                    })
+                            .setNegativeButton(R.string.cancel, null)
+                            .show();
                 });
         builder.show();
     }

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

@@ -8,7 +8,6 @@ import android.util.Log;
 
 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;
@@ -61,16 +60,8 @@ class ImportExportTask extends AsyncTask<Void, Void, Boolean>
     {
         boolean result = false;
 
-        try
-        {
-            InputStreamReader reader = new InputStreamReader(stream, Charset.forName("UTF-8"));
-            result = MultiFormatImporter.importData(db, reader, format);
-            reader.close();
-        }
-        catch(IOException e)
-        {
-            Log.e(TAG, "Unable to import file", e);
-        }
+
+        result = MultiFormatImporter.importData(db, stream, format);
 
         Log.i(TAG, "Import result: " + result);
 

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

@@ -3,10 +3,14 @@ package protect.card_locker;
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
+
+import com.google.zxing.BarcodeFormat;
+
 import java.io.InvalidObjectException;
 import java.math.BigDecimal;
 import java.util.Currency;
 import java.util.Date;
+import java.util.List;
 
 public class ImportURIHelper {
     private static final String STORE = DBHelper.LoyaltyCardDbIds.STORE;
@@ -15,6 +19,7 @@ public class ImportURIHelper {
     private static final String BALANCE = DBHelper.LoyaltyCardDbIds.BALANCE;
     private static final String BALANCE_TYPE = DBHelper.LoyaltyCardDbIds.BALANCE_TYPE;
     private static final String CARD_ID = DBHelper.LoyaltyCardDbIds.CARD_ID;
+    private static final String BARCODE_ID = DBHelper.LoyaltyCardDbIds.BARCODE_ID;
     private static final String BARCODE_TYPE = DBHelper.LoyaltyCardDbIds.BARCODE_TYPE;
 
     private static final String HEADER_COLOR = DBHelper.LoyaltyCardDbIds.HEADER_COLOR;
@@ -25,6 +30,7 @@ public class ImportURIHelper {
     private final String oldHost;
     private final String oldPath;
     private final String shareText;
+    private final String shareMultipleText;
 
     public ImportURIHelper(Context context) {
         this.context = context;
@@ -33,6 +39,7 @@ public class ImportURIHelper {
         oldHost = "brarcher.github.io";
         oldPath = "/loyalty-card-locker/share";
         shareText = context.getResources().getString(R.string.intent_import_card_from_url_share_text);
+        shareMultipleText = context.getResources().getString(R.string.intent_import_card_from_url_share_multiple_text);
     }
 
     private boolean isImportUri(Uri uri) {
@@ -46,17 +53,23 @@ public class ImportURIHelper {
 
         try {
             // These values are allowed to be null
+            BarcodeFormat barcodeType = null;
             Date expiry = null;
             BigDecimal balance = new BigDecimal("0");
             Currency balanceType = null;
             Integer headerColor = null;
-            Integer headerTextColor = null;
 
             String store = uri.getQueryParameter(STORE);
             String note = uri.getQueryParameter(NOTE);
             String cardId = uri.getQueryParameter(CARD_ID);
-            String barcodeType = uri.getQueryParameter(BARCODE_TYPE);
-            if (store == null || note == null || cardId == null || barcodeType == null) throw new InvalidObjectException("Not a valid import URI");
+            String barcodeId = uri.getQueryParameter(BARCODE_ID);
+            if (store == null || note == null || cardId == null) throw new InvalidObjectException("Not a valid import URI");
+
+            String unparsedBarcodeType = uri.getQueryParameter(BARCODE_TYPE);
+            if(unparsedBarcodeType != null && !unparsedBarcodeType.equals(""))
+            {
+                barcodeType = BarcodeFormat.valueOf(unparsedBarcodeType);
+            }
 
             String unparsedBalance = uri.getQueryParameter(BALANCE);
             if(unparsedBalance != null && !unparsedBalance.equals(""))
@@ -80,7 +93,7 @@ public class ImportURIHelper {
                 headerColor = Integer.parseInt(unparsedHeaderColor);
             }
 
-            return new LoyaltyCard(-1, store, note, expiry, balance, balanceType, cardId, barcodeType, headerColor, headerTextColor, 0);
+            return new LoyaltyCard(-1, store, note, expiry, balance, balanceType, cardId, barcodeId, barcodeType, headerColor, 0);
         } catch (NullPointerException | NumberFormatException ex) {
             throw new InvalidObjectException("Not a valid import URI");
         }
@@ -102,26 +115,47 @@ public class ImportURIHelper {
             uriBuilder.appendQueryParameter(EXPIRY, String.valueOf(loyaltyCard.expiry.getTime()));
         }
         uriBuilder.appendQueryParameter(CARD_ID, loyaltyCard.cardId);
-        uriBuilder.appendQueryParameter(BARCODE_TYPE, loyaltyCard.barcodeType);
-        if(loyaltyCard.headerColor != null)
-        {
+        if(loyaltyCard.barcodeId != null) {
+            uriBuilder.appendQueryParameter(BARCODE_ID, loyaltyCard.barcodeId);
+        }
+
+        if(loyaltyCard.barcodeType != null) {
+            uriBuilder.appendQueryParameter(BARCODE_TYPE, loyaltyCard.barcodeType.toString());
+        }
+        if(loyaltyCard.headerColor != null) {
             uriBuilder.appendQueryParameter(HEADER_COLOR, loyaltyCard.headerColor.toString());
         }
         //StarStatus will not be exported
         return uriBuilder.build();
     }
 
-    private void startShareIntent(Uri uri) {
+    public void startShareIntent(List<LoyaltyCard> loyaltyCards) {
+        int loyaltyCardCount = loyaltyCards.size();
+
+        StringBuilder text = new StringBuilder();
+        if (loyaltyCardCount == 1) {
+            text.append(shareText);
+        } else {
+            text.append(shareMultipleText);
+        }
+        text.append("\n\n");
+
+        for (int i = 0; i < loyaltyCardCount; i++) {
+            LoyaltyCard loyaltyCard = loyaltyCards.get(i);
+
+            text.append(loyaltyCard.store + ": " + toUri(loyaltyCard));
+
+            if (i < (loyaltyCardCount - 1)) {
+                text.append("\n\n");
+            }
+        }
+
         Intent sendIntent = new Intent();
         sendIntent.setAction(Intent.ACTION_SEND);
-        sendIntent.putExtra(Intent.EXTRA_TEXT, shareText + "\n" + uri.toString());
+        sendIntent.putExtra(Intent.EXTRA_TEXT, text.toString());
         sendIntent.setType("text/plain");
 
         Intent shareIntent = Intent.createChooser(sendIntent, null);
         context.startActivity(shareIntent);
     }
-
-    public void startShareIntent(LoyaltyCard loyaltyCard) {
-        startShareIntent(toUri(loyaltyCard));
-    }
 }

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

@@ -2,6 +2,8 @@ package protect.card_locker;
 
 import android.database.Cursor;
 
+import com.google.zxing.BarcodeFormat;
+
 import java.math.BigDecimal;
 import java.util.Currency;
 import java.util.Date;
@@ -17,19 +19,20 @@ public class LoyaltyCard
     public final BigDecimal balance;
     public final Currency balanceType;
     public final String cardId;
-    public final String barcodeType;
+
+    @Nullable
+    public final String barcodeId;
+
+    public final BarcodeFormat barcodeType;
 
     @Nullable
     public final Integer headerColor;
 
-    @Nullable
-    public final Integer headerTextColor;
-
     public final int starStatus;
 
     public LoyaltyCard(final int id, final String store, final String note, final Date expiry,
                        final BigDecimal balance, final Currency balanceType, final String cardId,
-                       final String barcodeType, final Integer headerColor, final Integer headerTextColor,
+                       final String barcodeId, final BarcodeFormat barcodeType, final Integer headerColor,
                        final int starStatus)
     {
         this.id = id;
@@ -39,9 +42,9 @@ public class LoyaltyCard
         this.balance = balance;
         this.balanceType = balanceType;
         this.cardId = cardId;
+        this.barcodeId = barcodeId;
         this.barcodeType = barcodeType;
         this.headerColor = headerColor;
-        this.headerTextColor = headerTextColor;
         this.starStatus = starStatus;
     }
 
@@ -53,17 +56,22 @@ public class LoyaltyCard
         long expiryLong = cursor.getLong(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.EXPIRY));
         BigDecimal balance = new BigDecimal(cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.BALANCE)));
         String cardId = cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.CARD_ID));
-        String barcodeType = cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.BARCODE_TYPE));
+        String barcodeId = cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.BARCODE_ID));
         int starred = cursor.getInt(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.STAR_STATUS));
 
+        int barcodeTypeColumn = cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.BARCODE_TYPE);
         int balanceTypeColumn = cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.BALANCE_TYPE);
         int headerColorColumn = cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.HEADER_COLOR);
-        int headerTextColorColumn = cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.HEADER_TEXT_COLOR);
 
+        BarcodeFormat barcodeType = null;
         Currency balanceType = null;
         Date expiry = null;
         Integer headerColor = null;
-        Integer headerTextColor = null;
+
+        if (cursor.isNull(barcodeTypeColumn) == false)
+        {
+            barcodeType = BarcodeFormat.valueOf(cursor.getString(barcodeTypeColumn));
+        }
 
         if (cursor.isNull(balanceTypeColumn) == false)
         {
@@ -80,11 +88,6 @@ public class LoyaltyCard
             headerColor = cursor.getInt(headerColorColumn);
         }
 
-        if(cursor.isNull(headerTextColorColumn) == false)
-        {
-            headerTextColor = cursor.getInt(headerTextColorColumn);
-        }
-
-        return new LoyaltyCard(id, store, note, expiry, balance, balanceType, cardId, barcodeType, headerColor, headerTextColor, starred);
+        return new LoyaltyCard(id, store, note, expiry, balance, balanceType, cardId, barcodeId, barcodeType, headerColor, starred);
     }
 }

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

@@ -0,0 +1,37 @@
+package protect.card_locker;
+
+import android.animation.AnimatorInflater;
+import android.animation.AnimatorSet;
+import android.content.Context;
+import android.view.View;
+
+public class LoyaltyCardAnimator {
+
+    private static AnimatorSet selectedViewIn, defaultViewOut, selectedViewOut, defaultViewIn;
+
+    public static void flipView(Context inputContext, final View inputSelectedView, final View inputDefaultView, boolean inputItemSelected) {
+
+        selectedViewIn = (AnimatorSet) AnimatorInflater.loadAnimator(inputContext, R.animator.flip_left_in);
+        defaultViewOut = (AnimatorSet) AnimatorInflater.loadAnimator(inputContext, R.animator.flip_right_out);
+        selectedViewOut = (AnimatorSet) AnimatorInflater.loadAnimator(inputContext, R.animator.flip_left_out);
+        defaultViewIn = (AnimatorSet) AnimatorInflater.loadAnimator(inputContext, R.animator.flip_right_in);
+
+        final AnimatorSet showFrontAnim = new AnimatorSet();
+        final AnimatorSet showBackAnim = new AnimatorSet();
+
+        selectedViewIn.setTarget(inputSelectedView);
+        defaultViewOut.setTarget(inputDefaultView);
+        showFrontAnim.playTogether(selectedViewIn, defaultViewOut);
+
+        selectedViewOut.setTarget(inputSelectedView);
+        defaultViewIn.setTarget(inputDefaultView);
+        showBackAnim.playTogether(defaultViewIn, selectedViewOut);
+
+        if (inputItemSelected) {
+            showFrontAnim.start();
+        } else {
+            showBackAnim.start();
+        }
+    }
+
+}

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

@@ -2,97 +2,296 @@ package protect.card_locker;
 
 import android.content.Context;
 import android.database.Cursor;
+import android.graphics.Color;
+import android.graphics.PorterDuff;
+import android.util.SparseBooleanArray;
+import android.view.HapticFeedbackConstants;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.CursorAdapter;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import java.math.BigDecimal;
 import java.text.DateFormat;
-import java.util.Date;
+import java.util.ArrayList;
 
+import androidx.cardview.widget.CardView;
+import androidx.constraintlayout.widget.ConstraintLayout;
+import androidx.recyclerview.widget.RecyclerView;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import protect.card_locker.preferences.Settings;
 
-class LoyaltyCardCursorAdapter extends CursorAdapter
+public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCursorAdapter.LoyaltyCardListItemViewHolder>
 {
-    Settings settings;
+    private static int mCurrentSelectedIndex = -1;
+    private Cursor mCursor;
+    Settings mSettings;
+    boolean mDarkModeEnabled;
+    private Context mContext;
+    private CardAdapterListener mListener;
+    private SparseBooleanArray mSelectedItems;
+    private SparseBooleanArray mAnimationItemsIndex;
+    private boolean mReverseAllAnimations = false;
 
-    public LoyaltyCardCursorAdapter(Context context, Cursor cursor)
+    public LoyaltyCardCursorAdapter(Context inputContext, Cursor inputCursor, CardAdapterListener inputListener)
     {
-        super(context, cursor, 0);
-        settings = new Settings(context);
+        super(inputCursor);
+        mSettings = new Settings(inputContext);
+        mCursor = inputCursor;
+        mContext = inputContext;
+        mListener = inputListener;
+        mSelectedItems = new SparseBooleanArray();
+        mAnimationItemsIndex = new SparseBooleanArray();
+
+        mDarkModeEnabled = MainActivity.isDarkModeEnabled(inputContext);
     }
 
-    // The newView method is used to inflate a new view and return it,
-    // you don't bind any data to the view at this point.
     @Override
-    public View newView(Context context, Cursor cursor, ViewGroup parent)
+    public LoyaltyCardListItemViewHolder onCreateViewHolder(ViewGroup inputParent, int inputViewType)
     {
-        return LayoutInflater.from(context).inflate(R.layout.loyalty_card_layout, parent, false);
+        View itemView = LayoutInflater.from(inputParent.getContext()).inflate(R.layout.loyalty_card_layout, inputParent, false);
+        return new LoyaltyCardListItemViewHolder(itemView);
     }
 
-    // The bindView method is used to bind all data to a given view
-    // such as setting the text on a TextView.
-    @Override
-    public void bindView(View view, Context context, Cursor cursor)
+    public Cursor getCursor()
     {
-        // Find fields to populate in inflated template
-        ImageView thumbnail = view.findViewById(R.id.thumbnail);
-        TextView storeField = view.findViewById(R.id.store);
-        TextView noteField = view.findViewById(R.id.note);
-        TextView balanceField = view.findViewById(R.id.balance);
-        TextView expiryField = view.findViewById(R.id.expiry);
-        ImageView star = view.findViewById(R.id.star);
+        return mCursor;
+    }
 
-        // Extract properties from cursor
-        LoyaltyCard loyaltyCard = LoyaltyCard.toLoyaltyCard(cursor);
-
-        // Populate fields with extracted properties
-        storeField.setText(loyaltyCard.store);
-
-        storeField.setTextSize(settings.getCardTitleListFontSize());
-
-        if(!loyaltyCard.note.isEmpty())
-        {
-            noteField.setVisibility(View.VISIBLE);
-            noteField.setText(loyaltyCard.note);
-            noteField.setTextSize(settings.getCardNoteListFontSize());
-        }
-        else
-        {
-            noteField.setVisibility(View.GONE);
+    public void onBindViewHolder(LoyaltyCardListItemViewHolder inputHolder, Cursor inputCursor) {
+        if (mDarkModeEnabled) {
+            inputHolder.mStarIcon.setColorFilter(Color.WHITE, PorterDuff.Mode.SRC_ATOP);
         }
 
-        if(!loyaltyCard.balance.equals(new BigDecimal("0"))) {
-            balanceField.setVisibility(View.VISIBLE);
-            balanceField.setText(context.getString(R.string.balanceSentence, Utils.formatBalance(context, loyaltyCard.balance, loyaltyCard.balanceType)));
-        }
-        else
-        {
-            balanceField.setVisibility(View.GONE);
+        LoyaltyCard loyaltyCard = LoyaltyCard.toLoyaltyCard(inputCursor);
+
+        inputHolder.mStoreField.setText(loyaltyCard.store);
+        inputHolder.mStoreField.setTextSize(mSettings.getFontSizeMax(mSettings.getMediumFont()));
+        if (!loyaltyCard.note.isEmpty()) {
+            inputHolder.mNoteField.setVisibility(View.VISIBLE);
+            inputHolder.mNoteField.setText(loyaltyCard.note);
+            inputHolder.mNoteField.setTextSize(mSettings.getFontSizeMax(mSettings.getSmallFont()));
+        } else {
+            inputHolder.mNoteField.setVisibility(View.GONE);
         }
 
-        if(loyaltyCard.expiry != null)
+        if (!loyaltyCard.balance.equals(new BigDecimal("0"))) {
+            inputHolder.mBalanceField.setVisibility(View.VISIBLE);
+            inputHolder.mBalanceField.setText(mContext.getString(R.string.balanceSentence, Utils.formatBalance(mContext, loyaltyCard.balance, loyaltyCard.balanceType)));
+            inputHolder.mBalanceField.setTextSize(mSettings.getFontSizeMax(mSettings.getSmallFont()));
+        } else {
+            inputHolder.mBalanceField.setVisibility(View.GONE);
+        }
+
+        if (loyaltyCard.expiry != null)
         {
-            expiryField.setVisibility(View.VISIBLE);
+            inputHolder.mExpiryField.setVisibility(View.VISIBLE);
             int expiryString = R.string.expiryStateSentence;
             if(Utils.hasExpired(loyaltyCard.expiry)) {
                 expiryString = R.string.expiryStateSentenceExpired;
-                expiryField.setTextColor(context.getResources().getColor(R.color.alert));
+                inputHolder.mExpiryField.setTextColor(mContext.getResources().getColor(R.color.alert));
+            }
+            inputHolder.mExpiryField.setText(mContext.getString(expiryString, DateFormat.getDateInstance(DateFormat.LONG).format(loyaltyCard.expiry)));
+            inputHolder.mExpiryField.setTextSize(mSettings.getFontSizeMax(mSettings.getSmallFont()));
+        } else {
+            inputHolder.mExpiryField.setVisibility(View.GONE);
+        }
+
+        inputHolder.mStarIcon.setVisibility((loyaltyCard.starStatus != 0) ? View.VISIBLE : View.GONE);
+        inputHolder.mCardIcon.setImageBitmap(Utils.generateIcon(mContext, loyaltyCard.store, loyaltyCard.headerColor).getLetterTile());
+
+        inputHolder.itemView.setActivated(mSelectedItems.get(inputCursor.getPosition(), false));
+        applyIconAnimation(inputHolder, inputCursor.getPosition());
+        applyClickEvents(inputHolder, inputCursor.getPosition());
+
+    }
+
+    private void applyClickEvents(LoyaltyCardListItemViewHolder inputHolder, final int inputPosition)
+    {
+        inputHolder.mThumbnailContainer.setOnClickListener(new View.OnClickListener()
+        {
+            @Override
+            public void onClick(View inputView)
+            {
+                mListener.onIconClicked(inputPosition);
+            }
+        });
+
+        inputHolder.mRow.setOnClickListener(new View.OnClickListener()
+        {
+            @Override
+            public void onClick(View inputView)
+            {
+                mListener.onRowClicked(inputPosition);
+            }
+        });
+
+        inputHolder.mInformationContainer.setOnClickListener(new View.OnClickListener()
+        {
+            @Override
+            public void onClick(View inputView)
+            {
+                mListener.onRowClicked(inputPosition);
+            }
+        });
+
+        inputHolder.mRow.setOnLongClickListener(new View.OnLongClickListener()
+        {
+            @Override
+            public boolean onLongClick(View inputView)
+            {
+                mListener.onRowLongClicked(inputPosition);
+                inputView.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS);
+                return true;
+            }
+        });
+
+        inputHolder.mInformationContainer.setOnLongClickListener(new View.OnLongClickListener()
+        {
+            @Override
+            public boolean onLongClick(View inputView)
+            {
+                mListener.onRowLongClicked(inputPosition);
+                inputView.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS);
+                return true;
+            }
+        });
+    }
+
+    private void applyIconAnimation(LoyaltyCardListItemViewHolder inputHolder, int inputPosition)
+    {
+        if (mSelectedItems.get(inputPosition, false))
+        {
+            inputHolder.mThumbnailFrontContainer.setVisibility(View.GONE);
+            resetIconYAxis(inputHolder.mThumbnailBackContainer);
+            inputHolder.mThumbnailBackContainer.setVisibility(View.VISIBLE);
+            inputHolder.mThumbnailBackContainer.setAlpha(1);
+            if (mCurrentSelectedIndex == inputPosition)
+            {
+                LoyaltyCardAnimator.flipView(mContext, inputHolder.mThumbnailBackContainer, inputHolder.mThumbnailFrontContainer, true);
+                resetCurrentIndex();
             }
-            expiryField.setText(context.getString(expiryString, DateFormat.getDateInstance(DateFormat.LONG).format(loyaltyCard.expiry)));
-            expiryField.setTextSize(settings.getCardNoteListFontSize());
         }
         else
         {
-            expiryField.setVisibility(View.GONE);
+            inputHolder.mThumbnailBackContainer.setVisibility(View.GONE);
+            resetIconYAxis(inputHolder.mThumbnailFrontContainer);
+            inputHolder.mThumbnailFrontContainer.setVisibility(View.VISIBLE);
+            inputHolder.mThumbnailFrontContainer.setAlpha(1);
+            if ((mReverseAllAnimations && mAnimationItemsIndex.get(inputPosition, false)) || mCurrentSelectedIndex == inputPosition)
+            {
+                LoyaltyCardAnimator.flipView(mContext, inputHolder.mThumbnailBackContainer, inputHolder.mThumbnailFrontContainer, false);
+                resetCurrentIndex();
+            }
+        }
+    }
+
+    private void resetIconYAxis(View inputView)
+    {
+        if (inputView.getRotationY() != 0)
+        {
+            inputView.setRotationY(0);
+        }
+    }
+
+    public void resetAnimationIndex()
+    {
+        mReverseAllAnimations = false;
+        mAnimationItemsIndex.clear();
+    }
+
+    @SuppressFBWarnings("ST_WRITE_TO_STATIC_FROM_INSTANCE_METHOD")
+    public void toggleSelection(int inputPosition)
+    {
+        mCurrentSelectedIndex = inputPosition;
+        if (mSelectedItems.get(inputPosition, false))
+        {
+            mSelectedItems.delete(inputPosition);
+            mAnimationItemsIndex.delete(inputPosition);
+        }
+        else
+        {
+            mSelectedItems.put(inputPosition, true);
+            mAnimationItemsIndex.put(inputPosition, true);
+        }
+        notifyItemChanged(inputPosition);
+    }
+
+    public void clearSelections()
+    {
+        mReverseAllAnimations = true;
+        mSelectedItems.clear();
+        notifyDataSetChanged();
+    }
+
+    public int getSelectedItemCount()
+    {
+        return mSelectedItems.size();
+    }
+
+    public ArrayList<LoyaltyCard> getSelectedItems()
+    {
+
+        ArrayList<LoyaltyCard> result = new ArrayList<>();
+
+        int i;
+        for(i = 0; i < mSelectedItems.size(); i++)
+        {
+            mCursor.moveToPosition(mSelectedItems.keyAt(i));
+            result.add(LoyaltyCard.toLoyaltyCard(mCursor));
         }
 
-        if (loyaltyCard.starStatus!=0) star.setVisibility(View.VISIBLE);
-            else star.setVisibility(View.GONE);
-
-        thumbnail.setImageBitmap(Utils.generateIcon(context, loyaltyCard.store, loyaltyCard.headerColor).getLetterTile());
+        return result;
     }
-}
+
+    private void resetCurrentIndex()
+    {
+        mCurrentSelectedIndex = -1;
+    }
+
+    public interface CardAdapterListener
+    {
+        void onIconClicked(int inputPosition);
+        void onRowClicked(int inputPosition);
+        void onRowLongClicked(int inputPosition);
+    }
+
+    public class LoyaltyCardListItemViewHolder extends RecyclerView.ViewHolder implements View.OnLongClickListener
+    {
+
+        public TextView mStoreField, mNoteField, mBalanceField, mExpiryField;
+        public LinearLayout mInformationContainer;
+        public ImageView mCardIcon, mStarIcon;
+        public CardView mThumbnailContainer;
+        public ConstraintLayout mRow;
+        public RelativeLayout mThumbnailFrontContainer, mThumbnailBackContainer;
+
+        public LoyaltyCardListItemViewHolder(View inputView)
+        {
+            super(inputView);
+            mThumbnailContainer = inputView.findViewById(R.id.thumbnail_container);
+            mRow = inputView.findViewById(R.id.row);
+            mThumbnailFrontContainer = inputView.findViewById(R.id.thumbnail_front);
+            mThumbnailBackContainer = inputView.findViewById(R.id.thumbnail_back);
+            mInformationContainer = inputView.findViewById(R.id.information_container);
+            mStoreField = inputView.findViewById(R.id.store);
+            mNoteField = inputView.findViewById(R.id.note);
+            mBalanceField = inputView.findViewById(R.id.balance);
+            mExpiryField = inputView.findViewById(R.id.expiry);
+            mCardIcon = inputView.findViewById(R.id.thumbnail);
+            mStarIcon = inputView.findViewById(R.id.star);
+            inputView.setOnLongClickListener(this);
+        }
+
+        @Override
+        public boolean onLongClick(View inputView)
+        {
+            mListener.onRowLongClicked(getAdapterPosition());
+            inputView.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS);
+            return true;
+        }
+    }
+}

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

@@ -10,26 +10,16 @@ import android.graphics.Color;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
-
-import com.google.android.material.chip.Chip;
-import com.google.android.material.chip.ChipGroup;
-import com.google.android.material.floatingactionbutton.FloatingActionButton;
-import com.google.android.material.snackbar.Snackbar;
-import androidx.appcompat.app.ActionBar;
-import androidx.appcompat.app.AlertDialog;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.widget.Toolbar;
-import androidx.fragment.app.DialogFragment;
-
 import android.os.LocaleList;
 import android.text.Editable;
+import android.text.InputType;
 import android.text.TextWatcher;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
-import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewTreeObserver;
+import android.view.WindowManager;
 import android.widget.ArrayAdapter;
 import android.widget.AutoCompleteTextView;
 import android.widget.Button;
@@ -39,6 +29,10 @@ import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import com.google.android.material.chip.Chip;
+import com.google.android.material.chip.ChipGroup;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import com.google.android.material.snackbar.Snackbar;
 import com.google.android.material.tabs.TabLayout;
 import com.google.zxing.BarcodeFormat;
 import com.jaredrummler.android.colorpicker.ColorPickerDialog;
@@ -47,7 +41,6 @@ import com.jaredrummler.android.colorpicker.ColorPickerDialogListener;
 import java.io.InvalidObjectException;
 import java.math.BigDecimal;
 import java.text.DateFormat;
-import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Collections;
@@ -57,10 +50,18 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+import androidx.fragment.app.DialogFragment;
+
 public class LoyaltyCardEditActivity extends AppCompatActivity
 {
     private static final String TAG = "Catima";
-
+    private final String STATE_TAB_INDEX = "savedTab";
     TabLayout tabs;
 
     ImageView thumbnail;
@@ -71,6 +72,7 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
     EditText balanceField;
     AutoCompleteTextView balanceCurrencyField;
     TextView cardIdFieldView;
+    AutoCompleteTextView barcodeIdField;
     AutoCompleteTextView barcodeTypeField;
     ImageView barcodeImage;
     View barcodeImageLayout;
@@ -80,8 +82,9 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
 
     int loyaltyCardId;
     boolean updateLoyaltyCard;
-    String barcodeType;
     String cardId;
+    String barcodeId;
+    String barcodeType;
 
     Uri importLoyaltyCardUri = null;
     Integer headingColorValue = null;
@@ -90,10 +93,12 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
     ImportURIHelper importUriHelper;
 
     boolean hasChanged = false;
+    String tempStoredOldBarcodeValue = null;
     boolean initDone = false;
     AlertDialog confirmExitDialog = null;
 
     boolean validBalance = true;
+    Runnable warnOnInvalidBarcodeType;
 
     HashMap<String, Currency> currencies = new HashMap<>();
 
@@ -103,13 +108,28 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
         loyaltyCardId = b != null ? b.getInt("id") : 0;
         updateLoyaltyCard = b != null && b.getBoolean("update", false);
 
-        barcodeType = b != null ? b.getString("barcodeType") : null;
         cardId = b != null ? b.getString("cardId") : null;
+        barcodeId = b != null ? b.getString("barcodeId") : null;
+        barcodeType = b != null ? b.getString("barcodeType") : null;
 
         importLoyaltyCardUri = intent.getData();
 
         Log.d(TAG, "View activity: id=" + loyaltyCardId
-                + ", updateLoyaltyCard=" + Boolean.toString(updateLoyaltyCard));
+                + ", updateLoyaltyCard=" + updateLoyaltyCard);
+    }
+
+    @Override
+    public void onSaveInstanceState(@NonNull Bundle savedInstanceState) {
+        super.onSaveInstanceState(savedInstanceState);
+        tabs = findViewById(R.id.tabs);
+        savedInstanceState.putInt(STATE_TAB_INDEX, tabs.getSelectedTabPosition());
+    }
+
+    @Override
+    public void onRestoreInstanceState(@NonNull Bundle savedInstanceState) {
+        super.onRestoreInstanceState(savedInstanceState);
+        tabs = findViewById(R.id.tabs);
+        tabs.selectTab(tabs.getTabAt(savedInstanceState.getInt(STATE_TAB_INDEX)));
     }
 
     @Override
@@ -144,6 +164,7 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
         balanceField = findViewById(R.id.balanceField);
         balanceCurrencyField = findViewById(R.id.balanceCurrencyField);
         cardIdFieldView = findViewById(R.id.cardIdView);
+        barcodeIdField = findViewById(R.id.barcodeIdField);
         barcodeTypeField = findViewById(R.id.barcodeTypeField);
         barcodeImage = findViewById(R.id.barcode);
         barcodeImageLayout = findViewById(R.id.barcodeLayout);
@@ -151,6 +172,12 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
 
         enterButton = findViewById(R.id.enterButton);
 
+        warnOnInvalidBarcodeType = () -> {
+            if (!(boolean) barcodeImage.getTag()) {
+                Toast.makeText(LoyaltyCardEditActivity.this, getString(R.string.wrongValueForBarcodeType), Toast.LENGTH_LONG).show();
+            }
+        };
+
         storeFieldEdit.addTextChangedListener(new TextWatcher() {
             @Override
             public void beforeTextChanged(CharSequence s, int start, int count, int after) { }
@@ -293,27 +320,96 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
 
         cardIdFieldView.addTextChangedListener(new TextWatcher() {
             @Override
-            public void beforeTextChanged(CharSequence s, int start, int count, int after) { }
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+                if (initDone) {
+                    if (tempStoredOldBarcodeValue == null) {
+                        // We changed the card ID, save the current barcode ID in a temp
+                        // variable and make sure to ask the user later if they also want to
+                        // update the barcode ID
+                        if (barcodeIdField.getTag() == null) {
+                            // If it is set to "same as Card ID", temp-save the value before the
+                            // Card ID change
+                            tempStoredOldBarcodeValue = s.toString();
+                        } else {
+                            // Otherwise, set the temp value to the current field value
+                            tempStoredOldBarcodeValue = barcodeIdField.getText().toString();
+                        }
 
-            @Override
-            public void onTextChanged(CharSequence s, int start, int before, int count) {
-                hasChanged = true;
-
-                String formatString = barcodeTypeField.getText().toString();
-
-                if (!formatString.isEmpty()) {
-                    if (formatString.equals(getString(R.string.noBarcode))) {
-                        hideBarcode();
-                    } else {
-                        generateBarcode(s.toString(), BarcodeFormat.valueOf(formatString));
+                        barcodeIdField.setText(tempStoredOldBarcodeValue);
+                        barcodeIdField.setTag(tempStoredOldBarcodeValue);
                     }
                 }
             }
 
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+                hasChanged = true;
+            }
+
             @Override
             public void afterTextChanged(Editable s) { }
         });
 
+        barcodeIdField.addTextChangedListener(new TextWatcher() {
+            CharSequence lastValue;
+
+            @Override
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+                lastValue = s;
+            }
+
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+                hasChanged = true;
+
+                if (s.toString().equals(getString(R.string.sameAsCardId))) {
+                    // If the user manually changes the barcode again make sure we disable the
+                    // request to update it to match the card id (if changed)
+                    tempStoredOldBarcodeValue = null;
+
+                    barcodeIdField.setTag(null);
+                } else if (s.toString().equals(getString(R.string.setBarcodeId))) {
+                    if (!lastValue.toString().equals(getString(R.string.setBarcodeId))) {
+                        barcodeIdField.setText(lastValue);
+                    };
+
+                    AlertDialog.Builder builder = new AlertDialog.Builder(LoyaltyCardEditActivity.this);
+                    builder.setTitle(R.string.setBarcodeId);
+                    final EditText input = new EditText(LoyaltyCardEditActivity.this);
+                    input.setInputType(InputType.TYPE_CLASS_TEXT);
+                    if (barcodeIdField.getTag() != null) {
+                        input.setText((String) barcodeIdField.getTag());
+                    }
+                    builder.setView(input);
+
+                    builder.setPositiveButton(getString(R.string.ok), (dialog, which) -> {
+                        // If the user manually changes the barcode again make sure we disable the
+                        // request to update it to match the card id (if changed)
+                        tempStoredOldBarcodeValue = null;
+
+                        barcodeIdField.setTag(input.getText().toString());
+                        barcodeIdField.setText(input.getText());
+                    });
+                    builder.setNegativeButton(getString(R.string.cancel), (dialog, which) -> dialog.cancel());
+                    AlertDialog dialog = builder.create();
+                    dialog.show();
+                    dialog.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE);
+                    input.requestFocus();
+                }
+
+                generateOrHideBarcode();
+            }
+
+            @Override
+            public void afterTextChanged(Editable s) {
+                ArrayList<String> barcodeIdList = new ArrayList<>();
+                barcodeIdList.add(0, getString(R.string.sameAsCardId));
+                barcodeIdList.add(1, getString(R.string.setBarcodeId));
+                ArrayAdapter<String> barcodeIdAdapter = new ArrayAdapter<>(LoyaltyCardEditActivity.this, android.R.layout.select_dialog_item, barcodeIdList);
+                barcodeIdField.setAdapter(barcodeIdAdapter);
+            }
+        });
+
         barcodeTypeField.addTextChangedListener(new TextWatcher() {
             @Override
             public void beforeTextChanged(CharSequence s, int start, int count, int after) { }
@@ -324,15 +420,30 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
 
                 if (!s.toString().isEmpty()) {
                     if (s.toString().equals(getString(R.string.noBarcode))) {
-                        hideBarcode();
+                        barcodeTypeField.setTag(null);
                     } else {
-                        generateBarcode(cardIdFieldView.getText().toString(), BarcodeFormat.valueOf(s.toString()));
+                        try {
+                            BarcodeFormat barcodeFormat = BarcodeFormat.valueOf(s.toString());
+
+                            barcodeTypeField.setTag(barcodeFormat);
+
+                            if (!BarcodeSelectorActivity.SUPPORTED_BARCODE_TYPES.contains(barcodeFormat.name())) {
+                                Toast.makeText(LoyaltyCardEditActivity.this, getString(R.string.unsupportedBarcodeType), Toast.LENGTH_LONG).show();
+                            }
+                        } catch (IllegalArgumentException e) {}
                     }
+
+                    generateOrHideBarcode();
                 }
             }
 
             @Override
-            public void afterTextChanged(Editable s) { }
+            public void afterTextChanged(Editable s) {
+                ArrayList<String> barcodeList = new ArrayList<>(BarcodeSelectorActivity.SUPPORTED_BARCODE_TYPES);
+                barcodeList.add(0, getString(R.string.noBarcode));
+                ArrayAdapter<String> barcodeAdapter = new ArrayAdapter<>(LoyaltyCardEditActivity.this, android.R.layout.select_dialog_item, barcodeList);
+                barcodeTypeField.setAdapter(barcodeAdapter);
+            }
         });
 
         tabs.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
@@ -375,6 +486,8 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
         balanceField.setTag(null);
         balanceField.setText("");
         cardIdFieldView.setText("");
+        barcodeIdField.setTag(null);
+        barcodeIdField.setText("");
         barcodeTypeField.setText("");
     }
 
@@ -430,9 +543,15 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
                 cardIdFieldView.setText(loyaltyCard.cardId);
             }
 
+            if(barcodeIdField.getText().length() == 0)
+            {
+                barcodeIdField.setTag(loyaltyCard.barcodeId);
+                barcodeIdField.setText(loyaltyCard.barcodeId != null ? loyaltyCard.barcodeId : getString(R.string.sameAsCardId));
+            }
+
             if(barcodeTypeField.getText().length() == 0)
             {
-                barcodeTypeField.setText(loyaltyCard.barcodeType.isEmpty() ? getString(R.string.noBarcode) : loyaltyCard.barcodeType);
+                barcodeTypeField.setText(loyaltyCard.barcodeType != null ? loyaltyCard.barcodeType.toString() : getString(R.string.noBarcode));
             }
 
             if(headingColorValue == null)
@@ -466,7 +585,9 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
             balanceCurrencyField.setTag(importCard.balanceType);
             formatBalanceCurrencyField(importCard.balanceType);
             cardIdFieldView.setText(importCard.cardId);
-            barcodeTypeField.setText(importCard.barcodeType);
+            barcodeIdField.setTag(importCard.barcodeId);
+            barcodeIdField.setText(importCard.barcodeId != null ? importCard.barcodeId : getString(R.string.sameAsCardId));
+            barcodeTypeField.setText(importCard.barcodeType != null ? importCard.barcodeType.toString() : getString(R.string.noBarcode));
             headingColorValue = importCard.headerColor;
         }
         else
@@ -474,6 +595,8 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
             setTitle(R.string.addCardTitle);
             expiryField.setTag(null);
             expiryField.setText(getString(R.string.never));
+            barcodeIdField.setTag(null);
+            barcodeIdField.setText(getString(R.string.sameAsCardId));
             balanceField.setTag(new BigDecimal("0"));
             balanceCurrencyField.setTag(null);
             formatBalanceCurrencyField(null);
@@ -525,46 +648,37 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
 
         thumbnail.setOnClickListener(new ColorSelectListener(headingColorValue));
 
+        // Update from intent
+        if (barcodeType != null) {
+            try {
+                barcodeTypeField.setText(BarcodeFormat.valueOf(barcodeType).name());
+            } catch (IllegalArgumentException e) {
+                barcodeTypeField.setText(getString(R.string.noBarcode));
+            }
+        }
+
+        if (cardId != null) {
+            cardIdFieldView.setText(cardId);
+        }
+
+        if (barcodeId != null) {
+            if (!barcodeId.isEmpty()) {
+                barcodeIdField.setText(barcodeId);
+            } else {
+                barcodeIdField.setText(getString(R.string.sameAsCardId));
+            }
+        }
+
         if (!initDone) {
             hasChanged = false;
             initDone = true;
         }
 
-        // Update from intent
-        if (barcodeType != null) {
-            barcodeTypeField.setText(barcodeType.isEmpty() ? getString(R.string.noBarcode) : barcodeType);
-            barcodeType = null;
-        }
-        if (cardId != null) {
-            cardIdFieldView.setText(cardId);
-            cardId = null;
-        }
-
-        if(cardIdFieldView.getText().length() > 0 && barcodeTypeField.getText().length() > 0)
-        {
-            String formatString = barcodeTypeField.getText().toString();
-
-            if(formatString.isEmpty() || formatString.equals(getString(R.string.noBarcode)))
-            {
-                hideBarcode();
-            }
-            else
-            {
-                final BarcodeFormat format = BarcodeFormat.valueOf(formatString);
-                final String cardIdString = cardIdFieldView.getText().toString();
-
-                generateBarcode(cardIdString, format);
-            }
-        }
+        generateOrHideBarcode();
 
         enterButton.setOnClickListener(new EditCardIdAndBarcode());
         barcodeImage.setOnClickListener(new EditCardIdAndBarcode());
 
-        ArrayList<String> barcodeList = new ArrayList<>(BarcodeSelectorActivity.SUPPORTED_BARCODE_TYPES);
-        barcodeList.add(0, getString(R.string.noBarcode));
-        ArrayAdapter<String> barcodeAdapter = new ArrayAdapter<>(this, android.R.layout.select_dialog_item, barcodeList);
-        barcodeTypeField.setAdapter(barcodeAdapter);
-
         FloatingActionButton saveButton = findViewById(R.id.fabSave);
         saveButton.setOnClickListener(v -> doSave());
 
@@ -592,8 +706,36 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
         askBeforeQuitIfChanged();
     }
 
+    private void askBarcodeChange(Runnable callback) {
+        new AlertDialog.Builder(this)
+                .setTitle(R.string.updateBarcodeQuestionTitle)
+                .setMessage(R.string.updateBarcodeQuestionText)
+                .setPositiveButton(R.string.yes, (dialog, which) -> {
+                    barcodeIdField.setText(R.string.sameAsCardId);
+                    tempStoredOldBarcodeValue = null;
+
+                    if (callback != null) {
+                        callback.run();
+                    }
+                })
+                .setNegativeButton(R.string.no, (dialog, which) -> {
+                    barcodeIdField.setText(tempStoredOldBarcodeValue);
+                    tempStoredOldBarcodeValue = null;
+
+                    if (callback != null) {
+                        callback.run();
+                    }
+                })
+                .show();
+    }
+
     private void askBeforeQuitIfChanged() {
         if (!hasChanged) {
+            if (tempStoredOldBarcodeValue != null) {
+                askBarcodeChange(this::askBeforeQuitIfChanged);
+                return;
+            }
+
             finish();
             return;
         }
@@ -634,6 +776,7 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
         }
     }
 
+
     class ColorSelectListener implements View.OnClickListener
     {
         final int defaultColor;
@@ -717,20 +860,19 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
 
     private void doSave()
     {
+        if (tempStoredOldBarcodeValue != null) {
+            askBarcodeChange(this::doSave);
+            return;
+        }
+
         String store = storeFieldEdit.getText().toString();
         String note = noteFieldEdit.getText().toString();
         Date expiry = (Date) expiryField.getTag();
         BigDecimal balance = (BigDecimal) balanceField.getTag();
         Currency balanceType = balanceCurrencyField.getTag() != null ? ((Currency) balanceCurrencyField.getTag()) : null;
         String cardId = cardIdFieldView.getText().toString();
-        String barcodeType = barcodeTypeField.getText().toString();
-
-        // We do not want to save the no barcode string to the database
-        // it is simply an empty there for no barcode
-        if(barcodeType.equals(getString(R.string.noBarcode)))
-        {
-            barcodeType = "";
-        }
+        String barcodeId = (String) barcodeIdField.getTag();
+        BarcodeFormat barcodeType = (BarcodeFormat) barcodeTypeField.getTag();
 
         if(store.isEmpty())
         {
@@ -759,12 +901,12 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
 
         if(updateLoyaltyCard)
         {   //update of "starStatus" not necessary, since it cannot be changed in this activity (only in ViewActivity)
-            db.updateLoyaltyCard(loyaltyCardId, store, note, expiry, balance, balanceType, cardId, barcodeType, headingColorValue);
+            db.updateLoyaltyCard(loyaltyCardId, store, note, expiry, balance, balanceType, cardId, barcodeId, barcodeType, headingColorValue);
             Log.i(TAG, "Updated " + loyaltyCardId + " to " + cardId);
         }
         else
         {
-            loyaltyCardId = (int)db.insertLoyaltyCard(store, note, expiry, balance, balanceType, cardId, barcodeType, headingColorValue, 0);
+            loyaltyCardId = (int)db.insertLoyaltyCard(store, note, expiry, balance, balanceType, cardId, barcodeId, barcodeType, headingColorValue, 0);
         }
 
         db.setLoyaltyCardGroups(loyaltyCardId, selectedGroups);
@@ -840,10 +982,13 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
     {
         super.onActivityResult(requestCode, resultCode, intent);
 
-        BarcodeValues barcodeValues = Utils.parseSetBarcodeActivityResult(requestCode, resultCode, intent);
+        BarcodeValues barcodeValues = Utils.parseSetBarcodeActivityResult(requestCode, resultCode, intent, this);
 
-        barcodeType = barcodeValues.format();
-        cardId = barcodeValues.content();
+        if (resultCode == RESULT_OK) {
+           cardId = barcodeValues.content();
+           barcodeType = barcodeValues.format();
+           barcodeId = "";
+        }
 
         onResume();
     }
@@ -856,7 +1001,18 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
         barcodeImageLayout.setVisibility(View.GONE);
     }
 
-    private void generateBarcode(final String cardId, final BarcodeFormat barcodeFormat) {
+    private void generateOrHideBarcode() {
+        String cardIdString = barcodeIdField.getTag() != null ? barcodeIdField.getTag().toString() : cardIdFieldView.getText().toString();
+        BarcodeFormat barcodeFormat = (BarcodeFormat) barcodeTypeField.getTag();
+
+        if (barcodeFormat == null || cardIdString.isEmpty() || !BarcodeSelectorActivity.SUPPORTED_BARCODE_TYPES.contains(barcodeFormat.name())) {
+            hideBarcode();
+        } else {
+            generateBarcode(cardIdString, barcodeFormat);
+        }
+    }
+
+    private void generateBarcode(String cardIdString, BarcodeFormat barcodeFormat) {
         if (barcodeImage.getHeight() == 0) {
             Log.d(TAG, "ImageView size is not known known at start, waiting for load");
             // The size of the ImageView is not yet available as it has not
@@ -868,12 +1024,12 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
                             barcodeImage.getViewTreeObserver().removeOnGlobalLayoutListener(this);
 
                             Log.d(TAG, "ImageView size now known");
-                            new BarcodeImageWriterTask(barcodeImage, cardId, barcodeFormat).execute();
+                            new BarcodeImageWriterTask(barcodeImage, cardIdString, barcodeFormat, null, false, warnOnInvalidBarcodeType).execute();
                         }
                     });
         } else {
             Log.d(TAG, "ImageView size known known, creating barcode");
-            new BarcodeImageWriterTask(barcodeImage, cardId, barcodeFormat).execute();
+            new BarcodeImageWriterTask(barcodeImage, cardIdString, barcodeFormat, null, false, warnOnInvalidBarcodeType).execute();
         }
 
         showBarcode();
@@ -898,6 +1054,11 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
     }
 
     private void showPart(String part) {
+        if (tempStoredOldBarcodeValue != null) {
+            askBarcodeChange(() -> showPart(part));
+            return;
+        }
+
         View cardPart = findViewById(R.id.cardPart);
         View barcodePart = findViewById(R.id.barcodePart);
 
@@ -912,12 +1073,7 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
             barcodePart.setVisibility(View.VISIBLE);
 
             // Redraw barcode due to size change (Visibility.GONE sets it to 0)
-            String formatString = barcodeTypeField.getText().toString();
-            if (formatString.isEmpty() || formatString.equals(getString(R.string.noBarcode))) {
-                hideBarcode();
-            } else {
-                generateBarcode(cardIdFieldView.getText().toString(), BarcodeFormat.valueOf(formatString));
-            }
+            generateOrHideBarcode();
         } else {
             throw new UnsupportedOperationException();
         }

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

@@ -1,8 +1,8 @@
 package protect.card_locker;
 
 import android.app.Application;
-import androidx.appcompat.app.AppCompatDelegate;
 
+import androidx.appcompat.app.AppCompatDelegate;
 import protect.card_locker.preferences.Settings;
 
 public class LoyaltyCardLockerApplication extends Application {

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

@@ -7,24 +7,12 @@ import android.graphics.Color;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.os.Bundle;
-
-import androidx.annotation.NonNull;
-import androidx.constraintlayout.widget.ConstraintLayout;
-import androidx.constraintlayout.widget.Guideline;
-import androidx.core.graphics.drawable.DrawableCompat;
-import androidx.core.widget.TextViewCompat;
-import androidx.appcompat.app.ActionBar;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.content.res.AppCompatResources;
-import androidx.appcompat.widget.Toolbar;
-
 import android.util.DisplayMetrics;
 import android.util.Log;
 import android.util.TypedValue;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
-import android.view.ViewGroup;
 import android.view.ViewTreeObserver;
 import android.view.Window;
 import android.view.WindowManager;
@@ -41,8 +29,17 @@ import com.google.zxing.BarcodeFormat;
 
 import java.math.BigDecimal;
 import java.text.DateFormat;
+import java.util.Arrays;
 import java.util.List;
 
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.content.res.AppCompatResources;
+import androidx.appcompat.widget.Toolbar;
+import androidx.constraintlayout.widget.Guideline;
+import androidx.core.graphics.drawable.DrawableCompat;
+import androidx.core.widget.TextViewCompat;
 import protect.card_locker.preferences.Settings;
 
 public class LoyaltyCardViewActivity extends AppCompatActivity
@@ -71,6 +68,7 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
     Settings settings;
 
     String cardIdString;
+    String barcodeIdString;
     BarcodeFormat format;
 
     FloatingActionButton editButton;
@@ -268,19 +266,20 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
 
         setupOrientation();
 
-        String formatString = loyaltyCard.barcodeType;
-        format = !formatString.isEmpty() ? BarcodeFormat.valueOf(formatString) : null;
+        format = loyaltyCard.barcodeType;
         cardIdString = loyaltyCard.cardId;
+        barcodeIdString = loyaltyCard.barcodeId;
 
         cardIdFieldView.setText(loyaltyCard.cardId);
         TextViewCompat.setAutoSizeTextTypeUniformWithConfiguration(cardIdFieldView,
-                getResources().getInteger(R.integer.settings_card_id_min_font_size_sp)-1, settings.getCardIdFontSize(),
+                settings.getFontSizeMin(settings.getLargeFont()), settings.getFontSizeMax(settings.getLargeFont()),
                 1, TypedValue.COMPLEX_UNIT_SP);
 
         if(loyaltyCard.note.length() > 0)
         {
             noteView.setVisibility(View.VISIBLE);
             noteView.setText(loyaltyCard.note);
+            noteView.setTextSize(settings.getFontSizeMax(settings.getMediumFont()));
         }
         else
         {
@@ -298,6 +297,7 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
 
             groupsView.setVisibility(View.VISIBLE);
             groupsView.setText(getString(R.string.groupsList, groupsString.toString()));
+            groupsView.setTextSize(settings.getFontSizeMax(settings.getMediumFont()));
         }
         else
         {
@@ -307,6 +307,7 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
         if(!loyaltyCard.balance.equals(new BigDecimal(0))) {
             balanceView.setVisibility(View.VISIBLE);
             balanceView.setText(getString(R.string.balanceSentence, Utils.formatBalance(this, loyaltyCard.balance, loyaltyCard.balanceType)));
+            balanceView.setTextSize(settings.getFontSizeMax(settings.getMediumFont()));
         }
         else
         {
@@ -322,6 +323,7 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
                 expiryView.setTextColor(getResources().getColor(R.color.alert));
             }
             expiryView.setText(getString(expiryString, DateFormat.getDateInstance(DateFormat.LONG).format(loyaltyCard.expiry)));
+            expiryView.setTextSize(settings.getFontSizeMax(settings.getMediumFont()));
         }
         else
         {
@@ -334,7 +336,7 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
         }
 
         storeName.setText(loyaltyCard.store);
-        storeName.setTextSize(settings.getCardTitleFontSize());
+        storeName.setTextSize(settings.getFontSizeMax(settings.getLargeFont()));
 
         int backgroundHeaderColor;
         if(loyaltyCard.headerColor != null)
@@ -382,7 +384,15 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
         // Set shadow colour of store text so even same color on same color would be readable
         storeName.setShadowLayer(1, 1, 1, backgroundNeedsDarkIcons ? Color.BLACK : Color.WHITE);
 
-        if(format != null)
+        Boolean isBarcodeSupported = true;
+
+        if (format != null && !BarcodeSelectorActivity.SUPPORTED_BARCODE_TYPES.contains(format.name())) {
+            isBarcodeSupported = false;
+
+            Toast.makeText(this, getString(R.string.unsupportedBarcodeType), Toast.LENGTH_LONG).show();
+        }
+
+        if(format != null && isBarcodeSupported)
         {
             if (!barcodeIsFullscreen) {
                 maximizeButton.setVisibility(View.VISIBLE);
@@ -398,7 +408,14 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
             else
             {
                 Log.d(TAG, "ImageView size known known, creating barcode");
-                new BarcodeImageWriterTask(barcodeImage, cardIdString, format).execute();
+                new BarcodeImageWriterTask(
+                    barcodeImage,
+                    barcodeIdString != null ? barcodeIdString : cardIdString,
+                    format,
+                    null,
+                    false,
+                    null)
+                .execute();
             }
 
             // Force redraw fullscreen state
@@ -471,7 +488,7 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
                 break;
 
             case R.id.action_share:
-                importURIHelper.startShareIntent(loyaltyCard);
+                importURIHelper.startShareIntent(Arrays.asList(loyaltyCard));
                 return true;
 
             case R.id.action_lock_unlock:
@@ -568,7 +585,14 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
                             barcodeImage.getViewTreeObserver().removeOnGlobalLayoutListener(this);
 
                             Log.d(TAG, "ImageView size now known");
-                            new BarcodeImageWriterTask(barcodeImage, cardIdString, format).execute();
+                            new BarcodeImageWriterTask(
+                                barcodeImage,
+                                barcodeIdString != null ? barcodeIdString : cardIdString,
+                                format,
+                                null,
+                                false,
+                                null)
+                            .execute();
                         }
                     });
         };

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

@@ -1,63 +1,157 @@
 package protect.card_locker;
 
-import android.app.AlertDialog;
 import android.app.SearchManager;
 import android.content.ClipData;
 import android.content.ClipboardManager;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.res.Configuration;
 import android.database.Cursor;
 import android.net.Uri;
 import android.os.Bundle;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.widget.SearchView;
-import androidx.appcompat.widget.Toolbar;
 import android.util.Log;
-import android.view.ContextMenu;
 import android.view.GestureDetector;
 import android.view.Menu;
-import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.MotionEvent;
 import android.view.View;
-import android.widget.AdapterView;
-import android.widget.ListView;
 import android.widget.TextView;
 import android.widget.Toast;
+
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.google.android.material.tabs.TabLayout;
+
 import java.util.List;
 
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.view.ActionMode;
+import androidx.appcompat.widget.SearchView;
+import androidx.appcompat.widget.Toolbar;
+import androidx.recyclerview.widget.DefaultItemAnimator;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import protect.card_locker.preferences.SettingsActivity;
 
-public class MainActivity extends AppCompatActivity implements GestureDetector.OnGestureListener
+public class MainActivity extends AppCompatActivity implements LoyaltyCardCursorAdapter.CardAdapterListener, GestureDetector.OnGestureListener
 {
     private static final String TAG = "Catima";
 
-    private Menu menu;
-    private GestureDetector gestureDetector;
-    protected String filter = "";
+    private final DBHelper mDB = new DBHelper(this);
+    private LoyaltyCardCursorAdapter mAdapter;
+    private ActionMode mCurrentActionMode;
+    private Menu mMenu;
+    private GestureDetector mGestureDetector;
+    protected String mFilter = "";
     protected int selectedTab = 0;
+    private RecyclerView mCardList;
+
+    private ActionMode.Callback mCurrentActionModeCallback = new ActionMode.Callback()
+    {
+        @Override
+        public boolean onCreateActionMode(ActionMode inputMode, Menu inputMenu)
+        {
+            inputMode.getMenuInflater().inflate(R.menu.card_longclick_menu, inputMenu);
+            return true;
+        }
+
+        @Override
+        public boolean onPrepareActionMode(ActionMode inputMode, Menu inputMenu)
+        {
+            return false;
+        }
+
+        @Override
+        public boolean onActionItemClicked(ActionMode inputMode, MenuItem inputItem)
+        {
+            if (inputItem.getItemId() == R.id.action_copy_to_clipboard)
+            {
+                ClipboardManager clipboard = (ClipboardManager) getSystemService(CLIPBOARD_SERVICE);
+
+                String clipboardData;
+                int cardCount = mAdapter.getSelectedItemCount();
+
+                if (cardCount == 1) {
+                    clipboardData = mAdapter.getSelectedItems().get(0).cardId;
+                } else {
+                    StringBuilder cardIds = new StringBuilder();
+
+                    for (int i = 0; i < cardCount; i++) {
+                        LoyaltyCard loyaltyCard = mAdapter.getSelectedItems().get(i);
+
+                        cardIds.append(loyaltyCard.store + ": " + loyaltyCard.cardId);
+                        if (i < (cardCount - 1)) {
+                            cardIds.append("\n");
+                        }
+                    }
+
+                    clipboardData = cardIds.toString();
+                }
+
+                ClipData clip = ClipData.newPlainText(getString(R.string.card_ids_copied), clipboardData);
+                clipboard.setPrimaryClip(clip);
+                Toast.makeText(MainActivity.this, cardCount > 1 ? R.string.copy_to_clipboard_multiple_toast : R.string.copy_to_clipboard_toast, Toast.LENGTH_LONG).show();
+                inputMode.finish();
+                return true;
+            }
+            else if (inputItem.getItemId() == R.id.action_share)
+            {
+                final ImportURIHelper importURIHelper = new ImportURIHelper(MainActivity.this);
+                importURIHelper.startShareIntent(mAdapter.getSelectedItems());
+                inputMode.finish();
+                return true;
+            }
+            else if(inputItem.getItemId() == R.id.action_edit)
+            {
+                if (mAdapter.getSelectedItemCount() != 1) {
+                    throw new IllegalArgumentException("Cannot edit more than 1 card at a time");
+                }
+
+                Intent intent = new Intent(getApplicationContext(), LoyaltyCardEditActivity.class);
+                Bundle bundle = new Bundle();
+                bundle.putInt("id", mAdapter.getSelectedItems().get(0).id);
+                bundle.putBoolean("update", true);
+                intent.putExtras(bundle);
+                startActivity(intent);
+                inputMode.finish();
+                return true;
+            }
+
+            return false;
+        }
+
+        @Override
+        public void onDestroyActionMode(ActionMode inputMode)
+        {
+            mAdapter.clearSelections();
+            mCurrentActionMode = null;
+            mCardList.post(new Runnable()
+            {
+                @Override
+                public void run()
+                {
+                    mAdapter.resetAnimationIndex();
+                }
+            });
+        }
+    };
 
     @Override
-    protected void onCreate(Bundle savedInstanceState)
+    protected void onCreate(Bundle inputSavedInstanceState)
     {
-        super.onCreate(savedInstanceState);
+        super.onCreate(inputSavedInstanceState);
         setContentView(R.layout.main_activity);
         Toolbar toolbar = findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
 
-        updateLoyaltyCardList(filter, null);
+        updateLoyaltyCardList(mFilter, null);
 
         TabLayout groupsTabLayout = findViewById(R.id.groups);
         groupsTabLayout.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
             @Override
             public void onTabSelected(TabLayout.Tab tab) {
                 selectedTab = tab.getPosition();
-                updateLoyaltyCardList(filter, tab.getTag());
+                updateLoyaltyCardList(mFilter, tab.getTag());
 
                 // Store active tab in Shared Preference to restore next app launch
                 SharedPreferences activeTabPref = getApplicationContext().getSharedPreferences(
@@ -79,12 +173,12 @@ public class MainActivity extends AppCompatActivity implements GestureDetector.O
             }
         });
 
-        gestureDetector = new GestureDetector(this, this);
+        mGestureDetector = new GestureDetector(this, this);
 
         View.OnTouchListener gestureTouchListener = new View.OnTouchListener() {
             @Override
             public boolean onTouch(final View v, final MotionEvent event){
-                return gestureDetector.onTouchEvent(event);
+                return mGestureDetector.onTouchEvent(event);
             }
         };
 
@@ -96,11 +190,18 @@ public class MainActivity extends AppCompatActivity implements GestureDetector.O
         noMatchingCardsText.setOnTouchListener(gestureTouchListener);
         list.setOnTouchListener(gestureTouchListener);
 
+        /*
+         * This was added for Huawei, but Huawei is just too much of a fucking pain.
+         * Just leaving this commented out if needed for the future idk
+         * https://twitter.com/SylvieLorxu/status/1379437902741012483
+         *
+
         // Show privacy policy on first run
         SharedPreferences privacyPolicyShownPref = getApplicationContext().getSharedPreferences(
                 getString(R.string.sharedpreference_privacy_policy_shown),
                 Context.MODE_PRIVATE);
 
+
         if (privacyPolicyShownPref.getInt(getString(R.string.sharedpreference_privacy_policy_shown), 0) == 0) {
             SharedPreferences.Editor privacyPolicyShownPrefEditor = privacyPolicyShownPref.edit();
             privacyPolicyShownPrefEditor.putInt(getString(R.string.sharedpreference_privacy_policy_shown), 1);
@@ -109,7 +210,7 @@ public class MainActivity extends AppCompatActivity implements GestureDetector.O
             new AlertDialog.Builder(this)
                     .setTitle(R.string.privacy_policy)
                     .setMessage(R.string.privacy_policy_popup_text)
-                    .setPositiveButton(R.string.thank_you, null)
+                    .setPositiveButton(R.string.accept, null)
                     .setNegativeButton(R.string.privacy_policy, new DialogInterface.OnClickListener() {
                         public void onClick(DialogInterface dialog, int whichButton) {
                             openPrivacyPolicy();
@@ -117,19 +218,28 @@ public class MainActivity extends AppCompatActivity implements GestureDetector.O
                     })
                     .setIcon(android.R.drawable.ic_dialog_info)
                     .show();
-        };
+        }
+         */
     }
 
     @Override
-    protected void onResume() {
+    protected void onResume()
+    {
         super.onResume();
 
-        if (menu != null)
+        if(mCurrentActionMode != null)
         {
-            SearchView searchView = (SearchView) menu.findItem(R.id.action_search).getActionView();
+            mAdapter.clearSelections();
+            mCurrentActionMode.finish();
+        }
 
-            if (!searchView.isIconified()) {
-                filter = searchView.getQuery().toString();
+        if (mMenu != null)
+        {
+            SearchView searchView = (SearchView) mMenu.findItem(R.id.action_search).getActionView();
+
+            if (!searchView.isIconified())
+            {
+                mFilter = searchView.getQuery().toString();
             }
         }
 
@@ -155,11 +265,12 @@ public class MainActivity extends AppCompatActivity implements GestureDetector.O
             assert tab != null;
             group = tab.getTag();
         }
-        updateLoyaltyCardList(filter, group);
+        updateLoyaltyCardList(mFilter, group);
         // End of active tab logic
 
         FloatingActionButton addButton = findViewById(R.id.fabAdd);
-        addButton.setOnClickListener(new View.OnClickListener() {
+        addButton.setOnClickListener(new View.OnClickListener()
+        {
             @Override
             public void onClick(View v) {
                 Intent i = new Intent(getApplicationContext(), ScanActivity.class);
@@ -175,20 +286,18 @@ public class MainActivity extends AppCompatActivity implements GestureDetector.O
         if (requestCode == Utils.MAIN_REQUEST) {
             // We're coming back from another view so clear the search
             // We only do this now to prevent a flash of all entries right after picking one
-            filter = "";
-            if (menu != null)
+            mFilter = "";
+            if (mMenu != null)
             {
-                MenuItem searchItem = menu.findItem(R.id.action_search);
+                MenuItem searchItem = mMenu.findItem(R.id.action_search);
                 searchItem.collapseActionView();
             }
-
-            // In case the theme changed
             recreate();
 
             return;
         }
 
-        BarcodeValues barcodeValues = Utils.parseSetBarcodeActivityResult(requestCode, resultCode, intent);
+        BarcodeValues barcodeValues = Utils.parseSetBarcodeActivityResult(requestCode, resultCode, intent, this);
 
         if(!barcodeValues.isEmpty()) {
             Intent newIntent = new Intent(getApplicationContext(), LoyaltyCardEditActivity.class);
@@ -201,16 +310,18 @@ public class MainActivity extends AppCompatActivity implements GestureDetector.O
     }
 
     @Override
-    public void onBackPressed() {
-        if (menu == null)
+    public void onBackPressed()
+    {
+        if (mMenu == null)
         {
             super.onBackPressed();
             return;
         }
 
-        SearchView searchView = (SearchView) menu.findItem(R.id.action_search).getActionView();
+        SearchView searchView = (SearchView) mMenu.findItem(R.id.action_search).getActionView();
 
-        if (!searchView.isIconified()) {
+        if (!searchView.isIconified())
+        {
             searchView.setIconified(true);
         } else {
             TabLayout groupsTabLayout = findViewById(R.id.groups);
@@ -231,21 +342,29 @@ public class MainActivity extends AppCompatActivity implements GestureDetector.O
             group = (Group) tag;
         }
 
-        final ListView cardList = findViewById(R.id.list);
+        mCardList = findViewById(R.id.list);
+        RecyclerView.LayoutManager mLayoutManager = new LinearLayoutManager(getApplicationContext());
+        mCardList.setLayoutManager(mLayoutManager);
+        mCardList.setItemAnimator(new DefaultItemAnimator());
+
         final TextView helpText = findViewById(R.id.helpText);
         final TextView noMatchingCardsText = findViewById(R.id.noMatchingCardsText);
-        final DBHelper db = new DBHelper(this);
 
-        Cursor cardCursor = db.getLoyaltyCardCursor(filterText, group);
+        Cursor cardCursor = mDB.getLoyaltyCardCursor(filterText, group);
 
-        if(db.getLoyaltyCardCount() > 0)
+        mAdapter = new LoyaltyCardCursorAdapter(this, cardCursor, this);
+        mCardList.setAdapter(mAdapter);
+
+        registerForContextMenu(mCardList);
+
+        if(mDB.getLoyaltyCardCount() > 0)
         {
             // We want the cardList to be visible regardless of the filtered match count
             // to ensure that the noMatchingCardsText doesn't end up being shown below
             // the keyboard
-            cardList.setVisibility(View.VISIBLE);
+            mCardList.setVisibility(View.VISIBLE);
             helpText.setVisibility(View.GONE);
-            if(cardCursor.getCount() > 0)
+            if(mAdapter.getItemCount() > 0)
             {
                 noMatchingCardsText.setVisibility(View.GONE);
             }
@@ -256,35 +375,14 @@ public class MainActivity extends AppCompatActivity implements GestureDetector.O
         }
         else
         {
-            cardList.setVisibility(View.GONE);
+            mCardList.setVisibility(View.GONE);
             helpText.setVisibility(View.VISIBLE);
             noMatchingCardsText.setVisibility(View.GONE);
         }
 
-        final LoyaltyCardCursorAdapter adapter = new LoyaltyCardCursorAdapter(this, cardCursor);
-        cardList.setAdapter(adapter);
-
-        registerForContextMenu(cardList);
-
-        cardList.setOnItemClickListener(new AdapterView.OnItemClickListener()
-        {
-            @Override
-            public void onItemClick(AdapterView<?> parent, View view, int position, long id)
-            {
-                Cursor selected = (Cursor) parent.getItemAtPosition(position);
-                LoyaltyCard loyaltyCard = LoyaltyCard.toLoyaltyCard(selected);
-
-                Intent i = new Intent(view.getContext(), LoyaltyCardViewActivity.class);
-                i.setAction("");
-                final Bundle b = new Bundle();
-                b.putInt("id", loyaltyCard.id);
-                i.putExtras(b);
-
-                ShortcutHelper.updateShortcuts(MainActivity.this, loyaltyCard, i);
-
-                startActivityForResult(i, Utils.MAIN_REQUEST);
-            }
-        });
+        if (mCurrentActionMode != null) {
+            mCurrentActionMode.finish();
+        }
     }
 
     public void updateTabGroups(TabLayout groupsTabLayout)
@@ -325,80 +423,47 @@ public class MainActivity extends AppCompatActivity implements GestureDetector.O
     }
 
     @Override
-    public void onCreateContextMenu(ContextMenu menu, View v, ContextMenu.ContextMenuInfo menuInfo)
+    public boolean onCreateOptionsMenu(Menu inputMenu)
     {
-        super.onCreateContextMenu(menu, v, menuInfo);
-        if (v.getId()==R.id.list)
-        {
-            MenuInflater inflater = getMenuInflater();
-            inflater.inflate(R.menu.card_longclick_menu, menu);
-        }
-    }
+        this.mMenu = inputMenu;
 
-    @Override
-    public boolean onContextItemSelected(MenuItem item)
-    {
-        AdapterView.AdapterContextMenuInfo info = (AdapterView.AdapterContextMenuInfo) item.getMenuInfo();
-        ListView listView = findViewById(R.id.list);
-
-        Cursor cardCursor = (Cursor)listView.getItemAtPosition(info.position);
-        LoyaltyCard card = LoyaltyCard.toLoyaltyCard(cardCursor);
-
-        if(item.getItemId() == R.id.action_clipboard)
-        {
-            ClipboardManager clipboard = (ClipboardManager) getSystemService(CLIPBOARD_SERVICE);
-            ClipData clip = ClipData.newPlainText(card.store, card.cardId);
-            clipboard.setPrimaryClip(clip);
-
-            Toast.makeText(this, R.string.copy_to_clipboard_toast, Toast.LENGTH_LONG).show();
-            return true;
-        }
-        else if(item.getItemId() == R.id.action_share)
-        {
-            final ImportURIHelper importURIHelper = new ImportURIHelper(this);
-            importURIHelper.startShareIntent(card);
-            return true;
-        }
-
-        return super.onContextItemSelected(item);
-    }
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu)
-    {
-        this.menu = menu;
-
-        getMenuInflater().inflate(R.menu.main_menu, menu);
+        getMenuInflater().inflate(R.menu.main_menu, inputMenu);
 
         SearchManager searchManager = (SearchManager) getSystemService(Context.SEARCH_SERVICE);
-        if (searchManager != null) {
-            SearchView searchView = (SearchView) menu.findItem(R.id.action_search).getActionView();
+        if (searchManager != null)
+        {
+            SearchView searchView = (SearchView) inputMenu.findItem(R.id.action_search).getActionView();
             searchView.setSearchableInfo(searchManager.getSearchableInfo(getComponentName()));
             searchView.setSubmitButtonEnabled(false);
 
-            searchView.setOnCloseListener(new SearchView.OnCloseListener() {
+            searchView.setOnCloseListener(new SearchView.OnCloseListener()
+            {
                 @Override
-                public boolean onClose() {
+                public boolean onClose()
+                {
                     invalidateOptionsMenu();
                     return false;
                 }
             });
 
-            searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
+            searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener()
+            {
                 @Override
-                public boolean onQueryTextSubmit(String query) {
+                public boolean onQueryTextSubmit(String query)
+                {
                     return false;
                 }
 
                 @Override
-                public boolean onQueryTextChange(String newText) {
-                    filter = newText;
+                public boolean onQueryTextChange(String newText)
+                {
+                    mFilter = newText;
 
                     TabLayout groupsTabLayout = findViewById(R.id.groups);
                     TabLayout.Tab currentTab = groupsTabLayout.getTabAt(groupsTabLayout.getSelectedTabPosition());
 
                     updateLoyaltyCardList(
-                        newText,
+                        mFilter,
                         currentTab != null ? currentTab.getTag() : null
                     );
 
@@ -406,14 +471,13 @@ public class MainActivity extends AppCompatActivity implements GestureDetector.O
                 }
             });
         }
-
-        return super.onCreateOptionsMenu(menu);
+        return super.onCreateOptionsMenu(inputMenu);
     }
 
     @Override
-    public boolean onOptionsItemSelected(MenuItem item)
+    public boolean onOptionsItemSelected(MenuItem inputItem)
     {
-        int id = item.getItemId();
+        int id = inputItem.getItemId();
 
         if (id == R.id.action_manage_groups)
         {
@@ -422,14 +486,14 @@ public class MainActivity extends AppCompatActivity implements GestureDetector.O
             return true;
         }
 
-        if(id == R.id.action_import_export)
+        if (id == R.id.action_import_export)
         {
             Intent i = new Intent(getApplicationContext(), ImportExportActivity.class);
             startActivityForResult(i, Utils.MAIN_REQUEST);
             return true;
         }
 
-        if(id == R.id.action_settings)
+        if (id == R.id.action_settings)
         {
             Intent i = new Intent(getApplicationContext(), SettingsActivity.class);
             startActivityForResult(i, Utils.MAIN_REQUEST);
@@ -442,14 +506,14 @@ public class MainActivity extends AppCompatActivity implements GestureDetector.O
             return true;
         }
 
-        if(id == R.id.action_about)
+        if (id == R.id.action_about)
         {
             Intent i = new Intent(getApplicationContext(), AboutActivity.class);
             startActivityForResult(i, Utils.MAIN_REQUEST);
             return true;
         }
 
-        return super.onOptionsItemSelected(item);
+        return super.onOptionsItemSelected(inputItem);
     }
 
     protected static boolean isDarkModeEnabled(Context inputContext)
@@ -528,4 +592,79 @@ public class MainActivity extends AppCompatActivity implements GestureDetector.O
 
         return false;
     }
+
+    @Override
+    public void onRowLongClicked(int inputPosition)
+    {
+        enableActionMode(inputPosition);
+    }
+
+    private void enableActionMode(int inputPosition)
+    {
+        if (mCurrentActionMode == null)
+        {
+            mCurrentActionMode = startSupportActionMode(mCurrentActionModeCallback);
+        }
+        toggleSelection(inputPosition);
+    }
+
+    private void toggleSelection(int inputPosition)
+    {
+        mAdapter.toggleSelection(inputPosition);
+        int count = mAdapter.getSelectedItemCount();
+
+        if (count == 0) {
+            mCurrentActionMode.finish();
+        } else {
+            mCurrentActionMode.setTitle("Selected: " + count + " Cards");
+
+            MenuItem editItem = mCurrentActionMode.getMenu().findItem(R.id.action_edit);
+            if (count == 1) {
+                editItem.setVisible(true);
+                editItem.setEnabled(true);
+            } else {
+                editItem.setVisible(false);
+                editItem.setEnabled(false);
+            }
+
+            mCurrentActionMode.invalidate();
+        }
+    }
+
+    @Override
+    public void onIconClicked(int inputPosition)
+    {
+        if (mCurrentActionMode == null)
+        {
+            mCurrentActionMode = startSupportActionMode(mCurrentActionModeCallback);
+        }
+
+        toggleSelection(inputPosition);
+    }
+
+    @Override
+    public void onRowClicked(int inputPosition)
+    {
+
+        if (mAdapter.getSelectedItemCount() > 0)
+        {
+            enableActionMode(inputPosition);
+        }
+        else
+        {
+            Cursor selected = mAdapter.getCursor();
+            selected.moveToPosition(inputPosition);
+            LoyaltyCard loyaltyCard = LoyaltyCard.toLoyaltyCard(selected);
+
+            Intent i = new Intent(this, LoyaltyCardViewActivity.class);
+            i.setAction("");
+            final Bundle b = new Bundle();
+            b.putInt("id", loyaltyCard.id);
+            i.putExtras(b);
+
+            ShortcutHelper.updateShortcuts(MainActivity.this, loyaltyCard, i);
+
+            startActivityForResult(i, Utils.MAIN_REQUEST);
+        }
+    }
 }

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

@@ -132,7 +132,7 @@ public class ScanActivity extends AppCompatActivity {
     {
         super.onActivityResult(requestCode, resultCode, intent);
 
-        BarcodeValues barcodeValues = Utils.parseSetBarcodeActivityResult(requestCode, resultCode, intent);
+        BarcodeValues barcodeValues = Utils.parseSetBarcodeActivityResult(requestCode, resultCode, intent, this);
 
         if (!barcodeValues.isEmpty()) {
             Intent manualResult = new Intent();
@@ -154,4 +154,10 @@ public class ScanActivity extends AppCompatActivity {
         }
         startActivityForResult(i, Utils.SELECT_BARCODE_REQUEST);
     }
+
+    public void addFromImage(View view) {
+        Intent photoPickerIntent = new Intent(Intent.ACTION_PICK);
+        photoPickerIntent.setType("image/*");
+        startActivityForResult(photoPickerIntent, Utils.BARCODE_IMPORT_FROM_IMAGE_FILE);
+    }
 }

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

@@ -0,0 +1,25 @@
+package protect.card_locker;
+
+public class ThirdPartyInfo {
+    private final String mName;
+    private final String mUrl;
+    private final String mLicense;
+
+    public ThirdPartyInfo(String name, String url, String license) {
+        mName = name;
+        mUrl = url;
+        mLicense = license;
+    }
+
+    public String name() {
+        return mName;
+    }
+
+    public String url() {
+        return mUrl;
+    }
+
+    public String license() {
+        return mLicense;
+    }
+}

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

@@ -3,18 +3,27 @@ package protect.card_locker;
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
+import android.graphics.Bitmap;
 import android.graphics.Color;
+import android.provider.MediaStore;
 import android.util.Log;
+import android.widget.Toast;
 
+import com.google.zxing.BinaryBitmap;
+import com.google.zxing.LuminanceSource;
+import com.google.zxing.MultiFormatReader;
+import com.google.zxing.NotFoundException;
+import com.google.zxing.RGBLuminanceSource;
+import com.google.zxing.Result;
+import com.google.zxing.common.HybridBinarizer;
+
+import java.io.IOException;
 import java.math.BigDecimal;
 import java.text.NumberFormat;
-import java.text.ParseException;
 import java.util.Calendar;
 import java.util.Currency;
 import java.util.Date;
 import java.util.GregorianCalendar;
-import java.util.List;
-import java.util.Locale;
 
 import androidx.core.graphics.ColorUtils;
 
@@ -25,15 +34,26 @@ public class Utils {
     public static final int MAIN_REQUEST = 1;
     public static final int SELECT_BARCODE_REQUEST = 2;
     public static final int BARCODE_SCAN = 3;
+    public static final int BARCODE_IMPORT_FROM_IMAGE_FILE = 4;
 
     static final double LUMINANCE_MIDPOINT = 0.5;
 
     static public LetterBitmap generateIcon(Context context, String store, Integer backgroundColor) {
+        return generateIcon(context, store, backgroundColor, false);
+    }
+
+    static public LetterBitmap generateIcon(Context context, String store, Integer backgroundColor, boolean forShortcut) {
         if (store.length() == 0) {
             return null;
         }
 
-        int tileLetterFontSize = context.getResources().getDimensionPixelSize(R.dimen.tileLetterFontSize);
+        int tileLetterFontSize;
+        if (forShortcut) {
+            tileLetterFontSize = context.getResources().getDimensionPixelSize(R.dimen.tileLetterFontSizeForShortcut);
+        } else {
+            tileLetterFontSize = context.getResources().getDimensionPixelSize(R.dimen.tileLetterFontSize);
+        }
+
         int pixelSize = context.getResources().getDimensionPixelSize(R.dimen.cardThumbnailSize);
 
         if (backgroundColor == null) {
@@ -48,28 +68,75 @@ public class Utils {
         return ColorUtils.calculateLuminance(backgroundColor) > LUMINANCE_MIDPOINT;
     }
 
-    static public BarcodeValues parseSetBarcodeActivityResult(int requestCode, int resultCode, Intent intent) {
-        String contents = null;
-        String format = null;
+    static public BarcodeValues parseSetBarcodeActivityResult(int requestCode, int resultCode, Intent intent, Context context) {
+        String contents;
+        String format;
 
-        if (resultCode == Activity.RESULT_OK)
-        {
+        if (resultCode != Activity.RESULT_OK) {
+            return new BarcodeValues(null, null);
+        }
+
+        if (requestCode == Utils.BARCODE_IMPORT_FROM_IMAGE_FILE) {
+            Log.i(TAG, "Received image file with possible barcode");
+
+            Bitmap bitmap;
+            try {
+                bitmap = MediaStore.Images.Media.getBitmap(context.getContentResolver(), intent.getData());
+            } catch (IOException e) {
+                Log.e(TAG, "Error getting data from image file");
+                e.printStackTrace();
+                Toast.makeText(context, R.string.errorReadingImage, Toast.LENGTH_LONG).show();
+                return new BarcodeValues(null, null);
+            }
+
+            BarcodeValues barcodeFromBitmap = getBarcodeFromBitmap(bitmap);
+
+            if (barcodeFromBitmap.isEmpty()) {
+                Log.i(TAG, "No barcode found in image file");
+                Toast.makeText(context, R.string.noBarcodeFound, Toast.LENGTH_LONG).show();
+            }
+
+            Log.i(TAG, "Read barcode id: " + barcodeFromBitmap.content());
+            Log.i(TAG, "Read format: " + barcodeFromBitmap.format());
+
+            return barcodeFromBitmap;
+        }
+
+        if (requestCode == Utils.BARCODE_SCAN || requestCode == Utils.SELECT_BARCODE_REQUEST) {
             if (requestCode == Utils.BARCODE_SCAN) {
                 Log.i(TAG, "Received barcode information from camera");
             } else if (requestCode == Utils.SELECT_BARCODE_REQUEST) {
                 Log.i(TAG, "Received barcode information from typing it");
-            } else {
-                return new BarcodeValues(null, null);
             }
 
             contents = intent.getStringExtra(BarcodeSelectorActivity.BARCODE_CONTENTS);
             format = intent.getStringExtra(BarcodeSelectorActivity.BARCODE_FORMAT);
+
+            Log.i(TAG, "Read barcode id: " + contents);
+            Log.i(TAG, "Read format: " + format);
+
+            return new BarcodeValues(format, contents);
         }
 
-        Log.i(TAG, "Read barcode id: " + contents);
-        Log.i(TAG, "Read format: " + format);
+        throw new UnsupportedOperationException("Unknown request code for parseSetBarcodeActivityResult");
+    }
 
-        return new BarcodeValues(format, contents);
+    static public BarcodeValues getBarcodeFromBitmap(Bitmap bitmap) {
+        // In order to decode it, the Bitmap must first be converted into a pixel array...
+        int[] intArray = new int[bitmap.getWidth() * bitmap.getHeight()];
+        bitmap.getPixels(intArray, 0, bitmap.getWidth(), 0, 0, bitmap.getWidth(), bitmap.getHeight());
+
+        // ...and then turned into a binary bitmap from its luminance
+        LuminanceSource source = new RGBLuminanceSource(bitmap.getWidth(), bitmap.getHeight(), intArray);
+        BinaryBitmap binaryBitmap = new BinaryBitmap(new HybridBinarizer(source));
+
+        try {
+            Result barcodeResult = new MultiFormatReader().decode(binaryBitmap);
+
+            return new BarcodeValues(barcodeResult.getBarcodeFormat().name(), barcodeResult.getText());
+        } catch (NotFoundException e) {
+            return new BarcodeValues(null, null);
+        }
     }
 
     static public Boolean hasExpired(Date expiryDate) {

app/src/main/java/protect/card_locker/importexport/CSVHelpers.java

@@ -0,0 +1,93 @@
+package protect.card_locker.importexport;
+
+import org.apache.commons.csv.CSVRecord;
+
+import protect.card_locker.FormatException;
+
+public class CSVHelpers {
+    /**
+     * Extract a string from the items array. The index into the array
+     * is determined by looking up the index in the fields map using the
+     * "key" as the key. If no such key exists, defaultValue is returned
+     * if it is not null. Otherwise, a FormatException is thrown.
+     */
+    static String extractString(String key, CSVRecord record, String defaultValue)
+            throws FormatException
+    {
+        String toReturn = defaultValue;
+
+        if(record.isMapped(key))
+        {
+            toReturn = record.get(key);
+        }
+        else
+        {
+            if(defaultValue == null)
+            {
+                throw new FormatException("Field not used but expected: " + key);
+            }
+        }
+
+        return toReturn;
+    }
+
+    /**
+     * Extract an integer from the items array. The index into the array
+     * is determined by looking up the index in the fields map using the
+     * "key" as the key. If no such key exists, or the data is not a valid
+     * int, a FormatException is thrown.
+     */
+    static Integer extractInt(String key, CSVRecord record, boolean nullIsOk)
+            throws FormatException
+    {
+        if(record.isMapped(key) == false)
+        {
+            throw new FormatException("Field not used but expected: " + key);
+        }
+
+        String value = record.get(key);
+        if(value.isEmpty() && nullIsOk)
+        {
+            return null;
+        }
+
+        try
+        {
+            return Integer.parseInt(record.get(key));
+        }
+        catch(NumberFormatException e)
+        {
+            throw new FormatException("Failed to parse field: " + key, e);
+        }
+    }
+
+    /**
+     * Extract a long from the items array. The index into the array
+     * is determined by looking up the index in the fields map using the
+     * "key" as the key. If no such key exists, or the data is not a valid
+     * int, a FormatException is thrown.
+     */
+    static Long extractLong(String key, CSVRecord record, boolean nullIsOk)
+            throws FormatException
+    {
+        if(record.isMapped(key) == false)
+        {
+            throw new FormatException("Field not used but expected: " + key);
+        }
+
+        String value = record.get(key);
+        if(value.isEmpty() && nullIsOk)
+        {
+            return null;
+        }
+
+        try
+        {
+            return Long.parseLong(record.get(key));
+        }
+        catch(NumberFormatException e)
+        {
+            throw new FormatException("Failed to parse field: " + key, e);
+        }
+    }
+}

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

@@ -2,15 +2,19 @@ package protect.card_locker.importexport;
 
 import android.database.sqlite.SQLiteDatabase;
 
+import com.google.zxing.BarcodeFormat;
+
 import org.apache.commons.csv.CSVFormat;
 import org.apache.commons.csv.CSVParser;
 import org.apache.commons.csv.CSVRecord;
 
 import java.io.BufferedReader;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.StringReader;
 import java.math.BigDecimal;
+import java.nio.charset.StandardCharsets;
 import java.util.Currency;
 import java.util.Date;
 import java.util.List;
@@ -28,9 +32,9 @@ import protect.card_locker.Group;
  */
 public class CsvDatabaseImporter implements DatabaseImporter
 {
-    public void importData(DBHelper db, InputStreamReader input) throws IOException, FormatException, InterruptedException
+    public void importData(DBHelper db, InputStream input) throws IOException, FormatException, InterruptedException
     {
-        BufferedReader bufferedReader = new BufferedReader(input);
+        BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(input, StandardCharsets.UTF_8));
 
         bufferedReader.mark(100);
 
@@ -200,92 +204,6 @@ public class CsvDatabaseImporter implements DatabaseImporter
         }
     }
 
-    /**
-     * Extract a string from the items array. The index into the array
-     * is determined by looking up the index in the fields map using the
-     * "key" as the key. If no such key exists, defaultValue is returned
-     * if it is not null. Otherwise, a FormatException is thrown.
-     */
-    private String extractString(String key, CSVRecord record, String defaultValue)
-            throws FormatException
-    {
-        String toReturn = defaultValue;
-
-        if(record.isMapped(key))
-        {
-            toReturn = record.get(key);
-        }
-        else
-        {
-            if(defaultValue == null)
-            {
-                throw new FormatException("Field not used but expected: " + key);
-            }
-        }
-
-        return toReturn;
-    }
-
-    /**
-     * Extract an integer from the items array. The index into the array
-     * is determined by looking up the index in the fields map using the
-     * "key" as the key. If no such key exists, or the data is not a valid
-     * int, a FormatException is thrown.
-     */
-    private Integer extractInt(String key, CSVRecord record, boolean nullIsOk)
-            throws FormatException
-    {
-        if(record.isMapped(key) == false)
-        {
-            throw new FormatException("Field not used but expected: " + key);
-        }
-
-        String value = record.get(key);
-        if(value.isEmpty() && nullIsOk)
-        {
-            return null;
-        }
-
-        try
-        {
-            return Integer.parseInt(record.get(key));
-        }
-        catch(NumberFormatException e)
-        {
-            throw new FormatException("Failed to parse field: " + key, e);
-        }
-    }
-
-    /**
-     * Extract a long from the items array. The index into the array
-     * is determined by looking up the index in the fields map using the
-     * "key" as the key. If no such key exists, or the data is not a valid
-     * int, a FormatException is thrown.
-     */
-    private Long extractLong(String key, CSVRecord record, boolean nullIsOk)
-            throws FormatException
-    {
-        if(record.isMapped(key) == false)
-        {
-            throw new FormatException("Field not used but expected: " + key);
-        }
-
-        String value = record.get(key);
-        if(value.isEmpty() && nullIsOk)
-        {
-            return null;
-        }
-
-        try
-        {
-            return Long.parseLong(record.get(key));
-        }
-        catch(NumberFormatException e)
-        {
-            throw new FormatException("Failed to parse field: " + key, e);
-        }
-    }
-
     /**
      * Import a single loyalty card into the database using the given
      * session.
@@ -293,23 +211,23 @@ public class CsvDatabaseImporter implements DatabaseImporter
     private void importLoyaltyCard(SQLiteDatabase database, DBHelper helper, CSVRecord record)
             throws IOException, FormatException
     {
-        int id = extractInt(DBHelper.LoyaltyCardDbIds.ID, record, false);
+        int id = CSVHelpers.extractInt(DBHelper.LoyaltyCardDbIds.ID, record, false);
 
-        String store = extractString(DBHelper.LoyaltyCardDbIds.STORE, record, "");
+        String store = CSVHelpers.extractString(DBHelper.LoyaltyCardDbIds.STORE, record, "");
         if(store.isEmpty())
         {
             throw new FormatException("No store listed, but is required");
         }
 
-        String note = extractString(DBHelper.LoyaltyCardDbIds.NOTE, record, "");
+        String note = CSVHelpers.extractString(DBHelper.LoyaltyCardDbIds.NOTE, record, "");
         Date expiry = null;
         try {
-            expiry = new Date(extractLong(DBHelper.LoyaltyCardDbIds.EXPIRY, record, true));
+            expiry = new Date(CSVHelpers.extractLong(DBHelper.LoyaltyCardDbIds.EXPIRY, record, true));
         } catch (NullPointerException | FormatException e) { }
 
         BigDecimal balance;
         try {
-            balance = new BigDecimal(extractString(DBHelper.LoyaltyCardDbIds.BALANCE, record, null));
+            balance = new BigDecimal(CSVHelpers.extractString(DBHelper.LoyaltyCardDbIds.BALANCE, record, null));
         } catch (FormatException _e ) {
             // These fields did not exist in versions 1.8.1 and before
             // We catch this exception so we can still import old backups
@@ -317,35 +235,46 @@ public class CsvDatabaseImporter implements DatabaseImporter
         }
 
         Currency balanceType = null;
-        String unparsedBalanceType = extractString(DBHelper.LoyaltyCardDbIds.BALANCE_TYPE, record, "");
+        String unparsedBalanceType = CSVHelpers.extractString(DBHelper.LoyaltyCardDbIds.BALANCE_TYPE, record, "");
         if(!unparsedBalanceType.isEmpty()) {
             balanceType = Currency.getInstance(unparsedBalanceType);
         }
 
-        String cardId = extractString(DBHelper.LoyaltyCardDbIds.CARD_ID, record, "");
+        String cardId = CSVHelpers.extractString(DBHelper.LoyaltyCardDbIds.CARD_ID, record, "");
         if(cardId.isEmpty())
         {
             throw new FormatException("No card ID listed, but is required");
         }
 
-        String barcodeType = extractString(DBHelper.LoyaltyCardDbIds.BARCODE_TYPE, record, "");
+        String barcodeId = CSVHelpers.extractString(DBHelper.LoyaltyCardDbIds.BARCODE_ID, record, "");
+        if(barcodeId.isEmpty())
+        {
+            barcodeId = null;
+        }
+
+        BarcodeFormat barcodeType = null;
+        String unparsedBarcodeType = CSVHelpers.extractString(DBHelper.LoyaltyCardDbIds.BARCODE_TYPE, record, "");
+        if(!unparsedBarcodeType.isEmpty())
+        {
+            barcodeType = BarcodeFormat.valueOf(unparsedBarcodeType);
+        }
 
         Integer headerColor = null;
 
         if(record.isMapped(DBHelper.LoyaltyCardDbIds.HEADER_COLOR))
         {
-            headerColor = extractInt(DBHelper.LoyaltyCardDbIds.HEADER_COLOR, record, true);
+            headerColor = CSVHelpers.extractInt(DBHelper.LoyaltyCardDbIds.HEADER_COLOR, record, true);
         }
 
         int starStatus = 0;
         try {
-            starStatus = extractInt(DBHelper.LoyaltyCardDbIds.STAR_STATUS, record, false);
+            starStatus = CSVHelpers.extractInt(DBHelper.LoyaltyCardDbIds.STAR_STATUS, record, false);
         } catch (FormatException _e ) {
             // This field did not exist in versions 0.28 and before
             // We catch this exception so we can still import old backups
         }
         if (starStatus != 1) starStatus = 0;
-        helper.insertLoyaltyCard(database, id, store, note, expiry, balance, balanceType, cardId, barcodeType, headerColor, starStatus);
+        helper.insertLoyaltyCard(database, id, store, note, expiry, balance, balanceType, cardId, barcodeId, barcodeType, headerColor, starStatus);
     }
 
     /**
@@ -355,7 +284,7 @@ public class CsvDatabaseImporter implements DatabaseImporter
     private void importGroup(SQLiteDatabase database, DBHelper helper, CSVRecord record)
             throws IOException, FormatException
     {
-        String id = extractString(DBHelper.LoyaltyCardDbGroups.ID, record, null);
+        String id = CSVHelpers.extractString(DBHelper.LoyaltyCardDbGroups.ID, record, null);
 
         helper.insertGroup(database, id);
     }
@@ -367,8 +296,8 @@ public class CsvDatabaseImporter implements DatabaseImporter
     private void importCardGroupMapping(SQLiteDatabase database, DBHelper helper, CSVRecord record)
             throws IOException, FormatException
     {
-        Integer cardId = extractInt(DBHelper.LoyaltyCardDbIdsGroups.cardID, record, false);
-        String groupId = extractString(DBHelper.LoyaltyCardDbIdsGroups.groupID, record, null);
+        Integer cardId = CSVHelpers.extractInt(DBHelper.LoyaltyCardDbIdsGroups.cardID, record, false);
+        String groupId = CSVHelpers.extractString(DBHelper.LoyaltyCardDbIdsGroups.groupID, record, null);
 
         List<Group> cardGroups = helper.getLoyaltyCardGroups(cardId);
         cardGroups.add(helper.getGroup(groupId));

app/src/main/java/protect/card_locker/importexport/DatabaseImporter.java

@@ -3,7 +3,7 @@ package protect.card_locker.importexport;
 import org.json.JSONException;
 
 import java.io.IOException;
-import java.io.InputStreamReader;
+import java.io.InputStream;
 import java.text.ParseException;
 
 import protect.card_locker.DBHelper;
@@ -21,5 +21,5 @@ public interface DatabaseImporter
      * @throws IOException
      * @throws FormatException
      */
-    void importData(DBHelper db, InputStreamReader input) throws IOException, FormatException, InterruptedException, JSONException, ParseException;
+    void importData(DBHelper db, InputStream input) throws IOException, FormatException, InterruptedException, JSONException, ParseException;
 }

app/src/main/java/protect/card_locker/importexport/FidmeImporter.java

@@ -0,0 +1,135 @@
+package protect.card_locker.importexport;
+
+import android.database.sqlite.SQLiteDatabase;
+
+import com.google.zxing.BarcodeFormat;
+
+import org.apache.commons.csv.CSVFormat;
+import org.apache.commons.csv.CSVParser;
+import org.apache.commons.csv.CSVRecord;
+import org.json.JSONException;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.StringReader;
+import java.math.BigDecimal;
+import java.nio.charset.StandardCharsets;
+import java.text.ParseException;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
+
+import protect.card_locker.DBHelper;
+import protect.card_locker.FormatException;
+
+/**
+ * Class for importing a database from CSV (Comma Separate Values)
+ * formatted data.
+ *
+ * The database's loyalty cards are expected to appear in the CSV data.
+ * A header is expected for the each table showing the names of the columns.
+ */
+public class FidmeImporter implements DatabaseImporter
+{
+    public void importData(DBHelper db, InputStream input) throws IOException, FormatException, JSONException, ParseException {
+        // We actually retrieve a .zip file
+        ZipInputStream zipInputStream = new ZipInputStream(input);
+
+        StringBuilder loyaltyCards = new StringBuilder();
+        byte[] buffer = new byte[1024];
+        int read = 0;
+
+        ZipEntry zipEntry;
+
+        while ((zipEntry = zipInputStream.getNextEntry()) != null) {
+            if (zipEntry.getName().equals("loyalty_programs.csv")) {
+                while ((read = zipInputStream.read(buffer, 0, 1024)) >= 0) {
+                    loyaltyCards.append(new String(buffer, 0, read, StandardCharsets.UTF_8));
+                }
+            }
+        }
+
+        if (loyaltyCards.length() == 0) {
+            throw new FormatException("Couldn't find loyalty_programs.csv in zip file or it is empty");
+        }
+
+        SQLiteDatabase database = db.getWritableDatabase();
+        database.beginTransaction();
+
+        final CSVParser fidmeParser = new CSVParser(new StringReader(loyaltyCards.toString()), CSVFormat.RFC4180.withDelimiter(';').withHeader());
+
+        try {
+            for (CSVRecord record : fidmeParser) {
+                importLoyaltyCard(database, db, record);
+
+                if (Thread.currentThread().isInterrupted()) {
+                    throw new InterruptedException();
+                }
+            }
+        } catch (IllegalArgumentException | IllegalStateException | InterruptedException e) {
+            throw new FormatException("Issue parsing CSV data", e);
+        } finally {
+            fidmeParser.close();
+        }
+
+        database.setTransactionSuccessful();
+        database.endTransaction();
+        database.close();
+
+        zipInputStream.close();
+    }
+
+    /**
+     * Import a single loyalty card into the database using the given
+     * session.
+     */
+    private void importLoyaltyCard(SQLiteDatabase database, DBHelper helper, CSVRecord record)
+            throws IOException, FormatException
+    {
+        // A loyalty card export from Fidme contains the following fields:
+        // Retailer (store name)
+        // Program (program name)
+        // Added at (YYYY-MM-DD HH:MM:SS UTC)
+        // Reference (card ID)
+        // Firstname (card holder first name)
+        // Lastname (card holder last name)
+
+        // The store is called Retailer
+        String store = CSVHelpers.extractString("Retailer", record, "");
+
+        if (store.isEmpty())
+        {
+            throw new FormatException("No store listed, but is required");
+        }
+
+        // There seems to be no note field in the CSV? So let's combine other fields instead...
+        String program = CSVHelpers.extractString("Program", record, "");
+        String addedAt = CSVHelpers.extractString("Added At", record, "");
+        String firstName = CSVHelpers.extractString("Firstname", record, "");
+        String lastName = CSVHelpers.extractString("Lastname", record, "");
+
+        String combinedName = String.format("%s %s", firstName, lastName);
+
+        StringBuilder noteBuilder = new StringBuilder();
+        if (!program.isEmpty()) noteBuilder.append(program).append('\n');
+        if (!addedAt.isEmpty()) noteBuilder.append(addedAt).append('\n');
+        if (!combinedName.isEmpty()) noteBuilder.append(combinedName).append('\n');
+        String note = noteBuilder.toString();
+
+        // The ID is called reference
+        String cardId = CSVHelpers.extractString("Reference", record, "");
+        if(cardId.isEmpty())
+        {
+            throw new FormatException("No card ID listed, but is required");
+        }
+
+        // Sadly, Fidme exports don't contain the card type
+        // I guess they have an online DB of all the different companies and what type they use
+        // TODO: Hook this into our own loyalty card DB if we ever get one
+        BarcodeFormat barcodeType = null;
+
+        // No favourite data in the export either
+        int starStatus = 0;
+
+        helper.insertLoyaltyCard(database, store, note, null, BigDecimal.valueOf(0), null, cardId, null, barcodeType, null, starStatus);
+    }
+}

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

@@ -7,8 +7,6 @@ import java.io.OutputStreamWriter;
 
 import protect.card_locker.DBHelper;
 import protect.card_locker.DataFormat;
-import protect.card_locker.importexport.CsvDatabaseExporter;
-import protect.card_locker.importexport.DatabaseExporter;
 
 public class MultiFormatExporter
 {

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

@@ -5,14 +5,12 @@ import android.util.Log;
 import org.json.JSONException;
 
 import java.io.IOException;
-import java.io.InputStreamReader;
+import java.io.InputStream;
 import java.text.ParseException;
 
 import protect.card_locker.DBHelper;
 import protect.card_locker.DataFormat;
 import protect.card_locker.FormatException;
-import protect.card_locker.importexport.CsvDatabaseImporter;
-import protect.card_locker.importexport.DatabaseImporter;
 
 public class MultiFormatImporter
 {
@@ -29,7 +27,7 @@ public class MultiFormatImporter
      * false otherwise. If false, no data was written to
      * the database.
      */
-    public static boolean importData(DBHelper db, InputStreamReader input, DataFormat format)
+    public static boolean importData(DBHelper db, InputStream input, DataFormat format)
     {
         DatabaseImporter importer = null;
 
@@ -38,6 +36,9 @@ public class MultiFormatImporter
             case Catima:
                 importer = new CsvDatabaseImporter();
                 break;
+            case Fidme:
+                importer = new FidmeImporter();
+                break;
             case VoucherVault:
                 importer = new VoucherVaultImporter();
                 break;

app/src/main/java/protect/card_locker/importexport/VoucherVaultImporter.java

@@ -12,8 +12,10 @@ import org.json.JSONObject;
 
 import java.io.BufferedReader;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.math.BigDecimal;
+import java.nio.charset.StandardCharsets;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Currency;
@@ -32,8 +34,8 @@ import protect.card_locker.FormatException;
  */
 public class VoucherVaultImporter implements DatabaseImporter
 {
-    public void importData(DBHelper db, InputStreamReader input) throws IOException, FormatException, JSONException, ParseException {
-        BufferedReader bufferedReader = new BufferedReader(input);
+    public void importData(DBHelper db, InputStream input) throws IOException, FormatException, JSONException, ParseException {
+        BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(input, StandardCharsets.UTF_8));
 
         StringBuilder sb = new StringBuilder();
         String line;
@@ -69,21 +71,24 @@ public class VoucherVaultImporter implements DatabaseImporter
 
             String cardId = jsonCard.getString("code");
 
-            String barcodeType = null;
+            BarcodeFormat barcodeType = null;
 
             String codeTypeFromJSON = jsonCard.getString("codeType");
             switch (codeTypeFromJSON) {
                 case "CODE128":
-                    barcodeType = BarcodeFormat.CODE_128.name();
+                    barcodeType = BarcodeFormat.CODE_128;
                     break;
                 case "CODE39":
-                    barcodeType = BarcodeFormat.CODE_39.name();
+                    barcodeType = BarcodeFormat.CODE_39;
                     break;
                 case "EAN13":
-                    barcodeType = BarcodeFormat.EAN_13.name();
+                    barcodeType = BarcodeFormat.EAN_13;
+                    break;
+                case "PDF417":
+                    barcodeType = BarcodeFormat.PDF_417;
                     break;
                 case "QR":
-                    barcodeType = BarcodeFormat.QR_CODE.name();
+                    barcodeType = BarcodeFormat.QR_CODE;
                     break;
                 case "TEXT":
                     break;
@@ -120,7 +125,7 @@ public class VoucherVaultImporter implements DatabaseImporter
                     throw new FormatException("Unknown colour type foun: " + colorFromJSON);
             }
 
-            db.insertLoyaltyCard(store, "", expiry, balance, balanceType, cardId, barcodeType, headerColor, 0);
+            db.insertLoyaltyCard(store, "", expiry, balance, balanceType, cardId, null, barcodeType, headerColor, 0);
         }
 
         database.setTransactionSuccessful();

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

@@ -2,11 +2,11 @@ package protect.card_locker.preferences;
 
 import android.content.Context;
 import android.content.SharedPreferences;
-import androidx.preference.PreferenceManager;
+
 import androidx.annotation.IntegerRes;
 import androidx.annotation.StringRes;
 import androidx.appcompat.app.AppCompatDelegate;
-
+import androidx.preference.PreferenceManager;
 import protect.card_locker.R;
 
 public class Settings
@@ -61,24 +61,34 @@ public class Settings
         return AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM;
     }
 
-    public int getCardTitleListFontSize()
+    public double getFontSizeScale()
     {
-        return getInt(R.string.settings_key_card_title_list_font_size, R.integer.settings_card_title_list_font_size_sp);
+        return getInt(R.string.settings_key_max_font_size_scale, R.integer.settings_max_font_size_scale_pct) / 100.0;
     }
 
-    public int getCardNoteListFontSize()
+    public int getSmallFont()
     {
-        return getInt(R.string.settings_key_card_note_list_font_size, R.integer.settings_card_note_list_font_size_sp);
+        return 14;
     }
 
-    public int getCardTitleFontSize()
+    public int getMediumFont()
     {
-        return getInt(R.string.settings_key_card_title_font_size, R.integer.settings_card_title_font_size_sp);
+        return 28;
     }
 
-    public int getCardIdFontSize()
+    public int getLargeFont()
     {
-        return getInt(R.string.settings_key_card_id_font_size, R.integer.settings_card_id_font_size_sp);
+        return 40;
+    }
+
+    public int getFontSizeMin(int fontSize)
+    {
+        return (int) (Math.round(fontSize / 2.0) - 1);
+    }
+
+    public int getFontSizeMax(int fontSize)
+    {
+        return (int) Math.round(fontSize * getFontSizeScale());
     }
 
     public boolean useMaxBrightnessDisplayingBarcode()

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

@@ -1,15 +1,15 @@
 package protect.card_locker.preferences;
 
 import android.os.Bundle;
+import android.view.MenuItem;
+
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatDelegate;
 import androidx.fragment.app.DialogFragment;
 import androidx.fragment.app.FragmentActivity;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceFragmentCompat;
-import androidx.appcompat.app.ActionBar;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.app.AppCompatDelegate;
-import android.view.MenuItem;
-
 import nl.invissvenska.numberpickerpreference.NumberDialogPreference;
 import nl.invissvenska.numberpickerpreference.NumberPickerPreferenceDialogFragment;
 import protect.card_locker.R;
@@ -20,6 +20,7 @@ public class SettingsActivity extends AppCompatActivity
     protected void onCreate(Bundle savedInstanceState)
     {
         super.onCreate(savedInstanceState);
+        setContentView(R.layout.settings_activity);
 
         ActionBar actionBar = getSupportActionBar();
         if(actionBar != null)
@@ -29,7 +30,7 @@ public class SettingsActivity extends AppCompatActivity
 
         // Display the fragment as the main content.
         getSupportFragmentManager().beginTransaction()
-                .replace(android.R.id.content, new SettingsFragment())
+                .replace(R.id.settings_container, new SettingsFragment())
                 .commit();
     }
 
@@ -96,6 +97,7 @@ public class SettingsActivity extends AppCompatActivity
                                 dialogPreference.getKey(),
                                 dialogPreference.getMinValue(),
                                 dialogPreference.getMaxValue(),
+                                dialogPreference.getStepValue(),
                                 dialogPreference.getUnitText()
                         );
                 dialogFragment.setTargetFragment(this, 0);

app/src/main/res/animator/flip_left_in.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+   <objectAnimator
+        android:duration="0"
+        android:propertyName="alpha"
+        android:valueFrom="1.0"
+        android:valueTo="0.0" />
+
+    <objectAnimator
+        android:duration="@integer/full_rotation_duration"
+        android:interpolator="@android:interpolator/accelerate_decelerate"
+        android:propertyName="rotationY"
+        android:valueFrom="-180"
+        android:valueTo="0" />
+
+    <objectAnimator
+        android:duration="1"
+        android:propertyName="alpha"
+        android:startOffset="@integer/half_rotation_duration"
+        android:valueFrom="0.0"
+        android:valueTo="1.0" />
+</set>

app/src/main/res/animator/flip_left_out.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <objectAnimator
+        android:duration="@integer/full_rotation_duration"
+        android:interpolator="@android:interpolator/accelerate_decelerate"
+        android:propertyName="rotationY"
+        android:valueFrom="0"
+        android:valueTo="180" />
+
+   <objectAnimator
+        android:duration="1"
+        android:propertyName="alpha"
+        android:startOffset="@integer/half_rotation_duration"
+        android:valueFrom="1.0"
+        android:valueTo="0.0" />
+</set>

app/src/main/res/animator/flip_right_in.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+   <objectAnimator
+        android:duration="0"
+        android:propertyName="alpha"
+        android:valueFrom="1.0"
+        android:valueTo="0.0" />
+
+    <objectAnimator
+        android:duration="@integer/full_rotation_duration"
+        android:interpolator="@android:interpolator/accelerate_decelerate"
+        android:propertyName="rotationY"
+        android:valueFrom="180"
+        android:valueTo="0" />
+
+    <objectAnimator
+        android:duration="1"
+        android:propertyName="alpha"
+        android:startOffset="@integer/half_rotation_duration"
+        android:valueFrom="0.0"
+        android:valueTo="1.0" />
+</set>

app/src/main/res/animator/flip_right_out.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <objectAnimator
+        android:duration="@integer/full_rotation_duration"
+        android:interpolator="@android:interpolator/accelerate_decelerate"
+        android:propertyName="rotationY"
+        android:valueFrom="0"
+        android:valueTo="-180" />
+
+    <objectAnimator
+        android:duration="1"
+        android:propertyName="alpha"
+        android:startOffset="@integer/half_rotation_duration"
+        android:valueFrom="1.0"
+        android:valueTo="0.0" />
+</set>

app/src/main/res/drawable/ic_close.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FFFFFFFF"
+      android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
+</vector>

app/src/main/res/drawable/ic_copy.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FFFFFFFF"
+      android:pathData="M16,1L4,1c-1.1,0 -2,0.9 -2,2v14h2L4,3h12L16,1zM19,5L8,5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h11c1.1,0 2,-0.9 2,-2L21,7c0,-1.1 -0.9,-2 -2,-2zM19,21L8,21L8,7h11v14z"/>
+</vector>

app/src/main/res/drawable/ic_done.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="@color/colorPrimary"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FFFFFF"
+      android:pathData="M9,16.2L4.8,12l-1.4,1.4L9,19 21,7l-1.4,-1.4L9,16.2z"/>
+</vector>

app/src/main/res/drawable/ic_edit.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z"/>
+</vector>

app/src/main/res/drawable/ic_share.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M18,16.08c-0.76,0 -1.44,0.3 -1.96,0.77L8.91,12.7c0.05,-0.23 0.09,-0.46 0.09,-0.7s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81 1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.81C7.5,9.31 6.79,9 6,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.79,0 1.5,-0.31 2.04,-0.81l7.12,4.16c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92 1.61,0 2.92,-1.31 2.92,-2.92s-1.31,-2.92 -2.92,-2.92z"/>
+</vector>

app/src/main/res/drawable/list_divider.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@android:color/darker_gray"/>
+    <size android:height="1dp"/>
+</shape>

app/src/main/res/drawable/list_row.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@color/listItemHighlight" android:state_activated="true" />
+</selector>

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

@@ -26,7 +26,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="?attr/actionBarSize"
-        android:orientation="vertical">
+        android:orientation="vertical"
+        android:padding="10dp">
 
         <TextView
             android:id="@+id/aboutText"

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

@@ -55,6 +55,7 @@
                           android:labelFor="@+id/cardId"
                           android:text="@string/cardId" />
                 <EditText android:id="@+id/cardId"
+                          android:hint="AB1234"
                           android:importantForAutofill="no"
                           android:layout_width="fill_parent"
                           android:layout_height="wrap_content"

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

@@ -27,9 +27,11 @@
         android:text="@string/noMatchingGiftCards"
         android:visibility="gone"/>
 
-    <ListView
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/list"
-        android:visibility="gone"/>
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:scrollbars="vertical"
+        android:visibility="gone" />
+
 </RelativeLayout>

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

@@ -19,11 +19,25 @@
         app:zxing_viewfinder_laser="@color/zxing_custom_viewfinder_laser"
         app:zxing_viewfinder_mask="@color/zxing_custom_viewfinder_mask"/>
 
-    <Button
-        android:id="@+id/add_manually"
+    <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/addManually"
         android:layout_gravity="bottom|center_horizontal"
-        android:onClick="addManually"/>
+        android:gravity="center_horizontal"
+        android:orientation="vertical">
+
+        <Button
+            android:id="@+id/add_from_image"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:onClick="addFromImage"
+            android:text="@string/addFromImage" />
+
+        <Button
+            android:id="@+id/add_manually"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:onClick="addManually"
+            android:text="@string/addManually" />
+    </LinearLayout>
 </merge>

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

@@ -96,6 +96,30 @@
                     </com.google.android.material.textfield.TextInputLayout>
                 </LinearLayout>
 
+                <!-- Card ID -->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingHorizontal="@dimen/inputPadding"
+                    android:paddingTop="@dimen/inputPadding"
+                    android:orientation="horizontal">
+
+                    <com.google.android.material.textfield.TextInputLayout
+                        android:id="@+id/cardIdField"
+                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:hint="@string/cardId">
+
+                        <com.google.android.material.textfield.TextInputEditText
+                            android:id="@+id/cardIdView"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            />
+
+                    </com.google.android.material.textfield.TextInputLayout>
+                </LinearLayout>
+
                 <!-- Note -->
                 <LinearLayout
                     android:layout_width="match_parent"
@@ -212,7 +236,7 @@
                 android:id="@+id/barcodePart"
                 android:visibility="gone">
 
-                <!-- Card ID -->
+                <!-- Barcode ID -->
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -220,26 +244,26 @@
                     android:paddingTop="@dimen/inputPadding"
                     android:orientation="horizontal">
 
-                    <!-- Card ID -->
+                    <!-- Barcode ID -->
                     <com.google.android.material.textfield.TextInputLayout
-                        android:id="@+id/cardIdField"
-                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+                        android:id="@+id/barcodeIdView"
+                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="1.0"
-                        android:hint="@string/cardId"
-                        android:labelFor="@+id/cardIdView">
+                        android:hint="@string/barcodeId"
+                        android:labelFor="@+id/barcodeIdView">
 
-                        <com.google.android.material.textfield.TextInputEditText
-                            android:id="@+id/cardIdView"
+                        <AutoCompleteTextView
+                            android:id="@+id/barcodeIdField"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            />
+                            android:inputType="none"/>
 
                     </com.google.android.material.textfield.TextInputLayout>
                 </LinearLayout>
 
-                <!-- Barcode ID -->
+                <!-- Barcode type -->
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"

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

@@ -1,80 +1,118 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/row"
     android:orientation="horizontal"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:gravity="center_vertical"
-    android:baselineAligned="false"
+    android:layout_height="wrap_content"
+    android:layout_marginBottom="0.5dp"
+    android:background="@drawable/list_row"
+    android:clickable="true"
+    android:focusable="true"
     android:padding="@dimen/activity_margin">
 
-    <androidx.cardview.widget.CardView
-        android:layout_width="@dimen/cardThumbnailSize"
-        android:layout_height="@dimen/cardThumbnailSize"
-        android:layout_marginEnd="@dimen/activity_margin"
-        app:cardCornerRadius="4dp"
-        app:cardElevation="0dp">
-
-        <ImageView
-            android:id="@+id/thumbnail"
-            android:layout_width="@dimen/cardThumbnailSize"
-            android:layout_height="@dimen/cardThumbnailSize"
-            android:contentDescription="@string/thumbnailDescription"
-            android:src="@mipmap/ic_launcher"/>
-
-    </androidx.cardview.widget.CardView>
-
     <LinearLayout
-        android:orientation="vertical"
-        android:layout_width="0dip"
+        android:id="@+id/information_container"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_weight="1">
+        android:layout_marginStart="@dimen/activity_margin"
+        android:layout_marginLeft="@dimen/activity_margin"
+        android:layout_toEndOf="@+id/thumbnail_container"
+        android:layout_toRightOf="@+id/thumbnail_container"
+        android:layout_weight="1"
+        android:clickable="true"
+        android:focusable="true"
+        android:orientation="vertical"
+        app:layout_constraintBottom_toBottomOf="@+id/thumbnail_container"
+        app:layout_constraintEnd_toStartOf="@+id/star"
+        app:layout_constraintStart_toEndOf="@+id/thumbnail_container"
+        app:layout_constraintTop_toTopOf="@+id/thumbnail_container">
 
-        <LinearLayout
-            android:id="@+id/valueLayout"
+        <TextView
+            android:id="@+id/store"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:visibility="visible" >
-
-            <TextView
-                android:id="@+id/store"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textSize="@dimen/storeNameTextSize"
-                android:textStyle="bold"/>
-
-        </LinearLayout>
+            android:textSize="@dimen/storeNameTextSize"
+            android:textStyle="bold" />
 
         <TextView
             android:id="@+id/note"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:maxLines="1"
             android:ellipsize="end"
-            android:textSize="@dimen/noteTextSize"/>
+            android:lines="1"
+            android:textSize="@dimen/noteTextSize" />
 
         <TextView
             android:id="@+id/balance"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:maxLines="1"
             android:ellipsize="end"
-            android:textSize="@dimen/noteTextSize"/>
+            android:lines="1"
+            android:textSize="@dimen/noteTextSize" />
 
         <TextView
             android:id="@+id/expiry"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:maxLines="1"
             android:ellipsize="end"
-            android:textSize="@dimen/noteTextSize"/>
+            android:lines="1"
+            android:textSize="@dimen/noteTextSize" />
+
     </LinearLayout>
+
+    <androidx.cardview.widget.CardView
+        android:id="@+id/thumbnail_container"
+        android:layout_width="@dimen/cardThumbnailSize"
+        android:layout_height="@dimen/cardThumbnailSize"
+        app:cardCornerRadius="4dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <RelativeLayout
+            android:id="@+id/thumbnail_front"
+            android:layout_width="@dimen/cardThumbnailSize"
+            android:layout_height="@dimen/cardThumbnailSize">
+
+            <ImageView
+                android:id="@+id/thumbnail"
+                android:layout_width="@dimen/cardThumbnailSize"
+                android:layout_height="@dimen/cardThumbnailSize"
+                android:contentDescription="@string/thumbnailDescription"
+                android:src="@mipmap/ic_launcher" />
+
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:id="@+id/thumbnail_back"
+            android:layout_width="@dimen/cardThumbnailSize"
+            android:layout_height="@dimen/cardThumbnailSize">
+
+            <ImageView
+                android:layout_width="@dimen/cardThumbnailSize"
+                android:layout_height="@dimen/cardThumbnailSize"
+                android:layout_centerHorizontal="true"
+                android:contentDescription="@string/thumbnailDescription"
+                app:srcCompat="@drawable/ic_done" />
+
+        </RelativeLayout>
+    </androidx.cardview.widget.CardView>
+
     <ImageView
         android:id="@+id/star"
         android:layout_width="@dimen/cardThumbnailSize"
         android:layout_height="@dimen/cardThumbnailSize"
-        android:layout_marginStart="@dimen/activity_margin"
+        android:layout_marginLeft="@dimen/activity_margin"
         app:srcCompat="@drawable/ic_starred_white"
-        app:tint="@color/iconColor"
-        android:contentDescription="@string/starImage"/>
-</LinearLayout>
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentRight="true"
+        android:layout_centerVertical="true"
+        android:layout_marginStart="@dimen/activity_margin"
+        android:contentDescription="@string/starImage"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:tint="@android:color/black" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -135,6 +135,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
+        android:padding="20dp"
         android:visibility="gone"
         app:behavior_hideable="false"
         app:behavior_peekHeight="104dp"
@@ -155,46 +156,38 @@
         <TextView
             android:id="@+id/noteView"
             android:layout_width="match_parent"
-            android:layout_height="80dp"
+            android:layout_height="wrap_content"
             android:background="@color/inputBackground"
             android:gravity="center"
             android:padding="20dp"
-            app:autoSizeMaxTextSize="@dimen/singleCardNoteTextSizeMax"
-            app:autoSizeMinTextSize="@dimen/singleCardNoteTextSizeMin"
-            app:autoSizeTextType="uniform" />
+            android:textSize="@dimen/singleCardNoteTextSizeMin" />
 
         <TextView
             android:id="@+id/groupsView"
             android:layout_width="match_parent"
-            android:layout_height="80dp"
+            android:layout_height="wrap_content"
             android:background="@color/inputBackground"
             android:gravity="center"
             android:padding="20dp"
-            app:autoSizeMaxTextSize="@dimen/singleCardNoteTextSizeMax"
-            app:autoSizeMinTextSize="@dimen/singleCardNoteTextSizeMin"
-            app:autoSizeTextType="uniform" />
+            android:textSize="@dimen/singleCardNoteTextSizeMin" />
 
         <TextView
             android:id="@+id/balanceView"
             android:layout_width="match_parent"
-            android:layout_height="80dp"
+            android:layout_height="wrap_content"
             android:background="@color/inputBackground"
             android:gravity="center"
             android:padding="20dp"
-            app:autoSizeMaxTextSize="@dimen/singleCardNoteTextSizeMax"
-            app:autoSizeMinTextSize="@dimen/singleCardNoteTextSizeMin"
-            app:autoSizeTextType="uniform" />
+            android:textSize="@dimen/singleCardNoteTextSizeMin" />
 
         <TextView
             android:id="@+id/expiryView"
             android:layout_width="match_parent"
-            android:layout_height="80dp"
+            android:layout_height="wrap_content"
             android:background="@color/inputBackground"
             android:gravity="center"
             android:padding="20dp"
-            app:autoSizeMaxTextSize="@dimen/singleCardNoteTextSizeMax"
-            app:autoSizeMinTextSize="@dimen/singleCardNoteTextSizeMin"
-            app:autoSizeTextType="uniform" />
+            android:textSize="@dimen/singleCardNoteTextSizeMin" />
     </LinearLayout>
 
     <com.google.android.material.appbar.AppBarLayout

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

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <androidx.fragment.app.FragmentContainerView
+        android:id="@+id/settings_container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+</LinearLayout>

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

@@ -1,4 +1,3 @@
 <?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>
 </menu>

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

@@ -3,11 +3,24 @@
       xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <item
-        android:id="@+id/action_clipboard"
+        android:id="@+id/action_copy_to_clipboard"
         android:title="@string/copy_to_clipboard"
+        android:icon="@drawable/ic_copy"
+        android:titleCondensed="@string/copy_to_clipboard"
         app:showAsAction="always"/>
+
     <item
         android:id="@+id/action_share"
         android:title="@string/share"
+        android:icon="@drawable/ic_share"
+        android:titleCondensed="@string/share"
         app:showAsAction="always"/>
+
+    <item
+        android:id="@+id/action_edit"
+        android:icon="@drawable/ic_edit"
+        android:title="@string/editCardTitle"
+        android:titleCondensed="@string/editCardTitle"
+        app:showAsAction="always"/>
+
 </menu>

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

@@ -48,7 +48,6 @@
     <string name="about_title_fmt">O aplikaci <xliff:g id="app_name">%s</xliff:g></string>
     <string name="debug_version_fmt">Verze: <xliff:g id="version">%s</xliff:g></string>
     <string name="app_revision_fmt">Revizní informace: <xliff:g id="app_revision_url">%s</xliff:g></string>
-    <string name="app_libraries"><xliff:g id="app_name">%s</xliff:g> používá tyto knihovny třetích stran: <xliff:g id="app_libraries_list">%s</xliff:g></string>
     <string name="selectBarcodeTitle">Vyberte čárový kód</string>
     <string name="copy_to_clipboard_toast">ID karty zkopírováno do schránky</string>
 

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

@@ -1,17 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="action_search">Suche</string>
-    <string name="action_add">Neu</string>
-    <string name="noGiftCards">Klicken Sie auf die Schaltfläche + (plus), um zuerst eine Karte hinzuzufügen.
-\n
-\nCatima trägt Ihre Karten auf dem Gerät, so dass sie immer in Reichweite sind.</string>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" xmlns:tools="http://schemas.android.com/tools">
+    <string name="action_search">Suchen</string>
+    <string name="action_add">Hinzufügen</string>
+    <string name="noGiftCards">Klicken Sie auf das Pluszeichen +, um eine Karte hinzuzufügen, oder importieren Sie zunächst einige aus dem ⋮ Menü.</string>
     <string name="noMatchingGiftCards">Nichts gefunden. Versuchen Sie, Ihre Suche zu ändern.</string>
-    <string name="storeName">Geschäft</string>
+    <string name="storeName">Name</string>
     <string name="note">Notiz</string>
     <string name="cardId">Kartennummer</string>
     <string name="cancel">Abbrechen</string>
     <string name="save">Speichern</string>
-    <string name="editCard">Karte bearbeiten</string>
     <string name="edit">Bearbeiten</string>
     <string name="delete">Löschen</string>
     <string name="confirm">Bestätigen</string>
@@ -20,17 +17,17 @@
     <string name="star">Zu den Favoriten hinzufügen</string>
     <string name="unstar">Aus der Favoritenliste entfernen</string>
     <string name="deleteTitle">Karte entfernen</string>
-    <string name="deleteConfirmation">Bitte bestätigen Sie, dass diese Karte gelöscht werden soll.</string>
-    <string name="ok">Ok</string>
-    <string name="copy_to_clipboard">Kopiere die Nummer in die Zwischenablage</string>
-    <string name="sendLabel">Senden…</string>
+    <string name="deleteConfirmation">Diese Karte löschen\?</string>
+    <string name="ok">OK</string>
+    <string name="copy_to_clipboard">Nummer in die Zwischenablage kopieren</string>
+    <string name="sendLabel">Senden …</string>
     <string name="editCardTitle">Kundenkarte bearbeiten</string>
     <string name="addCardTitle">Neue Kundenkarte</string>
     <string name="scanCardBarcode">Strichcode scannen</string>
     <string name="cardShortcut">Shortcut zu einer Karte</string>
     <string name="noCardsMessage">Fügen Sie zuerst eine Karte hinzu</string>
     <string name="barcodeImageDescription">Bild des Strichcodes</string>
-    <string name="noStoreError">Kein Geschäft angegeben</string>
+    <string name="noStoreError">Kein Name eingegeben</string>
     <string name="noCardIdError">Keine Kartennummer angegeben</string>
     <string name="noCardExistsError">Karte konnte nicht gefunden werden</string>
     <string name="importExport">Import/Export</string>
@@ -48,25 +45,19 @@
     <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 Anwendung verwenden</string>
+    <string name="importOptionApplicationTitle">Andere Anwendung verwenden</string>
     <string name="importOptionApplicationExplanation">Verwenden Sie eine beliebige Anwendung oder Ihren bevorzugten Dateiverwaltungsprogramm, um eine Datei zu öffnen.</string>
-    <string name="importOptionApplicationButton">Externe Anwendung nutzen</string>
+    <string name="importOptionApplicationButton">Andere Anwendung verwenden</string>
     <string name="about">Über</string>
     <string name="app_license">Freie Software, lizensiert unter der GPLv3+.</string>
     <string name="about_title_fmt">Über <xliff:g id="app_name">%s</xliff:g></string>
     <string name="debug_version_fmt">Version: <xliff:g id="version">%s</xliff:g></string>
     <string name="app_revision_fmt">Informationen zu dieser Version: <xliff:g id="app_revision_url">%s</xliff:g></string>
-    <string name="app_libraries"><xliff:g id="app_name">%s</xliff:g> benutzt die folgenden Fremdbibliotheken: <xliff:g id="app_libraries_list">%s</xliff:g></string>
-    <string name="app_resources"><xliff:g id="app_name">%s</xliff:g> verwendet folgenden Dritt-Ressourcen: <xliff:g id="app_resources_list">%s</xliff:g></string>
     <string name="selectBarcodeTitle">Strichcode auswählen</string>
     <string name="copy_to_clipboard_toast">Nummer in die Zwischenablage kopiert</string>
     <string name="thumbnailDescription">Vorschaubild für die Karte</string>
     <string name="settings">Einstellungen</string>
     <string name="settings_category_title_ui">Benutzeroberfläche</string>
-    <string name="settings_card_title_list_font_size">Schriftgröße des Kartentitels (Listenmodus)</string>
-    <string name="settings_card_note_list_font_size">Schriftgröße der Kartennotiz (Listenmodus)</string>
-    <string name="settings_card_title_font_size">Schriftgröße des Kartentitels (Vorschau)</string>
-    <string name="settings_card_id_font_size">Schriftgröße der Kartennummer</string>
     <string name="settings_display_barcode_max_brightness">Helligkeit bei Strichcode Ansicht erhöhen</string>
     <string name="settings_lock_barcode_orientation">Strichcodeausrichtung sperren</string>
     <string name="exportSuccessful">Kartendaten exportiert</string>
@@ -76,51 +67,83 @@
     <string name="settings_light_theme">Hell</string>
     <string name="settings_system_theme">System</string>
     <string name="settings_theme">Design</string>
-    <string name="enterBarcodeInstructions">Geben Sie die Karten-ID ein und wählen Sie das Bild aus, das den Strichcode darstellt, den Sie verwenden möchten, oder wählen Sie „Diese Karte hat keinen Strichcode“, um keinen Strichcode zu verwenden.</string>
-    <string name="app_copyright_old">Basiert auf Loyalty Card Keychain, Copyright 2016–2020 Branden Archer.</string>
+    <string name="enterBarcodeInstructions">Geben Sie die Karten-ID ein und wählen Sie unten entweder den Strichcodetyp oder „Diese Karte hat keinen Strichcode“.</string>
+    <string name="app_copyright_old">Basierend auf Loyalty Card Keychain
+\nCopyright © 2016-2020 Branden Archer.</string>
     <string name="exportOptionExplanation">Die Daten werden an einen Ort Ihrer Wahl geschrieben.</string>
     <string name="failedParsingImportUriError">Der Import-URI konnte nicht analysiert werden</string>
     <string name="share">Teilen</string>
     <string name="barcodeNoBarcode">Diese Karte hat keinen Strichcode</string>
     <string name="barcodeType">Strichcode-Typ</string>
     <string name="starImage">Favoritenstern</string>
-    <string name="deleteConfirmationGroup">Bitte bestätigen Sie, dass Sie diese Gruppe löschen möchten</string>
+    <string name="deleteConfirmationGroup">Gruppe löschen\?</string>
     <string name="all">Alle</string>
-    <string name="noGroups">Klicken Sie auf die Schaltfläche + (plus), um zuerst Gruppen hinzuzufügen.
-\n
-\nGruppen machen es einfacher, Dinge zu finden.</string>
+    <string name="noGroups">Klicken Sie auf das Pluszeichen +, um zunächst Gruppen zur Kategorisierung hinzuzufügen.</string>
     <string name="groups">Gruppen</string>
     <string name="enter_group_name">Geben Sie den Gruppennamen ein</string>
-    <string name="leaveWithoutSaveConfirmation">Sind Sie sicher, dass Sie diesen Bildschirm verlassen wollen\? Vorgenommene Änderungen werden nicht gespeichert.</string>
-    <string name="leaveWithoutSaveTitle">Beenden ohne zu speichern</string>
-    <string name="failedOpeningFileManager">Fehler beim Öffnen eines Dateiverwaltungsprogrammes. Stellen Sie sicher, dass eine installiert ist.</string>
+    <string name="leaveWithoutSaveConfirmation">Beenden ohne zu speichern\?</string>
+    <string name="leaveWithoutSaveTitle">Beenden</string>
+    <string name="failedOpeningFileManager">Installieren Sie zunächst ein Dateiverwaltungsprogramm.</string>
     <string name="noBarcode">Kein Strichcode</string>
     <string name="addManually">Die Karten-ID manuell eingeben</string>
-    <string name="moveDown">In der Liste nach unten verschieben</string>
-    <string name="moveUp">In der Liste nach oben verschieben</string>
+    <string name="moveDown">Nach unten verschieben</string>
+    <string name="moveUp">Nach oben verschieben</string>
     <plurals name="groupCardCount">
-        <item quantity="one"><xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%d</xliff:g> Karte</item>
-        <item quantity="other"><xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%d</xliff:g> Karten</item>
+        <item quantity="one"><xliff:g>%d</xliff:g> Karte</item>
+        <item quantity="other"><xliff:g>%d</xliff:g> Karten</item>
     </plurals>
-    <string name="groupsList">Gruppen: <xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%s</xliff:g></string>
+    <string name="groupsList">Gruppen: <xliff:g>%s</xliff:g></string>
     <string name="app_loyalty_card_keychain">Loyalty Card Keychain</string>
-    <string name="chooseImportType">Aus welcher App Daten importieren\?</string>
-    <string name="parsingBalanceFailed"><xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%s</xliff:g> scheint kein gültiges Guthaben zu sein.</string>
+    <string name="chooseImportType">Daten importieren aus\?</string>
+    <string name="parsingBalanceFailed"><xliff:g>%s</xliff:g> scheint kein gültiges Guthaben zu sein.</string>
     <string name="points">Punkte</string>
     <string name="currency">Währung</string>
     <string name="balance">Guthaben</string>
-    <string name="moveBarcodeToCenterOfScreen">Barcode auf dem Bildschirm zentrieren</string>
-    <string name="moveBarcodeToTopOfScreen">Barcode auf dem Bildschirm nach oben schieben</string>
+    <string name="moveBarcodeToCenterOfScreen">Strichcode auf dem Bildschirm zentrieren</string>
+    <string name="moveBarcodeToTopOfScreen">Strichcode auf dem Bildschirm nach oben schieben</string>
     <string name="chooseExpiryDate">Ablaufdatum wählen</string>
     <string name="never">Nie</string>
     <string name="expiryDate">Ablaufdatum</string>
-    <string name="editBarcode">Barcode bearbeiten</string>
-    <string name="barcode">Barcode</string>
+    <string name="editBarcode">Strichcode bearbeiten</string>
+    <string name="barcode">Strichcode</string>
     <string name="card">Karte</string>
-    <string name="balancePoints"><xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%s</xliff:g> Punkte</string>
-    <string name="balanceSentence">Guthaben: <xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%s</xliff:g></string>
-    <string name="expiryStateSentenceExpired">Abgelaufen: <xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%s</xliff:g></string>
-    <string name="expiryStateSentence">Läuft ab: <xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%s</xliff:g></string>
-    <string name="settings_disable_lockscreen_while_viewing_card">Sperrbildschirm deaktivieren während eine Karte angesehen wird</string>
-    <string name="settings_keep_screen_on">Bildschirm anlassen während eine Karte angesehen wird</string>
-</resources>
+    <string name="balancePoints"><xliff:g>%s</xliff:g> Punkte</string>
+    <string name="balanceSentence">Guthaben: <xliff:g>%s</xliff:g></string>
+    <string name="expiryStateSentenceExpired">Abgelaufen: <xliff:g>%s</xliff:g></string>
+    <string name="expiryStateSentence">Läuft ab: <xliff:g>%s</xliff:g></string>
+    <string name="settings_disable_lockscreen_while_viewing_card">Sperrbildschirm verhindern</string>
+    <string name="settings_keep_screen_on">Bildschirm eingeschaltet halten</string>
+    <string name="privacy_policy_popup_text">Hinweis zum Datenschutz (oft gefordert):
+\n
+\nKEINE DATEN WERDEN GESAMMELT, was jeder bestätigen kann, da unsere Anwendung eine freie Software ist.</string>
+    <string name="accept">Annehmen</string>
+    <string name="privacy_policy">Datenschutzrichtlinie</string>
+    <string name="importVoucherVaultMessage">Suchen Sie eine Datei, die wahrscheinlich <i>vouchervault.json</i> heißt, um sie zu importieren.
+\nOder erstellen Sie sie, indem Sie zuerst in Voucher Vault auf Export drücken.</string>
+    <string name="importVoucherVault">Aus Voucher Vault importieren</string>
+    <string name="importLoyaltyCardKeychainMessage">Suchen Sie eine Datei, die höchstwahrscheinlich <i>LoyaltyCardKeychain.csv</i> heißt, um sie zu importieren.
+\nOder erstellen Sie sie über das Menü Import/Export in Loyalty Card Keychain, indem Sie zuerst auf Export drücken.</string>
+    <string name="importLoyaltyCardKeychain">Aus Loyalty Card Keychain importieren</string>
+    <string name="importFidmeMessage">Suchen Sie eine Datei, die wahrscheinlich <i>fidme-export-request-xxxxxx.zip</i> heißt, um sie zu importieren, und wählen Sie anschließend die Strichcodetypen manuell aus.
+\nOder erstellen Sie sie aus Ihrem FidMe-Profil, indem Sie Datenschutz wählen und dann zuerst auf Extrahiere meine Daten drücken.</string>
+    <string name="importFidme">Aus FidMe importieren</string>
+    <string name="importCatimaMessage">Suchen Sie eine Datei, die wahrscheinlich <i>Catima.csv</i> heißt, um sie zu importieren.
+\nOder erstellen Sie sie aus dem Import/Export-Menü einer anderen Catima-Anwendung, indem Sie dort zuerst Export drücken.</string>
+    <string name="importCatima">Aus Catima importieren</string>
+    <string name="setBarcodeId">Strichcodewert setzen</string>
+    <string name="sameAsCardId">Gleich wie Karten-ID</string>
+    <string name="barcodeId">Strichcodewert</string>
+    <string name="errorReadingImage">Das Bild konnte nicht gelesen werden</string>
+    <string name="noBarcodeFound">Kein Strichcode gefunden</string>
+    <string name="addFromImage">Bild aus der Galerie auswählen</string>
+    <string name="settings_max_font_size_scale">Max. Schriftgröße</string>
+    <string name="unsupportedBarcodeType">Dieser Strichcodetyp kann noch nicht angezeigt werden. Er wird möglicherweise in einer neueren Version der Anwendung unterstützt.</string>
+    <string name="wrongValueForBarcodeType">Der Wert ist für den gewählten Strichcodetyp nicht gültig</string>
+    <string name="app_resources">Freie Ressourcen von Drittanbietern: <xliff:g id="app_resources_list">%s</xliff:g></string>
+    <string name="app_libraries">Freie Bibliotheken von Drittanbietern: <xliff:g id="app_libraries_list">%s</xliff:g></string>
+    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Copyright © 2019–<xliff:g>%d</xliff:g> Sylvia van Os.</string>
+    <string name="intent_import_card_from_url_share_multiple_text">Ich möchte Karten mit dir teilen</string>
+    <string name="copy_to_clipboard_multiple_toast">Kartennummern in die Zwischenablage kopiert</string>
+    <string name="card_ids_copied">Kartennummer(n) kopiert</string>
+    <string name="card_selected">"Ausgewählt: "</string>
+</resources>

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

@@ -7,7 +7,6 @@
     <string name="cardId">Κωδικός Κάρτας</string>
     <string name="cancel">Άκυρο</string>
     <string name="save">Αποθήκευση</string>
-    <string name="editCard">Επεξεργασία Κάρτας</string>
     <string name="edit">Επεξεργασία</string>
     <string name="delete">Διαγραφή</string>
     <string name="confirm">Επιβεβαίωση</string>
@@ -50,18 +49,13 @@
     <string name="about_title_fmt">Σχετικά με <xliff:g id="app_name">%s</xliff:g></string>
     <string name="debug_version_fmt">Έκδοση: <xliff:g id="version">%s</xliff:g></string>
     <string name="app_revision_fmt">Πληροφορίες Αναθεώρησης: <xliff:g id="app_revision_url">%s</xliff:g></string>
-    <string name="app_libraries">Το <xliff:g id="app_name">%s</xliff:g> χρησιμοποιεί τις ακόλουθες βιβλιοθήκες τρίτων: <xliff:g id="app_libraries_list">%s</xliff:g></string>
-    <string name="app_resources">Το <xliff:g id="app_name">%s</xliff:g> χρησιμοποιεί τους παρακάτω πόρους τρίτων: <xliff:g id="app_resources_list">%s</xliff:g></string>
     <string name="selectBarcodeTitle">Επιλέξτε Barcode</string>
     <string name="copy_to_clipboard_toast">Ο κωδικός της κάρτας αντιγράφτηκε στο πρόχειρο</string>
     <string name="thumbnailDescription">Μικρογραφία κάρτας</string>
     <string name="settings">Ρυθμίσεις</string>
     <string name="settings_category_title_ui">Διεπαφή χρήστη</string>
-    <string name="settings_card_title_list_font_size">Μέγεθος κειμένου λίστας καρτών</string>
-    <string name="settings_card_note_list_font_size">Μέγεθος κειμένου λίστας σημειώσεων καρτών</string>
-    <string name="settings_card_title_font_size">Μέγεθος κειμένου τίτλου κάρτας</string>
-    <string name="settings_card_id_font_size">Μέγεθος κειμένου κωδικού κάρτας</string>
     <string name="settings_dark_theme">Σκοτεινό</string>
     <string name="settings_light_theme">Φωτεινό</string>
     <string name="settings_system_theme">Σύστημα</string>
+    <string name="barcode">Γραμμικός κώδικας</string>
 </resources>

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

@@ -1,4 +1,4 @@
-<resources
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-
-    </resources>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="barcode">Código de barras</string>
+</resources>

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

@@ -1,22 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" xmlns:tools="http://schemas.android.com/tools">
     <string name="action_add">Añadir</string>
-    <string name="noGiftCards">Pulse el botón «+» para añadir una nueva tarjeta.
-\n
-\nCatima guarda sus tarjetas en el dispositivo, para que estén siempre a su alcance.</string>
-    <string name="storeName">Tienda</string>
+    <string name="noGiftCards">Pulse el botón «+» para añadir una tarjeta, o importe algunas del menú ⋮.</string>
+    <string name="storeName">Nombre</string>
     <string name="note">Nota</string>
     <string name="cardId">Id. de tarjeta</string>
     <string name="cancel">Cancelar</string>
     <string name="save">Guardar</string>
-    <string name="editCard">Editar tarjeta</string>
     <string name="edit">Editar</string>
     <string name="delete">Eliminar</string>
     <string name="confirm">Confirmar</string>
-    <string name="lockScreen">Bloquear rotación</string>
-    <string name="unlockScreen">Desbloquear rotación</string>
+    <string name="lockScreen">Bloquear giro</string>
+    <string name="unlockScreen">Desbloquear giro</string>
     <string name="deleteTitle">Eliminar tarjeta</string>
-    <string name="deleteConfirmation">Por favor, confirme que quiere eliminar esta tarjeta.</string>
+    <string name="deleteConfirmation">¿Quiere eliminar esta tarjeta\?</string>
     <string name="ok">Aceptar</string>
     <string name="copy_to_clipboard">Copiar id. en portapapeles</string>
     <string name="sendLabel">Enviar…</string>
@@ -26,7 +23,7 @@
     <string name="cardShortcut">Atajo de tarjeta</string>
     <string name="noCardsMessage">Añada una tarjeta primero</string>
     <string name="barcodeImageDescription">Imagen del código de barras de la tarjeta</string>
-    <string name="noStoreError">Establecimiento no especificado</string>
+    <string name="noStoreError">No se proporcionó ningún nombre</string>
     <string name="noCardIdError">Id. de tarjeta no especificado</string>
     <string name="noCardExistsError">No se ha podido encontrar la tarjeta</string>
     <string name="importExport">Importar/exportar</string>
@@ -44,19 +41,15 @@
     <string name="importOptionFilesystemTitle">Importar desde el sistema de archivos</string>
     <string name="importOptionFilesystemExplanation">Elegir un archivo concreto del sistema de archivos.</string>
     <string name="importOptionFilesystemButton">Desde el sistema de archivos</string>
-    <string name="importOptionApplicationTitle">Utilizar aplicación externa</string>
+    <string name="importOptionApplicationTitle">Utilizar otra aplicación</string>
     <string name="importOptionApplicationExplanation">Use una aplicación o su gestor de archivos favoritos para abrir un archivo.</string>
-    <string name="importOptionApplicationButton">Utilizar aplicación externa</string>
+    <string name="importOptionApplicationButton">Utilizar otra aplicación</string>
     <string name="about">Acerca de</string>
-    <string name="app_license">Software libre con copyleft, disponible bajo la licencia GPLv3+.</string>
+    <string name="app_license">Programa libre con «copyleft», disponible en virtud de la licencia GPLv3+.</string>
     <string name="about_title_fmt">Acerca de <xliff:g id="app_name">%s</xliff:g></string>
     <string name="debug_version_fmt">Versión: <xliff:g id="version">%s</xliff:g></string>
     <string name="settings">Configuración</string>
     <string name="settings_category_title_ui">Interfaz de usuario</string>
-    <string name="settings_card_title_list_font_size">Tamaño de fuente del título de la tarjeta (modo lista)</string>
-    <string name="settings_card_note_list_font_size">Tamaño de fuente de las notas de la tarjeta (modo lista)</string>
-    <string name="settings_card_title_font_size">Tamaño de fuente del título de la tarjeta (vista previa)</string>
-    <string name="settings_card_id_font_size">Tamaño de la letra para el ID de la tarjeta</string>
     <string name="settings_display_barcode_max_brightness">Iluminar vista del código de barras</string>
     <string name="exportSuccessful">Datos de las tarjetas exportados</string>
     <string name="importSuccessful">Datos de las tarjetas importados</string>
@@ -67,7 +60,8 @@
     <string name="settings_system_theme">Sistema</string>
     <string name="settings_theme">Tema</string>
     <string name="enterBarcodeInstructions">Introduzca el identificador de tarjeta y seleccione la imagen que represente el código de barras que se utilizará, o bien, elija «Esta tarjeta no tiene código de barras» para no utilizar ninguno.</string>
-    <string name="app_copyright_old">Basado en Loyalty Card Keychain, derechos de autor 2016–2020 de Branden Archer.</string>
+    <string name="app_copyright_old">Basado en Loyalty Card Keychain
+\nderechos de autor © 2016-2020 de Branden Archer.</string>
     <string name="exportOptionExplanation">Los datos se guardarán en la ubicación que elija.</string>
     <string name="failedParsingImportUriError">No se pudo procesar el URI de importación</string>
     <string name="share">Compartir</string>
@@ -75,33 +69,29 @@
     <string name="barcodeType">Tipo de código de barras</string>
     <string name="noMatchingGiftCards">No se ha encontrado nada. Pruebe a modificar su búsqueda.</string>
     <string name="action_search">Buscar</string>
-    <string name="app_libraries"><xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" id="app_name">%s</xliff:g> usa las siguientes librerías de terceros: <xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" id="app_libraries_list">%s</xliff:g></string>
-    <string name="app_revision_fmt">Información de la revisión: <xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" id="app_revision_url">%s</xliff:g></string>
-    <string name="noGroups">Pulse el botón «+» para añadir grupos.
-\n
-\nLos grupos permiten encontrar cosas fácilmente.</string>
+    <string name="app_revision_fmt">Información de la revisión: <xliff:g id="app_revision_url">%s</xliff:g></string>
+    <string name="noGroups">Primero pulse en el botón «+» para añadir grupos de categorización.</string>
     <string name="starImage">Favorito</string>
     <string name="thumbnailDescription">Miniatura de la tarjeta</string>
-    <string name="copy_to_clipboard_toast">Id. de la tarjeta copiado al portapapeles</string>
+    <string name="copy_to_clipboard_toast">Se copió el identificador de tarjeta en el portapapeles</string>
     <string name="selectBarcodeTitle">Seleccionar el código de barras</string>
-    <string name="app_resources"><xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" id="app_name">%s</xliff:g> usa los siguientes recursos de terceros: <xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" id="app_resources_list">%s</xliff:g></string>
     <string name="unstar">Eliminar de favoritos</string>
     <string name="noBarcode">Sin código de barras</string>
     <string name="enter_group_name">Introducir nombre del grupo</string>
     <string name="groups">Grupos</string>
-    <string name="groupsList">Grupos: <xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%s</xliff:g></string>
+    <string name="groupsList">Grupos: <xliff:g>%s</xliff:g></string>
     <string name="addManually">Introducir el id. de la tarjeta manualmente</string>
-    <string name="leaveWithoutSaveConfirmation">¿Está seguro de querer abandonar esta página\? Los cambios no se guardarán.</string>
-    <string name="leaveWithoutSaveTitle">Salir sin guardar</string>
-    <string name="moveDown">Bajar en la lista</string>
-    <string name="moveUp">Subir en la lista</string>
-    <string name="failedOpeningFileManager">Fallo al abrir el gestor de archivos. Por favor, asegúrese de que haya uno instalado.</string>
-    <string name="deleteConfirmationGroup">Por favor, confirme que desea eliminar este grupo</string>
+    <string name="leaveWithoutSaveConfirmation">¿Quiere abandonar sin guardar\?</string>
+    <string name="leaveWithoutSaveTitle">Salir</string>
+    <string name="moveDown">Bajar</string>
+    <string name="moveUp">Subir</string>
+    <string name="failedOpeningFileManager">Instale un gestor de archivos primero.</string>
+    <string name="deleteConfirmationGroup">¿Quiere eliminar el grupo\?</string>
     <string name="all">Todo</string>
     <string name="star">Añadir a favoritos</string>
     <plurals name="groupCardCount">
-        <item quantity="one"><xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%d</xliff:g> tarjeta</item>
-        <item quantity="other"><xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%d</xliff:g> tarjetas</item>
+        <item quantity="one"><xliff:g>%d</xliff:g> tarjeta</item>
+        <item quantity="other"><xliff:g>%d</xliff:g> tarjetas</item>
     </plurals>
     <string name="points">Puntos</string>
     <string name="moveBarcodeToCenterOfScreen">Centrar el código de barras en la pantalla</string>
@@ -112,5 +102,10 @@
     <string name="editBarcode">Editar el código de barras</string>
     <string name="barcode">Código de barras</string>
     <string name="card">Tarjeta</string>
-    <string name="balancePoints"><xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%s</xliff:g> puntos</string>
-</resources>
+    <string name="balancePoints"><xliff:g>%s</xliff:g> puntos</string>
+    <string name="expiryStateSentenceExpired">Expirado: <xliff:g>%s</xliff:g></string>
+    <string name="expiryStateSentence">Expira: <xliff:g>%s</xliff:g></string>
+    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Derechos de autor © 2019-<xliff:g>%d</xliff:g> de Sylvia van Os.</string>
+    <string name="app_resources">Recursos de terceros libres: <xliff:g id="app_resources_list">%s</xliff:g></string>
+    <string name="app_libraries">Bibliotecas de terceros libres: <xliff:g id="app_libraries_list">%s</xliff:g></string>
+</resources>

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

@@ -1,32 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" xmlns:tools="http://schemas.android.com/tools">
     <string name="action_add">Ajouter</string>
-    <string name="noGiftCards">Appuyez d\'abord sur le bouton \"+\" (plus) pour ajouter une carte.
-\n
-\nCatima enregistre vos cartes sur votre appareil, pour toujours les avoir à portée de main.</string>
-    <string name="storeName">Nom du Magasin</string>
+    <string name="noGiftCards">Cliquez sur le bouton + plus pour ajouter une carte, ou importez-en d’abord depuis le menu ⋮</string>
+    <string name="storeName">Nom</string>
     <string name="note">Notes</string>
     <string name="cardId">Numéro</string>
     <string name="cancel">Annuler</string>
     <string name="save">Enregistrer</string>
-    <string name="editCard">Modifier</string>
     <string name="edit">Modifier</string>
     <string name="delete">Supprimer</string>
     <string name="confirm">Confirmer</string>
     <string name="lockScreen">Désactiver la rotation</string>
     <string name="unlockScreen">Activer la rotation</string>
     <string name="deleteTitle">Supprimer la carte de fidélité</string>
-    <string name="deleteConfirmation">Confirmez la suppression de cette carte.</string>
+    <string name="deleteConfirmation">Supprimer cette carte \?</string>
     <string name="ok">OK</string>
     <string name="copy_to_clipboard">Copier le numéro dans le presse-papier</string>
     <string name="sendLabel">Envoyer…</string>
-    <string name="editCardTitle">Modifier la carte de fidélité</string>
+    <string name="editCardTitle">Modifier la carte</string>
     <string name="addCardTitle">Ajouter une carte de fidélité</string>
     <string name="scanCardBarcode">Scanner le code-barres</string>
     <string name="cardShortcut">Raccourci de carte</string>
     <string name="noCardsMessage">Ajoutez d\'abord une carte</string>
     <string name="barcodeImageDescription">Image du code-barres</string>
-    <string name="noStoreError">Aucun nom de magasin saisi</string>
+    <string name="noStoreError">Aucun nom saisi</string>
     <string name="noCardIdError">Aucun numéro de carte saisi</string>
     <string name="noCardExistsError">Aucune carte trouvée</string>
     <string name="importExport">Importer/Exporter</string>
@@ -44,25 +41,19 @@
     <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">Utiliser une application externe</string>
+    <string name="importOptionApplicationTitle">Utiliser une autre application</string>
     <string name="importOptionApplicationExplanation">Utilisez le gestionnaire de fichiers de votre choix pour importer un fichier.</string>
-    <string name="importOptionApplicationButton">Utiliser une application externe</string>
+    <string name="importOptionApplicationButton">Utiliser une autre application</string>
     <string name="about">À propos</string>
     <string name="app_license">Logiciel libre à copyleft, sous licence GPLv3+.</string>
     <string name="about_title_fmt">À propos de <xliff:g id="app_name">%s</xliff:g></string>
     <string name="debug_version_fmt">Version : <xliff:g id="version">%s</xliff:g></string>
-    <string name="app_revision_fmt">Notes de version : <xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" id="app_revision_url">%s</xliff:g></string>
-    <string name="app_libraries"><xliff:g id="app_name">%s</xliff:g> utilise les bibliothèques-tierces suivantes : <xliff:g id="app_libraries_list">%s</xliff:g></string>
-    <string name="app_resources"><xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" id="app_name">%s</xliff:g> utilise les ressources tierces suivantes : <xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" id="app_resources_list">%s</xliff:g></string>
+    <string name="app_revision_fmt">Notes de version : <xliff:g id="app_revision_url">%s</xliff:g></string>
     <string name="selectBarcodeTitle">Choisissez le code-barres</string>
     <string name="copy_to_clipboard_toast">Numéro de carte copié dans le presse-papier</string>
     <string name="thumbnailDescription">Miniature de la carte</string>
     <string name="settings">Paramètres</string>
     <string name="settings_category_title_ui">Interface utilisateur</string>
-    <string name="settings_card_title_list_font_size">Taille du nom des cartes (mode liste)</string>
-    <string name="settings_card_note_list_font_size">Taille de la description (mode liste)</string>
-    <string name="settings_card_title_font_size">Taille du nom de la carte (aperçu)</string>
-    <string name="settings_card_id_font_size">Taille des numéros de carte</string>
     <string name="settings_display_barcode_max_brightness">Augmenter la luminosité du code-barres</string>
     <string name="settings_lock_barcode_orientation">Verrouiller l\'orientation du code-barres</string>
     <string name="exportSuccessful">Carte exportée avec succès</string>
@@ -72,9 +63,10 @@
     <string name="settings_light_theme">Clair</string>
     <string name="settings_system_theme">Système</string>
     <string name="settings_theme">Thème</string>
-    <string name="enterBarcodeInstructions">Entrez l\'identifiant de la carte puis sélectionnez l\'image qui représente le code-barres que vous souhaitez utiliser, ou sélectionnez « Cette carte n\'a pas de code-barres » pour ne pas utiliser de code-barres.</string>
-    <string name="app_copyright_old">Basé sur Loyalty Card Keychain, copyright 2016–2020 Branden Archer.</string>
-    <string name="exportOptionExplanation">Les données seront eportées vers l\'emplacement de votre choix.</string>
+    <string name="enterBarcodeInstructions">Entrez l’identifiant de la carte et choisissez le type de code-barres ci-dessous, ou « Cette carte n’a pas de code-barres ».</string>
+    <string name="app_copyright_old">Basé sur Loyalty Card Keychain
+\ncopyright © 2016-2020 Branden Archer.</string>
+    <string name="exportOptionExplanation">Les données seront exportées vers l\'emplacement de votre choix.</string>
     <string name="failedParsingImportUriError">Impossible d\'analyser l\'URI d\'importation</string>
     <string name="share">Partager</string>
     <string name="barcodeNoBarcode">Cette carte n\'a pas de code-barres</string>
@@ -84,23 +76,74 @@
     <string name="unstar">Retirer des favoris</string>
     <string name="star">Ajouter aux favoris</string>
     <string name="starImage">Étoile favorite</string>
-    <string name="deleteConfirmationGroup">Confirmez que vous voulez supprimer ce groupe</string>
+    <string name="deleteConfirmationGroup">Supprimer le groupe \?</string>
     <string name="all">Tous</string>
-    <string name="noGroups">Cliquez d\'abord sur le bouton \"+\" (plus) pour ajouter un groupe.
-\n
-\nLes groupes permettent de facilement retrouver vos cartes.</string>
+    <string name="noGroups">Cliquez sur le bouton + pour ajouter des groupes à catégoriser.</string>
     <string name="groups">Groupes</string>
     <string name="enter_group_name">Entrez le nom du groupe</string>
     <string name="noBarcode">Aucun code-barres</string>
-    <string name="leaveWithoutSaveConfirmation">Voulez-vous quitter la page \? Toutes vos modifications seront perdues.</string>
-    <string name="leaveWithoutSaveTitle">Quitter sans enregistrer</string>
-    <string name="failedOpeningFileManager">Gestionnaire de fichiers introuvable. Installez-en un si nécessaire.</string>
+    <string name="leaveWithoutSaveConfirmation">Quitter sans enregistrer \?</string>
+    <string name="leaveWithoutSaveTitle">Quitter</string>
+    <string name="failedOpeningFileManager">Installez d’abord un gestionnaire de fichiers.</string>
     <string name="addManually">Entrer manuellement l\'identifiant de la carte</string>
-    <string name="moveDown">Descendre dans la liste</string>
-    <string name="moveUp">Monter dans la liste</string>
+    <string name="moveDown">Descendre</string>
+    <string name="moveUp">Monter</string>
     <plurals name="groupCardCount">
-        <item quantity="one"><xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%d</xliff:g> carte</item>
-        <item quantity="other"><xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%d</xliff:g> cartes</item>
+        <item quantity="one"><xliff:g>%d</xliff:g> carte</item>
+        <item quantity="other"><xliff:g>%d</xliff:g> cartes</item>
     </plurals>
-    <string name="groupsList">Groupes : <xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%s</xliff:g></string>
-</resources>
+    <string name="groupsList">Groupes : <xliff:g>%s</xliff:g></string>
+    <string name="accept">Accepter</string>
+    <string name="privacy_policy_popup_text">Avis sur la politique de confidentialité (exigé par certains magasins d\'applications) :
+\n
+\nAUCUNE DONNÉE N’EST COLLECTÉE, ce que tout le monde peut confirmer puisque notre application est un logiciel libre.</string>
+    <string name="privacy_policy">Politique de confidentialité</string>
+    <string name="app_loyalty_card_keychain">Loyalty Card Keychain</string>
+    <string name="chooseImportType">Importer les données depuis \?</string>
+    <string name="parsingBalanceFailed">&lt;xliff:g xmlns:xliff=\"urn:oasis:names:tc:xliff:document:1.2\"&gt;%s&lt;/xliff:g&gt; ne semble pas être un solde valide.</string>
+    <string name="points">Points</string>
+    <string name="currency">Monnaie</string>
+    <string name="balance">Solde</string>
+    <string name="moveBarcodeToCenterOfScreen">Centrer le code-barres sur l\'écran</string>
+    <string name="moveBarcodeToTopOfScreen">Déplacez le code-barres vers le haut de l\'écran</string>
+    <string name="chooseExpiryDate">Choisissez la date d\'expiration</string>
+    <string name="never">Jamais</string>
+    <string name="expiryDate">Date d\'expiration</string>
+    <string name="editBarcode">Modifier le code-barres</string>
+    <string name="barcode">Code-barres</string>
+    <string name="card">Carte</string>
+    <string name="balancePoints">&lt;xliff:g xmlns:xliff=\"urn:oasis:names:tc:xliff:document:1.2\"&gt;%s&lt;/xliff:g&gt; points</string>
+    <string name="balanceSentence">Solde : &lt;xliff:g xmlns:xliff=\"urn:oasis:names:tc:xliff:document:1.2\"&gt;%s&lt;/xliff:g&gt;</string>
+    <string name="expiryStateSentenceExpired">Expiré : &lt;xliff:g xmlns:xliff=\"urn:oasis:names:tc:xliff:document:1.2\"&gt;%s&lt;/xliff:g&gt;</string>
+    <string name="expiryStateSentence">Expire : &lt;xliff:g xmlns:xliff=\"urn:oasis:names:tc:xliff:document:1.2\"&gt;%s&lt;/xliff:g&gt;</string>
+    <string name="settings_disable_lockscreen_while_viewing_card">Empêcher le verrouillage de l’écran</string>
+    <string name="settings_keep_screen_on">Garder l’écran allumé</string>
+    <string name="importVoucherVaultMessage">Trouvez un fichier probablement nommé <i>vouchervault.json</i> à importer.
+\nOu créez-le en appuyant d’abord sur Exporter dans Voucher Vault.</string>
+    <string name="importVoucherVault">Importer depuis Voucher Vault</string>
+    <string name="importLoyaltyCardKeychainMessage">Trouvez un fichier probablement nommé <i>LoyaltyCardKeychain.csv</i> à importer.
+\nOu créez-le à partir du menu Importer/Exporter du Loyalty Card Keychain en appuyant d’abord sur Exporter.</string>
+    <string name="importLoyaltyCardKeychain">Importer depuis Loyalty Card Keychain</string>
+    <string name="importFidmeMessage">Trouvez un fichier probablement nommé <i>fidme-export-request-xxxxxx.zip</i> pour l’importer, et sélectionnez ensuite manuellement les types de codes-barres.
+\nVous pouvez aussi le créer à partir de votre profil FidMe en choisissant Protection des données, puis en cliquant sur Extraire mes données.</string>
+    <string name="importFidme">Importer depuis FidMe</string>
+    <string name="importCatimaMessage">Trouvez un fichier probablement nommé <i>Catima.csv</i> à importer.
+\nOu créez-le à partir du menu Importer/Exporter d’une autre application Catima en appuyant d’abord sur Exporter.</string>
+    <string name="importCatima">Importer depuis Catima</string>
+    <string name="addFromImage">Sélectionner dans la galerie</string>
+    <string name="errorReadingImage">Impossible de lire l\'image</string>
+    <string name="noBarcodeFound">Aucun code-barres n\'a été trouvé</string>
+    <string name="setBarcodeId">Définir la valeur du code-barres</string>
+    <string name="sameAsCardId">Identique à l’identifiant de la carte</string>
+    <string name="barcodeId">Valeur du code-barres</string>
+    <string name="settings_max_font_size_scale">Taille max. de la police</string>
+    <string name="unsupportedBarcodeType">Ce type de code-barres ne peut pas encore être affiché. Il sera peut-être pris en charge dans une version plus récente de l\'application.</string>
+    <string name="wrongValueForBarcodeType">La valeur n\'est pas valide pour le type de code-barres sélectionné</string>
+    <string name="app_resources">Ressources libres tierces : <xliff:g id="app_resources_list">%s</xliff:g></string>
+    <string name="app_libraries">Bibliothèques libres tierces : <xliff:g id="app_libraries_list">%s</xliff:g></string>
+    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Copyright © 2019–<xliff:g>%d</xliff:g> Sylvia van Os.</string>
+    <string name="intent_import_card_from_url_share_multiple_text">Je veux partager des cartes avec vous</string>
+    <string name="copy_to_clipboard_multiple_toast">Nméros des cartes copiés dans le presse-papier</string>
+    <string name="card_ids_copied">Num. de la carte copié(s)</string>
+    <string name="card_selected">"Sélectionnée : "</string>
+</resources>

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

@@ -6,5 +6,4 @@
     <string name="cardId">מזהה כרטיס</string>
     <string name="cancel">ביטול</string>
     <string name="save">שמור</string>
-    <string name="editCard">עריכת כרטיס</string>
-    </resources>
+</resources>

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

@@ -1,26 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" xmlns:tools="http://schemas.android.com/tools">
     <string name="action_search">Cerca</string>
     <string name="action_add">Aggiungi</string>
-    <string name="noGiftCards">Fai clic sul pulsante + (più) per aggiungere prima una carta.
-\n
-\nCatima trasporta le tue carte sul dispositivo, quindi sono sempre a portata di mano.</string>
+    <string name="noGiftCards">Clicca il pulsante + più per aggiungere una carta, o importane alcune dal menù ⋮ prima.</string>
     <string name="noMatchingGiftCards">Non ho trovato niente. Prova a cambiare la tua ricerca.</string>
-    <string name="storeName">Negozio</string>
+    <string name="storeName">Nome</string>
     <string name="note">Note</string>
     <string name="cardId">Codice</string>
     <string name="barcodeNoBarcode">Questa carta non ha un codice a barre</string>
     <string name="cancel">Annulla</string>
     <string name="save">Salva</string>
-    <string name="editCard">Modifica carta</string>
     <string name="edit">Modifica</string>
     <string name="delete">Elimina</string>
     <string name="confirm">Conferma</string>
     <string name="lockScreen">Blocca rotazione</string>
     <string name="unlockScreen">Sblocca rotazione</string>
     <string name="deleteTitle">Rimuovi carta fedeltà</string>
-    <string name="deleteConfirmation">Conferma di voler eliminare questa carta.</string>
-    <string name="ok">Ok</string>
+    <string name="deleteConfirmation">Eliminare questa carta\?</string>
+    <string name="ok">OK</string>
     <string name="copy_to_clipboard">Copia ID negli appunti</string>
     <string name="share">Condividi</string>
     <string name="sendLabel">Invia…</string>
@@ -30,7 +27,7 @@
     <string name="cardShortcut">Scorciatoia per la carta</string>
     <string name="noCardsMessage">Aggiungi prima una carta</string>
     <string name="barcodeImageDescription">Immagine del codice della carta</string>
-    <string name="noStoreError">Nessun negozio inserito</string>
+    <string name="noStoreError">Nessun nome inserito</string>
     <string name="noCardIdError">Nessun codice carta inserito</string>
     <string name="noCardExistsError">Impossibile trovare la carta</string>
     <string name="failedParsingImportUriError">Impossibile analizzare l\'URI</string>
@@ -49,19 +46,17 @@
     <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="importOptionApplicationTitle">Usa un’altra app</string>
     <string name="importOptionApplicationExplanation">Usa qualsiasi app o il tuo gestore di file preferito per aprire un file.</string>
-    <string name="importOptionApplicationButton">Usa un\'applicazione esterna</string>
+    <string name="importOptionApplicationButton">Usa un’altra app</string>
     <string name="about">Informazioni</string>
     <string name="app_license">Software libero con copyleft, licenza GPLv3+.</string>
     <string name="about_title_fmt">Informazioni su <xliff:g id="app_name">%s</xliff:g></string>
     <string name="debug_version_fmt">Versione: <xliff:g id="version">%s</xliff:g></string>
-    <string name="app_revision_fmt">Informazioni sulla revisione: <xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" id="app_revision_url"> %s </xliff:g></string>
-    <string name="app_libraries"><xliff:g id="app_name">%s</xliff:g> usa le seguenti librerie di terze parti: <xliff:g id="app_libraries_list">%s</xliff:g></string>
-    <string name="app_resources"><xliff:g id="app_name">%s</xliff:g> usa le seguenti risorse di terze parti: <xliff:g id="app_resources_list">%s</xliff:g></string>
+    <string name="app_revision_fmt">Informazioni sulla revisione: <xliff:g id="app_revision_url"> %s </xliff:g></string>
     <string name="selectBarcodeTitle">Seleziona codice a barre</string>
-    <string name="enterBarcodeInstructions">Immettere l\'ID della carta, quindi selezionare l\'immagine che rappresenta il codice a barre desiderato oppure selezionare «Questa carta non ha un codice a barre» per non valorizzare il dato.</string>
-    <string name="copy_to_clipboard_toast">ID della carta copiato negli appunti</string>
+    <string name="enterBarcodeInstructions">Inserisci l’ID della carta, e scegli il suo tipo di codice a barre qui sotto, oppure «Questa carta non ha codice a barre».</string>
+    <string name="copy_to_clipboard_toast">Numero della carta copiato negli appunti</string>
     <string name="thumbnailDescription">Miniatura carta</string>
     <string name="settings">Impostazioni</string>
     <string name="settings_category_title_ui">Interfaccia utente</string>
@@ -69,39 +64,34 @@
     <string name="settings_system_theme">Sistema</string>
     <string name="settings_light_theme">Chiaro</string>
     <string name="settings_dark_theme">Scuro</string>
-    <string name="settings_card_title_list_font_size">Dimensione caratteri del titolo della carta (modalità elenco)</string>
-    <string name="settings_card_note_list_font_size">Dimensione caratteri nota della carta (modalità elenco)</string>
-    <string name="settings_card_title_font_size">Dimensione caratteri del titolo della carta (anteprima)</string>
-    <string name="settings_card_id_font_size">Dimensione testo dell\'ID 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_share_text">Voglio condividere una carta fedeltà con te</string>
     <string name="exportSuccessful">Dati della carta importati</string>
     <string name="importSuccessful">Dati della carta importati</string>
-    <string name="app_copyright_old">Basato su Loyalty Card Keychain, copyright 2016–2020 Branden Archer.</string>
+    <string name="app_copyright_old">Basato su Loyalty Card Keychain
+\ncopyright © 2016–2020 Branden Archer.</string>
     <string name="exportOptionExplanation">I dati verranno scritti in una posizione a tua scelta.</string>
     <string name="barcodeType">Tipo di codice a barre</string>
     <string name="unstar">Rimuovi dai preferiti</string>
     <string name="star">Aggiungi ai preferiti</string>
     <string name="starImage">Stella preferita</string>
-    <string name="deleteConfirmationGroup">Conferma di voler eliminare questo gruppo</string>
+    <string name="deleteConfirmationGroup">Eliminare il gruppo\?</string>
     <string name="all">Tutti</string>
-    <string name="noGroups">Fai clic sul pulsante + (più) per aggiungere prima i gruppi.
-\n
-\nI gruppi rendono le cose più facili da trovare.</string>
+    <string name="noGroups">Clicca sul pulsante + più per aggiungere prima i gruppi per la categorizzazione.</string>
     <string name="groups">Gruppi</string>
     <string name="enter_group_name">Inserisci il nome del gruppo</string>
-    <string name="groupsList">Gruppi: <xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%s</xliff:g></string>
+    <string name="groupsList">Gruppi: <xliff:g>%s</xliff:g></string>
     <string name="addManually">Inserisci manualmente l\'ID della carta</string>
-    <string name="leaveWithoutSaveConfirmation">Sei sicuro/a di voler uscire da questa schermata\? Le modifiche apportate non verranno salvate.</string>
-    <string name="leaveWithoutSaveTitle">Esci senza salvare</string>
-    <string name="moveDown">Sposta in basso nell\'elenco</string>
-    <string name="moveUp">Sposta in alto nell\'elenco</string>
-    <string name="failedOpeningFileManager">Apertura di un gestore di file non riuscita. Assicurati che ne sia installato uno.</string>
+    <string name="leaveWithoutSaveConfirmation">Uscire senza salvare\?</string>
+    <string name="leaveWithoutSaveTitle">Esci</string>
+    <string name="moveDown">Sposta in basso</string>
+    <string name="moveUp">Sposta in alto</string>
+    <string name="failedOpeningFileManager">Installa prima un gestore di file.</string>
     <string name="noBarcode">Nessun codice a barre</string>
     <plurals name="groupCardCount">
-        <item quantity="one"><xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%d</xliff:g> carta</item>
-        <item quantity="other"><xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%d</xliff:g> carte</item>
+        <item quantity="one"><xliff:g>%d</xliff:g> carta</item>
+        <item quantity="other"><xliff:g>%d</xliff:g> carte</item>
     </plurals>
     <string name="parsingBalanceFailed">&lt;xliff:g xmlns:xliff=\"urn:oasis:names:tc:xliff:document:1.2\"&gt;%s&lt;/xliff:g&gt; non sembra un saldo corretto.</string>
     <string name="points">Punti</string>
@@ -115,12 +105,45 @@
     <string name="editBarcode">Modifica il codice a barre</string>
     <string name="barcode">Codice a barre</string>
     <string name="card">Carta</string>
-    <string name="balancePoints"><xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%s</xliff:g> punti</string>
-    <string name="balanceSentence">Saldo: <xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%s</xliff:g></string>
-    <string name="expiryStateSentenceExpired">Scaduta: <xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%s</xliff:g></string>
-    <string name="expiryStateSentence">Scade: <xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%s</xliff:g></string>
-    <string name="settings_keep_screen_on">Mantieni schermo acceso durante la visualizzazione di una carta</string>
+    <string name="balancePoints"><xliff:g>%s</xliff:g> punti</string>
+    <string name="balanceSentence">Saldo: <xliff:g>%s</xliff:g></string>
+    <string name="expiryStateSentenceExpired">Scaduta: <xliff:g>%s</xliff:g></string>
+    <string name="expiryStateSentence">Scade: <xliff:g>%s</xliff:g></string>
+    <string name="settings_keep_screen_on">Tieni schermo attivo</string>
     <string name="app_loyalty_card_keychain">Loyalty Card Keychain</string>
-    <string name="chooseImportType">Da quale app vuoi importare i dati\?</string>
-    <string name="settings_disable_lockscreen_while_viewing_card">Mantieni schermo attivo mentre visualizzi una carta</string>
+    <string name="chooseImportType">Importare i dati da\?</string>
+    <string name="settings_disable_lockscreen_while_viewing_card">Impedisci blocco schermo</string>
+    <string name="accept">Accetta</string>
+    <string name="privacy_policy_popup_text">Informativa sulla riservatezza (spesso richiesta):
+\n
+\nNESSUN DATO VIENE RACCOLTO, cosa che chiunque può confermare dato che la nostra applicazione è un software libero.</string>
+    <string name="privacy_policy">Informativa sulla riservatezza</string>
+    <string name="importVoucherVaultMessage">Trova un file probabilmente chiamato <i>vouchervault.json</i> da importare.
+\nOppure crealo premendo prima Esporta in Voucher Vault.</string>
+    <string name="importVoucherVault">Importa da Voucher Vault</string>
+    <string name="importLoyaltyCardKeychainMessage">Trova un file probabilmente chiamato <i>LoyaltyCardKeychain.csv</i> da importare.
+\nOppure crealo dal menù Importa/Esporta nel Loyalty Card Keychain premendo prima Esporta.</string>
+    <string name="importLoyaltyCardKeychain">Importa da Loyalty Card Keychain</string>
+    <string name="importFidmeMessage">Trova un file probabilmente chiamato <i>fidme-export-request-xxxxxx.zip</i> da importare, e poi seleziona i tipi di codice a barre manualmente in seguito.
+\nOppure crearlo dal tuo profilo FidMe scegliendo Protezione dati e poi premendo Estrai i miei dati prima.</string>
+    <string name="importFidme">Importa da FidMe</string>
+    <string name="importCatimaMessage">Trova un file probabilmente chiamato <i>Catima.csv</i> da importare.
+\nOppure crealo dal menù Importa/Esporta di un’altra applicazione Catima premendo prima Esporta.</string>
+    <string name="importCatima">Importa da Catima</string>
+    <string name="setBarcodeId">Imposta il valore del codice a barre</string>
+    <string name="sameAsCardId">Uguale all\'ID della carta</string>
+    <string name="barcodeId">Valore del codice a barre</string>
+    <string name="errorReadingImage">Impossibile leggere l\'immagine</string>
+    <string name="noBarcodeFound">Nessun codice a barre trovato</string>
+    <string name="addFromImage">Seleziona immagine dalla galleria</string>
+    <string name="settings_max_font_size_scale">Dimensione mass. caratteri</string>
+    <string name="unsupportedBarcodeType">Questo tipo di codice a barre non può ancora essere visualizzato. Potrebbe essere supportato in una versione più recente dell\'applicazione.</string>
+    <string name="wrongValueForBarcodeType">Il valore non è valido per il tipo di codice a barre selezionato</string>
+    <string name="app_resources">Risorse libre di terze parti: <xliff:g id="app_resources_list"> %s </xliff:g></string>
+    <string name="app_libraries">Librerie libre di terze parti: <xliff:g id="app_libraries_list"> %s </xliff:g></string>
+    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Copyright © 2019–<xliff:g>%d</xliff:g> Sylvia van Os.</string>
+    <string name="intent_import_card_from_url_share_multiple_text">Voglio condividere alcune carte con te</string>
+    <string name="copy_to_clipboard_multiple_toast">Numeri delle carte copiati negli appunti</string>
+    <string name="card_ids_copied">Numero/i della carta copiato/i</string>
+    <string name="card_selected">"Selezionata: "</string>
 </resources>

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

@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" xmlns:tools="http://schemas.android.com/tools">
+    <string name="wrongValueForBarcodeType">選択したバーコード形式ではこの番号は使用できません</string>
+    <string name="unsupportedBarcodeType">このバーコード形式は表示できません。将来のアップデートにより対応するかもしれません。</string>
+    <string name="setBarcodeId">バーコード番号を設定</string>
+    <string name="importLoyaltyCardKeychainMessage">インポートするには <i>LoyaltyCardKeychain.csv</i> のような名前のファイルを選択してください。
+\nまたは、あらかじめ Loyalty Card Keychainアプリからファイルをエクスポートしてください。</string>
+    <string name="importLoyaltyCardKeychain">Loyalty Card Keychain からインポート</string>
+    <string name="importFidmeMessage">インポートするには <i>fidme-export-request-xxxxxx.zip</i> のような名前のファイルを選択してください。そのあと手動でバーコード形式を選択してください。
+\nまたは 、あらかじめFidMeからファイルを作成してください。</string>
+    <string name="importFidme">FidMe からインポート</string>
+    <string name="importCatimaMessage">インポートするには <i>Catima.csv</i> のような名前のファイルを選択してください。
+\nまたは、あらかじめ他のCatima アプリからファイルをエクスポートしてください。</string>
+    <string name="importCatima">Catima からインポート</string>
+    <string name="accept">承認</string>
+    <string name="privacy_policy_popup_text">プライバシーポリシーの案内:
+\n
+\nこのアプリはユーザーのデータを一切収集しません。</string>
+    <string name="privacy_policy">プライバシーポリシー</string>
+    <string name="app_loyalty_card_keychain">Loyalty Card Keychain</string>
+    <string name="chooseImportType">インポート元を選択</string>
+    <string name="parsingBalanceFailed"><xliff:g>%s</xliff:g> は有効な残高ではないようです。</string>
+    <string name="points">ポイント</string>
+    <string name="currency">通貨</string>
+    <string name="balance">残高</string>
+    <string name="errorReadingImage">画像が読み込めませんでした</string>
+    <string name="noBarcodeFound">バーコードが見つかりませんでした</string>
+    <string name="moveBarcodeToCenterOfScreen">バーコードを画面の中央に配置</string>
+    <string name="moveBarcodeToTopOfScreen">バーコードを画面の上部に移動</string>
+    <string name="chooseExpiryDate">有効期限を選択</string>
+    <string name="never">なし</string>
+    <string name="expiryDate">有効期限</string>
+    <string name="editBarcode">バーコードの編集</string>
+    <string name="barcode">バーコード</string>
+    <string name="card">カード</string>
+    <string name="balancePoints"><xliff:g>%s</xliff:g> ポイント</string>
+    <string name="balanceSentence">残高: <xliff:g>%s</xliff:g></string>
+    <string name="expiryStateSentenceExpired">期限: <xliff:g>%s</xliff:g></string>
+    <string name="expiryStateSentence">期限: <xliff:g>%s</xliff:g></string>
+    <string name="groupsList">グループ: <xliff:g>%s</xliff:g></string>
+    <string name="addFromImage">ギャラリーから画像を選択</string>
+    <string name="addManually">カード番号を手動で入力</string>
+    <string name="leaveWithoutSaveConfirmation">保存せずに終了しますか？</string>
+    <string name="leaveWithoutSaveTitle">終了する</string>
+    <plurals name="groupCardCount">
+        <item quantity="other"><xliff:g>%d</xliff:g> 枚</item>
+    </plurals>
+    <string name="moveDown">下に移動</string>
+    <string name="moveUp">上に移動</string>
+    <string name="failedOpeningFileManager">ファイルマネージャーをインストールしてください。</string>
+    <string name="deleteConfirmationGroup">グループを削除しますか？</string>
+    <string name="all">すべて</string>
+    <string name="noGroups">+ボタンを押してグループを追加してください。</string>
+    <string name="groups">グループ</string>
+    <string name="enter_group_name">グループ名を入力</string>
+    <string name="exportSuccessful">カードのデータがエクスポートされました</string>
+    <string name="importSuccessful">カードのデータがインポートされました</string>
+    <string name="intent_import_card_from_url_share_text">あなたとカードを共有したいです</string>
+    <string name="settings_disable_lockscreen_while_viewing_card">バーコード表示中は画面をロックしない</string>
+    <string name="settings_keep_screen_on">バーコード表示中は画面を消灯しない</string>
+    <string name="settings_lock_barcode_orientation">バーコード表示画面を自動回転しない</string>
+    <string name="settings_display_barcode_max_brightness">バーコード表示画面を明るくする</string>
+    <string name="settings_max_font_size_scale">最大のフォントサイズ</string>
+    <string name="settings_dark_theme">ダーク</string>
+    <string name="settings_light_theme">ライト</string>
+    <string name="settings_system_theme">システムに従う</string>
+    <string name="settings_theme">テーマ</string>
+    <string name="settings_category_title_ui">ユーザーインターフェイス</string>
+    <string name="settings">設定</string>
+    <string name="starImage">お気に入りのスター</string>
+    <string name="thumbnailDescription">カードのサムネイル</string>
+    <string name="copy_to_clipboard_toast">カード番号をクリップボードにコピーしました</string>
+    <string name="enterBarcodeInstructions">カード番号を入力し、バーコード形式を選択してください。</string>
+    <string name="selectBarcodeTitle">バーコード選択</string>
+    <string name="app_libraries">Third-party libre libraries: <xliff:g id="app_libraries_list">%s</xliff:g></string>
+    <string name="app_revision_fmt">Revision Info: <xliff:g id="app_revision_url">%s</xliff:g></string>
+    <string name="debug_version_fmt">Version: <xliff:g id="version">%s</xliff:g></string>
+    <string name="about_title_fmt">About <xliff:g id="app_name">%s</xliff:g></string>
+    <string name="app_license">Copylefted libre software, licensed GPLv3+.</string>
+    <string name="app_copyright_old">Based on Loyalty Card Keychain
+\ncopyright © 2016–2020 Branden Archer.</string>
+    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Copyright © 2019–<xliff:g>%d</xliff:g> Sylvia van Os.</string>
+    <string name="app_resources">Third-party libre resources: <xliff:g id="app_resources_list">%s</xliff:g></string>
+    <string name="about">Catimaについて</string>
+    <string name="importOptionApplicationButton">外部のアプリを使う</string>
+    <string name="importOptionApplicationExplanation">任意のアプリやお気に入りのファイルマネージャーからファイルを開く。</string>
+    <string name="importOptionApplicationTitle">外部アプリを使う</string>
+    <string name="importOptionFilesystemButton">ファイルを選択</string>
+    <string name="importOptionFilesystemExplanation">ストレージからファイルを選択してください。</string>
+    <string name="importOptionFilesystemTitle">ストレージからインポート</string>
+    <string name="exportOptionExplanation">選択した場所にデータを出力します。</string>
+    <string name="noExternalStoragePermissionError">カードをインポート/エクスポートするために外部ストレージへのアクセスを許可してください</string>
+    <string name="exporting">エクスポート中…</string>
+    <string name="importing">インポート中…</string>
+    <string name="exportFailed">カードをエクスポートできませんでした</string>
+    <string name="exportFailedTitle">エクスポート失敗</string>
+    <string name="exportSuccessfulTitle">エクスポートしました</string>
+    <string name="sameAsCardId">カードの表記と同一</string>
+    <string name="barcodeId">バーコード番号</string>
+    <string name="importVoucherVaultMessage">インポートするには <i>vouchervault.json</i> のような名前のファイルを選択してください。
+\nまたは、あらかじめVoucher Vault でファイルを作成してください。</string>
+    <string name="importVoucherVault">Voucher Vault からインポート</string>
+    <string name="importFailed">カードをインポートできません</string>
+    <string name="importFailedTitle">インポート失敗</string>
+    <string name="importSuccessfulTitle">インポートしました</string>
+    <string name="importExportHelp">カードをバックアップすると、カードを他のデバイスに移すことができます。</string>
+    <string name="exportName">エクスポート</string>
+    <string name="importExport">インポート/エクスポート</string>
+    <string name="failedParsingImportUriError">インポートURIを解析できません</string>
+    <string name="noCardExistsError">カードが見つかりません</string>
+    <string name="noCardIdError">カード番号が入力されていません</string>
+    <string name="noStoreError">名前が入力されていません</string>
+    <string name="barcodeImageDescription">バーコードの画像</string>
+    <string name="noCardsMessage">カードを追加</string>
+    <string name="cardShortcut">カードのショートカット</string>
+    <string name="scanCardBarcode">カードのバーコードをスキャン</string>
+    <string name="addCardTitle">カードの追加</string>
+    <string name="editCardTitle">カードの編集</string>
+    <string name="sendLabel">送信先を選択…</string>
+    <string name="share">共有</string>
+    <string name="copy_to_clipboard">カード番号をクリップボードにコピー</string>
+    <string name="ok">はい</string>
+    <string name="deleteConfirmation">選択したカードを削除しますか？</string>
+    <string name="deleteTitle">カードを削除</string>
+    <string name="unlockScreen">自動回転を無効にしない</string>
+    <string name="lockScreen">自動回転を無効にする</string>
+    <string name="confirm">確認</string>
+    <string name="delete">削除</string>
+    <string name="edit">編集</string>
+    <string name="save">保存</string>
+    <string name="cancel">取り消し</string>
+    <string name="unstar">お気に入りから削除</string>
+    <string name="star">お気に入りに追加</string>
+    <string name="noBarcode">バーコードなし</string>
+    <string name="barcodeNoBarcode">バーコード指定なし</string>
+    <string name="barcodeType">形式</string>
+    <string name="cardId">カード番号</string>
+    <string name="note">メモ</string>
+    <string name="storeName">名前</string>
+    <string name="noMatchingGiftCards">該当なし</string>
+    <string name="noGiftCards">まず初めに+ボタンを押してカードを追加するか、メニューから以前のカードをインポートしてください。</string>
+    <string name="action_add">追加</string>
+    <string name="action_search">検索</string>
+    <string name="intent_import_card_from_url_share_multiple_text">あなたとカードを共有したいです</string>
+    <string name="copy_to_clipboard_multiple_toast">カード番号をクリップボードにコピーしました</string>
+    <string name="card_ids_copied">コピーしたカード</string>
+    <string name="card_selected">"選択: "</string>
+</resources>

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

@@ -6,10 +6,6 @@
     <string name="groups">그룹</string>
     <string name="enter_group_name">그룹 이름 입력</string>
     <string name="settings_lock_barcode_orientation">바코드 회전 잠금</string>
-    <string name="settings_card_id_font_size">카드 ID 글꼴 크기</string>
-    <string name="settings_card_title_font_size">카드 제목 글꼴 크기 (미리 보기)</string>
-    <string name="settings_card_note_list_font_size">카드 노트 글꼴 크기 (목록 모드)</string>
-    <string name="settings_card_title_list_font_size">카드 제목 글꼴 크기 (목록 모드)</string>
     <string name="settings_dark_theme">어두움</string>
     <string name="settings_light_theme">밝음</string>
     <string name="debug_version_fmt">버전: <xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" id="version">%s</xliff:g></string>
@@ -18,9 +14,7 @@
     <string name="settings_theme">테마</string>
     <string name="settings_category_title_ui">사용자 인터페이스</string>
     <string name="settings">설정</string>
-    <string name="enterBarcodeInstructions">카드 ID를 입력하고 카드에서 사용하는 바코드 이미지를 선택하세요. 바코드를 사용하지 않는 경우 \"이 카드는 바코드가 없음\"을 선택하세요.</string>
-    <string name="app_resources"><xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" id="app_name">%s</xliff:g> 앱은 다음 서드 파티 리소스를 사용합니다: <xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" id="app_resources_list">%s</xliff:g></string>
-    <string name="app_libraries"><xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" id="app_name">%s</xliff:g> 앱은 다음 서드 파티 라이브러리를 사용합니다: <xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" id="app_libraries_list">%s</xliff:g></string>
+    <string name="enterBarcodeInstructions">카드 ID를 입력하고 카드에서 사용하는 바코드 이미지를 선택하세요. 바코드를 사용하지 않는 경우 “이 카드는 바코드가 없음”을 선택하세요.</string>
     <string name="app_revision_fmt">리비전 정보: &lt;xliff:g xmlns:xliff=\"urn:oasis:names:tc:xliff:document:1.2\" id=\"app_revision_url\"&gt;%s&lt;/xliff:g&gt;</string>
     <string name="selectBarcodeTitle">바코드 선택</string>
     <string name="about">정보</string>
@@ -44,7 +38,6 @@
     <string name="confirm">확인</string>
     <string name="delete">삭제</string>
     <string name="edit">편집</string>
-    <string name="editCard">카드 편집</string>
     <string name="save">저장</string>
     <string name="cancel">취소</string>
     <string name="unstar">즐겨찾기에서 제거</string>
@@ -84,4 +77,5 @@
     <string name="noStoreError">매장을 입력하지 않음</string>
     <string name="starImage">즐겨찾기 별</string>
     <string name="settings_display_barcode_max_brightness">바코드를 표시할 때 화면 밝기 높이기</string>
+    <string name="barcode">바코드</string>
 </resources>

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

@@ -35,7 +35,6 @@
     <string name="about_title_fmt">Apie <xliff:g id="app_name">%s</xliff:g></string>
     <string name="debug_version_fmt">Versija: <xliff:g id="version">%s</xliff:g></string>
     <string name="app_revision_fmt">Revizijos informacija: <xliff:g id="app_revision_url">%s</xliff:g></string>
-    <string name="app_libraries"><xliff:g id="app_name">%s</xliff:g> naudoja šias trečiosios šalies bibliotekas: <xliff:g id="app_libraries_list">%s</xliff:g></string>
     <string name="selectBarcodeTitle">Pasirinkite brūkšninį kodą</string>
     <string name="copy_to_clipboard_toast">Kortelės ID nukopijuota į iškarpinę</string>
 

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

@@ -1,23 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" xmlns:tools="http://schemas.android.com/tools">
     <string name="action_add">Legg til</string>
-    <string name="noGiftCards">Klikk på \"+\" (pluss)-knappen for å legge til et kort først.
-\n
-\nDa har du dem alltid hendig.</string>
+    <string name="noGiftCards">Klikk på «+» (pluss)-knappen for å legge til eller importere kort fra ⋮-menyen først-.</string>
     <string name="storeName">Butikk</string>
     <string name="note">Merknad</string>
     <string name="cardId">Kort-ID</string>
     <string name="barcodeType">Strekkodetype</string>
     <string name="cancel">Avbryt</string>
     <string name="save">Lagre</string>
-    <string name="editCard">Rediger kort</string>
     <string name="edit">Rediger</string>
     <string name="delete">Slett</string>
     <string name="confirm">Bekreft</string>
     <string name="lockScreen">Ingen rotering</string>
     <string name="unlockScreen">Skru på rotering</string>
     <string name="deleteTitle">Fjern kundekort</string>
-    <string name="deleteConfirmation">Bekreft at du ønsker å slette dette kortet.</string>
+    <string name="deleteConfirmation">Slett dette kortet\?</string>
     <string name="ok">OK</string>
     <string name="copy_to_clipboard">Kopier ID til utklippstavle</string>
     <string name="sendLabel">Send…</string>
@@ -51,21 +48,15 @@
     <string name="importOptionApplicationButton">Bruk eksternt program</string>
     <string name="about">Om</string>
     <string name="app_license">Gemenhetslig fri programvare, lisensiert GPLv3+.</string>
-    <string name="about_title_fmt">Om <xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" id="app_name">%s</xliff:g></string>
-    <string name="debug_version_fmt">Versjon: <xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" id="version">%s</xliff:g></string>
+    <string name="about_title_fmt">Om <xliff:g id="app_name">%s</xliff:g></string>
+    <string name="debug_version_fmt">Versjon: <xliff:g id="version">%s</xliff:g></string>
     <string name="app_revision_fmt">Utgivelsesinfo: <xliff:g id="app_revision_url">%s</xliff:g></string>
-    <string name="app_libraries"><xliff:g id="app_name">%s</xliff:g> brukfer følgende tredjepartsbibliotek: <xliff:g id="app_libraries_list">%s</xliff:g></string>
-    <string name="app_resources"><xliff:g id="app_name">%s</xliff:g> bruker følgende tredjepartsressurser: <xliff:g id="app_resources_list">%s</xliff:g></string>
     <string name="selectBarcodeTitle">Velg strekkode</string>
     <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="settings">Innstillinger</string>
     <string name="settings_category_title_ui">Brukergrensesnitt</string>
-    <string name="settings_card_title_list_font_size">Korttittelskriftstørrelse (listemodus)</string>
-    <string name="settings_card_note_list_font_size">Skriftstørrelse for kortmerknadsliste (listemodus)</string>
-    <string name="settings_card_title_font_size">Skriftstørrelse for korttittel (forhåndsvisning)</string>
-    <string name="settings_card_id_font_size">Skriftstørrelse for kort-ID</string>
     <string name="settings_display_barcode_max_brightness">Lysere strekkodevisning</string>
     <string name="settings_lock_barcode_orientation">Lås strekkodesideretning</string>
     <string name="exportSuccessful">Kortdata eksportert</string>
@@ -75,7 +66,8 @@
     <string name="settings_light_theme">Lys</string>
     <string name="settings_system_theme">System</string>
     <string name="settings_theme">Drakt</string>
-    <string name="app_copyright_old">Basert på Kundekortknippe, opphavsrett 2016–2020 Branden Archer.</string>
+    <string name="app_copyright_old">Basert på Kundekortknippe
+\nopphavsrett 2016–2020 Branden Archer.</string>
     <string name="failedParsingImportUriError">Kunne ikke tolke importerings-URI</string>
     <string name="share">Del</string>
     <string name="barcodeNoBarcode">Dette kortet har ingen strekkode</string>
@@ -84,43 +76,74 @@
     <string name="starImage">Favorittstjerne</string>
     <string name="unstar">Fjern fra favoritter</string>
     <string name="star">Legg til i favoritter</string>
-    <string name="noGroups">Klikk på «+»-tegnet for å legge til grupper først.
-\n
-\nGrupper gjør ting enklere å finne.</string>
-    <string name="deleteConfirmationGroup">Bekreft at du ønsker å slette denne gruppen</string>
+    <string name="noGroups">Klikk på «+»- (pluss)-tegnet for å legge til grupper for kategorisering først.</string>
+    <string name="deleteConfirmationGroup">Slett gruppe\?</string>
     <string name="all">Alle</string>
     <string name="groups">Grupper</string>
     <string name="enter_group_name">Skriv inn gruppenavn</string>
     <string name="noBarcode">Ingen strekkode</string>
-    <string name="failedOpeningFileManager">Klarte ikke å åpne noen filbehandler. Forsikre deg om at du har installert en.</string>
-    <string name="leaveWithoutSaveConfirmation">Er du sikker på at du vil forlate denne skjermen\? Endringer vil ikke bli lagret.</string>
-    <string name="leaveWithoutSaveTitle">Forlat uten å lagre</string>
+    <string name="failedOpeningFileManager">Installer en filbehandler først.</string>
+    <string name="leaveWithoutSaveConfirmation">Forlat uten å lagre\?</string>
+    <string name="leaveWithoutSaveTitle">Avslutt</string>
     <string name="addManually">Skriv inn kort-ID manuelt</string>
     <string name="moveDown">Flytt nedover i listen</string>
     <string name="moveUp">Flytt oppover i listen</string>
     <plurals name="groupCardCount">
-        <item quantity="one"><xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%d</xliff:g> kort</item>
-        <item quantity="other"><xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%d</xliff:g> kort</item>
+        <item quantity="one"><xliff:g>%d</xliff:g> kort</item>
+        <item quantity="other"><xliff:g>%d</xliff:g> kort</item>
     </plurals>
-    <string name="groupsList">Grupper: <xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%s</xliff:g></string>
+    <string name="groupsList">Grupper: <xliff:g>%s</xliff:g></string>
     <string name="editBarcode">Rediger strekkode</string>
     <string name="barcode">Strekkode</string>
     <string name="card">Kort</string>
-    <string name="expiryStateSentence">Utløper: <xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%s</xliff:g></string>
+    <string name="expiryStateSentence">Utløper: <xliff:g>%s</xliff:g></string>
     <string name="chooseExpiryDate">Velg utløpsdato</string>
     <string name="never">Aldri</string>
     <string name="expiryDate">Utløpsdato</string>
-    <string name="expiryStateSentenceExpired">Utløpt: <xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%s</xliff:g></string>
+    <string name="expiryStateSentenceExpired">Utløpt: <xliff:g>%s</xliff:g></string>
     <string name="moveBarcodeToCenterOfScreen">Sentrer strekkoden på skjermen</string>
     <string name="moveBarcodeToTopOfScreen">Flytt strekkoden til toppen av skjermen</string>
-    <string name="parsingBalanceFailed"><xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%s</xliff:g> ser ikke ut til å være en gyldig saldo.</string>
+    <string name="parsingBalanceFailed"><xliff:g>%s</xliff:g> ser ikke ut til å være en gyldig saldo.</string>
     <string name="points">Poeng</string>
     <string name="currency">Valuta</string>
     <string name="balance">Saldo</string>
-    <string name="balancePoints"><xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%s</xliff:g> poeng</string>
-    <string name="balanceSentence">Saldo: <xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%s</xliff:g></string>
-    <string name="chooseImportType">Hvilket program vil du importere data fra\?</string>
+    <string name="balancePoints"><xliff:g>%s</xliff:g> poeng</string>
+    <string name="balanceSentence">Saldo: <xliff:g>%s</xliff:g></string>
+    <string name="chooseImportType">Importer data fra\?</string>
     <string name="app_loyalty_card_keychain">Kundekortsknippe</string>
     <string name="settings_disable_lockscreen_while_viewing_card">Skru av låseskjerm under kortvisning</string>
     <string name="settings_keep_screen_on">Behold skjerm påslått under kortvisning</string>
+    <string name="privacy_policy_popup_text">Mange programbutikker krever at programmer viser personvernspraksisen sin ved første oppstart. Her er vår:
+\n
+\nVi SAMLER IKKE IN NOEN DATA overhodet, og programmet vårt er fri programvare, så alle kan bekrefte at dette stemmer.</string>
+    <string name="accept">Godta</string>
+    <string name="privacy_policy">Personvernspraksis</string>
+    <string name="importFidme">Importer fra FidMe</string>
+    <string name="importCatima">Importer fra Catima</string>
+    <string name="errorReadingImage">Klarte ikke å lese bildet</string>
+    <string name="noBarcodeFound">Fant ingen strekkode</string>
+    <string name="addFromImage">Velg bilde fra galleri</string>
+    <string name="unsupportedBarcodeType">Denne strekkodetypen kan ikke vises for øyeblikket. Støtte kan bli lagt til i en senere versjon av programmet.</string>
+    <string name="setBarcodeId">Sett strekkodeverdi</string>
+    <string name="sameAsCardId">Samme som kort-ID</string>
+    <string name="barcodeId">Strekkodeverdi</string>
+    <string name="importVoucherVaultMessage">Finn en fil som antagelig heter <i>voucher.vault.json</i> å importere.
+\nEller opprett den ved å trykke «Eksport» i Voucher Vault først.</string>
+    <string name="importVoucherVault">Importer fra Voucher Vault</string>
+    <string name="importLoyaltyCardKeychainMessage">Finn en fil som antagelig heter <i>LoyaltyCardKeychain.csv</i> å importere.
+\nEller opprett den i Import/eksport-menyen i Kundekortknippe ved å trykke «Eksporter» der først.</string>
+    <string name="importLoyaltyCardKeychain">Importer fra Kundekortknippe</string>
+    <string name="importFidmeMessage">Finn en fil som antagelig heter <i>fidme.export-request-xxxxx.zip</i> å importere, for så å så velge strekkodetypene manuelt etterpå-
+\nEller opprett den i din FidMe-profil ved å velge «Databeskyttelse», for så å trykke «Pakk ut dataen min» først.</string>
+    <string name="importCatimaMessage">Finn en fil som antagelig heter <i>Catima.csv</i> å importere.
+\nEller opprett den i Import/eksport-menyen i et annet Catima-program ved å trykke «Eksporter» der først.</string>
+    <string name="settings_max_font_size_scale">Maksimal skriftstørrelse</string>
+    <string name="wrongValueForBarcodeType">Verdien er ikke gyldig for valgt strekkodetype</string>
+    <string name="intent_import_card_from_url_share_multiple_text">Jeg ønsker å dele noen kort med deg</string>
+    <string name="copy_to_clipboard_multiple_toast">Kopierte kort-ID til utklippstavle</string>
+    <string name="app_resources">Frie tredjepartsressurser: <xliff:g id="app_resources_list">%s</xliff:g></string>
+    <string name="app_libraries">Frie tredjepartsbibliotek: <xliff:g id="app_libraries_list">%s</xliff:g></string>
+    <string name="card_selected">"Valgt: "</string>
+    <string name="card_ids_copied">Kopierte kort-ID(er)</string>
+    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Opphavsrett © 2019–<xliff:g>%d</xliff:g> Sylvia van Os.</string>
 </resources>

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

@@ -11,6 +11,8 @@
     <color name="colorPrimaryText">#000000</color>
     <color name="colorSecondaryText">#ffffff</color>
 
+    <color name="listItemHighlight">#88000000</color>
+
     <color name="inputContrastBackground">#070707</color>
     <color name="inputBackground">#000000</color>
     <color name="inputBorder">#222222</color>

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

@@ -1,26 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" xmlns:tools="http://schemas.android.com/tools">
     <string name="action_search">Zoeken</string>
     <string name="action_add">Toevoegen</string>
-    <string name="noGiftCards">Druk op de knop \'+\' (plus) om een kaart toe te voegen.
-\n
-\nMet Catima heb je je klantenkaarten altijd binnen handbereik, gewoon op je apparaat.</string>
-    <string name="noMatchingGiftCards">Geen zoekresultaten. Probeer een andere zoekopdracht.</string>
-    <string name="storeName">Winkel</string>
+    <string name="noGiftCards">Druk op de plusknop (‘+’) om een kaart toe te voegen of importeer kaarten via het ⋮-menu.</string>
+    <string name="noMatchingGiftCards">Geen zoekresultaten - probeer een andere zoekopdracht.</string>
+    <string name="storeName">Naam</string>
     <string name="note">Aantekening</string>
     <string name="cardId">Kaartnummer</string>
     <string name="barcodeType">Soort barcode</string>
     <string name="barcodeNoBarcode">Deze kaart heeft geen barcode</string>
     <string name="cancel">Annuleren</string>
     <string name="save">Opslaan</string>
-    <string name="editCard">Kaart bewerken</string>
     <string name="edit">Bewerken</string>
     <string name="delete">Verwijderen</string>
     <string name="confirm">Bevestigen</string>
     <string name="lockScreen">Draaien niet toestaan</string>
     <string name="unlockScreen">Draaien toestaan</string>
     <string name="deleteTitle">Kaart verwijderen</string>
-    <string name="deleteConfirmation">Bevestig dat je deze kaart wilt verwijderen.</string>
+    <string name="deleteConfirmation">Kaart verwijderen\?</string>
     <string name="ok">Oké</string>
     <string name="copy_to_clipboard">Kaartnummer kopiëren naar klembord</string>
     <string name="share">Delen</string>
@@ -31,7 +28,7 @@
     <string name="cardShortcut">Kaartsnelkoppeling</string>
     <string name="noCardsMessage">Voeg eerst een kaart toe</string>
     <string name="barcodeImageDescription">Afbeelding van barcode</string>
-    <string name="noStoreError">Geen winkelnaam ingevoerd</string>
+    <string name="noStoreError">Geen naam ingevoerd</string>
     <string name="noCardIdError">Geen kaartnummer ingevoerd</string>
     <string name="noCardExistsError">De kaart is niet aangetroffen</string>
     <string name="failedParsingImportUriError">Kan de import-uri niet verwerken</string>
@@ -46,24 +43,22 @@
     <string name="exportFailed">Het exporteren is mislukt</string>
     <string name="importing">Bezig met importeren…</string>
     <string name="exporting">Bezig met exporteren…</string>
-    <string name="noExternalStoragePermissionError">Verleen het recht \'externe opslag\' om kaarten te kunnen im- of exporteren</string>
+    <string name="noExternalStoragePermissionError">Verleen het recht ‘externe opslag’ om kaarten te kunnen im- of exporteren</string>
     <string name="exportOptionExplanation">De gegevens worden weggeschreven op een locatie naar keuze.</string>
     <string name="importOptionFilesystemTitle">Importeren uit bestandssysteem</string>
     <string name="importOptionFilesystemExplanation">Kies een specifiek bestand vanop het bestandssysteem.</string>
     <string name="importOptionFilesystemButton">Van bestandssysteem</string>
-    <string name="importOptionApplicationTitle">Externe app gebruiken</string>
+    <string name="importOptionApplicationTitle">Andere app gebruiken</string>
     <string name="importOptionApplicationExplanation">Open een bestand middels een app of je favoriete bestandsbeheerder.</string>
-    <string name="importOptionApplicationButton">Externe app gebruiken</string>
+    <string name="importOptionApplicationButton">Andere app gebruiken</string>
     <string name="about">Over</string>
     <string name="app_license">Vrije software, uitgebracht onder de GPLv3-licentie.</string>
     <string name="about_title_fmt">Over <xliff:g id="app_name">%s</xliff:g></string>
     <string name="debug_version_fmt">Versie: <xliff:g id="version">%s</xliff:g></string>
     <string name="app_revision_fmt">Versie-informatie: <xliff:g id="app_revision_url">%s</xliff:g></string>
-    <string name="app_libraries"><xliff:g id="app_name">%s</xliff:g> gebruikt de volgende bibliotheken van externe partijen: <xliff:g id="app_libraries_list">%s</xliff:g></string>
-    <string name="app_resources"><xliff:g id="app_name">%s</xliff:g> gebruikt de volgende bronnen van externe partijen: <xliff:g id="app_resources_list">%s</xliff:g></string>
     <string name="selectBarcodeTitle">Barcode toevoegen</string>
-    <string name="enterBarcodeInstructions">Voer de barcode in en kies daarna de afbeelding van de barcode die je wilt gebruiken of druk op “Deze kaart heeft geen barcode” om geen barcode te gebruiken.</string>
-    <string name="copy_to_clipboard_toast">Kaartnummer is gekopieerd naar het klembord</string>
+    <string name="enterBarcodeInstructions">Voer de kaart-id in en kies daarna het soort barcode druk op “Deze kaart heeft geen barcode”.</string>
+    <string name="copy_to_clipboard_toast">De kaart-id is gekopieerd naar het klembord</string>
     <string name="thumbnailDescription">Miniatuurvoorbeeld van kaart</string>
     <string name="settings">Instellingen</string>
     <string name="settings_category_title_ui">Vormgeving</string>
@@ -71,61 +66,84 @@
     <string name="settings_system_theme">Systeem</string>
     <string name="settings_light_theme">Licht</string>
     <string name="settings_dark_theme">Donker</string>
-    <string name="settings_card_title_list_font_size">Lettergrootte van kaartnamen (lijstmodus)</string>
-    <string name="settings_card_note_list_font_size">Lettergrootte van aantekeningen (lijstmodus)</string>
-    <string name="settings_card_title_font_size">Lettergrootte van kaartnamen (voorvertoning)</string>
-    <string name="settings_card_id_font_size">Lettergrootte van kaartnummer</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_share_text">Ik wil een klantenkaart met je delen</string>
     <string name="all">Alles</string>
     <string name="importSuccessful">De kaartgegevens zijn geïmporteerd</string>
-    <string name="deleteConfirmationGroup">Bevestig dat je deze groep wilt verwijderen</string>
-    <string name="noGroups">Druk op de knop \'+\' (plus) om een groep toe te voegen.
-\n
-\nDoor kaarten te groeperen vind je ze makkelijker terug.</string>
+    <string name="deleteConfirmationGroup">Groep verwijderen\?</string>
+    <string name="noGroups">Druk op de plusknop (‘+’) om een groep toe te voegen.</string>
     <string name="exportSuccessful">De kaartgegevens zijn geëxporteerd</string>
     <string name="groups">Groepen</string>
     <string name="enter_group_name">Voer een groepsnaam in</string>
     <string name="starImage">Favoriete ster</string>
-    <string name="app_copyright_old">Gebaseerd op Loyalty Card Keychain, copyright 2016–2020 Branden Archer.</string>
+    <string name="app_copyright_old">Gebaseerd op Loyalty Card Keychain,
+\ncopyright ©2016–2020 Branden Archer.</string>
     <string name="unstar">Verwijderen uit favorieten</string>
     <string name="star">Toevoegen aan favorieten</string>
     <string name="addManually">Kaartnummer handmatig invoeren</string>
-    <string name="leaveWithoutSaveConfirmation">Weet je zeker dat je dit wilt\? Hierdoor worden je aanpassingen niet opgeslagen.</string>
-    <string name="leaveWithoutSaveTitle">Afbreken zonder opslaan</string>
+    <string name="leaveWithoutSaveConfirmation">Weet je zeker dat je niet wilt opslaan\?</string>
+    <string name="leaveWithoutSaveTitle">Afsluiten</string>
     <string name="moveDown">Omlaag verplaatsen</string>
     <string name="moveUp">Omhoog verplaatsen</string>
-    <string name="failedOpeningFileManager">Kan de bestandsbeheerder niet openen - zorg dat je er een hebt geïnstalleerd.</string>
+    <string name="failedOpeningFileManager">Installeer een bestandsbeheerder.</string>
     <string name="noBarcode">Geen barcode</string>
     <plurals name="groupCardCount">
-        <item quantity="one"><xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%d</xliff:g> kaart</item>
-        <item quantity="other"><xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%d</xliff:g> kaarten</item>
+        <item quantity="one"><xliff:g>%d</xliff:g> kaart</item>
+        <item quantity="other"><xliff:g>%d</xliff:g> kaarten</item>
     </plurals>
-    <string name="groupsList">Groepen: <xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%s</xliff:g></string>
+    <string name="groupsList">Groepen: <xliff:g>%s</xliff:g></string>
     <string name="editBarcode">Barcode aanpassen</string>
     <string name="barcode">Barcode</string>
     <string name="card">Kaart</string>
     <string name="chooseExpiryDate">Kies een vervaldatum</string>
     <string name="never">Nooit</string>
     <string name="expiryDate">Vervaldatum</string>
-    <string name="expiryStateSentence">Vervalt op <xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%s</xliff:g></string>
-    <string name="expiryStateSentenceExpired">Verlopen: <xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%s</xliff:g></string>
+    <string name="expiryStateSentence">Vervalt op <xliff:g>%s</xliff:g></string>
+    <string name="expiryStateSentenceExpired">Verlopen: <xliff:g>%s</xliff:g></string>
     <string name="moveBarcodeToCenterOfScreen">Barcode verplaatsen naar midden van scherm</string>
     <string name="moveBarcodeToTopOfScreen">Barcode verplaatsen naar bovenkant van scherm</string>
-    <string name="parsingBalanceFailed"><xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%s</xliff:g> lijkt geen geldig saldo te zijn.</string>
+    <string name="parsingBalanceFailed"><xliff:g>%s</xliff:g> lijkt geen geldig saldo te zijn.</string>
     <string name="points">Aantal punten</string>
     <string name="currency">Valuta</string>
     <string name="balance">Saldo</string>
-    <string name="balancePoints"><xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%s</xliff:g> punten</string>
-    <string name="balanceSentence">Saldo: <xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%s</xliff:g></string>
-    <string name="chooseImportType">Uit welke app wil je gegevens importeren\?</string>
+    <string name="balancePoints"><xliff:g>%s</xliff:g> punten</string>
+    <string name="balanceSentence">Saldo: <xliff:g>%s</xliff:g></string>
+    <string name="chooseImportType">Gegevens importeren uit…\?</string>
     <string name="app_loyalty_card_keychain">Klantenkaartkluis</string>
-    <string name="settings_disable_lockscreen_while_viewing_card">Vergrendelscherm uitschakelen tijdens tonen van kaart</string>
-    <string name="settings_keep_screen_on">Scherm niet uitschakelen tijdens tonen van kaart</string>
-    <string name="privacy_policy_popup_text">Veel appwinkels vereisen dat apps na de eerste keer opstarten hun privacybeleid tonen. Dat van ons is eenvoudig:
+    <string name="settings_disable_lockscreen_while_viewing_card">Vergrendelscherm uitschakelen</string>
+    <string name="settings_keep_screen_on">Scherm niet uitschakelen</string>
+    <string name="privacy_policy_popup_text">Privacybeleid (vereist door sommige appwinkels):
 \n
-\nWe verzamelen HELEMAAL NIKS. Bovendien is onze app open source, zodat een ieder met eigen ogen kan zien wat de app wel of niet doet.</string>
-    <string name="thank_you">Bedankt</string>
+\nER WORDEN GEEN GEGEVENS VERZAMELD. Bovendien is onze app open source, zodat een ieder met eigen ogen kan zien wat de app wel of niet doet.</string>
     <string name="privacy_policy">Privacybeleid</string>
+    <string name="accept">Accepteren</string>
+    <string name="importVoucherVaultMessage">Kies het te importeren Voucher Vault-exportbestand genaamd <i>vouchervault.json</i>.
+\nOf ga naar het exportmenu van Voucher Vault om exportbestand samen te stellen.</string>
+    <string name="importVoucherVault">Importeren uit Voucher Vault</string>
+    <string name="importLoyaltyCardKeychainMessage">Kies het te importeren Klantenkaartkluis-exportbestand - genaamd <i>LoyaltyCardKeychain.csv</i>.
+\nOf ga naar het import-/exportmenu van Klantenkaartkluis om een exportbestand samen te stellen.</string>
+    <string name="importLoyaltyCardKeychain">Importeren uit Klantenkaartkluis</string>
+    <string name="importFidmeMessage">Kies het te importeren FidMe-exportbestand genaamd <i>fidme-export-request-xxxxxx.zip</i>.
+\nOf ga naar je FidMe-profiel en druk op ‘Gegevensbescherming’ om een exportbestand samen te stellen.</string>
+    <string name="importCatimaMessage">Kies het te importeren exportbestand genaamd <i>Catima.csv</i>.
+\nOf ga naar het import-/exportmenu van Catima op een ander apparaat om een exportbestand samen te stellen.</string>
+    <string name="importFidme">Importeren uit FidMe</string>
+    <string name="importCatima">Importeren uit Catima</string>
+    <string name="errorReadingImage">De afbeelding kan niet worden uitgelezen</string>
+    <string name="noBarcodeFound">Geen barcode aangetroffen</string>
+    <string name="addFromImage">Afbeelding kiezen uit galerij</string>
+    <string name="setBarcodeId">Barcodewaarde instellen</string>
+    <string name="sameAsCardId">Gelijk aan kaart-id</string>
+    <string name="barcodeId">Barcodewaarde</string>
+    <string name="settings_max_font_size_scale">Max. tekstgrootte</string>
+    <string name="unsupportedBarcodeType">Dit type barcode kan nog niet worden getoond - we hopen hiervoor in een nieuwere versie ondersteuning toe te voegen.</string>
+    <string name="wrongValueForBarcodeType">Deze waarde komt niet overeen met het gekozen barcodetype</string>
+    <string name="app_resources">Externe vrije bronnen: <xliff:g id="app_resources_list">%s</xliff:g></string>
+    <string name="app_libraries">Externe vrije bibliotheken: <xliff:g id="app_libraries_list">%s</xliff:g></string>
+    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Auteursrecht © 2019–<xliff:g>%d</xliff:g> Sylvia van Os.</string>
+    <string name="intent_import_card_from_url_share_multiple_text">Ik wil kaarten met je delen</string>
+    <string name="copy_to_clipboard_multiple_toast">De kaart-id‘s zijn gekopieerd naar het klembord</string>
+    <string name="card_ids_copied">De kaart-id‘s zijn gekopieerd</string>
+    <string name="card_selected">"Geselecteerd: "</string>
 </resources>

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

@@ -10,7 +10,6 @@
     <string name="barcodeNoBarcode">Ta karta nie ma kodu kreskowego</string>
     <string name="cancel">Anuluj</string>
     <string name="save">Zapisz</string>
-    <string name="editCard">Edytuj kartę</string>
     <string name="edit">Edytuj</string>
     <string name="delete">Usuń</string>
     <string name="confirm">Potwierdź</string>
@@ -55,10 +54,8 @@
     <string name="about_title_fmt">O <xliff:g id="app_name">%s</xliff:g></string>
     <string name="debug_version_fmt">Wersja: <xliff:g id="version">%s</xliff:g></string>
     <string name="app_revision_fmt">Info o wydaniu: <xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" id="app_revision_url">%s</xliff:g></string>
-    <string name="app_libraries"><xliff:g id="app_name">%s</xliff:g> wykorzystuje następujące biblioteki osób trzecich: <xliff:g id="app_libraries_list">%s</xliff:g></string>
-    <string name="app_resources"><xliff:g id="app_name">%s</xliff:g> wykorzystuje następujące zasoby osób trzecich: <xliff:g id="app_resources_list">%s</xliff:g></string>
     <string name="selectBarcodeTitle">Wybierz kod kreskowy</string>
-    <string name="enterBarcodeInstructions">Wprowadź identyfikator karty, a następnie wybierz obraz reprezentujący kod kreskowy, którego chcesz użyć, lub wybierz “Ta karta nie ma kodu kreskowego”, aby nie używać kodu kreskowego.</string>
+    <string name="enterBarcodeInstructions">Wprowadź identyfikator karty, a następnie wybierz obraz reprezentujący kod kreskowy, którego chcesz użyć, lub wybierz „Ta karta nie ma kodu kreskowego”, aby nie używać kodu kreskowego.</string>
     <string name="copy_to_clipboard_toast">Skopiowano identyfikator karty do schowka</string>
     <string name="thumbnailDescription">Miniaturka karty</string>
     <string name="settings">Ustawienia</string>
@@ -67,10 +64,6 @@
     <string name="settings_system_theme">Systemowy</string>
     <string name="settings_light_theme">Jasny</string>
     <string name="settings_dark_theme">Ciemny</string>
-    <string name="settings_card_title_list_font_size">Rozmiar czcionki listy tytułów kart</string>
-    <string name="settings_card_note_list_font_size">Rozmiar czcionki listy kart</string>
-    <string name="settings_card_title_font_size">Rozmiar czcionki tytułu karty</string>
-    <string name="settings_card_id_font_size">Rozmiar czcionki identyfikatora 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_share_text">Chcę udostępnić Ci kartę lojalnościową</string>
@@ -90,4 +83,4 @@
     <string name="star">Dodaj do ulubionych</string>
     <string name="noBarcode">Brak kodu kreskowego</string>
     <string name="barcodeType">Typ kodu kreskowego</string>
-</resources>
+</resources>

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

@@ -1,28 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" xmlns:tools="http://schemas.android.com/tools">
     <string name="action_search">Поиск</string>
     <string name="action_add">Добавить</string>
-    <string name="noGiftCards">Нажмите кнопку + (плюс), чтобы добавить карту.
-\n
-\nCatima хранит ваши карты на устройстве, поэтому они всегда под рукой.</string>
+    <string name="noGiftCards">Нажмите кнопку \"+\" для добавления карты или используйте меню \"⋮\" для импортирования.</string>
     <string name="noMatchingGiftCards">Ничего не найдено. Попробуйте изменить поисковый запрос.</string>
-    <string name="storeName">Магазин</string>
+    <string name="storeName">Название</string>
     <string name="note">Примечание</string>
     <string name="cardId">Номер карты</string>
     <string name="barcodeType">Тип штрих-кода</string>
     <string name="barcodeNoBarcode">Эта карта без штрих-кода</string>
     <string name="cancel">Отменить</string>
     <string name="save">Сохранить</string>
-    <string name="editCard">Изменить штрих-код</string>
     <string name="edit">Изменить</string>
     <string name="delete">Удалить карту</string>
     <string name="confirm">Подтвердить</string>
     <string name="lockScreen">Блокировать поворот экрана</string>
     <string name="unlockScreen">Автоповорот экрана</string>
     <string name="deleteTitle">Удаление карты</string>
-    <string name="deleteConfirmation">Подтвердите удаление карты.</string>
+    <string name="deleteConfirmation">Удалить карту\?</string>
     <string name="ok">ОК</string>
-    <string name="copy_to_clipboard">Скопировать номер карты в буфер обмена</string>
+    <string name="copy_to_clipboard">Копировать номер карты</string>
     <string name="share">Переслать</string>
     <string name="sendLabel">Отправить…</string>
     <string name="editCardTitle">Изменить карту</string>
@@ -31,11 +28,11 @@
     <string name="cardShortcut">Ярлык карты</string>
     <string name="noCardsMessage">Сначала добавьте карту</string>
     <string name="barcodeImageDescription">Изображение штрих-кода карты</string>
-    <string name="noStoreError">Название магазина не указано</string>
+    <string name="noStoreError">Название не указано</string>
     <string name="noCardIdError">Номер карты не указан</string>
     <string name="noCardExistsError">Карта не найдена</string>
     <string name="failedParsingImportUriError">Невозможно разобрать импортируемый URI</string>
-    <string name="importExport">Импорт/экспорт</string>
+    <string name="importExport">Импорт/Экспорт</string>
     <string name="exportName">Экспорт</string>
     <string name="importExportHelp">Резервное копирование карт позволяет переместить их на другое устройство.</string>
     <string name="importSuccessfulTitle">Импортировано</string>
@@ -56,13 +53,11 @@
     <string name="importOptionApplicationButton">Использовать другое приложение</string>
     <string name="about">О приложении</string>
     <string name="app_license">Авторское лево свободного программного обеспечения, лицензия GPLv3+.</string>
-    <string name="about_title_fmt">О приложении <xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" id="app_name">%s</xliff:g></string>
+    <string name="about_title_fmt">О приложении <xliff:g id="app_name">%s</xliff:g></string>
     <string name="debug_version_fmt">Версия: <xliff:g id="version">%s</xliff:g></string>
-    <string name="app_revision_fmt">Информация о версиях: <xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" id="app_revision_url">%s</xliff:g></string>
-    <string name="app_libraries"><xliff:g id="app_name">%s</xliff:g> использует следующие сторонние библиотеки: <xliff:g id="app_libraries_list">%s</xliff:g></string>
-    <string name="app_resources"><xliff:g id="app_name">%s</xliff:g> использует следующие сторонние ресурсы: <xliff:g id="app_resources_list">%s</xliff:g></string>
+    <string name="app_revision_fmt">Информация о версиях: <xliff:g id="app_revision_url">%s</xliff:g></string>
     <string name="selectBarcodeTitle">Выбор штрих-кода</string>
-    <string name="enterBarcodeInstructions">Введите номер карты и выберите тип штрих-кода.</string>
+    <string name="enterBarcodeInstructions">Введите номер карты и выберите тип штрих-кода. Или выберите \"Эта карта без штрих-кода\".</string>
     <string name="copy_to_clipboard_toast">Номер карты скопирован в буфер обмена</string>
     <string name="thumbnailDescription">Логотип карты</string>
     <string name="settings">Настройки</string>
@@ -71,44 +66,38 @@
     <string name="settings_system_theme">Системная</string>
     <string name="settings_light_theme">Светлая</string>
     <string name="settings_dark_theme">Тёмная</string>
-    <string name="settings_card_title_list_font_size">Размер шрифта названия карты (список)</string>
-    <string name="settings_card_note_list_font_size">Размер шрифта примечания (список)</string>
-    <string name="settings_card_title_font_size">Размер шрифта названия карты (просмотр)</string>
-    <string name="settings_card_id_font_size">Размер шрифта номера карты</string>
     <string name="settings_display_barcode_max_brightness">Максимальная яркость при показе карты</string>
     <string name="settings_lock_barcode_orientation">Портретная ориентация экрана при показе карты</string>
     <string name="intent_import_card_from_url_share_text">Я хочу поделиться картой с вами</string>
-    <string name="exportSuccessful">Данные карты экспортированы</string>
+    <string name="exportSuccessful">Данные карт успешно экспортированы</string>
     <string name="all">Все</string>
-    <string name="noGroups">Нажмите кнопку + (плюс), чтобы добавить группы.
-\n
-\nГруппы упрощают поиск.</string>
+    <string name="noGroups">Нажмите кнопку \"+\", чтобы добавить группы для упорядочивания записей.</string>
     <string name="groups">Группы</string>
     <string name="enter_group_name">Введите название группы</string>
-    <string name="importSuccessful">Данные карты успешно импортированы</string>
+    <string name="importSuccessful">Данные карт успешно импортированы</string>
     <string name="starImage">Звезда избранного</string>
-    <string name="app_copyright_old">На основе Loyalty Card Keychain, авторские права 2016–2020 Branden Archer.</string>
+    <string name="app_copyright_old">На основе Loyalty Card Keychain
+\nавторские права © 2016–2020 Branden Archer.</string>
     <string name="unstar">Удалить из избранного</string>
     <string name="star">Добавить в избранное</string>
     <string name="noBarcode">Нет штрих-кода</string>
-    <string name="deleteConfirmationGroup">Подтвердите, что хотите удалить эту группу</string>
-    <string name="leaveWithoutSaveConfirmation">Вы уверены, что хотите покинуть этот экран\? Изменения не будут сохранены.</string>
-    <string name="leaveWithoutSaveTitle">Выйти без сохранения</string>
-    <string name="failedOpeningFileManager">Невозможно открыть файловый менеджер. Убедитесь, что он установлен.</string>
-    <string name="balancePoints"><xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%s</xliff:g> баллов</string>
-    <string name="balanceSentence">Баланс: <xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%s</xliff:g></string>
-    <string name="expiryStateSentenceExpired">Истёк срок действия: <xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%s</xliff:g></string>
-    <string name="expiryStateSentence">Истекает срок действия: <xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%s</xliff:g></string>
+    <string name="deleteConfirmationGroup">Удалить группу\?</string>
+    <string name="leaveWithoutSaveConfirmation">Выйти без сохранения\?</string>
+    <string name="leaveWithoutSaveTitle">Выход</string>
+    <string name="failedOpeningFileManager">Требуется файловый менеджер.</string>
+    <string name="balancePoints"><xliff:g>%s</xliff:g> баллов</string>
+    <string name="balanceSentence">Баланс: <xliff:g>%s</xliff:g></string>
+    <string name="expiryStateSentenceExpired">Срок действия истёк: <xliff:g>%s</xliff:g></string>
+    <string name="expiryStateSentence">Срок действия истекает: <xliff:g>%s</xliff:g></string>
     <string name="points">Баллы</string>
-    <string name="parsingBalanceFailed"><xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%s</xliff:g> не похож на правильный баланс.</string>
+    <string name="parsingBalanceFailed"><xliff:g>%s</xliff:g> не похож на правильный баланс.</string>
     <string name="addManually">Ручной ввод номера карты</string>
-    <string name="privacy_policy_popup_text">Многие магазины приложений требуют, чтобы приложение показывало свою политику конфиденциальности при первом запуске. Вот наша:
+    <string name="privacy_policy_popup_text">Уведомление о политике конфиденциальности (требуется некоторыми магазинами приложений):
 \n
-\nМы НЕ собираем НИКАКИХ ДАННЫХ и наше приложение имеет открытый исходный код, так что любой может убедиться в том, что это правда.</string>
-    <string name="thank_you">Спасибо</string>
+\nНИКАКИЕ ДАННЫЕ НЕ СОБИРАЮТСЯ ВООБЩЕ, что может подтвердить любой, так как наше приложение является свободным программным обеспечением.</string>
     <string name="privacy_policy">Политика конфиденциальности</string>
     <string name="app_loyalty_card_keychain">Loyalty Card Keychain</string>
-    <string name="chooseImportType">Из какого приложения импортировать данные\?</string>
+    <string name="chooseImportType">Откуда импортировать данные\?</string>
     <string name="balance">Баланс</string>
     <string name="moveBarcodeToTopOfScreen">Переместить штрих-код в верхнюю часть экрана</string>
     <string name="moveBarcodeToCenterOfScreen">Центрировать штрих-код на экране</string>
@@ -119,15 +108,44 @@
     <string name="editBarcode">Изменить штрих-код</string>
     <string name="barcode">Штрих-код</string>
     <string name="card">Карта</string>
-    <string name="groupsList">Группы: <xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%s</xliff:g></string>
-    <string name="moveDown">Переместить ниже в вписке</string>
-    <string name="moveUp">Переместить выше в вписке</string>
-    <string name="settings_disable_lockscreen_while_viewing_card">Не блокировать экран при показе карты</string>
-    <string name="settings_keep_screen_on">Не отключать экран при показе карты</string>
+    <string name="groupsList">Группы: <xliff:g>%s</xliff:g></string>
+    <string name="moveDown">Переместить ниже</string>
+    <string name="moveUp">Переместить выше</string>
+    <string name="settings_disable_lockscreen_while_viewing_card">Не давать блокировать экран</string>
+    <string name="settings_keep_screen_on">Не отключать экран</string>
     <plurals name="groupCardCount">
-        <item quantity="one"><xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%d</xliff:g> карта</item>
-        <item quantity="few"><xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%d</xliff:g> карты</item>
-        <item quantity="many"><xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%d</xliff:g> карт</item>
-        <item quantity="other"><xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%d</xliff:g> карт</item>
+        <item quantity="one"><xliff:g>%d</xliff:g> карта</item>
+        <item quantity="few"><xliff:g>%d</xliff:g> карты</item>
+        <item quantity="many"><xliff:g>%d</xliff:g> карт</item>
+        <item quantity="other"><xliff:g>%d</xliff:g> карт</item>
     </plurals>
+    <string name="accept">Принять</string>
+    <string name="importVoucherVaultMessage">Выберите файл для импортирования, обычно именуемый <i>vouchervault.json</i>.
+\nФайл экспорта можно создать в приложении Voucher Vault, нажав кнопку \"Экспорт\".</string>
+    <string name="importVoucherVault">Импорт из Voucher Vault</string>
+    <string name="importFidmeMessage">Выберите файл для импортирования, обычно именуемый <i>fidme-export-request-xxxxxx.zip</i>, а затем вручную выберите типы штрих-кодов.
+\nФайл экспорта можно создать в приложении FidMe, перейдя в свой профиль, выбрав функцию \"Защита данных\", и затем нажав кнопку \"Извлечь мои данные\".</string>
+    <string name="importLoyaltyCardKeychainMessage">Выберите файл экспорта, обычно именуемый <i>LoyaltyCardKeychain.csv</i>.
+\nФайл экспорта можно создать в приложении Loyalty Card Keychain, перейдя в меню \"Импорт/Экспорт\" и нажав кнопку \"Экспорт\".</string>
+    <string name="importLoyaltyCardKeychain">Импорт из Loyalty Card Keychain</string>
+    <string name="importCatimaMessage">Выберите файл для импортирования, обычно именуемый <i>Catima.csv</i>.
+\nФайл экспорта можно создать в другой копии Catima, перейдя в меню \"Импорт/Экспорт\" и нажав кнопку \"Экспорт\".</string>
+    <string name="importFidme">Импорт из FidMe</string>
+    <string name="importCatima">Импорт из Catima</string>
+    <string name="errorReadingImage">Невозможно считать изображение</string>
+    <string name="noBarcodeFound">Штрих-код не найден</string>
+    <string name="addFromImage">Выбрать изображение из галереи</string>
+    <string name="setBarcodeId">Указать значение</string>
+    <string name="sameAsCardId">Как номер карты</string>
+    <string name="barcodeId">Значение штрих-кода</string>
+    <string name="settings_max_font_size_scale">Максимальный размер шрифта</string>
+    <string name="unsupportedBarcodeType">В настоящее время данный тип штрих-кодов не отображается. Его поддержка может быть добавлена в следующих версиях приложения.</string>
+    <string name="wrongValueForBarcodeType">Недопустимое значение для выбранного типа штрих-кода</string>
+    <string name="app_resources">Сторонние свободные ресурсы: <xliff:g id="app_resources_list">%s</xliff:g></string>
+    <string name="app_libraries">Сторонние свободные библиотеки: <xliff:g id="app_libraries_list">%s</xliff:g></string>
+    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Авторские права © 2019–<xliff:g>%d</xliff:g> Sylvia van Os.</string>
+    <string name="intent_import_card_from_url_share_multiple_text">Поделиться картами</string>
+    <string name="card_ids_copied">Скопированные номера карт</string>
+    <string name="copy_to_clipboard_multiple_toast">Номера карт скопированы в буфер обмена</string>
+    <string name="card_selected">"Выбрано: "</string>
 </resources>

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

@@ -9,7 +9,6 @@
     <string name="cardId">ID karty</string>
     <string name="cancel">Zrušiť</string>
     <string name="save">Uložiť</string>
-    <string name="editCard">Úprava karty</string>
     <string name="edit">Upraviť</string>
     <string name="delete">Vymazať</string>
     <string name="confirm">Potvrdiť</string>
@@ -55,8 +54,6 @@
     <string name="about_title_fmt">O <xliff:g id="app_name">%s</xliff:g></string>
     <string name="debug_version_fmt">Verzia: <xliff:g id="version">%s</xliff:g></string>
     <string name="app_revision_fmt">Informácia pri revízii: <xliff:g id="app_revision_url">%s</xliff:g></string>
-    <string name="app_libraries"><xliff:g id="app_name">%s</xliff:g> používa nasledujúce knižnice tretej strany: <xliff:g id="app_libraries_list">%s</xliff:g></string>
-    <string name="app_resources"><xliff:g id="app_name">%s</xliff:g> používa tieto knižnice tretích strán: <xliff:g id="app_resources_list">%s</xliff:g></string>
 
     <string name="selectBarcodeTitle">Vyberte čiarový kód</string>
     <string name="copy_to_clipboard_toast">ID karty skopírované do schránky</string>
@@ -65,10 +62,6 @@
 
     <string name="settings">Nastavenia</string>
     <string name="settings_category_title_ui">Používateľské prostredie</string>
-    <string name="settings_card_title_list_font_size">Veľkosť názvu karty v zozname</string>
-    <string name="settings_card_note_list_font_size">Veľkosť poznámky v zozname</string>
-    <string name="settings_card_title_font_size">Veľkosť názvu karty</string>
-    <string name="settings_card_id_font_size">Veľkosť ID karty pod čiarovým kódom</string>
     <string name="settings_display_barcode_max_brightness">Zvýšiť jas pri zobrazení čiarového kódu </string>
     <string name="settings_lock_barcode_orientation">Uzamkni orientáciu čiarového kódu</string>
     </resources>

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

@@ -1,15 +1,12 @@
-<resources
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <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="cancel">Prekliči</string>
     <string name="save">Shrani</string>
-    <string name="editCard">Uredi kartico</string>
     <string name="edit">Uredi</string>
     <string name="delete">Izbriši</string>
     <string name="confirm">Potrdi</string>
@@ -19,15 +16,13 @@
     <string name="deleteConfirmation">Prosim potrdite, če želite izbrisati to kartico.</string>
     <string name="ok">Vredu</string>
     <string name="copy_to_clipboard">Kopirajte številko kartice</string>
-    <string name="sendLabel">Pošlji#8230;</string>
+    <string name="sendLabel">Pošlji…</string>
     <string name="editCardTitle">Uredi kartico zvestobe</string>
     <string name="addCardTitle">Dodaj 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>
-
     <string name="barcodeImageDescription">Slika črtne kode na kartici</string>
-
     <string name="noStoreError">Ime trgovine ni bilo vnešeno</string>
     <string name="noCardIdError">Številka kartice ni bila vnešena</string>
     <string name="noCardExistsError">Te kartice zvestobe ni bilo moč najti</string>
@@ -40,8 +35,8 @@
     <string name="exportSuccessfulTitle">Izvoz je uspel</string>
     <string name="exportFailedTitle">Izvoz ni uspel</string>
     <string name="exportFailed">Napaka pri izvozu</string>
-    <string name="importing">Uvažanje&#8230;</string>
-    <string name="exporting">Izvažanje&#8230;</string>
+    <string name="importing">Uvažanje…</string>
+    <string name="exporting">Izvažanje…</string>
     <string name="noExternalStoragePermissionError">Izvažanje in uvažanje je nemogoče brez omogočenega dostopa do zunanje shrambe</string>
     <string name="importOptionFilesystemTitle">Uvozi iz datotečnega sistema</string>
     <string name="importOptionFilesystemExplanation">Izberite specifično datoteko iz datotečnega sistema</string>
@@ -49,26 +44,16 @@
     <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="about">Več o aplikaciji</string>
     <string name="app_license">Licencirano s skladu z GPLv3.</string>
     <string name="about_title_fmt">Več o <xliff:g id="app_name">%s</xliff:g></string>
     <string name="debug_version_fmt">Verzija: <xliff:g id="version">%s</xliff:g></string>
     <string name="app_revision_fmt">Informacije o popravkih: <xliff:g id="app_revision_url">%s</xliff:g></string>
-    <string name="app_libraries"><xliff:g id="app_name">%s</xliff:g> uporablja sledeče zunanje knjižnice: <xliff:g id="app_libraries_list">%s</xliff:g> </string>
-    <string name="app_resources"><xliff:g id="app_name">%s</xliff:g>uporablja sledeče zunanje vire: <xliff:g id="app_resources_list">%s</xliff:g></string>
-
     <string name="selectBarcodeTitle">Izberite črtno kodo</string>
     <string name="copy_to_clipboard_toast">Številka kartice je bila kopirana v odložišče</string>
-
     <string name="thumbnailDescription">Ikona kartice</string>
-
     <string name="settings">Nastavitve</string>
     <string name="settings_category_title_ui">Uporabniški vmesnik</string>
-    <string name="settings_card_title_list_font_size">Velikost pisave seznama naslovov kartic</string>
-    <string name="settings_card_note_list_font_size">Velikost pisave seznama zabeležk </string>
-    <string name="settings_card_title_font_size">Velikost pisave imen kartic</string>
-    <string name="settings_card_id_font_size">Velikost pisave številke kartice</string>
     <string name="settings_display_barcode_max_brightness">Povečaj osvetljenost prikaza črtne kode</string>
     <string name="settings_lock_barcode_orientation">Zakleni orientacijo črtne kode</string>
-    </resources>
+</resources>

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

@@ -1,8 +1,9 @@
-<resources>>
+<resources>
 
     <style name="AppTheme.NoActionBar" parent="AppTheme">
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
         <item name="android:windowDrawsSystemBarBackgrounds">true</item>
     </style>
+
 </resources>

app/src/main/res/values-zh-rCN/strings.xml

@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" xmlns:tools="http://schemas.android.com/tools">
+    <string name="app_revision_fmt">更新日志: <xliff:g id="app_revision_url">%s</xliff:g></string>
+    <string name="groupsList">组：<xliff:g>%s</xliff:g></string>
+    <plurals name="groupCardCount">
+        <item quantity="other"><xliff:g>%d</xliff:g> 卡片</item>
+    </plurals>
+    <string name="app_libraries">第三方自由程序库: <xliff:g id="app_libraries_list">%s</xliff:g></string>
+    <string name="debug_version_fmt">版本: <xliff:g id="version">%s</xliff:g></string>
+    <string name="about_title_fmt">关于 <xliff:g id="app_name">%s</xliff:g></string>
+    <string name="barcode">条形码</string>
+    <string name="card">卡片</string>
+    <string name="addManually">手动输入卡号</string>
+    <string name="settings_system_theme">系统设置</string>
+    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Copyright © 2019–<xliff:g>%d</xliff:g> Sylvia van Os.</string>
+    <string name="importOptionApplicationButton">使用其他应用</string>
+    <string name="importOptionFilesystemButton">从文件系统</string>
+    <string name="barcodeImageDescription">卡片二维码图像</string>
+    <string name="unstar">从收藏中删除</string>
+    <string name="intent_import_card_from_url_share_multiple_text">我想和你分享一些卡片</string>
+    <string name="copy_to_clipboard_multiple_toast">已将卡号复制到剪贴板</string>
+    <string name="wrongValueForBarcodeType">该值对所选条形码类型无效</string>
+    <string name="unsupportedBarcodeType">此条形码类型尚无法显示。较新版本的应用程序可能提供支持。</string>
+    <string name="setBarcodeId">设置条形码值</string>
+    <string name="sameAsCardId">与卡号相同</string>
+    <string name="barcodeId">条形码值</string>
+    <string name="importVoucherVaultMessage">找到一个可能名为<i>vouchervault.json</i>的文件进行导入。
+\n或者先在Voucher Vault中按下导出键来创建导出。</string>
+    <string name="importVoucherVault">从 Voucher Vault 导入</string>
+    <string name="importLoyaltyCardKeychainMessage">找到一个很可能名为<i>LoyaltyCardKeychain.csv</i>的文件来导入。
+\n或者先从Loyalty Card Keychain的Import/Export菜单中选择Export来导出。</string>
+    <string name="importLoyaltyCardKeychain">从 Loyalty Card Keychain 导入</string>
+    <string name="importFidmeMessage">找到一个可能名为<i>fidme-export-request-xxxxxx.zip</i>的文件进行导入，之后再手动选择条码类型。
+\n或者从你的FidMe配置文件中选择数据保护，然后按提取我的数据来创建导出。</string>
+    <string name="importFidme">从 FidMe 导入</string>
+    <string name="importCatimaMessage">找到一个可能名为<i>Catima.csv</i>的文件来导入。
+\n或者先从另一个Catima应用程序的导入/导出菜单中，来创建导出。</string>
+    <string name="importCatima">从 Catima 导入</string>
+    <string name="accept">接受</string>
+    <string name="privacy_policy_popup_text">隐私政策通知（一些应用程序商店要求）。
+\n
+\n本应用没有收集任何数据，任何人都可以查阅源码来确认，因为本软件是自由软件。</string>
+    <string name="privacy_policy">隐私政策</string>
+    <string name="app_loyalty_card_keychain">Loyalty Card Keychain</string>
+    <string name="chooseImportType">导入数据？</string>
+    <string name="parsingBalanceFailed"><xliff:g>%s</xliff:g>似乎不是有效的余额。</string>
+    <string name="points">积分</string>
+    <string name="currency">货币</string>
+    <string name="balance">余额</string>
+    <string name="errorReadingImage">无法读取图像</string>
+    <string name="noBarcodeFound">未找到条形码</string>
+    <string name="moveBarcodeToCenterOfScreen">将条形码居中显示</string>
+    <string name="moveBarcodeToTopOfScreen">将条形码移到屏幕的顶部</string>
+    <string name="chooseExpiryDate">选择到期日</string>
+    <string name="never">从不</string>
+    <string name="expiryDate">过期时间</string>
+    <string name="editBarcode">编辑条形码</string>
+    <string name="balancePoints"><xliff:g>%s</xliff:g>分</string>
+    <string name="balanceSentence">余额：<xliff:g>%s</xliff:g></string>
+    <string name="expiryStateSentenceExpired">过期：<xliff:g>%s</xliff:g></string>
+    <string name="expiryStateSentence">过期: <xliff:g>%s</xliff:g></string>
+    <string name="addFromImage">从相册中选择图片</string>
+    <string name="leaveWithoutSaveConfirmation">不保存就离开吗？</string>
+    <string name="leaveWithoutSaveTitle">退出</string>
+    <string name="moveDown">向下移</string>
+    <string name="moveUp">向上移</string>
+    <string name="failedOpeningFileManager">请先安装文件管理器。</string>
+    <string name="deleteConfirmationGroup">删除群组？</string>
+    <string name="all">全部</string>
+    <string name="noGroups">点击 \"+\" 按钮，先添加组进行分类。</string>
+    <string name="enter_group_name">输入组名</string>
+    <string name="groups">组</string>
+    <string name="exportSuccessful">已导出卡片数据</string>
+    <string name="importSuccessful">已导入卡片数据</string>
+    <string name="intent_import_card_from_url_share_text">我想和你分享一张卡</string>
+    <string name="settings_disable_lockscreen_while_viewing_card">禁用锁屏</string>
+    <string name="settings_keep_screen_on">保持屏幕常亮</string>
+    <string name="settings_lock_barcode_orientation">锁定条码方向</string>
+    <string name="settings_display_barcode_max_brightness">提高条码界面亮度</string>
+    <string name="settings_max_font_size_scale">最大字体大小</string>
+    <string name="settings_dark_theme">暗色</string>
+    <string name="settings_light_theme">浅色</string>
+    <string name="settings_theme">主题</string>
+    <string name="settings_category_title_ui">用户界面</string>
+    <string name="settings">设置</string>
+    <string name="thumbnailDescription">卡片缩略图</string>
+    <string name="copy_to_clipboard_toast">已复制卡号到剪贴板</string>
+    <string name="enterBarcodeInstructions">输入卡号，并从下面选择其条码类型，或选择\"此卡片没有条码\"。</string>
+    <string name="selectBarcodeTitle">选择条码</string>
+    <string name="app_resources">第三方自由资源：<xliff:g id="app_resources_list">%s</xliff:g></string>
+    <string name="app_license">本软件为自由软件，使用 GPLv3+ 许可.</string>
+    <string name="app_copyright_old">基于 Loyalty Card Keychain
+\ncopyright © 2016–2020 Branden Archer.</string>
+    <string name="about">关于</string>
+    <string name="importOptionApplicationExplanation">使用任何应用程序或您喜欢的文件管理器打开文件。</string>
+    <string name="importOptionApplicationTitle">使用其他应用</string>
+    <string name="importOptionFilesystemExplanation">请从文件系统选择文件.</string>
+    <string name="importOptionFilesystemTitle">从文件系统导入</string>
+    <string name="exportOptionExplanation">导出的数据将储存至你选择的位置.</string>
+    <string name="noExternalStoragePermissionError">在导入导出前需要获得外部储存权限</string>
+    <string name="exporting">导出中…</string>
+    <string name="importing">导入中…</string>
+    <string name="exportFailed">无法导出卡片</string>
+    <string name="exportFailedTitle">导出失败</string>
+    <string name="exportSuccessfulTitle">导出成功</string>
+    <string name="importFailed">无法导入卡片</string>
+    <string name="importFailedTitle">导入失败</string>
+    <string name="importSuccessfulTitle">导入成功</string>
+    <string name="importExportHelp">备份卡片后你可以让你将它们转移到其他设备。</string>
+    <string name="exportName">导出</string>
+    <string name="importExport">导入/导出</string>
+    <string name="failedParsingImportUriError">无法解析导入的URI</string>
+    <string name="noCardExistsError">无法到卡片</string>
+    <string name="noCardIdError">未输入卡号</string>
+    <string name="noStoreError">未输入卡片名称</string>
+    <string name="card_ids_copied">复制卡号</string>
+    <string name="noCardsMessage">请先添加一张卡片</string>
+    <string name="cardShortcut">卡片快捷键</string>
+    <string name="editCardTitle">编辑卡片</string>
+    <string name="addCardTitle">添加卡片</string>
+    <string name="scanCardBarcode">扫描卡片条码</string>
+    <string name="sendLabel">发送…</string>
+    <string name="share">分享</string>
+    <string name="copy_to_clipboard">复制卡号到剪贴板</string>
+    <string name="ok">确定</string>
+    <string name="deleteConfirmation">删除此卡？</string>
+    <string name="deleteTitle">移除卡片</string>
+    <string name="unlockScreen">解除旋转锁定</string>
+    <string name="lockScreen">锁定旋转</string>
+    <string name="confirm">确认</string>
+    <string name="delete">删除</string>
+    <string name="edit">编辑</string>
+    <string name="save">保存</string>
+    <string name="cancel">取消</string>
+    <string name="star">添加到收藏</string>
+    <string name="noBarcode">无条形码</string>
+    <string name="barcodeNoBarcode">此卡无条形码</string>
+    <string name="barcodeType">条形码类型</string>
+    <string name="cardId">卡号</string>
+    <string name="note">备注</string>
+    <string name="storeName">名称</string>
+    <string name="noMatchingGiftCards">没有找到任何东西。尝试改变你的搜索。</string>
+    <string name="noGiftCards">点击 \"+\"加号按钮来添加卡片，或者先从⋮菜单中导入一些。</string>
+    <string name="card_selected">"选中： "</string>
+    <string name="action_add">添加</string>
+    <string name="action_search">搜索</string>
+</resources>

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

@@ -2,6 +2,7 @@
 <resources>
     <string-array name="import_types_array">
         <item>Catima</item>
+        <item>Fidme</item>
         <item>@string/app_loyalty_card_keychain</item>
         <item>Voucher Vault</item>
     </string-array>

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

@@ -10,6 +10,8 @@
     <color name="colorPrimaryText">#ffffff</color>
     <color name="colorSecondaryText">#000000</color>
 
+    <color name="listItemHighlight">#44000000</color>
+
     <color name="inputContrastBackground">#F8F8F8</color>
     <color name="inputBackground">#FFFFFF</color>
     <color name="inputBorder">#DDDDDD</color>

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

@@ -2,4 +2,6 @@
 <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>
+    <integer name="full_rotation_duration">100</integer>
+    <integer name="half_rotation_duration">50</integer>
 </resources>

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

@@ -34,5 +34,6 @@
 
     <!-- The default letter tile text size -->
     <dimen name="tileLetterFontSize">33sp</dimen>
+    <dimen name="tileLetterFontSizeForShortcut">24dp</dimen>
     <dimen name="cardViewLetterFontSize">100sp</dimen>
 </resources>

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

@@ -24,18 +24,9 @@
     </array>
 
     <!-- Default values -->
-    <integer name="settings_card_title_list_font_size_sp">28</integer>
-    <integer name="settings_card_note_list_font_size_sp">14</integer>
-    <integer name="settings_card_title_font_size_sp">40</integer>
-    <integer name="settings_card_id_font_size_sp">50</integer>
+    <integer name="settings_max_font_size_scale_pct">100</integer>
 
     <!-- Constraints -->
-    <integer name="settings_card_title_list_max_font_size_sp">40</integer>
-    <integer name="settings_card_title_list_min_font_size_sp">16</integer>
-    <integer name="settings_card_note_list_max_font_size_sp">25</integer>
-    <integer name="settings_card_note_list_min_font_size_sp">10</integer>
-    <integer name="settings_card_title_max_font_size_sp">50</integer>
-    <integer name="settings_card_title_min_font_size_sp">16</integer>
-    <integer name="settings_card_id_max_font_size_sp">50</integer>
-    <integer name="settings_card_id_min_font_size_sp">16</integer>
+    <integer name="settings_max_font_size_scale_pct_min">50</integer>
+    <integer name="settings_max_font_size_scale_pct_max">200</integer>
 </resources>

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

@@ -4,11 +4,12 @@
 
     <string name="action_search">Search</string>
     <string name="action_add">Add</string>
+    <string name="card_selected">Selected:\u0020</string>
 
-    <string name="noGiftCards">Click the "+" (plus) button to add a card first.\n\nCatima carries your cards on the device, so they are always within reach.</string>
+    <string name="noGiftCards">Click the + plus button to add a card, or import some from the ⋮ menu first.</string>
     <string name="noMatchingGiftCards">Didn\'t find anything. Try changing your search.</string>
 
-    <string name="storeName">Store</string>
+    <string name="storeName">Name</string>
     <string name="note">Note</string>
     <string name="cardId">Card ID</string>
     <string name="barcodeType">Barcode type</string>
@@ -20,14 +21,13 @@
 
     <string name="cancel">Cancel</string>
     <string name="save">Save</string>
-    <string name="editCard">Edit Card</string>
     <string name="edit">Edit</string>
     <string name="delete">Delete</string>
     <string name="confirm">Confirm</string>
     <string name="lockScreen">Block Rotation</string>
     <string name="unlockScreen">Unblock Rotation</string>
     <string name="deleteTitle">Remove Card</string>
-    <string name="deleteConfirmation">Please confirm you want to delete this card.</string>
+    <string name="deleteConfirmation">Delete this card?</string>
     <string name="ok">OK</string>
     <string name="copy_to_clipboard">Copy ID to clipboard</string>
     <string name="share">Share</string>
@@ -37,10 +37,11 @@
     <string name="scanCardBarcode">Scan Card Barcode</string>
     <string name="cardShortcut">Card Shortcut</string>
     <string name="noCardsMessage">Add a card first</string>
+    <string name="card_ids_copied">Copied Card ID(s)</string>
 
     <string name="barcodeImageDescription">Image of card barcode</string>
 
-    <string name="noStoreError">No store entered</string>
+    <string name="noStoreError">No name entered</string>
     <string name="noCardIdError">No card ID entered</string>
     <string name="noCardExistsError">Could not find card</string>
     <string name="failedParsingImportUriError">Could not parse the import URI</string>
@@ -60,22 +61,22 @@
     <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 app</string>
+    <string name="importOptionApplicationTitle">Use another app</string>
     <string name="importOptionApplicationExplanation">Use any app or your favorite file manager to open a file.</string>
-    <string name="importOptionApplicationButton">Use external app</string>
+    <string name="importOptionApplicationButton">Use another app</string>
 
     <string name="about">About</string>
-    <string name="app_copyright_fmt" translatable="false" tools:ignore="PluralsCandidate">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" tools:ignore="PluralsCandidate">Copyright © 2019–<xliff:g>%d</xliff:g> Sylvia van Os.</string>
+    <string name="app_copyright_old">Based on Loyalty Card Keychain\ncopyright © 2016–2020 Branden Archer.</string>
     <string name="app_license">Copylefted libre software, licensed GPLv3+.</string>
     <string name="about_title_fmt">About <xliff:g id="app_name">%s</xliff:g></string>
     <string name="debug_version_fmt">Version: <xliff:g id="version">%s</xliff:g></string>
     <string name="app_revision_fmt">Revision Info: <xliff:g id="app_revision_url">%s</xliff:g></string>
-    <string name="app_libraries"><xliff:g id="app_name">%s</xliff:g> uses the following third-party libraries: <xliff:g id="app_libraries_list">%s</xliff:g></string>
-    <string name="app_resources"><xliff:g id="app_name">%s</xliff:g> uses the following third-party resources: <xliff:g id="app_resources_list">%s</xliff:g></string>
+    <string name="app_libraries">Third-party libre libraries: <xliff:g id="app_libraries_list">%s</xliff:g></string>
+    <string name="app_resources">Third-party libre resources: <xliff:g id="app_resources_list">%s</xliff:g></string>
 
     <string name="selectBarcodeTitle">Select Barcode</string>
-    <string name="enterBarcodeInstructions">Enter the card ID then select the image which represents the barcode you want to use, or select &#8220;This card has no barcode&#8221; to not use a barcode.</string>
+    <string name="enterBarcodeInstructions">Enter the card ID, and either pick its barcode type below, or &#8220;This card has no barcode&#8221;.</string>
 
     <string name="copy_to_clipboard_toast">Card ID copied to clipboard</string>
 
@@ -92,21 +93,16 @@
     <string name="settings_key_light_theme" translatable="false">light</string>
     <string name="settings_dark_theme">Dark</string>
     <string name="settings_key_dark_theme" translatable="false">dark</string>
-    <string name="settings_card_title_list_font_size">Card title font size (list mode)</string>
-    <string name="settings_key_card_title_list_font_size" translatable="false">pref_card_title_list_font_size_sp</string>
-    <string name="settings_card_note_list_font_size">Card note font size (list mode)</string>
-    <string name="settings_key_card_note_list_font_size" translatable="false">pref_card_note_list_font_size_sp</string>
-    <string name="settings_card_title_font_size">Card title font size (preview)</string>
-    <string name="settings_key_card_title_font_size" translatable="false">pref_card_title_font_size_sp</string>
-    <string name="settings_card_id_font_size">Card ID font size</string>
-    <string name="settings_key_card_id_font_size" translatable="false">pref_card_id_font_size_sp</string>
+    <string name="settings_key_max_font_size_scale" translatable="false">pref_max_font_size_scale</string>
+    <string name="settings_max_font_size_scale">Max. font size</string>
+
     <string name="settings_display_barcode_max_brightness">Brighten barcode view</string>
     <string name="settings_key_display_barcode_max_brightness" translatable="false">pref_display_card_max_brightness</string>
     <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="settings_keep_screen_on">Keep screen on while viewing a card</string>
+    <string name="settings_keep_screen_on">Keep screen on</string>
     <string name="settings_key_keep_screen_on" translatable="false">pref_keep_screen_on</string>
-    <string name="settings_disable_lockscreen_while_viewing_card">Disable lock screen while viewing a card</string>
+    <string name="settings_disable_lockscreen_while_viewing_card">Prevent lock screen</string>
     <string name="settings_key_disable_lockscreen_while_viewing_card" translatable="false">pref_disable_lockscreen_while_viewing_card</string>
 
     <string name="sharedpreference_active_tab" translatable="false">sharedpreference_active_tab</string>
@@ -122,20 +118,21 @@
 
     <string name="enter_group_name">Enter group name</string>
     <string name="groups">Groups</string>
-    <string name="noGroups">Click the "+" (plus) button to add groups first.\n\nGroups make things easier to find.</string>
+    <string name="noGroups">Click the + plus button to add groups for categorization first.</string>
     <plurals name="groupCardCount">
         <item quantity="one"><xliff:g>%d</xliff:g> card</item>
         <item quantity="other"><xliff:g>%d</xliff:g> cards</item>
     </plurals>
 
     <string name="all">All</string>
-    <string name="deleteConfirmationGroup">Please confirm you want to delete this group</string>
-    <string name="failedOpeningFileManager">Failed opening a file manager. Please make sure one is installed.</string>
-    <string name="moveUp">Move up in list</string>
-    <string name="moveDown">Move down in list</string>
-    <string name="leaveWithoutSaveTitle">Leave without saving</string>
-    <string name="leaveWithoutSaveConfirmation">Are you sure you want to leave this screen? Changed made will not be saved.</string>
+    <string name="deleteConfirmationGroup">Delete group?</string>
+    <string name="failedOpeningFileManager">Install a file manager first.</string>
+    <string name="moveUp">Move upwards</string>
+    <string name="moveDown">Move downwards</string>
+    <string name="leaveWithoutSaveTitle">Exit</string>
+    <string name="leaveWithoutSaveConfirmation">Leave without saving?</string>
     <string name="addManually">Manually enter card ID</string>
+    <string name="addFromImage">Select image from gallery</string>
     <string name="groupsList">Groups: <xliff:g>%s</xliff:g></string>
     <string name="expiryStateSentence">Expires: <xliff:g>%s</xliff:g></string>
     <string name="expiryStateSentenceExpired">Expired: <xliff:g>%s</xliff:g></string>
@@ -151,15 +148,37 @@
     <string name="moveBarcodeToTopOfScreen">Move the barcode to the top of the screen</string>
     <string name="moveBarcodeToCenterOfScreen">Center the barcode on the screen</string>
 
+    <string name="noBarcodeFound">No barcode was found</string>
+    <string name="errorReadingImage">Could not read the image</string>
+
     <string name="balance">Balance</string>
     <string name="currency">Currency</string>
     <string name="points">Points</string>
 
     <string name="parsingBalanceFailed"><xliff:g>%s</xliff:g> does not seem to be a valid balance.</string>
-    <string name="chooseImportType">Import data from which app?</string>
+    <string name="chooseImportType">Import data from?</string>
     <string name="app_loyalty_card_keychain">Loyalty Card Keychain</string>
 
     <string name="privacy_policy">Privacy Policy</string>
-    <string name="thank_you">Thank you</string>
-    <string name="privacy_policy_popup_text">Many app stores require apps to show their privacy policy on first start. Here is ours:\n\nWe collect NO DATA AT ALL and our app is Open Source so anyone can confirm this to be true.</string>
+    <string name="privacy_policy_popup_text">Privacy policy notice (required by some app stores):\n\nNO DATA IS COLLECTED AT ALL, which anyone can confirm since our app is libre software.</string>
+    <string name="accept">Accept</string>
+    <string name="importCatima">Import from Catima</string>
+    <string name="importCatimaMessage">Find a file likely named <i>Catima.csv</i> to import.\nOr create it from the Import/Export menu of another Catima app by pressing "Export" there first.</string>
+    <string name="importFidme">Import from FidMe</string>
+    <string name="importFidmeMessage">Find a file likely named <i>fidme-export-request-xxxxxx.zip</i> to import, and then select the barcode types manually afterwards.\nOr create it from your FidMe profile by choosing "Data Protection" and then pressing "Extract my data" first.</string>
+    <string name="importLoyaltyCardKeychain">Import from Loyalty Card Keychain</string>
+    <string name="importLoyaltyCardKeychainMessage">Find a file most likely named <i>LoyaltyCardKeychain.csv</i> to import.\nOr create it from the Import/Export menu in Loyalty Card Keychain by pressing "Export" first.</string>
+    <string name="importVoucherVault">Import from Voucher Vault</string>
+    <string name="importVoucherVaultMessage">Find a file likely named <i>vouchervault.json</i> to import.\nOr create it by pressing "Export" in Voucher Vault first.</string>
+    <string name="barcodeId">Barcode value</string>
+    <string name="sameAsCardId">Same as card ID</string>
+    <string name="setBarcodeId">Set barcode value</string>
+    <string name="unsupportedBarcodeType">This barcode type can\'t yet be displayed. It may be supported in a newer version of the app.</string>
+    <string name="wrongValueForBarcodeType">The value is not valid for the selected barcode type</string>
+    <string name="copy_to_clipboard_multiple_toast">Copied card IDs to clipboard</string>
+    <string name="intent_import_card_from_url_share_multiple_text">I want to share some cards with you</string>
+    <string name="updateBarcodeQuestionTitle">Update barcode value?</string>
+    <string name="updateBarcodeQuestionText">You changed the card ID. Do you want to also update the barcode to use the same value?</string>
+    <string name="yes">Yes</string>
+    <string name="no">No</string>
 </resources>

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

@@ -7,6 +7,9 @@
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorSecondary">@color/colorSecondary</item>
         <item name="colorAccent">@color/colorSecondary</item>
+        <item name="actionModeBackground">@color/colorPrimary</item>
+        <item name="windowActionModeOverlay">true</item>
+        <item name="actionModeCloseDrawable">@drawable/ic_close</item>
     </style>
 
     <style name="AppTheme.NoActionBar" parent="AppTheme">

app/src/main/res/xml/preferences.xml

@@ -13,63 +13,47 @@
             android:defaultValue="@string/settings_key_system_theme"
             android:entries="@array/theme_value_strings"
             android:entryValues="@array/theme_values"
-            app:iconSpaceReserved="false" />
+            app:iconSpaceReserved="false"
+            app:singleLineTitle="false" />
 
         <nl.invissvenska.numberpickerpreference.NumberDialogPreference
-            android:key="@string/settings_key_card_title_list_font_size"
-            android:title="@string/settings_card_title_list_font_size"
-            app:defaultValue="@integer/settings_card_title_list_font_size_sp"
-            app:numberPickerPreference_maxValue="@integer/settings_card_title_list_max_font_size_sp"
-            app:numberPickerPreference_minValue="@integer/settings_card_title_list_min_font_size_sp"
-            app:iconSpaceReserved="false" />
-
-        <nl.invissvenska.numberpickerpreference.NumberDialogPreference
-            android:key="@string/settings_key_card_note_list_font_size"
-            android:title="@string/settings_card_note_list_font_size"
-            app:defaultValue="@integer/settings_card_note_list_font_size_sp"
-            app:numberPickerPreference_maxValue="@integer/settings_card_note_list_max_font_size_sp"
-            app:numberPickerPreference_minValue="@integer/settings_card_note_list_min_font_size_sp"
-            app:iconSpaceReserved="false" />
-
-        <nl.invissvenska.numberpickerpreference.NumberDialogPreference
-            android:key="@string/settings_key_card_title_font_size"
-            android:title="@string/settings_card_title_font_size"
-            app:defaultValue="@integer/settings_card_title_font_size_sp"
-            app:numberPickerPreference_maxValue="@integer/settings_card_title_max_font_size_sp"
-            app:numberPickerPreference_minValue="@integer/settings_card_title_min_font_size_sp"
-            app:iconSpaceReserved="false" />
-
-        <nl.invissvenska.numberpickerpreference.NumberDialogPreference
-            android:key="@string/settings_key_card_id_font_size"
-            android:title="@string/settings_card_id_font_size"
-            app:defaultValue="@integer/settings_card_id_font_size_sp"
-            app:numberPickerPreference_maxValue="@integer/settings_card_id_max_font_size_sp"
-            app:numberPickerPreference_minValue="@integer/settings_card_id_min_font_size_sp"
-            app:iconSpaceReserved="false" />
+            android:key="@string/settings_key_max_font_size_scale"
+            android:title="@string/settings_max_font_size_scale"
+            app:defaultValue="@integer/settings_max_font_size_scale_pct"
+            app:numberPickerPreference_maxValue="@integer/settings_max_font_size_scale_pct_max"
+            app:numberPickerPreference_minValue="@integer/settings_max_font_size_scale_pct_min"
+            app:numberPickerPreference_stepValue="10"
+            app:numberPickerPreference_unitText="%"
+            app:iconSpaceReserved="false"
+            app:singleLineTitle="false" />
 
         <SwitchPreferenceCompat
             android:defaultValue="true"
             android:key="@string/settings_key_display_barcode_max_brightness"
             android:title="@string/settings_display_barcode_max_brightness"
-            app:iconSpaceReserved="false" />
+            app:iconSpaceReserved="false"
+            app:singleLineTitle="false" />
 
         <SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="@string/settings_key_lock_barcode_orientation"
             android:title="@string/settings_lock_barcode_orientation"
-            app:iconSpaceReserved="false" />
+            app:iconSpaceReserved="false"
+            app:singleLineTitle="false" />
 
         <SwitchPreferenceCompat
             android:defaultValue="true"
             android:key="@string/settings_key_keep_screen_on"
             android:title="@string/settings_keep_screen_on"
-            app:iconSpaceReserved="false" />
+            app:iconSpaceReserved="false"
+            app:singleLineTitle="false" />
 
         <SwitchPreferenceCompat
             android:defaultValue="true"
             android:key="@string/settings_key_disable_lockscreen_while_viewing_card"
             android:title="@string/settings_disable_lockscreen_while_viewing_card"
-            app:iconSpaceReserved="false" />
+            app:iconSpaceReserved="false"
+            app:singleLineTitle="false" />
     </PreferenceCategory>
 
 </PreferenceScreen>

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

@@ -38,14 +38,14 @@ public class DatabaseTest
     public void setUp()
     {
         Activity activity = Robolectric.setupActivity(MainActivity.class);
-        db = new DBHelper(activity);
+        db = TestHelpers.getEmptyDb(activity);
     }
 
     @Test
     public void addRemoveOneGiftCard()
     {
         assertEquals(0, db.getLoyaltyCardCount());
-        long id = db.insertLoyaltyCard("store", "note", null, new BigDecimal("0"), null, "cardId", BarcodeFormat.UPC_A.toString(), DEFAULT_HEADER_COLOR, 0);
+        long id = db.insertLoyaltyCard("store", "note", null, new BigDecimal("0"), null, "cardId", null, BarcodeFormat.UPC_A, DEFAULT_HEADER_COLOR, 0);
         boolean result = (id != -1);
         assertTrue(result);
         assertEquals(1, db.getLoyaltyCardCount());
@@ -58,8 +58,10 @@ public class DatabaseTest
         assertEquals(new BigDecimal("0"), loyaltyCard.balance);
         assertEquals(null, loyaltyCard.balanceType);
         assertEquals("cardId", loyaltyCard.cardId);
+        assertEquals(null, loyaltyCard.barcodeId);
+        assertEquals(BarcodeFormat.UPC_A, loyaltyCard.barcodeType);
+        assertEquals(DEFAULT_HEADER_COLOR, loyaltyCard.headerColor);
         assertEquals(0, loyaltyCard.starStatus);
-        assertEquals(BarcodeFormat.UPC_A.toString(), loyaltyCard.barcodeType);
 
         result = db.deleteLoyaltyCard(1);
         assertTrue(result);
@@ -70,12 +72,12 @@ public class DatabaseTest
     @Test
     public void updateGiftCard()
     {
-        long id = db.insertLoyaltyCard("store", "note", null, new BigDecimal("0"), null, "cardId", BarcodeFormat.UPC_A.toString(), DEFAULT_HEADER_COLOR, 0);
+        long id = db.insertLoyaltyCard("store", "note", null, new BigDecimal("0"), null, "cardId", null, BarcodeFormat.UPC_A, DEFAULT_HEADER_COLOR, 0);
         boolean result = (id != -1);
         assertTrue(result);
         assertEquals(1, db.getLoyaltyCardCount());
 
-        result = db.updateLoyaltyCard(1, "store1", "note1", null, new BigDecimal("10.00"), Currency.getInstance("EUR"), "cardId1", BarcodeFormat.AZTEC.toString(), DEFAULT_HEADER_COLOR);
+        result = db.updateLoyaltyCard(1, "store1", "note1", null, new BigDecimal("10.00"), Currency.getInstance("EUR"), "cardId1", null, BarcodeFormat.AZTEC, DEFAULT_HEADER_COLOR);
         assertTrue(result);
         assertEquals(1, db.getLoyaltyCardCount());
 
@@ -87,14 +89,16 @@ public class DatabaseTest
         assertEquals(new BigDecimal("10.00"), loyaltyCard.balance);
         assertEquals(Currency.getInstance("EUR"), loyaltyCard.balanceType);
         assertEquals("cardId1", loyaltyCard.cardId);
+        assertEquals(null, loyaltyCard.barcodeId);
+        assertEquals(BarcodeFormat.AZTEC, loyaltyCard.barcodeType);
+        assertEquals(DEFAULT_HEADER_COLOR, loyaltyCard.headerColor);
         assertEquals(0, loyaltyCard.starStatus);
-        assertEquals(BarcodeFormat.AZTEC.toString(), loyaltyCard.barcodeType);
     }
 
     @Test
     public void updateGiftCardOnlyStar()
     {
-        long id = db.insertLoyaltyCard("store", "note", null, new BigDecimal("0"), null, "cardId", BarcodeFormat.UPC_A.toString(), DEFAULT_HEADER_COLOR, 0);
+        long id = db.insertLoyaltyCard("store", "note", null, new BigDecimal("0"), null, "cardId", null, BarcodeFormat.UPC_A, DEFAULT_HEADER_COLOR, 0);
         boolean result = (id != -1);
         assertTrue(result);
         assertEquals(1, db.getLoyaltyCardCount());
@@ -111,8 +115,10 @@ public class DatabaseTest
         assertEquals(new BigDecimal("0"), loyaltyCard.balance);
         assertEquals(null, loyaltyCard.balanceType);
         assertEquals("cardId", loyaltyCard.cardId);
+        assertEquals(null, loyaltyCard.barcodeId);
+        assertEquals(BarcodeFormat.UPC_A, loyaltyCard.barcodeType);
+        assertEquals(DEFAULT_HEADER_COLOR, loyaltyCard.headerColor);
         assertEquals(1, loyaltyCard.starStatus);
-        assertEquals(BarcodeFormat.UPC_A.toString(), loyaltyCard.barcodeType);
     }
 
     @Test
@@ -121,7 +127,7 @@ public class DatabaseTest
         assertEquals(0, db.getLoyaltyCardCount());
 
         boolean result = db.updateLoyaltyCard(1, "store1", "note1", null, new BigDecimal("0"), null, "cardId1",
-                BarcodeFormat.UPC_A.toString(), DEFAULT_HEADER_COLOR);
+                null, BarcodeFormat.UPC_A, DEFAULT_HEADER_COLOR);
         assertEquals(false, result);
         assertEquals(0, db.getLoyaltyCardCount());
     }
@@ -129,7 +135,7 @@ public class DatabaseTest
     @Test
     public void emptyGiftCardValues()
     {
-        long id = db.insertLoyaltyCard("", "", null, new BigDecimal("0"), null, "", "", null, 0);
+        long id = db.insertLoyaltyCard("", "", null, new BigDecimal("0"), null, "", null, null, null, 0);
         boolean result = (id != -1);
         assertTrue(result);
         assertEquals(1, db.getLoyaltyCardCount());
@@ -142,7 +148,10 @@ public class DatabaseTest
         assertEquals(new BigDecimal("0"), loyaltyCard.balance);
         assertEquals(null, loyaltyCard.balanceType);
         assertEquals("", loyaltyCard.cardId);
-        assertEquals("", loyaltyCard.barcodeType);
+        assertEquals(null, loyaltyCard.barcodeId);
+        assertEquals(null, loyaltyCard.barcodeType);
+        // headerColor is randomly generated when not given, so skip
+        assertEquals(0, loyaltyCard.starStatus);
     }
 
     @Test
@@ -155,7 +164,7 @@ public class DatabaseTest
         for(int index = CARDS_TO_ADD-1; index >= 0; index--)
         {
             long id = db.insertLoyaltyCard("store" + index, "note" + index, null, new BigDecimal("0"), null, "cardId" + index,
-                    BarcodeFormat.UPC_A.toString(), index, 0);
+                    null, BarcodeFormat.UPC_A, index, 0);
             boolean result = (id != -1);
             assertTrue(result);
         }
@@ -177,9 +186,10 @@ public class DatabaseTest
             assertEquals("0", cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.BALANCE)));
             assertEquals(null, cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.BALANCE_TYPE)));
             assertEquals("cardId"+index, cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.CARD_ID)));
+            assertEquals(null, cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.BARCODE_ID)));
             assertEquals(BarcodeFormat.UPC_A.toString(), cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.BARCODE_TYPE)));
-            assertEquals(0, cursor.getInt(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.STAR_STATUS)));
             assertEquals(index, cursor.getInt(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.HEADER_COLOR)));
+            assertEquals(0, cursor.getInt(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.STAR_STATUS)));
 
             cursor.moveToNext();
         }
@@ -200,12 +210,12 @@ public class DatabaseTest
         {
             if (index == CARDS_TO_ADD-1) {
                 id = db.insertLoyaltyCard("store" + index, "note" + index, null, new BigDecimal("0"), null, "cardId" + index,
-                        BarcodeFormat.UPC_A.toString(), index, 1);
+                        null, BarcodeFormat.UPC_A, index, 1);
             }
 
             else {
                 id = db.insertLoyaltyCard("store" + index, "note" + index, null, new BigDecimal("0"), null, "cardId" + index,
-                        BarcodeFormat.UPC_A.toString(), index, 0);
+                        null, BarcodeFormat.UPC_A, index, 0);
             }
             boolean result = (id != -1);
             assertTrue(result);
@@ -226,9 +236,10 @@ public class DatabaseTest
         assertEquals("0", cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.BALANCE)));
         assertEquals(null, cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.BALANCE_TYPE)));
         assertEquals("cardId"+index, cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.CARD_ID)));
+        assertEquals(null, cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.BARCODE_ID)));
         assertEquals(BarcodeFormat.UPC_A.toString(), cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.BARCODE_TYPE)));
-        assertEquals(1, cursor.getInt(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.STAR_STATUS)));
         assertEquals(index, cursor.getInt(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.HEADER_COLOR)));
+        assertEquals(1, cursor.getInt(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.STAR_STATUS)));
 
         cursor.moveToNext();
 
@@ -240,9 +251,10 @@ public class DatabaseTest
             assertEquals("0", cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.BALANCE)));
             assertEquals(null, cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.BALANCE_TYPE)));
             assertEquals("cardId"+index, cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.CARD_ID)));
+            assertEquals(null, cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.BARCODE_ID)));
             assertEquals(BarcodeFormat.UPC_A.toString(), cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.BARCODE_TYPE)));
-            assertEquals(0, cursor.getInt(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.STAR_STATUS)));
             assertEquals(index, cursor.getInt(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.HEADER_COLOR)));
+            assertEquals(0, cursor.getInt(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.STAR_STATUS)));
 
             cursor.moveToNext();
         }
@@ -304,7 +316,7 @@ public class DatabaseTest
     {
         // Create card
         assertEquals(0, db.getLoyaltyCardCount());
-        long id = db.insertLoyaltyCard("store", "note", null, new BigDecimal("0"), null, "cardId", BarcodeFormat.UPC_A.toString(), DEFAULT_HEADER_COLOR, 0);
+        long id = db.insertLoyaltyCard("store", "note", null, new BigDecimal("0"), null, "cardId", null, BarcodeFormat.UPC_A, DEFAULT_HEADER_COLOR, 0);
         boolean result = (id != -1);
         assertTrue(result);
         assertEquals(1, db.getLoyaltyCardCount());
@@ -421,7 +433,7 @@ public class DatabaseTest
     {
         // Create card
         assertEquals(0, db.getLoyaltyCardCount());
-        long id = db.insertLoyaltyCard("store", "note", null, new BigDecimal("0"), null, "cardId", BarcodeFormat.UPC_A.toString(), DEFAULT_HEADER_COLOR, 0);
+        long id = db.insertLoyaltyCard("store", "note", null, new BigDecimal("0"), null, "cardId", null, BarcodeFormat.UPC_A, DEFAULT_HEADER_COLOR, 0);
         boolean result = (id != -1);
         assertTrue(result);
         assertEquals(1, db.getLoyaltyCardCount());
@@ -473,6 +485,7 @@ public class DatabaseTest
 
         // Insert a budget and transaction
         int newCardId = insertCardVersion1(database, "store", "cardId", BarcodeFormat.UPC_A.toString());
+        int newCardId2 = insertCardVersion1(database, "store", "cardId", "");
 
         // Upgrade database
         db.onUpgrade(database, DBHelper.ORIGINAL_DATABASE_VERSION, DBHelper.DATABASE_VERSION);
@@ -480,14 +493,28 @@ public class DatabaseTest
         // Determine that the entries are queryable and the fields are correct
         LoyaltyCard card = db.getLoyaltyCard(newCardId);
         assertEquals("store", card.store);
+        assertEquals("", card.note);
         assertEquals(null, card.expiry);
         assertEquals(new BigDecimal("0"), card.balance);
         assertEquals(null, card.balanceType);
         assertEquals("cardId", card.cardId);
-        assertEquals(BarcodeFormat.UPC_A.toString(), card.barcodeType);
-        assertEquals("", card.note);
+        assertEquals(null, card.barcodeId);
+        assertEquals(BarcodeFormat.UPC_A, card.barcodeType);
         assertEquals(null, card.headerColor);
-        assertEquals(null, card.headerTextColor);
+        assertEquals(0, card.starStatus);
+
+        // Determine that the entries are queryable and the fields are correct
+        LoyaltyCard card2 = db.getLoyaltyCard(newCardId2);
+        assertEquals("store", card2.store);
+        assertEquals("", card2.note);
+        assertEquals(null, card2.expiry);
+        assertEquals(new BigDecimal("0"), card2.balance);
+        assertEquals(null, card2.balanceType);
+        assertEquals("cardId", card2.cardId);
+        assertEquals(null, card2.barcodeId);
+        assertEquals(null, card2.barcodeType); // Empty string should've become null
+        assertEquals(null, card2.headerColor);
+        assertEquals(0, card2.starStatus);
 
         database.close();
     }

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

@@ -1,8 +1,5 @@
 package protect.card_locker;
 
-import static org.junit.Assert.assertEquals;
-import static org.robolectric.Shadows.shadowOf;
-
 import android.app.Activity;
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
@@ -10,6 +7,7 @@ import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.view.View;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.Robolectric;
@@ -17,6 +15,9 @@ import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
+import static org.junit.Assert.assertEquals;
+import static org.robolectric.Shadows.shadowOf;
+
 @RunWith(RobolectricTestRunner.class)
 @Config(sdk = 23)
 public class ImportExportActivityTest

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

@@ -24,12 +24,12 @@ 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.math.BigDecimal;
 import java.nio.charset.StandardCharsets;
 import java.text.ParseException;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Calendar;
 import java.util.Currency;
 import java.util.Date;
@@ -54,13 +54,13 @@ public class ImportExportTest
     private final int MONTHS_PER_YEAR = 12;
 
     private final String BARCODE_DATA = "428311627547";
-    private final String BARCODE_TYPE = BarcodeFormat.UPC_A.name();
+    private final BarcodeFormat BARCODE_TYPE = BarcodeFormat.UPC_A;
 
     @Before
     public void setUp()
     {
         activity = Robolectric.setupActivity(MainActivity.class);
-        db = new DBHelper(activity);
+        db = TestHelpers.getEmptyDb(activity);
         nowMs = System.currentTimeMillis();
 
         Calendar lastYear = Calendar.getInstance();
@@ -80,7 +80,7 @@ public class ImportExportTest
         {
             String storeName = String.format("store, \"%4d", index);
             String note = String.format("note, \"%4d", index);
-            long id = db.insertLoyaltyCard(storeName, note, null, new BigDecimal(String.valueOf(index)), null, BARCODE_DATA, BARCODE_TYPE, index, 0);
+            long id = db.insertLoyaltyCard(storeName, note, null, new BigDecimal(String.valueOf(index)), null, BARCODE_DATA, null, BARCODE_TYPE, index, 0);
             boolean result = (id != -1);
             assertTrue(result);
         }
@@ -96,7 +96,7 @@ public class ImportExportTest
         {
             String storeName = String.format("store, \"%4d", index);
             String note = String.format("note, \"%4d", index);
-            long id = db.insertLoyaltyCard(storeName, note, null, new BigDecimal(String.valueOf(index)), null, BARCODE_DATA, BARCODE_TYPE, index, 1);
+            long id = db.insertLoyaltyCard(storeName, note, null, new BigDecimal(String.valueOf(index)), null, BARCODE_DATA, null, BARCODE_TYPE, index, 1);
             boolean result = (id != -1);
             assertTrue(result);
         }
@@ -105,7 +105,7 @@ public class ImportExportTest
             String storeName = String.format("store, \"%4d", index);
             String note = String.format("note, \"%4d", index);
             //if index is even
-            long id = db.insertLoyaltyCard(storeName, note, null, new BigDecimal(String.valueOf(index)), null, BARCODE_DATA, BARCODE_TYPE, index, 0);
+            long id = db.insertLoyaltyCard(storeName, note, null, new BigDecimal(String.valueOf(index)), null, BARCODE_DATA, null, BARCODE_TYPE, index, 0);
             boolean result = (id != -1);
             assertTrue(result);
         }
@@ -115,7 +115,7 @@ public class ImportExportTest
     @Test
     public void addLoyaltyCardsWithExpiryNeverPastTodayFuture()
     {
-        long id = db.insertLoyaltyCard("No Expiry", "", null, new BigDecimal("0"), null, BARCODE_DATA, BARCODE_TYPE, 0, 0);
+        long id = db.insertLoyaltyCard("No Expiry", "", null, new BigDecimal("0"), null, BARCODE_DATA, null, BARCODE_TYPE, 0, 0);
         boolean result = (id != -1);
         assertTrue(result);
 
@@ -126,11 +126,12 @@ public class ImportExportTest
         assertEquals(new BigDecimal("0"), card.balance);
         assertEquals(null, card.balanceType);
         assertEquals(BARCODE_DATA, card.cardId);
+        assertEquals(null, card.barcodeId);
         assertEquals(BARCODE_TYPE, card.barcodeType);
         assertEquals(Integer.valueOf(0), card.headerColor);
         assertEquals(0, card.starStatus);
 
-        id = db.insertLoyaltyCard("Past", "", new Date((long) 1), new BigDecimal("0"), null, BARCODE_DATA, BARCODE_TYPE, 0, 0);
+        id = db.insertLoyaltyCard("Past", "", new Date((long) 1), new BigDecimal("0"), null, BARCODE_DATA, null, BARCODE_TYPE, 0, 0);
         result = (id != -1);
         assertTrue(result);
 
@@ -141,11 +142,12 @@ public class ImportExportTest
         assertEquals(new BigDecimal("0"), card.balance);
         assertEquals(null, card.balanceType);
         assertEquals(BARCODE_DATA, card.cardId);
+        assertEquals(null, card.barcodeId);
         assertEquals(BARCODE_TYPE, card.barcodeType);
         assertEquals(Integer.valueOf(0), card.headerColor);
         assertEquals(0, card.starStatus);
 
-        id = db.insertLoyaltyCard("Today", "", new Date(), new BigDecimal("0"), null, BARCODE_DATA, BARCODE_TYPE, 0, 0);
+        id = db.insertLoyaltyCard("Today", "", new Date(), new BigDecimal("0"), null, BARCODE_DATA, null, BARCODE_TYPE, 0, 0);
         result = (id != -1);
         assertTrue(result);
 
@@ -157,13 +159,14 @@ public class ImportExportTest
         assertEquals(new BigDecimal("0"), card.balance);
         assertEquals(null, card.balanceType);
         assertEquals(BARCODE_DATA, card.cardId);
+        assertEquals(null, card.barcodeId);
         assertEquals(BARCODE_TYPE, card.barcodeType);
         assertEquals(Integer.valueOf(0), card.headerColor);
         assertEquals(0, card.starStatus);
 
         // This will break after 19 January 2038
         // If someone is still maintaining this code base by then: I love you
-        id = db.insertLoyaltyCard("Future", "", new Date(2147483648000L), new BigDecimal("0"), null, BARCODE_DATA, BARCODE_TYPE, 0, 0);
+        id = db.insertLoyaltyCard("Future", "", new Date(2147483648000L), new BigDecimal("0"), null, BARCODE_DATA, null, BARCODE_TYPE, 0, 0);
         result = (id != -1);
         assertTrue(result);
 
@@ -174,6 +177,7 @@ public class ImportExportTest
         assertEquals(new BigDecimal("0"), card.balance);
         assertEquals(null, card.balanceType);
         assertEquals(BARCODE_DATA, card.cardId);
+        assertEquals(null, card.barcodeId);
         assertEquals(BARCODE_TYPE, card.barcodeType);
         assertEquals(Integer.valueOf(0), card.headerColor);
         assertEquals(0, card.starStatus);
@@ -214,9 +218,11 @@ public class ImportExportTest
 
             assertEquals(expectedStore, card.store);
             assertEquals(expectedNote, card.note);
+            assertEquals(null, card.expiry);
             assertEquals(new BigDecimal(String.valueOf(index)), card.balance);
             assertEquals(null, card.balanceType);
             assertEquals(BARCODE_DATA, card.cardId);
+            assertEquals(null, card.barcodeId);
             assertEquals(BARCODE_TYPE, card.barcodeType);
             assertEquals(Integer.valueOf(index), card.headerColor);
             assertEquals(0, card.starStatus);
@@ -246,9 +252,11 @@ public class ImportExportTest
 
             assertEquals(expectedStore, card.store);
             assertEquals(expectedNote, card.note);
+            assertEquals(null, card.expiry);
             assertEquals(new BigDecimal(String.valueOf(index)), card.balance);
             assertEquals(null, card.balanceType);
             assertEquals(BARCODE_DATA, card.cardId);
+            assertEquals(null, card.barcodeId);
             assertEquals(BARCODE_TYPE, card.barcodeType);
             assertEquals(Integer.valueOf(index), card.headerColor);
             assertEquals(1, card.starStatus);
@@ -266,9 +274,11 @@ public class ImportExportTest
 
         assertEquals(expectedStore, card.store);
         assertEquals(expectedNote, card.note);
+        assertEquals(null, card.expiry);
         assertEquals(new BigDecimal(String.valueOf(index)), card.balance);
         assertEquals(null, card.balanceType);
         assertEquals(BARCODE_DATA, card.cardId);
+        assertEquals(null, card.barcodeId);
         assertEquals(BARCODE_TYPE, card.barcodeType);
         assertEquals(Integer.valueOf(index), card.headerColor);
         assertEquals(0, card.starStatus);
@@ -302,20 +312,6 @@ public class ImportExportTest
         cursor.close();
     }
 
-    /**
-     * Delete the contents of the database
-     */
-    private void clearDatabase()
-    {
-        SQLiteDatabase database = db.getWritableDatabase();
-        database.execSQL("delete from " + DBHelper.LoyaltyCardDbIds.TABLE);
-        database.execSQL("delete from " + DBHelper.LoyaltyCardDbGroups.TABLE);
-        database.execSQL("delete from " + DBHelper.LoyaltyCardDbIdsGroups.TABLE);
-        database.close();
-
-        assertEquals(0, db.getLoyaltyCardCount());
-    }
-
     @Test
     public void multipleCardsExportImport() throws IOException
     {
@@ -331,13 +327,12 @@ public class ImportExportTest
         assertTrue(result);
         outStream.close();
 
-        clearDatabase();
+        TestHelpers.getEmptyDb(activity);
 
         ByteArrayInputStream inData = new ByteArrayInputStream(outData.toByteArray());
-        InputStreamReader inStream = new InputStreamReader(inData);
 
         // Import the CSV data
-        result = MultiFormatImporter.importData(db, inStream, DataFormat.Catima);
+        result = MultiFormatImporter.importData(db, inData, DataFormat.Catima);
         assertTrue(result);
 
         assertEquals(NUM_CARDS, db.getLoyaltyCardCount());
@@ -345,7 +340,7 @@ public class ImportExportTest
         checkLoyaltyCards();
 
         // Clear the database for the next format under test
-        clearDatabase();
+        TestHelpers.getEmptyDb(activity);
     }
 
     @Test
@@ -363,13 +358,12 @@ public class ImportExportTest
         assertTrue(result);
         outStream.close();
 
-        clearDatabase();
+        TestHelpers.getEmptyDb(activity);
 
         ByteArrayInputStream inData = new ByteArrayInputStream(outData.toByteArray());
-        InputStreamReader inStream = new InputStreamReader(inData);
 
         // Import the CSV data
-        result = MultiFormatImporter.importData(db, inStream, DataFormat.Catima);
+        result = MultiFormatImporter.importData(db, inData, DataFormat.Catima);
         assertTrue(result);
 
         assertEquals(NUM_CARDS, db.getLoyaltyCardCount());
@@ -377,7 +371,7 @@ public class ImportExportTest
         checkLoyaltyCardsFiveStarred();
 
         // Clear the database for the next format under test
-        clearDatabase();
+        TestHelpers.getEmptyDb(activity);
     }
 
     private List<String> groupsToGroupNames(List<Group> groups)
@@ -437,13 +431,12 @@ public class ImportExportTest
         assertTrue(result);
         outStream.close();
 
-        clearDatabase();
+        TestHelpers.getEmptyDb(activity);
 
         ByteArrayInputStream inData = new ByteArrayInputStream(outData.toByteArray());
-        InputStreamReader inStream = new InputStreamReader(inData);
 
         // Import the CSV data
-        result = MultiFormatImporter.importData(db, inStream, DataFormat.Catima);
+        result = MultiFormatImporter.importData(db, inData, DataFormat.Catima);
         assertTrue(result);
 
         assertEquals(NUM_CARDS, db.getLoyaltyCardCount());
@@ -464,7 +457,7 @@ public class ImportExportTest
         assertEquals(emptyGroup, db.getLoyaltyCardGroups(10));
 
         // Clear the database for the next format under test
-        clearDatabase();
+        TestHelpers.getEmptyDb(activity);
     }
 
     @Test
@@ -483,10 +476,9 @@ public class ImportExportTest
         outStream.close();
 
         ByteArrayInputStream inData = new ByteArrayInputStream(outData.toByteArray());
-        InputStreamReader inStream = new InputStreamReader(inData);
 
         // Import the CSV data on top of the existing database
-        result = MultiFormatImporter.importData(db, inStream, DataFormat.Catima);
+        result = MultiFormatImporter.importData(db, inData, DataFormat.Catima);
         assertTrue(result);
 
         assertEquals(NUM_CARDS, db.getLoyaltyCardCount());
@@ -494,7 +486,7 @@ public class ImportExportTest
         checkLoyaltyCards();
 
         // Clear the database for the next format under test
-        clearDatabase();
+        TestHelpers.getEmptyDb(activity);
     }
 
     @Test
@@ -513,7 +505,7 @@ public class ImportExportTest
             boolean result = MultiFormatExporter.exportData(db, outStream, DataFormat.Catima);
             assertTrue(result);
 
-            clearDatabase();
+            TestHelpers.getEmptyDb(activity);
 
             // commons-csv would throw a RuntimeException if an entry was quotes but had
             // content after. For example:
@@ -522,15 +514,14 @@ public class ImportExportTest
             String corruptEntry = "ThisStringIsLikelyNotPartOfAnyFormat,\"\"a";
 
             ByteArrayInputStream inData = new ByteArrayInputStream((outData.toString() + corruptEntry).getBytes());
-            InputStreamReader inStream = new InputStreamReader(inData);
 
             // Attempt to import the data
-            result = MultiFormatImporter.importData(db, inStream, format);
+            result = MultiFormatImporter.importData(db, inData, format);
             assertEquals(false, result);
 
             assertEquals(0, db.getLoyaltyCardCount());
 
-            clearDatabase();
+            TestHelpers.getEmptyDb(activity);
         }
     }
 
@@ -569,7 +560,7 @@ public class ImportExportTest
         assertNotNull(listener.success);
         assertEquals(true, listener.success);
 
-        clearDatabase();
+        TestHelpers.getEmptyDb(activity);
 
         // Import everything back from the default location
 
@@ -592,7 +583,7 @@ public class ImportExportTest
         checkLoyaltyCards();
 
         // Clear the database for the next format under test
-        clearDatabase();
+        TestHelpers.getEmptyDb(activity);
     }
 
     @Test
@@ -606,13 +597,12 @@ public class ImportExportTest
                 DBHelper.LoyaltyCardDbIds.BARCODE_TYPE + "," +
                 DBHelper.LoyaltyCardDbIds.STAR_STATUS + "\n";
 
-        csvText += "1,store,note,12345,type,0";
+        csvText += "1,store,note,12345,AZTEC,0";
 
         ByteArrayInputStream inputStream = new ByteArrayInputStream(csvText.getBytes(StandardCharsets.UTF_8));
-        InputStreamReader inStream = new InputStreamReader(inputStream);
 
         // Import the CSV data
-        boolean result = MultiFormatImporter.importData(db, inStream, DataFormat.Catima);
+        boolean result = MultiFormatImporter.importData(db, inputStream, DataFormat.Catima);
         assertTrue(result);
         assertEquals(1, db.getLoyaltyCardCount());
 
@@ -624,11 +614,12 @@ public class ImportExportTest
         assertEquals(new BigDecimal("0"), card.balance);
         assertEquals(null, card.balanceType);
         assertEquals("12345", card.cardId);
-        assertEquals("type", card.barcodeType);
-        assertEquals(0, card.starStatus);
+        assertEquals(null, card.barcodeId);
+        assertEquals(BarcodeFormat.AZTEC, card.barcodeType);
         assertNull(card.headerColor);
+        assertEquals(0, card.starStatus);
 
-        clearDatabase();
+        TestHelpers.getEmptyDb(activity);
     }
 
     @Test
@@ -644,13 +635,12 @@ public class ImportExportTest
                 DBHelper.LoyaltyCardDbIds.HEADER_TEXT_COLOR + "," +
                 DBHelper.LoyaltyCardDbIds.STAR_STATUS + "\n";
 
-        csvText += "1,store,note,12345,type,,,0";
+        csvText += "1,store,note,12345,AZTEC,,,0";
 
         ByteArrayInputStream inputStream = new ByteArrayInputStream(csvText.getBytes(StandardCharsets.UTF_8));
-        InputStreamReader inStream = new InputStreamReader(inputStream);
 
         // Import the CSV data
-        boolean result = MultiFormatImporter.importData(db, inStream, DataFormat.Catima);
+        boolean result = MultiFormatImporter.importData(db, inputStream, DataFormat.Catima);
         assertTrue(result);
         assertEquals(1, db.getLoyaltyCardCount());
 
@@ -662,11 +652,12 @@ public class ImportExportTest
         assertEquals(new BigDecimal("0"), card.balance);
         assertEquals(null, card.balanceType);
         assertEquals("12345", card.cardId);
-        assertEquals("type", card.barcodeType);
-        assertEquals(0, card.starStatus);
+        assertEquals(null, card.barcodeId);
+        assertEquals(BarcodeFormat.AZTEC, card.barcodeType);
         assertNull(card.headerColor);
+        assertEquals(0, card.starStatus);
 
-        clearDatabase();
+        TestHelpers.getEmptyDb(activity);
     }
 
     @Test
@@ -685,14 +676,13 @@ public class ImportExportTest
         csvText += "1,store,note,12345,type,not a number,invalid,0";
 
         ByteArrayInputStream inputStream = new ByteArrayInputStream(csvText.getBytes(StandardCharsets.UTF_8));
-        InputStreamReader inStream = new InputStreamReader(inputStream);
 
         // Import the CSV data
-        boolean result = MultiFormatImporter.importData(db, inStream, DataFormat.Catima);
+        boolean result = MultiFormatImporter.importData(db, inputStream, DataFormat.Catima);
         assertEquals(false, result);
         assertEquals(0, db.getLoyaltyCardCount());
 
-        clearDatabase();
+        TestHelpers.getEmptyDb(activity);
     }
 
     @Test
@@ -711,10 +701,9 @@ public class ImportExportTest
         csvText += "1,store,note,12345,,1,1,0";
 
         ByteArrayInputStream inputStream = new ByteArrayInputStream(csvText.getBytes(StandardCharsets.UTF_8));
-        InputStreamReader inStream = new InputStreamReader(inputStream);
 
         // Import the CSV data
-        boolean result = MultiFormatImporter.importData(db, inStream, DataFormat.Catima);
+        boolean result = MultiFormatImporter.importData(db, inputStream, DataFormat.Catima);
         assertEquals(true, result);
         assertEquals(1, db.getLoyaltyCardCount());
 
@@ -726,11 +715,12 @@ public class ImportExportTest
         assertEquals(new BigDecimal("0"), card.balance);
         assertEquals(null, card.balanceType);
         assertEquals("12345", card.cardId);
-        assertEquals("", card.barcodeType);
-        assertEquals(0, card.starStatus);
+        assertEquals(null, card.barcodeId);
+        assertEquals(null, card.barcodeType);
         assertEquals(1, (long) card.headerColor);
+        assertEquals(0, card.starStatus);
 
-        clearDatabase();
+        TestHelpers.getEmptyDb(activity);
     }
 
     @Test
@@ -746,13 +736,12 @@ public class ImportExportTest
                 DBHelper.LoyaltyCardDbIds.HEADER_TEXT_COLOR + "," +
                 DBHelper.LoyaltyCardDbIds.STAR_STATUS + "\n";
 
-        csvText += "1,store,note,12345,type,1,1,1";
+        csvText += "1,store,note,12345,AZTEC,1,1,1";
 
         ByteArrayInputStream inputStream = new ByteArrayInputStream(csvText.getBytes(StandardCharsets.UTF_8));
-        InputStreamReader inStream = new InputStreamReader(inputStream);
 
         // Import the CSV data
-        boolean result = MultiFormatImporter.importData(db, inStream, DataFormat.Catima);
+        boolean result = MultiFormatImporter.importData(db, inputStream, DataFormat.Catima);
         assertEquals(true, result);
         assertEquals(1, db.getLoyaltyCardCount());
 
@@ -764,11 +753,12 @@ public class ImportExportTest
         assertEquals(new BigDecimal("0"), card.balance);
         assertEquals(null, card.balanceType);
         assertEquals("12345", card.cardId);
-        assertEquals("type", card.barcodeType);
-        assertEquals(1, card.starStatus);
+        assertEquals(null, card.barcodeId);
+        assertEquals(BarcodeFormat.AZTEC, card.barcodeType);
         assertEquals(1, (long) card.headerColor);
+        assertEquals(1, card.starStatus);
 
-        clearDatabase();
+        TestHelpers.getEmptyDb(activity);
     }
 
     @Test
@@ -784,13 +774,12 @@ public class ImportExportTest
                 DBHelper.LoyaltyCardDbIds.HEADER_TEXT_COLOR + "," +
                 DBHelper.LoyaltyCardDbIds.STAR_STATUS + "\n";
 
-        csvText += "1,store,note,12345,type,1,1,";
+        csvText += "1,store,note,12345,AZTEC,1,1,";
 
         ByteArrayInputStream inputStream = new ByteArrayInputStream(csvText.getBytes(StandardCharsets.UTF_8));
-        InputStreamReader inStream = new InputStreamReader(inputStream);
 
         // Import the CSV data
-        boolean result = MultiFormatImporter.importData(db, inStream, DataFormat.Catima);
+        boolean result = MultiFormatImporter.importData(db, inputStream, DataFormat.Catima);
         assertEquals(true, result);
         assertEquals(1, db.getLoyaltyCardCount());
 
@@ -802,11 +791,12 @@ public class ImportExportTest
         assertEquals(new BigDecimal("0"), card.balance);
         assertEquals(null, card.balanceType);
         assertEquals("12345", card.cardId);
-        assertEquals("type", card.barcodeType);
-        assertEquals(0, card.starStatus);
+        assertEquals(null, card.barcodeId);
+        assertEquals(BarcodeFormat.AZTEC, card.barcodeType);
         assertEquals(1, (long) card.headerColor);
+        assertEquals(0, card.starStatus);
 
-        clearDatabase();
+        TestHelpers.getEmptyDb(activity);
     }
 
     @Test
@@ -822,13 +812,12 @@ public class ImportExportTest
                 DBHelper.LoyaltyCardDbIds.HEADER_TEXT_COLOR + "," +
                 DBHelper.LoyaltyCardDbIds.STAR_STATUS + "\n";
 
-        csvText += "1,store,note,12345,type,1,1,2";
+        csvText += "1,store,note,12345,AZTEC,1,1,2";
 
         ByteArrayInputStream inputStream = new ByteArrayInputStream(csvText.getBytes(StandardCharsets.UTF_8));
-        InputStreamReader inStream = new InputStreamReader(inputStream);
 
         // Import the CSV data
-        boolean result = MultiFormatImporter.importData(db, inStream, DataFormat.Catima);
+        boolean result = MultiFormatImporter.importData(db, inputStream, DataFormat.Catima);
         assertTrue(result);
         assertEquals(1, db.getLoyaltyCardCount());
 
@@ -842,13 +831,12 @@ public class ImportExportTest
                 DBHelper.LoyaltyCardDbIds.HEADER_TEXT_COLOR + "," +
                 DBHelper.LoyaltyCardDbIds.STAR_STATUS + "\n";
 
-        csvText += "1,store,note,12345,type,1,1,text";
+        csvText += "1,store,note,12345,AZTEC,1,1,text";
 
         inputStream = new ByteArrayInputStream(csvText.getBytes(StandardCharsets.UTF_8));
-        inStream = new InputStreamReader(inputStream);
 
         // Import the CSV data
-        result = MultiFormatImporter.importData(db, inStream, DataFormat.Catima);
+        result = MultiFormatImporter.importData(db, inputStream, DataFormat.Catima);
         assertTrue(result);
         assertEquals(1, db.getLoyaltyCardCount());
 
@@ -860,11 +848,169 @@ public class ImportExportTest
         assertEquals(new BigDecimal("0"), card.balance);
         assertEquals(null, card.balanceType);
         assertEquals("12345", card.cardId);
-        assertEquals("type", card.barcodeType);
-        assertEquals(0, card.starStatus);
+        assertEquals(null, card.barcodeId);
+        assertEquals(BarcodeFormat.AZTEC, card.barcodeType);
         assertEquals(1, (long) card.headerColor);
+        assertEquals(0, card.starStatus);
 
-        clearDatabase();
+        TestHelpers.getEmptyDb(activity);
+    }
+
+    @Test
+    public void exportV2()
+    {
+        db.insertGroup("Example");
+        int loyaltyCard = (int) db.insertLoyaltyCard("Card 1", "Note 1", new Date(1618053234), new BigDecimal("100"), Currency.getInstance("USD"), "1234", "5432", BarcodeFormat.QR_CODE, 1, 0);
+        db.setLoyaltyCardGroups(loyaltyCard, Arrays.asList(db.getGroup("Example")));
+
+        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+        OutputStreamWriter outputStreamWriter = new OutputStreamWriter(outputStream);
+
+        MultiFormatExporter.exportData(db, outputStreamWriter, DataFormat.Catima);
+
+        String outputCsv = "2\r\n" +
+                "\r\n" +
+                "_id\r\n" +
+                "Example\r\n" +
+                "\r\n" +
+                "_id,store,note,expiry,balance,balancetype,cardid,headercolor,barcodetype,starstatus\r\n" +
+                "1,Card 1,Note 1,1618053234,100,USD,1234,1,QR_CODE,0\r\n" +
+                "\r\n" +
+                "cardId,groupId\r\n" +
+                "1,Example\r\n";
+
+        assertEquals(outputCsv, outputStream.toString());
+    }
+
+    @Test
+    public void importV2()
+    {
+        String csvText = "2\n" +
+                "\n" +
+                "_id\n" +
+                "Health\n" +
+                "Food\n" +
+                "Fashion\n" +
+                "\n" +
+                "_id,store,note,expiry,balance,balancetype,cardid,barcodeid,headercolor,barcodetype,starstatus\n" +
+                "8,Clothes Store,Note about store,,0,,a,,-5317,,0\n" +
+                "2,Department Store,,1618041729,0,,A,,-9977996,,0\n" +
+                "3,Grocery Store,,,150,,dhd,,-9977996,,0\n" +
+                "4,Pharmacy,,,0,,dhshsvshs,,-10902850,,1\n" +
+                "5,Restaurant,Note about restaurant here,,0,,98765432,23456,-10902850,CODE_128,0\n" +
+                "6,Shoe Store,,,12.50,EUR,a,-5317,,AZTEC,0\n" +
+                "\n" +
+                "cardId,groupId\n" +
+                "8,Fashion\n" +
+                "3,Food\n" +
+                "4,Health\n" +
+                "5,Food\n" +
+                "6,Fashion\n";
+
+        ByteArrayInputStream inputStream = new ByteArrayInputStream(csvText.getBytes(StandardCharsets.UTF_8));
+
+        // Import the CSV data
+        boolean result = MultiFormatImporter.importData(db, inputStream, DataFormat.Catima);
+        assertEquals(true, result);
+        assertEquals(6, db.getLoyaltyCardCount());
+        assertEquals(3, db.getGroupCount());
+
+        // Check all groups
+        Group healthGroup = db.getGroup("Health");
+        assertNotNull(healthGroup);
+        assertEquals(1, db.getGroupCardCount("Health"));
+        assertEquals(Arrays.asList(4), db.getGroupCardIds("Health"));
+
+        Group foodGroup = db.getGroup("Food");
+        assertNotNull(foodGroup);
+        assertEquals(2, db.getGroupCardCount("Food"));
+        assertEquals(Arrays.asList(3, 5), db.getGroupCardIds("Food"));
+
+        Group fashionGroup = db.getGroup("Fashion");
+        assertNotNull(fashionGroup);
+        assertEquals(2, db.getGroupCardCount("Fashion"));
+        assertEquals(Arrays.asList(8, 6), db.getGroupCardIds("Fashion"));
+
+        // Check all cards
+        LoyaltyCard card8 = db.getLoyaltyCard(8);
+
+        assertEquals("Clothes Store", card8.store);
+        assertEquals("Note about store", card8.note);
+        assertEquals(null, card8.expiry);
+        assertEquals(new BigDecimal("0"), card8.balance);
+        assertEquals(null, card8.balanceType);
+        assertEquals("a", card8.cardId);
+        assertEquals(null, card8.barcodeId);
+        assertEquals(null, card8.barcodeType);
+        assertEquals(-5317, (long) card8.headerColor);
+        assertEquals(0, card8.starStatus);
+
+        LoyaltyCard card2 = db.getLoyaltyCard(2);
+
+        assertEquals("Department Store", card2.store);
+        assertEquals("", card2.note);
+        assertEquals(new Date(1618041729), card2.expiry);
+        assertEquals(new BigDecimal("0"), card2.balance);
+        assertEquals(null, card2.balanceType);
+        assertEquals("A", card2.cardId);
+        assertEquals(null, card2.barcodeId);
+        assertEquals(null, card2.barcodeType);
+        assertEquals(-9977996, (long) card2.headerColor);
+        assertEquals(0, card2.starStatus);
+
+        LoyaltyCard card3 = db.getLoyaltyCard(3);
+
+        assertEquals("Grocery Store", card3.store);
+        assertEquals("", card3.note);
+        assertEquals(null, card3.expiry);
+        assertEquals(new BigDecimal("150"), card3.balance);
+        assertEquals(null, card3.balanceType);
+        assertEquals("dhd", card3.cardId);
+        assertEquals(null, card3.barcodeId);
+        assertEquals(null, card3.barcodeType);
+        assertEquals(-9977996, (long) card3.headerColor);
+        assertEquals(0, card3.starStatus);
+
+        LoyaltyCard card4 = db.getLoyaltyCard(4);
+
+        assertEquals("Pharmacy", card4.store);
+        assertEquals("", card4.note);
+        assertEquals(null, card4.expiry);
+        assertEquals(new BigDecimal("0"), card4.balance);
+        assertEquals(null, card4.balanceType);
+        assertEquals("dhshsvshs", card4.cardId);
+        assertEquals(null, card4.barcodeId);
+        assertEquals(null, card4.barcodeType);
+        assertEquals(-10902850, (long) card4.headerColor);
+        assertEquals(1, card4.starStatus);
+
+        LoyaltyCard card5 = db.getLoyaltyCard(5);
+
+        assertEquals("Restaurant", card5.store);
+        assertEquals("Note about restaurant here", card5.note);
+        assertEquals(null, card5.expiry);
+        assertEquals(new BigDecimal("0"), card5.balance);
+        assertEquals(null, card5.balanceType);
+        assertEquals("98765432", card5.cardId);
+        assertEquals("23456", card5.barcodeId);
+        assertEquals(BarcodeFormat.CODE_128, card5.barcodeType);
+        assertEquals(-10902850, (long) card5.headerColor);
+        assertEquals(0, card5.starStatus);
+
+        LoyaltyCard card6 = db.getLoyaltyCard(6);
+
+        assertEquals("Shoe Store", card6.store);
+        assertEquals("", card6.note);
+        assertEquals(null, card6.expiry);
+        assertEquals(new BigDecimal("12.50"), card6.balance);
+        assertEquals(Currency.getInstance("EUR"), card6.balanceType);
+        assertEquals("a", card6.cardId);
+        assertEquals("-5317", card6.barcodeId);
+        assertEquals(BarcodeFormat.AZTEC, card6.barcodeType);
+        assertEquals(null, card6.headerColor);
+        assertEquals(0, card6.starStatus);
+
+        TestHelpers.getEmptyDb(activity);
     }
 
     @Test
@@ -893,10 +1039,9 @@ public class ImportExportTest
                 "]";
 
         ByteArrayInputStream inputStream = new ByteArrayInputStream(jsonText.getBytes(StandardCharsets.UTF_8));
-        InputStreamReader inStream = new InputStreamReader(inputStream);
 
         // Import the Voucher Vault data
-        boolean result = MultiFormatImporter.importData(db, inStream, DataFormat.VoucherVault);
+        boolean result = MultiFormatImporter.importData(db, inputStream, DataFormat.VoucherVault);
         assertTrue(result);
         assertEquals(2, db.getLoyaltyCardCount());
 
@@ -908,9 +1053,10 @@ public class ImportExportTest
         assertEquals(new BigDecimal("0"), card.balance);
         assertEquals(Currency.getInstance("USD"), card.balanceType);
         assertEquals("123456", card.cardId);
-        assertEquals(BarcodeFormat.CODE_128.name(), card.barcodeType);
-        assertEquals(0, card.starStatus);
+        assertEquals(null, card.barcodeId);
+        assertEquals(BarcodeFormat.CODE_128, card.barcodeType);
         assertEquals(Color.GRAY, (long) card.headerColor);
+        assertEquals(0, card.starStatus);
 
         card = db.getLoyaltyCard(2);
 
@@ -920,10 +1066,11 @@ public class ImportExportTest
         assertEquals(new BigDecimal("3.5"), card.balance);
         assertEquals(Currency.getInstance("USD"), card.balanceType);
         assertEquals("26846363", card.cardId);
-        assertEquals(BarcodeFormat.CODE_39.name(), card.barcodeType);
-        assertEquals(0, card.starStatus);
+        assertEquals(null, card.barcodeId);
+        assertEquals(BarcodeFormat.CODE_39, card.barcodeType);
         assertEquals(Color.rgb(128, 0, 128), (long) card.headerColor);
+        assertEquals(0, card.starStatus);
 
-        clearDatabase();
+        TestHelpers.getEmptyDb(activity);
     }
 }

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

@@ -3,13 +3,16 @@ package protect.card_locker;
 import android.app.Activity;
 import android.graphics.Color;
 import android.net.Uri;
+
 import com.google.zxing.BarcodeFormat;
+
 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 java.math.BigDecimal;
 import java.util.Currency;
@@ -18,7 +21,6 @@ import java.util.Date;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
-import static protect.card_locker.DBHelper.LoyaltyCardDbIds;
 
 @RunWith(RobolectricTestRunner.class)
 @Config(sdk = 23)
@@ -31,7 +33,7 @@ public class ImportURITest {
     {
         Activity activity = Robolectric.setupActivity(MainActivity.class);
         importURIHelper = new ImportURIHelper(activity);
-        db = new DBHelper(activity);
+        db = TestHelpers.getEmptyDb(activity);
     }
 
     @Test
@@ -40,7 +42,7 @@ public class ImportURITest {
         // Generate card
         Date date = new Date();
 
-        db.insertLoyaltyCard("store", "note", date, new BigDecimal("100"), null, BarcodeFormat.UPC_A.toString(), LoyaltyCardDbIds.BARCODE_TYPE, Color.BLACK, 1);
+        db.insertLoyaltyCard("store", "note", date, new BigDecimal("100"), null, BarcodeFormat.UPC_E.toString(), BarcodeFormat.UPC_A.toString(), BarcodeFormat.QR_CODE, Color.BLACK, 1);
 
         // Get card
         LoyaltyCard card = db.getLoyaltyCard(1);
@@ -52,15 +54,16 @@ public class ImportURITest {
         LoyaltyCard parsedCard = importURIHelper.parse(cardUri);
 
         // Compare everything
-        assertEquals(card.barcodeType, parsedCard.barcodeType);
-        assertEquals(card.cardId, parsedCard.cardId);
-        assertEquals(card.headerColor, parsedCard.headerColor);
+        assertEquals(card.store, parsedCard.store);
         assertEquals(card.note, parsedCard.note);
         assertEquals(card.expiry, parsedCard.expiry);
         assertEquals(card.balance, parsedCard.balance);
         assertEquals(card.balanceType, parsedCard.balanceType);
-        assertEquals(card.store, parsedCard.store);
-        // No export of starStatus for single cards foreseen therefore 0 will be imported
+        assertEquals(card.cardId, parsedCard.cardId);
+        assertEquals(card.barcodeId, parsedCard.barcodeId);
+        assertEquals(card.barcodeType, parsedCard.barcodeType);
+        assertEquals(card.headerColor, parsedCard.headerColor);
+        // No export of starStatus for export URL foreseen therefore 0 will be imported
         assertEquals(0, parsedCard.starStatus);
     }
 
@@ -68,7 +71,7 @@ public class ImportURITest {
     public void ensureNoCrashOnMissingHeaderFields() throws InvalidObjectException
     {
         // Generate card
-        db.insertLoyaltyCard("store", "note", null, new BigDecimal("10.00"), Currency.getInstance("EUR"), BarcodeFormat.UPC_A.toString(), LoyaltyCardDbIds.BARCODE_TYPE, null, 0);
+        db.insertLoyaltyCard("store", "note", null, new BigDecimal("10.00"), Currency.getInstance("EUR"), BarcodeFormat.UPC_A.toString(), null, BarcodeFormat.QR_CODE, null, 0);
 
         // Get card
         LoyaltyCard card = db.getLoyaltyCard(1);
@@ -80,15 +83,17 @@ public class ImportURITest {
         LoyaltyCard parsedCard = importURIHelper.parse(cardUri);
 
         // Compare everything
-        assertEquals(card.barcodeType, parsedCard.barcodeType);
-        assertEquals(card.cardId, parsedCard.cardId);
+        assertEquals(card.store, parsedCard.store);
         assertEquals(card.note, parsedCard.note);
         assertEquals(card.expiry, parsedCard.expiry);
         assertEquals(card.balance, parsedCard.balance);
         assertEquals(card.balanceType, parsedCard.balanceType);
-        assertEquals(card.store, parsedCard.store);
+        assertEquals(card.cardId, parsedCard.cardId);
+        assertEquals(card.barcodeId, parsedCard.barcodeId);
+        assertEquals(card.barcodeType, parsedCard.barcodeType);
         assertNull(parsedCard.headerColor);
-        assertNull(parsedCard.headerTextColor);
+        // No export of starStatus for export URL foreseen therefore 0 will be imported
+        assertEquals(0, parsedCard.starStatus);
     }
 
     @Test
@@ -125,14 +130,15 @@ public class ImportURITest {
         }
 
         // Compare everything
-        assertEquals("ITF", parsedCard.barcodeType);
-        assertEquals("12345", parsedCard.cardId);
-        assertEquals("note", parsedCard.note);
         assertEquals("store", parsedCard.store);
-        assertEquals(Integer.valueOf(-416706), parsedCard.headerColor);
-        assertEquals(0, parsedCard.starStatus);
+        assertEquals("note", parsedCard.note);
         assertEquals(null, parsedCard.expiry);
         assertEquals(new BigDecimal("0"), parsedCard.balance);
         assertEquals(null, parsedCard.balanceType);
+        assertEquals("12345", parsedCard.cardId);
+        assertEquals(null, parsedCard.barcodeId);
+        assertEquals(BarcodeFormat.ITF, parsedCard.barcodeType);
+        assertEquals(Integer.valueOf(-416706), parsedCard.headerColor);
+        assertEquals(0, parsedCard.starStatus);
     }
 }

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

@@ -4,10 +4,8 @@ import android.app.Activity;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.database.Cursor;
+import android.database.sqlite.SQLiteDatabase;
 import android.graphics.Color;
-import androidx.preference.PreferenceManager;
-import androidx.test.core.app.ApplicationProvider;
-
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
@@ -20,13 +18,22 @@ import org.junit.runner.RunWith;
 import org.robolectric.Robolectric;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
+import org.robolectric.shadows.ShadowLog;
 
 import java.math.BigDecimal;
 import java.text.DateFormat;
 import java.util.Currency;
 import java.util.Date;
 
+import androidx.preference.PreferenceManager;
+import androidx.recyclerview.widget.RecyclerView;
+import protect.card_locker.preferences.Settings;
+
+import static android.os.Looper.getMainLooper;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertTrue;
+import static org.robolectric.Shadows.shadowOf;
 
 @RunWith(RobolectricTestRunner.class)
 @Config(sdk = 23)
@@ -39,27 +46,28 @@ public class LoyaltyCardCursorAdapterTest
     @Before
     public void setUp()
     {
+        ShadowLog.stream = System.out;
+
         activity = Robolectric.setupActivity(MainActivity.class);
-        db = new DBHelper(activity);
+        db = TestHelpers.getEmptyDb(activity);
         settings = PreferenceManager.getDefaultSharedPreferences(activity);
     }
 
-    private void setFontSizes(int storeFontSize, int noteFontSize)
+    private void setFontScale(int fontSizeScale)
     {
         settings.edit()
-            .putInt(activity.getResources().getString(R.string.settings_key_card_title_list_font_size), storeFontSize)
-            .putInt(activity.getResources().getString(R.string.settings_key_card_note_list_font_size), noteFontSize)
+            .putInt(activity.getResources().getString(R.string.settings_key_max_font_size_scale), fontSizeScale)
             .apply();
     }
 
     private View createView(Cursor cursor)
     {
-        LoyaltyCardCursorAdapter adapter = new LoyaltyCardCursorAdapter(activity.getApplicationContext(), cursor);
+        LoyaltyCardCursorAdapter adapter = new LoyaltyCardCursorAdapter(activity.getApplicationContext(), cursor, (MainActivity) activity);
 
-        View view = adapter.newView(activity.getApplicationContext(), cursor, null);
-        adapter.bindView(view, activity.getApplicationContext(), cursor);
+        RecyclerView.ViewHolder viewHolder = adapter.createViewHolder(activity.findViewById(R.id.list), 0);
+        adapter.bindViewHolder((LoyaltyCardCursorAdapter.LoyaltyCardListItemViewHolder) viewHolder, cursor.getPosition());
 
-        return view;
+        return viewHolder.itemView;
     }
 
     private void checkView(final View view, final String store, final String note, final String expiry, final String balance, boolean checkFontSizes)
@@ -71,12 +79,13 @@ public class LoyaltyCardCursorAdapterTest
 
         if(checkFontSizes)
         {
-            int storeFontSize = settings.getInt(activity.getResources().getString(R.string.settings_key_card_title_list_font_size), 0);
-            int noteFontSize = settings.getInt(activity.getResources().getString(R.string.settings_key_card_note_list_font_size), 0);
+            Settings preferences = new Settings(activity.getApplicationContext());
+            int mediumFontSize = preferences.getFontSizeMax(preferences.getMediumFont());
+            int smallFontSize = preferences.getFontSizeMax(preferences.getSmallFont());
 
-            assertEquals(storeFontSize, (int)storeField.getTextSize());
-            assertEquals(noteFontSize, (int)noteField.getTextSize());
-            assertEquals(noteFontSize, (int)expiryField.getTextSize());
+            assertEquals(mediumFontSize, (int)storeField.getTextSize());
+            assertEquals(smallFontSize, (int)noteField.getTextSize());
+            assertEquals(smallFontSize, (int)expiryField.getTextSize());
         }
 
         assertEquals(store, storeField.getText().toString());
@@ -115,7 +124,7 @@ public class LoyaltyCardCursorAdapterTest
     @Test
     public void TestCursorAdapterEmptyNote()
     {
-        db.insertLoyaltyCard("store", "", null, new BigDecimal("0"), null, "cardId", BarcodeFormat.UPC_A.toString(), Color.BLACK, 0);
+        db.insertLoyaltyCard("store", "", null, new BigDecimal("0"), null, "cardId", null, BarcodeFormat.UPC_A, Color.BLACK, 0);
         LoyaltyCard card = db.getLoyaltyCard(1);
 
         Cursor cursor = db.getLoyaltyCardCursor();
@@ -131,7 +140,7 @@ public class LoyaltyCardCursorAdapterTest
     @Test
     public void TestCursorAdapterWithNote()
     {
-        db.insertLoyaltyCard("store", "note", null, new BigDecimal("0"), null, "cardId", BarcodeFormat.UPC_A.toString(), Color.BLACK, 0);
+        db.insertLoyaltyCard("store", "note", null, new BigDecimal("0"), null, "cardId", null, BarcodeFormat.UPC_A, Color.BLACK, 0);
         LoyaltyCard card = db.getLoyaltyCard(1);
 
         Cursor cursor = db.getLoyaltyCardCursor();
@@ -147,22 +156,22 @@ public class LoyaltyCardCursorAdapterTest
     @Test
     public void TestCursorAdapterFontSizes()
     {
-        final Context context = ApplicationProvider.getApplicationContext();
+        final Context context = activity.getApplicationContext();
         Date expiryDate = new Date();
         String dateString = context.getString(R.string.expiryStateSentence, DateFormat.getDateInstance(DateFormat.LONG).format(expiryDate));
 
-        db.insertLoyaltyCard("store", "note", expiryDate, new BigDecimal("0"), null, "cardId", BarcodeFormat.UPC_A.toString(), Color.BLACK, 0);
+        db.insertLoyaltyCard("store", "note", expiryDate, new BigDecimal("0"), null, "cardId", null, BarcodeFormat.UPC_A, Color.BLACK, 0);
         LoyaltyCard card = db.getLoyaltyCard(1);
 
         Cursor cursor = db.getLoyaltyCardCursor();
         cursor.moveToFirst();
 
-        setFontSizes(1, 2);
+        setFontScale(50);
         View view = createView(cursor);
 
         checkView(view, card.store, card.note, dateString, "", true);
 
-        setFontSizes(30, 31);
+        setFontScale(200);
         view = createView(cursor);
         checkView(view, card.store, card.note, dateString, "",true);
 
@@ -172,22 +181,39 @@ public class LoyaltyCardCursorAdapterTest
     @Test
     public void TestCursorAdapterStarring()
     {
-        db.insertLoyaltyCard("storeA", "note", null, new BigDecimal("0"), null, "cardId", BarcodeFormat.UPC_A.toString(), Color.BLACK, 0);
-        db.insertLoyaltyCard("storeB", "note", null, new BigDecimal("0"), null, "cardId", BarcodeFormat.UPC_A.toString(), Color.BLACK, 1);
-        db.insertLoyaltyCard("storeC", "note", null, new BigDecimal("0"), null, "cardId", BarcodeFormat.UPC_A.toString(), Color.BLACK, 1);
+        assertNotEquals(-1, db.insertLoyaltyCard("storeA", "note", null, new BigDecimal("0"), null, "cardId", null, BarcodeFormat.UPC_A, Color.BLACK, 0));
+        assertNotEquals(-1, db.insertLoyaltyCard("storeB", "note", null, new BigDecimal("0"), null, "cardId", null, BarcodeFormat.UPC_A, Color.BLACK, 1));
+        assertNotEquals(-1, db.insertLoyaltyCard("storeC", "note", null, new BigDecimal("0"), null, "cardId", null, BarcodeFormat.UPC_A, Color.BLACK, 1));
+
+        assertEquals(3, db.getLoyaltyCardCount());
 
         Cursor cursor = db.getLoyaltyCardCursor();
+        assertEquals(3, cursor.getCount());
+
         cursor.moveToFirst();
+        System.out.println(LoyaltyCard.toLoyaltyCard(cursor).store);
+        cursor.moveToNext();
+        System.out.println(LoyaltyCard.toLoyaltyCard(cursor).store);
+        cursor.moveToNext();
+        System.out.println(LoyaltyCard.toLoyaltyCard(cursor).store);
+
+        assertTrue(cursor.moveToFirst());
+        LoyaltyCard loyaltyCard = LoyaltyCard.toLoyaltyCard(cursor);
+        assertEquals("storeB", loyaltyCard.store);
         View view = createView(cursor);
         ImageView star = view.findViewById(R.id.star);
         assertEquals(View.VISIBLE, star.getVisibility());
 
-        cursor.moveToNext();
+        assertTrue(cursor.moveToNext());
+        loyaltyCard = LoyaltyCard.toLoyaltyCard(cursor);
+        assertEquals("storeC", loyaltyCard.store);
         view = createView(cursor);
         star = view.findViewById(R.id.star);
         assertEquals(View.VISIBLE, star.getVisibility());
 
-        cursor.moveToNext();
+        assertTrue(cursor.moveToNext());
+        loyaltyCard = LoyaltyCard.toLoyaltyCard(cursor);
+        assertEquals("storeA", loyaltyCard.store);
         view = createView(cursor);
         star = view.findViewById(R.id.star);
         assertEquals(View.GONE, star.getVisibility());
@@ -198,7 +224,7 @@ public class LoyaltyCardCursorAdapterTest
     @Test
     public void TestCursorAdapter0Points()
     {
-        db.insertLoyaltyCard("store", "", null, new BigDecimal("0"), null, "cardId", BarcodeFormat.UPC_A.toString(), Color.BLACK, 0);
+        db.insertLoyaltyCard("store", "", null, new BigDecimal("0"), null, "cardId", null, BarcodeFormat.UPC_A, Color.BLACK, 0);
         LoyaltyCard card = db.getLoyaltyCard(1);
 
         Cursor cursor = db.getLoyaltyCardCursor();
@@ -214,7 +240,7 @@ public class LoyaltyCardCursorAdapterTest
     @Test
     public void TestCursorAdapter0EUR()
     {
-        db.insertLoyaltyCard("store", "", null, new BigDecimal("0"), Currency.getInstance("EUR"), "cardId", BarcodeFormat.UPC_A.toString(), Color.BLACK, 0);
+        db.insertLoyaltyCard("store", "", null, new BigDecimal("0"), Currency.getInstance("EUR"), "cardId", null, BarcodeFormat.UPC_A, Color.BLACK, 0);
         LoyaltyCard card = db.getLoyaltyCard(1);
 
         Cursor cursor = db.getLoyaltyCardCursor();
@@ -230,7 +256,7 @@ public class LoyaltyCardCursorAdapterTest
     @Test
     public void TestCursorAdapter100Points()
     {
-        db.insertLoyaltyCard("store", "note", null, new BigDecimal("100"), null, "cardId", BarcodeFormat.UPC_A.toString(), Color.BLACK, 0);
+        db.insertLoyaltyCard("store", "note", null, new BigDecimal("100"), null, "cardId", null, BarcodeFormat.UPC_A, Color.BLACK, 0);
         LoyaltyCard card = db.getLoyaltyCard(1);
 
         Cursor cursor = db.getLoyaltyCardCursor();
@@ -246,7 +272,7 @@ public class LoyaltyCardCursorAdapterTest
     @Test
     public void TestCursorAdapter10USD()
     {
-        db.insertLoyaltyCard("store", "note", null, new BigDecimal("10.00"), Currency.getInstance("USD"), "cardId", BarcodeFormat.UPC_A.toString(), Color.BLACK, 0);
+        db.insertLoyaltyCard("store", "note", null, new BigDecimal("10.00"), Currency.getInstance("USD"), "cardId", null, BarcodeFormat.UPC_A, Color.BLACK, 0);
         LoyaltyCard card = db.getLoyaltyCard(1);
 
         Cursor cursor = db.getLoyaltyCardCursor();

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

@@ -1,26 +1,18 @@
 package protect.card_locker;
 
-import static android.os.Looper.getMainLooper;
-import static org.junit.Assert.assertEquals;
-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 android.app.Activity;
 import android.app.DatePickerDialog;
+import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.pm.ActivityInfo;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
-import android.content.Context;
 import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
 import android.net.Uri;
 import android.os.Bundle;
-import androidx.preference.PreferenceManager;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
@@ -30,19 +22,13 @@ import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.SeekBar;
 import android.widget.TextView;
-import androidx.core.widget.TextViewCompat;
-import androidx.test.core.app.ApplicationProvider;
 
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.google.android.material.textfield.MaterialAutoCompleteTextView;
 import com.google.android.material.textfield.TextInputLayout;
 import com.google.zxing.BarcodeFormat;
 import com.google.zxing.client.android.Intents;
-import java.io.IOException;
-import java.math.BigDecimal;
-import java.text.DateFormat;
-import java.util.Currency;
-import java.util.Date;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -52,19 +38,35 @@ import org.robolectric.RuntimeEnvironment;
 import org.robolectric.android.controller.ActivityController;
 import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowActivity;
-import org.robolectric.shadows.ShadowAlertDialog;
 import org.robolectric.shadows.ShadowDialog;
 import org.robolectric.shadows.ShadowLog;
 
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.util.Currency;
+import java.util.Date;
+
+import androidx.core.widget.TextViewCompat;
+import androidx.preference.PreferenceManager;
+
+import static android.os.Looper.getMainLooper;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.robolectric.Shadows.shadowOf;
+
 @RunWith(RobolectricTestRunner.class)
 @Config(sdk = 23)
 public class LoyaltyCardViewActivityTest
 {
     private final String BARCODE_DATA = "428311627547";
-    private final String BARCODE_TYPE = BarcodeFormat.UPC_A.name();
+    private final BarcodeFormat BARCODE_TYPE = BarcodeFormat.UPC_A;
 
     private final String EAN_BARCODE_DATA = "4763705295336";
-    private final String EAN_BARCODE_TYPE = BarcodeFormat.EAN_13.name();
+    private final BarcodeFormat EAN_BARCODE_TYPE = BarcodeFormat.EAN_13;
 
     enum ViewMode
     {
@@ -109,13 +111,13 @@ public class LoyaltyCardViewActivityTest
      */
     private void saveLoyaltyCardWithArguments(final Activity activity,
                                               final String store, final String note,
-                                              final Date expiry,
+                                              final String expiry,
                                               final BigDecimal balance,
-                                              final Currency balanceType,
+                                              final String balanceType,
                                               final String cardId,
+                                              final String barcodeId,
                                               final String barcodeType,
-                                              boolean creatingNewCard)
-    {
+                                              boolean creatingNewCard) throws ParseException {
         DBHelper db = new DBHelper(activity);
         if(creatingNewCard)
         {
@@ -132,18 +134,16 @@ public class LoyaltyCardViewActivityTest
         final EditText balanceView = activity.findViewById(R.id.balanceField);
         final EditText balanceCurrencyField = activity.findViewById(R.id.balanceCurrencyField);
         final TextView cardIdField = activity.findViewById(R.id.cardIdView);
+        final TextView barcodeIdField = activity.findViewById(R.id.barcodeIdField);
         final TextView barcodeTypeField = activity.findViewById(R.id.barcodeTypeField);
 
         storeField.setText(store);
         noteField.setText(note);
         expiryView.setTag(expiry);
-        if (balance != null) {
-            balanceView.setText(balance.toPlainString());
-        }
-        if (balanceType != null) {
-            balanceCurrencyField.setText(balanceType.getSymbol());
-        }
+        balanceView.setText(balance.toPlainString());
+        balanceCurrencyField.setText(balanceType);
         cardIdField.setText(cardId);
+        barcodeIdField.setText(barcodeId);
         barcodeTypeField.setText(barcodeType);
 
         assertEquals(false, activity.isFinishing());
@@ -155,26 +155,49 @@ public class LoyaltyCardViewActivityTest
         LoyaltyCard card = db.getLoyaltyCard(1);
         assertEquals(store, card.store);
         assertEquals(note, card.note);
-        assertEquals(expiry, card.expiry);
-        if (balance != null) {
-            assertEquals(balance, card.balance);
-        } else {
-            assertEquals(new BigDecimal("0"), card.balance);
+        assertEquals(balance, card.balance);
+
+        // The special "Never" string shouldn't actually be written to the loyalty card
+        if(expiry.equals(activity.getApplicationContext().getString(R.string.never)))
+        {
+            assertEquals(null, card.expiry);
+        }
+        else
+        {
+            assertEquals(DateFormat.getDateInstance().parse(expiry), card.expiry);
+        }
+
+        // The special "Points" string shouldn't actually be written to the loyalty card
+        if(balanceType.equals(activity.getApplicationContext().getString(R.string.points)))
+        {
+            assertEquals(null, card.balanceType);
+        }
+        else
+        {
+            assertEquals(Currency.getInstance(balanceType), card.balanceType);
         }
-        assertEquals(balanceType, card.balanceType);
         assertEquals(cardId, card.cardId);
 
+        // The special "Same as barcode ID" string shouldn't actually be written to the loyalty card
+        if(barcodeId.equals(activity.getApplicationContext().getString(R.string.sameAsCardId)))
+        {
+            assertEquals(null, card.barcodeId);
+        }
+        else
+        {
+            assertEquals(barcodeId, card.barcodeId);
+        }
+
         // The special "No barcode" string shouldn't actually be written to the loyalty card
         if(barcodeType.equals(activity.getApplicationContext().getString(R.string.noBarcode)))
         {
-            assertEquals("", card.barcodeType);
+            assertEquals(null, card.barcodeType);
         }
         else
         {
-            assertEquals(barcodeType, card.barcodeType);
+            assertEquals(BarcodeFormat.valueOf(barcodeType), card.barcodeType);
         }
         assertNotNull(card.headerColor);
-        assertNotNull(card.headerTextColor);
 
         db.close();
     }
@@ -201,7 +224,7 @@ public class LoyaltyCardViewActivityTest
         Intent resultIntent = new Intent(intent);
         Bundle resultBundle = new Bundle();
         resultBundle.putString(BarcodeSelectorActivity.BARCODE_CONTENTS, BARCODE_DATA);
-        resultBundle.putString(BarcodeSelectorActivity.BARCODE_FORMAT, BARCODE_TYPE);
+        resultBundle.putString(BarcodeSelectorActivity.BARCODE_FORMAT, String.valueOf(BARCODE_TYPE));
         resultIntent.putExtras(resultBundle);
 
         // Respond to image capture, success
@@ -274,7 +297,8 @@ public class LoyaltyCardViewActivityTest
     private void checkAllFields(final Activity activity, ViewMode mode,
                                 final String store, final String note, final String expiryString,
                                 final String balanceString, final String balanceTypeString,
-                                final String cardId, final String barcodeType)
+                                final String cardId, final String barcodeId,
+                                final String barcodeType)
     {
         if(mode == ViewMode.VIEW_CARD)
         {
@@ -290,6 +314,7 @@ public class LoyaltyCardViewActivityTest
             checkFieldProperties(activity, R.id.balanceField, editVisibility, balanceString);
             checkFieldProperties(activity, R.id.balanceCurrencyField, editVisibility, balanceTypeString);
             checkFieldProperties(activity, R.id.cardIdView, View.VISIBLE, cardId);
+            checkFieldProperties(activity, R.id.barcodeIdField, View.VISIBLE, barcodeId);
             checkFieldProperties(activity, R.id.barcodeTypeField, View.VISIBLE, barcodeType);
             checkFieldProperties(activity, R.id.barcode, View.VISIBLE, null);
         }
@@ -304,9 +329,9 @@ public class LoyaltyCardViewActivityTest
         activityController.resume();
 
         Activity activity = (Activity)activityController.get();
-        final Context context = ApplicationProvider.getApplicationContext();
+        final Context context = activity.getApplicationContext();
 
-        checkAllFields(activity, ViewMode.ADD_CARD, "", "", context.getString(R.string.never) , "0", context.getString(R.string.points), "", "");
+        checkAllFields(activity, ViewMode.ADD_CARD, "", "", context.getString(R.string.never) , "0", context.getString(R.string.points), "", context.getString(R.string.sameAsCardId),"");
     }
 
     @Test
@@ -319,7 +344,7 @@ public class LoyaltyCardViewActivityTest
 
         Activity activity = (Activity)activityController.get();
         
-        DBHelper db = new DBHelper(activity);
+        DBHelper db = TestHelpers.getEmptyDb(activity);
         assertEquals(0, db.getLoyaltyCardCount());
 
         final EditText storeField = activity.findViewById(R.id.storeNameEdit);
@@ -355,8 +380,7 @@ public class LoyaltyCardViewActivityTest
     }
 
     @Test
-    public void startWithoutParametersCaptureBarcodeCreateLoyaltyCard() throws IOException
-    {
+    public void startWithoutParametersCaptureBarcodeCreateLoyaltyCard() throws IOException, ParseException {
         registerMediaStoreIntentHandler();
 
         ActivityController activityController = Robolectric.buildActivity(LoyaltyCardEditActivity.class).create();
@@ -365,19 +389,19 @@ public class LoyaltyCardViewActivityTest
         activityController.resume();
 
         Activity activity = (Activity)activityController.get();
-        final Context context = ApplicationProvider.getApplicationContext();
+        final Context context = activity.getApplicationContext();
 
-        checkAllFields(activity, ViewMode.ADD_CARD, "", "", context.getString(R.string.never), "0", context.getString(R.string.points), "", "");
+        checkAllFields(activity, ViewMode.ADD_CARD, "", "", context.getString(R.string.never), "0", context.getString(R.string.points), "", context.getString(R.string.sameAsCardId),"");
 
         // Complete barcode capture successfully
         captureBarcodeWithResult(activity, true);
 
-        checkAllFields(activity, ViewMode.ADD_CARD, "", "", context.getString(R.string.never), "0", context.getString(R.string.points), BARCODE_DATA, BARCODE_TYPE);
+        checkAllFields(activity, ViewMode.ADD_CARD, "", "", context.getString(R.string.never), "0", context.getString(R.string.points), BARCODE_DATA, context.getString(R.string.sameAsCardId), BARCODE_TYPE.toString());
 
         shadowOf(getMainLooper()).idle();
 
         // Save and check the loyalty card
-        saveLoyaltyCardWithArguments(activity, "store", "note", null, null, null, BARCODE_DATA, BARCODE_TYPE, true);
+        saveLoyaltyCardWithArguments(activity, "store", "note", context.getString(R.string.never), new BigDecimal("0"), context.getString(R.string.points), BARCODE_DATA, context.getString(R.string.sameAsCardId), BARCODE_TYPE.name(), true);
     }
 
     @Test
@@ -389,14 +413,14 @@ public class LoyaltyCardViewActivityTest
         activityController.resume();
 
         Activity activity = (Activity)activityController.get();
-        final Context context = ApplicationProvider.getApplicationContext();
+        final Context context = activity.getApplicationContext();
 
-        checkAllFields(activity, ViewMode.ADD_CARD, "", "", context.getString(R.string.never), "0", context.getString(R.string.points), "", "");
+        checkAllFields(activity, ViewMode.ADD_CARD, "", "", context.getString(R.string.never), "0", context.getString(R.string.points), "", context.getString(R.string.sameAsCardId), "");
 
         // Complete barcode capture in failure
         captureBarcodeWithResult(activity, false);
 
-        checkAllFields(activity, ViewMode.ADD_CARD, "", "", context.getString(R.string.never), "0", context.getString(R.string.points), "", "");
+        checkAllFields(activity, ViewMode.ADD_CARD, "", "", context.getString(R.string.never), "0", context.getString(R.string.points), "", context.getString(R.string.sameAsCardId),"");
     }
 
     @Test
@@ -408,14 +432,14 @@ public class LoyaltyCardViewActivityTest
         activityController.resume();
 
         LoyaltyCardEditActivity activity = (LoyaltyCardEditActivity) activityController.get();
-        final Context context = ApplicationProvider.getApplicationContext();
+        final Context context = activity.getApplicationContext();
 
-        checkAllFields(activity, ViewMode.ADD_CARD, "", "", context.getString(R.string.never), "0", context.getString(R.string.points), "", "");
+        checkAllFields(activity, ViewMode.ADD_CARD, "", "", context.getString(R.string.never), "0", context.getString(R.string.points), "", context.getString(R.string.sameAsCardId),"");
 
         // Complete barcode capture successfully
         captureBarcodeWithResult(activity, true);
 
-        checkAllFields(activity, ViewMode.ADD_CARD, "", "", context.getString(R.string.never), "0", context.getString(R.string.points), BARCODE_DATA, BARCODE_TYPE);
+        checkAllFields(activity, ViewMode.ADD_CARD, "", "", context.getString(R.string.never), "0", context.getString(R.string.points), BARCODE_DATA, context.getString(R.string.sameAsCardId), BARCODE_TYPE.toString());
 
         // Cancel the loyalty card creation
         assertEquals(false, activity.isFinishing());
@@ -462,16 +486,16 @@ public class LoyaltyCardViewActivityTest
     {
         ActivityController activityController = createActivityWithLoyaltyCard(true);
         Activity activity = (Activity)activityController.get();
-        final Context context = ApplicationProvider.getApplicationContext();
-        DBHelper db = new DBHelper(activity);
+        final Context context = activity.getApplicationContext();
+        DBHelper db = TestHelpers.getEmptyDb(activity);
 
-        db.insertLoyaltyCard("store", "note", null, new BigDecimal("0"), null, BARCODE_DATA, BARCODE_TYPE, Color.BLACK, 0);
+        db.insertLoyaltyCard("store", "note", null, new BigDecimal("0"), null, BARCODE_DATA, null, BARCODE_TYPE, Color.BLACK, 0);
 
         activityController.start();
         activityController.visible();
         activityController.resume();
 
-        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", null, "0", context.getString(R.string.points), BARCODE_DATA, BARCODE_TYPE);
+        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", null, "0", context.getString(R.string.points), BARCODE_DATA, null, BARCODE_TYPE.toString());
 
         db.close();
     }
@@ -481,16 +505,16 @@ public class LoyaltyCardViewActivityTest
     {
         ActivityController activityController = createActivityWithLoyaltyCard(false);
         Activity activity = (Activity)activityController.get();
-        final Context context = ApplicationProvider.getApplicationContext();
-        DBHelper db = new DBHelper(activity);
+        final Context context = activity.getApplicationContext();
+        DBHelper db = TestHelpers.getEmptyDb(activity);
 
-        db.insertLoyaltyCard("store", "note", null, new BigDecimal("0"), null, BARCODE_DATA, BARCODE_TYPE, Color.BLACK, 0);
+        db.insertLoyaltyCard("store", "note", null, new BigDecimal("0"), null, BARCODE_DATA, null, BARCODE_TYPE, Color.BLACK, 0);
 
         activityController.start();
         activityController.visible();
         activityController.resume();
 
-        checkAllFields(activity, ViewMode.VIEW_CARD, "store", "note", null, "0", context.getString(R.string.points), BARCODE_DATA, BARCODE_TYPE);
+        checkAllFields(activity, ViewMode.VIEW_CARD, "store", "note", null, "0", context.getString(R.string.points), BARCODE_DATA, null, BARCODE_TYPE.toString());
 
         db.close();
     }
@@ -500,21 +524,21 @@ public class LoyaltyCardViewActivityTest
     {
         ActivityController activityController = createActivityWithLoyaltyCard(true);
         Activity activity = (Activity)activityController.get();
-        final Context context = ApplicationProvider.getApplicationContext();
-        DBHelper db = new DBHelper(activity);
+        final Context context = activity.getApplicationContext();
+        DBHelper db = TestHelpers.getEmptyDb(activity);
 
-        db.insertLoyaltyCard("store", "note", null, new BigDecimal("0"), null, EAN_BARCODE_DATA, EAN_BARCODE_TYPE, Color.BLACK, 0);
+        db.insertLoyaltyCard("store", "note", null, new BigDecimal("0"), null, EAN_BARCODE_DATA, null, EAN_BARCODE_TYPE, Color.BLACK, 0);
 
         activityController.start();
         activityController.visible();
         activityController.resume();
 
-        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", null, "0", context.getString(R.string.points), EAN_BARCODE_DATA, EAN_BARCODE_TYPE);
+        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", null, "0", context.getString(R.string.points), EAN_BARCODE_DATA, null, EAN_BARCODE_TYPE.toString());
 
         // Complete barcode capture successfully
         captureBarcodeWithResult(activity, true);
 
-        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", null, "0", context.getString(R.string.points), BARCODE_DATA, BARCODE_TYPE);
+        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", null, "0", context.getString(R.string.points), BARCODE_DATA, null, BARCODE_TYPE.toString());
 
         db.close();
     }
@@ -524,21 +548,21 @@ public class LoyaltyCardViewActivityTest
     {
         ActivityController activityController = createActivityWithLoyaltyCard(true);
         LoyaltyCardEditActivity activity = (LoyaltyCardEditActivity) activityController.get();
-        final Context context = ApplicationProvider.getApplicationContext();
-        DBHelper db = new DBHelper(activity);
+        final Context context = activity.getApplicationContext();
+        DBHelper db = TestHelpers.getEmptyDb(activity);
 
-        db.insertLoyaltyCard("store", "note", null, new BigDecimal("0"), null, EAN_BARCODE_DATA, EAN_BARCODE_TYPE, Color.BLACK, 0);
+        db.insertLoyaltyCard("store", "note", null, new BigDecimal("0"), null, EAN_BARCODE_DATA, null, EAN_BARCODE_TYPE, Color.BLACK, 0);
 
         activityController.start();
         activityController.visible();
         activityController.resume();
 
-        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", null, "0", context.getString(R.string.points), EAN_BARCODE_DATA, EAN_BARCODE_TYPE);
+        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", null, "0", context.getString(R.string.points), EAN_BARCODE_DATA, null, EAN_BARCODE_TYPE.toString());
 
         // Complete barcode capture successfully
         captureBarcodeWithResult(activity, true);
 
-        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", null, "0", context.getString(R.string.points), BARCODE_DATA, BARCODE_TYPE);
+        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", null, "0", context.getString(R.string.points), BARCODE_DATA, null, BARCODE_TYPE.toString());
 
         // Cancel the loyalty card creation
         assertEquals(false, activity.isFinishing());
@@ -562,16 +586,16 @@ public class LoyaltyCardViewActivityTest
     {
         ActivityController activityController = createActivityWithLoyaltyCard(true);
         Activity activity = (Activity)activityController.get();
-        final Context context = ApplicationProvider.getApplicationContext();
-        DBHelper db = new DBHelper(activity);
+        final Context context = activity.getApplicationContext();
+        DBHelper db = TestHelpers.getEmptyDb(activity);
 
-        db.insertLoyaltyCard("store", "note", null, new BigDecimal("0"), null, EAN_BARCODE_DATA, EAN_BARCODE_TYPE, Color.BLACK, 0);
+        db.insertLoyaltyCard("store", "note", null, new BigDecimal("0"), null, EAN_BARCODE_DATA, null, EAN_BARCODE_TYPE, Color.BLACK, 0);
 
         activityController.start();
         activityController.visible();
         activityController.resume();
 
-        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", context.getString(R.string.never), "0", context.getString(R.string.points), EAN_BARCODE_DATA, EAN_BARCODE_TYPE);
+        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", context.getString(R.string.never), "0", context.getString(R.string.points), EAN_BARCODE_DATA, null, EAN_BARCODE_TYPE.toString());
 
         // Set date to today
         MaterialAutoCompleteTextView expiryField = activity.findViewById(R.id.expiryField);
@@ -585,7 +609,7 @@ public class LoyaltyCardViewActivityTest
 
         shadowOf(getMainLooper()).idle();
 
-        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", DateFormat.getDateInstance(DateFormat.LONG).format(new Date()), "0", context.getString(R.string.points), EAN_BARCODE_DATA, EAN_BARCODE_TYPE);
+        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", DateFormat.getDateInstance(DateFormat.LONG).format(new Date()), "0", context.getString(R.string.points), EAN_BARCODE_DATA, null, EAN_BARCODE_TYPE.toString());
 
         db.close();
     }
@@ -595,22 +619,22 @@ public class LoyaltyCardViewActivityTest
     {
         ActivityController activityController = createActivityWithLoyaltyCard(true);
         Activity activity = (Activity)activityController.get();
-        final Context context = ApplicationProvider.getApplicationContext();
-        DBHelper db = new DBHelper(activity);
+        final Context context = activity.getApplicationContext();
+        DBHelper db = TestHelpers.getEmptyDb(activity);
 
-        db.insertLoyaltyCard("store", "note", new Date(), new BigDecimal("0"), null, EAN_BARCODE_DATA, EAN_BARCODE_TYPE, Color.BLACK, 0);
+        db.insertLoyaltyCard("store", "note", new Date(), new BigDecimal("0"), null, EAN_BARCODE_DATA, null, EAN_BARCODE_TYPE, Color.BLACK, 0);
 
         activityController.start();
         activityController.visible();
         activityController.resume();
 
-        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", DateFormat.getDateInstance(DateFormat.LONG).format(new Date()), "0", context.getString(R.string.points), EAN_BARCODE_DATA, EAN_BARCODE_TYPE);
+        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", DateFormat.getDateInstance(DateFormat.LONG).format(new Date()), "0", context.getString(R.string.points), EAN_BARCODE_DATA, null, EAN_BARCODE_TYPE.toString());
 
         // Set date to never
         MaterialAutoCompleteTextView expiryField = activity.findViewById(R.id.expiryField);
         expiryField.setText(expiryField.getAdapter().getItem(0).toString(), false);
 
-        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", context.getString(R.string.never), "0", context.getString(R.string.points), EAN_BARCODE_DATA, EAN_BARCODE_TYPE);
+        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", context.getString(R.string.never), "0", context.getString(R.string.points), EAN_BARCODE_DATA, null, EAN_BARCODE_TYPE.toString());
 
         db.close();
     }
@@ -620,16 +644,16 @@ public class LoyaltyCardViewActivityTest
     {
         ActivityController activityController = createActivityWithLoyaltyCard(true);
         Activity activity = (Activity)activityController.get();
-        final Context context = ApplicationProvider.getApplicationContext();
-        DBHelper db = new DBHelper(activity);
+        final Context context = activity.getApplicationContext();
+        DBHelper db = TestHelpers.getEmptyDb(activity);
 
-        db.insertLoyaltyCard("store", "note", null, new BigDecimal("0"), null, EAN_BARCODE_DATA, EAN_BARCODE_TYPE, Color.BLACK, 0);
+        db.insertLoyaltyCard("store", "note", null, new BigDecimal("0"), null, EAN_BARCODE_DATA, null, EAN_BARCODE_TYPE, Color.BLACK, 0);
 
         activityController.start();
         activityController.visible();
         activityController.resume();
 
-        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", context.getString(R.string.never), "0", context.getString(R.string.points), EAN_BARCODE_DATA, EAN_BARCODE_TYPE);
+        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", context.getString(R.string.never), "0", context.getString(R.string.points), EAN_BARCODE_DATA, null, EAN_BARCODE_TYPE.toString());
 
         // Set balance to 10 points
         EditText balanceField = activity.findViewById(R.id.balanceField);
@@ -658,7 +682,7 @@ public class LoyaltyCardViewActivityTest
 
                 shadowOf(getMainLooper()).idle();
 
-                checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", DateFormat.getDateInstance(DateFormat.LONG).format(new Date()), "10.00", "€", EAN_BARCODE_DATA, EAN_BARCODE_TYPE);
+                checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", DateFormat.getDateInstance(DateFormat.LONG).format(new Date()), "10.00", "€", EAN_BARCODE_DATA, null, EAN_BARCODE_TYPE.toString());
 
                 db.close();
             }
@@ -671,16 +695,16 @@ public class LoyaltyCardViewActivityTest
     {
         ActivityController activityController = createActivityWithLoyaltyCard(true);
         Activity activity = (Activity)activityController.get();
-        final Context context = ApplicationProvider.getApplicationContext();
-        DBHelper db = new DBHelper(activity);
+        final Context context = activity.getApplicationContext();
+        DBHelper db = TestHelpers.getEmptyDb(activity);
 
-        db.insertLoyaltyCard("store", "note", null, new BigDecimal("10.00"), Currency.getInstance("USD"), EAN_BARCODE_DATA, EAN_BARCODE_TYPE, Color.BLACK, 0);
+        db.insertLoyaltyCard("store", "note", null, new BigDecimal("10.00"), Currency.getInstance("USD"), EAN_BARCODE_DATA, null, EAN_BARCODE_TYPE, Color.BLACK, 0);
 
         activityController.start();
         activityController.visible();
         activityController.resume();
 
-        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", context.getString(R.string.never), "10.00", "$", EAN_BARCODE_DATA, EAN_BARCODE_TYPE);
+        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", context.getString(R.string.never), "10.00", "$", EAN_BARCODE_DATA, null, EAN_BARCODE_TYPE.toString());
 
         shadowOf(getMainLooper()).idle();
 
@@ -702,7 +726,7 @@ public class LoyaltyCardViewActivityTest
 
         shadowOf(getMainLooper()).idle();
 
-        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", context.getString(R.string.never), "0", "₩", EAN_BARCODE_DATA, EAN_BARCODE_TYPE);
+        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", context.getString(R.string.never), "0", "₩", EAN_BARCODE_DATA, null, EAN_BARCODE_TYPE.toString());
 
         db.close();
     }
@@ -712,9 +736,9 @@ public class LoyaltyCardViewActivityTest
     {
         ActivityController activityController = createActivityWithLoyaltyCard(false);
         Activity activity = (Activity)activityController.get();
-        DBHelper db = new DBHelper(activity);
+        DBHelper db = TestHelpers.getEmptyDb(activity);
 
-        db.insertLoyaltyCard("store", "note", null, new BigDecimal("0"), null, BARCODE_DATA, BARCODE_TYPE, Color.BLACK, 0);
+        db.insertLoyaltyCard("store", "note", null, new BigDecimal("0"), null, BARCODE_DATA, null, BARCODE_TYPE, Color.BLACK, 0);
 
         activityController.start();
         activityController.visible();
@@ -761,8 +785,8 @@ public class LoyaltyCardViewActivityTest
         ActivityController activityController = createActivityWithLoyaltyCard(false);
 
         Activity activity = (Activity)activityController.get();
-        DBHelper db = new DBHelper(activity);
-        db.insertLoyaltyCard("store", "note", null, new BigDecimal("0"), null, BARCODE_DATA, BARCODE_TYPE, Color.BLACK, 0);
+        DBHelper db = TestHelpers.getEmptyDb(activity);
+        db.insertLoyaltyCard("store", "note", null, new BigDecimal("0"), null, BARCODE_DATA, null, BARCODE_TYPE, Color.BLACK, 0);
 
         activityController.start();
         activityController.visible();
@@ -781,8 +805,8 @@ public class LoyaltyCardViewActivityTest
         ActivityController activityController = createActivityWithLoyaltyCard(false);
 
         Activity activity = (Activity)activityController.get();
-        DBHelper db = new DBHelper(activity);
-        db.insertLoyaltyCard("store", "note", null, new BigDecimal("0"), null, BARCODE_DATA, BARCODE_TYPE, null, 0);
+        DBHelper db = TestHelpers.getEmptyDb(activity);
+        db.insertLoyaltyCard("store", "note", null, new BigDecimal("0"), null, BARCODE_DATA, null, BARCODE_TYPE, null, 0);
 
         activityController.start();
         activityController.visible();
@@ -796,69 +820,66 @@ public class LoyaltyCardViewActivityTest
     }
 
     @Test
-    public void startLoyaltyCardWithoutColorsSave() throws IOException
-    {
+    public void startLoyaltyCardWithoutColorsSave() throws IOException, ParseException {
         ActivityController activityController = createActivityWithLoyaltyCard(true);
 
         Activity activity = (Activity)activityController.get();
-        DBHelper db = new DBHelper(activity);
-        db.insertLoyaltyCard("store", "note", null, new BigDecimal("0"), null, BARCODE_DATA, BARCODE_TYPE, null, 0);
+        DBHelper db = TestHelpers.getEmptyDb(activity);
+        db.insertLoyaltyCard("store", "note", null, new BigDecimal("0"), null, BARCODE_DATA, null, BARCODE_TYPE, null, 0);
 
         activityController.start();
         activityController.visible();
         activityController.resume();
 
         // Save and check the loyalty card
-        saveLoyaltyCardWithArguments(activity, "store", "note", null, new BigDecimal("0"), null, BARCODE_DATA, BARCODE_TYPE, false);
+        saveLoyaltyCardWithArguments(activity, "store", "note", activity.getApplicationContext().getString(R.string.never), new BigDecimal("0"), activity.getApplicationContext().getString(R.string.points), BARCODE_DATA, activity.getApplicationContext().getString(R.string.sameAsCardId), BARCODE_TYPE.toString(), false);
 
         db.close();
     }
 
     @Test
-    public void startLoyaltyCardWithExplicitNoBarcodeSave() throws IOException
-    {
+    public void startLoyaltyCardWithExplicitNoBarcodeSave() throws IOException, ParseException {
         ActivityController activityController = createActivityWithLoyaltyCard(true);
 
         Activity activity = (Activity)activityController.get();
-        DBHelper db = new DBHelper(activity);
-        db.insertLoyaltyCard("store", "note", null, new BigDecimal("0"), null, BARCODE_DATA, "", Color.BLACK, 0);
+        DBHelper db = TestHelpers.getEmptyDb(activity);
+        db.insertLoyaltyCard("store", "note", null, new BigDecimal("0"), null, BARCODE_DATA, null, null, Color.BLACK, 0);
 
         activityController.start();
         activityController.visible();
         activityController.resume();
 
         // Save and check the loyalty card
-        saveLoyaltyCardWithArguments(activity, "store", "note", null, new BigDecimal("0"), null, BARCODE_DATA, activity.getApplicationContext().getString(R.string.noBarcode), false);
+        saveLoyaltyCardWithArguments(activity, "store", "note", activity.getApplicationContext().getString(R.string.never), new BigDecimal("0"), activity.getApplicationContext().getString(R.string.points), BARCODE_DATA, activity.getApplicationContext().getString(R.string.sameAsCardId), activity.getApplicationContext().getString(R.string.noBarcode), false);
 
         db.close();
     }
 
     @Test
-    public void removeBarcodeFromLoyaltyCard() throws IOException
-    {
+    public void removeBarcodeFromLoyaltyCard() throws IOException, ParseException {
         ActivityController activityController = createActivityWithLoyaltyCard(true);
         Activity activity = (Activity)activityController.get();
-        final Context context = ApplicationProvider.getApplicationContext();
-        DBHelper db = new DBHelper(activity);
+        final Context context = activity.getApplicationContext();
+        DBHelper db = TestHelpers.getEmptyDb(activity);
 
-        db.insertLoyaltyCard("store", "note", null, new BigDecimal("0"), null, BARCODE_DATA, BARCODE_TYPE, Color.BLACK, 0);
+        db.insertLoyaltyCard("store", "note", null, new BigDecimal("0"), null, BARCODE_DATA, null, BARCODE_TYPE, Color.BLACK, 0);
 
         activityController.start();
         activityController.visible();
         activityController.resume();
 
         // First check if the card is as expected
-        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", context.getString(R.string.never), "0", context.getString(R.string.points), BARCODE_DATA, BARCODE_TYPE);
+        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", context.getString(R.string.never), "0", context.getString(R.string.points), BARCODE_DATA, null, BARCODE_TYPE.toString());
 
         // Complete empty barcode selection successfully
         selectBarcodeWithResult(activity, BARCODE_DATA, "", true);
 
         // Check if the barcode type is NO_BARCODE as expected
-        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", context.getString(R.string.never), "0", context.getString(R.string.points), BARCODE_DATA, activity.getApplicationContext().getString(R.string.noBarcode));
+        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", context.getString(R.string.never), "0", context.getString(R.string.points), BARCODE_DATA, null, context.getString(R.string.noBarcode));
         assertEquals(View.GONE, activity.findViewById(R.id.barcodeLayout).getVisibility());
 
         // Check if the special NO_BARCODE string doesn't get saved
-        saveLoyaltyCardWithArguments(activity, "store", "note", null, null, null, BARCODE_DATA, activity.getApplicationContext().getString(R.string.noBarcode), false);
+        saveLoyaltyCardWithArguments(activity, "store", "note", context.getString(R.string.never), new BigDecimal("0"), context.getString(R.string.points), BARCODE_DATA, context.getString(R.string.sameAsCardId), context.getString(R.string.noBarcode), false);
 
         db.close();
     }
@@ -869,16 +890,14 @@ public class LoyaltyCardViewActivityTest
         ActivityController activityController = createActivityWithLoyaltyCard(false);
 
         Activity activity = (Activity)activityController.get();
-        DBHelper db = new DBHelper(activity);
-        db.insertLoyaltyCard("store", "note", null, new BigDecimal("0"), null, BARCODE_DATA, BARCODE_TYPE, Color.BLACK, 0);
+        DBHelper db = TestHelpers.getEmptyDb(activity);
+        db.insertLoyaltyCard("store", "note", null, new BigDecimal("0"), null, BARCODE_DATA, null, BARCODE_TYPE, Color.BLACK, 0);
 
-        final int STORE_FONT_SIZE = 50;
-        final int CARD_FONT_SIZE = 40;
+        final int LARGE_FONT_SIZE = 40;
 
         SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences(activity);
         settings.edit()
-            .putInt(activity.getResources().getString(R.string.settings_key_card_title_font_size), STORE_FONT_SIZE)
-            .putInt(activity.getResources().getString(R.string.settings_key_card_id_font_size), CARD_FONT_SIZE)
+            .putInt(activity.getResources().getString(R.string.settings_key_max_font_size_scale), 100)
             .apply();
 
         activityController.start();
@@ -892,8 +911,8 @@ public class LoyaltyCardViewActivityTest
 
         TextViewCompat.getAutoSizeMaxTextSize(storeName);
         TextViewCompat.getAutoSizeMaxTextSize(storeName);
-        assertEquals(STORE_FONT_SIZE, (int)storeName.getTextSize());
-        assertEquals(CARD_FONT_SIZE, TextViewCompat.getAutoSizeMaxTextSize(cardIdFieldView));
+        assertEquals(LARGE_FONT_SIZE, (int)storeName.getTextSize());
+        assertEquals(LARGE_FONT_SIZE, TextViewCompat.getAutoSizeMaxTextSize(cardIdFieldView));
 
         shadowOf(activity).clickMenuItem(android.R.id.home);
         assertEquals(true, activity.isFinishing());
@@ -910,7 +929,7 @@ public class LoyaltyCardViewActivityTest
 
             Activity activity = (Activity)activityController.get();
             DBHelper db = new DBHelper(activity);
-            db.insertLoyaltyCard("store", "note", null, new BigDecimal("0"), null, BARCODE_DATA, BARCODE_TYPE, Color.BLACK, 0);
+            db.insertLoyaltyCard("store", "note", null, new BigDecimal("0"), null, BARCODE_DATA, null, BARCODE_TYPE, Color.BLACK, 0);
 
             SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences(activity);
             settings.edit()
@@ -946,8 +965,8 @@ public class LoyaltyCardViewActivityTest
         ActivityController activityController = createActivityWithLoyaltyCard(false);
 
         Activity activity = (Activity) activityController.get();
-        DBHelper db = new DBHelper(activity);
-        db.insertLoyaltyCard("store", "note", null, new BigDecimal("0"), null, BARCODE_DATA, BARCODE_TYPE, Color.BLACK,0);
+        DBHelper db = TestHelpers.getEmptyDb(activity);
+        db.insertLoyaltyCard("store", "note", null, new BigDecimal("0"), null, BARCODE_DATA, null, BARCODE_TYPE, Color.BLACK,0);
         activityController.start();
         activityController.visible();
         activityController.resume();
@@ -981,8 +1000,8 @@ public class LoyaltyCardViewActivityTest
         ActivityController activityController = createActivityWithLoyaltyCard(false);
 
         Activity activity = (Activity)activityController.get();
-        DBHelper db = new DBHelper(activity);
-        db.insertLoyaltyCard("store", "note", null, new BigDecimal("0"), null, BARCODE_DATA, BARCODE_TYPE, Color.BLACK, 0);
+        DBHelper db = TestHelpers.getEmptyDb(activity);
+        db.insertLoyaltyCard("store", "note", null, new BigDecimal("0"), null, BARCODE_DATA, null, BARCODE_TYPE, Color.BLACK, 0);
 
         activityController.start();
         activityController.visible();
@@ -1092,11 +1111,11 @@ public class LoyaltyCardViewActivityTest
         activityController.resume();
 
         Activity activity = (Activity)activityController.get();
-        final Context context = ApplicationProvider.getApplicationContext();
+        final Context context = activity.getApplicationContext();
 
         shadowOf(getMainLooper()).idle();
 
-        checkAllFields(activity, ViewMode.ADD_CARD, "Example Store", "", DateFormat.getDateInstance(DateFormat.LONG).format(date), "10.00", "$", "123456", "AZTEC");
+        checkAllFields(activity, ViewMode.ADD_CARD, "Example Store", "", DateFormat.getDateInstance(DateFormat.LONG).format(date), "10.00", "$", "123456", null, "AZTEC");
         assertEquals(-416706, ((ColorDrawable) activity.findViewById(R.id.thumbnail).getBackground()).getColor());
     }
 
@@ -1115,9 +1134,9 @@ public class LoyaltyCardViewActivityTest
         activityController.resume();
 
         Activity activity = (Activity)activityController.get();
-        final Context context = ApplicationProvider.getApplicationContext();
+        final Context context = activity.getApplicationContext();
 
-        checkAllFields(activity, ViewMode.ADD_CARD, "Example Store", "", context.getString(R.string.never), "0", context.getString(R.string.points), "123456", "AZTEC");
+        checkAllFields(activity, ViewMode.ADD_CARD, "Example Store", "", context.getString(R.string.never), "0", context.getString(R.string.points), "123456", null, "AZTEC");
         assertEquals(-416706, ((ColorDrawable) activity.findViewById(R.id.thumbnail).getBackground()).getColor());
     }
 }

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

@@ -17,17 +17,20 @@ 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.android.controller.ActivityController;
+import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowActivity;
+import org.w3c.dom.Text;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 
+import androidx.recyclerview.widget.RecyclerView;
+
+import static android.os.Looper.getMainLooper;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
 import static org.robolectric.Shadows.shadowOf;
 
 @RunWith(RobolectricTestRunner.class)
@@ -37,10 +40,9 @@ public class MainActivityTest
     private SharedPreferences prefs;
 
     @Test
-    public void initiallyNoLoyaltyCards() throws Exception
-    {
+    public void initiallyNoLoyaltyCards() {
         Activity activity = Robolectric.setupActivity(MainActivity.class);
-        assertTrue(activity != null);
+        assertNotNull(activity);
 
         TextView helpText = activity.findViewById(R.id.helpText);
         assertEquals(View.VISIBLE, helpText.getVisibility());
@@ -48,17 +50,16 @@ public class MainActivityTest
         TextView noMatchingCardsText = activity.findViewById(R.id.noMatchingCardsText);
         assertEquals(View.GONE, noMatchingCardsText.getVisibility());
 
-        ListView list = activity.findViewById(R.id.list);
+        RecyclerView list = activity.findViewById(R.id.list);
         assertEquals(View.GONE, list.getVisibility());
     }
 
     @Test
-    public void onCreateShouldInflateLayout() throws Exception
-    {
+    public void onCreateShouldInflateLayout() {
         final MainActivity activity = Robolectric.setupActivity(MainActivity.class);
 
         final Menu menu = shadowOf(activity).getOptionsMenu();
-        assertTrue(menu != null);
+        assertNotNull(menu);
 
         // The settings, import/export, groups, search and add button should be present
         assertEquals(menu.size(), 6);
@@ -92,12 +93,12 @@ public class MainActivityTest
 
         TextView helpText = mainActivity.findViewById(R.id.helpText);
         TextView noMatchingCardsText = mainActivity.findViewById(R.id.noMatchingCardsText);
-        ListView list = mainActivity.findViewById(R.id.list);
+        RecyclerView list = mainActivity.findViewById(R.id.list);
 
-        assertEquals(0, list.getCount());
+        assertEquals(0, list.getAdapter().getItemCount());
 
-        DBHelper db = new DBHelper(mainActivity);
-        db.insertLoyaltyCard("store", "note", null, new BigDecimal("0"), null, "cardId", BarcodeFormat.UPC_A.toString(), Color.BLACK, 0);
+        DBHelper db = TestHelpers.getEmptyDb(mainActivity);
+        db.insertLoyaltyCard("store", "note", null, new BigDecimal("0"), null, "cardId", null, BarcodeFormat.UPC_A, Color.BLACK, 0);
 
         assertEquals(View.VISIBLE, helpText.getVisibility());
         assertEquals(View.GONE, noMatchingCardsText.getVisibility());
@@ -110,9 +111,7 @@ public class MainActivityTest
         assertEquals(View.GONE, noMatchingCardsText.getVisibility());
         assertEquals(View.VISIBLE, list.getVisibility());
 
-        assertEquals(1, list.getAdapter().getCount());
-        Cursor cursor = (Cursor)list.getAdapter().getItem(0);
-        assertNotNull(cursor);
+        assertEquals(1, list.getAdapter().getItemCount());
 
         db.close();
     }
@@ -125,18 +124,19 @@ public class MainActivityTest
         Activity mainActivity = (Activity)activityController.get();
         activityController.start();
         activityController.resume();
+        activityController.visible();
 
         TextView helpText = mainActivity.findViewById(R.id.helpText);
         TextView noMatchingCardsText = mainActivity.findViewById(R.id.noMatchingCardsText);
-        ListView list = mainActivity.findViewById(R.id.list);
+        RecyclerView list = mainActivity.findViewById(R.id.list);
 
-        assertEquals(0, list.getCount());
+        assertEquals(0, list.getAdapter().getItemCount());
 
-        DBHelper db = new DBHelper(mainActivity);
-        db.insertLoyaltyCard("storeB", "note", null, new BigDecimal("0"), null, "cardId", BarcodeFormat.UPC_A.toString(), Color.BLACK, 0);
-        db.insertLoyaltyCard("storeA", "note", null, new BigDecimal("0"), null, "cardId", BarcodeFormat.UPC_A.toString(), Color.BLACK, 0);
-        db.insertLoyaltyCard("storeD", "note", null, new BigDecimal("0"), null, "cardId", BarcodeFormat.UPC_A.toString(), Color.BLACK, 1);
-        db.insertLoyaltyCard("storeC", "note", null, new BigDecimal("0"), null, "cardId", BarcodeFormat.UPC_A.toString(), Color.BLACK, 1);
+        DBHelper db = TestHelpers.getEmptyDb(mainActivity);
+        db.insertLoyaltyCard("storeB", "note", null, new BigDecimal("0"), null, "cardId", null, BarcodeFormat.UPC_A, Color.BLACK, 0);
+        db.insertLoyaltyCard("storeA", "note", null, new BigDecimal("0"), null, "cardId", null, BarcodeFormat.UPC_A, Color.BLACK, 0);
+        db.insertLoyaltyCard("storeD", "note", null, new BigDecimal("0"), null, "cardId", null, BarcodeFormat.UPC_A, Color.BLACK, 1);
+        db.insertLoyaltyCard("storeC", "note", null, new BigDecimal("0"), null, "cardId", null, BarcodeFormat.UPC_A, Color.BLACK, 1);
 
         assertEquals(View.VISIBLE, helpText.getVisibility());
         assertEquals(View.GONE, noMatchingCardsText.getVisibility());
@@ -144,27 +144,17 @@ public class MainActivityTest
 
         activityController.pause();
         activityController.resume();
+        activityController.visible();
 
         assertEquals(View.GONE, helpText.getVisibility());
         assertEquals(View.GONE, noMatchingCardsText.getVisibility());
         assertEquals(View.VISIBLE, list.getVisibility());
 
-        assertEquals(4, list.getAdapter().getCount());
-        Cursor cursor = (Cursor)list.getAdapter().getItem(0);
-        assertNotNull(cursor);
-        assertEquals("storeC",cursor.getString(cursor.getColumnIndex("store")));
-
-        cursor = (Cursor)list.getAdapter().getItem(1);
-        assertNotNull(cursor);
-        assertEquals("storeD",cursor.getString(cursor.getColumnIndex("store")));
-
-        cursor = (Cursor)list.getAdapter().getItem(2);
-        assertNotNull(cursor);
-        assertEquals("storeA",cursor.getString(cursor.getColumnIndex("store")));
-
-        cursor = (Cursor)list.getAdapter().getItem(3);
-        assertNotNull(cursor);
-        assertEquals("storeB",cursor.getString(cursor.getColumnIndex("store")));
+        assertEquals(4, list.getAdapter().getItemCount());
+        assertEquals("storeC", ((TextView) list.findViewHolderForAdapterPosition(0).itemView.findViewById(R.id.store)).getText());
+        assertEquals("storeD", ((TextView) list.findViewHolderForAdapterPosition(1).itemView.findViewById(R.id.store)).getText());
+        assertEquals("storeA", ((TextView) list.findViewHolderForAdapterPosition(2).itemView.findViewById(R.id.store)).getText());
+        assertEquals("storeB", ((TextView) list.findViewHolderForAdapterPosition(3).itemView.findViewById(R.id.store)).getText());
 
         db.close();
     }
@@ -178,7 +168,7 @@ public class MainActivityTest
         activityController.start();
         activityController.resume();
 
-        DBHelper db = new DBHelper(mainActivity);
+        DBHelper db = TestHelpers.getEmptyDb(mainActivity);
 
         TabLayout groupTabs = mainActivity.findViewById(R.id.groups);
 
@@ -230,12 +220,12 @@ public class MainActivityTest
 
         TextView helpText = mainActivity.findViewById(R.id.helpText);
         TextView noMatchingCardsText = mainActivity.findViewById(R.id.noMatchingCardsText);
-        ListView list = mainActivity.findViewById(R.id.list);
+        RecyclerView list = mainActivity.findViewById(R.id.list);
         TabLayout groupTabs = mainActivity.findViewById(R.id.groups);
 
-        DBHelper db = new DBHelper(mainActivity);
-        db.insertLoyaltyCard("The First Store", "Initial note", null, new BigDecimal("0"), null, "cardId", BarcodeFormat.UPC_A.toString(), Color.BLACK, 0);
-        db.insertLoyaltyCard("The Second Store", "Secondary note", null, new BigDecimal("0"), null, "cardId", BarcodeFormat.UPC_A.toString(), Color.BLACK, 0);
+        DBHelper db = TestHelpers.getEmptyDb(mainActivity);
+        db.insertLoyaltyCard("The First Store", "Initial note", null, new BigDecimal("0"), null, "cardId", null, BarcodeFormat.UPC_A, Color.BLACK, 0);
+        db.insertLoyaltyCard("The Second Store", "Secondary note", null, new BigDecimal("0"), null, "cardId", null, BarcodeFormat.UPC_A, Color.BLACK, 0);
 
         db.insertGroup("Group one");
         List<Group> groups = new ArrayList<>();
@@ -249,9 +239,9 @@ public class MainActivityTest
         assertEquals(View.GONE, noMatchingCardsText.getVisibility());
         assertEquals(View.VISIBLE, list.getVisibility());
 
-        assertEquals(2, list.getCount());
+        assertEquals(2, list.getAdapter().getItemCount());
 
-        mainActivity.filter = "store";
+        mainActivity.mFilter = "store";
 
         activityController.pause();
         activityController.resume();
@@ -260,7 +250,7 @@ public class MainActivityTest
         assertEquals(View.GONE, noMatchingCardsText.getVisibility());
         assertEquals(View.VISIBLE, list.getVisibility());
 
-        assertEquals(2, list.getCount());
+        assertEquals(2, list.getAdapter().getItemCount());
 
         // Switch to Group one
         groupTabs.selectTab(groupTabs.getTabAt(1));
@@ -272,7 +262,7 @@ public class MainActivityTest
         assertEquals(View.GONE, noMatchingCardsText.getVisibility());
         assertEquals(View.VISIBLE, list.getVisibility());
 
-        assertEquals(1, list.getCount());
+        assertEquals(1, list.getAdapter().getItemCount());
 
         // Switch back to all groups
         groupTabs.selectTab(groupTabs.getTabAt(0));
@@ -281,9 +271,9 @@ public class MainActivityTest
         assertEquals(View.GONE, noMatchingCardsText.getVisibility());
         assertEquals(View.VISIBLE, list.getVisibility());
 
-        assertEquals(2, list.getCount());
+        assertEquals(2, list.getAdapter().getItemCount());
 
-        mainActivity.filter = "first";
+        mainActivity.mFilter = "first";
 
         activityController.pause();
         activityController.resume();
@@ -292,7 +282,7 @@ public class MainActivityTest
         assertEquals(View.GONE, noMatchingCardsText.getVisibility());
         assertEquals(View.VISIBLE, list.getVisibility());
 
-        assertEquals(1, list.getCount());
+        assertEquals(1, list.getAdapter().getItemCount());
 
         // Switch to Group one
         groupTabs.selectTab(groupTabs.getTabAt(1));
@@ -304,7 +294,7 @@ public class MainActivityTest
         assertEquals(View.GONE, noMatchingCardsText.getVisibility());
         assertEquals(View.VISIBLE, list.getVisibility());
 
-        assertEquals(1, list.getCount());
+        assertEquals(1, list.getAdapter().getItemCount());
 
         // Switch back to all groups
         groupTabs.selectTab(groupTabs.getTabAt(0));
@@ -313,9 +303,9 @@ public class MainActivityTest
         assertEquals(View.GONE, noMatchingCardsText.getVisibility());
         assertEquals(View.VISIBLE, list.getVisibility());
 
-        assertEquals(1, list.getCount());
+        assertEquals(1, list.getAdapter().getItemCount());
 
-        mainActivity.filter = "initial";
+        mainActivity.mFilter = "initial";
 
         activityController.pause();
         activityController.resume();
@@ -324,7 +314,7 @@ public class MainActivityTest
         assertEquals(View.GONE, noMatchingCardsText.getVisibility());
         assertEquals(View.VISIBLE, list.getVisibility());
 
-        assertEquals(1, list.getCount());
+        assertEquals(1, list.getAdapter().getItemCount());
 
         // Switch to Group one
         groupTabs.selectTab(groupTabs.getTabAt(1));
@@ -336,7 +326,7 @@ public class MainActivityTest
         assertEquals(View.GONE, noMatchingCardsText.getVisibility());
         assertEquals(View.VISIBLE, list.getVisibility());
 
-        assertEquals(1, list.getCount());
+        assertEquals(1, list.getAdapter().getItemCount());
 
         // Switch back to all groups
         groupTabs.selectTab(groupTabs.getTabAt(0));
@@ -345,9 +335,9 @@ public class MainActivityTest
         assertEquals(View.GONE, noMatchingCardsText.getVisibility());
         assertEquals(View.VISIBLE, list.getVisibility());
 
-        assertEquals(1, list.getCount());
+        assertEquals(1, list.getAdapter().getItemCount());
 
-        mainActivity.filter = "second";
+        mainActivity.mFilter = "second";
 
         activityController.pause();
         activityController.resume();
@@ -356,7 +346,7 @@ public class MainActivityTest
         assertEquals(View.GONE, noMatchingCardsText.getVisibility());
         assertEquals(View.VISIBLE, list.getVisibility());
 
-        assertEquals(1, list.getCount());
+        assertEquals(1, list.getAdapter().getItemCount());
 
         // Switch to Group one
         groupTabs.selectTab(groupTabs.getTabAt(1));
@@ -364,11 +354,13 @@ public class MainActivityTest
         activityController.pause();
         activityController.resume();
 
+        shadowOf(getMainLooper()).idle();
+
         assertEquals(View.GONE, helpText.getVisibility());
         assertEquals(View.VISIBLE, noMatchingCardsText.getVisibility());
         assertEquals(View.VISIBLE, list.getVisibility());
 
-        assertEquals(0, list.getCount());
+        assertEquals(0, list.getAdapter().getItemCount());
 
         // Switch back to all groups
         groupTabs.selectTab(groupTabs.getTabAt(0));
@@ -377,18 +369,20 @@ public class MainActivityTest
         assertEquals(View.GONE, noMatchingCardsText.getVisibility());
         assertEquals(View.VISIBLE, list.getVisibility());
 
-        assertEquals(1, list.getCount());
+        assertEquals(1, list.getAdapter().getItemCount());
 
-        mainActivity.filter = "company";
+        mainActivity.mFilter = "company";
 
         activityController.pause();
         activityController.resume();
 
+        shadowOf(getMainLooper()).idle();
+
         assertEquals(View.GONE, helpText.getVisibility());
         assertEquals(View.VISIBLE, noMatchingCardsText.getVisibility());
         assertEquals(View.VISIBLE, list.getVisibility());
 
-        assertEquals(0, list.getCount());
+        assertEquals(0, list.getAdapter().getItemCount());
 
         // Switch to Group one
         groupTabs.selectTab(groupTabs.getTabAt(1));
@@ -396,11 +390,13 @@ public class MainActivityTest
         activityController.pause();
         activityController.resume();
 
+        shadowOf(getMainLooper()).idle();
+
         assertEquals(View.GONE, helpText.getVisibility());
         assertEquals(View.VISIBLE, noMatchingCardsText.getVisibility());
         assertEquals(View.VISIBLE, list.getVisibility());
 
-        assertEquals(0, list.getCount());
+        assertEquals(0, list.getAdapter().getItemCount());
 
         // Switch back to all groups
         groupTabs.selectTab(groupTabs.getTabAt(0));
@@ -409,18 +405,20 @@ public class MainActivityTest
         assertEquals(View.VISIBLE, noMatchingCardsText.getVisibility());
         assertEquals(View.VISIBLE, list.getVisibility());
 
-        assertEquals(0, list.getCount());
+        assertEquals(0, list.getAdapter().getItemCount());
 
-        mainActivity.filter = "";
+        mainActivity.mFilter = "";
 
         activityController.pause();
         activityController.resume();
 
+        shadowOf(getMainLooper()).idle();
+
         assertEquals(View.GONE, helpText.getVisibility());
         assertEquals(View.GONE, noMatchingCardsText.getVisibility());
         assertEquals(View.VISIBLE, list.getVisibility());
 
-        assertEquals(2, list.getCount());
+        assertEquals(2, list.getAdapter().getItemCount());
 
         // Switch to Group one
         groupTabs.selectTab(groupTabs.getTabAt(1));
@@ -428,11 +426,13 @@ public class MainActivityTest
         activityController.pause();
         activityController.resume();
 
+        shadowOf(getMainLooper()).idle();
+
         assertEquals(View.GONE, helpText.getVisibility());
         assertEquals(View.GONE, noMatchingCardsText.getVisibility());
         assertEquals(View.VISIBLE, list.getVisibility());
 
-        assertEquals(1, list.getCount());
+        assertEquals(1, list.getAdapter().getItemCount());
 
         // Switch back to all groups
         groupTabs.selectTab(groupTabs.getTabAt(0));
@@ -441,7 +441,7 @@ public class MainActivityTest
         assertEquals(View.GONE, noMatchingCardsText.getVisibility());
         assertEquals(View.VISIBLE, list.getVisibility());
 
-        assertEquals(2, list.getCount());
+        assertEquals(2, list.getAdapter().getItemCount());
 
         db.close();
     }

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

@@ -0,0 +1,18 @@
+package protect.card_locker;
+
+import android.app.Activity;
+import android.database.sqlite.SQLiteDatabase;
+
+public class TestHelpers {
+    static public DBHelper getEmptyDb(Activity activity) {
+        DBHelper db = new DBHelper(activity);
+        // Make sure DB is empty
+        SQLiteDatabase database = db.getWritableDatabase();
+        database.execSQL("delete from " + DBHelper.LoyaltyCardDbIds.TABLE);
+        database.execSQL("delete from " + DBHelper.LoyaltyCardDbGroups.TABLE);
+        database.execSQL("delete from " + DBHelper.LoyaltyCardDbIdsGroups.TABLE);
+        database.close();
+
+        return db;
+    }
+}

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

@@ -1,17 +1,14 @@
 package protect.card_locker;
 
-
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
-import org.robolectric.util.Util;
 
 import java.math.BigDecimal;
 import java.util.Currency;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThrows;
 
 @RunWith(RobolectricTestRunner.class)
 @Config(sdk = 23)

build.gradle

@@ -5,12 +5,12 @@ buildscript {
         google()
         jcenter()
         maven { url "https://jitpack.io" }
-        maven { url "https://plugins.gradle.org/m2/" }
+        gradlePluginPortal()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.1'
-        classpath 'gradle.plugin.com.github.spotbugs.snom:spotbugs-gradle-plugin:4.6.0'
+        classpath 'com.android.tools.build:gradle:4.1.3'
+        classpath 'gradle.plugin.com.github.spotbugs.snom:spotbugs-gradle-plugin:4.7.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -22,7 +22,7 @@ allprojects {
         google()
         jcenter()
         maven { url "https://jitpack.io" }
-        maven { url "https://plugins.gradle.org/m2/" }
+        gradlePluginPortal()
     }
 }
 

docs/README.md

@@ -1,22 +1,25 @@
 # Catima
+
+Copylefted libre software (GPLv3+) card management app.
+
 ![Android CI](https://github.com/TheLastProject/Catima/workflows/Android%20CI/badge.svg)
 [![Translation status](https://hosted.weblate.org/widgets/catima/-/svg-badge.svg)](https://hosted.weblate.org/engage/catima/)
 
-<a href="https://play.google.com/store/apps/details?id=me.hackerchick.catima" target="_blank">
-<img src="https://play.google.com/intl/en_us/badges/images/generic/en-play-badge.png" alt="Get it on Google Play" height="90"/></a>
-<a href="https://appgallery.huawei.com/#/app/C103806479" target="_blank">
-<img src="https://huaweimobileservices.com/wp-content/uploads/2020/05/Explore-it-on-AppGallery.png" alt="Explore it on AppGallery" height="90"/></a>
-
 <a href="https://f-droid.org/repository/browse/?fdid=me.hackerchick.catima" target="_blank">
 <img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png" alt="Get it on F-Droid" height="90"/></a>
 <a href="https://apt.izzysoft.de/fdroid/index/apk/me.hackerchick.catima" target="_blank">
 <img src="https://gitlab.com/IzzyOnDroid/repo/-/raw/master/assets/IzzyOnDroid.png" alt="Get it on IzzyOnDroid" height="90"/></a>
 
+<a href="https://play.google.com/store/apps/details?id=me.hackerchick.catima" target="_blank">
+<img src="https://play.google.com/intl/en_us/badges/images/generic/en-play-badge.png" alt="Get it on Google Play" height="90"/></a>
+
 ![Logo](https://github.com/TheLastProject/Catima/raw/master/app/src/main/ic_launcher-playstore.png)
 
 *Logo by [Rose (TangentFoxy)](http://github.com/TangentFoxy)*
 
-Stores all of your store loyalty cards on your phone, removing the need to carry them around.  Currently the following barcode types are supported:
+Stores your store loyalty and membership cards on your device, instead of having to carry them around.
+
+Supported barcodes:
 
 - AZTEC
 - CODABAR
@@ -41,16 +44,17 @@ Stores all of your store loyalty cards on your phone, removing the need to carry
 [<img src="https://github.com/TheLastProject/Catima/raw/master/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-07.png" width=250>](https://github.com/TheLastProject/Catima/raw/master/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-07.png)
 [<img src="https://github.com/TheLastProject/Catima/raw/master/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-08.png" width=250>](https://github.com/TheLastProject/Catima/raw/master/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-08.png)
 
-# Migrating from other apps
+# Moving data from other apps
 
-[See our migration guides](migrate).
+Within the app you can import cards and codes from files, Catima, Loyalty Card Keychain, Voucher Vault, and FidMe.
+For FidMe you need to select the barcode type for each entry afterwards.
 
 # Building
 
-To build, use the gradle wrapper scripts provided in the top level directory of the project. The following will
-compile the application and run all unit tests:
+Use the Gradle wrapper scripts provided in the top level directory of the project.
+To compile the app and run all unit tests:
 
-GNU/Linux, OSX, UNIX:
+Linux|GNU, Unix-like, macOS:
 ```
 ./gradlew build
 ```
@@ -64,8 +68,8 @@ Windows:
 
 [![Translation status](https://hosted.weblate.org/widgets/catima/-/open-graph.png)](https://hosted.weblate.org/engage/catima/)
 
-Please contribute through [our Weblate page](https://hosted.weblate.org/projects/catima/).
+Help translate the app to your language from [our Hosted Weblate page](https://hosted.weblate.org/projects/catima/).
 
-# Note from Developer
+# Developer Note
 
-This application is based on the great [Loyalty Card Keychain](https://github.com/brarcher/loyalty-card-locker) by [Branden Archer](https://github.com/brarcher). This fork was created due to the original developer having stopped development of this app.
+This app is based on the great (but no longer developed) [Loyalty Card Keychain](https://github.com/brarcher/loyalty-card-locker) by [Branden Archer](https://github.com/brarcher).

docs/migrate/index.md

@@ -1,11 +0,0 @@
-# Migrating from other apps
-
-We believe people shouldn't be locked into any specific app. That's why Catima will always allow you to export your data.
-
-We also try to support important your data from other applications whenever possible.
-
-Currently, importing is supported from the following apps:
-
-[Loyalty Card Keychain](protect_card_locker)
-
-Is the app you want to import from not listed? [Tell us about it](https://github.com/TheLastProject/Catima/issues) and we will look into supporting it.

docs/migrate/protect_card_locker/index.md

@@ -1,38 +0,0 @@
-# Migrating from Loyalty Card Keychain
-
-As Catima is based on Loyalty Card Keychain, importing your data from it is very simple.
-
-## 1. Open Loyalty Card Keychain
-![Step 1](step_1.png)
-
-## 2. Press the More Options button in the top right
-![Step 2](step_2.png)
-
-## 3. Press Import/Export
-![Step 3](step_3.png)
-
-## 4. Press Export
-![Step 4](step_4.png)
-
-## 5. Choose a save location, filename (default: LoyaltyCardKeychain.csv) and press Save
-![Step 5](step_5.png)
-
-## 6. Confirm the export was succesful
-![Step 6](step_6.png)
-
-## 7. Open Catima
-![Step 7](step_7.png)
-
-## 8. Press the More Options button in the top right
-![Step 8](step_8.png)
-
-## 9. Press Import/Export
-![Step 9](step_9.png)
-
-## 10. Press From Filesystem
-![Step 10](step_10.png)
-
-## 11. Choose the file you saved in step 5
-![Step 11](step_11.png)
-
-## That's it, you've succesfully imported your Loyalty Card Keychain database into Catima