Merge branch 'master' of github.com:TheLastProject/loyalty-card-locker into fix/deprecatedProgressDialog

688: Translations update from Hosted Weblate r=TheLastProject a=weblate

Translations update from [Hosted Weblate](https://hosted.weblate.org) for [Catima/Catima](https://hosted.weblate.org/projects/catima/catima/).


It also includes following components:

* [Catima/Fastlane](https://hosted.weblate.org/projects/catima/fastlane/)



Current translation status:

![Weblate translation status](https://hosted.weblate.org/widgets/catima/-/catima/horizontal-auto.svg)


Co-authored-by: Nyatsuki <Odamaki@yandex.ru>

.github/workflows/android.yml

@@ -2,9 +2,13 @@ name: Android CI
 
 on:
   push:
-    branches: [ master ]
+    branches:
+      - master
+      - staging
+      - trying
   pull_request:
-    branches: [ master ]
+    branches:
+      - master
 
 jobs:
   build:

.github/workflows/autoclose-needs-info.yml

@@ -2,7 +2,7 @@ name: 'Close issues and PRs needing info for too long'
 on:
   schedule:
     - cron: '30 1 * * *'
-    
+
 permissions:
   issues: write
   pull-requests: write

.github/workflows/changelog-to-fastlane.yml

@@ -1,7 +1,8 @@
 name: Convert CHANGELOG to Fastlane
 on:
   push:
-    branches: [ master ]
+    branches:
+      - master
 
 jobs:
   convert_changelog_to_fastlane:

.github/workflows/codeql-analysis.yml

@@ -13,10 +13,12 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [ master ]
+    branches:
+      - master
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [ master ]
+    branches:
+      - master
   schedule:
     - cron: '33 1 * * 4'
 

.scripts/changelog_to_fastlane.py

@@ -24,5 +24,10 @@ with open('CHANGELOG.md') as changelog:
             text.append(re.sub(r'\[(.*?)\]\((.*?)\)', r'\1 (\2)', line))
 
 for version, description in changelogs.items():
+    description = "".join(description).strip()
+
+    if not description:
+        continue
+
     with open(os.path.join("fastlane", "metadata", "android", "en-US", "changelogs", f"{version}.txt"), "w") as fastlane_file:
-        fastlane_file.write("".join(description).strip())
+        fastlane_file.write(description)

CHANGELOG.md

@@ -1,6 +1,64 @@
 # Changelog
 
-## v2.7 - 85 (2021-10-05)
+## Unreleased - 96
+
+- Add CODE 93 support
+
+## v2.11.2 - 95 (2021-12-04)
+
+- Fix crash on sharing card
+
+## v2.11.1 - 94 (2021-11-30)
+
+- Fix blurriness of main screen letter icons
+- Fix icons sometimes disappearing after selection
+- Fix status bar icons possibly being invisible on Android 5
+
+## v2.11.0 - 93 (2021-11-28)
+
+- Add Catima to [Quick Access Device Controls](https://developer.android.com/guide/topics/ui/device-control)
+- Fix some groups not showing up correctly in group management screen
+
+## v2.10.0 - 92 (2021-11-20)
+
+- New main screen layout
+- Fix bottomsheet sizing issues when switching in and out of fullscreen
+
+## v2.9.0 - 91 (2021-11-14)
+
+- Improved group management support
+- Support cropping images
+- Fix image data loss when saving after rotating in edit view
+- Ability to set a custom image as card icon
+
+## v2.8.1 - 90 (2021-10-27)
+
+- Fix dots in card view having the wrong colour when changing theme manually
+- Fix crash in card view on rotation/theme change
+- Fix flashing of cards list
+- Fix text overlaying star icon
+
+## v2.8.0 - 89 (2021-10-25)
+
+- Fix swiping between groups not working on an empty group
+- Allow password-protecting exports
+- Improve usage of space for QR codes
+- Save the last used zoom level per card
+- Fix a crash when swiping right after a tap
+
+## v2.7.3 - 88 (2021-10-10)
+
+- Fix incorrect migration making first card become invisible
+
+## v2.7.2 - 87 (2021-10-09)
+
+- Fix regression breaking import/export
+
+## v2.7.1 - 86 (2021-10-07)
+
+- Improve search with spaces
+
+## v2.7.0 - 85 (2021-10-05)
 
 Android 4.4 is no longer supported starting with this release. If you want to use Catima on Android 4.4, please use version 2.6.1.
 

app/build.gradle

@@ -18,8 +18,8 @@ android {
         applicationId "me.hackerchick.catima"
         minSdkVersion 21
         targetSdkVersion 31
-        versionCode 85
-        versionName "2.7.0"
+        versionCode 95
+        versionName "2.11.2"
 
         vectorDrawables.useSupportLibrary true
         multiDexEnabled true
@@ -49,8 +49,8 @@ android {
         // Flag to enable support for the new language APIs
         coreLibraryDesugaringEnabled true
 
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
     }
 
     lintOptions {
@@ -80,25 +80,25 @@ android {
 
 dependencies {
 // AndroidX
-    implementation "androidx.multidex:multidex:2.0.1"
-    implementation 'androidx.appcompat:appcompat:1.3.1'
-    implementation 'androidx.cardview:cardview:1.0.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.1'
+    implementation 'androidx.appcompat:appcompat:1.4.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.2'
     implementation 'androidx.exifinterface:exifinterface:1.3.3'
+    implementation 'androidx.palette:palette:1.0.0'
     implementation 'androidx.preference:preference:1.1.1'
     implementation 'com.google.android.material:material:1.4.0'
+    implementation 'com.github.yalantis:ucrop:2.2.7'
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
 
 // Splash Screen
     implementation 'androidx.core:core-splashscreen:1.0.0-alpha02'
 
 // Third-party
-    implementation 'com.journeyapps:zxing-android-embedded:4.2.0@aar'
+    implementation 'com.journeyapps:zxing-android-embedded:4.3.0@aar'
     implementation 'com.google.zxing:core:3.4.1'
     implementation 'org.apache.commons:commons-csv:1.9.0'
     implementation 'com.jaredrummler:colorpicker:1.1.0'
-    implementation 'com.github.invissvenska:NumberPickerPreference:1.0.3'
-    implementation 'net.lingala.zip4j:zip4j:2.9.0'
+    implementation 'com.github.invissvenska:NumberPickerPreference:1.0.4'
+    implementation 'net.lingala.zip4j:zip4j:2.9.1'
 
 // SpotBugs
     implementation 'io.wcm.tooling.spotbugs:io.wcm.tooling.spotbugs.annotations:1.0.0'
@@ -106,7 +106,7 @@ dependencies {
 // Testing
     testImplementation 'androidx.test:core:1.4.0'
     testImplementation 'junit:junit:4.13.2'
-    testImplementation 'org.robolectric:robolectric:4.6.1'
+    testImplementation 'org.robolectric:robolectric:4.7.3'
 }
 
 tasks.withType(SpotBugsTask) {

app/src/main/AndroidManifest.xml

@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="protect.card_locker"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    package="protect.card_locker">
 
-    <uses-permission
-        android:name="android.permission.CAMERA"/>
-    <uses-permission
-        android:name="android.permission.READ_EXTERNAL_STORAGE"/>
-    <uses-permission
-        android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    <uses-sdk tools:overrideLibrary="com.google.zxing.client.android" />
+
+    <uses-permission android:name="android.permission.CAMERA" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
     <uses-feature
         android:name="android.hardware.camera"
@@ -17,8 +16,6 @@
         android:name="android.hardware.camera.autofocus"
         android:required="false" />
 
-    <uses-sdk tools:overrideLibrary="com.google.zxing.client.android"/>
-
     <application
         android:name=".LoyaltyCardLockerApplication"
         android:allowBackup="true"
@@ -27,98 +24,117 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
         <activity
-            android:name="protect.card_locker.MainActivity"
+            android:name=".MainActivity"
+            android:exported="true"
             android:label="@string/app_name"
-            android:theme="@style/Theme.App.Starting"
-            android:exported="true">
+            android:theme="@style/Theme.App.Starting">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
+                <action android:name="android.intent.action.MAIN" />
 
-                <category android:name="android.intent.category.LAUNCHER"/>
+                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-
         <activity
             android:name=".AboutActivity"
             android:label="@string/about"
-            android:theme="@style/AppTheme.NoActionBar">
-        </activity>
+            android:theme="@style/AppTheme.NoActionBar" />
         <activity
             android:name=".ManageGroupsActivity"
             android:label="@string/groups"
-            android:theme="@style/AppTheme.NoActionBar">
-        </activity>
+            android:theme="@style/AppTheme.NoActionBar" />
+        <activity
+            android:name=".ManageGroupActivity"
+            android:label="@string/group_edit"
+            android:theme="@style/AppTheme.NoActionBar"/>
         <activity
             android:name=".LoyaltyCardViewActivity"
+            android:exported="true"
             android:theme="@style/AppTheme.NoActionBar"
-            android:windowSoftInputMode="stateHidden"
-            android:exported="true"/>
+            android:windowSoftInputMode="stateHidden" />
         <activity
             android:name=".LoyaltyCardEditActivity"
+            android:exported="true"
             android:theme="@style/AppTheme.NoActionBar"
-            android:windowSoftInputMode="stateHidden"
-            android:exported="true">
-            <intent-filter android:autoVerify="true" android:label="@string/app_name">
+            android:windowSoftInputMode="stateHidden">
+            <intent-filter
+                android:autoVerify="true"
+                android:label="@string/app_name">
                 <action android:name="android.intent.action.VIEW" />
+
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
                 <!-- Main card sharing URIs -->
                 <data android:scheme="http" />
                 <data android:scheme="https" />
-
-                <data android:host="@string/intent_import_card_from_url_host_catima_app"
+                <data
+                    android:host="@string/intent_import_card_from_url_host_catima_app"
                     android:pathPrefix="@string/intent_import_card_from_url_path_prefix_catima_app" />
             </intent-filter>
             <intent-filter android:label="@string/app_name">
                 <action android:name="android.intent.action.VIEW" />
+
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
                 <!-- Old card sharing URIs -->
                 <data android:scheme="http" />
                 <data android:scheme="https" />
-
-                <data android:host="@string/intent_import_card_from_url_host_thelastproject"
+                <data
+                    android:host="@string/intent_import_card_from_url_host_thelastproject"
                     android:pathPrefix="@string/intent_import_card_from_url_path_prefix_thelastproject" />
-                <data android:host="@string/intent_import_card_from_url_host_brarcher"
+                <data
+                    android:host="@string/intent_import_card_from_url_host_brarcher"
                     android:pathPrefix="@string/intent_import_card_from_url_path_prefix_brarcher" />
             </intent-filter>
         </activity>
         <activity
             android:name=".ScanActivity"
             android:label="@string/scanCardBarcode"
-            android:theme="@style/AppTheme.NoActionBar"/>
+            android:theme="@style/AppTheme.NoActionBar" />
         <activity
             android:name=".BarcodeSelectorActivity"
             android:label="@string/selectBarcodeTitle"
             android:theme="@style/AppTheme.NoActionBar"
-            android:windowSoftInputMode="stateHidden"/>
+            android:windowSoftInputMode="stateHidden" />
         <activity
             android:name=".preferences.SettingsActivity"
             android:label="@string/settings"
-            android:theme="@style/AppTheme.NoActionBar"/>
+            android:theme="@style/AppTheme.NoActionBar" />
         <activity
             android:name=".ImportExportActivity"
             android:label="@string/importExport"
-            android:theme="@style/AppTheme.NoActionBar"/>
+            android:theme="@style/AppTheme.NoActionBar" />
         <activity
             android:name=".CardShortcutConfigure"
+            android:exported="true"
             android:label="@string/cardShortcut"
-            android:theme="@style/AppTheme.NoActionBar"
-            android:exported="true">
+            android:theme="@style/AppTheme.NoActionBar">
             <intent-filter>
-                <action android:name="android.intent.action.CREATE_SHORTCUT"/>
-                <category android:name="android.intent.category.DEFAULT"/>
+                <action android:name="android.intent.action.CREATE_SHORTCUT" />
+
+                <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
+
+        <activity
+            android:name="com.yalantis.ucrop.UCropActivity"
+            android:theme="@style/AppTheme.NoActionBar" />
+
         <provider
             android:name="androidx.core.content.FileProvider"
-            android:grantUriPermissions="true"
+            android:authorities="${applicationId}"
             android:exported="false"
-            android:authorities="${applicationId}">
+            android:grantUriPermissions="true">
             <meta-data
                 android:name="android.support.FILE_PROVIDER_PATHS"
-                android:resource="@xml/file_provider_paths"/>
+                android:resource="@xml/file_provider_paths" />
         </provider>
+        <service android:name=".CardsOnPowerScreenService" android:label="@string/app_name"
+            android:permission="android.permission.BIND_CONTROLS" android:exported="true">
+            <intent-filter>
+                <action android:name="android.service.controls.ControlsProviderService" />
+            </intent-filter>
+        </service>
+
     </application>
 
-</manifest>
+</manifest>

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

@@ -24,22 +24,19 @@ import androidx.appcompat.widget.Toolbar;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.core.text.HtmlCompat;
 
-public class AboutActivity extends CatimaAppCompatActivity implements View.OnClickListener
-{
+public class AboutActivity extends CatimaAppCompatActivity implements View.OnClickListener {
     private static final String TAG = "Catima";
     ConstraintLayout version_history, translate, license, repo, privacy, error, credits, rate;
 
     @Override
-    protected void onCreate(Bundle savedInstanceState)
-    {
+    protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setTitle(R.string.about);
         setContentView(R.layout.about_activity);
         Toolbar toolbar = findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
         ActionBar actionBar = getSupportActionBar();
-        if(actionBar != null)
-        {
+        if (actionBar != null) {
             actionBar.setDisplayHomeAsUpEnabled(true);
         }
 
@@ -59,7 +56,8 @@ public class AboutActivity extends CatimaAppCompatActivity implements View.OnCli
                 contributors.append("<br/>");
                 contributors.append(tmp);
             }
-        } catch (IOException ignored) {}
+        } catch (IOException ignored) {
+        }
 
         final List<ThirdPartyInfo> USED_LIBRARIES = new ArrayList<>();
         USED_LIBRARIES.add(new ThirdPartyInfo("Color Picker", "https://github.com/jaredrummler/ColorPicker", "Apache 2.0"));
@@ -73,14 +71,12 @@ public class AboutActivity extends CatimaAppCompatActivity implements View.OnCli
         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 (ThirdPartyInfo entry : USED_LIBRARIES)
-        {
+        for (ThirdPartyInfo entry : USED_LIBRARIES) {
             libs.append("<br/><a href=\"").append(entry.url()).append("\">").append(entry.name()).append("</a> (").append(entry.license()).append(")");
         }
 
         StringBuilder resources = new StringBuilder().append("<br/>");
-        for (ThirdPartyInfo entry : USED_ASSETS)
-        {
+        for (ThirdPartyInfo entry : USED_ASSETS) {
             resources.append("<br/><a href=\"").append(entry.url()).append("\">").append(entry.name()).append("</a> (").append(entry.license()).append(")");
         }
 
@@ -88,13 +84,10 @@ public class AboutActivity extends CatimaAppCompatActivity implements View.OnCli
         int year = Calendar.getInstance().get(Calendar.YEAR);
 
         String version = "?";
-        try
-        {
+        try {
             PackageInfo pi = getPackageManager().getPackageInfo(getPackageName(), 0);
             version = pi.versionName;
-        }
-        catch (PackageManager.NameNotFoundException e)
-        {
+        } catch (PackageManager.NameNotFoundException e) {
             Log.w(TAG, "Package name not found", e);
         }
 
@@ -134,13 +127,13 @@ public class AboutActivity extends CatimaAppCompatActivity implements View.OnCli
         credits.setOnClickListener(view -> new AlertDialog.Builder(this)
                 .setTitle(R.string.credits)
                 .setMessage(contributorInfo.toString())
-                .setPositiveButton(R.string.ok, (dialogInterface, i) -> {})
+                .setPositiveButton(R.string.ok, (dialogInterface, i) -> {
+                })
                 .show());
     }
 
     @Override
-    public boolean onOptionsItemSelected(MenuItem item)
-    {
+    public boolean onOptionsItemSelected(MenuItem item) {
         int id = item.getItemId();
         if (id == android.R.id.home) {
             finish();

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

@@ -4,30 +4,29 @@ import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.Color;
 import android.graphics.PorterDuff;
-import android.os.AsyncTask;
 import android.util.Log;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.google.zxing.BarcodeFormat;
 import com.google.zxing.MultiFormatWriter;
 import com.google.zxing.WriterException;
 import com.google.zxing.common.BitMatrix;
 
 import java.lang.ref.WeakReference;
 
+import protect.card_locker.async.CompatCallable;
+
 /**
  * This task will generate a barcode and load it into an ImageView.
  * Only a weak reference of the ImageView is kept, so this class will not
  * prevent the ImageView from being garbage collected.
  */
-class BarcodeImageWriterTask extends AsyncTask<Void, Void, Bitmap>
-{
+public class BarcodeImageWriterTask implements CompatCallable<Bitmap> {
     private static final String TAG = "Catima";
 
     private static final int IS_VALID = 999;
-    private Context mContext;
+    private final Context mContext;
     private boolean isSuccesful;
 
     // When drawn in a smaller window 1D barcodes for some reason end up
@@ -44,10 +43,11 @@ class BarcodeImageWriterTask extends AsyncTask<Void, Void, Bitmap>
     private final boolean showFallback;
     private final Runnable callback;
 
-    BarcodeImageWriterTask(Context context, ImageView imageView, String cardIdString,
-                           CatimaBarcode barcodeFormat, TextView textView,
-                           boolean showFallback, Runnable callback)
-    {
+    BarcodeImageWriterTask(
+            Context context, ImageView imageView, String cardIdString,
+            CatimaBarcode barcodeFormat, TextView textView,
+            boolean showFallback, Runnable callback
+    ) {
         mContext = context;
 
         isSuccesful = true;
@@ -62,26 +62,21 @@ class BarcodeImageWriterTask extends AsyncTask<Void, Void, Bitmap>
 
         final int MAX_WIDTH = getMaxWidth(format);
 
-        if(imageView.getWidth() < MAX_WIDTH)
-        {
+        if (imageView.getWidth() < MAX_WIDTH) {
             imageHeight = imageView.getHeight();
             imageWidth = imageView.getWidth();
-        }
-        else
-        {
+        } else {
             // Scale down the image to reduce the memory needed to produce it
             imageWidth = MAX_WIDTH;
-            double ratio = (double)MAX_WIDTH / (double)imageView.getWidth();
-            imageHeight = (int)(imageView.getHeight() * ratio);
+            double ratio = (double) MAX_WIDTH / (double) imageView.getWidth();
+            imageHeight = (int) (imageView.getHeight() * ratio);
         }
 
         this.showFallback = showFallback;
     }
 
-    private int getMaxWidth(CatimaBarcode format)
-    {
-        switch(format.format())
-        {
+    private int getMaxWidth(CatimaBarcode format) {
+        switch (format.format()) {
             // 2D barcodes
             case AZTEC:
             case DATA_MATRIX:
@@ -108,10 +103,8 @@ class BarcodeImageWriterTask extends AsyncTask<Void, Void, Bitmap>
         }
     }
 
-    private String getFallbackString(CatimaBarcode format)
-    {
-        switch(format.format())
-        {
+    private String getFallbackString(CatimaBarcode format) {
+        switch (format.format()) {
             // 2D barcodes
             case AZTEC:
                 return "AZTEC";
@@ -127,6 +120,8 @@ class BarcodeImageWriterTask extends AsyncTask<Void, Void, Bitmap>
                 return "C0C";
             case CODE_39:
                 return "CODE_39";
+            case CODE_93:
+                return "CODE_93";
             case CODE_128:
                 return "CODE_128";
             case EAN_8:
@@ -144,23 +139,17 @@ class BarcodeImageWriterTask extends AsyncTask<Void, Void, Bitmap>
         }
     }
 
-    private Bitmap generate()
-    {
-        if (cardId.isEmpty())
-        {
+    private Bitmap generate() {
+        if (cardId.isEmpty()) {
             return null;
         }
 
         MultiFormatWriter writer = new MultiFormatWriter();
         BitMatrix bitMatrix;
-        try
-        {
-            try
-            {
+        try {
+            try {
                 bitMatrix = writer.encode(cardId, format.format(), imageWidth, imageHeight, null);
-            }
-            catch(Exception e)
-            {
+            } catch (Exception e) {
                 // Cast a wider net here and catch any exception, as there are some
                 // cases where an encoder may fail if the data is invalid for the
                 // barcode type. If this happens, we want to fail gracefully.
@@ -175,11 +164,9 @@ class BarcodeImageWriterTask extends AsyncTask<Void, Void, Bitmap>
 
             int[] pixels = new int[bitMatrixWidth * bitMatrixHeight];
 
-            for (int y = 0; y < bitMatrixHeight; y++)
-            {
+            for (int y = 0; y < bitMatrixHeight; y++) {
                 int offset = y * bitMatrixWidth;
-                for (int x = 0; x < bitMatrixWidth; x++)
-                {
+                for (int x = 0; x < bitMatrixWidth; x++) {
                     int color = bitMatrix.get(x, y) ? BLACK : WHITE;
                     pixels[offset + x] = color;
                 }
@@ -199,19 +186,14 @@ class BarcodeImageWriterTask extends AsyncTask<Void, Void, Bitmap>
             int widthScale = imageWidth / bitMatrixHeight;
             int scalingFactor = Math.min(heightScale, widthScale);
 
-            if(scalingFactor > 1)
-            {
+            if (scalingFactor > 1) {
                 bitmap = Bitmap.createScaledBitmap(bitmap, bitMatrixWidth * scalingFactor, bitMatrixHeight * scalingFactor, false);
             }
 
             return bitmap;
-        }
-        catch (WriterException e)
-        {
+        } catch (WriterException e) {
             Log.e(TAG, "Failed to generate barcode of type " + format + ": " + cardId, e);
-        }
-        catch(OutOfMemoryError e)
-        {
+        } catch (OutOfMemoryError e) {
             Log.w(TAG, "Insufficient memory to render barcode, "
                     + imageWidth + "x" + imageHeight + ", " + format.name()
                     + ", length=" + cardId.length(), e);
@@ -220,29 +202,36 @@ class BarcodeImageWriterTask extends AsyncTask<Void, Void, Bitmap>
         return null;
     }
 
-    public Bitmap doInBackground(Void... params)
-    {
-        Bitmap bitmap = generate();
+    public Bitmap doInBackground(Void... params) {
+        // Only do the hard tasks if we've not already been cancelled
+        if (!Thread.currentThread().isInterrupted()) {
+            Bitmap bitmap = generate();
 
-        if (bitmap == null) {
-            isSuccesful = false;
+            if (bitmap == null) {
+                isSuccesful = false;
 
-            if (showFallback) {
-                Log.i(TAG, "Barcode generation failed, generating fallback...");
-                cardId = getFallbackString(format);
-                bitmap = generate();
+                if (showFallback && !Thread.currentThread().isInterrupted()) {
+                    Log.i(TAG, "Barcode generation failed, generating fallback...");
+                    cardId = getFallbackString(format);
+                    bitmap = generate();
+                    return bitmap;
+                }
+            } else {
+                return bitmap;
             }
         }
 
-        return bitmap;
+        // We've been interrupted - create a empty fallback
+        Bitmap.Config config = Bitmap.Config.ARGB_8888;
+        return Bitmap.createBitmap(imageWidth, imageHeight, config);
     }
 
-    protected void onPostExecute(Bitmap result)
-    {
+    public void onPostExecute(Object castResult) {
+        Bitmap result = (Bitmap) castResult;
+
         Log.i(TAG, "Finished generating barcode image of type " + format + ": " + cardId);
         ImageView imageView = imageViewReference.get();
-        if(imageView == null)
-        {
+        if (imageView == null) {
             // The ImageView no longer exists, nothing to do
             return;
         }
@@ -255,8 +244,7 @@ class BarcodeImageWriterTask extends AsyncTask<Void, Void, Bitmap>
         imageView.setContentDescription(mContext.getString(R.string.barcodeImageDescriptionWithType, formatPrettyName));
         TextView textView = textViewReference.get();
 
-        if(result != null)
-        {
+        if (result != null) {
             Log.i(TAG, "Displaying barcode");
             imageView.setVisibility(View.VISIBLE);
 
@@ -270,9 +258,7 @@ class BarcodeImageWriterTask extends AsyncTask<Void, Void, Bitmap>
                 textView.setVisibility(View.VISIBLE);
                 textView.setText(formatPrettyName);
             }
-        }
-        else
-        {
+        } else {
             Log.i(TAG, "Barcode generation failed, removing image from display");
             imageView.setVisibility(View.GONE);
             if (textView != null) {
@@ -284,4 +270,19 @@ class BarcodeImageWriterTask extends AsyncTask<Void, Void, Bitmap>
             callback.run();
         }
     }
+
+    @Override
+    public void onPreExecute() {
+        // No Action
+    }
+
+    /**
+     * Provided to comply with Callable while keeping the original Syntax of AsyncTask
+     *
+     * @return generated Bitmap
+     */
+    @Override
+    public Bitmap call() {
+        return doInBackground();
+    }
 }

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

@@ -2,26 +2,19 @@ package protect.card_locker;
 
 import android.app.Activity;
 import android.content.Intent;
-import android.os.AsyncTask;
 import android.os.Bundle;
+import android.os.Handler;
+import android.os.Looper;
 import android.util.Log;
-import android.util.Pair;
 import android.view.MenuItem;
 import android.view.View;
-import android.view.ViewTreeObserver;
 import android.widget.EditText;
-import android.widget.ImageView;
-import android.widget.TextView;
+import android.widget.ListView;
 import android.widget.Toast;
 
 import com.google.zxing.BarcodeFormat;
 
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.Map;
+import java.util.ArrayList;
 
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.widget.Toolbar;
@@ -32,66 +25,59 @@ import androidx.appcompat.widget.Toolbar;
  * the data. The user may then select any barcode, where its
  * data and type will be returned to the caller.
  */
-public class BarcodeSelectorActivity extends CatimaAppCompatActivity
-{
+public class BarcodeSelectorActivity extends CatimaAppCompatActivity implements BarcodeSelectorAdapter.BarcodeSelectorListener {
     private static final String TAG = "Catima";
 
     // Result this activity will return
     public static final String BARCODE_CONTENTS = "contents";
     public static final String BARCODE_FORMAT = "format";
 
-    private Map<String, Pair<Integer, Integer>> barcodeViewMap;
-    private LinkedList<AsyncTask> barcodeGeneratorTasks = new LinkedList<>();
+    private final Handler typingDelayHandler = new Handler(Looper.getMainLooper());
+    public static final Integer INPUT_DELAY = 250;
+
+    private BarcodeSelectorAdapter mAdapter;
 
     @Override
-    protected void onCreate(Bundle savedInstanceState)
-    {
+    protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setTitle(R.string.selectBarcodeTitle);
         setContentView(R.layout.barcode_selector_activity);
         Toolbar toolbar = findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
         ActionBar actionBar = getSupportActionBar();
-        if(actionBar != null)
-        {
+        if (actionBar != null) {
             actionBar.setDisplayHomeAsUpEnabled(true);
         }
 
-        barcodeViewMap = new HashMap<>();
-        barcodeViewMap.put(BarcodeFormat.AZTEC.name(), new Pair<>(R.id.aztecBarcode, R.id.aztecBarcodeText));
-        barcodeViewMap.put(BarcodeFormat.CODE_39.name(), new Pair<>(R.id.code39Barcode, R.id.code39BarcodeText));
-        barcodeViewMap.put(BarcodeFormat.CODE_128.name(), new Pair<>(R.id.code128Barcode, R.id.code128BarcodeText));
-        barcodeViewMap.put(BarcodeFormat.CODABAR.name(), new Pair<>(R.id.codabarBarcode, R.id.codabarBarcodeText));
-        barcodeViewMap.put(BarcodeFormat.DATA_MATRIX.name(), new Pair<>(R.id.datamatrixBarcode, R.id.datamatrixBarcodeText));
-        barcodeViewMap.put(BarcodeFormat.EAN_8.name(), new Pair<>(R.id.ean8Barcode, R.id.ean8BarcodeText));
-        barcodeViewMap.put(BarcodeFormat.EAN_13.name(), new Pair<>(R.id.ean13Barcode, R.id.ean13BarcodeText));
-        barcodeViewMap.put(BarcodeFormat.ITF.name(), new Pair<>(R.id.itfBarcode, R.id.itfBarcodeText));
-        barcodeViewMap.put(BarcodeFormat.PDF_417.name(), new Pair<>(R.id.pdf417Barcode, R.id.pdf417BarcodeText));
-        barcodeViewMap.put(BarcodeFormat.QR_CODE.name(), new Pair<>(R.id.qrcodeBarcode, R.id.qrcodeBarcodeText));
-        barcodeViewMap.put(BarcodeFormat.UPC_A.name(), new Pair<>(R.id.upcaBarcode, R.id.upcaBarcodeText));
-        barcodeViewMap.put(BarcodeFormat.UPC_E.name(), new Pair<>(R.id.upceBarcode, R.id.upceBarcodeText));
-
         EditText cardId = findViewById(R.id.cardId);
-        cardId.addTextChangedListener(new SimpleTextWatcher()
-        {
+        ListView mBarcodeList = findViewById(R.id.barcodes);
+        mAdapter = new BarcodeSelectorAdapter(this, new ArrayList<>(), this);
+        mBarcodeList.setAdapter(mAdapter);
+
+        cardId.addTextChangedListener(new SimpleTextWatcher() {
             @Override
-            public void onTextChanged(CharSequence s, int start, int before, int count)
-            {
-                Log.d(TAG, "Entered text: " + s);
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+                // Delay the input processing so we avoid overload
+                typingDelayHandler.removeCallbacksAndMessages(null);
 
-                generateBarcodes(s.toString());
+                typingDelayHandler.postDelayed(() -> {
+                    Log.d(TAG, "Entered text: " + s);
 
-                View noBarcodeButtonView = findViewById(R.id.noBarcode);
-                setButtonListener(noBarcodeButtonView, s.toString());
-                noBarcodeButtonView.setEnabled(s.length() > 0);
+                    runOnUiThread(() -> {
+                        generateBarcodes(s.toString());
+
+                        View noBarcodeButtonView = findViewById(R.id.noBarcode);
+                        setButtonListener(noBarcodeButtonView, s.toString());
+                        noBarcodeButtonView.setEnabled(s.length() > 0);
+                    });
+                }, INPUT_DELAY);
             }
         });
 
         final Bundle b = getIntent().getExtras();
         final String initialCardId = b != null ? b.getString("initialCardId") : null;
 
-        if(initialCardId != null)
-        {
+        if (initialCardId != null) {
             cardId.setText(initialCardId);
         } else {
             generateBarcodes("");
@@ -99,24 +85,16 @@ public class BarcodeSelectorActivity extends CatimaAppCompatActivity
     }
 
     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);
+        ArrayList<CatimaBarcodeWithValue> barcodes = new ArrayList<>();
+        for (BarcodeFormat barcodeFormat : CatimaBarcode.barcodeFormats) {
+            CatimaBarcode catimaBarcode = CatimaBarcode.fromBarcode(barcodeFormat);
+            barcodes.add(new CatimaBarcodeWithValue(catimaBarcode, value));
         }
+        mAdapter.setBarcodes(barcodes);
     }
 
-    private void setButtonListener(final View button, final String cardId)
-    {
+    private void setButtonListener(final View button, final String cardId) {
         button.setOnClickListener(view -> {
             Log.d(TAG, "Selected no barcode");
             Intent result = new Intent();
@@ -127,60 +105,9 @@ public class BarcodeSelectorActivity extends CatimaAppCompatActivity
         });
     }
 
-    private void createBarcodeOption(final ImageView image, final String formatType, final String cardId, final TextView text)
-    {
-        final CatimaBarcode format = CatimaBarcode.fromName(formatType);
-
-        image.setImageBitmap(null);
-        image.setOnClickListener(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);
-            BarcodeSelectorActivity.this.setResult(RESULT_OK, result);
-            finish();
-        });
-
-        if(image.getHeight() == 0)
-        {
-            // The size of the ImageView is not yet available as it has not
-            // yet been drawn. Wait for it to be drawn so the size is available.
-            image.getViewTreeObserver().addOnGlobalLayoutListener(
-                new ViewTreeObserver.OnGlobalLayoutListener()
-                {
-                    @Override
-                    public void onGlobalLayout()
-                    {
-                        Log.d(TAG, "Global layout finished, type: + " + formatType + ", width: " + image.getWidth());
-                        image.getViewTreeObserver().removeOnGlobalLayoutListener(this);
-
-                        Log.d(TAG, "Generating barcode for type " + formatType);
-                        BarcodeImageWriterTask task = new BarcodeImageWriterTask(getApplicationContext(), image, cardId, format, text, true, null);
-                        barcodeGeneratorTasks.add(task);
-                        task.execute();
-                    }
-                });
-        }
-        else
-        {
-            Log.d(TAG, "Generating barcode for type " + formatType);
-            BarcodeImageWriterTask task = new BarcodeImageWriterTask(getApplicationContext(), image, cardId, format, text, true, null);
-            barcodeGeneratorTasks.add(task);
-            task.execute();
-        }
-    }
-
     @Override
-    public boolean onOptionsItemSelected(MenuItem item)
-    {
-        if (item.getItemId() == android.R.id.home)
-        {
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == android.R.id.home) {
             setResult(Activity.RESULT_CANCELED);
             finish();
             return true;
@@ -188,4 +115,26 @@ public class BarcodeSelectorActivity extends CatimaAppCompatActivity
 
         return super.onOptionsItemSelected(item);
     }
+
+    @Override
+    public void onRowClicked(int inputPosition, View view) {
+        CatimaBarcodeWithValue barcodeWithValue = mAdapter.getItem(inputPosition);
+        CatimaBarcode catimaBarcode = barcodeWithValue.catimaBarcode();
+
+        if (!mAdapter.isValid(view)) {
+            Toast.makeText(this, getString(R.string.wrongValueForBarcodeType), Toast.LENGTH_LONG).show();
+            return;
+        }
+
+        String barcodeFormat = catimaBarcode.format().name();
+        String value = barcodeWithValue.value();
+
+        Log.d(TAG, "Selected barcode type " + barcodeFormat);
+
+        Intent result = new Intent();
+        result.putExtra(BARCODE_FORMAT, barcodeFormat);
+        result.putExtra(BARCODE_CONTENTS, value);
+        BarcodeSelectorActivity.this.setResult(RESULT_OK, result);
+        finish();
+    }
 }

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

@@ -0,0 +1,102 @@
+package protect.card_locker;
+
+import android.content.Context;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.ViewTreeObserver;
+import android.widget.ArrayAdapter;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import java.util.ArrayList;
+
+import protect.card_locker.async.TaskHandler;
+
+public class BarcodeSelectorAdapter extends ArrayAdapter<CatimaBarcodeWithValue> {
+    private static final String TAG = "Catima";
+
+    private final TaskHandler mTasks = new TaskHandler();
+    private final BarcodeSelectorListener mListener;
+
+    private static class ViewHolder {
+        ImageView image;
+        TextView text;
+    }
+
+    public interface BarcodeSelectorListener {
+        void onRowClicked(int inputPosition, View view);
+    }
+
+    public BarcodeSelectorAdapter(Context context, ArrayList<CatimaBarcodeWithValue> barcodes, BarcodeSelectorListener barcodeSelectorListener) {
+        super(context, 0, barcodes);
+        mListener = barcodeSelectorListener;
+    }
+
+    public void setBarcodes(ArrayList<CatimaBarcodeWithValue> barcodes) {
+        clear();
+        addAll(barcodes);
+        notifyDataSetChanged();
+        mTasks.flushTaskList(TaskHandler.TYPE.BARCODE, true, false, false);
+    }
+
+    @Override
+    public View getView(int position, View convertView, ViewGroup parent) {
+        CatimaBarcodeWithValue catimaBarcodeWithValue = getItem(position);
+        CatimaBarcode catimaBarcode = catimaBarcodeWithValue.catimaBarcode();
+        String value = catimaBarcodeWithValue.value();
+
+        ViewHolder viewHolder;
+        if (convertView == null) {
+            viewHolder = new ViewHolder();
+            LayoutInflater inflater = LayoutInflater.from(getContext());
+            convertView = inflater.inflate(R.layout.barcode_layout, parent, false);
+            viewHolder.image = convertView.findViewById(R.id.barcodeImage);
+            viewHolder.text = convertView.findViewById(R.id.barcodeName);
+            convertView.setTag(viewHolder);
+        } else {
+            viewHolder = (ViewHolder) convertView.getTag();
+        }
+
+        createBarcodeOption(viewHolder.image, catimaBarcode.format().name(), value, viewHolder.text);
+
+        View finalConvertView = convertView;
+        convertView.setOnClickListener(view -> mListener.onRowClicked(position, finalConvertView));
+
+        return convertView;
+    }
+
+    public boolean isValid(View view) {
+        ViewHolder viewHolder = (ViewHolder) view.getTag();
+        return viewHolder.image.getTag() != null && (boolean) viewHolder.image.getTag();
+    }
+
+    private void createBarcodeOption(final ImageView image, final String formatType, final String cardId, final TextView text) {
+        final CatimaBarcode format = CatimaBarcode.fromName(formatType);
+
+        image.setImageBitmap(null);
+
+        if (image.getHeight() == 0) {
+            // The size of the ImageView is not yet available as it has not
+            // yet been drawn. Wait for it to be drawn so the size is available.
+            image.getViewTreeObserver().addOnGlobalLayoutListener(
+                    new ViewTreeObserver.OnGlobalLayoutListener() {
+                        @Override
+                        public void onGlobalLayout() {
+                            Log.d(TAG, "Global layout finished, type: + " + formatType + ", width: " + image.getWidth());
+                            image.getViewTreeObserver().removeOnGlobalLayoutListener(this);
+
+                            Log.d(TAG, "Generating barcode for type " + formatType);
+
+                            BarcodeImageWriterTask barcodeWriter = new BarcodeImageWriterTask(getContext(), image, cardId, format, text, true, null);
+                            mTasks.executeTask(TaskHandler.TYPE.BARCODE, barcodeWriter);
+                        }
+                    });
+        } else {
+            Log.d(TAG, "Generating barcode for type " + formatType);
+            BarcodeImageWriterTask barcodeWriter = new BarcodeImageWriterTask(getContext(), image, cardId, format, text, true, null);
+            mTasks.executeTask(TaskHandler.TYPE.BARCODE, barcodeWriter);
+        }
+    }
+}

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

@@ -4,30 +4,30 @@ import android.database.Cursor;
 
 import androidx.recyclerview.widget.RecyclerView;
 
-public abstract class BaseCursorAdapter<V extends RecyclerView.ViewHolder> extends RecyclerView.Adapter<V>
-{
-    private Cursor mCursor;
+public abstract class BaseCursorAdapter<V extends RecyclerView.ViewHolder> extends RecyclerView.Adapter<V> {
+    public Cursor mCursor;
     private boolean mDataValid;
     private int mRowIDColumn;
 
-    public BaseCursorAdapter(Cursor inputCursor)
-    {
+    private String mRowIDColumnName;
+
+    public BaseCursorAdapter(Cursor inputCursor, String rowIDColumnName) {
         setHasStableIds(true);
+
+        mRowIDColumnName = rowIDColumnName;
+
         swapCursor(inputCursor);
     }
 
     public abstract void onBindViewHolder(V inputHolder, Cursor inputCursor);
 
     @Override
-    public void onBindViewHolder(V inputHolder, int inputPosition)
-    {
-        if (!mDataValid)
-        {
+    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))
-        {
+        if (!mCursor.moveToPosition(inputPosition)) {
             throw new IllegalStateException("Could not move cursor to position " + inputPosition + " when trying to bind view holder");
         }
 
@@ -35,49 +35,38 @@ public abstract class BaseCursorAdapter<V extends RecyclerView.ViewHolder> exten
     }
 
     @Override
-    public int getItemCount()
-    {
-        if (mDataValid)
-        {
+    public int getItemCount() {
+        if (mDataValid) {
             return mCursor.getCount();
-        }
-        else
-        {
+        } else {
             return 0;
         }
     }
 
     @Override
-    public long getItemId(int inputPosition)
-    {
-        if (!mDataValid)
-        {
+    public long getItemId(int inputPosition) {
+        if (!mDataValid) {
             throw new IllegalStateException("Cannot lookup item id when cursor is in invalid state.");
         }
 
-        if (!mCursor.moveToPosition(inputPosition))
-        {
+        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)
-        {
+    public void swapCursor(Cursor inputCursor) {
+        if (inputCursor == mCursor) {
             return;
         }
 
-        if (inputCursor != null)
-        {
+        if (inputCursor != null) {
             mCursor = inputCursor;
+            mRowIDColumn = mCursor.getColumnIndex(mRowIDColumnName);
             mDataValid = true;
             notifyDataSetChanged();
-        }
-        else
-        {
+        } else {
             notifyItemRangeRemoved(0, getItemCount());
             mCursor = null;
             mRowIDColumn = -1;

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

@@ -1,69 +1,58 @@
 package protect.card_locker;
 
 import android.database.Cursor;
+import android.database.sqlite.SQLiteDatabase;
 import android.os.Bundle;
 import android.util.Log;
-import android.view.View;
 import android.widget.Toast;
 
-import com.google.android.material.floatingactionbutton.FloatingActionButton;
-
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
 import androidx.core.content.pm.ShortcutInfoCompat;
 import androidx.core.content.pm.ShortcutManagerCompat;
-import androidx.recyclerview.widget.DefaultItemAnimator;
-import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
 /**
  * The configuration screen for creating a shortcut.
  */
-public class CardShortcutConfigure extends AppCompatActivity implements LoyaltyCardCursorAdapter.CardAdapterListener
-{
+public class CardShortcutConfigure extends AppCompatActivity implements LoyaltyCardCursorAdapter.CardAdapterListener {
     static final String TAG = "Catima";
-    final DBHelper mDb = new DBHelper(this);
+    private SQLiteDatabase mDatabase;
 
     @Override
     public void onCreate(Bundle bundle) {
         super.onCreate(bundle);
 
+        mDatabase = new DBHelper(this).getReadableDatabase();
+
         // Set the result to CANCELED.  This will cause nothing to happen if the
         // aback button is pressed.
         setResult(RESULT_CANCELED);
 
-        setContentView(R.layout.main_activity);
+        setContentView(R.layout.simple_toolbar_list_activity);
         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);
+        toolbar.setTitle(R.string.shortcutSelectCard);
 
         // If there are no cards, bail
-        if (db.getLoyaltyCardCount() == 0) {
+        if (DBHelper.getLoyaltyCardCount(mDatabase) == 0) {
             Toast.makeText(this, R.string.noCardsMessage, Toast.LENGTH_LONG).show();
             finish();
         }
 
         final RecyclerView cardList = findViewById(R.id.list);
+        GridLayoutManager layoutManager = (GridLayoutManager) cardList.getLayoutManager();
+        if (layoutManager != null) {
+            layoutManager.setSpanCount(getResources().getInteger(R.integer.main_view_card_columns));
+        }
 
-        RecyclerView.LayoutManager mLayoutManager = new LinearLayoutManager(getApplicationContext());
-        cardList.setLayoutManager(mLayoutManager);
-        cardList.setItemAnimator(new DefaultItemAnimator());
-
-        cardList.setVisibility(View.VISIBLE);
-
-        Cursor cardCursor = db.getLoyaltyCardCursor();
-
+        Cursor cardCursor = DBHelper.getLoyaltyCardCursor(mDatabase);
         final LoyaltyCardCursorAdapter adapter = new LoyaltyCardCursorAdapter(this, cardCursor, this);
         cardList.setAdapter(adapter);
     }
 
     private void onClickAction(int position) {
-        Cursor selected = mDb.getLoyaltyCardCursor();
+        Cursor selected = DBHelper.getLoyaltyCardCursor(mDatabase);
         selected.moveToPosition(position);
         LoyaltyCard loyaltyCard = LoyaltyCard.toLoyaltyCard(selected);
 

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

@@ -0,0 +1,167 @@
+package protect.card_locker;
+
+import android.annotation.SuppressLint;
+import android.app.PendingIntent;
+import android.content.Context;
+import android.content.Intent;
+import android.database.Cursor;
+import android.database.sqlite.SQLiteDatabase;
+import android.graphics.Bitmap;
+import android.graphics.drawable.Icon;
+import android.os.Build;
+import android.service.controls.Control;
+import android.service.controls.ControlsProviderService;
+import android.service.controls.DeviceTypes;
+import android.service.controls.actions.ControlAction;
+import android.service.controls.templates.StatelessTemplate;
+import android.util.Log;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.RequiresApi;
+
+import java.util.List;
+import java.util.concurrent.Flow;
+import java.util.function.Consumer;
+
+@RequiresApi(Build.VERSION_CODES.R)
+public class CardsOnPowerScreenService extends ControlsProviderService {
+
+    public static final String PREFIX = "catima-";
+    static final String TAG = "Catima";
+    private SQLiteDatabase mDatabase;
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+
+        mDatabase = new DBHelper(this).getReadableDatabase();
+    }
+
+    @NonNull
+    @Override
+    public Flow.Publisher<Control> createPublisherForAllAvailable() {
+        Cursor loyaltyCardCursor = DBHelper.getLoyaltyCardCursor(mDatabase);
+        return subscriber -> {
+            while (loyaltyCardCursor.moveToNext()) {
+                LoyaltyCard card = LoyaltyCard.toLoyaltyCard(loyaltyCardCursor);
+                Intent openIntent = new Intent(this, LoyaltyCardViewActivity.class)
+                        .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                        .putExtra("id", card.id);
+                PendingIntent pendingIntent = PendingIntent.getActivity(getBaseContext(), card.id, openIntent, PendingIntent.FLAG_IMMUTABLE);
+                subscriber.onNext(
+                        new Control.StatelessBuilder(PREFIX + card.id, pendingIntent)
+                                .setControlId(PREFIX + card.id)
+                                .setTitle(card.store)
+                                .setDeviceType(DeviceTypes.TYPE_GENERIC_OPEN_CLOSE)
+                                .setSubtitle(card.note)
+                                .setCustomIcon(Icon.createWithBitmap(getIcon(this, card)))
+                                .build()
+                );
+            }
+            subscriber.onComplete();
+        };
+    }
+
+    @NonNull
+    @Override
+    public Flow.Publisher<Control> createPublisherFor(@NonNull List<String> controlIds) {
+        return subscriber -> {
+            subscriber.onSubscribe(new NoOpSubscription());
+            for (String controlId : controlIds) {
+                Control control;
+
+                try {
+                    Integer cardId = this.controlIdToCardId(controlId);
+                    LoyaltyCard card = DBHelper.getLoyaltyCard(mDatabase, cardId);
+                    Intent openIntent = new Intent(this, LoyaltyCardViewActivity.class)
+                            .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                            .putExtra("id", card.id);
+                    PendingIntent pendingIntent = PendingIntent.getActivity(getBaseContext(), card.id, openIntent, PendingIntent.FLAG_IMMUTABLE);
+                    control = new Control.StatefulBuilder(controlId, pendingIntent)
+                            .setTitle(card.store)
+                            .setDeviceType(DeviceTypes.TYPE_GENERIC_OPEN_CLOSE)
+                            .setSubtitle(card.note)
+                            .setStatus(Control.STATUS_OK)
+                            .setControlTemplate(new StatelessTemplate(controlId))
+                            .setCustomIcon(Icon.createWithBitmap(getIcon(this, card)))
+                            .build();
+                } catch (NullPointerException ignored) {
+                    Intent mainScreenIntent = new Intent(this, MainActivity.class)
+                            .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                    PendingIntent pendingIntent = PendingIntent.getActivity(getBaseContext(), -1, mainScreenIntent, PendingIntent.FLAG_IMMUTABLE);
+                    control = new Control.StatefulBuilder(controlId, pendingIntent)
+                            .setStatus(Control.STATUS_NOT_FOUND)
+                            .build();
+                }
+                Log.d(TAG, "Dispatching widget " + controlId);
+                subscriber.onNext(control);
+            }
+            subscriber.onComplete();
+        };
+    }
+
+    private Bitmap getIcon(Context context, LoyaltyCard loyaltyCard) {
+        Bitmap cardIcon = Utils.retrieveCardImage(context, loyaltyCard.id, ImageLocationType.icon);
+
+        if (cardIcon != null) {
+            return cardIcon;
+        }
+
+        return Utils.generateIcon(this, loyaltyCard.store, loyaltyCard.headerColor).getLetterTile();
+    }
+
+    private Integer controlIdToCardId(String controlId) {
+        if (controlId == null)
+            return null;
+        if (!controlId.startsWith(PREFIX)) {
+            Log.w(TAG, "Unsupported control ID format: " + controlId);
+            return null;
+        }
+        controlId = controlId.substring(PREFIX.length());
+        try {
+            return Integer.parseInt(controlId);
+        } catch (RuntimeException ex) {
+            Log.e(TAG, "Unsupported control ID format. Expected numeric after prefix, found: " + controlId);
+            return null;
+        }
+    }
+
+    @Override
+    public void performControlAction(@NonNull String controlId, @NonNull ControlAction action, @NonNull Consumer<Integer> consumer) {
+        consumer.accept(ControlAction.RESPONSE_OK);
+        Intent openIntent = new Intent(this, LoyaltyCardViewActivity.class)
+                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                .putExtra("id", controlIdToCardId(controlId));
+        startActivity(openIntent);
+
+        closePowerScreenOnAndroid11();
+    }
+
+    @SuppressLint({"MissingPermission", "deprecation"})
+    private void closePowerScreenOnAndroid11() {
+        // Android 12 will auto-close the power screen, but earlier versions won't
+        // Lint complains about this but on Android 11 the permission is not needed
+        // On Android 12, we don't need it, and Google will probably get angry if we ask for it
+        if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.R) {
+            sendBroadcast(new Intent(Intent.ACTION_CLOSE_SYSTEM_DIALOGS));
+        }
+    }
+
+    /**
+     * A no-op subscription.
+     * <p>
+     * Flow.Subscriptions are made to last during time and receive periodic updates.
+     * Our app does not require sending periodic updates of loyalty cards, so we are just ignoring anything in the subscription
+     * Also, our db is quick enough to respond that the Publisher is immediately sending and completing data.
+     * This facility is overkill, but if we don't call onSubscribe the service won't work
+     */
+    private static class NoOpSubscription implements Flow.Subscription {
+        @Override
+        public void request(long l) {
+        }
+
+        @Override
+        public void cancel() {
+        }
+    }
+}

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

@@ -5,11 +5,11 @@ import android.content.SharedPreferences;
 import android.content.res.Resources;
 import android.util.TypedValue;
 
-import java.util.HashMap;
-
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.preference.PreferenceManager;
 
+import java.util.HashMap;
+
 public class CatimaAppCompatActivity extends AppCompatActivity {
 
     SharedPreferences pref;

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

@@ -8,33 +8,35 @@ import java.util.List;
 
 public class CatimaBarcode {
     public static final List<BarcodeFormat> barcodeFormats = Collections.unmodifiableList(Arrays.asList(
-        BarcodeFormat.AZTEC,
-        BarcodeFormat.CODE_39,
-        BarcodeFormat.CODE_128,
-        BarcodeFormat.CODABAR,
-        BarcodeFormat.DATA_MATRIX,
-        BarcodeFormat.EAN_8,
-        BarcodeFormat.EAN_13,
-        BarcodeFormat.ITF,
-        BarcodeFormat.PDF_417,
-        BarcodeFormat.QR_CODE,
-        BarcodeFormat.UPC_A,
-        BarcodeFormat.UPC_E
+            BarcodeFormat.AZTEC,
+            BarcodeFormat.CODE_39,
+            BarcodeFormat.CODE_93,
+            BarcodeFormat.CODE_128,
+            BarcodeFormat.CODABAR,
+            BarcodeFormat.DATA_MATRIX,
+            BarcodeFormat.EAN_8,
+            BarcodeFormat.EAN_13,
+            BarcodeFormat.ITF,
+            BarcodeFormat.PDF_417,
+            BarcodeFormat.QR_CODE,
+            BarcodeFormat.UPC_A,
+            BarcodeFormat.UPC_E
     ));
 
     public static final List<String> barcodePrettyNames = Collections.unmodifiableList(Arrays.asList(
-        "Aztec",
-        "Code 39",
-        "Code 128",
-        "Codabar",
-        "Data Matrix",
-        "EAN 8",
-        "EAN 13",
-        "ITF",
-        "PDF 417",
-        "QR Code",
-        "UPC A",
-        "UPC E"
+            "Aztec",
+            "Code 39",
+            "Code 93",
+            "Code 128",
+            "Codabar",
+            "Data Matrix",
+            "EAN 8",
+            "EAN 13",
+            "ITF",
+            "PDF 417",
+            "QR Code",
+            "UPC A",
+            "UPC E"
     ));
 
     private final BarcodeFormat mBarcodeFormat;
@@ -63,6 +65,13 @@ public class CatimaBarcode {
         return barcodeFormats.contains(mBarcodeFormat);
     }
 
+    public boolean isSquare() {
+        return mBarcodeFormat == BarcodeFormat.AZTEC
+                || mBarcodeFormat == BarcodeFormat.DATA_MATRIX
+                || mBarcodeFormat == BarcodeFormat.MAXICODE
+                || mBarcodeFormat == BarcodeFormat.QR_CODE;
+    }
+
     public BarcodeFormat format() {
         return mBarcodeFormat;
     }

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

@@ -0,0 +1,19 @@
+package protect.card_locker;
+
+public class CatimaBarcodeWithValue {
+    private final CatimaBarcode mCatimaBarcode;
+    private final String mValue;
+
+    public CatimaBarcodeWithValue(CatimaBarcode catimaBarcode, String value) {
+        mCatimaBarcode = catimaBarcode;
+        mValue = value;
+    }
+
+    public CatimaBarcode catimaBarcode() {
+        return mCatimaBarcode;
+    }
+
+    public String value() {
+        return mValue;
+    }
+}

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

@@ -1,24 +1,25 @@
 package protect.card_locker;
 
 import android.app.Activity;
+import android.content.Context;
 import android.widget.Toast;
 
 import com.journeyapps.barcodescanner.CaptureManager;
 import com.journeyapps.barcodescanner.DecoratedBarcodeView;
 
 public class CatimaCaptureManager extends CaptureManager {
-    private Activity activity;
+    private final Context mContext;
 
     public CatimaCaptureManager(Activity activity, DecoratedBarcodeView barcodeView) {
         super(activity, barcodeView);
 
-        this.activity = activity;
+        mContext = activity.getApplicationContext();
     }
 
     @Override
     protected void displayFrameworkBugMessageAndExit(String message) {
         // We don't want to exit, as we also have a enter from card image and add manually button here
         // So we show a toast instead
-        Toast.makeText(activity, message, Toast.LENGTH_LONG).show();
+        Toast.makeText(mContext, message, Toast.LENGTH_LONG).show();
     }
 }

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

@@ -7,6 +7,8 @@ import android.database.DatabaseUtils;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteException;
 import android.database.sqlite.SQLiteOpenHelper;
+import android.text.TextUtils;
+import android.util.Log;
 
 import java.io.FileNotFoundException;
 import java.math.BigDecimal;
@@ -16,21 +18,18 @@ import java.util.Currency;
 import java.util.Date;
 import java.util.List;
 
-public class DBHelper extends SQLiteOpenHelper
-{
+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 = 12;
+    public static final int DATABASE_VERSION = 14;
 
-    public static class LoyaltyCardDbGroups
-    {
+    public static class LoyaltyCardDbGroups {
         public static final String TABLE = "groups";
         public static final String ID = "_id";
         public static final String ORDER = "orderId";
     }
 
-    public static class LoyaltyCardDbIds
-    {
+    public static class LoyaltyCardDbIds {
         public static final String TABLE = "cards";
         public static final String ID = "_id";
         public static final String STORE = "store";
@@ -45,17 +44,16 @@ public class DBHelper extends SQLiteOpenHelper
         public static final String BARCODE_TYPE = "barcodetype";
         public static final String STAR_STATUS = "starstatus";
         public static final String LAST_USED = "lastused";
+        public static final String ZOOM_LEVEL = "zoomlevel";
     }
 
-    public static class LoyaltyCardDbIdsGroups
-    {
+    public static class LoyaltyCardDbIdsGroups {
         public static final String TABLE = "cardsGroups";
         public static final String cardID = "cardId";
         public static final String groupID = "groupId";
     }
 
-    public static class LoyaltyCardDbFTS
-    {
+    public static class LoyaltyCardDbFTS {
         public static final String TABLE = "fts";
         public static final String ID = "rowid"; // This should NEVER be changed
         public static final String STORE = "store";
@@ -73,18 +71,12 @@ public class DBHelper extends SQLiteOpenHelper
         Descending
     }
 
-    private Context mContext;
-
-    public DBHelper(Context context)
-    {
+    public DBHelper(Context context) {
         super(context, DATABASE_NAME, null, DATABASE_VERSION);
-
-        mContext = context;
     }
 
     @Override
-    public void onCreate(SQLiteDatabase db)
-    {
+    public void onCreate(SQLiteDatabase db) {
         // create table for card groups
         db.execSQL("CREATE TABLE " + LoyaltyCardDbGroups.TABLE + "(" +
                 LoyaltyCardDbGroups.ID + " TEXT primary key not null," +
@@ -104,13 +96,14 @@ public class DBHelper extends SQLiteOpenHelper
                 LoyaltyCardDbIds.BARCODE_ID + " TEXT," +
                 LoyaltyCardDbIds.BARCODE_TYPE + " TEXT," +
                 LoyaltyCardDbIds.STAR_STATUS + " INTEGER DEFAULT '0'," +
-                LoyaltyCardDbIds.LAST_USED + " INTEGER DEFAULT '0')");
+                LoyaltyCardDbIds.LAST_USED + " INTEGER DEFAULT '0', " +
+                LoyaltyCardDbIds.ZOOM_LEVEL + " INTEGER DEFAULT '100' )");
 
         // create associative table for cards in groups
         db.execSQL("CREATE TABLE " + LoyaltyCardDbIdsGroups.TABLE + "(" +
                 LoyaltyCardDbIdsGroups.cardID + " INTEGER," +
                 LoyaltyCardDbIdsGroups.groupID + " TEXT," +
-                "primary key (" + LoyaltyCardDbIdsGroups.cardID + "," + LoyaltyCardDbIdsGroups.groupID +"))");
+                "primary key (" + LoyaltyCardDbIdsGroups.cardID + "," + LoyaltyCardDbIdsGroups.groupID + "))");
 
         // create FTS search table
         db.execSQL("CREATE VIRTUAL TABLE " + LoyaltyCardDbFTS.TABLE + " USING fts4(" +
@@ -119,67 +112,57 @@ public class DBHelper extends SQLiteOpenHelper
     }
 
     @Override
-    public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion)
-    {
-        if(oldVersion < 2 && newVersion >= 2)
-        {
+    public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
+        if (oldVersion < 2 && newVersion >= 2) {
             db.execSQL("ALTER TABLE " + LoyaltyCardDbIds.TABLE
                     + " ADD COLUMN " + LoyaltyCardDbIds.NOTE + " TEXT not null default ''");
         }
 
-        if(oldVersion < 3 && newVersion >= 3)
-        {
+        if (oldVersion < 3 && newVersion >= 3) {
             db.execSQL("ALTER TABLE " + LoyaltyCardDbIds.TABLE
                     + " ADD COLUMN " + LoyaltyCardDbIds.HEADER_COLOR + " INTEGER");
             db.execSQL("ALTER TABLE " + LoyaltyCardDbIds.TABLE
                     + " ADD COLUMN " + LoyaltyCardDbIds.HEADER_TEXT_COLOR + " INTEGER");
         }
 
-        if(oldVersion < 4 && newVersion >= 4)
-        {
+        if (oldVersion < 4 && newVersion >= 4) {
             db.execSQL("ALTER TABLE " + LoyaltyCardDbIds.TABLE
                     + " ADD COLUMN " + LoyaltyCardDbIds.STAR_STATUS + " INTEGER DEFAULT '0'");
         }
 
-        if(oldVersion < 5 && newVersion >= 5)
-        {
+        if (oldVersion < 5 && newVersion >= 5) {
             db.execSQL("CREATE TABLE " + LoyaltyCardDbGroups.TABLE + "(" +
                     LoyaltyCardDbGroups.ID + " TEXT primary key not null)");
 
             db.execSQL("CREATE TABLE " + LoyaltyCardDbIdsGroups.TABLE + "(" +
                     LoyaltyCardDbIdsGroups.cardID + " INTEGER," +
                     LoyaltyCardDbIdsGroups.groupID + " TEXT," +
-                    "primary key (" + LoyaltyCardDbIdsGroups.cardID + "," + LoyaltyCardDbIdsGroups.groupID +"))");
+                    "primary key (" + LoyaltyCardDbIdsGroups.cardID + "," + LoyaltyCardDbIdsGroups.groupID + "))");
         }
 
-        if(oldVersion < 6 && newVersion >= 6)
-        {
+        if (oldVersion < 6 && newVersion >= 6) {
             db.execSQL("ALTER TABLE " + LoyaltyCardDbGroups.TABLE
                     + " ADD COLUMN " + LoyaltyCardDbGroups.ORDER + " INTEGER DEFAULT '0'");
         }
 
-        if(oldVersion < 7 && newVersion >= 7)
-        {
+        if (oldVersion < 7 && newVersion >= 7) {
             db.execSQL("ALTER TABLE " + LoyaltyCardDbIds.TABLE
                     + " ADD COLUMN " + LoyaltyCardDbIds.EXPIRY + " INTEGER");
         }
 
-        if(oldVersion < 8 && newVersion >= 8)
-        {
+        if (oldVersion < 8 && newVersion >= 8) {
             db.execSQL("ALTER TABLE " + LoyaltyCardDbIds.TABLE
                     + " ADD COLUMN " + LoyaltyCardDbIds.BALANCE + " TEXT not null DEFAULT '0'");
             db.execSQL("ALTER TABLE " + LoyaltyCardDbIds.TABLE
                     + " ADD COLUMN " + LoyaltyCardDbIds.BALANCE_TYPE + " TEXT");
         }
 
-        if(oldVersion < 9 && newVersion >= 9)
-        {
+        if (oldVersion < 9 && newVersion >= 9) {
             db.execSQL("ALTER TABLE " + LoyaltyCardDbIds.TABLE
                     + " ADD COLUMN " + LoyaltyCardDbIds.BARCODE_ID + " TEXT");
         }
 
-        if(oldVersion < 10 && newVersion >= 10)
-        {
+        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
@@ -272,14 +255,12 @@ public class DBHelper extends SQLiteOpenHelper
             db.endTransaction();
         }
 
-        if(oldVersion < 11 && newVersion >= 11)
-        {
+        if (oldVersion < 11 && newVersion >= 11) {
             db.execSQL("ALTER TABLE " + LoyaltyCardDbIds.TABLE
                     + " ADD COLUMN " + LoyaltyCardDbIds.LAST_USED + " INTEGER DEFAULT '0'");
         }
 
-        if(oldVersion < 12 && newVersion >= 12)
-        {
+        if (oldVersion < 12 && newVersion >= 12) {
             db.execSQL("CREATE VIRTUAL TABLE " + LoyaltyCardDbFTS.TABLE + " USING fts4(" +
                     LoyaltyCardDbFTS.STORE + ", " + LoyaltyCardDbFTS.NOTE + ", " +
                     "tokenize=unicode61);");
@@ -289,13 +270,41 @@ public class DBHelper extends SQLiteOpenHelper
             cursor.moveToFirst();
 
             while (cursor.moveToNext()) {
-                LoyaltyCard loyaltyCard = LoyaltyCard.toLoyaltyCard(cursor);
-                insertFTS(db, loyaltyCard.id, loyaltyCard.store, loyaltyCard.note);
+                int id = cursor.getInt(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.ID));
+                String store = cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.STORE));
+                String note = cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.NOTE));
+                insertFTS(db, id, store, note);
             }
         }
+
+        if (oldVersion < 13 && newVersion >= 13) {
+            db.execSQL("DELETE FROM " + LoyaltyCardDbFTS.TABLE + ";");
+
+            Cursor cursor = db.rawQuery("SELECT * FROM " + LoyaltyCardDbIds.TABLE + ";", null, null);
+
+            if (cursor.moveToFirst()) {
+                int id = cursor.getInt(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.ID));
+                String store = cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.STORE));
+                String note = cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.NOTE));
+                insertFTS(db, id, store, note);
+
+                while (cursor.moveToNext()) {
+                    id = cursor.getInt(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.ID));
+                    store = cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.STORE));
+                    note = cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.NOTE));
+                    insertFTS(db, id, store, note);
+                }
+            }
+            cursor.close();
+        }
+
+        if (oldVersion < 14 && newVersion >= 14) {
+            db.execSQL("ALTER TABLE " + LoyaltyCardDbIds.TABLE
+                    + " ADD COLUMN " + LoyaltyCardDbIds.ZOOM_LEVEL + " INTEGER DEFAULT '100' ");
+        }
     }
 
-    private ContentValues generateFTSContentValues(final int id, final String store, final String note) {
+    private static ContentValues generateFTSContentValues(final int id, final String store, final String note) {
         // FTS on Android is severely limited and can only search for word starting with a certain string
         // So for each word, we grab every single substring
         // This makes it possible to find Décathlon by searching both de and cat, for example
@@ -327,23 +336,21 @@ public class DBHelper extends SQLiteOpenHelper
         return ftsContentValues;
     }
 
-    private void insertFTS(final SQLiteDatabase db, final int id, final String store, final String note) {
+    private static void insertFTS(final SQLiteDatabase db, final int id, final String store, final String note) {
         db.insert(LoyaltyCardDbFTS.TABLE, null, generateFTSContentValues(id, store, note));
     }
 
-    private void updateFTS(final SQLiteDatabase db, final int id, final String store, final String note) {
+    private static void updateFTS(final SQLiteDatabase db, final int id, final String store, final String note) {
         db.update(LoyaltyCardDbFTS.TABLE, generateFTSContentValues(id, store, note),
                 whereAttrs(LoyaltyCardDbFTS.ID), withArgs(id));
     }
 
-    public long insertLoyaltyCard(final String store, final String note, final Date expiry,
-                                  final BigDecimal balance, final Currency balanceType,
-                                  final String cardId, final String barcodeId,
-                                  final CatimaBarcode barcodeType, final Integer headerColor,
-                                  final int starStatus, final Long lastUsed)
-    {
-        SQLiteDatabase db = getWritableDatabase();
-        db.beginTransaction();
+    public static long insertLoyaltyCard(
+            final SQLiteDatabase database, final String store, final String note, final Date expiry,
+            final BigDecimal balance, final Currency balanceType, final String cardId,
+            final String barcodeId, final CatimaBarcode barcodeType, final Integer headerColor,
+            final int starStatus, final Long lastUsed) {
+        database.beginTransaction();
 
         // Card
         ContentValues contentValues = new ContentValues();
@@ -358,58 +365,23 @@ public class DBHelper extends SQLiteOpenHelper
         contentValues.put(LoyaltyCardDbIds.HEADER_COLOR, headerColor);
         contentValues.put(LoyaltyCardDbIds.STAR_STATUS, starStatus);
         contentValues.put(LoyaltyCardDbIds.LAST_USED, lastUsed != null ? lastUsed : Utils.getUnixTime());
-        long id = db.insert(LoyaltyCardDbIds.TABLE, null, contentValues);
+        long id = database.insert(LoyaltyCardDbIds.TABLE, null, contentValues);
 
         // FTS
-        insertFTS(db, (int) id, store, note);
+        insertFTS(database, (int) id, store, note);
 
-        db.setTransactionSuccessful();
-        db.endTransaction();
+        database.setTransactionSuccessful();
+        database.endTransaction();
 
         return id;
     }
 
-    public long 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 CatimaBarcode barcodeType,
-                                  final Integer headerColor, final int starStatus,
-                                  final Long lastUsed)
-    {
-        db.beginTransaction();
-
-        // Card
-        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.name() : null);
-        contentValues.put(LoyaltyCardDbIds.HEADER_COLOR, headerColor);
-        contentValues.put(LoyaltyCardDbIds.STAR_STATUS, starStatus);
-        contentValues.put(LoyaltyCardDbIds.LAST_USED, lastUsed != null ? lastUsed : Utils.getUnixTime());
-        long id = db.insert(LoyaltyCardDbIds.TABLE, null, contentValues);
-
-        // FTS
-        insertFTS(db, (int) id, store, note);
-
-        db.setTransactionSuccessful();
-        db.endTransaction();
-
-        return id;
-    }
-
-    public long 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 barcodeId, final CatimaBarcode barcodeType,
-                                  final Integer headerColor, final int starStatus,
-                                  final Long lastUsed)
-    {
-        db.beginTransaction();
+    public static long insertLoyaltyCard(
+            final SQLiteDatabase database, final int id, final String store, final String note,
+            final Date expiry, final BigDecimal balance, final Currency balanceType,
+            final String cardId, final String barcodeId, final CatimaBarcode barcodeType,
+            final Integer headerColor, final int starStatus, final Long lastUsed) {
+        database.beginTransaction();
 
         // Card
         ContentValues contentValues = new ContentValues();
@@ -425,25 +397,23 @@ public class DBHelper extends SQLiteOpenHelper
         contentValues.put(LoyaltyCardDbIds.HEADER_COLOR, headerColor);
         contentValues.put(LoyaltyCardDbIds.STAR_STATUS, starStatus);
         contentValues.put(LoyaltyCardDbIds.LAST_USED, lastUsed != null ? lastUsed : Utils.getUnixTime());
-        db.insert(LoyaltyCardDbIds.TABLE, null, contentValues);
+        database.insert(LoyaltyCardDbIds.TABLE, null, contentValues);
 
         // FTS
-        insertFTS(db, id, store, note);
+        insertFTS(database, id, store, note);
 
-        db.setTransactionSuccessful();
-        db.endTransaction();
+        database.setTransactionSuccessful();
+        database.endTransaction();
 
         return id;
     }
 
-    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 barcodeId, final CatimaBarcode barcodeType,
-                                     final Integer headerColor)
-    {
-        SQLiteDatabase db = getWritableDatabase();
-        db.beginTransaction();
+    public static boolean updateLoyaltyCard(
+            SQLiteDatabase database, final int id, final String store, final String note,
+            final Date expiry, final BigDecimal balance, final Currency balanceType,
+            final String cardId, final String barcodeId, final CatimaBarcode barcodeType,
+            final Integer headerColor) {
+        database.beginTransaction();
 
         // Card
         ContentValues contentValues = new ContentValues();
@@ -456,48 +426,53 @@ public class DBHelper extends SQLiteOpenHelper
         contentValues.put(LoyaltyCardDbIds.BARCODE_ID, barcodeId);
         contentValues.put(LoyaltyCardDbIds.BARCODE_TYPE, barcodeType != null ? barcodeType.name() : null);
         contentValues.put(LoyaltyCardDbIds.HEADER_COLOR, headerColor);
-        int rowsUpdated = db.update(LoyaltyCardDbIds.TABLE, contentValues,
+        int rowsUpdated = database.update(LoyaltyCardDbIds.TABLE, contentValues,
                 whereAttrs(LoyaltyCardDbIds.ID), withArgs(id));
 
         // FTS
-        updateFTS(db, id, store, note);
+        updateFTS(database, id, store, note);
 
-        db.setTransactionSuccessful();
-        db.endTransaction();
+        database.setTransactionSuccessful();
+        database.endTransaction();
 
         return (rowsUpdated == 1);
     }
 
-    public boolean updateLoyaltyCardStarStatus(final int id, final int starStatus)
-    {
-        SQLiteDatabase db = getWritableDatabase();
+    public static boolean updateLoyaltyCardStarStatus(SQLiteDatabase database, final int id, final int starStatus) {
         ContentValues contentValues = new ContentValues();
-        contentValues.put(LoyaltyCardDbIds.STAR_STATUS,starStatus);
-        int rowsUpdated = db.update(LoyaltyCardDbIds.TABLE, contentValues,
+        contentValues.put(LoyaltyCardDbIds.STAR_STATUS, starStatus);
+        int rowsUpdated = database.update(LoyaltyCardDbIds.TABLE, contentValues,
                 whereAttrs(LoyaltyCardDbIds.ID),
                 withArgs(id));
         return (rowsUpdated == 1);
     }
 
-    public boolean updateLoyaltyCardLastUsed(final int id) {
-        SQLiteDatabase db = getWritableDatabase();
+    public static boolean updateLoyaltyCardLastUsed(SQLiteDatabase database, final int id) {
         ContentValues contentValues = new ContentValues();
         contentValues.put(LoyaltyCardDbIds.LAST_USED, System.currentTimeMillis() / 1000);
-        int rowsUpdated = db.update(LoyaltyCardDbIds.TABLE, contentValues,
+        int rowsUpdated = database.update(LoyaltyCardDbIds.TABLE, contentValues,
                 whereAttrs(LoyaltyCardDbIds.ID),
                 withArgs(id));
         return (rowsUpdated == 1);
     }
 
-    public LoyaltyCard getLoyaltyCard(final int id)
-    {
-        SQLiteDatabase db = getReadableDatabase();
-        Cursor data = db.query(LoyaltyCardDbIds.TABLE, null, whereAttrs(LoyaltyCardDbIds.ID), withArgs(id), null, null, null);
+    public static boolean updateLoyaltyCardZoomLevel(SQLiteDatabase database, int loyaltyCardId, int zoomLevel) {
+        ContentValues contentValues = new ContentValues();
+        contentValues.put(LoyaltyCardDbIds.ZOOM_LEVEL, zoomLevel);
+        Log.d("updateLoyaltyCardZLevel", "Card Id = " + loyaltyCardId + " Zoom level= " + zoomLevel);
+        int rowsUpdated = database.update(LoyaltyCardDbIds.TABLE, contentValues,
+                whereAttrs(LoyaltyCardDbIds.ID),
+                withArgs(loyaltyCardId));
+        Log.d("updateLoyaltyCardZLevel", "Rows changed = " + rowsUpdated);
+        return (rowsUpdated == 1);
+    }
+
+    public static LoyaltyCard getLoyaltyCard(SQLiteDatabase database, final int id) {
+        Cursor data = database.query(LoyaltyCardDbIds.TABLE, null, whereAttrs(LoyaltyCardDbIds.ID), withArgs(id), null, null, null);
 
         LoyaltyCard card = null;
 
-        if(data.getCount() == 1)
-        {
+        if (data.getCount() == 1) {
             data.moveToFirst();
             card = LoyaltyCard.toLoyaltyCard(data);
         }
@@ -507,10 +482,8 @@ public class DBHelper extends SQLiteOpenHelper
         return card;
     }
 
-    public List<Group> getLoyaltyCardGroups(final int id)
-    {
-        SQLiteDatabase db = getReadableDatabase();
-        Cursor data = db.rawQuery("select * from " + LoyaltyCardDbGroups.TABLE + " g " +
+    public static List<Group> getLoyaltyCardGroups(SQLiteDatabase database, final int id) {
+        Cursor data = database.rawQuery("select * from " + LoyaltyCardDbGroups.TABLE + " g " +
                 " LEFT JOIN " + LoyaltyCardDbIdsGroups.TABLE + " ig ON ig." + LoyaltyCardDbIdsGroups.groupID + " = g." + LoyaltyCardDbGroups.ID +
                 " where " + LoyaltyCardDbIdsGroups.cardID + "=?" +
                 " ORDER BY " + LoyaltyCardDbIdsGroups.groupID, withArgs(id));
@@ -533,12 +506,9 @@ public class DBHelper extends SQLiteOpenHelper
         return groups;
     }
 
-    public void setLoyaltyCardGroups(final int id, List<Group> groups)
-    {
-        SQLiteDatabase db = getWritableDatabase();
-
+    public static void setLoyaltyCardGroups(SQLiteDatabase database, final int id, List<Group> groups) {
         // First delete lookup table entries associated with this card
-        db.delete(LoyaltyCardDbIdsGroups.TABLE,
+        database.delete(LoyaltyCardDbIdsGroups.TABLE,
                 whereAttrs(LoyaltyCardDbIdsGroups.cardID),
                 withArgs(id));
 
@@ -547,59 +517,41 @@ public class DBHelper extends SQLiteOpenHelper
             ContentValues contentValues = new ContentValues();
             contentValues.put(LoyaltyCardDbIdsGroups.cardID, id);
             contentValues.put(LoyaltyCardDbIdsGroups.groupID, group._id);
-            db.insert(LoyaltyCardDbIdsGroups.TABLE, null, contentValues);
+            database.insert(LoyaltyCardDbIdsGroups.TABLE, null, contentValues);
         }
     }
 
-    public void setLoyaltyCardGroups(final SQLiteDatabase db, final int id, List<Group> groups)
-    {
-        // First delete lookup table entries associated with this card
-        db.delete(LoyaltyCardDbIdsGroups.TABLE,
-                whereAttrs(LoyaltyCardDbIdsGroups.cardID),
-                withArgs(id));
-
-        // Then create entries for selected values
-        for (Group group : groups) {
-            ContentValues contentValues = new ContentValues();
-            contentValues.put(LoyaltyCardDbIdsGroups.cardID, id);
-            contentValues.put(LoyaltyCardDbIdsGroups.groupID, group._id);
-            db.insert(LoyaltyCardDbIdsGroups.TABLE, null, contentValues);
-        }
-    }
-
-    public boolean deleteLoyaltyCard(final int id)
-    {
-        SQLiteDatabase db = getWritableDatabase();
+    public static boolean deleteLoyaltyCard(SQLiteDatabase database, Context context, final int id) {
         // Delete card
-        int rowsDeleted = db.delete(LoyaltyCardDbIds.TABLE,
+        int rowsDeleted = database.delete(LoyaltyCardDbIds.TABLE,
                 whereAttrs(LoyaltyCardDbIds.ID),
                 withArgs(id));
 
         // And delete lookup table entries associated with this card
-        db.delete(LoyaltyCardDbIdsGroups.TABLE,
+        database.delete(LoyaltyCardDbIdsGroups.TABLE,
                 whereAttrs(LoyaltyCardDbIdsGroups.cardID),
                 withArgs(id));
 
         // Delete FTS table entries
-        db.delete(LoyaltyCardDbFTS.TABLE,
+        database.delete(LoyaltyCardDbFTS.TABLE,
                 whereAttrs(LoyaltyCardDbFTS.ID),
                 withArgs(id));
 
         // Also wipe card images associated with this card
-        try {
-            Utils.saveCardImage(mContext, null, id, true);
-            Utils.saveCardImage(mContext, null, id, false);
-        } catch (FileNotFoundException e) {
-            e.printStackTrace();
+        for (ImageLocationType imageLocationType : ImageLocationType.values()) {
+            try {
+                Utils.saveCardImage(context, null, id, imageLocationType);
+            } catch (FileNotFoundException e) {
+                e.printStackTrace();
+            }
         }
 
         return (rowsDeleted == 1);
     }
 
-    public Cursor getLoyaltyCardCursor()
-    {
+    public static Cursor getLoyaltyCardCursor(SQLiteDatabase database) {
         // An empty string will match everything
-        return getLoyaltyCardCursor("");
+        return getLoyaltyCardCursor(database, "");
     }
 
     /**
@@ -608,9 +560,8 @@ public class DBHelper extends SQLiteOpenHelper
      * @param filter
      * @return Cursor
      */
-    public Cursor getLoyaltyCardCursor(final String filter)
-    {
-        return getLoyaltyCardCursor(filter, null);
+    public static Cursor getLoyaltyCardCursor(SQLiteDatabase database, final String filter) {
+        return getLoyaltyCardCursor(database, filter, null);
     }
 
     /**
@@ -620,9 +571,8 @@ public class DBHelper extends SQLiteOpenHelper
      * @param group
      * @return Cursor
      */
-    public Cursor getLoyaltyCardCursor(final String filter, Group group)
-    {
-        return getLoyaltyCardCursor(filter, group, LoyaltyCardOrder.Alpha, LoyaltyCardOrderDirection.Ascending);
+    public static Cursor getLoyaltyCardCursor(SQLiteDatabase database, final String filter, Group group) {
+        return getLoyaltyCardCursor(database, filter, group, LoyaltyCardOrder.Alpha, LoyaltyCardOrderDirection.Ascending);
     }
 
     /**
@@ -633,14 +583,12 @@ public class DBHelper extends SQLiteOpenHelper
      * @param order
      * @return Cursor
      */
-    public Cursor getLoyaltyCardCursor(String filter, Group group, LoyaltyCardOrder order, LoyaltyCardOrderDirection direction) {
+    public static Cursor getLoyaltyCardCursor(SQLiteDatabase database, String filter, Group group, LoyaltyCardOrder order, LoyaltyCardOrderDirection direction) {
         StringBuilder groupFilter = new StringBuilder();
         String limitString = "";
 
-        SQLiteDatabase db = getReadableDatabase();
-
         if (group != null) {
-            List<Integer> allowedIds = getGroupCardIds(group._id);
+            List<Integer> allowedIds = getGroupCardIds(database, group._id);
 
             // Empty group
             if (!allowedIds.isEmpty()) {
@@ -660,39 +608,25 @@ public class DBHelper extends SQLiteOpenHelper
 
         String orderField = getFieldForOrder(order);
 
-        return db.rawQuery("SELECT " + LoyaltyCardDbIds.TABLE + ".* FROM " + LoyaltyCardDbIds.TABLE +
+        return database.rawQuery("SELECT " + LoyaltyCardDbIds.TABLE + ".* FROM " + LoyaltyCardDbIds.TABLE +
                 " JOIN " + LoyaltyCardDbFTS.TABLE +
                 " ON " + LoyaltyCardDbFTS.TABLE + "." + LoyaltyCardDbFTS.ID + " = " + LoyaltyCardDbIds.TABLE + "." + LoyaltyCardDbIds.ID +
-                (filter.isEmpty() ? " " : " AND " + LoyaltyCardDbFTS.TABLE + " MATCH ? ") +
+                (filter.trim().isEmpty() ? " " : " AND " + LoyaltyCardDbFTS.TABLE + " MATCH ? ") +
                 groupFilter.toString() +
                 " ORDER BY " + LoyaltyCardDbIds.TABLE + "." + LoyaltyCardDbIds.STAR_STATUS + " DESC, " +
                 " (CASE WHEN " + LoyaltyCardDbIds.TABLE + "." + orderField + " IS NULL THEN 1 ELSE 0 END), " +
                 LoyaltyCardDbIds.TABLE + "." + orderField + " COLLATE NOCASE " + getDbDirection(order, direction) + ", " +
                 LoyaltyCardDbIds.TABLE + "." + LoyaltyCardDbIds.STORE + " COLLATE NOCASE ASC " +
-                limitString, filter.isEmpty() ? null : new String[] { filter + '*' }, null);
-    }
-
-    public int getLoyaltyCardCount()
-    {
-        SQLiteDatabase db = getReadableDatabase();
-        return (int) DatabaseUtils.queryNumEntries(db, LoyaltyCardDbIds.TABLE);
+                limitString, filter.trim().isEmpty() ? null : new String[]{TextUtils.join("* ", filter.split(" ")) + '*'}, null);
     }
 
     /**
-     * Returns the amount of loyalty cards with the filter text in either the store or note.
+     * Returns the amount of loyalty cards.
      *
-     * @param filter
      * @return Integer
      */
-    public int getLoyaltyCardCount(String filter)
-    {
-        if (filter.isEmpty()) {
-            return getLoyaltyCardCount();
-        }
-
-        SQLiteDatabase db = getReadableDatabase();
-        return (int) DatabaseUtils.queryNumEntries(db, LoyaltyCardDbFTS.TABLE,
-                LoyaltyCardDbFTS.TABLE + " MATCH ? ", withArgs(filter + '*'));
+    public static int getLoyaltyCardCount(SQLiteDatabase database) {
+        return (int) DatabaseUtils.queryNumEntries(database, LoyaltyCardDbIds.TABLE);
     }
 
     /**
@@ -700,42 +634,38 @@ public class DBHelper extends SQLiteOpenHelper
      *
      * @return Cursor
      */
-    public Cursor getGroupCursor()
-    {
-        SQLiteDatabase db = getReadableDatabase();
-
-        return db.rawQuery("select * from " + LoyaltyCardDbGroups.TABLE +
+    public static Cursor getGroupCursor(SQLiteDatabase database) {
+        return database.rawQuery("select * from " + LoyaltyCardDbGroups.TABLE +
                 " ORDER BY " + LoyaltyCardDbGroups.ORDER + " ASC," + LoyaltyCardDbGroups.ID + " COLLATE NOCASE ASC", null, null);
     }
 
-    public List<Group> getGroups() {
-        try(Cursor data = getGroupCursor()) {
-            List<Group> groups = new ArrayList<>();
+    public static List<Group> getGroups(SQLiteDatabase database) {
+        Cursor data = getGroupCursor(database);
 
-            if (!data.moveToFirst()) {
-                return groups;
-            }
-
-            groups.add(Group.toGroup(data));
-            while (data.moveToNext()) {
-                groups.add(Group.toGroup(data));
-            }
+        List<Group> groups = new ArrayList<>();
 
+        if (!data.moveToFirst()) {
+            data.close();
             return groups;
         }
+
+        groups.add(Group.toGroup(data));
+        while (data.moveToNext()) {
+            groups.add(Group.toGroup(data));
+        }
+
+        data.close();
+        return groups;
     }
 
-    public void reorderGroups(final List<Group> groups)
-    {
+    public static void reorderGroups(SQLiteDatabase database, final List<Group> groups) {
         Integer order = 0;
-        SQLiteDatabase db = getWritableDatabase();
 
-        for (Group group : groups)
-        {
+        for (Group group : groups) {
             ContentValues contentValues = new ContentValues();
             contentValues.put(LoyaltyCardDbGroups.ORDER, order);
 
-            db.update(LoyaltyCardDbGroups.TABLE, contentValues,
+            database.update(LoyaltyCardDbGroups.TABLE, contentValues,
                     whereAttrs(LoyaltyCardDbGroups.ID),
                     withArgs(group._id));
 
@@ -743,15 +673,12 @@ public class DBHelper extends SQLiteOpenHelper
         }
     }
 
-    public Group getGroup(final String groupName)
-    {
-        SQLiteDatabase db = getReadableDatabase();
-        Cursor data = db.query(LoyaltyCardDbGroups.TABLE, null,
+    public static Group getGroup(SQLiteDatabase database, final String groupName) {
+        Cursor data = database.query(LoyaltyCardDbGroups.TABLE, null,
                 whereAttrs(LoyaltyCardDbGroups.ID), withArgs(groupName), null, null, null);
 
         Group group = null;
-        if(data.getCount() == 1)
-        {
+        if (data.getCount() == 1) {
             data.moveToFirst();
             group = Group.toGroup(data);
         }
@@ -760,16 +687,12 @@ public class DBHelper extends SQLiteOpenHelper
         return group;
     }
 
-    public int getGroupCount()
-    {
-        SQLiteDatabase db = getReadableDatabase();
-        return (int) DatabaseUtils.queryNumEntries(db, LoyaltyCardDbGroups.TABLE);
+    public static int getGroupCount(SQLiteDatabase database) {
+        return (int) DatabaseUtils.queryNumEntries(database, LoyaltyCardDbGroups.TABLE);
     }
 
-    public List<Integer> getGroupCardIds(final String groupName)
-    {
-        SQLiteDatabase db = getReadableDatabase();
-        Cursor data = db.query(LoyaltyCardDbIdsGroups.TABLE, withArgs(LoyaltyCardDbIdsGroups.cardID),
+    public static List<Integer> getGroupCardIds(SQLiteDatabase database, final String groupName) {
+        Cursor data = database.query(LoyaltyCardDbIdsGroups.TABLE, withArgs(LoyaltyCardDbIdsGroups.cardID),
                 whereAttrs(LoyaltyCardDbIdsGroups.groupID), withArgs(groupName), null, null, null);
         List<Integer> cardIds = new ArrayList<>();
 
@@ -788,104 +711,85 @@ public class DBHelper extends SQLiteOpenHelper
         return cardIds;
     }
 
-    public long insertGroup(final String name)
-    {
+    public static long insertGroup(SQLiteDatabase database, final String name) {
         if (name.isEmpty()) return -1;
 
-        SQLiteDatabase db = getWritableDatabase();
         ContentValues contentValues = new ContentValues();
         contentValues.put(LoyaltyCardDbGroups.ID, name);
-        contentValues.put(LoyaltyCardDbGroups.ORDER, getGroupCount());
-        return db.insert(LoyaltyCardDbGroups.TABLE, null, contentValues);
+        contentValues.put(LoyaltyCardDbGroups.ORDER, getGroupCount(database));
+        return database.insert(LoyaltyCardDbGroups.TABLE, null, contentValues);
     }
 
-    public boolean insertGroup(final SQLiteDatabase db, final String name)
-    {
-        ContentValues contentValues = new ContentValues();
-        contentValues.put(LoyaltyCardDbGroups.ID, name);
-        contentValues.put(LoyaltyCardDbGroups.ORDER, getGroupCount());
-        final long newId = db.insert(LoyaltyCardDbGroups.TABLE, null, contentValues);
-        return newId != -1;
-    }
-
-    public boolean updateGroup(final String groupName, final String newName)
-    {
+    public static boolean updateGroup(SQLiteDatabase database, final String groupName, final String newName) {
         if (newName.isEmpty()) return false;
 
         boolean success = false;
 
-        SQLiteDatabase db = getWritableDatabase();
         ContentValues groupContentValues = new ContentValues();
         groupContentValues.put(LoyaltyCardDbGroups.ID, newName);
 
         ContentValues lookupContentValues = new ContentValues();
         lookupContentValues.put(LoyaltyCardDbIdsGroups.groupID, newName);
 
-        db.beginTransaction();
+        database.beginTransaction();
         try {
             // Update group name
-            int groupsChanged = db.update(LoyaltyCardDbGroups.TABLE, groupContentValues,
+            int groupsChanged = database.update(LoyaltyCardDbGroups.TABLE, groupContentValues,
                     whereAttrs(LoyaltyCardDbGroups.ID),
                     withArgs(groupName));
 
             // Also update lookup tables
-            db.update(LoyaltyCardDbIdsGroups.TABLE, lookupContentValues,
+            database.update(LoyaltyCardDbIdsGroups.TABLE, lookupContentValues,
                     whereAttrs(LoyaltyCardDbIdsGroups.groupID),
                     withArgs(groupName));
 
             if (groupsChanged == 1) {
-                db.setTransactionSuccessful();
+                database.setTransactionSuccessful();
                 success = true;
             }
-        } catch (SQLiteException e) {
+        } catch (SQLiteException ignored) {
         } finally {
-            db.endTransaction();
+            database.endTransaction();
         }
 
         return success;
     }
 
-    public boolean deleteGroup(final String groupName)
-    {
+    public static boolean deleteGroup(SQLiteDatabase database, final String groupName) {
         boolean success = false;
 
-        SQLiteDatabase db = getWritableDatabase();
-
-        db.beginTransaction();
+        database.beginTransaction();
         try {
             // Delete group
-            int groupsDeleted = db.delete(LoyaltyCardDbGroups.TABLE,
+            int groupsDeleted = database.delete(LoyaltyCardDbGroups.TABLE,
                     whereAttrs(LoyaltyCardDbGroups.ID),
                     withArgs(groupName));
 
             // And delete lookup table entries associated with this group
-            db.delete(LoyaltyCardDbIdsGroups.TABLE,
+            database.delete(LoyaltyCardDbIdsGroups.TABLE,
                     whereAttrs(LoyaltyCardDbIdsGroups.groupID),
                     withArgs(groupName));
 
             if (groupsDeleted == 1) {
-                db.setTransactionSuccessful();
+                database.setTransactionSuccessful();
                 success = true;
             }
         } finally {
-            db.endTransaction();
+            database.endTransaction();
         }
 
         // Reorder after delete to ensure no bad order IDs
-        reorderGroups(getGroups());
+        reorderGroups(database, getGroups(database));
 
         return success;
     }
 
-    public int getGroupCardCount(final String groupName)
-    {
-        SQLiteDatabase db = getReadableDatabase();
-
-        return (int) DatabaseUtils.queryNumEntries(db, LoyaltyCardDbIdsGroups.TABLE,
+    public static int getGroupCardCount(SQLiteDatabase database, final String groupName) {
+        return (int) DatabaseUtils.queryNumEntries(database, LoyaltyCardDbIdsGroups.TABLE,
                 whereAttrs(LoyaltyCardDbIdsGroups.groupID), withArgs(groupName));
     }
 
-    private String whereAttrs(String... attrs) {
+    static private String whereAttrs(String... attrs) {
         if (attrs.length == 0) {
             return null;
         }
@@ -896,13 +800,13 @@ public class DBHelper extends SQLiteOpenHelper
         return whereClause.toString();
     }
 
-    private String[] withArgs(Object... object) {
+    static private String[] withArgs(Object... object) {
         return Arrays.stream(object)
                 .map(String::valueOf)
                 .toArray(String[]::new);
     }
 
-    private String getFieldForOrder(LoyaltyCardOrder order) {
+    private static String getFieldForOrder(LoyaltyCardOrder order) {
         if (order == LoyaltyCardOrder.Alpha) {
             return LoyaltyCardDbIds.STORE;
         }
@@ -918,7 +822,7 @@ public class DBHelper extends SQLiteOpenHelper
         throw new IllegalArgumentException("Unknown order " + order);
     }
 
-    private String getDbDirection(LoyaltyCardOrder order, LoyaltyCardOrderDirection direction) {
+    private static String getDbDirection(LoyaltyCardOrder order, LoyaltyCardOrderDirection direction) {
         if (order == LoyaltyCardOrder.LastUsed) {
             // We want the default sorting to put the most recently used first
             return direction == LoyaltyCardOrderDirection.Descending ? "ASC" : "DESC";

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

@@ -5,15 +5,12 @@ package protect.card_locker;
  * encountered with the format of data being
  * imported or exported.
  */
-public class FormatException extends Exception
-{
-    public FormatException(String message)
-    {
+public class FormatException extends Exception {
+    public FormatException(String message) {
         super(message);
     }
 
-    public FormatException(String message, Exception rootCause)
-    {
+    public FormatException(String message, Exception rootCause) {
         super(message, rootCause);
     }
 }

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

@@ -2,8 +2,9 @@ package protect.card_locker;
 
 import android.database.Cursor;
 
-public class Group
-{
+import androidx.annotation.Nullable;
+
+public class Group {
     public final String _id;
     public final int order;
 
@@ -12,11 +13,28 @@ public class Group
         this.order = order;
     }
 
-    public static Group toGroup(Cursor cursor)
-    {
+    public static Group toGroup(Cursor cursor) {
         String _id = cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbGroups.ID));
         int order = cursor.getInt(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbGroups.ORDER));
 
         return new Group(_id, order);
     }
+
+    @Override
+    public boolean equals(@Nullable Object obj) {
+        if (obj == null) {
+            return false;
+        }
+        if (!(obj instanceof Group)) {
+            return false;
+        }
+        Group anotherGroup = (Group) obj;
+        return _id.equals(anotherGroup._id) && order == anotherGroup.order;
+    }
+
+    @Override
+    public int hashCode() {
+        String combined = _id + "_" + order;
+        return combined.hashCode();
+    }
 }

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

@@ -2,6 +2,7 @@ package protect.card_locker;
 
 import android.content.Context;
 import android.database.Cursor;
+import android.database.sqlite.SQLiteDatabase;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -12,50 +13,36 @@ import androidx.appcompat.widget.AppCompatImageButton;
 import androidx.recyclerview.widget.RecyclerView;
 import protect.card_locker.preferences.Settings;
 
-class GroupCursorAdapter extends BaseCursorAdapter<GroupCursorAdapter.GroupListItemViewHolder>
-{
+public class GroupCursorAdapter extends BaseCursorAdapter<GroupCursorAdapter.GroupListItemViewHolder> {
     Settings mSettings;
-    private Cursor mCursor;
     private final Context mContext;
-    private final GroupCursorAdapter.GroupAdapterListener mListener;
-    DBHelper mDb;
+    private final GroupAdapterListener mListener;
+    SQLiteDatabase mDatabase;
 
-    public GroupCursorAdapter(Context inputContext, Cursor inputCursor, GroupCursorAdapter.GroupAdapterListener inputListener) {
-        super(inputCursor);
+    public GroupCursorAdapter(Context inputContext, Cursor inputCursor, GroupAdapterListener inputListener) {
+        super(inputCursor, DBHelper.LoyaltyCardDbGroups.ORDER);
         setHasStableIds(true);
         mSettings = new Settings(inputContext);
-        mContext = inputContext;
+        mContext = inputContext.getApplicationContext();
         mListener = inputListener;
-        mDb = new DBHelper(inputContext);
+        mDatabase = new DBHelper(inputContext).getReadableDatabase();
 
-        swapCursor(mCursor);
-    }
-
-    @Override
-    public void swapCursor(Cursor inputCursor) {
-        super.swapCursor(inputCursor);
-        mCursor = inputCursor;
+        swapCursor(inputCursor);
     }
 
     @NonNull
     @Override
-    public GroupCursorAdapter.GroupListItemViewHolder onCreateViewHolder(ViewGroup inputParent, int inputViewType)
-    {
+    public GroupCursorAdapter.GroupListItemViewHolder onCreateViewHolder(ViewGroup inputParent, int inputViewType) {
         View itemView = LayoutInflater.from(inputParent.getContext()).inflate(R.layout.group_layout, inputParent, false);
-        return new GroupCursorAdapter.GroupListItemViewHolder(itemView);
+        return new GroupListItemViewHolder(itemView);
     }
 
-    public Cursor getCursor()
-    {
-        return mCursor;
-    }
-
-    public void onBindViewHolder(GroupCursorAdapter.GroupListItemViewHolder inputHolder, Cursor inputCursor) {
+    public void onBindViewHolder(GroupListItemViewHolder inputHolder, Cursor inputCursor) {
         Group group = Group.toGroup(inputCursor);
 
         inputHolder.mName.setText(group._id);
 
-        int groupCardCount = mDb.getGroupCardCount(group._id);
+        int groupCardCount = DBHelper.getGroupCardCount(mDatabase, group._id);
         inputHolder.mCardCount.setText(mContext.getResources().getQuantityString(R.plurals.groupCardCount, groupCardCount, groupCardCount));
 
         inputHolder.mName.setTextSize(mSettings.getFontSizeMax(mSettings.getMediumFont()));
@@ -64,24 +51,24 @@ class GroupCursorAdapter extends BaseCursorAdapter<GroupCursorAdapter.GroupListI
         applyClickEvents(inputHolder);
     }
 
-    private void applyClickEvents(GroupListItemViewHolder inputHolder)
-    {
+    private void applyClickEvents(GroupListItemViewHolder inputHolder) {
         inputHolder.mMoveDown.setOnClickListener(view -> mListener.onMoveDownButtonClicked(inputHolder.itemView));
         inputHolder.mMoveUp.setOnClickListener(view -> mListener.onMoveUpButtonClicked(inputHolder.itemView));
         inputHolder.mEdit.setOnClickListener(view -> mListener.onEditButtonClicked(inputHolder.itemView));
         inputHolder.mDelete.setOnClickListener(view -> mListener.onDeleteButtonClicked(inputHolder.itemView));
     }
 
-    public interface GroupAdapterListener
-    {
+    public interface GroupAdapterListener {
         void onMoveDownButtonClicked(View view);
+
         void onMoveUpButtonClicked(View view);
+
         void onEditButtonClicked(View view);
+
         void onDeleteButtonClicked(View view);
     }
 
-    public class GroupListItemViewHolder extends RecyclerView.ViewHolder
-    {
+    public static class GroupListItemViewHolder extends RecyclerView.ViewHolder {
         public TextView mName, mCardCount;
         public AppCompatImageButton mMoveUp, mMoveDown, mEdit, mDelete;
 

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

@@ -0,0 +1,7 @@
+package protect.card_locker;
+
+public enum ImageLocationType {
+    front,
+    back,
+    icon
+}

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

@@ -1,63 +1,78 @@
 package protect.card_locker;
 
 import android.Manifest;
+import android.app.NotificationManager;
+import android.app.PendingIntent;
 import android.content.ActivityNotFoundException;
+import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.net.Uri;
-import android.os.AsyncTask;
 import android.os.Bundle;
 import android.text.InputType;
 import android.util.Log;
 import android.view.MenuItem;
-import android.view.View;
+import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.EditText;
+import android.widget.FrameLayout;
 import android.widget.Toast;
 
-import java.io.File;
+import androidx.activity.result.ActivityResultLauncher;
+import androidx.activity.result.contract.ActivityResultContracts;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.widget.Toolbar;
+import androidx.core.app.ActivityCompat;
+import androidx.core.app.NotificationCompat;
+import androidx.core.content.ContextCompat;
+
 import java.io.FileInputStream;
-import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
+import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.List;
 
-import androidx.appcompat.app.ActionBar;
-import androidx.appcompat.app.AlertDialog;
-import androidx.appcompat.widget.Toolbar;
-import androidx.core.app.ActivityCompat;
-import androidx.core.content.ContextCompat;
+import protect.card_locker.async.TaskHandler;
 import protect.card_locker.importexport.DataFormat;
 import protect.card_locker.importexport.ImportExportResult;
 
-public class ImportExportActivity extends CatimaAppCompatActivity
-{
+public class ImportExportActivity extends CatimaAppCompatActivity {
     private static final String TAG = "Catima";
 
     private static final int PERMISSIONS_EXTERNAL_STORAGE = 1;
-    private static final int CHOOSE_EXPORT_LOCATION = 2;
-    private static final int IMPORT = 3;
 
     private ImportExportTask importExporter;
 
     private String importAlertTitle;
     private String importAlertMessage;
     private DataFormat importDataFormat;
+    private String exportPassword;
+
+    private ActivityResultLauncher<Intent> fileCreateLauncher;
+    private ActivityResultLauncher<String> fileOpenLauncher;
+    private ActivityResultLauncher<Intent> filePickerLauncher;
+
+    final private TaskHandler mTasks = new TaskHandler();
+
+    private NotificationManager mNotifyManager;
+    private NotificationCompat.Builder mBuilder;
+
+    private static final int NOTIFICATION_IMPORT = 1;
+    private static final int NOTIFICATION_EXPORT = 2;
 
     @Override
-    protected void onCreate(Bundle savedInstanceState)
-    {
+    protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setTitle(R.string.importExport);
         setContentView(R.layout.import_export_activity);
         Toolbar toolbar = findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
         ActionBar actionBar = getSupportActionBar();
-        if(actionBar != null)
-        {
+        if (actionBar != null) {
             actionBar.setDisplayHomeAsUpEnabled(true);
         }
 
@@ -66,15 +81,57 @@ public class ImportExportActivity extends CatimaAppCompatActivity
 
         if (ContextCompat.checkSelfPermission(ImportExportActivity.this,
                 Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED ||
-            ContextCompat.checkSelfPermission(ImportExportActivity.this,
-                Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED)
-        {
+                ContextCompat.checkSelfPermission(ImportExportActivity.this,
+                        Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
             ActivityCompat.requestPermissions(ImportExportActivity.this,
                     new String[]{Manifest.permission.READ_EXTERNAL_STORAGE,
-                                 Manifest.permission.WRITE_EXTERNAL_STORAGE},
+                            Manifest.permission.WRITE_EXTERNAL_STORAGE},
                     PERMISSIONS_EXTERNAL_STORAGE);
         }
 
+        // would use ActivityResultContracts.CreateDocument() but mime type cannot be set
+        fileCreateLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), result -> {
+            Intent intent = result.getData();
+            if (intent == null) {
+                Log.e(TAG, "Activity returned NULL data");
+                return;
+            }
+            Uri uri = intent.getData();
+            if (uri == null) {
+                Log.e(TAG, "Activity returned NULL uri");
+                return;
+            }
+            try {
+                OutputStream writer = getContentResolver().openOutputStream(uri);
+                Log.e(TAG, "Starting file export with: " + result.toString());
+                startExport(writer, uri, exportPassword != null ? exportPassword.toCharArray() : null, true);
+            } catch (IOException e) {
+                Log.e(TAG, "Failed to export file: " + result.toString(), e);
+                onExportComplete(ImportExportResult.GenericFailure, uri);
+            }
+
+        });
+        fileOpenLauncher = registerForActivityResult(new ActivityResultContracts.GetContent(), result -> {
+            if (result == null) {
+                Log.e(TAG, "Activity returned NULL data");
+                return;
+            }
+            openFileForImport(result, null);
+        });
+        filePickerLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), result -> {
+            Intent intent = result.getData();
+            if (intent == null) {
+                Log.e(TAG, "Activity returned NULL data");
+                return;
+            }
+            Uri uri = intent.getData();
+            if (uri == null) {
+                Log.e(TAG, "Activity returned NULL uri");
+                return;
+            }
+            openFileForImport(intent.getData(), null);
+        });
+
         // Check that there is a file manager available
         final Intent intentCreateDocumentAction = new Intent(Intent.ACTION_CREATE_DOCUMENT);
         intentCreateDocumentAction.addCategory(Intent.CATEGORY_OPENABLE);
@@ -82,45 +139,57 @@ public class ImportExportActivity extends CatimaAppCompatActivity
         intentCreateDocumentAction.putExtra(Intent.EXTRA_TITLE, "catima.zip");
 
         Button exportButton = findViewById(R.id.exportButton);
-        exportButton.setOnClickListener(new View.OnClickListener()
-        {
-            @Override
-            public void onClick(View v)
-            {
-                chooseFileWithIntent(intentCreateDocumentAction, CHOOSE_EXPORT_LOCATION);
-            }
+        exportButton.setOnClickListener(v -> {
+            AlertDialog.Builder builder = new AlertDialog.Builder(ImportExportActivity.this);
+            builder.setTitle(R.string.exportPassword);
+
+            FrameLayout container = new FrameLayout(ImportExportActivity.this);
+            FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+            params.leftMargin = 50;
+            params.rightMargin = 50;
+
+            final EditText input = new EditText(ImportExportActivity.this);
+            input.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD);
+            input.setLayoutParams(params);
+            input.setHint(R.string.exportPasswordHint);
+
+            container.addView(input);
+            builder.setView(container);
+            builder.setPositiveButton(R.string.ok, (dialogInterface, i) -> {
+                exportPassword = input.getText().toString();
+                try {
+                    fileCreateLauncher.launch(intentCreateDocumentAction);
+                } catch (ActivityNotFoundException e) {
+                    Toast.makeText(getApplicationContext(), R.string.failedOpeningFileManager, Toast.LENGTH_LONG).show();
+                    Log.e(TAG, "No activity found to handle intent", e);
+                }
+            });
+            builder.setNegativeButton(R.string.cancel, (dialogInterface, i) -> dialogInterface.cancel());
+            builder.show();
+
         });
 
         // Check that there is a file manager available
-        final Intent intentGetContentAction = new Intent(Intent.ACTION_GET_CONTENT);
-        intentGetContentAction.addCategory(Intent.CATEGORY_OPENABLE);
-        intentGetContentAction.setType("*/*");
-
         Button importFilesystem = findViewById(R.id.importOptionFilesystemButton);
-        importFilesystem.setOnClickListener(new View.OnClickListener()
-        {
-            @Override
-            public void onClick(View v)
-            {
-                chooseImportType(intentGetContentAction);
-            }
-        });
+        importFilesystem.setOnClickListener(v -> chooseImportType(false));
 
         // Check that there is an app that data can be imported from
-        final Intent intentPickAction = new Intent(Intent.ACTION_PICK);
-
         Button importApplication = findViewById(R.id.importOptionApplicationButton);
-        importApplication.setOnClickListener(new View.OnClickListener()
-        {
-            @Override
-            public void onClick(View v)
-            {
-                chooseImportType(intentPickAction);
-            }
-        });
+        importApplication.setOnClickListener(v -> chooseImportType(true));
     }
 
-    private void chooseImportType(Intent baseIntent) {
+    private void openFileForImport(Uri uri, char[] password) {
+        try {
+            InputStream reader = getContentResolver().openInputStream(uri);
+            Log.e(TAG, "Starting file import with: " + uri.toString());
+            startImport(reader, uri, importDataFormat, password, true);
+        } catch (IOException e) {
+            Log.e(TAG, "Failed to import file: " + uri.toString(), e);
+            onImportComplete(ImportExportResult.GenericFailure, uri, importDataFormat);
+        }
+    }
+
+    private void chooseImportType(boolean choosePicker) {
         List<CharSequence> betaImportOptions = new ArrayList<>();
         betaImportOptions.add("Fidme");
         betaImportOptions.add("Stocard");
@@ -176,47 +245,102 @@ public class ImportExportActivity extends CatimaAppCompatActivity
                             .setTitle(importAlertTitle)
                             .setMessage(importAlertMessage)
                             .setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
-                                        @Override
-                                        public void onClick(DialogInterface dialog, int which) {
-                                            chooseFileWithIntent(baseIntent, IMPORT);
+                                @Override
+                                public void onClick(DialogInterface dialog, int which) {
+                                    try {
+                                        if (choosePicker) {
+                                            final Intent intentPickAction = new Intent(Intent.ACTION_PICK);
+                                            filePickerLauncher.launch(intentPickAction);
+                                        } else {
+                                            fileOpenLauncher.launch("*/*");
                                         }
-                                    })
+                                    } catch (ActivityNotFoundException e) {
+                                        Toast.makeText(getApplicationContext(), R.string.failedOpeningFileManager, Toast.LENGTH_LONG).show();
+                                        Log.e(TAG, "No activity found to handle intent", e);
+                                    }
+                                }
+                            })
                             .setNegativeButton(R.string.cancel, null)
                             .show();
                 });
         builder.show();
     }
 
-    private void startImport(final InputStream target, final Uri targetUri, final DataFormat dataFormat, final char[] password)
-    {
-        ImportExportTask.TaskCompleteListener listener = new ImportExportTask.TaskCompleteListener()
-        {
-            @Override
-            public void onTaskComplete(ImportExportResult result, DataFormat dataFormat)
-            {
-                onImportComplete(result, targetUri, dataFormat);
-            }
-        };
-
-        importExporter = new ImportExportTask(ImportExportActivity.this,
-                dataFormat, target, password, listener);
-        importExporter.execute();
+    private void startProgressNotification(boolean importing) {
+        mNotifyManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
+        mBuilder = new NotificationCompat.Builder(this, NotificationType.getImportExportChannel(this));
+        mBuilder.setContentTitle(getString(importing ? R.string.importing : R.string.exporting))
+                .setContentText(null)
+                .setSmallIcon(R.drawable.ic_import_export_white_24dp)
+                .setColor(getThemeColor())
+                .setProgress(0, 0, true);
+        mNotifyManager.notify(importing ? NOTIFICATION_IMPORT : NOTIFICATION_EXPORT, mBuilder.build());
     }
 
-    private void startExport(final OutputStream target, final Uri targetUri)
-    {
-        ImportExportTask.TaskCompleteListener listener = new ImportExportTask.TaskCompleteListener()
-        {
-            @Override
-            public void onTaskComplete(ImportExportResult result, DataFormat dataFormat)
-            {
-                onExportComplete(result, targetUri);
+    private void endProgressNotification(boolean importing, ImportExportResult result, PendingIntent sendIntent) {
+        String notificationTitle;
+        String notificationMessage;
+
+        if (result.equals(ImportExportResult.Success)) {
+            notificationTitle = getString(importing ? R.string.importSuccessfulTitle : R.string.exportSuccessfulTitle);
+            notificationMessage = getString(importing ? R.string.importSuccessful : R.string.exportSuccessful);
+        } else {
+            int reason = R.string.unknown_failure;
+            if (result.equals(ImportExportResult.BadPassword)) {
+                reason = R.string.incorrect_password;
+            }
+
+            notificationTitle = getString(importing ? R.string.importFailedTitle : R.string.exportFailedTitle);
+            notificationMessage = String.format(getString(importing ? R.string.importFailed : R.string.exportFailed), getString(reason));
+        }
+
+        mBuilder.setContentTitle(notificationTitle)
+                .setContentText(notificationMessage)
+                .setProgress(0,0, false);
+
+        if (sendIntent != null) {
+            mBuilder.addAction(R.drawable.ic_share, getString(R.string.sendLabel), sendIntent);
+        }
+
+        mNotifyManager.notify(importing ? NOTIFICATION_IMPORT : NOTIFICATION_EXPORT, mBuilder.build());
+    }
+
+    private void startImport(final InputStream target, final Uri targetUri, final DataFormat dataFormat, final char[] password, final boolean closeWhenDone) {
+        mTasks.flushTaskList(TaskHandler.TYPE.IMPORT, true, false, false);
+        ImportExportTask.TaskCompleteListener listener = (result, dataFormat1) -> {
+            onImportComplete(result, targetUri, dataFormat1);
+            if (closeWhenDone) {
+                try {
+                    target.close();
+                } catch (IOException ioException) {
+                    ioException.printStackTrace();
+                }
             }
         };
 
+        startProgressNotification(true);
         importExporter = new ImportExportTask(ImportExportActivity.this,
-                DataFormat.Catima, target, listener);
-        importExporter.execute();
+                dataFormat, target, password, listener);
+        mTasks.executeTask(TaskHandler.TYPE.IMPORT, importExporter);
+    }
+
+    private void startExport(final OutputStream target, final Uri targetUri, char[] password, final boolean closeWhenDone) {
+        mTasks.flushTaskList(TaskHandler.TYPE.EXPORT, true, false, false);
+        ImportExportTask.TaskCompleteListener listener = (result, dataFormat) -> {
+            onExportComplete(result, targetUri);
+            if (closeWhenDone) {
+                try {
+                    target.close();
+                } catch (IOException ioException) {
+                    ioException.printStackTrace();
+                }
+            }
+        };
+
+        startProgressNotification(false);
+        importExporter = new ImportExportTask(ImportExportActivity.this,
+                DataFormat.Catima, target, password, listener);
+        mTasks.executeTask(TaskHandler.TYPE.EXPORT, importExporter);
     }
 
     @Override
@@ -244,22 +368,17 @@ public class ImportExportActivity extends CatimaAppCompatActivity
     }
 
     @Override
-    protected void onDestroy()
-    {
-        if(importExporter != null && importExporter.getStatus() != AsyncTask.Status.RUNNING)
-        {
-            importExporter.cancel(true);
-        }
+    protected void onDestroy() {
+        mTasks.flushTaskList(TaskHandler.TYPE.IMPORT, true, false, false);
+        mTasks.flushTaskList(TaskHandler.TYPE.EXPORT, true, false, false);
         super.onDestroy();
     }
 
     @Override
-    public boolean onOptionsItemSelected(MenuItem item)
-    {
+    public boolean onOptionsItemSelected(MenuItem item) {
         int id = item.getItemId();
 
-        if(id == android.R.id.home)
-        {
+        if (id == android.R.id.home) {
             finish();
             return true;
         }
@@ -276,7 +395,7 @@ public class ImportExportActivity extends CatimaAppCompatActivity
         builder.setView(input);
 
         builder.setPositiveButton(R.string.ok, (dialogInterface, i) -> {
-            activityResultParser(IMPORT, RESULT_OK, uri, input.getText().toString().toCharArray());
+            openFileForImport(uri, input.getText().toString().toCharArray());
         });
         builder.setNegativeButton(R.string.cancel, (dialogInterface, i) -> dialogInterface.cancel());
 
@@ -284,170 +403,27 @@ public class ImportExportActivity extends CatimaAppCompatActivity
     }
 
     private void onImportComplete(ImportExportResult result, Uri path, DataFormat dataFormat) {
+        endProgressNotification(true, result, null);
+
         if (result == ImportExportResult.BadPassword) {
             retryWithPassword(dataFormat, path);
-            return;
-        }
-
-        AlertDialog.Builder builder = new AlertDialog.Builder(this);
-
-        int messageId;
-
-        if (result == ImportExportResult.Success)
-        {
-            builder.setTitle(R.string.importSuccessfulTitle);
-            messageId = R.string.importSuccessful;
-        }
-        else
-        {
-            builder.setTitle(R.string.importFailedTitle);
-            messageId = R.string.importFailed;
-        }
-
-        final String message = getResources().getString(messageId);
-
-        builder.setMessage(message);
-        builder.setNeutralButton(R.string.ok, new DialogInterface.OnClickListener()
-        {
-            @Override
-            public void onClick(DialogInterface dialog, int which)
-            {
-                dialog.dismiss();
-            }
-        });
-
-        builder.create().show();
-    }
-
-    private void onExportComplete(ImportExportResult result, final Uri path)
-    {
-        AlertDialog.Builder builder = new AlertDialog.Builder(this);
-
-        int messageId;
-
-        if(result == ImportExportResult.Success)
-        {
-            builder.setTitle(R.string.exportSuccessfulTitle);
-            messageId = R.string.exportSuccessful;
-        }
-        else
-        {
-            builder.setTitle(R.string.exportFailedTitle);
-            messageId = R.string.exportFailed;
-        }
-
-        final String message = getResources().getString(messageId);
-
-        builder.setMessage(message);
-        builder.setNeutralButton(R.string.ok, (dialog, which) -> dialog.dismiss());
-
-        if(result == ImportExportResult.Success)
-        {
-            final CharSequence sendLabel = ImportExportActivity.this.getResources().getText(R.string.sendLabel);
-
-            builder.setPositiveButton(sendLabel, (dialog, which) -> {
-                Intent sendIntent = new Intent(Intent.ACTION_SEND);
-                sendIntent.putExtra(Intent.EXTRA_STREAM, path);
-                sendIntent.setType("text/csv");
-
-                // set flag to give temporary permission to external app to use the FileProvider
-                sendIntent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
-
-                ImportExportActivity.this.startActivity(Intent.createChooser(sendIntent,
-                        sendLabel));
-
-                dialog.dismiss();
-            });
-        }
-
-        builder.create().show();
-    }
-
-    private void chooseFileWithIntent(Intent intent, int requestCode)
-    {
-        try
-        {
-            startActivityForResult(intent, requestCode);
-        }
-        catch (ActivityNotFoundException e)
-        {
-            Toast.makeText(getApplicationContext(), R.string.failedOpeningFileManager, Toast.LENGTH_LONG).show();
-            Log.e(TAG, "No activity found to handle intent", e);
         }
     }
 
-    private void activityResultParser(int requestCode, int resultCode, Uri uri, char[] password) {
-        if (resultCode != RESULT_OK)
-        {
-            Log.w(TAG, "Failed onActivityResult(), result=" + resultCode);
-            return;
+    private void onExportComplete(ImportExportResult result, final Uri path) {
+        PendingIntent pendingIntent = null;
+
+        if (result == ImportExportResult.Success) {
+            Intent sendIntent = new Intent(Intent.ACTION_SEND);
+            sendIntent.putExtra(Intent.EXTRA_STREAM, path);
+            sendIntent.setType("text/csv");
+
+            // set flag to give temporary permission to external app to use the FileProvider
+            sendIntent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
+
+            pendingIntent = PendingIntent.getActivity(this, NOTIFICATION_EXPORT, sendIntent, PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_IMMUTABLE);
         }
 
-        if(uri == null)
-        {
-            Log.e(TAG, "Activity returned a NULL URI");
-            return;
-        }
-
-        try
-        {
-            if (requestCode == CHOOSE_EXPORT_LOCATION)
-            {
-                OutputStream writer;
-                if (uri.getScheme() != null)
-                {
-                    writer = getContentResolver().openOutputStream(uri);
-                }
-                else
-                {
-                    writer = new FileOutputStream(new File(uri.toString()));
-                }
-
-                Log.e(TAG, "Starting file export with: " + uri.toString());
-                startExport(writer, uri);
-            }
-            else
-            {
-                InputStream reader;
-                if(uri.getScheme() != null)
-                {
-                    reader = getContentResolver().openInputStream(uri);
-                }
-                else
-                {
-                    reader = new FileInputStream(new File(uri.toString()));
-                }
-
-                Log.e(TAG, "Starting file import with: " + uri.toString());
-
-                startImport(reader, uri, importDataFormat, password);
-            }
-        }
-        catch(FileNotFoundException e)
-        {
-            Log.e(TAG, "Failed to import/export file: " + uri.toString(), e);
-            if (requestCode == CHOOSE_EXPORT_LOCATION)
-            {
-                onExportComplete(ImportExportResult.GenericFailure, uri);
-            }
-            else
-            {
-                onImportComplete(ImportExportResult.GenericFailure, uri, importDataFormat);
-            }
-        }
-    }
-
-    @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data)
-    {
-        super.onActivityResult(requestCode, resultCode, data);
-
-        if(data == null)
-        {
-            Log.e(TAG, "Activity returned NULL data");
-            return;
-        }
-
-        activityResultParser(requestCode, resultCode, data.getData(), null);
+        endProgressNotification(false, result, pendingIntent);
     }
 }

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

@@ -1,10 +1,10 @@
 package protect.card_locker;
 
 import android.app.Activity;
-import android.app.ProgressDialog;
+import android.app.NotificationManager;
 import android.content.Context;
 import android.content.DialogInterface;
-import android.os.AsyncTask;
+import android.database.sqlite.SQLiteDatabase;
 import android.util.Log;
 
 import java.io.IOException;
@@ -13,36 +13,35 @@ import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.nio.charset.StandardCharsets;
 
+import androidx.core.app.NotificationCompat;
+import protect.card_locker.async.CompatCallable;
 import protect.card_locker.importexport.DataFormat;
 import protect.card_locker.importexport.ImportExportResult;
 import protect.card_locker.importexport.MultiFormatExporter;
 import protect.card_locker.importexport.MultiFormatImporter;
 
-class ImportExportTask extends AsyncTask<Void, Void, ImportExportResult>
-{
+public class ImportExportTask implements CompatCallable<ImportExportResult> {
     private static final String TAG = "Catima";
 
-    private Activity activity;
-    private boolean doImport;
-    private DataFormat format;
+    private final Activity activity;
+    private final boolean doImport;
+    private final DataFormat format;
     private OutputStream outputStream;
     private InputStream inputStream;
-    private char[] password;
-    private TaskCompleteListener listener;
-
-    private ProgressDialog progress;
+    private final char[] password;
+    private final TaskCompleteListener listener;
 
     /**
      * Constructor which will setup a task for exporting to the given file
      */
-    ImportExportTask(Activity activity, DataFormat format, OutputStream output,
-            TaskCompleteListener listener)
-    {
+    ImportExportTask(Activity activity, DataFormat format, OutputStream output, char[] password,
+                     TaskCompleteListener listener) {
         super();
         this.activity = activity;
         this.doImport = false;
         this.format = format;
         this.outputStream = output;
+        this.password = password;
         this.listener = listener;
     }
 
@@ -50,8 +49,7 @@ class ImportExportTask extends AsyncTask<Void, Void, ImportExportResult>
      * Constructor which will setup a task for importing from the given InputStream.
      */
     ImportExportTask(Activity activity, DataFormat format, InputStream input, char[] password,
-                            TaskCompleteListener listener)
-    {
+                     TaskCompleteListener listener) {
         super();
         this.activity = activity;
         this.doImport = true;
@@ -61,27 +59,22 @@ class ImportExportTask extends AsyncTask<Void, Void, ImportExportResult>
         this.listener = listener;
     }
 
-    private ImportExportResult performImport(Context context, InputStream stream, DBHelper db, char[] password)
-    {
-        ImportExportResult importResult = MultiFormatImporter.importData(context, db, stream, format, password);
+    private ImportExportResult performImport(Context context, InputStream stream, SQLiteDatabase database, char[] password) {
+        ImportExportResult result = MultiFormatImporter.importData(context, database, stream, format, password);
 
-        Log.i(TAG, "Import result: " + importResult.name());
+        Log.i(TAG, "Import result: " + result.name());
 
-        return importResult;
+        return result;
     }
 
-    private ImportExportResult performExport(Context context, OutputStream stream, DBHelper db)
-    {
+    private ImportExportResult performExport(Context context, OutputStream stream, SQLiteDatabase database, char[] password) {
         ImportExportResult result = ImportExportResult.GenericFailure;
 
-        try
-        {
+        try {
             OutputStreamWriter writer = new OutputStreamWriter(stream, StandardCharsets.UTF_8);
-            result = MultiFormatExporter.exportData(context, db, stream, format);
+            result = MultiFormatExporter.exportData(context, database, stream, format, password);
             writer.close();
-        }
-        catch (IOException e)
-        {
+        } catch (IOException e) {
             Log.e(TAG, "Unable to export file", e);
         }
 
@@ -90,55 +83,43 @@ class ImportExportTask extends AsyncTask<Void, Void, ImportExportResult>
         return result;
     }
 
-    protected void onPreExecute()
-    {
-        progress = new ProgressDialog(activity);
-        progress.setTitle(doImport ? R.string.importing : R.string.exporting);
-
-        progress.setOnDismissListener(new DialogInterface.OnDismissListener()
-        {
-            @Override
-            public void onDismiss(DialogInterface dialog)
-            {
-                ImportExportTask.this.cancel(true);
-            }
-        });
-
-        progress.show();
-    }
-
-    protected ImportExportResult doInBackground(Void... nothing)
-    {
-        final DBHelper db = new DBHelper(activity);
+    protected ImportExportResult doInBackground(Void... nothing) {
+        final SQLiteDatabase database = new DBHelper(activity).getWritableDatabase();
         ImportExportResult result;
 
-        if(doImport)
-        {
-            result = performImport(activity.getApplicationContext(), inputStream, db, password);
-        }
-        else
-        {
-            result = performExport(activity.getApplicationContext(), outputStream, db);
+        if (doImport) {
+            result = performImport(activity.getApplicationContext(), inputStream, database, password);
+        } else {
+            result = performExport(activity.getApplicationContext(), outputStream, database, password);
         }
 
+        database.close();
+
         return result;
     }
 
-    protected void onPostExecute(ImportExportResult result)
-    {
+    public void onPostExecute(Object castResult) {
+        ImportExportResult result = (ImportExportResult) castResult;
+
         listener.onTaskComplete(result, format);
 
-        progress.dismiss();
         Log.i(TAG, (doImport ? "Import" : "Export") + " Complete");
     }
 
-    protected void onCancelled()
-    {
-        progress.dismiss();
-        Log.i(TAG, (doImport ? "Import" : "Export") + " Cancelled");
+    @Override
+    public void onPreExecute() {
     }
-    interface TaskCompleteListener
-    {
+
+    protected void stop() {
+        // Whelp
+    }
+
+    @Override
+    public ImportExportResult call() {
+        return doInBackground();
+    }
+
+    interface TaskCompleteListener {
         void onTaskComplete(ImportExportResult result, DataFormat format);
     }
 

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

@@ -4,8 +4,6 @@ import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 
-import com.google.zxing.BarcodeFormat;
-
 import java.io.InvalidObjectException;
 import java.io.UnsupportedEncodingException;
 import java.math.BigDecimal;
@@ -35,7 +33,7 @@ public class ImportURIHelper {
     private final String shareMultipleText;
 
     public ImportURIHelper(Context context) {
-        this.context = context;
+        this.context = context.getApplicationContext();
         hosts[0] = context.getResources().getString(R.string.intent_import_card_from_url_host_catima_app);
         paths[0] = context.getResources().getString(R.string.intent_import_card_from_url_path_prefix_catima_app);
         hosts[1] = context.getResources().getString(R.string.intent_import_card_from_url_host_thelastproject);
@@ -57,7 +55,7 @@ public class ImportURIHelper {
     }
 
     public LoyaltyCard parse(Uri uri) throws InvalidObjectException {
-        if(!isImportUri(uri)) {
+        if (!isImportUri(uri)) {
             throw new InvalidObjectException("Not an import URI");
         }
 
@@ -92,37 +90,33 @@ public class ImportURIHelper {
             String note = kv.get(NOTE);
             String cardId = kv.get(CARD_ID);
             String barcodeId = kv.get(BARCODE_ID);
-            if (store == null || note == null || cardId == null) throw new InvalidObjectException("Not a valid import URI: " + uri.toString());
+            if (store == null || note == null || cardId == null)
+                throw new InvalidObjectException("Not a valid import URI: " + uri.toString());
 
             String unparsedBarcodeType = kv.get(BARCODE_TYPE);
-            if(unparsedBarcodeType != null && !unparsedBarcodeType.equals(""))
-            {
+            if (unparsedBarcodeType != null && !unparsedBarcodeType.equals("")) {
                 barcodeType = CatimaBarcode.fromName(unparsedBarcodeType);
             }
 
             String unparsedBalance = kv.get(BALANCE);
-            if(unparsedBalance != null && !unparsedBalance.equals(""))
-            {
+            if (unparsedBalance != null && !unparsedBalance.equals("")) {
                 balance = new BigDecimal(unparsedBalance);
             }
             String unparsedBalanceType = kv.get(BALANCE_TYPE);
-            if (unparsedBalanceType != null && !unparsedBalanceType.equals(""))
-            {
+            if (unparsedBalanceType != null && !unparsedBalanceType.equals("")) {
                 balanceType = Currency.getInstance(unparsedBalanceType);
             }
             String unparsedExpiry = kv.get(EXPIRY);
-            if(unparsedExpiry != null && !unparsedExpiry.equals(""))
-            {
+            if (unparsedExpiry != null && !unparsedExpiry.equals("")) {
                 expiry = new Date(Long.parseLong(unparsedExpiry));
             }
 
             String unparsedHeaderColor = kv.get(HEADER_COLOR);
-            if(unparsedHeaderColor != null)
-            {
+            if (unparsedHeaderColor != null) {
                 headerColor = Integer.parseInt(unparsedHeaderColor);
             }
 
-            return new LoyaltyCard(-1, store, note, expiry, balance, balanceType, cardId, barcodeId, barcodeType, headerColor, 0, Utils.getUnixTime());
+            return new LoyaltyCard(-1, store, note, expiry, balance, balanceType, cardId, barcodeId, barcodeType, headerColor, 0, Utils.getUnixTime(), 100);
         } catch (NullPointerException | NumberFormatException | UnsupportedEncodingException ex) {
             throw new InvalidObjectException("Not a valid import URI");
         }
@@ -159,14 +153,14 @@ public class ImportURIHelper {
             fragment = appendFragment(fragment, EXPIRY, String.valueOf(loyaltyCard.expiry.getTime()));
         }
         fragment = appendFragment(fragment, CARD_ID, loyaltyCard.cardId);
-        if(loyaltyCard.barcodeId != null) {
+        if (loyaltyCard.barcodeId != null) {
             fragment = appendFragment(fragment, BARCODE_ID, loyaltyCard.barcodeId);
         }
 
-        if(loyaltyCard.barcodeType != null) {
+        if (loyaltyCard.barcodeType != null) {
             fragment = appendFragment(fragment, BARCODE_TYPE, loyaltyCard.barcodeType.name());
         }
-        if(loyaltyCard.headerColor != null) {
+        if (loyaltyCard.headerColor != null) {
             fragment = appendFragment(fragment, HEADER_COLOR, loyaltyCard.headerColor.toString());
         }
         // Star status will not be exported
@@ -203,6 +197,7 @@ public class ImportURIHelper {
         sendIntent.setType("text/plain");
 
         Intent shareIntent = Intent.createChooser(sendIntent, null);
+        shareIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         context.startActivity(shareIntent);
     }
 }

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

@@ -18,8 +18,7 @@ import android.text.TextPaint;
  * alphabet or digit, if there is no letter or digit available, a default image
  * is shown instead.
  */
-class LetterBitmap
-{
+class LetterBitmap {
 
     /**
      * The number of available tile colors
@@ -37,39 +36,32 @@ class LetterBitmap
     /**
      * Constructor for <code>LetterTileProvider</code>
      *
-     * @param context The {@link Context} to use
-     * @param displayName The name used to create the letter for the tile
-     * @param key         The key used to generate the background color for the tile
+     * @param context            The {@link Context} to use
+     * @param displayName        The name used to create the letter for the tile
+     * @param key                The key used to generate the background color for the tile
      * @param tileLetterFontSize The font size used to display the letter
-     * @param width       The desired width of the tile
-     * @param height      The desired height of the tile
-     * @param backgroundColor  (optional) color to use for background.
-     * @param textColor  (optional) color to use for text.
+     * @param width              The desired width of the tile
+     * @param height             The desired height of the tile
+     * @param backgroundColor    (optional) color to use for background.
+     * @param textColor          (optional) color to use for text.
      */
     public LetterBitmap(Context context, String displayName, String key, int tileLetterFontSize,
-                        int width, int height, Integer backgroundColor, Integer textColor)
-    {
+                        int width, int height, Integer backgroundColor, Integer textColor) {
         TextPaint paint = new TextPaint();
         paint.setTypeface(Typeface.create("sans-serif-light", Typeface.BOLD));
 
-        if(textColor != null)
-        {
+        if (textColor != null) {
             paint.setColor(textColor);
-        }
-        else
-        {
+        } else {
             paint.setColor(Color.WHITE);
         }
 
         paint.setTextAlign(Paint.Align.CENTER);
         paint.setAntiAlias(true);
 
-        if(backgroundColor == null)
-        {
+        if (backgroundColor == null) {
             mColor = getDefaultColor(context, key);
-        }
-        else
-        {
+        } else {
             mColor = backgroundColor;
         }
 
@@ -80,7 +72,7 @@ class LetterBitmap
         c.setBitmap(mBitmap);
         c.drawColor(mColor);
 
-        char [] firstCharArray = new char[1];
+        char[] firstCharArray = new char[1];
         firstCharArray[0] = firstChar.toUpperCase().charAt(0);
         paint.setTextSize(tileLetterFontSize);
 
@@ -97,16 +89,14 @@ class LetterBitmap
      * alphabet or digit, if there is no letter or digit available, a
      * default image is shown instead
      */
-    public Bitmap getLetterTile()
-    {
+    public Bitmap getLetterTile() {
         return mBitmap;
     }
 
     /**
      * @return background color used for letter title.
      */
-    public int getBackgroundColor()
-    {
+    public int getBackgroundColor() {
         return mColor;
     }
 
@@ -115,8 +105,7 @@ class LetterBitmap
      * @return A new or previously chosen color for <code>key</code> used as the
      * tile background color
      */
-    private static int pickColor(String key, TypedArray colors)
-    {
+    private static int pickColor(String key, TypedArray colors) {
         // String.hashCode() is not supposed to change across java versions, so
         // this should guarantee the same key always maps to the same color
         final int color = Math.abs(key.hashCode()) % NUM_OF_TILE_COLORS;
@@ -127,8 +116,7 @@ class LetterBitmap
      * Determine the color which the letter tile will use if no default
      * color is provided.
      */
-    public static int getDefaultColor(Context context, String key)
-    {
+    public static int getDefaultColor(Context context, String key) {
         final Resources res = context.getResources();
 
         TypedArray colors = res.obtainTypedArray(R.array.letter_tile_colors);

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

@@ -30,12 +30,12 @@ public class LoyaltyCard implements Parcelable {
 
     public final int starStatus;
     public final long lastUsed;
+    public int zoomLevel;
 
     public LoyaltyCard(final int id, final String store, final String note, final Date expiry,
                        final BigDecimal balance, final Currency balanceType, final String cardId,
                        @Nullable final String barcodeId, @Nullable final CatimaBarcode barcodeType,
-                       @Nullable final Integer headerColor, final int starStatus, final long lastUsed)
-    {
+                       @Nullable final Integer headerColor, final int starStatus, final long lastUsed, final int zoomLevel) {
         this.id = id;
         this.store = store;
         this.note = note;
@@ -48,6 +48,7 @@ public class LoyaltyCard implements Parcelable {
         this.headerColor = headerColor;
         this.starStatus = starStatus;
         this.lastUsed = lastUsed;
+        this.zoomLevel = zoomLevel;
     }
 
     protected LoyaltyCard(Parcel in) {
@@ -66,6 +67,7 @@ public class LoyaltyCard implements Parcelable {
         headerColor = tmpHeaderColor != -1 ? tmpHeaderColor : null;
         starStatus = in.readInt();
         lastUsed = in.readLong();
+        zoomLevel = in.readInt();
     }
 
     @Override
@@ -82,10 +84,10 @@ public class LoyaltyCard implements Parcelable {
         parcel.writeInt(headerColor != null ? headerColor : -1);
         parcel.writeInt(starStatus);
         parcel.writeLong(lastUsed);
+        parcel.writeInt(zoomLevel);
     }
 
-    public static LoyaltyCard toLoyaltyCard(Cursor cursor)
-    {
+    public static LoyaltyCard toLoyaltyCard(Cursor cursor) {
         int id = cursor.getInt(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.ID));
         String store = cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.STORE));
         String note = cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.NOTE));
@@ -95,6 +97,7 @@ public class LoyaltyCard implements Parcelable {
         String barcodeId = cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.BARCODE_ID));
         int starred = cursor.getInt(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.STAR_STATUS));
         long lastUsed = cursor.getLong(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.LAST_USED));
+        int zoomLevel = cursor.getInt(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.ZOOM_LEVEL));
 
         int barcodeTypeColumn = cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.BARCODE_TYPE);
         int balanceTypeColumn = cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.BALANCE_TYPE);
@@ -105,27 +108,23 @@ public class LoyaltyCard implements Parcelable {
         Date expiry = null;
         Integer headerColor = null;
 
-        if (cursor.isNull(barcodeTypeColumn) == false)
-        {
+        if (cursor.isNull(barcodeTypeColumn) == false) {
             barcodeType = CatimaBarcode.fromName(cursor.getString(barcodeTypeColumn));
         }
 
-        if (cursor.isNull(balanceTypeColumn) == false)
-        {
+        if (cursor.isNull(balanceTypeColumn) == false) {
             balanceType = Currency.getInstance(cursor.getString(balanceTypeColumn));
         }
 
-        if(expiryLong > 0)
-        {
+        if (expiryLong > 0) {
             expiry = new Date(expiryLong);
         }
 
-        if(cursor.isNull(headerColorColumn) == false)
-        {
+        if (cursor.isNull(headerColorColumn) == false) {
             headerColor = cursor.getInt(headerColorColumn);
         }
 
-        return new LoyaltyCard(id, store, note, expiry, balance, balanceType, cardId, barcodeId, barcodeType, headerColor, starred, lastUsed);
+        return new LoyaltyCard(id, store, note, expiry, balance, balanceType, cardId, barcodeId, barcodeType, headerColor, starred, lastUsed, zoomLevel);
     }
 
     @Override

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

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

@@ -1,228 +1,184 @@
 package protect.card_locker;
 
 import android.content.Context;
+import android.content.res.Resources;
 import android.database.Cursor;
+import android.graphics.Bitmap;
 import android.graphics.Color;
-import android.graphics.PorterDuff;
 import android.graphics.drawable.Drawable;
 import android.util.SparseBooleanArray;
+import android.util.TypedValue;
 import android.view.HapticFeedbackConstants;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.RelativeLayout;
 import android.widget.TextView;
 
+import androidx.constraintlayout.widget.ConstraintLayout;
+import androidx.core.content.ContextCompat;
+import androidx.core.graphics.BlendModeColorFilterCompat;
+import androidx.core.graphics.BlendModeCompat;
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.google.android.material.card.MaterialCardView;
 
 import java.math.BigDecimal;
 import java.text.DateFormat;
 import java.util.ArrayList;
+import java.util.Currency;
+import java.util.Date;
 
-import androidx.cardview.widget.CardView;
-import androidx.recyclerview.widget.RecyclerView;
 import protect.card_locker.preferences.Settings;
 
-public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCursorAdapter.LoyaltyCardListItemViewHolder>
-{
+public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCursorAdapter.LoyaltyCardListItemViewHolder> {
     private int mCurrentSelectedIndex = -1;
-    private Cursor mCursor;
     Settings mSettings;
     boolean mDarkModeEnabled;
-    private Context mContext;
-    private CardAdapterListener mListener;
-    private SparseBooleanArray mSelectedItems;
-    private SparseBooleanArray mAnimationItemsIndex;
+    private final Context mContext;
+    private final CardAdapterListener mListener;
+    protected SparseBooleanArray mSelectedItems;
+    protected SparseBooleanArray mAnimationItemsIndex;
     private boolean mReverseAllAnimations = false;
+    private boolean mShowDetails = true;
 
-    public LoyaltyCardCursorAdapter(Context inputContext, Cursor inputCursor, CardAdapterListener inputListener)
-    {
-        super(inputCursor);
+    public LoyaltyCardCursorAdapter(Context inputContext, Cursor inputCursor, CardAdapterListener inputListener) {
+        super(inputCursor, DBHelper.LoyaltyCardDbIds.ID);
         setHasStableIds(true);
         mSettings = new Settings(inputContext);
-        mContext = inputContext;
+        mContext = inputContext.getApplicationContext();
         mListener = inputListener;
         mSelectedItems = new SparseBooleanArray();
         mAnimationItemsIndex = new SparseBooleanArray();
 
-        mDarkModeEnabled = MainActivity.isDarkModeEnabled(inputContext);
+        mDarkModeEnabled = Utils.isDarkModeEnabled(inputContext);
 
-        swapCursor(mCursor);
+        swapCursor(inputCursor);
+    }
+
+    public void showDetails(boolean show) {
+        mShowDetails = show;
+        notifyDataSetChanged();
+    }
+
+    public boolean showingDetails() {
+        return mShowDetails;
     }
 
     @Override
-    public void swapCursor(Cursor inputCursor) {
-        super.swapCursor(inputCursor);
-        mCursor = inputCursor;
-    }
-
-    @Override
-    public LoyaltyCardListItemViewHolder onCreateViewHolder(ViewGroup inputParent, int inputViewType)
-    {
+    public LoyaltyCardListItemViewHolder onCreateViewHolder(ViewGroup inputParent, int inputViewType) {
         View itemView = LayoutInflater.from(inputParent.getContext()).inflate(R.layout.loyalty_card_layout, inputParent, false);
-        return new LoyaltyCardListItemViewHolder(itemView);
+        return new LoyaltyCardListItemViewHolder(itemView, mListener);
     }
 
-    public Cursor getCursor()
-    {
-        return mCursor;
+    public LoyaltyCard getCard(int position) {
+        mCursor.moveToPosition(position);
+        return LoyaltyCard.toLoyaltyCard(mCursor);
     }
 
     public void onBindViewHolder(LoyaltyCardListItemViewHolder inputHolder, Cursor inputCursor) {
         // Invisible until we want to show something more
         inputHolder.mDivider.setVisibility(View.GONE);
 
-        if (mDarkModeEnabled) {
-            inputHolder.mStarIcon.setColorFilter(Color.WHITE, PorterDuff.Mode.SRC_ATOP);
-        }
-
         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()));
+        inputHolder.setStoreField(loyaltyCard.store);
+        if (mShowDetails && !loyaltyCard.note.isEmpty()) {
+            inputHolder.setNoteField(loyaltyCard.note);
         } else {
-            inputHolder.mNoteField.setVisibility(View.GONE);
+            inputHolder.setNoteField(null);
         }
 
-        if (!loyaltyCard.balance.equals(new BigDecimal("0"))) {
-            inputHolder.mDivider.setVisibility(View.VISIBLE);
-            inputHolder.mBalanceField.setVisibility(View.VISIBLE);
-            if (mDarkModeEnabled) {
-                inputHolder.mBalanceField.getCompoundDrawables()[0].setColorFilter(Color.WHITE, PorterDuff.Mode.SRC_ATOP);
-            }
-            inputHolder.mBalanceField.setText(Utils.formatBalance(mContext, loyaltyCard.balance, loyaltyCard.balanceType));
-            inputHolder.mBalanceField.setTextSize(mSettings.getFontSizeMax(mSettings.getSmallFont()));
+        if (mShowDetails && !loyaltyCard.balance.equals(new BigDecimal("0"))) {
+            inputHolder.setBalanceField(loyaltyCard.balance, loyaltyCard.balanceType);
         } else {
-            inputHolder.mBalanceField.setVisibility(View.GONE);
+            inputHolder.setBalanceField(null, null);
         }
 
-        if (loyaltyCard.expiry != null) {
-            inputHolder.mDivider.setVisibility(View.VISIBLE);
-            inputHolder.mExpiryField.setVisibility(View.VISIBLE);
-            Drawable expiryIcon = inputHolder.mExpiryField.getCompoundDrawables()[0];
-            if (Utils.hasExpired(loyaltyCard.expiry)) {
-                expiryIcon.setColorFilter(Color.RED, PorterDuff.Mode.SRC_ATOP);
-                inputHolder.mExpiryField.setTextColor(Color.RED);
-            } else if (mDarkModeEnabled) {
-                expiryIcon.setColorFilter(Color.WHITE, PorterDuff.Mode.SRC_ATOP);
-            }
-            inputHolder.mExpiryField.setText(DateFormat.getDateInstance(DateFormat.LONG).format(loyaltyCard.expiry));
-            inputHolder.mExpiryField.setTextSize(mSettings.getFontSizeMax(mSettings.getSmallFont()));
+        if (mShowDetails && loyaltyCard.expiry != null) {
+            inputHolder.setExpiryField(loyaltyCard.expiry);
         } else {
-            inputHolder.mExpiryField.setVisibility(View.GONE);
+            inputHolder.setExpiryField(null);
         }
 
-        inputHolder.mStarIcon.setVisibility(loyaltyCard.starStatus != 0 ? View.VISIBLE : View.GONE);
-        inputHolder.mCardIcon.setImageBitmap(Utils.generateIcon(mContext, loyaltyCard.store, loyaltyCard.headerColor).getLetterTile());
+        Bitmap cardIcon = Utils.retrieveCardImage(mContext, loyaltyCard.id, ImageLocationType.icon);
+        if (cardIcon != null) {
+            inputHolder.mCardIcon.setImageBitmap(cardIcon);
+            inputHolder.mCardIcon.setScaleType(ImageView.ScaleType.CENTER_CROP);
+        } else {
+            inputHolder.mCardIcon.setImageBitmap(Utils.generateIcon(mContext, loyaltyCard.store, loyaltyCard.headerColor).getLetterTile());
+            inputHolder.mCardIcon.setScaleType(ImageView.ScaleType.FIT_CENTER);
+        }
+        inputHolder.setIconBackgroundColor(loyaltyCard.headerColor != null ? loyaltyCard.headerColor : ContextCompat.getColor(mContext, R.color.colorPrimary));
+
+        inputHolder.toggleStar(loyaltyCard.starStatus != 0, itemSelected(inputCursor.getPosition()));
 
         inputHolder.itemView.setActivated(mSelectedItems.get(inputCursor.getPosition(), false));
         applyIconAnimation(inputHolder, inputCursor.getPosition());
         applyClickEvents(inputHolder, inputCursor.getPosition());
+
+        // Force redraw to fix size not shrinking after data change
+        inputHolder.mRow.requestLayout();
     }
 
-    private void applyClickEvents(LoyaltyCardListItemViewHolder inputHolder, final int inputPosition)
-    {
+    private void applyClickEvents(LoyaltyCardListItemViewHolder inputHolder, final int inputPosition) {
         inputHolder.mRow.setOnClickListener(inputView -> mListener.onRowClicked(inputPosition));
-        inputHolder.mInformationContainer.setOnClickListener(inputView -> mListener.onRowClicked(inputPosition));
 
         inputHolder.mRow.setOnLongClickListener(inputView -> {
             mListener.onRowLongClicked(inputPosition);
             inputView.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS);
             return true;
         });
-
-        inputHolder.mInformationContainer.setOnLongClickListener(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);
+    private boolean itemSelected(int inputPosition) {
+        return mSelectedItems.get(inputPosition, false);
+    }
+
+    private void applyIconAnimation(LoyaltyCardListItemViewHolder inputHolder, int inputPosition) {
+        if (itemSelected(inputPosition)) {
+            inputHolder.mCardIcon.setVisibility(View.GONE);
+            inputHolder.mTickIcon.setVisibility(View.VISIBLE);
+            if (mCurrentSelectedIndex == inputPosition) {
                 resetCurrentIndex();
             }
-        }
-        else
-        {
-            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);
+        } else {
+            inputHolder.mTickIcon.setVisibility(View.GONE);
+            inputHolder.mCardIcon.setVisibility(View.VISIBLE);
+            if ((mReverseAllAnimations && mAnimationItemsIndex.get(inputPosition, false)) || mCurrentSelectedIndex == inputPosition) {
                 resetCurrentIndex();
             }
         }
     }
 
-    private void resetIconYAxis(View inputView)
-    {
-        if (inputView.getRotationY() != 0)
-        {
-            inputView.setRotationY(0);
-        }
-    }
-
-    public void resetAnimationIndex()
-    {
-        mReverseAllAnimations = false;
-        mAnimationItemsIndex.clear();
-    }
-
-
-    public void toggleSelection(int inputPosition)
-    {
+    public void toggleSelection(int inputPosition) {
         mCurrentSelectedIndex = inputPosition;
-        if (mSelectedItems.get(inputPosition, false))
-        {
+        if (mSelectedItems.get(inputPosition, false)) {
             mSelectedItems.delete(inputPosition);
             mAnimationItemsIndex.delete(inputPosition);
-        }
-        else
-        {
+        } else {
             mSelectedItems.put(inputPosition, true);
             mAnimationItemsIndex.put(inputPosition, true);
         }
         notifyDataSetChanged();
     }
 
-    public void clearSelections()
-    {
+    public void clearSelections() {
         mReverseAllAnimations = true;
         mSelectedItems.clear();
         notifyDataSetChanged();
     }
 
-    public int getSelectedItemCount()
-    {
+    public int getSelectedItemCount() {
         return mSelectedItems.size();
     }
 
-    public ArrayList<LoyaltyCard> getSelectedItems()
-    {
+    public ArrayList<LoyaltyCard> getSelectedItems() {
 
         ArrayList<LoyaltyCard> result = new ArrayList<>();
 
         int i;
-        for(i = 0; i < mSelectedItems.size(); i++)
-        {
+        for (i = 0; i < mSelectedItems.size(); i++) {
             mCursor.moveToPosition(mSelectedItems.keyAt(i));
             result.add(LoyaltyCard.toLoyaltyCard(mCursor));
         }
@@ -230,50 +186,146 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
         return result;
     }
 
-    private void resetCurrentIndex()
-    {
+    private void resetCurrentIndex() {
         mCurrentSelectedIndex = -1;
     }
 
-    public interface CardAdapterListener
-    {
+    public interface CardAdapterListener {
         void onRowClicked(int inputPosition);
+
         void onRowLongClicked(int inputPosition);
     }
 
-    public class LoyaltyCardListItemViewHolder extends RecyclerView.ViewHolder implements View.OnLongClickListener
-    {
+    public class LoyaltyCardListItemViewHolder extends RecyclerView.ViewHolder {
 
         public TextView mStoreField, mNoteField, mBalanceField, mExpiryField;
-        public LinearLayout mInformationContainer;
-        public ImageView mCardIcon, mStarIcon;
+        public ImageView mCardIcon, mStarBackground, mStarBorder, mTickIcon;
         public MaterialCardView mRow;
+        public ConstraintLayout mStar;
         public View mDivider;
-        public RelativeLayout mThumbnailFrontContainer, mThumbnailBackContainer;
 
-        public LoyaltyCardListItemViewHolder(View inputView)
-        {
+        private int mIconBackgroundColor;
+
+        protected LoyaltyCardListItemViewHolder(View inputView, CardAdapterListener inputListener) {
             super(inputView);
             mRow = inputView.findViewById(R.id.row);
             mDivider = inputView.findViewById(R.id.info_divider);
-            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);
+            mStar = inputView.findViewById(R.id.star);
+            mStarBackground = inputView.findViewById(R.id.star_background);
+            mStarBorder = inputView.findViewById(R.id.star_border);
+            mTickIcon = inputView.findViewById(R.id.selected_thumbnail);
+            inputView.setOnLongClickListener(view -> {
+                inputListener.onRowClicked(getAdapterPosition());
+                inputView.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS);
+                return true;
+            });
         }
 
-        @Override
-        public boolean onLongClick(View inputView)
-        {
-            mListener.onRowLongClicked(getAdapterPosition());
-            inputView.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS);
-            return true;
+        public void setStoreField(String text) {
+            mStoreField.setText(text);
+            mStoreField.setTextSize(mSettings.getFontSizeMax(mSettings.getMediumFont()));
+            mStoreField.requestLayout();
+        }
+
+        public void setNoteField(String text) {
+            if (text == null) {
+                mNoteField.setVisibility(View.GONE);
+            } else {
+                mNoteField.setVisibility(View.VISIBLE);
+                mNoteField.setText(text);
+                mNoteField.setTextSize(mSettings.getFontSizeMax(mSettings.getSmallFont()));
+            }
+            mNoteField.requestLayout();
+        }
+
+        public void setBalanceField(BigDecimal balance, Currency balanceType) {
+            if (balance == null) {
+                mBalanceField.setVisibility(View.GONE);
+            } else {
+                int size = mSettings.getFontSizeMax(mSettings.getSmallFont());
+                int drawableSize = dpToPx((size * 24) / 14, mContext);
+                mDivider.setVisibility(View.VISIBLE);
+                mBalanceField.setVisibility(View.VISIBLE);
+                Drawable balanceIcon = mBalanceField.getCompoundDrawables()[0];
+                balanceIcon.setBounds(0, 0, drawableSize, drawableSize);
+                mBalanceField.setCompoundDrawablesRelative(balanceIcon, null, null, null);
+                if (mDarkModeEnabled) {
+                    balanceIcon.setColorFilter(BlendModeColorFilterCompat.createBlendModeColorFilterCompat(Color.WHITE, BlendModeCompat.SRC_ATOP));
+                }
+                mBalanceField.setText(Utils.formatBalance(mContext, balance, balanceType));
+                mBalanceField.setTextSize(size);
+            }
+            mBalanceField.requestLayout();
+        }
+
+        public void setExpiryField(Date expiry) {
+            if (expiry == null) {
+                mExpiryField.setVisibility(View.GONE);
+            } else {
+                int size = mSettings.getFontSizeMax(mSettings.getSmallFont());
+                int drawableSize = dpToPx((size * 24) / 14, mContext);
+                mDivider.setVisibility(View.VISIBLE);
+                mExpiryField.setVisibility(View.VISIBLE);
+                Drawable expiryIcon = mExpiryField.getCompoundDrawables()[0];
+                expiryIcon.setBounds(0, 0, drawableSize, drawableSize);
+                mExpiryField.setCompoundDrawablesRelative(expiryIcon, null, null, null);
+                if (Utils.hasExpired(expiry)) {
+                    expiryIcon.setColorFilter(BlendModeColorFilterCompat.createBlendModeColorFilterCompat(Color.RED, BlendModeCompat.SRC_ATOP));
+                    mExpiryField.setTextColor(Color.RED);
+                } else if (mDarkModeEnabled) {
+                    expiryIcon.setColorFilter(BlendModeColorFilterCompat.createBlendModeColorFilterCompat(Color.WHITE, BlendModeCompat.SRC_ATOP));
+                }
+                mExpiryField.setText(DateFormat.getDateInstance(DateFormat.LONG).format(expiry));
+                mExpiryField.setTextSize(size);
+            }
+            mExpiryField.requestLayout();
+        }
+
+        public void toggleStar(boolean enable, boolean colorByTheme) {
+            /* the below code does not work in android 5! hence the change of drawable instead
+            boolean needDarkForeground = Utils.needsDarkForeground(mIconBackgroundColor);
+            Drawable borderDrawable = mStarBorder.getDrawable().mutate();
+            Drawable backgroundDrawable = mStarBackground.getDrawable().mutate();
+            DrawableCompat.setTint(borderDrawable, needsDarkForeground ? Color.BLACK : Color.WHITE);
+            DrawableCompat.setTint(backgroundDrawable, needsDarkForeground ? Color.BLACK : Color.WHITE);
+            mStarBorder.setImageDrawable(borderDrawable);
+            mStarBackground.setImageDrawable(backgroundDrawable);
+            */
+            boolean dark = Utils.needsDarkForeground(mIconBackgroundColor);
+            if (colorByTheme) {
+                dark = !mDarkModeEnabled;
+            }
+            if (dark) {
+                mStarBorder.setImageResource(R.drawable.ic_unstarred_black);
+                mStarBackground.setImageResource(R.drawable.ic_starred_black);
+            } else {
+                mStarBorder.setImageResource(R.drawable.ic_unstarred_white);
+                mStarBackground.setImageResource(R.drawable.ic_starred_white);
+            }
+            if (enable) {
+                mStar.setVisibility(View.VISIBLE);
+            } else {
+                mStar.setVisibility(View.GONE);
+            }
+            mStarBorder.invalidate();
+            mStarBackground.invalidate();
+        }
+
+        public void setIconBackgroundColor(int color) {
+            mIconBackgroundColor = color;
+            mCardIcon.setBackgroundColor(color);
         }
     }
-}
+
+    public int dpToPx(int dp, Context mContext) {
+        Resources r = mContext.getResources();
+        int px = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dp, r.getDisplayMetrics());
+        return px;
+    }
+}

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

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

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

@@ -3,13 +3,14 @@ package protect.card_locker;
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
 import android.content.res.Configuration;
+import android.database.sqlite.SQLiteDatabase;
 import android.graphics.Bitmap;
 import android.graphics.Color;
+import android.graphics.Outline;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.os.Bundle;
 import android.text.TextUtils;
-import android.util.DisplayMetrics;
 import android.util.Log;
 import android.util.TypedValue;
 import android.view.GestureDetector;
@@ -17,6 +18,8 @@ import android.view.Menu;
 import android.view.MenuItem;
 import android.view.MotionEvent;
 import android.view.View;
+import android.view.ViewGroup;
+import android.view.ViewOutlineProvider;
 import android.view.ViewTreeObserver;
 import android.view.Window;
 import android.view.WindowManager;
@@ -30,7 +33,6 @@ import android.widget.Toast;
 import com.google.android.material.appbar.AppBarLayout;
 import com.google.android.material.bottomsheet.BottomSheetBehavior;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
-import com.google.zxing.BarcodeFormat;
 
 import java.io.UnsupportedEncodingException;
 import java.math.BigDecimal;
@@ -45,21 +47,26 @@ import androidx.appcompat.content.res.AppCompatResources;
 import androidx.appcompat.widget.AppCompatTextView;
 import androidx.appcompat.widget.Toolbar;
 import androidx.constraintlayout.widget.Guideline;
+import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import androidx.core.content.ContextCompat;
+import androidx.core.graphics.ColorUtils;
 import androidx.core.graphics.drawable.DrawableCompat;
+import androidx.core.widget.NestedScrollView;
 import androidx.core.widget.TextViewCompat;
+
+import protect.card_locker.async.TaskHandler;
 import protect.card_locker.preferences.Settings;
 
-public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements GestureDetector.OnGestureListener
-{
+public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements GestureDetector.OnGestureListener {
     private static final String TAG = "Catima";
 
     private GestureDetector mGestureDetector;
 
+    CoordinatorLayout coordinatorLayout;
     TextView cardIdFieldView;
     BottomSheetBehavior behavior;
-    View bottomSheet;
-    View bottomSheetContentWrapper;
+    LinearLayout bottomSheet;
+    NestedScrollView bottomSheetContentWrapper;
     ImageView bottomSheetButton;
     TextView noteView;
     TextView groupsView;
@@ -72,10 +79,13 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
     ImageButton minimizeButton;
     View collapsingToolbarLayout;
     AppBarLayout appBarLayout;
+    ImageView iconImage;
+    Toolbar landscapeToolbar;
+
     int loyaltyCardId;
     LoyaltyCard loyaltyCard;
     boolean rotationEnabled;
-    DBHelper db;
+    SQLiteDatabase database;
     ImportURIHelper importURIHelper;
     Settings settings;
 
@@ -99,8 +109,15 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
     private ImageView[] dots;
     boolean isBarcodeSupported = true;
 
+    int bottomSheetState;
+
     static final String STATE_IMAGEINDEX = "imageIndex";
     static final String STATE_FULLSCREEN = "isFullscreen";
+    static final String STATE_BOTTOMSHEET = "bottomSheetState";
+
+    private final int HEADER_FILTER_ALPHA = 127;
+
+    final private TaskHandler mTasks = new TaskHandler();
 
     @Override
     public boolean onDown(MotionEvent e) {
@@ -182,47 +199,57 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
         IMAGE_BACK
     }
 
-    private void extractIntentFields(Intent intent)
-    {
+    private void extractIntentFields(Intent intent) {
         final Bundle b = intent.getExtras();
         loyaltyCardId = b != null ? b.getInt("id") : 0;
         Log.d(TAG, "View activity: id=" + loyaltyCardId);
     }
 
-    private Drawable getDotIcon(boolean active) {
+    private Drawable getDotIcon(boolean active, boolean darkMode) {
         Drawable unwrappedIcon = AppCompatResources.getDrawable(this, active ? R.drawable.active_dot : R.drawable.inactive_dot);
         assert unwrappedIcon != null;
         Drawable wrappedIcon = DrawableCompat.wrap(unwrappedIcon);
-        DrawableCompat.setTint(wrappedIcon, ContextCompat.getColor(getApplicationContext(), R.color.iconColor));
+        if (darkMode) {
+            DrawableCompat.setTint(wrappedIcon, Color.WHITE);
+        } else {
+            DrawableCompat.setTint(wrappedIcon, Color.BLACK);
+        }
 
         return wrappedIcon;
     }
 
-    private Drawable getIcon(int icon, boolean dark)
-    {
+    private Drawable getIcon(int icon, boolean dark) {
         Drawable unwrappedIcon = AppCompatResources.getDrawable(this, icon);
         assert unwrappedIcon != null;
         Drawable wrappedIcon = DrawableCompat.wrap(unwrappedIcon);
-        if(dark)
-        {
+        if (dark) {
             DrawableCompat.setTint(wrappedIcon, Color.BLACK);
-        }
-        else
-        {
+        } else {
             DrawableCompat.setTintList(wrappedIcon, null);
         }
 
         return wrappedIcon;
     }
 
+    private void setCenterGuideline(int zoomLevel) {
+        float scale = zoomLevel / 100f;
+
+        if (format != null && format.isSquare()) {
+            centerGuideline.setGuidelinePercent(0.75f * scale);
+        } else {
+            centerGuideline.setGuidelinePercent(0.5f * scale);
+        }
+
+    }
+
     @Override
-    protected void onCreate(Bundle savedInstanceState)
-    {
+    protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
         if (savedInstanceState != null) {
             mainImageIndex = savedInstanceState.getInt(STATE_IMAGEINDEX);
             isFullscreen = savedInstanceState.getBoolean(STATE_FULLSCREEN);
+            bottomSheetState = savedInstanceState.getInt(STATE_BOTTOMSHEET);
         }
 
         settings = new Settings(this);
@@ -231,9 +258,10 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
 
         setContentView(R.layout.loyalty_card_view_layout);
 
-        db = new DBHelper(this);
+        database = new DBHelper(this).getWritableDatabase();
         importURIHelper = new ImportURIHelper(this);
 
+        coordinatorLayout = findViewById(R.id.coordinator_layout);
         cardIdFieldView = findViewById(R.id.cardIdView);
         bottomSheet = findViewById(R.id.bottom_sheet);
         bottomSheetContentWrapper = findViewById(R.id.bottomSheetContentWrapper);
@@ -249,26 +277,32 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
         minimizeButton = findViewById(R.id.minimizeButton);
         collapsingToolbarLayout = findViewById(R.id.collapsingToolbarLayout);
         appBarLayout = findViewById(R.id.app_bar_layout);
+        iconImage = findViewById(R.id.icon_image);
+        landscapeToolbar = findViewById(R.id.toolbar_landscape);
 
         centerGuideline = findViewById(R.id.centerGuideline);
-        centerGuideline.setGuidelinePercent(0.5f);
         barcodeScaler = findViewById(R.id.barcodeScaler);
-        barcodeScaler.setProgress(100);
         maximizeButton.setBackgroundColor(getThemeColor());
         minimizeButton.setBackgroundColor(getThemeColor());
         bottomSheetButton.setBackgroundColor(getThemeColor());
         barcodeScaler.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
             @Override
             public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
+                if (!fromUser) {
+                    Log.d(TAG, "non user triggered onProgressChanged, ignoring, progress is " + progress);
+                    return;
+                }
                 Log.d(TAG, "Progress is " + progress);
                 Log.d(TAG, "Max is " + barcodeScaler.getMax());
                 float scale = (float) progress / (float) barcodeScaler.getMax();
                 Log.d(TAG, "Scaling to " + scale);
 
-                if (imageTypes.get(mainImageIndex) == ImageType.BARCODE) {
-                    redrawBarcodeAfterResize();
-                }
-                centerGuideline.setGuidelinePercent(0.5f * scale);
+                loyaltyCard.zoomLevel = progress;
+                DBHelper.updateLoyaltyCardZoomLevel(database, loyaltyCardId, loyaltyCard.zoomLevel);
+
+                setCenterGuideline(loyaltyCard.zoomLevel);
+
+                drawMainImage(mainImageIndex, true);
             }
 
             @Override
@@ -304,24 +338,12 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
         behavior.addBottomSheetCallback(new BottomSheetBehavior.BottomSheetCallback() {
             @Override
             public void onStateChanged(@NonNull View bottomSheet, int newState) {
-                if (newState == BottomSheetBehavior.STATE_DRAGGING) {
-                    editButton.hide();
-                } else if (newState == BottomSheetBehavior.STATE_EXPANDED) {
-                    bottomSheetButton.setImageResource(R.drawable.ic_baseline_arrow_drop_down_24);
-                    editButton.hide();
-                } else if (newState == BottomSheetBehavior.STATE_COLLAPSED) {
-                    bottomSheetButton.setImageResource(R.drawable.ic_baseline_arrow_drop_up_24);
-                    if (!isFullscreen) {
-                        editButton.show();
-                    }
-
-                    // Scroll bottomsheet content back to top
-                    bottomSheetContentWrapper.setScrollY(0);
-                }
+                changeUiToBottomSheetState(newState);
             }
 
             @Override
-            public void onSlide(@NonNull View bottomSheet, float slideOffset) { }
+            public void onSlide(@NonNull View bottomSheet, float slideOffset) {
+            }
         });
 
         bottomSheetButton.setOnClickListener(v -> {
@@ -332,22 +354,18 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
             }
         });
 
-        // Fix bottom sheet content sizing
-        ViewTreeObserver viewTreeObserver = bottomSheet.getViewTreeObserver();
-        viewTreeObserver.addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
+        appBarLayout.addOnLayoutChangeListener(new View.OnLayoutChangeListener() {
             @Override
-            public void onGlobalLayout() {
-                bottomSheet.getViewTreeObserver().removeOnGlobalLayoutListener(this);
-                DisplayMetrics displayMetrics = getResources().getDisplayMetrics();
-                int height = displayMetrics.heightPixels;
-                int maxHeight = height - appBarLayout.getHeight() - bottomSheetButton.getHeight();
-                Log.d(TAG, "Button sheet should be " + maxHeight + " pixels high");
-                bottomSheetContentWrapper.setLayoutParams(
-                        new LinearLayout.LayoutParams(
-                                LinearLayout.LayoutParams.MATCH_PARENT,
-                                maxHeight
-                        )
-                );
+            public void onLayoutChange(View v, int left, int top, int right, int bottom, int oldLeft, int oldTop, int oldRight, int oldBottom) {
+                adjustLayoutHeights();
+            }
+        });
+
+        appBarLayout.setOutlineProvider(new ViewOutlineProvider() {
+            @Override
+            public void getOutline(View view, Outline outline) {
+                ViewOutlineProvider.BACKGROUND.getOutline(view, outline);
+                outline.setAlpha(0f);
             }
         });
 
@@ -356,9 +374,55 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
         mainImage.setOnTouchListener(gestureTouchListener);
     }
 
+    private void changeUiToBottomSheetState(int newState) {
+        if (newState == BottomSheetBehavior.STATE_DRAGGING) {
+            editButton.hide();
+        } else if (newState == BottomSheetBehavior.STATE_EXPANDED) {
+            bottomSheetButton.setImageResource(R.drawable.ic_baseline_arrow_drop_down_24);
+            editButton.hide();
+        } else if (newState == BottomSheetBehavior.STATE_COLLAPSED) {
+            bottomSheetButton.setImageResource(R.drawable.ic_baseline_arrow_drop_up_24);
+            if (!isFullscreen) {
+                editButton.show();
+            }
+
+            // Scroll bottomsheet content back to top
+            bottomSheetContentWrapper.setScrollY(0);
+        }
+        bottomSheetState = newState;
+    }
+
+    private void adjustLayoutHeights() {
+        // use getLayoutParams instead of getHeight when heights are pre-determined in xml! getHeight could return 0 if a View is not inflated
+        if (iconImage.getLayoutParams().height != appBarLayout.getHeight()) {
+            Log.d("adjustLayoutHeights", "setting imageIcon height from: " + iconImage.getLayoutParams().height + " to: " + appBarLayout.getHeight());
+            iconImage.setLayoutParams(new CoordinatorLayout.LayoutParams(
+                    CoordinatorLayout.LayoutParams.MATCH_PARENT, appBarLayout.getHeight())
+            );
+        }
+        int bottomSheetHeight = getResources().getDisplayMetrics().heightPixels - appBarLayout.getHeight() - bottomSheetButton.getLayoutParams().height;
+        ViewGroup.LayoutParams params = bottomSheetContentWrapper.getLayoutParams();
+        if (params.height != bottomSheetHeight || params.width != LinearLayout.LayoutParams.MATCH_PARENT) {
+            // XXX android 5 - 9 has so much quirks with setting bottomSheetContent height
+            // just invalidate the wrapper works on 10 onward
+            // bottomSheetContentWrapper.invalidate();
+            // The below worked on android 5 but not 6, reloading the card then it breaks again on 6, entirely random :(
+            // for (int i = 0; i < bottomSheetContentWrapper.getChildCount(); i++) {
+            //     bottomSheetContentWrapper.getChildAt(i).invalidate();
+            // }
+            // since it's basically allergic to getting enlarged then shrunk again, and setting it at all when fullscreen makes no sense
+            if (!isFullscreen) {
+                Log.d("adjustLayoutHeights", "setting bottomSheet height from: " + params.height + " to: " + bottomSheetHeight);
+                bottomSheetContentWrapper.setLayoutParams(
+                        new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, bottomSheetHeight)
+                );
+            }
+        }
+    }
+
+
     @Override
-    public void onNewIntent(Intent intent)
-    {
+    public void onNewIntent(Intent intent) {
         super.onNewIntent(intent);
 
         Log.i(TAG, "Received new intent");
@@ -369,13 +433,13 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
     public void onSaveInstanceState(Bundle savedInstanceState) {
         savedInstanceState.putInt(STATE_IMAGEINDEX, mainImageIndex);
         savedInstanceState.putBoolean(STATE_FULLSCREEN, isFullscreen);
+        savedInstanceState.putInt(STATE_BOTTOMSHEET, bottomSheetState);
         super.onSaveInstanceState(savedInstanceState);
     }
 
 
     @Override
-    public void onResume()
-    {
+    public void onResume() {
         super.onResume();
 
         Log.i(TAG, "To view card: " + loyaltyCardId);
@@ -384,12 +448,10 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
         // '1' is the brightest. We attempt to maximize the brightness
         // to help barcode readers scan the barcode.
         Window window = getWindow();
-        if(window != null)
-        {
+        if (window != null) {
             WindowManager.LayoutParams attributes = window.getAttributes();
 
-            if (settings.useMaxBrightnessDisplayingBarcode())
-            {
+            if (settings.useMaxBrightnessDisplayingBarcode()) {
                 attributes.screenBrightness = 1F;
             }
 
@@ -398,16 +460,15 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
             }
 
             if (settings.getDisableLockscreenWhileViewingCard()) {
-                window.addFlags(WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD|
+                window.addFlags(WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD |
                         WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED);
             }
 
             window.setAttributes(attributes);
         }
 
-        loyaltyCard = db.getLoyaltyCard(loyaltyCardId);
-        if(loyaltyCard == null)
-        {
+        loyaltyCard = DBHelper.getLoyaltyCard(database, loyaltyCardId);
+        if (loyaltyCard == null) {
             Log.w(TAG, "Could not lookup loyalty card " + loyaltyCardId);
             Toast.makeText(this, R.string.noCardExistsError, Toast.LENGTH_LONG).show();
             finish();
@@ -425,20 +486,17 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
                 settings.getFontSizeMin(settings.getLargeFont()), settings.getFontSizeMax(settings.getLargeFont()),
                 1, TypedValue.COMPLEX_UNIT_SP);
 
-        if(loyaltyCard.note.length() > 0)
-        {
+        if (loyaltyCard.note.length() > 0) {
             noteView.setVisibility(View.VISIBLE);
             noteView.setText(loyaltyCard.note);
             noteView.setTextSize(settings.getFontSizeMax(settings.getMediumFont()));
-        }
-        else
-        {
+        } else {
             noteView.setVisibility(View.GONE);
         }
 
-        List<Group> loyaltyCardGroups = db.getLoyaltyCardGroups(loyaltyCardId);
+        List<Group> loyaltyCardGroups = DBHelper.getLoyaltyCardGroups(database, loyaltyCardId);
 
-        if(loyaltyCardGroups.size() > 0) {
+        if (loyaltyCardGroups.size() > 0) {
             List<String> groupNames = new ArrayList<>();
             for (Group group : loyaltyCardGroups) {
                 groupNames.add(group._id);
@@ -447,35 +505,29 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
             groupsView.setVisibility(View.VISIBLE);
             groupsView.setText(getString(R.string.groupsList, TextUtils.join(", ", groupNames)));
             groupsView.setTextSize(settings.getFontSizeMax(settings.getMediumFont()));
-        }
-        else
-        {
+        } else {
             groupsView.setVisibility(View.GONE);
         }
 
-        if(!loyaltyCard.balance.equals(new BigDecimal(0))) {
+        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
-        {
+        } else {
             balanceView.setVisibility(View.GONE);
         }
 
-        if(loyaltyCard.expiry != null) {
+        if (loyaltyCard.expiry != null) {
             expiryView.setVisibility(View.VISIBLE);
 
             int expiryString = R.string.expiryStateSentence;
-            if(Utils.hasExpired(loyaltyCard.expiry)) {
+            if (Utils.hasExpired(loyaltyCard.expiry)) {
                 expiryString = R.string.expiryStateSentenceExpired;
                 expiryView.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.alert));
             }
             expiryView.setText(getString(expiryString, DateFormat.getDateInstance(DateFormat.LONG).format(loyaltyCard.expiry)));
             expiryView.setTextSize(settings.getFontSizeMax(settings.getMediumFont()));
-        }
-        else
-        {
+        } else {
             expiryView.setVisibility(View.GONE);
         }
         expiryView.setTag(loyaltyCard.expiry);
@@ -494,44 +546,50 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
                 TypedValue.COMPLEX_UNIT_DIP);
 
         int backgroundHeaderColor;
-        if(loyaltyCard.headerColor != null)
-        {
+        if (loyaltyCard.headerColor != null) {
             backgroundHeaderColor = loyaltyCard.headerColor;
-        }
-        else
-        {
+        } else {
             backgroundHeaderColor = LetterBitmap.getDefaultColor(this, loyaltyCard.store);
         }
 
-        collapsingToolbarLayout.setBackgroundColor(backgroundHeaderColor);
-        appBarLayout.setBackgroundColor(backgroundHeaderColor);
-
         int textColor;
-        if(Utils.needsDarkForeground(backgroundHeaderColor))
-        {
+        if (Utils.needsDarkForeground(backgroundHeaderColor)) {
             textColor = Color.BLACK;
-        }
-        else
-        {
+        } else {
             textColor = Color.WHITE;
         }
         storeName.setTextColor(textColor);
-        ((Toolbar) findViewById(R.id.toolbar_landscape)).setTitleTextColor(textColor);
+        landscapeToolbar.setTitleTextColor(textColor);
+
+        Bitmap icon = Utils.retrieveCardImage(this, loyaltyCard.id, ImageLocationType.icon);
+        if (icon != null) {
+            int backgroundAlphaColor = Utils.needsDarkForeground(backgroundHeaderColor) ? Color.WHITE : Color.BLACK;
+            Log.d("onResume", "setting icon image");
+            iconImage.setImageBitmap(icon);
+            int backgroundWithAlpha = Color.argb(HEADER_FILTER_ALPHA, Color.red(backgroundAlphaColor), Color.green(backgroundAlphaColor), Color.blue(backgroundAlphaColor));
+            // for images that has alpha
+            appBarLayout.setBackgroundColor(backgroundWithAlpha);
+        } else {
+            Bitmap plain = Bitmap.createBitmap(new int[]{backgroundHeaderColor}, 1, 1, Bitmap.Config.ARGB_8888);
+            iconImage.setImageBitmap(plain);
+            appBarLayout.setBackgroundColor(Color.TRANSPARENT);
+        }
 
         // If the background is very bright, we should use dark icons
         backgroundNeedsDarkIcons = Utils.needsDarkForeground(backgroundHeaderColor);
         ActionBar actionBar = getSupportActionBar();
-        if(actionBar != null)
-        {
+        if (actionBar != null) {
             actionBar.setHomeAsUpIndicator(getIcon(R.drawable.ic_arrow_back_white, backgroundNeedsDarkIcons));
         }
 
         // Make notification area light if dark icons are needed
-        if(Build.VERSION.SDK_INT >= 23)
-        {
+        if (Build.VERSION.SDK_INT >= 23) {
             window.getDecorView().setSystemUiVisibility(backgroundNeedsDarkIcons ? View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR : 0);
+            window.setStatusBarColor(Color.TRANSPARENT);
+        } else {
+            // Darken statusbar if icons won't be visible otherwise
+            window.setStatusBarColor(backgroundNeedsDarkIcons ? ColorUtils.blendARGB(backgroundHeaderColor, Color.BLACK, 0.15f) : Color.TRANSPARENT);
         }
-        window.setStatusBarColor(Color.TRANSPARENT);
 
         // Set shadow colour of store text so even same color on same color would be readable
         storeName.setShadowLayer(1, 1, 1, backgroundNeedsDarkIcons ? Color.BLACK : Color.WHITE);
@@ -550,13 +608,12 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
             imageTypes.add(ImageType.BARCODE);
         }
 
-        frontImageBitmap = Utils.retrieveCardImage(this, loyaltyCard.id, true);
-        backImageBitmap = Utils.retrieveCardImage(this, loyaltyCard.id, false);
-
+        frontImageBitmap = Utils.retrieveCardImage(this, loyaltyCard.id, ImageLocationType.front);
         if (frontImageBitmap != null) {
             imageTypes.add(ImageType.IMAGE_FRONT);
         }
 
+        backImageBitmap = Utils.retrieveCardImage(this, loyaltyCard.id, ImageLocationType.back);
         if (backImageBitmap != null) {
             imageTypes.add(ImageType.IMAGE_BACK);
         }
@@ -564,10 +621,11 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
         dotIndicator.removeAllViews();
         if (imageTypes.size() >= 2) {
             dots = new ImageView[imageTypes.size()];
+            boolean darkMode = Utils.isDarkModeEnabled(getApplicationContext());
 
             for (int i = 0; i < imageTypes.size(); i++) {
                 dots[i] = new ImageView(this);
-                dots[i].setImageDrawable(getDotIcon(false));
+                dots[i].setImageDrawable(getDotIcon(false, darkMode));
 
                 LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT);
                 params.setMargins(8, 0, 8, 0);
@@ -580,13 +638,15 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
 
         setFullscreen(isFullscreen);
 
-        db.updateLoyaltyCardLastUsed(loyaltyCard.id);
+        // restore bottomSheet UI states from changing orientation
+        changeUiToBottomSheetState(bottomSheetState);
+
+        DBHelper.updateLoyaltyCardLastUsed(database, loyaltyCard.id);
     }
 
     @Override
     public void onBackPressed() {
-        if (isFullscreen)
-        {
+        if (isFullscreen) {
             setFullscreen(false);
             return;
         }
@@ -595,20 +655,18 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
     }
 
     @Override
-    public boolean onCreateOptionsMenu(Menu menu)
-    {
+    public boolean onCreateOptionsMenu(Menu menu) {
         getMenuInflater().inflate(R.menu.card_view_menu, menu);
 
         // Always calculate lockscreen icon, it may need a black color
         boolean lockBarcodeScreenOrientation = settings.getLockBarcodeScreenOrientation();
         MenuItem item = menu.findItem(R.id.action_lock_unlock);
         setOrientatonLock(item, lockBarcodeScreenOrientation);
-        if(lockBarcodeScreenOrientation)
-        {
+        if (lockBarcodeScreenOrientation) {
             item.setVisible(false);
         }
 
-        loyaltyCard = db.getLoyaltyCard(loyaltyCardId);
+        loyaltyCard = DBHelper.getLoyaltyCard(database, loyaltyCardId);
         starred = loyaltyCard.starStatus != 0;
 
         menu.findItem(R.id.action_share).setIcon(getIcon(R.drawable.ic_share_white, backgroundNeedsDarkIcons));
@@ -623,8 +681,7 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
         if (starred) {
             menu.findItem(R.id.action_star_unstar).setIcon(getIcon(R.drawable.ic_starred_white, backgroundNeedsDarkIcons));
             menu.findItem(R.id.action_star_unstar).setTitle(R.string.unstar);
-        }
-        else {
+        } else {
             menu.findItem(R.id.action_star_unstar).setIcon(getIcon(R.drawable.ic_unstarred_white, backgroundNeedsDarkIcons));
             menu.findItem(R.id.action_star_unstar).setTitle(R.string.star);
         }
@@ -632,12 +689,10 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
     }
 
     @Override
-    public boolean onOptionsItemSelected(MenuItem item)
-    {
+    public boolean onOptionsItemSelected(MenuItem item) {
         int id = item.getItemId();
 
-        switch(id)
-        {
+        switch (id) {
             case android.R.id.home:
                 finish();
                 break;
@@ -652,12 +707,9 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
                 return true;
 
             case R.id.action_lock_unlock:
-                if(rotationEnabled)
-                {
+                if (rotationEnabled) {
                     setOrientatonLock(item, true);
-                }
-                else
-                {
+                } else {
                     setOrientatonLock(item, false);
                 }
                 rotationEnabled = !rotationEnabled;
@@ -665,7 +717,7 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
 
             case R.id.action_star_unstar:
                 starred = !starred;
-                db.updateLoyaltyCardStarStatus(loyaltyCardId, starred ? 1 : 0);
+                DBHelper.updateLoyaltyCardStarStatus(database, loyaltyCardId, starred ? 1 : 0);
                 invalidateOptionsMenu();
                 return true;
         }
@@ -673,10 +725,8 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
         return super.onOptionsItemSelected(item);
     }
 
-    private void setupOrientation()
-    {
+    private void setupOrientation() {
         Toolbar portraitToolbar = findViewById(R.id.toolbar);
-        Toolbar landscapeToolbar = findViewById(R.id.toolbar_landscape);
 
         int orientation = getResources().getConfiguration().orientation;
         if (orientation == Configuration.ORIENTATION_LANDSCAPE) {
@@ -702,51 +752,44 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
         }
 
         ActionBar actionBar = getSupportActionBar();
-        if(actionBar != null)
-        {
+        if (actionBar != null) {
             actionBar.setDisplayHomeAsUpEnabled(true);
         }
     }
 
-    private void setOrientatonLock(MenuItem item, boolean lock)
-    {
-        if(lock)
-        {
+    private void setOrientatonLock(MenuItem item, boolean lock) {
+        if (lock) {
 
             item.setIcon(getIcon(R.drawable.ic_lock_outline_white_24dp, backgroundNeedsDarkIcons));
             item.setTitle(R.string.unlockScreen);
             setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_NOSENSOR);
-        }
-        else
-        {
+        } else {
             item.setIcon(getIcon(R.drawable.ic_lock_open_white_24dp, backgroundNeedsDarkIcons));
             item.setTitle(R.string.lockScreen);
             setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED);
         }
     }
 
-    private void makeBottomSheetVisibleIfUseful()
-    {
+    private void makeBottomSheetVisibleIfUseful() {
         if (noteView.getVisibility() == View.VISIBLE || groupsView.getVisibility() == View.VISIBLE || balanceView.getVisibility() == View.VISIBLE || expiryView.getVisibility() == View.VISIBLE) {
             bottomSheet.setVisibility(View.VISIBLE);
-        }
-        else
-        {
+        } else {
             bottomSheet.setVisibility(View.GONE);
         }
     }
 
     private void drawBarcode() {
+        mTasks.flushTaskList(TaskHandler.TYPE.BARCODE, true, false, false);
         if (format != null) {
-            new BarcodeImageWriterTask(
+            BarcodeImageWriterTask barcodeWriter = new BarcodeImageWriterTask(
                     getApplicationContext(),
                     mainImage,
                     barcodeIdString != null ? barcodeIdString : cardIdString,
                     format,
                     null,
                     false,
-                    null)
-                    .execute();
+                    null);
+            mTasks.executeTask(TaskHandler.TYPE.BARCODE, barcodeWriter);
         }
     }
 
@@ -762,7 +805,7 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
                             drawBarcode();
                         }
                     });
-        };
+        }
     }
 
     private void drawMainImage(int index, boolean waitForResize) {
@@ -772,8 +815,9 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
         }
 
         if (dots != null) {
+            boolean darkMode = Utils.isDarkModeEnabled(getApplicationContext());
             for (int i = 0; i < dots.length; i++) {
-                dots[i].setImageDrawable(getDotIcon(i == index));
+                dots[i].setImageDrawable(getDotIcon(i == index, darkMode));
             }
         }
 
@@ -817,11 +861,12 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
 
     /**
      * When enabled, hides the status bar and moves the barcode to the top of the screen.
-     *
+     * <p>
      * The purpose of this function is to make sure the barcode can be scanned from the phone
      * by machines which offer no space to insert the complete device.
      */
     private void setFullscreen(boolean enabled) {
+        isFullscreen = enabled;
         ActionBar actionBar = getSupportActionBar();
 
         if (enabled && !imageTypes.isEmpty()) {
@@ -829,14 +874,16 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
 
             drawMainImage(mainImageIndex, true);
 
+            barcodeScaler.setProgress(loyaltyCard.zoomLevel);
+            setCenterGuideline(loyaltyCard.zoomLevel);
+
             // Hide maximize and show minimize button and scaler
             maximizeButton.setVisibility(View.GONE);
             minimizeButton.setVisibility(View.VISIBLE);
             barcodeScaler.setVisibility(View.VISIBLE);
 
             // Hide actionbar
-            if(actionBar != null)
-            {
+            if (actionBar != null) {
                 actionBar.hide();
             }
 
@@ -847,7 +894,7 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
             // Don't ask me why...
             appBarLayout.setVisibility(View.INVISIBLE);
             collapsingToolbarLayout.setVisibility(View.GONE);
-            findViewById(R.id.toolbar_landscape).setVisibility(View.GONE);
+            landscapeToolbar.setVisibility(View.GONE);
 
             // Hide other UI elements
             cardIdFieldView.setVisibility(View.GONE);
@@ -855,19 +902,20 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
             behavior.setState(BottomSheetBehavior.STATE_COLLAPSED);
             editButton.hide();
 
+            // android 5-9, avoid padding growing on top of bottomSheet
+            coordinatorLayout.removeView(bottomSheet);
+
             // Set Android to fullscreen mode
             getWindow().getDecorView().setSystemUiVisibility(
                     getWindow().getDecorView().getSystemUiVisibility()
                             | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY
                             | View.SYSTEM_UI_FLAG_FULLSCREEN
             );
-        }
-        else
-        {
+        } else {
             Log.d(TAG, "Move out of fullscreen");
 
             // Reset center guideline
-            barcodeScaler.setProgress(100);
+            setCenterGuideline(100);
 
             drawMainImage(mainImageIndex, true);
 
@@ -878,16 +926,13 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
             barcodeScaler.setVisibility(View.GONE);
 
             // Show actionbar
-            if(actionBar != null)
-            {
+            if (actionBar != null) {
                 actionBar.show();
             }
 
             // Show appropriate toolbar
             // And restore 24dp paddingTop for appBarLayout
             appBarLayout.setVisibility(View.VISIBLE);
-            DisplayMetrics metrics = new DisplayMetrics();
-            getWindowManager().getDefaultDisplay().getMetrics(metrics);
             setupOrientation();
 
             // Show other UI elements
@@ -901,8 +946,13 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
                             & ~View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY
                             & ~View.SYSTEM_UI_FLAG_FULLSCREEN
             );
+
+            // android 5-9, avoid padding growing on top of bottomSheet
+            if (bottomSheet.getParent() != coordinatorLayout) {
+                coordinatorLayout.addView(bottomSheet);
+            }
         }
 
-        isFullscreen = enabled;
+        Log.d("setFullScreen", "Is full screen enabled? " + enabled + " Zoom Level = " + barcodeScaler.getProgress());
     }
 }

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

@@ -1,14 +1,14 @@
 package protect.card_locker;
 
+import android.app.Activity;
 import android.app.SearchManager;
 import android.content.ClipData;
 import android.content.ClipboardManager;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
-import android.content.res.Configuration;
-import android.database.Cursor;
-import android.net.Uri;
+import android.database.CursorIndexOutOfBoundsException;
+import android.database.sqlite.SQLiteDatabase;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.GestureDetector;
@@ -19,6 +19,15 @@ import android.view.View;
 import android.widget.CheckBox;
 import android.widget.Toast;
 
+import androidx.activity.result.ActivityResultLauncher;
+import androidx.activity.result.contract.ActivityResultContracts;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.view.ActionMode;
+import androidx.appcompat.widget.SearchView;
+import androidx.appcompat.widget.Toolbar;
+import androidx.core.splashscreen.SplashScreen;
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.google.android.material.tabs.TabLayout;
 
@@ -27,23 +36,16 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import androidx.appcompat.app.AlertDialog;
-import androidx.appcompat.view.ActionMode;
-import androidx.appcompat.widget.SearchView;
-import androidx.appcompat.widget.Toolbar;
-import androidx.core.app.ActivityCompat;
-import androidx.core.splashscreen.SplashScreen;
-import androidx.recyclerview.widget.RecyclerView;
 import protect.card_locker.preferences.SettingsActivity;
 
-public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCardCursorAdapter.CardAdapterListener, GestureDetector.OnGestureListener
-{
+public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCardCursorAdapter.CardAdapterListener, GestureDetector.OnGestureListener {
     private static final String TAG = "Catima";
+    public static final String RESTART_ACTIVITY_INTENT = "restart_activity_intent";
 
-    private final DBHelper mDB = new DBHelper(this);
+    private SQLiteDatabase mDatabase;
     private LoyaltyCardCursorAdapter mAdapter;
     private ActionMode mCurrentActionMode;
-    private Menu mMenu;
+    private SearchView mSearchView;
     private GestureDetector mGestureDetector;
     protected String mFilter = "";
     protected Object mGroup = null;
@@ -55,8 +57,10 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
     private View mNoMatchingCardsText;
     private View mNoGroupCardsText;
 
-    private ActionMode.Callback mCurrentActionModeCallback = new ActionMode.Callback()
-    {
+    private ActivityResultLauncher<Intent> mBarcodeScannerLauncher;
+    private ActivityResultLauncher<Intent> mSettingsLauncher;
+
+    private ActionMode.Callback mCurrentActionModeCallback = new ActionMode.Callback() {
         @Override
         public boolean onCreateActionMode(ActionMode inputMode, Menu inputMenu) {
             inputMode.getMenuInflater().inflate(R.menu.card_longclick_menu, inputMenu);
@@ -64,8 +68,7 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
         }
 
         @Override
-        public boolean onPrepareActionMode(ActionMode inputMode, Menu inputMenu)
-        {
+        public boolean onPrepareActionMode(ActionMode inputMode, Menu inputMenu) {
             return false;
         }
 
@@ -109,7 +112,7 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
                 }
                 inputMode.finish();
                 return true;
-            } else if(inputItem.getItemId() == R.id.action_edit) {
+            } else if (inputItem.getItemId() == R.id.action_edit) {
                 if (mAdapter.getSelectedItemCount() != 1) {
                     throw new IllegalArgumentException("Cannot edit more than 1 card at a time");
                 }
@@ -122,7 +125,7 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
                 startActivity(intent);
                 inputMode.finish();
                 return true;
-            } else if(inputItem.getItemId() == R.id.action_delete) {
+            } else if (inputItem.getItemId() == R.id.action_delete) {
                 AlertDialog.Builder builder = new AlertDialog.Builder(MainActivity.this);
                 // The following may seem weird, but it is necessary to give translators enough flexibility.
                 // For example, in Russian, Android's plural quantity "one" actually refers to "any number ending on 1 but not ending in 11".
@@ -142,7 +145,7 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
                     for (LoyaltyCard loyaltyCard : mAdapter.getSelectedItems()) {
                         Log.e(TAG, "Deleting card: " + loyaltyCard.id);
 
-                        db.deleteLoyaltyCard(loyaltyCard.id);
+                        DBHelper.deleteLoyaltyCard(mDatabase, MainActivity.this, loyaltyCard.id);
 
                         ShortcutHelper.removeShortcut(MainActivity.this, loyaltyCard.id);
                     }
@@ -165,24 +168,14 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
         }
 
         @Override
-        public void onDestroyActionMode(ActionMode inputMode)
-        {
+        public void onDestroyActionMode(ActionMode inputMode) {
             mAdapter.clearSelections();
             mCurrentActionMode = null;
-            mCardList.post(new Runnable()
-            {
-                @Override
-                public void run()
-                {
-                    mAdapter.resetAnimationIndex();
-                }
-            });
         }
     };
 
     @Override
-    protected void onCreate(Bundle inputSavedInstanceState)
-    {
+    protected void onCreate(Bundle inputSavedInstanceState) {
         super.onCreate(inputSavedInstanceState);
         SplashScreen.installSplashScreen(this);
         setTitle(R.string.app_name);
@@ -190,14 +183,16 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
         Toolbar toolbar = findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
 
+        mDatabase = new DBHelper(this).getWritableDatabase();
+
         TabLayout groupsTabLayout = findViewById(R.id.groups);
         groupsTabLayout.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
             @Override
             public void onTabSelected(TabLayout.Tab tab) {
                 selectedTab = tab.getPosition();
+                Log.d("onTabSelected", "Tab Position " + tab.getPosition());
                 mGroup = tab.getTag();
                 updateLoyaltyCardList();
-
                 // Store active tab in Shared Preference to restore next app launch
                 SharedPreferences activeTabPref = getApplicationContext().getSharedPreferences(
                         getString(R.string.sharedpreference_active_tab),
@@ -230,6 +225,7 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
         mHelpText.setOnTouchListener(gestureTouchListener);
         mNoMatchingCardsText.setOnTouchListener(gestureTouchListener);
         mCardList.setOnTouchListener(gestureTouchListener);
+        mNoGroupCardsText.setOnTouchListener(gestureTouchListener);
 
         mAdapter = new LoyaltyCardCursorAdapter(this, null, this);
         mCardList.setAdapter(mAdapter);
@@ -268,27 +264,46 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
                     .show();
         }
          */
+
+        mBarcodeScannerLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), result -> {
+            Intent intent = result.getData();
+            BarcodeValues barcodeValues = Utils.parseSetBarcodeActivityResult(Utils.BARCODE_SCAN, result.getResultCode(), intent, this);
+
+            if (!barcodeValues.isEmpty()) {
+                Intent newIntent = new Intent(getApplicationContext(), LoyaltyCardEditActivity.class);
+                Bundle newBundle = new Bundle();
+                newBundle.putString(LoyaltyCardEditActivity.BUNDLE_BARCODETYPE, barcodeValues.format());
+                newBundle.putString(LoyaltyCardEditActivity.BUNDLE_CARDID, barcodeValues.content());
+                Bundle inputBundle = intent.getExtras();
+                if (inputBundle != null && inputBundle.getString(LoyaltyCardEditActivity.BUNDLE_ADDGROUP) != null) {
+                    newBundle.putString(LoyaltyCardEditActivity.BUNDLE_ADDGROUP, inputBundle.getString(LoyaltyCardEditActivity.BUNDLE_ADDGROUP));
+                }
+                newIntent.putExtras(newBundle);
+                startActivity(newIntent);
+            }
+        });
+
+        mSettingsLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), result -> {
+            if (result.getResultCode() == Activity.RESULT_OK) {
+                Intent intent = result.getData();
+                if (intent != null && intent.getBooleanExtra(RESTART_ACTIVITY_INTENT, false)) {
+                    recreate();
+                }
+            }
+        });
     }
 
     @Override
-    protected void onResume()
-    {
+    protected void onResume() {
         super.onResume();
 
-        if(mCurrentActionMode != null)
-        {
+        if (mCurrentActionMode != null) {
             mAdapter.clearSelections();
             mCurrentActionMode.finish();
         }
 
-        if (mMenu != null)
-        {
-            SearchView searchView = (SearchView) mMenu.findItem(R.id.action_search).getActionView();
-
-            if (!searchView.isIconified())
-            {
-                mFilter = searchView.getQuery().toString();
-            }
+        if (mSearchView != null && !mSearchView.isIconified()) {
+            mFilter = mSearchView.getQuery().toString();
         }
 
         // Start of active tab logic
@@ -306,7 +321,8 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
         try {
             mOrder = DBHelper.LoyaltyCardOrder.valueOf(sortPref.getString(getString(R.string.sharedpreference_sort_order), null));
             mOrderDirection = DBHelper.LoyaltyCardOrderDirection.valueOf(sortPref.getString(getString(R.string.sharedpreference_sort_direction), null));
-        } catch (IllegalArgumentException | NullPointerException ignored) {}
+        } catch (IllegalArgumentException | NullPointerException ignored) {
+        }
 
         mGroup = null;
 
@@ -331,57 +347,18 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
                 bundle.putString(LoyaltyCardEditActivity.BUNDLE_ADDGROUP, groupsTabLayout.getTabAt(selectedTab).getText().toString());
             }
             intent.putExtras(bundle);
-            startActivityForResult(intent, Utils.BARCODE_SCAN);
+            mBarcodeScannerLauncher.launch(intent);
         });
         addButton.bringToFront();
     }
 
     @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent intent) {
-        super.onActivityResult(requestCode, resultCode, intent);
-
-        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
-            mFilter = "";
-            if (mMenu != null)
-            {
-                MenuItem searchItem = mMenu.findItem(R.id.action_search);
-                searchItem.collapseActionView();
-            }
-            ActivityCompat.recreate(this);
-
+    public void onBackPressed() {
+        if (!mSearchView.isIconified()) {
+            mSearchView.setIconified(true);
             return;
         }
 
-        BarcodeValues barcodeValues = Utils.parseSetBarcodeActivityResult(requestCode, resultCode, intent, this);
-
-        if(!barcodeValues.isEmpty()) {
-            Intent newIntent = new Intent(getApplicationContext(), LoyaltyCardEditActivity.class);
-            Bundle newBundle = new Bundle();
-            newBundle.putString(LoyaltyCardEditActivity.BUNDLE_BARCODETYPE, barcodeValues.format());
-            newBundle.putString(LoyaltyCardEditActivity.BUNDLE_CARDID, barcodeValues.content());
-            Bundle inputBundle = intent.getExtras();
-            if (inputBundle != null && inputBundle.getString(LoyaltyCardEditActivity.BUNDLE_ADDGROUP) != null) {
-                newBundle.putString(LoyaltyCardEditActivity.BUNDLE_ADDGROUP, inputBundle.getString(LoyaltyCardEditActivity.BUNDLE_ADDGROUP));
-            }
-            newIntent.putExtras(newBundle);
-            startActivity(newIntent);
-        }
-    }
-
-    @Override
-    public void onBackPressed()
-    {
-        if (mMenu != null) {
-            SearchView searchView = (SearchView) mMenu.findItem(R.id.action_search).getActionView();
-
-            if (!searchView.isIconified()) {
-                searchView.setIconified(true);
-                return;
-            }
-        }
-
         super.onBackPressed();
     }
 
@@ -391,22 +368,18 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
             group = (Group) mGroup;
         }
 
-        mAdapter.swapCursor(mDB.getLoyaltyCardCursor(mFilter, group, mOrder, mOrderDirection));
+        mAdapter.swapCursor(DBHelper.getLoyaltyCardCursor(mDatabase, mFilter, group, mOrder, mOrderDirection));
 
-        if(mDB.getLoyaltyCardCount() > 0)
-        {
+        if (DBHelper.getLoyaltyCardCount(mDatabase) > 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
             mHelpText.setVisibility(View.GONE);
             mNoGroupCardsText.setVisibility(View.GONE);
-            if(mAdapter.getItemCount() > 0)
-            {
+            if (mAdapter.getItemCount() > 0) {
                 mCardList.setVisibility(View.VISIBLE);
                 mNoMatchingCardsText.setVisibility(View.GONE);
-            }
-            else
-            {
+            } else {
                 mCardList.setVisibility(View.GONE);
                 if (!mFilter.isEmpty()) {
                     // Actual Empty Search Result
@@ -418,9 +391,7 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
                     mNoGroupCardsText.setVisibility(View.VISIBLE);
                 }
             }
-        }
-        else
-        {
+        } else {
             mCardList.setVisibility(View.GONE);
             mHelpText.setVisibility(View.VISIBLE);
             mNoMatchingCardsText.setVisibility(View.GONE);
@@ -432,11 +403,8 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
         }
     }
 
-    public void updateTabGroups(TabLayout groupsTabLayout)
-    {
-        final DBHelper db = new DBHelper(this);
-
-        List<Group> newGroups = db.getGroups();
+    public void updateTabGroups(TabLayout groupsTabLayout) {
+        List<Group> newGroups = DBHelper.getGroups(mDatabase);
 
         if (newGroups.size() == 0) {
             groupsTabLayout.removeAllTabs();
@@ -462,35 +430,28 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
     }
 
     @Override
-    public boolean onCreateOptionsMenu(Menu inputMenu)
-    {
-        this.mMenu = inputMenu;
-
+    public boolean onCreateOptionsMenu(Menu inputMenu) {
         getMenuInflater().inflate(R.menu.main_menu, inputMenu);
 
         SearchManager searchManager = (SearchManager) getSystemService(Context.SEARCH_SERVICE);
-        if (searchManager != null)
-        {
-            SearchView searchView = (SearchView) inputMenu.findItem(R.id.action_search).getActionView();
-            searchView.setSearchableInfo(searchManager.getSearchableInfo(getComponentName()));
-            searchView.setSubmitButtonEnabled(false);
+        if (searchManager != null) {
+            mSearchView = (SearchView) inputMenu.findItem(R.id.action_search).getActionView();
+            mSearchView.setSearchableInfo(searchManager.getSearchableInfo(getComponentName()));
+            mSearchView.setSubmitButtonEnabled(false);
 
-            searchView.setOnCloseListener(() -> {
+            mSearchView.setOnCloseListener(() -> {
                 invalidateOptionsMenu();
                 return false;
             });
 
-            searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener()
-            {
+            mSearchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
                 @Override
-                public boolean onQueryTextSubmit(String query)
-                {
+                public boolean onQueryTextSubmit(String query) {
                     return false;
                 }
 
                 @Override
-                public boolean onQueryTextChange(String newText)
-                {
+                public boolean onQueryTextChange(String newText) {
                     mFilter = newText;
 
                     TabLayout groupsTabLayout = findViewById(R.id.groups);
@@ -507,12 +468,26 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
     }
 
     @Override
-    public boolean onOptionsItemSelected(MenuItem inputItem)
-    {
+    public boolean onOptionsItemSelected(MenuItem inputItem) {
         int id = inputItem.getItemId();
 
-        if (id == R.id.action_sort)
-        {
+        if (id == R.id.action_unfold) {
+            boolean shouldShow = !mAdapter.showingDetails();
+
+            if (shouldShow) {
+                inputItem.setIcon(R.drawable.ic_baseline_unfold_less_24);
+                inputItem.setTitle(R.string.action_hide_details);
+            } else {
+                inputItem.setIcon(R.drawable.ic_baseline_unfold_more_24);
+                inputItem.setTitle(R.string.action_show_details);
+            }
+
+            mAdapter.showDetails(shouldShow);
+
+            return true;
+        }
+
+        if (id == R.id.action_sort) {
             TabLayout.Tab tab = ((TabLayout) findViewById(R.id.groups)).getTabAt(selectedTab);
             AtomicInteger currentIndex = new AtomicInteger();
             List<DBHelper.LoyaltyCardOrder> loyaltyCardOrders = Arrays.asList(DBHelper.LoyaltyCardOrder.values());
@@ -535,10 +510,9 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
             builder.setSingleChoiceItems(R.array.sort_types_array, currentIndex.get(), (dialog, which) -> currentIndex.set(which));
 
             builder.setPositiveButton(R.string.sort, (dialog, which) -> {
-                if(ch.isChecked()) {
+                if (ch.isChecked()) {
                     setSort(loyaltyCardOrders.get(currentIndex.get()), DBHelper.LoyaltyCardOrderDirection.Descending);
-                }
-                else {
+                } else {
                     setSort(loyaltyCardOrders.get(currentIndex.get()), DBHelper.LoyaltyCardOrderDirection.Ascending);
                 }
                 dialog.dismiss();
@@ -552,31 +526,27 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
             return true;
         }
 
-        if (id == R.id.action_manage_groups)
-        {
+        if (id == R.id.action_manage_groups) {
             Intent i = new Intent(getApplicationContext(), ManageGroupsActivity.class);
-            startActivityForResult(i, Utils.MAIN_REQUEST);
+            startActivity(i);
             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);
+            startActivity(i);
             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);
+            mSettingsLauncher.launch(i);
             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);
+            startActivity(i);
             return true;
         }
 
@@ -601,13 +571,6 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
         updateLoyaltyCardList();
     }
 
-    protected static boolean isDarkModeEnabled(Context inputContext)
-    {
-        Configuration config = inputContext.getResources().getConfiguration();
-        int currentNightMode = config.uiMode & Configuration.UI_MODE_NIGHT_MASK;
-        return (currentNightMode == Configuration.UI_MODE_NIGHT_YES);
-    }
-
     @Override
     public boolean onDown(MotionEvent e) {
         return false;
@@ -633,6 +596,12 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
 
     }
 
+    @Override
+    public boolean dispatchTouchEvent(MotionEvent ev) {
+        mGestureDetector.onTouchEvent(ev);
+        return super.dispatchTouchEvent(ev);
+    }
+
     @Override
     public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX, float velocityY) {
         Log.d(TAG, "On fling");
@@ -648,9 +617,10 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
         }
 
         Integer currentTab = groupsTabLayout.getSelectedTabPosition();
-
+        Log.d("onFling", "Current Tab " + currentTab);
         // Swipe right
         if (velocityX < -150) {
+            Log.d("onFling", "Right Swipe detected " + velocityX);
             Integer nextTab = currentTab + 1;
 
             if (nextTab == groupsTabLayout.getTabCount()) {
@@ -664,6 +634,7 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
 
         // Swipe left
         if (velocityX > 150) {
+            Log.d("onFling", "Left Swipe detected " + velocityX);
             Integer nextTab = currentTab - 1;
 
             if (nextTab < 0) {
@@ -679,22 +650,18 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
     }
 
     @Override
-    public void onRowLongClicked(int inputPosition)
-    {
+    public void onRowLongClicked(int inputPosition) {
         enableActionMode(inputPosition);
     }
 
-    private void enableActionMode(int inputPosition)
-    {
-        if (mCurrentActionMode == null)
-        {
+    private void enableActionMode(int inputPosition) {
+        if (mCurrentActionMode == null) {
             mCurrentActionMode = startSupportActionMode(mCurrentActionModeCallback);
         }
         toggleSelection(inputPosition);
     }
 
-    private void toggleSelection(int inputPosition)
-    {
+    private void toggleSelection(int inputPosition) {
         mAdapter.toggleSelection(inputPosition);
         int count = mAdapter.getSelectedItemCount();
 
@@ -716,19 +683,26 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
         }
     }
 
-
     @Override
-    public void onRowClicked(int inputPosition)
-    {
-        if (mAdapter.getSelectedItemCount() > 0)
-        {
+    public void onRowClicked(int inputPosition) {
+        if (mAdapter.getSelectedItemCount() > 0) {
             enableActionMode(inputPosition);
-        }
-        else
-        {
-            Cursor selected = mAdapter.getCursor();
-            selected.moveToPosition(inputPosition);
-            LoyaltyCard loyaltyCard = LoyaltyCard.toLoyaltyCard(selected);
+        } else {
+            // FIXME
+            //
+            // There is a really nasty edge case that can happen when someone taps a card but right
+            // after it swipes (very small window, hard to reproduce). The cursor gets replaced and
+            // may not have a card at the ID number that is returned from onRowClicked.
+            //
+            // The proper fix, obviously, would involve makes sure an onFling can't happen while a
+            // click is being processed. Sadly, I have not yet found a way to make that possible.
+            LoyaltyCard loyaltyCard;
+            try {
+                loyaltyCard = mAdapter.getCard(inputPosition);
+            } catch (CursorIndexOutOfBoundsException e) {
+                Log.w(TAG, "Prevented crash from tap + swipe on ID " + inputPosition + ": " + e);
+                return;
+            }
 
             Intent i = new Intent(this, LoyaltyCardViewActivity.class);
             i.setAction("");
@@ -738,7 +712,7 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
 
             ShortcutHelper.updateShortcuts(MainActivity.this, loyaltyCard);
 
-            startActivityForResult(i, Utils.MAIN_REQUEST);
+            startActivity(i);
         }
     }
 }

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

@@ -0,0 +1,219 @@
+package protect.card_locker;
+
+
+import android.content.Intent;
+import android.database.sqlite.SQLiteDatabase;
+import android.os.Bundle;
+import android.text.Editable;
+import android.text.TextWatcher;
+import android.util.Log;
+import android.view.View;
+import android.widget.EditText;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.widget.Toolbar;
+import androidx.recyclerview.widget.RecyclerView;
+
+public class ManageGroupActivity extends CatimaAppCompatActivity implements ManageGroupCursorAdapter.CardAdapterListener {
+
+    private SQLiteDatabase mDatabase;
+    private ManageGroupCursorAdapter mAdapter;
+
+    private final String SAVE_INSTANCE_ADAPTER_STATE = "adapterState";
+    private final String SAVE_INSTANCE_CURRENT_GROUP_NAME = "currentGroupName";
+
+    protected Group mGroup = null;
+    private RecyclerView mCardList;
+    private TextView mHelpText;
+    private EditText mGroupNameText;
+
+    private boolean mGroupNameNotInUse;
+
+    @Override
+    protected void onCreate(Bundle inputSavedInstanceState) {
+        super.onCreate(inputSavedInstanceState);
+        setContentView(R.layout.activity_manage_group);
+        Toolbar toolbar = findViewById(R.id.toolbar);
+        setSupportActionBar(toolbar);
+
+        mDatabase = new DBHelper(this).getWritableDatabase();
+
+        mHelpText = findViewById(R.id.helpText);
+        mCardList = findViewById(R.id.list);
+        FloatingActionButton saveButton = findViewById(R.id.fabSave);
+
+        mGroupNameText = findViewById(R.id.editTextGroupName);
+
+        mGroupNameText.addTextChangedListener(new TextWatcher() {
+            @Override
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+            }
+
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+            }
+
+            @Override
+            public void afterTextChanged(Editable s) {
+                mGroupNameNotInUse = true;
+                mGroupNameText.setError(null);
+                String currentGroupName = mGroupNameText.getText().toString().trim();
+                if (currentGroupName.length() == 0) {
+                    mGroupNameText.setError(getResources().getText(R.string.group_name_is_empty));
+                    return;
+                }
+                if (!mGroup._id.equals(currentGroupName)) {
+                    if (DBHelper.getGroup(mDatabase, currentGroupName) != null) {
+                        mGroupNameNotInUse = false;
+                        mGroupNameText.setError(getResources().getText(R.string.group_name_already_in_use));
+                    } else {
+                        mGroupNameNotInUse = true;
+                    }
+                }
+            }
+        });
+
+        Intent intent = getIntent();
+        String groupId = intent.getStringExtra("group");
+        if (groupId == null) {
+            throw (new IllegalArgumentException("this activity expects a group loaded into it's intent"));
+        }
+        Log.d("groupId", "groupId: " + groupId);
+        mGroup = DBHelper.getGroup(mDatabase, groupId);
+        if (mGroup == null) {
+            throw (new IllegalArgumentException("cannot load group " + groupId + " from database"));
+        }
+        mGroupNameText.setText(mGroup._id);
+        setTitle(getString(R.string.editGroup, mGroup._id));
+        mAdapter = new ManageGroupCursorAdapter(this, null, this, mGroup);
+        mCardList.setAdapter(mAdapter);
+        registerForContextMenu(mCardList);
+
+        if (inputSavedInstanceState != null) {
+            mAdapter.importInGroupState(integerArrayToAdapterState(inputSavedInstanceState.getIntegerArrayList(SAVE_INSTANCE_ADAPTER_STATE)));
+            mGroupNameText.setText(inputSavedInstanceState.getString(SAVE_INSTANCE_CURRENT_GROUP_NAME));
+        }
+
+        ActionBar actionBar = getSupportActionBar();
+        if (actionBar == null) {
+            throw (new RuntimeException("mActionBar is not expected to be null here"));
+        }
+        actionBar.setDisplayHomeAsUpEnabled(true);
+        actionBar.setDisplayShowHomeEnabled(true);
+
+        saveButton.setOnClickListener(v -> {
+            String currentGroupName = mGroupNameText.getText().toString().trim();
+            if (!currentGroupName.equals(mGroup._id)) {
+                if (currentGroupName.length() == 0) {
+                    Toast.makeText(getApplicationContext(), R.string.group_name_is_empty, Toast.LENGTH_SHORT).show();
+                    return;
+                }
+                if (!mGroupNameNotInUse) {
+                    Toast.makeText(getApplicationContext(), R.string.group_name_already_in_use, Toast.LENGTH_SHORT).show();
+                    return;
+                }
+            }
+
+            mAdapter.commitToDatabase();
+            if (!currentGroupName.equals(mGroup._id)) {
+                DBHelper.updateGroup(mDatabase, mGroup._id, currentGroupName);
+            }
+            Toast.makeText(getApplicationContext(), R.string.group_updated, Toast.LENGTH_SHORT).show();
+            finish();
+        });
+        // this setText is here because content_main.xml is reused from main activity
+        mHelpText.setText(getResources().getText(R.string.noGiftCardsGroup));
+        updateLoyaltyCardList();
+    }
+
+    private ArrayList<Integer> adapterStateToIntegerArray(HashMap<Integer, Boolean> adapterState) {
+        ArrayList<Integer> ret = new ArrayList<>(adapterState.size() * 2);
+        for (Map.Entry<Integer, Boolean> entry : adapterState.entrySet()) {
+            ret.add(entry.getKey());
+            ret.add(entry.getValue() ? 1 : 0);
+        }
+        return ret;
+    }
+
+    private HashMap<Integer, Boolean> integerArrayToAdapterState(ArrayList<Integer> in) {
+        HashMap<Integer, Boolean> ret = new HashMap<>();
+        if (in.size() % 2 != 0) {
+            throw (new RuntimeException("failed restoring adapterState from integer array list"));
+        }
+        for (int i = 0; i < in.size(); i += 2) {
+            ret.put(in.get(i), in.get(i + 1) == 1);
+        }
+        return ret;
+    }
+
+
+    @Override
+    protected void onSaveInstanceState(@NonNull Bundle outState) {
+        super.onSaveInstanceState(outState);
+
+        outState.putIntegerArrayList(SAVE_INSTANCE_ADAPTER_STATE, adapterStateToIntegerArray(mAdapter.exportInGroupState()));
+        outState.putString(SAVE_INSTANCE_CURRENT_GROUP_NAME, mGroupNameText.getText().toString());
+    }
+
+    private void updateLoyaltyCardList() {
+        mAdapter.swapCursor(DBHelper.getLoyaltyCardCursor(mDatabase));
+
+        if (mAdapter.getItemCount() == 0) {
+            mCardList.setVisibility(View.GONE);
+            mHelpText.setVisibility(View.VISIBLE);
+        } else {
+            mCardList.setVisibility(View.VISIBLE);
+            mHelpText.setVisibility(View.GONE);
+        }
+    }
+
+    private void leaveWithoutSaving() {
+        if (hasChanged()) {
+            AlertDialog.Builder builder = new AlertDialog.Builder(ManageGroupActivity.this);
+            builder.setTitle(R.string.leaveWithoutSaveTitle);
+            builder.setMessage(R.string.leaveWithoutSaveConfirmation);
+            builder.setPositiveButton(R.string.confirm, (dialog, which) -> finish());
+            builder.setNegativeButton(R.string.cancel, (dialog, which) -> dialog.dismiss());
+            AlertDialog dialog = builder.create();
+            dialog.show();
+        } else {
+            finish();
+        }
+    }
+
+    @Override
+    public void onBackPressed() {
+        leaveWithoutSaving();
+    }
+
+    @Override
+    public boolean onSupportNavigateUp() {
+        onBackPressed();
+        return true;
+    }
+
+    private boolean hasChanged() {
+        return mAdapter.hasChanged() || !mGroup._id.equals(mGroupNameText.getText().toString().trim());
+    }
+
+    @Override
+    public void onRowLongClicked(int inputPosition) {
+        mAdapter.toggleSelection(inputPosition);
+    }
+
+    @Override
+    public void onRowClicked(int inputPosition) {
+        mAdapter.toggleSelection(inputPosition);
+
+    }
+}

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

@@ -0,0 +1,109 @@
+package protect.card_locker;
+
+import android.content.Context;
+import android.database.Cursor;
+import android.database.sqlite.SQLiteDatabase;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class ManageGroupCursorAdapter extends LoyaltyCardCursorAdapter {
+    private HashMap<Integer, Integer> mIndexCardMap;
+    private HashMap<Integer, Boolean> mInGroupOverlay;
+    private HashMap<Integer, Boolean> mIsLoyaltyCardInGroupCache;
+    private HashMap<Integer, List<Group>> mGetGroupCache;
+    final private Group mGroup;
+    final private SQLiteDatabase mDatabase;
+
+    public ManageGroupCursorAdapter(Context inputContext, Cursor inputCursor, CardAdapterListener inputListener, Group group) {
+        super(inputContext, inputCursor, inputListener);
+        mGroup = new Group(group._id, group.order);
+        mInGroupOverlay = new HashMap<>();
+        mDatabase = new DBHelper(inputContext).getWritableDatabase();
+    }
+
+    @Override
+    public void swapCursor(Cursor inputCursor) {
+        super.swapCursor(inputCursor);
+        mIndexCardMap = new HashMap<>();
+        mIsLoyaltyCardInGroupCache = new HashMap<>();
+        mGetGroupCache = new HashMap<>();
+    }
+
+    @Override
+    public void onBindViewHolder(LoyaltyCardListItemViewHolder inputHolder, Cursor inputCursor) {
+        LoyaltyCard loyaltyCard = LoyaltyCard.toLoyaltyCard(inputCursor);
+        Boolean overlayValue = mInGroupOverlay.get(loyaltyCard.id);
+        if ((overlayValue != null ? overlayValue : isLoyaltyCardInGroup(loyaltyCard.id))) {
+            mAnimationItemsIndex.put(inputCursor.getPosition(), true);
+            mSelectedItems.put(inputCursor.getPosition(), true);
+        }
+        mIndexCardMap.put(inputCursor.getPosition(), loyaltyCard.id);
+        super.onBindViewHolder(inputHolder, inputCursor);
+    }
+
+    private List<Group> getGroups(int cardId) {
+        List<Group> cache = mGetGroupCache.get(cardId);
+        if (cache != null) {
+            return cache;
+        }
+        List<Group> groups = DBHelper.getLoyaltyCardGroups(mDatabase, cardId);
+        mGetGroupCache.put(cardId, groups);
+        return groups;
+    }
+
+    private boolean isLoyaltyCardInGroup(int cardId) {
+        Boolean cache = mIsLoyaltyCardInGroupCache.get(cardId);
+        if (cache != null) {
+            return cache;
+        }
+        List<Group> groups = getGroups(cardId);
+        if (groups.contains(mGroup)) {
+            mIsLoyaltyCardInGroupCache.put(cardId, true);
+            return true;
+        }
+        mIsLoyaltyCardInGroupCache.put(cardId, false);
+        return false;
+    }
+
+    @Override
+    public void toggleSelection(int inputPosition) {
+        super.toggleSelection(inputPosition);
+        Integer cardId = mIndexCardMap.get(inputPosition);
+        if (cardId == null) {
+            throw (new RuntimeException("cardId should not be null here"));
+        }
+        Boolean overlayValue = mInGroupOverlay.get(cardId);
+        if (overlayValue == null) {
+            mInGroupOverlay.put(cardId, !isLoyaltyCardInGroup(cardId));
+        } else {
+            mInGroupOverlay.remove(cardId);
+        }
+    }
+
+    public boolean hasChanged() {
+        return mInGroupOverlay.size() > 0;
+    }
+
+    public void commitToDatabase() {
+        for (Map.Entry<Integer, Boolean> entry : mInGroupOverlay.entrySet()) {
+            int cardId = entry.getKey();
+            List<Group> groups = getGroups(cardId);
+            if (entry.getValue()) {
+                groups.add(mGroup);
+            } else {
+                groups.remove(mGroup);
+            }
+            DBHelper.setLoyaltyCardGroups(mDatabase, cardId, groups);
+        }
+    }
+
+    public void importInGroupState(HashMap<Integer, Boolean> cardIdInGroupMap) {
+        mInGroupOverlay = new HashMap<>(cardIdInGroupMap);
+    }
+
+    public HashMap<Integer, Boolean> exportInGroupState() {
+        return new HashMap<>(mInGroupOverlay);
+    }
+}

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

@@ -1,7 +1,9 @@
 package protect.card_locker;
 
 import android.content.Context;
+import android.content.Intent;
 import android.content.SharedPreferences;
+import android.database.sqlite.SQLiteDatabase;
 import android.os.Bundle;
 import android.text.InputType;
 import android.view.MenuItem;
@@ -9,6 +11,7 @@ import android.view.View;
 import android.view.WindowManager;
 import android.widget.EditText;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 
@@ -21,28 +24,27 @@ import androidx.recyclerview.widget.DefaultItemAnimator;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
-public class ManageGroupsActivity extends CatimaAppCompatActivity implements GroupCursorAdapter.GroupAdapterListener
-{
+public class ManageGroupsActivity extends CatimaAppCompatActivity implements GroupCursorAdapter.GroupAdapterListener {
     private static final String TAG = "Catima";
 
-    private final DBHelper mDb = new DBHelper(this);
+    private SQLiteDatabase mDatabase;
     private TextView mHelpText;
     private RecyclerView mGroupList;
     GroupCursorAdapter mAdapter;
 
     @Override
-    protected void onCreate(Bundle savedInstanceState)
-    {
+    protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setTitle(R.string.groups);
         setContentView(R.layout.manage_groups_activity);
         Toolbar toolbar = findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
         ActionBar actionBar = getSupportActionBar();
-        if(actionBar != null)
-        {
+        if (actionBar != null) {
             actionBar.setDisplayHomeAsUpEnabled(true);
         }
+
+        mDatabase = new DBHelper(this).getWritableDatabase();
     }
 
     @Override
@@ -72,11 +74,10 @@ public class ManageGroupsActivity extends CatimaAppCompatActivity implements Gro
         super.onBackPressed();
     }
 
-    private void updateGroupList()
-    {
-        mAdapter.swapCursor(mDb.getGroupCursor());
+    private void updateGroupList() {
+        mAdapter.swapCursor(DBHelper.getGroupCursor(mDatabase));
 
-        if (mDb.getGroupCount() == 0) {
+        if (DBHelper.getGroupCount(mDatabase) == 0) {
             mGroupList.setVisibility(View.GONE);
             mHelpText.setVisibility(View.VISIBLE);
 
@@ -87,8 +88,7 @@ public class ManageGroupsActivity extends CatimaAppCompatActivity implements Gro
         mHelpText.setVisibility(View.GONE);
     }
 
-    private void invalidateHomescreenActiveTab()
-    {
+    private void invalidateHomescreenActiveTab() {
         SharedPreferences activeTabPref = getApplicationContext().getSharedPreferences(
                 getString(R.string.sharedpreference_active_tab),
                 Context.MODE_PRIVATE);
@@ -98,8 +98,7 @@ public class ManageGroupsActivity extends CatimaAppCompatActivity implements Gro
     }
 
     @Override
-    public boolean onOptionsItemSelected(MenuItem item)
-    {
+    public boolean onOptionsItemSelected(MenuItem item) {
         int id = item.getItemId();
 
         if (id == android.R.id.home) {
@@ -110,14 +109,23 @@ public class ManageGroupsActivity extends CatimaAppCompatActivity implements Gro
     }
 
     private void createGroup() {
-        AlertDialog.Builder builder = new AlertDialog.Builder(this,R.style.AlertDialogTheme);
+        AlertDialog.Builder builder = new AlertDialog.Builder(this, R.style.AlertDialogTheme);
         builder.setTitle(R.string.enter_group_name);
         final EditText input = new EditText(this);
         input.setInputType(InputType.TYPE_CLASS_TEXT);
         builder.setView(input);
 
         builder.setPositiveButton(getString(R.string.ok), (dialog, which) -> {
-            mDb.insertGroup(input.getText().toString());
+            String inputString = input.getText().toString().trim();
+            if (inputString.length() == 0) {
+                Toast.makeText(getApplicationContext(), R.string.group_name_is_empty, Toast.LENGTH_SHORT).show();
+                return;
+            }
+            if (DBHelper.getGroup(mDatabase, inputString) != null) {
+                Toast.makeText(getApplicationContext(), R.string.group_name_already_in_use, Toast.LENGTH_SHORT).show();
+                return;
+            }
+            DBHelper.insertGroup(mDatabase, inputString);
             updateGroupList();
         });
         builder.setNegativeButton(getString(R.string.cancel), (dialog, which) -> dialog.cancel());
@@ -133,10 +141,10 @@ public class ManageGroupsActivity extends CatimaAppCompatActivity implements Gro
     }
 
     private void moveGroup(View view, boolean up) {
-        List<Group> groups = mDb.getGroups();
+        List<Group> groups = DBHelper.getGroups(mDatabase);
         final String groupName = getGroupName(view);
 
-        int currentIndex = mDb.getGroup(groupName).order;
+        int currentIndex = DBHelper.getGroup(mDatabase, groupName).order;
         int newIndex;
 
         // Reinsert group in correct position
@@ -155,7 +163,7 @@ public class ManageGroupsActivity extends CatimaAppCompatActivity implements Gro
         groups.add(newIndex, group);
 
         // Update database
-        mDb.reorderGroups(groups);
+        DBHelper.reorderGroups(mDatabase, groups);
 
         // Update UI
         updateGroupList();
@@ -176,25 +184,9 @@ public class ManageGroupsActivity extends CatimaAppCompatActivity implements Gro
 
     @Override
     public void onEditButtonClicked(View view) {
-        final String groupName = getGroupName(view);
-
-        AlertDialog.Builder builder = new AlertDialog.Builder(this);
-        builder.setTitle(R.string.enter_group_name);
-        final EditText input = new EditText(this);
-        input.setInputType(InputType.TYPE_CLASS_TEXT);
-        input.setText(groupName);
-        builder.setView(input);
-
-        builder.setPositiveButton(getString(R.string.ok), (dialog, which) -> {
-            String newGroupName = input.getText().toString();
-            mDb.updateGroup(groupName, newGroupName);
-            updateGroupList();
-        });
-        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();
+        Intent intent = new Intent(this, ManageGroupActivity.class);
+        intent.putExtra("group", getGroupName(view));
+        startActivity(intent);
     }
 
     @Override
@@ -206,7 +198,7 @@ public class ManageGroupsActivity extends CatimaAppCompatActivity implements Gro
         builder.setMessage(groupName);
 
         builder.setPositiveButton(getString(R.string.ok), (dialog, which) -> {
-            mDb.deleteGroup(groupName);
+            DBHelper.deleteGroup(mDatabase, groupName);
             updateGroupList();
             // Delete may change ordering, so invalidate
             invalidateHomescreenActiveTab();

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

@@ -0,0 +1,29 @@
+package protect.card_locker;
+
+import android.app.NotificationChannel;
+import android.app.NotificationManager;
+import android.content.Context;
+import android.os.Build;
+
+public class NotificationType {
+    private final static String NOTIFICATION_IMPORT_EXPORT = "NOTIFICATION_IMPORT_EXPORT";
+
+    public static String getImportExportChannel(Context context) {
+        createNotificationChannel(context, NOTIFICATION_IMPORT_EXPORT, context.getString(R.string.importExport), context.getString(R.string.importExportDescription), NotificationManager.IMPORTANCE_HIGH);
+
+        return NOTIFICATION_IMPORT_EXPORT;
+    }
+
+    private static void createNotificationChannel(Context context, String channelId, CharSequence name, String description, int importance) {
+        // Create the NotificationType, but only on API 26+ because
+        // the NotificationType class is new and not in the support library
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            NotificationChannel channel = new NotificationChannel(channelId, name, importance);
+            channel.setDescription(description);
+            // Register the channel with the system; you can't change the importance
+            // or other notification behaviors after this
+            NotificationManager notificationManager = context.getSystemService(NotificationManager.class);
+            notificationManager.createNotificationChannel(channel);
+        }
+    }
+}

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

@@ -20,12 +20,14 @@ import com.journeyapps.barcodescanner.DecoratedBarcodeView;
 
 import java.util.List;
 
+import androidx.activity.result.ActivityResultLauncher;
+import androidx.activity.result.contract.ActivityResultContracts;
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.widget.Toolbar;
 
 /**
  * Custom Scannner Activity extending from Activity to display a custom layout form scanner view.
- *
+ * <p>
  * Based on https://github.com/journeyapps/zxing-android-embedded/blob/0fdfbce9fb3285e985bad9971c5f7c0a7a334e7b/sample/src/main/java/example/zxing/CustomScannerActivity.java
  * originally licensed under Apache 2.0
  */
@@ -39,6 +41,10 @@ public class ScanActivity extends CatimaAppCompatActivity {
     private String addGroup;
     private boolean torch = false;
 
+    private ActivityResultLauncher<Intent> manualAddLauncher;
+    // can't use the pre-made contract because that launches the file manager for image type instead of gallery
+    private ActivityResultLauncher<Intent> photoPickerLauncher;
+
     private void extractIntentFields(Intent intent) {
         final Bundle b = intent.getExtras();
         cardId = b != null ? b.getString(LoyaltyCardEditActivity.BUNDLE_CARDID) : null;
@@ -54,13 +60,14 @@ public class ScanActivity extends CatimaAppCompatActivity {
         Toolbar toolbar = findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
         ActionBar actionBar = getSupportActionBar();
-        if(actionBar != null)
-        {
+        if (actionBar != null) {
             actionBar.setDisplayHomeAsUpEnabled(true);
         }
 
         extractIntentFields(getIntent());
 
+        manualAddLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), result -> handleActivityResult(Utils.SELECT_BARCODE_REQUEST, result.getResultCode(), result.getData()));
+        photoPickerLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), result -> handleActivityResult(Utils.BARCODE_IMPORT_FROM_IMAGE_FILE, result.getResultCode(), result.getData()));
         findViewById(R.id.add_from_image).setOnClickListener(this::addFromImage);
         findViewById(R.id.add_manually).setOnClickListener(this::addManually);
 
@@ -127,8 +134,7 @@ public class ScanActivity extends CatimaAppCompatActivity {
     }
 
     @Override
-    public boolean onCreateOptionsMenu(Menu menu)
-    {
+    public boolean onCreateOptionsMenu(Menu menu) {
         if (getPackageManager().hasSystemFeature(PackageManager.FEATURE_CAMERA_FLASH)) {
             getMenuInflater().inflate(R.menu.scan_menu, menu);
         }
@@ -139,10 +145,8 @@ public class ScanActivity extends CatimaAppCompatActivity {
     }
 
     @Override
-    public boolean onOptionsItemSelected(MenuItem item)
-    {
-        if (item.getItemId() == android.R.id.home)
-        {
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == android.R.id.home) {
             setResult(Activity.RESULT_CANCELED);
             finish();
             return true;
@@ -163,9 +167,7 @@ public class ScanActivity extends CatimaAppCompatActivity {
         return super.onOptionsItemSelected(item);
     }
 
-    @Override
-    public void onActivityResult(int requestCode, int resultCode, Intent intent)
-    {
+    private void handleActivityResult(int requestCode, int resultCode, Intent intent) {
         super.onActivityResult(requestCode, resultCode, intent);
 
         BarcodeValues barcodeValues;
@@ -198,12 +200,12 @@ public class ScanActivity extends CatimaAppCompatActivity {
             b.putString("initialCardId", cardId);
             i.putExtras(b);
         }
-        startActivityForResult(i, Utils.SELECT_BARCODE_REQUEST);
+        manualAddLauncher.launch(i);
     }
 
     public void addFromImage(View view) {
         Intent photoPickerIntent = new Intent(Intent.ACTION_PICK);
         photoPickerIntent.setType("image/*");
-        startActivityForResult(photoPickerIntent, Utils.BARCODE_IMPORT_FROM_IMAGE_FILE);
+        photoPickerLauncher.launch(photoPickerIntent);
     }
 }

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

@@ -2,9 +2,14 @@ package protect.card_locker;
 
 import android.content.Context;
 import android.content.Intent;
+import android.database.sqlite.SQLiteDatabase;
 import android.graphics.Bitmap;
+import android.graphics.Canvas;
+import android.graphics.Color;
 import android.os.Bundle;
 
+import org.jetbrains.annotations.NotNull;
+
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.LinkedList;
@@ -12,10 +17,10 @@ import java.util.List;
 
 import androidx.core.content.pm.ShortcutInfoCompat;
 import androidx.core.content.pm.ShortcutManagerCompat;
+import androidx.core.graphics.ColorUtils;
 import androidx.core.graphics.drawable.IconCompat;
 
-class ShortcutHelper
-{
+class ShortcutHelper {
     // Android documentation says that no more than 5 shortcuts
     // are supported. However, that may be too many, as not all
     // launcher will show all 5. Instead, the number is limited
@@ -23,6 +28,14 @@ class ShortcutHelper
     // chance of being shown.
     private static final int MAX_SHORTCUTS = 3;
 
+    // https://developer.android.com/reference/android/graphics/drawable/AdaptiveIconDrawable.html
+    private static final int ADAPTIVE_BITMAP_SCALE = 1;
+    private static final int ADAPTIVE_BITMAP_SIZE = 108 * ADAPTIVE_BITMAP_SCALE;
+    private static final int ADAPTIVE_BITMAP_VISIBLE_SIZE = 72 * ADAPTIVE_BITMAP_SCALE;
+    private static final int ADAPTIVE_BITMAP_IMAGE_SIZE = ADAPTIVE_BITMAP_VISIBLE_SIZE + 5 * ADAPTIVE_BITMAP_SCALE;
+    private static final int PADDING_COLOR = Color.argb(255, 255, 255, 255);
+    private static final int PADDING_COLOR_OVERLAY = Color.argb(127, 0, 0, 0);
+
     /**
      * Add a card to the app shortcuts, and maintain a list of the most
      * recently used cards. If there is already a shortcut for the card,
@@ -30,11 +43,10 @@ class ShortcutHelper
      * card exceeds the max number of shortcuts, then the least recently
      * used card shortcut is discarded.
      */
-    static void updateShortcuts(Context context, LoyaltyCard card)
-    {
+    static void updateShortcuts(Context context, LoyaltyCard card) {
         LinkedList<ShortcutInfoCompat> list = new LinkedList<>(ShortcutManagerCompat.getDynamicShortcuts(context));
 
-        DBHelper dbHelper = new DBHelper(context);
+        SQLiteDatabase database = new DBHelper(context).getReadableDatabase();
 
         String shortcutId = Integer.toString(card.id);
 
@@ -44,31 +56,25 @@ class ShortcutHelper
 
         Integer foundIndex = null;
 
-        for(int index = 0; index < list.size(); index++)
-        {
-            if(list.get(index).getId().equals(shortcutId))
-            {
+        for (int index = 0; index < list.size(); index++) {
+            if (list.get(index).getId().equals(shortcutId)) {
                 // Found the item already
                 foundIndex = index;
                 break;
             }
         }
 
-        if(foundIndex != null)
-        {
+        if (foundIndex != null) {
             // If the item is already found, then the list needs to be
             // reordered, so that the selected item now has the lowest
             // rank, thus letting it survive longer.
             ShortcutInfoCompat found = list.remove(foundIndex.intValue());
             list.addFirst(found);
-        }
-        else
-        {
+        } else {
             // The item is new to the list. First, we need to trim the list
             // until it is able to accept a new item, then the item is
             // inserted.
-            while(list.size() >= MAX_SHORTCUTS)
-            {
+            while (list.size() >= MAX_SHORTCUTS) {
                 list.pollLast();
             }
 
@@ -80,15 +86,14 @@ class ShortcutHelper
         LinkedList<ShortcutInfoCompat> finalList = new LinkedList<>();
 
         // The ranks are now updated; the order in the list is the rank.
-        for(int index = 0; index < list.size(); index++)
-        {
+        for (int index = 0; index < list.size(); index++) {
             ShortcutInfoCompat prevShortcut = list.get(index);
 
-            LoyaltyCard loyaltyCard = dbHelper.getLoyaltyCard(Integer.parseInt(prevShortcut.getId()));
+            LoyaltyCard loyaltyCard = DBHelper.getLoyaltyCard(database, Integer.parseInt(prevShortcut.getId()));
 
             ShortcutInfoCompat updatedShortcut = createShortcutBuilder(context, loyaltyCard)
-                        .setRank(index)
-                        .build();
+                    .setRank(index)
+                    .build();
 
             finalList.addLast(updatedShortcut);
         }
@@ -100,16 +105,13 @@ class ShortcutHelper
      * Remove the given card id from the app shortcuts, if such a
      * shortcut exists.
      */
-    static void removeShortcut(Context context, int cardId)
-    {
+    static void removeShortcut(Context context, int cardId) {
         List<ShortcutInfoCompat> list = ShortcutManagerCompat.getDynamicShortcuts(context);
 
         String shortcutId = Integer.toString(cardId);
 
-        for(int index = 0; index < list.size(); index++)
-        {
-            if(list.get(index).getId().equals(shortcutId))
-            {
+        for (int index = 0; index < list.size(); index++) {
+            if (list.get(index).getId().equals(shortcutId)) {
                 list.remove(index);
                 break;
             }
@@ -118,6 +120,16 @@ class ShortcutHelper
         ShortcutManagerCompat.setDynamicShortcuts(context, list);
     }
 
+    static @NotNull
+    Bitmap createAdaptiveBitmap(@NotNull Bitmap in, int paddingColor) {
+        Bitmap ret = Bitmap.createBitmap(ADAPTIVE_BITMAP_SIZE, ADAPTIVE_BITMAP_SIZE, Bitmap.Config.ARGB_8888);
+        Canvas output = new Canvas(ret);
+        output.drawColor(ColorUtils.compositeColors(PADDING_COLOR_OVERLAY, paddingColor));
+        Bitmap resized = Utils.resizeBitmap(in, ADAPTIVE_BITMAP_IMAGE_SIZE);
+        output.drawBitmap(resized, (ADAPTIVE_BITMAP_SIZE - resized.getWidth()) / 2f, (ADAPTIVE_BITMAP_SIZE - resized.getHeight()) / 2f, null);
+        return ret;
+    }
+
     static ShortcutInfoCompat.Builder createShortcutBuilder(Context context, LoyaltyCard loyaltyCard) {
         Intent intent = new Intent(context, LoyaltyCardViewActivity.class);
         intent.setAction(Intent.ACTION_MAIN);
@@ -129,7 +141,12 @@ class ShortcutHelper
         bundle.putBoolean("view", true);
         intent.putExtras(bundle);
 
-        Bitmap iconBitmap = Utils.generateIcon(context, loyaltyCard, true).getLetterTile();
+        Bitmap iconBitmap = Utils.retrieveCardImage(context, loyaltyCard.id, ImageLocationType.icon);
+        if (iconBitmap == null) {
+            iconBitmap = Utils.generateIcon(context, loyaltyCard, true).getLetterTile();
+        } else {
+            iconBitmap = createAdaptiveBitmap(iconBitmap, loyaltyCard.headerColor == null ? PADDING_COLOR : loyaltyCard.headerColor);
+        }
 
         IconCompat icon = IconCompat.createWithAdaptiveBitmap(iconBitmap);
 

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

@@ -5,11 +5,14 @@ import android.text.TextWatcher;
 
 public class SimpleTextWatcher implements TextWatcher {
     @Override
-    public void beforeTextChanged(CharSequence s, int start, int count, int after) { }
+    public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+    }
 
     @Override
-    public void onTextChanged(CharSequence s, int start, int before, int count) { }
+    public void onTextChanged(CharSequence s, int start, int before, int count) {
+    }
 
     @Override
-    public void afterTextChanged(Editable s) { }
+    public void afterTextChanged(Editable s) {
+    }
 }

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

@@ -25,6 +25,7 @@ import com.google.zxing.Result;
 import com.google.zxing.common.HybridBinarizer;
 
 import java.io.ByteArrayOutputStream;
+import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
@@ -38,6 +39,7 @@ import java.util.GregorianCalendar;
 import java.util.Locale;
 import java.util.Map;
 
+import androidx.appcompat.app.AppCompatDelegate;
 import androidx.core.graphics.ColorUtils;
 import androidx.exifinterface.media.ExifInterface;
 import protect.card_locker.preferences.Settings;
@@ -52,12 +54,15 @@ public class Utils {
     public static final int BARCODE_IMPORT_FROM_IMAGE_FILE = 4;
     public static final int CARD_IMAGE_FROM_CAMERA_FRONT = 5;
     public static final int CARD_IMAGE_FROM_CAMERA_BACK = 6;
-    public static final int CARD_IMAGE_FROM_FILE_FRONT = 7;
-    public static final int CARD_IMAGE_FROM_FILE_BACK = 8;
+    public static final int CARD_IMAGE_FROM_CAMERA_ICON = 7;
+    public static final int CARD_IMAGE_FROM_FILE_FRONT = 8;
+    public static final int CARD_IMAGE_FROM_FILE_BACK = 9;
+    public static final int CARD_IMAGE_FROM_FILE_ICON = 10;
 
     static final double LUMINANCE_MIDPOINT = 0.5;
 
-    static final int BITMAP_SIZE_BIG = 512;
+    static final int BITMAP_SIZE_SMALL = 512;
+    static final int BITMAP_SIZE_BIG = 2048;
 
     static public LetterBitmap generateIcon(Context context, LoyaltyCard loyaltyCard, boolean forShortcut) {
         return generateIcon(context, loyaltyCard.store, loyaltyCard.headerColor, forShortcut);
@@ -79,7 +84,7 @@ public class Utils {
             tileLetterFontSize = context.getResources().getDimensionPixelSize(R.dimen.tileLetterFontSize);
         }
 
-        int pixelSize = context.getResources().getDimensionPixelSize(R.dimen.cardThumbnailSize);
+        int pixelSize = context.getResources().getDimensionPixelSize(R.dimen.tileLetterImageSize);
 
         if (backgroundColor == null) {
             backgroundColor = LetterBitmap.getDefaultColor(context, store);
@@ -264,13 +269,11 @@ public class Utils {
         return bos.toByteArray();
     }
 
-    static public Bitmap resizeBitmap(Bitmap bitmap) {
+    static public Bitmap resizeBitmap(Bitmap bitmap, double maxSize) {
         if (bitmap == null) {
             return null;
         }
 
-        double maxSize = BITMAP_SIZE_BIG;
-
         double width = bitmap.getWidth();
         double height = bitmap.getHeight();
 
@@ -313,16 +316,20 @@ public class Utils {
         return Bitmap.createBitmap(bitmap, 0, 0, bitmap.getWidth(), bitmap.getHeight(), matrix, true);
     }
 
-    static public String getCardImageFileName(int loyaltyCardId, boolean front) {
+    static public String getCardImageFileName(int loyaltyCardId, ImageLocationType type) {
         StringBuilder cardImageFileNameBuilder = new StringBuilder();
 
         cardImageFileNameBuilder.append("card_");
         cardImageFileNameBuilder.append(loyaltyCardId);
         cardImageFileNameBuilder.append("_");
-        if (front) {
+        if (type == ImageLocationType.front) {
             cardImageFileNameBuilder.append("front");
-        } else {
+        } else if (type == ImageLocationType.back) {
             cardImageFileNameBuilder.append("back");
+        } else if (type == ImageLocationType.icon) {
+            cardImageFileNameBuilder.append("icon");
+        } else {
+            throw new IllegalArgumentException("Unknown image type");
         }
         cardImageFileNameBuilder.append(".png");
 
@@ -340,8 +347,8 @@ public class Utils {
         bitmap.compress(Bitmap.CompressFormat.PNG, 100, out);
     }
 
-    static public void saveCardImage(Context context, Bitmap bitmap, int loyaltyCardId, boolean front) throws FileNotFoundException {
-        saveCardImage(context, bitmap, getCardImageFileName(loyaltyCardId, front));
+    static public void saveCardImage(Context context, Bitmap bitmap, int loyaltyCardId, ImageLocationType type) throws FileNotFoundException {
+        saveCardImage(context, bitmap, getCardImageFileName(loyaltyCardId, type));
     }
 
     static public Bitmap retrieveCardImage(Context context, String fileName) {
@@ -355,11 +362,11 @@ public class Utils {
         return BitmapFactory.decodeStream(in);
     }
 
-    static public Bitmap retrieveCardImage(Context context, int loyaltyCardId, boolean front) {
-        return retrieveCardImage(context, getCardImageFileName(loyaltyCardId, front));
+    static public Bitmap retrieveCardImage(Context context, int loyaltyCardId, ImageLocationType type) {
+        return retrieveCardImage(context, getCardImageFileName(loyaltyCardId, type));
     }
 
-    static public <T,U> U mapGetOrDefault(Map<T,U> map, T key, U defaultValue) {
+    static public <T, U> U mapGetOrDefault(Map<T, U> map, T key, U defaultValue) {
         U value = map.get(key);
         if (value == null) {
             return defaultValue;
@@ -401,4 +408,44 @@ public class Utils {
     static public long getUnixTime() {
         return System.currentTimeMillis() / 1000;
     }
+
+    static public boolean isDarkModeEnabled(Context inputContext) {
+        int nightModeSetting = new Settings(inputContext).getTheme();
+        if (nightModeSetting == AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM) {
+            Configuration config = inputContext.getResources().getConfiguration();
+            int currentNightMode = config.uiMode & Configuration.UI_MODE_NIGHT_MASK;
+            return (currentNightMode == Configuration.UI_MODE_NIGHT_YES);
+        } else {
+            return nightModeSetting == AppCompatDelegate.MODE_NIGHT_YES;
+        }
+    }
+
+    public static File createTempFile(Context context, String name) {
+        return new File(context.getCacheDir() + "/" + name);
+    }
+
+    public static String saveTempImage(Context context, Bitmap in, String name, Bitmap.CompressFormat format) {
+        File image = createTempFile(context, name);
+        try (FileOutputStream out = new FileOutputStream(image)) {
+            in.compress(format, 100, out);
+            return image.getAbsolutePath();
+        } catch (IOException e) {
+            Log.d("store temp image", "failed writing temp file for temporary image, name: " + name);
+            return null;
+        }
+    }
+
+    public static Bitmap loadImage(String path) {
+        try {
+            return BitmapFactory.decodeStream(new FileInputStream(path));
+        } catch (IOException e) {
+            Log.d("load image", "failed loading image from " + path);
+            return null;
+        }
+    }
+
+    public static Bitmap loadTempImage(Context context, String name) {
+        return loadImage(context.getCacheDir() + "/" + name);
+    }
+
 }

app/src/main/java/protect/card_locker/async/CompatCallable.java

@@ -0,0 +1,9 @@
+package protect.card_locker.async;
+
+import java.util.concurrent.Callable;
+
+public interface CompatCallable<T> extends Callable<T> {
+    void onPostExecute(Object result);
+
+    void onPreExecute();
+}

app/src/main/java/protect/card_locker/async/TaskHandler.java

@@ -0,0 +1,175 @@
+package protect.card_locker.async;
+
+import android.os.Handler;
+import android.os.Looper;
+
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * AsyncTask has been deprecated so this provides very rudimentary compatibility without
+ * needing to redo too many Parts.
+ * <p>
+ * However this is a much, much more cooperative Behaviour than before so
+ * the callers need to ensure we do NOT rely on forced cancellation and feed less into the
+ * ThreadPools so we don't OOM/Overload the Users device
+ * <p>
+ * This assumes single-threaded callers.
+ */
+public class TaskHandler {
+
+    public enum TYPE {
+        BARCODE,
+        IMPORT,
+        EXPORT
+    }
+
+    HashMap<TYPE, ThreadPoolExecutor> executors = generateExecutors();
+
+    final private HashMap<TYPE, LinkedList<Future<?>>> taskList = new HashMap<>();
+
+    private final Handler uiHandler = new Handler(Looper.getMainLooper());
+
+    private HashMap<TYPE, ThreadPoolExecutor> generateExecutors() {
+        HashMap<TYPE, ThreadPoolExecutor> initExecutors = new HashMap<>();
+        for (TYPE type : TYPE.values()) {
+            replaceExecutor(initExecutors, type, false, false);
+        }
+        return initExecutors;
+    }
+
+    /**
+     * Replaces (or initializes) an Executor with a clean (new) one
+     *
+     * @param executors Map Reference
+     * @param type      Which Queue
+     * @param flushOld  attempt shutdown
+     * @param waitOnOld wait for Termination
+     */
+    private void replaceExecutor(HashMap<TYPE, ThreadPoolExecutor> executors, TYPE type, Boolean flushOld, Boolean waitOnOld) {
+        ThreadPoolExecutor oldExecutor = executors.get(type);
+        if (oldExecutor != null) {
+            if (flushOld) {
+                oldExecutor.shutdownNow();
+            }
+            if (waitOnOld) {
+                try {
+                    //noinspection ResultOfMethodCallIgnored
+                    oldExecutor.awaitTermination(5, TimeUnit.SECONDS);
+                } catch (InterruptedException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+        executors.put(type, (ThreadPoolExecutor) Executors.newCachedThreadPool());
+    }
+
+    /**
+     * Queue a Pseudo-AsyncTask for execution
+     *
+     * @param type     Queue
+     * @param callable PseudoAsyncTask
+     */
+    public void executeTask(TYPE type, CompatCallable<?> callable) {
+        Runnable runner = () -> {
+            try {
+                // Run on the UI Thread
+                uiHandler.post(callable::onPreExecute);
+
+                // Background
+                final Object result = callable.call();
+
+                // Post results on UI Thread so we can show them
+                uiHandler.post(() -> {
+                    callable.onPostExecute(result);
+                });
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        };
+
+        LinkedList<Future<?>> list = taskList.get(type);
+
+        if (list == null) {
+            list = new LinkedList<>();
+        }
+
+        ThreadPoolExecutor executor = executors.get(type);
+
+        if (executor != null) {
+            Future<?> task = executor.submit(runner);
+            // Test Queue Cancellation:
+            // task.cancel(true);
+            list.push(task);
+            taskList.put(type, list);
+        }
+    }
+
+    /**
+     * This will attempt to cancel a currently running list of Tasks
+     * Useful to ignore scheduled tasks - but not able to hard-stop tasks that are running
+     *
+     * @param type                    Which Queue to target
+     * @param forceCancel             attempt to close the Queue and force-replace it after
+     * @param waitForFinish           wait and return after the old executor finished. Times out after 5s
+     * @param waitForCurrentlyRunning wait before cancelling tasks. Useful for tests.
+     */
+    public void flushTaskList(TYPE type, Boolean forceCancel, Boolean waitForFinish, Boolean waitForCurrentlyRunning) {
+        // Only used for Testing
+        if (waitForCurrentlyRunning) {
+            ThreadPoolExecutor oldExecutor = executors.get(type);
+
+            if (oldExecutor != null) {
+                try {
+                    //noinspection ResultOfMethodCallIgnored
+                    oldExecutor.awaitTermination(5, TimeUnit.SECONDS);
+                } catch (InterruptedException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+
+        // Attempt to cancel known Tasks and clean the List
+        LinkedList<Future<?>> tasks = taskList.get(type);
+        if (tasks != null) {
+            for (Future<?> task : tasks) {
+                if (!task.isDone() || !task.isCancelled()) {
+                    // Interrupt any Task we can
+                    task.cancel(true);
+                }
+            }
+        }
+        tasks = new LinkedList<>();
+        taskList.put(type, tasks);
+
+        if (forceCancel || waitForFinish) {
+            ThreadPoolExecutor oldExecutor = executors.get(type);
+
+            if (oldExecutor != null) {
+                if (forceCancel) {
+                    if (waitForFinish) {
+                        try {
+                            //noinspection ResultOfMethodCallIgnored
+                            oldExecutor.awaitTermination(5, TimeUnit.SECONDS);
+                        } catch (InterruptedException e) {
+                            e.printStackTrace();
+                        }
+                    }
+                    oldExecutor.shutdownNow();
+                    replaceExecutor(executors, type, true, false);
+                } else {
+                    try {
+                        //noinspection ResultOfMethodCallIgnored
+                        oldExecutor.awaitTermination(5, TimeUnit.SECONDS);
+                    } catch (InterruptedException e) {
+                        e.printStackTrace();
+                    }
+                }
+            }
+        }
+    }
+}

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

@@ -12,18 +12,13 @@ public class CSVHelpers {
      * if it is not null. Otherwise, a FormatException is thrown.
      */
     static String extractString(String key, CSVRecord record, String defaultValue)
-            throws FormatException
-    {
+            throws FormatException {
         String toReturn = defaultValue;
 
-        if(record.isMapped(key))
-        {
+        if (record.isMapped(key)) {
             toReturn = record.get(key);
-        }
-        else
-        {
-            if(defaultValue == null)
-            {
+        } else {
+            if (defaultValue == null) {
                 throw new FormatException("Field not used but expected: " + key);
             }
         }
@@ -38,25 +33,19 @@ public class CSVHelpers {
      * int, a FormatException is thrown.
      */
     static Integer extractInt(String key, CSVRecord record, boolean nullIsOk)
-            throws FormatException
-    {
-        if(record.isMapped(key) == false)
-        {
+            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)
-        {
+        if (value.isEmpty() && nullIsOk) {
             return null;
         }
 
-        try
-        {
+        try {
             return Integer.parseInt(record.get(key));
-        }
-        catch(NumberFormatException e)
-        {
+        } catch (NumberFormatException e) {
             throw new FormatException("Failed to parse field: " + key, e);
         }
     }
@@ -68,25 +57,19 @@ public class CSVHelpers {
      * int, a FormatException is thrown.
      */
     static Long extractLong(String key, CSVRecord record, boolean nullIsOk)
-            throws FormatException
-    {
-        if(record.isMapped(key) == false)
-        {
+            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)
-        {
+        if (value.isEmpty() && nullIsOk) {
             return null;
         }
 
-        try
-        {
+        try {
             return Long.parseLong(record.get(key));
-        }
-        catch(NumberFormatException e)
-        {
+        } catch (NumberFormatException e) {
             throw new FormatException("Failed to parse field: " + key, e);
         }
     }

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

@@ -2,10 +2,12 @@ package protect.card_locker.importexport;
 
 import android.content.Context;
 import android.database.Cursor;
+import android.database.sqlite.SQLiteDatabase;
 import android.graphics.Bitmap;
 
 import net.lingala.zip4j.io.outputstream.ZipOutputStream;
 import net.lingala.zip4j.model.ZipParameters;
+import net.lingala.zip4j.model.enums.EncryptionMethod;
 import net.lingala.zip4j.util.InternalZipConstants;
 
 import org.apache.commons.csv.CSVFormat;
@@ -21,6 +23,7 @@ import java.nio.charset.StandardCharsets;
 
 import protect.card_locker.DBHelper;
 import protect.card_locker.Group;
+import protect.card_locker.ImageLocationType;
 import protect.card_locker.LoyaltyCard;
 import protect.card_locker.Utils;
 
@@ -28,25 +31,28 @@ import protect.card_locker.Utils;
  * Class for exporting the database into CSV (Comma Separate Values)
  * format.
  */
-public class CatimaExporter implements Exporter
-{
-    public void exportData(Context context, DBHelper db, OutputStream output) throws IOException, InterruptedException
-    {
+public class CatimaExporter implements Exporter {
+    public void exportData(Context context, SQLiteDatabase database, OutputStream output, char[] password) throws IOException, InterruptedException {
         // Necessary vars
         int readLen;
         byte[] readBuffer = new byte[InternalZipConstants.BUFF_SIZE];
 
         // Create zip output stream
-        ZipOutputStream zipOutputStream = new ZipOutputStream(output);
+        ZipOutputStream zipOutputStream;
+
+        if (password != null && password.length > 0) {
+            zipOutputStream = new ZipOutputStream(output, password);
+        } else {
+            zipOutputStream = new ZipOutputStream(output);
+        }
 
         // Generate CSV
         ByteArrayOutputStream catimaOutputStream = new ByteArrayOutputStream();
         OutputStreamWriter catimaOutputStreamWriter = new OutputStreamWriter(catimaOutputStream, StandardCharsets.UTF_8);
-        writeCSV(db, catimaOutputStreamWriter);
+        writeCSV(database, catimaOutputStreamWriter);
 
         // Add CSV to zip file
-        ZipParameters csvZipParameters = new ZipParameters();
-        csvZipParameters.setFileNameInZip("catima.csv");
+        ZipParameters csvZipParameters = createZipParameters("catima.csv", password);
         zipOutputStream.putNextEntry(csvZipParameters);
         InputStream csvInputStream = new ByteArrayInputStream(catimaOutputStream.toByteArray());
         while ((readLen = csvInputStream.read(readBuffer)) != -1) {
@@ -55,24 +61,17 @@ public class CatimaExporter implements Exporter
         zipOutputStream.closeEntry();
 
         // Loop over all cards again
-        Cursor cardCursor = db.getLoyaltyCardCursor();
-        while(cardCursor.moveToNext())
-        {
+        Cursor cardCursor = DBHelper.getLoyaltyCardCursor(database);
+        while (cardCursor.moveToNext()) {
             // For each card
             LoyaltyCard card = LoyaltyCard.toLoyaltyCard(cardCursor);
 
-            // Prepare looping over both front and back image
-            boolean[] frontValues = new boolean[2];
-            frontValues[0] = true;
-            frontValues[1] = false;
-
             // For each image
-            for (boolean front : frontValues) {
+            for (ImageLocationType imageLocationType : ImageLocationType.values()) {
                 // If it exists, add to the .zip file
-                Bitmap image = Utils.retrieveCardImage(context, card.id, front);
+                Bitmap image = Utils.retrieveCardImage(context, card.id, imageLocationType);
                 if (image != null) {
-                    ZipParameters imageZipParameters = new ZipParameters();
-                    imageZipParameters.setFileNameInZip(Utils.getCardImageFileName(card.id, front));
+                    ZipParameters imageZipParameters = createZipParameters(Utils.getCardImageFileName(card.id, imageLocationType), password);
                     zipOutputStream.putNextEntry(imageZipParameters);
                     InputStream imageInputStream = new ByteArrayInputStream(Utils.bitmapToByteArray(image));
                     while ((readLen = imageInputStream.read(readBuffer)) != -1) {
@@ -86,7 +85,17 @@ public class CatimaExporter implements Exporter
         zipOutputStream.close();
     }
 
-    private void writeCSV(DBHelper db, OutputStreamWriter output) throws IOException, InterruptedException {
+    private ZipParameters createZipParameters(String fileName, char[] password) {
+        ZipParameters zipParameters = new ZipParameters();
+        zipParameters.setFileNameInZip(fileName);
+        if (password != null && password.length > 0) {
+            zipParameters.setEncryptFiles(true);
+            zipParameters.setEncryptionMethod(EncryptionMethod.AES);
+        }
+        return zipParameters;
+    }
+
+    private void writeCSV(SQLiteDatabase database, OutputStreamWriter output) throws IOException, InterruptedException {
         CSVPrinter printer = new CSVPrinter(output, CSVFormat.RFC4180);
 
         // Print the version
@@ -97,16 +106,14 @@ public class CatimaExporter implements Exporter
         // Print the header for groups
         printer.printRecord(DBHelper.LoyaltyCardDbGroups.ID);
 
-        Cursor groupCursor = db.getGroupCursor();
+        Cursor groupCursor = DBHelper.getGroupCursor(database);
 
-        while(groupCursor.moveToNext())
-        {
+        while (groupCursor.moveToNext()) {
             Group group = Group.toGroup(groupCursor);
 
             printer.printRecord(group._id);
 
-            if(Thread.currentThread().isInterrupted())
-            {
+            if (Thread.currentThread().isInterrupted()) {
                 throw new InterruptedException();
             }
         }
@@ -130,10 +137,9 @@ public class CatimaExporter implements Exporter
                 DBHelper.LoyaltyCardDbIds.STAR_STATUS,
                 DBHelper.LoyaltyCardDbIds.LAST_USED);
 
-        Cursor cardCursor = db.getLoyaltyCardCursor();
+        Cursor cardCursor = DBHelper.getLoyaltyCardCursor(database);
 
-        while(cardCursor.moveToNext())
-        {
+        while (cardCursor.moveToNext()) {
             LoyaltyCard card = LoyaltyCard.toLoyaltyCard(cardCursor);
 
             printer.printRecord(card.id,
@@ -149,8 +155,7 @@ public class CatimaExporter implements Exporter
                     card.starStatus,
                     card.lastUsed);
 
-            if(Thread.currentThread().isInterrupted())
-            {
+            if (Thread.currentThread().isInterrupted()) {
                 throw new InterruptedException();
             }
         }
@@ -164,18 +169,16 @@ public class CatimaExporter implements Exporter
         printer.printRecord(DBHelper.LoyaltyCardDbIdsGroups.cardID,
                 DBHelper.LoyaltyCardDbIdsGroups.groupID);
 
-        Cursor cardCursor2 = db.getLoyaltyCardCursor();
+        Cursor cardCursor2 = DBHelper.getLoyaltyCardCursor(database);
 
-        while(cardCursor2.moveToNext())
-        {
+        while (cardCursor2.moveToNext()) {
             LoyaltyCard card = LoyaltyCard.toLoyaltyCard(cardCursor2);
 
-            for (Group group : db.getLoyaltyCardGroups(card.id)) {
+            for (Group group : DBHelper.getLoyaltyCardGroups(database, card.id)) {
                 printer.printRecord(card.id, group._id);
             }
 
-            if(Thread.currentThread().isInterrupted())
-            {
+            if (Thread.currentThread().isInterrupted()) {
                 throw new InterruptedException();
             }
         }

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

@@ -4,8 +4,6 @@ import android.content.Context;
 import android.database.sqlite.SQLiteDatabase;
 import android.net.Uri;
 
-import com.google.zxing.BarcodeFormat;
-
 import net.lingala.zip4j.io.inputstream.ZipInputStream;
 import net.lingala.zip4j.model.LocalFileHeader;
 
@@ -37,18 +35,17 @@ import protect.card_locker.ZipUtils;
 /**
  * Class for importing a database from CSV (Comma Separate Values)
  * formatted data.
- *
+ * <p>
  * 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 CatimaImporter implements Importer
-{
-    public void importData(Context context, DBHelper db, InputStream input, char[] password) throws IOException, FormatException, InterruptedException {
+public class CatimaImporter implements Importer {
+    public void importData(Context context, SQLiteDatabase database, InputStream input, char[] password) throws IOException, FormatException, InterruptedException {
         InputStream bufferedInputStream = new BufferedInputStream(input);
         bufferedInputStream.mark(100);
 
         // First, check if this is a zip file
-        ZipInputStream zipInputStream = new ZipInputStream(bufferedInputStream);
+        ZipInputStream zipInputStream = new ZipInputStream(bufferedInputStream, password);
 
         boolean isZipFile = false;
 
@@ -58,7 +55,7 @@ public class CatimaImporter implements Importer
 
             String fileName = Uri.parse(localFileHeader.getFileName()).getLastPathSegment();
             if (fileName.equals("catima.csv")) {
-                importCSV(context, db, new ByteArrayInputStream(ZipUtils.read(zipInputStream).getBytes(StandardCharsets.UTF_8)));
+                importCSV(context, database, new ByteArrayInputStream(ZipUtils.read(zipInputStream).getBytes(StandardCharsets.UTF_8)));
             } else if (fileName.endsWith(".png")) {
                 Utils.saveCardImage(context, ZipUtils.readImage(zipInputStream), fileName);
             } else {
@@ -69,11 +66,11 @@ public class CatimaImporter implements Importer
         if (!isZipFile) {
             // This is not a zip file, try importing as bare CSV
             bufferedInputStream.reset();
-            importCSV(context, db, bufferedInputStream);
+            importCSV(context, database, bufferedInputStream);
         }
     }
 
-    public void importCSV(Context context, DBHelper db, InputStream input) throws IOException, FormatException, InterruptedException {
+    public void importCSV(Context context, SQLiteDatabase database, InputStream input) throws IOException, FormatException, InterruptedException {
         BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(input, StandardCharsets.UTF_8));
 
         bufferedReader.mark(100);
@@ -90,10 +87,10 @@ public class CatimaImporter implements Importer
 
         switch (version) {
             case 1:
-                parseV1(context, db, bufferedReader);
+                parseV1(context, database, bufferedReader);
                 break;
             case 2:
-                parseV2(context, db, bufferedReader);
+                parseV2(context, database, bufferedReader);
                 break;
             default:
                 throw new FormatException(String.format("No code to parse version %s", version));
@@ -102,44 +99,25 @@ public class CatimaImporter implements Importer
         bufferedReader.close();
     }
 
-    public void parseV1(Context context, DBHelper db, BufferedReader input) throws IOException, FormatException, InterruptedException
-    {
-        final CSVParser parser = new CSVParser(input, CSVFormat.RFC4180.withHeader());
+    public void parseV1(Context context, SQLiteDatabase database, BufferedReader input) throws IOException, FormatException, InterruptedException {
+        final CSVParser parser = new CSVParser(input, CSVFormat.RFC4180.builder().setHeader().build());
 
-        SQLiteDatabase database = db.getWritableDatabase();
-        database.beginTransaction();
+        try {
+            for (CSVRecord record : parser) {
+                importLoyaltyCard(context, database, record);
 
-        try
-        {
-            for (CSVRecord record : parser)
-            {
-                importLoyaltyCard(context, database, db, record);
-
-                if(Thread.currentThread().isInterrupted())
-                {
+                if (Thread.currentThread().isInterrupted()) {
                     throw new InterruptedException();
                 }
             }
 
             parser.close();
-            database.setTransactionSuccessful();
-        }
-        catch(IllegalArgumentException|IllegalStateException e)
-        {
+        } catch (IllegalArgumentException | IllegalStateException e) {
             throw new FormatException("Issue parsing CSV data", e);
         }
-        finally
-        {
-            database.endTransaction();
-            database.close();
-        }
     }
 
-    public void parseV2(Context context, DBHelper db, BufferedReader input) throws IOException, FormatException, InterruptedException
-    {
-        SQLiteDatabase database = db.getWritableDatabase();
-        database.beginTransaction();
-
+    public void parseV2(Context context, SQLiteDatabase database, BufferedReader input) throws IOException, FormatException, InterruptedException {
         Integer part = 0;
         String stringPart = "";
 
@@ -157,7 +135,7 @@ public class CatimaImporter implements Importer
                             break;
                         case 1:
                             try {
-                                parseV2Groups(db, database, stringPart);
+                                parseV2Groups(database, stringPart);
                                 sectionParsed = true;
                             } catch (FormatException e) {
                                 // We may have a multiline field, try again
@@ -165,7 +143,7 @@ public class CatimaImporter implements Importer
                             break;
                         case 2:
                             try {
-                                parseV2Cards(context, db, database, stringPart);
+                                parseV2Cards(context, database, stringPart);
                                 sectionParsed = true;
                             } catch (FormatException e) {
                                 // We may have a multiline field, try again
@@ -173,7 +151,7 @@ public class CatimaImporter implements Importer
                             break;
                         case 3:
                             try {
-                                parseV2CardGroups(db, database, stringPart);
+                                parseV2CardGroups(database, stringPart);
                                 sectionParsed = true;
                             } catch (FormatException e) {
                                 // We may have a multiline field, try again
@@ -197,19 +175,14 @@ public class CatimaImporter implements Importer
                     stringPart += tmp + "\n";
                 }
             }
-            database.setTransactionSuccessful();
         } catch (FormatException e) {
             throw new FormatException("Issue parsing CSV data", e);
-        } finally {
-            database.endTransaction();
-            database.close();
         }
     }
 
-    public void parseV2Groups(DBHelper db, SQLiteDatabase database, String data) throws IOException, FormatException, InterruptedException
-    {
+    public void parseV2Groups(SQLiteDatabase database, String data) throws IOException, FormatException, InterruptedException {
         // Parse groups
-        final CSVParser groupParser = new CSVParser(new StringReader(data), CSVFormat.RFC4180.withHeader());
+        final CSVParser groupParser = new CSVParser(new StringReader(data), CSVFormat.RFC4180.builder().setHeader().build());
 
         List<CSVRecord> records = new ArrayList<>();
 
@@ -228,14 +201,13 @@ public class CatimaImporter implements Importer
         }
 
         for (CSVRecord record : records) {
-            importGroup(database, db, record);
+            importGroup(database, record);
         }
     }
 
-    public void parseV2Cards(Context context, DBHelper db, SQLiteDatabase database, String data) throws IOException, FormatException, InterruptedException
-    {
+    public void parseV2Cards(Context context, SQLiteDatabase database, String data) throws IOException, FormatException, InterruptedException {
         // Parse cards
-        final CSVParser cardParser = new CSVParser(new StringReader(data), CSVFormat.RFC4180.withHeader());
+        final CSVParser cardParser = new CSVParser(new StringReader(data), CSVFormat.RFC4180.builder().setHeader().build());
 
         List<CSVRecord> records = new ArrayList<>();
 
@@ -254,14 +226,13 @@ public class CatimaImporter implements Importer
         }
 
         for (CSVRecord record : records) {
-            importLoyaltyCard(context, database, db, record);
+            importLoyaltyCard(context, database, record);
         }
     }
 
-    public void parseV2CardGroups(DBHelper db, SQLiteDatabase database, String data) throws IOException, FormatException, InterruptedException
-    {
+    public void parseV2CardGroups(SQLiteDatabase database, String data) throws IOException, FormatException, InterruptedException {
         // Parse card group mappings
-        final CSVParser cardGroupParser = new CSVParser(new StringReader(data), CSVFormat.RFC4180.withHeader());
+        final CSVParser cardGroupParser = new CSVParser(new StringReader(data), CSVFormat.RFC4180.builder().setHeader().build());
 
         List<CSVRecord> records = new ArrayList<>();
 
@@ -280,7 +251,7 @@ public class CatimaImporter implements Importer
         }
 
         for (CSVRecord record : records) {
-            importCardGroupMapping(database, db, record);
+            importCardGroupMapping(database, record);
         }
     }
 
@@ -288,14 +259,12 @@ public class CatimaImporter implements Importer
      * Import a single loyalty card into the database using the given
      * session.
      */
-    private void importLoyaltyCard(Context context, SQLiteDatabase database, DBHelper helper, CSVRecord record)
-            throws IOException, FormatException
-    {
+    private void importLoyaltyCard(Context context, SQLiteDatabase database, CSVRecord record)
+            throws IOException, FormatException {
         int id = CSVHelpers.extractInt(DBHelper.LoyaltyCardDbIds.ID, record, false);
 
         String store = CSVHelpers.extractString(DBHelper.LoyaltyCardDbIds.STORE, record, "");
-        if(store.isEmpty())
-        {
+        if (store.isEmpty()) {
             throw new FormatException("No store listed, but is required");
         }
 
@@ -303,12 +272,13 @@ public class CatimaImporter implements Importer
         Date expiry = null;
         try {
             expiry = new Date(CSVHelpers.extractLong(DBHelper.LoyaltyCardDbIds.EXPIRY, record, true));
-        } catch (NullPointerException | FormatException e) { }
+        } catch (NullPointerException | FormatException e) {
+        }
 
         BigDecimal balance;
         try {
             balance = new BigDecimal(CSVHelpers.extractString(DBHelper.LoyaltyCardDbIds.BALANCE, record, null));
-        } catch (FormatException _e ) {
+        } 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
             balance = new BigDecimal("0");
@@ -316,33 +286,29 @@ public class CatimaImporter implements Importer
 
         Currency balanceType = null;
         String unparsedBalanceType = CSVHelpers.extractString(DBHelper.LoyaltyCardDbIds.BALANCE_TYPE, record, "");
-        if(!unparsedBalanceType.isEmpty()) {
+        if (!unparsedBalanceType.isEmpty()) {
             balanceType = Currency.getInstance(unparsedBalanceType);
         }
 
         String cardId = CSVHelpers.extractString(DBHelper.LoyaltyCardDbIds.CARD_ID, record, "");
-        if(cardId.isEmpty())
-        {
+        if (cardId.isEmpty()) {
             throw new FormatException("No card ID listed, but is required");
         }
 
         String barcodeId = CSVHelpers.extractString(DBHelper.LoyaltyCardDbIds.BARCODE_ID, record, "");
-        if(barcodeId.isEmpty())
-        {
+        if (barcodeId.isEmpty()) {
             barcodeId = null;
         }
 
         CatimaBarcode barcodeType = null;
         String unparsedBarcodeType = CSVHelpers.extractString(DBHelper.LoyaltyCardDbIds.BARCODE_TYPE, record, "");
-        if(!unparsedBarcodeType.isEmpty())
-        {
+        if (!unparsedBarcodeType.isEmpty()) {
             barcodeType = CatimaBarcode.fromName(unparsedBarcodeType);
         }
 
         Integer headerColor = null;
 
-        if(record.isMapped(DBHelper.LoyaltyCardDbIds.HEADER_COLOR))
-        {
+        if (record.isMapped(DBHelper.LoyaltyCardDbIds.HEADER_COLOR)) {
             headerColor = CSVHelpers.extractInt(DBHelper.LoyaltyCardDbIds.HEADER_COLOR, record, true);
         }
 
@@ -363,33 +329,29 @@ public class CatimaImporter implements Importer
             // We catch this exception so we can still import old backups
         }
 
-        helper.insertLoyaltyCard(database, id, store, note, expiry, balance, balanceType, cardId, barcodeId, barcodeType, headerColor, starStatus, lastUsed);
+        DBHelper.insertLoyaltyCard(database, id, store, note, expiry, balance, balanceType, cardId, barcodeId, barcodeType, headerColor, starStatus, lastUsed);
     }
 
     /**
      * Import a single group into the database using the given
      * session.
      */
-    private void importGroup(SQLiteDatabase database, DBHelper helper, CSVRecord record)
-            throws IOException, FormatException
-    {
+    private void importGroup(SQLiteDatabase database, CSVRecord record) throws FormatException {
         String id = CSVHelpers.extractString(DBHelper.LoyaltyCardDbGroups.ID, record, null);
 
-        helper.insertGroup(database, id);
+        DBHelper.insertGroup(database, id);
     }
 
     /**
      * Import a single card to group mapping into the database using the given
      * session.
      */
-    private void importCardGroupMapping(SQLiteDatabase database, DBHelper helper, CSVRecord record)
-            throws IOException, FormatException
-    {
+    private void importCardGroupMapping(SQLiteDatabase database, CSVRecord record) throws FormatException {
         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));
-        helper.setLoyaltyCardGroups(database, cardId, cardGroups);
+        List<Group> cardGroups = DBHelper.getLoyaltyCardGroups(database, cardId);
+        cardGroups.add(DBHelper.getGroup(database, groupId));
+        DBHelper.setLoyaltyCardGroups(database, cardId, cardGroups);
     }
 }

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

@@ -1,10 +1,8 @@
 package protect.card_locker.importexport;
 
-public enum DataFormat
-{
+public enum DataFormat {
     Catima,
     Fidme,
     Stocard,
-    VoucherVault
-    ;
+    VoucherVault;
 }

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

@@ -1,6 +1,7 @@
 package protect.card_locker.importexport;
 
 import android.content.Context;
+import android.database.sqlite.SQLiteDatabase;
 
 import java.io.IOException;
 import java.io.OutputStream;
@@ -11,11 +12,11 @@ import protect.card_locker.DBHelper;
  * Interface for a class which can export the contents of the database
  * in a given format.
  */
-public interface Exporter
-{
+public interface Exporter {
     /**
      * Export the database to the output stream in a given format.
+     *
      * @throws IOException
      */
-    void exportData(Context context, DBHelper db, OutputStream output) throws IOException, InterruptedException;
+    void exportData(Context context, SQLiteDatabase database, OutputStream output, char[] password) throws IOException, InterruptedException;
 }

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

@@ -3,8 +3,6 @@ package protect.card_locker.importexport;
 import android.content.Context;
 import android.database.sqlite.SQLiteDatabase;
 
-import com.google.zxing.BarcodeFormat;
-
 import net.lingala.zip4j.io.inputstream.ZipInputStream;
 import net.lingala.zip4j.model.LocalFileHeader;
 
@@ -23,18 +21,16 @@ import java.text.ParseException;
 import protect.card_locker.CatimaBarcode;
 import protect.card_locker.DBHelper;
 import protect.card_locker.FormatException;
-import protect.card_locker.Utils;
 
 /**
  * Class for importing a database from CSV (Comma Separate Values)
  * formatted data.
- *
+ * <p>
  * 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 Importer
-{
-    public void importData(Context context, DBHelper db, InputStream input, char[] password) throws IOException, FormatException, JSONException, ParseException {
+public class FidmeImporter implements Importer {
+    public void importData(Context context, SQLiteDatabase database, InputStream input, char[] password) throws IOException, FormatException, JSONException, ParseException {
         // We actually retrieve a .zip file
         ZipInputStream zipInputStream = new ZipInputStream(input, password);
 
@@ -56,14 +52,11 @@ public class FidmeImporter implements Importer
             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());
+        final CSVParser fidmeParser = new CSVParser(new StringReader(loyaltyCards.toString()), CSVFormat.RFC4180.builder().setDelimiter(';').setHeader().build());
 
         try {
             for (CSVRecord record : fidmeParser) {
-                importLoyaltyCard(database, db, record);
+                importLoyaltyCard(database, record);
 
                 if (Thread.currentThread().isInterrupted()) {
                     throw new InterruptedException();
@@ -75,10 +68,6 @@ public class FidmeImporter implements Importer
             fidmeParser.close();
         }
 
-        database.setTransactionSuccessful();
-        database.endTransaction();
-        database.close();
-
         zipInputStream.close();
     }
 
@@ -86,9 +75,8 @@ public class FidmeImporter implements Importer
      * Import a single loyalty card into the database using the given
      * session.
      */
-    private void importLoyaltyCard(SQLiteDatabase database, DBHelper helper, CSVRecord record)
-            throws IOException, FormatException
-    {
+    private void importLoyaltyCard(SQLiteDatabase database, CSVRecord record)
+            throws FormatException {
         // A loyalty card export from Fidme contains the following fields:
         // Retailer (store name)
         // Program (program name)
@@ -100,8 +88,7 @@ public class FidmeImporter implements Importer
         // The store is called Retailer
         String store = CSVHelpers.extractString("Retailer", record, "");
 
-        if (store.isEmpty())
-        {
+        if (store.isEmpty()) {
             throw new FormatException("No store listed, but is required");
         }
 
@@ -121,8 +108,7 @@ public class FidmeImporter implements Importer
 
         // The ID is called reference
         String cardId = CSVHelpers.extractString("Reference", record, "");
-        if(cardId.isEmpty())
-        {
+        if (cardId.isEmpty()) {
             throw new FormatException("No card ID listed, but is required");
         }
 
@@ -136,6 +122,6 @@ public class FidmeImporter implements Importer
 
         // TODO: Front and back image
 
-        helper.insertLoyaltyCard(database, store, note, null, BigDecimal.valueOf(0), null, cardId, null, barcodeType, null, starStatus, null);
+        DBHelper.insertLoyaltyCard(database, store, note, null, BigDecimal.valueOf(0), null, cardId, null, barcodeType, null, starStatus, null);
     }
 }

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

@@ -1,9 +1,7 @@
 package protect.card_locker.importexport;
 
-public enum ImportExportResult
-{
+public enum ImportExportResult {
     Success,
     GenericFailure,
-    BadPassword
-    ;
+    BadPassword;
 }

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

@@ -1,6 +1,7 @@
 package protect.card_locker.importexport;
 
 import android.content.Context;
+import android.database.sqlite.SQLiteDatabase;
 
 import org.json.JSONException;
 
@@ -8,20 +9,19 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.text.ParseException;
 
-import protect.card_locker.DBHelper;
 import protect.card_locker.FormatException;
 
 /**
  * Interface for a class which can import the contents of a stream
  * into the database.
  */
-public interface Importer
-{
+public interface Importer {
     /**
      * Import data from the input stream in a given format into
      * the database.
+     *
      * @throws IOException
      * @throws FormatException
      */
-    void importData(Context context, DBHelper db, InputStream input, char[] password) throws IOException, FormatException, InterruptedException, JSONException, ParseException;
+    void importData(Context context, SQLiteDatabase database, InputStream input, char[] password) throws IOException, FormatException, InterruptedException, JSONException, ParseException;
 }

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

@@ -1,6 +1,7 @@
 package protect.card_locker.importexport;
 
 import android.content.Context;
+import android.database.sqlite.SQLiteDatabase;
 import android.util.Log;
 
 import java.io.IOException;
@@ -8,26 +9,23 @@ import java.io.OutputStream;
 
 import protect.card_locker.DBHelper;
 
-public class MultiFormatExporter
-{
+public class MultiFormatExporter {
     private static final String TAG = "Catima";
 
     /**
      * Attempts to export data to the output stream in the
      * given format, if possible.
-     *
+     * <p>
      * The output stream is closed on success.
      *
      * @return ImportExportResult.Success if the database was successfully exported,
      * another ImportExportResult otherwise. If not Success, partial data may have been
      * written to the output stream, and it should be discarded.
      */
-    public static ImportExportResult exportData(Context context, DBHelper db, OutputStream output, DataFormat format)
-    {
+    public static ImportExportResult exportData(Context context, SQLiteDatabase database, OutputStream output, DataFormat format, char[] password) {
         Exporter exporter = null;
 
-        switch(format)
-        {
+        switch (format) {
             case Catima:
                 exporter = new CatimaExporter();
                 break;
@@ -36,26 +34,18 @@ public class MultiFormatExporter
                 break;
         }
 
-        if(exporter != null)
-        {
-            try
-            {
-                exporter.exportData(context, db, output);
+        if (exporter != null) {
+            try {
+                exporter.exportData(context, database, output, password);
                 return ImportExportResult.Success;
-            }
-            catch(IOException e)
-            {
+            } catch (IOException e) {
                 Log.e(TAG, "Failed to export data", e);
-            }
-            catch(InterruptedException e)
-            {
+            } catch (InterruptedException e) {
                 Log.e(TAG, "Failed to export data", e);
             }
 
             return ImportExportResult.GenericFailure;
-        }
-        else
-        {
+        } else {
             Log.e(TAG, "Unsupported data format exported: " + format.name());
             return ImportExportResult.GenericFailure;
         }

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

@@ -1,6 +1,7 @@
 package protect.card_locker.importexport;
 
 import android.content.Context;
+import android.database.sqlite.SQLiteDatabase;
 import android.util.Log;
 
 import net.lingala.zip4j.exception.ZipException;
@@ -14,14 +15,13 @@ import java.text.ParseException;
 import protect.card_locker.DBHelper;
 import protect.card_locker.FormatException;
 
-public class MultiFormatImporter
-{
+public class MultiFormatImporter {
     private static final String TAG = "Catima";
 
     /**
      * Attempts to import data from the input stream of the
      * given format into the database.
-     *
+     * <p>
      * The input stream is not closed, and doing so is the
      * responsibility of the caller.
      *
@@ -29,12 +29,10 @@ public class MultiFormatImporter
      * or another result otherwise. If no Success, no data was written to
      * the database.
      */
-    public static ImportExportResult importData(Context context, DBHelper db, InputStream input, DataFormat format, char[] password)
-    {
+    public static ImportExportResult importData(Context context, SQLiteDatabase database, InputStream input, DataFormat format, char[] password) {
         Importer importer = null;
 
-        switch(format)
-        {
+        switch (format) {
             case Catima:
                 importer = new CatimaImporter();
                 break;
@@ -49,25 +47,20 @@ public class MultiFormatImporter
                 break;
         }
 
-        if (importer != null)
-        {
-            try
-            {
-                importer.importData(context, db, input, password);
+        if (importer != null) {
+            database.beginTransaction();
+            try {
+                importer.importData(context, database, input, password);
+                database.setTransactionSuccessful();
                 return ImportExportResult.Success;
-            }
-            catch(ZipException e)
-            {
+            } catch (ZipException e) {
                 return ImportExportResult.BadPassword;
-            }
-            catch(IOException | FormatException | InterruptedException | JSONException | ParseException | NullPointerException e)
-            {
+            } catch (IOException | FormatException | InterruptedException | JSONException | ParseException | NullPointerException e) {
                 Log.e(TAG, "Failed to import data", e);
+            } finally {
+                database.endTransaction();
             }
-
-        }
-        else
-        {
+        } else {
             Log.e(TAG, "Unsupported data format imported: " + format.name());
         }
 

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

@@ -26,6 +26,7 @@ import java.util.HashMap;
 import protect.card_locker.CatimaBarcode;
 import protect.card_locker.DBHelper;
 import protect.card_locker.FormatException;
+import protect.card_locker.ImageLocationType;
 import protect.card_locker.R;
 import protect.card_locker.Utils;
 import protect.card_locker.ZipUtils;
@@ -33,22 +34,19 @@ import protect.card_locker.ZipUtils;
 /**
  * Class for importing a database from CSV (Comma Separate Values)
  * formatted data.
- *
+ * <p>
  * 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 StocardImporter implements Importer
-{
-    public void importData(Context context, DBHelper db, InputStream input, char[] password) throws IOException, FormatException, JSONException, ParseException {
+public class StocardImporter implements Importer {
+    public void importData(Context context, SQLiteDatabase database, InputStream input, char[] password) throws IOException, FormatException, JSONException, ParseException {
         HashMap<String, HashMap<String, Object>> loyaltyCardHashMap = new HashMap<>();
         HashMap<String, HashMap<String, String>> providers = new HashMap<>();
 
-        final CSVParser parser = new CSVParser(new InputStreamReader(context.getResources().openRawResource(R.raw.stocard_stores), StandardCharsets.UTF_8), CSVFormat.RFC4180.withHeader());
+        final CSVParser parser = new CSVParser(new InputStreamReader(context.getResources().openRawResource(R.raw.stocard_stores), StandardCharsets.UTF_8), CSVFormat.RFC4180.builder().setHeader().build());
 
-        try
-        {
-            for (CSVRecord record : parser)
-            {
+        try {
+            for (CSVRecord record : parser) {
                 HashMap<String, String> recordData = new HashMap<>();
                 recordData.put("name", record.get("name"));
                 recordData.put("barcodeFormat", record.get("barcodeFormat"));
@@ -57,7 +55,7 @@ public class StocardImporter implements Importer
             }
 
             parser.close();
-        } catch(IllegalArgumentException|IllegalStateException e) {
+        } catch (IllegalArgumentException | IllegalStateException e) {
             throw new FormatException("Issue parsing CSV data", e);
         }
 
@@ -72,7 +70,7 @@ public class StocardImporter implements Importer
             String[] nameParts = fileName.split("/");
 
             if (providersFileName == null) {
-                providersFileName = new String[] {
+                providersFileName = new String[]{
                         nameParts[0],
                         "sync",
                         "data",
@@ -80,7 +78,7 @@ public class StocardImporter implements Importer
                         nameParts[0],
                         "analytics-properties.json"
                 };
-                cardBaseName = new String[] {
+                cardBaseName = new String[]{
                         nameParts[0],
                         "sync",
                         "data",
@@ -111,19 +109,19 @@ public class StocardImporter implements Importer
                                 cardName,
                                 "_providerId",
                                 jsonObject
-                                    .getJSONObject("input_provider_reference")
-                                    .getString("identifier")
-                                    .substring("/loyalty-card-providers/".length())
+                                        .getJSONObject("input_provider_reference")
+                                        .getString("identifier")
+                                        .substring("/loyalty-card-providers/".length())
                         );
 
-                        try {
+                        if (jsonObject.has("input_barcode_format")) {
                             loyaltyCardHashMap = appendToLoyaltyCardHashMap(
                                     loyaltyCardHashMap,
                                     cardName,
                                     "barcodeType",
                                     jsonObject.getString("input_barcode_format")
                             );
-                        } catch (JSONException ignored) {}
+                        }
                     }
                 } else if (fileName.endsWith("notes/default.json")) {
                     loyaltyCardHashMap = appendToLoyaltyCardHashMap(
@@ -131,7 +129,7 @@ public class StocardImporter implements Importer
                             cardName,
                             "note",
                             ZipUtils.readJSON(zipInputStream)
-                                .getString("content")
+                                    .getString("content")
                     );
                 } else if (fileName.endsWith("/images/front.png")) {
                     loyaltyCardHashMap = appendToLoyaltyCardHashMap(
@@ -155,9 +153,6 @@ public class StocardImporter implements Importer
             throw new FormatException("Couldn't find any loyalty cards in this Stocard export.");
         }
 
-        SQLiteDatabase database = db.getWritableDatabase();
-        database.beginTransaction();
-
         for (HashMap<String, Object> loyaltyCardData : loyaltyCardHashMap.values()) {
             String providerId = (String) loyaltyCardData.get("_providerId");
             HashMap<String, String> providerData = providers.get(providerId);
@@ -175,20 +170,16 @@ public class StocardImporter implements Importer
                 }
             }
 
-            long loyaltyCardInternalId = db.insertLoyaltyCard(database, store, note, null, BigDecimal.valueOf(0), null, cardId, null, barcodeType, null, 0, null);
+            long loyaltyCardInternalId = DBHelper.insertLoyaltyCard(database, store, note, null, BigDecimal.valueOf(0), null, cardId, null, barcodeType, null, 0, null);
 
             if (loyaltyCardData.containsKey("frontImage")) {
-                Utils.saveCardImage(context, (Bitmap) loyaltyCardData.get("frontImage"), (int) loyaltyCardInternalId, true);
+                Utils.saveCardImage(context, (Bitmap) loyaltyCardData.get("frontImage"), (int) loyaltyCardInternalId, ImageLocationType.front);
             }
             if (loyaltyCardData.containsKey("backImage")) {
-                Utils.saveCardImage(context, (Bitmap) loyaltyCardData.get("backImage"), (int) loyaltyCardInternalId, false);
+                Utils.saveCardImage(context, (Bitmap) loyaltyCardData.get("backImage"), (int) loyaltyCardInternalId, ImageLocationType.back);
             }
         }
 
-        database.setTransactionSuccessful();
-        database.endTransaction();
-        database.close();
-
         zipInputStream.close();
     }
 

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

@@ -31,13 +31,12 @@ import protect.card_locker.Utils;
 /**
  * Class for importing a database from CSV (Comma Separate Values)
  * formatted data.
- *
+ * <p>
  * 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 VoucherVaultImporter implements Importer
-{
-    public void importData(Context context, DBHelper db, InputStream input, char[] password) throws IOException, FormatException, JSONException, ParseException {
+public class VoucherVaultImporter implements Importer {
+    public void importData(Context context, SQLiteDatabase database, InputStream input, char[] password) throws IOException, FormatException, JSONException, ParseException {
         BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(input, StandardCharsets.UTF_8));
 
         StringBuilder sb = new StringBuilder();
@@ -47,9 +46,6 @@ public class VoucherVaultImporter implements Importer
         }
         JSONArray jsonArray = new JSONArray(sb.toString());
 
-        SQLiteDatabase database = db.getWritableDatabase();
-        database.beginTransaction();
-
         // See https://github.com/tim-smart/vouchervault/issues/4#issuecomment-788226503 for more info
         for (int i = 0; i < jsonArray.length(); i++) {
             JSONObject jsonCard = jsonArray.getJSONObject(i);
@@ -130,13 +126,9 @@ public class VoucherVaultImporter implements Importer
                     throw new FormatException("Unknown colour type found: " + colorFromJSON);
             }
 
-            db.insertLoyaltyCard(store, "", expiry, balance, balanceType, cardId, null, barcodeType, headerColor, 0, Utils.getUnixTime());
+            DBHelper.insertLoyaltyCard(database, store, "", expiry, balance, balanceType, cardId, null, barcodeType, headerColor, 0, Utils.getUnixTime());
         }
 
-        database.setTransactionSuccessful();
-        database.endTransaction();
-        database.close();
-
         bufferedReader.close();
     }
 }

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

@@ -12,44 +12,36 @@ import androidx.preference.PreferenceManager;
 import protect.card_locker.R;
 import protect.card_locker.Utils;
 
-public class Settings
-{
-    private Context context;
-    private SharedPreferences settings;
+public class Settings {
+    private final Context mContext;
+    private SharedPreferences mSettings;
 
-    public Settings(Context context)
-    {
-        this.context = context;
-        this.settings = PreferenceManager.getDefaultSharedPreferences(context);
+    public Settings(Context context) {
+        mContext = context.getApplicationContext();
+        mSettings = PreferenceManager.getDefaultSharedPreferences(context);
     }
 
-    private String getResString(@StringRes int resId)
-    {
-        return context.getString(resId);
+    private String getResString(@StringRes int resId) {
+        return mContext.getString(resId);
     }
 
-    private int getResInt(@IntegerRes int resId)
-    {
-        return context.getResources().getInteger(resId);
+    private int getResInt(@IntegerRes int resId) {
+        return mContext.getResources().getInteger(resId);
     }
 
-    private String getString(@StringRes int keyId, String defaultValue)
-    {
-        return settings.getString(getResString(keyId), defaultValue);
+    private String getString(@StringRes int keyId, String defaultValue) {
+        return mSettings.getString(getResString(keyId), defaultValue);
     }
 
-    private int getInt(@StringRes int keyId, @IntegerRes int defaultId)
-    {
-        return settings.getInt(getResString(keyId), getResInt(defaultId));
+    private int getInt(@StringRes int keyId, @IntegerRes int defaultId) {
+        return mSettings.getInt(getResString(keyId), getResInt(defaultId));
     }
 
-    private boolean getBoolean(@StringRes int keyId, boolean defaultValue)
-    {
-        return settings.getBoolean(getResString(keyId), defaultValue);
+    private boolean getBoolean(@StringRes int keyId, boolean defaultValue) {
+        return mSettings.getBoolean(getResString(keyId), defaultValue);
     }
 
-    public Locale getLocale()
-    {
+    public Locale getLocale() {
         String value = getString(R.string.settings_key_locale, "");
 
         if (value.length() == 0) {
@@ -59,69 +51,55 @@ public class Settings
         return Utils.stringToLocale(value);
     }
 
-    public int getTheme()
-    {
+    public int getTheme() {
         String value = getString(R.string.settings_key_theme, getResString(R.string.settings_key_system_theme));
 
-        if(value.equals(getResString(R.string.settings_key_light_theme)))
-        {
+        if (value.equals(getResString(R.string.settings_key_light_theme))) {
             return AppCompatDelegate.MODE_NIGHT_NO;
-        }
-        else if(value.equals(getResString(R.string.settings_key_dark_theme)))
-        {
+        } else if (value.equals(getResString(R.string.settings_key_dark_theme))) {
             return AppCompatDelegate.MODE_NIGHT_YES;
         }
 
         return AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM;
     }
 
-    public double getFontSizeScale()
-    {
+    public double getFontSizeScale() {
         return getInt(R.string.settings_key_max_font_size_scale, R.integer.settings_max_font_size_scale_pct) / 100.0;
     }
 
-    public int getSmallFont()
-    {
+    public int getSmallFont() {
         return 14;
     }
 
-    public int getMediumFont()
-    {
+    public int getMediumFont() {
         return 28;
     }
 
-    public int getLargeFont()
-    {
+    public int getLargeFont() {
         return 40;
     }
 
-    public int getFontSizeMin(int fontSize)
-    {
+    public int getFontSizeMin(int fontSize) {
         return (int) (Math.round(fontSize / 2.0) - 1);
     }
 
-    public int getFontSizeMax(int fontSize)
-    {
+    public int getFontSizeMax(int fontSize) {
         return (int) Math.round(fontSize * getFontSizeScale());
     }
 
-    public boolean useMaxBrightnessDisplayingBarcode()
-    {
+    public boolean useMaxBrightnessDisplayingBarcode() {
         return getBoolean(R.string.settings_key_display_barcode_max_brightness, true);
     }
 
-    public boolean getLockBarcodeScreenOrientation()
-    {
+    public boolean getLockBarcodeScreenOrientation() {
         return getBoolean(R.string.settings_key_lock_barcode_orientation, false);
     }
 
-    public boolean getKeepScreenOn()
-    {
+    public boolean getKeepScreenOn() {
         return getBoolean(R.string.settings_key_keep_screen_on, true);
     }
 
-    public boolean getDisableLockscreenWhileViewingCard()
-    {
+    public boolean getDisableLockscreenWhileViewingCard() {
         return getBoolean(R.string.settings_key_disable_lockscreen_while_viewing_card, true);
     }
 }

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

@@ -1,74 +1,98 @@
 package protect.card_locker.preferences;
 
 
+import android.app.Activity;
+import android.content.Intent;
 import android.os.Bundle;
 import android.view.MenuItem;
 
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AppCompatDelegate;
+import androidx.appcompat.widget.Toolbar;
+import androidx.fragment.app.DialogFragment;
+import androidx.preference.ListPreference;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceFragmentCompat;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
 
-import androidx.appcompat.app.ActionBar;
-import androidx.appcompat.app.AppCompatDelegate;
-import androidx.appcompat.widget.Toolbar;
-import androidx.core.app.ActivityCompat;
-import androidx.fragment.app.DialogFragment;
-import androidx.fragment.app.FragmentActivity;
-import androidx.preference.ListPreference;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceFragmentCompat;
 import nl.invissvenska.numberpickerpreference.NumberDialogPreference;
 import nl.invissvenska.numberpickerpreference.NumberPickerPreferenceDialogFragment;
 import protect.card_locker.CatimaAppCompatActivity;
+import protect.card_locker.MainActivity;
 import protect.card_locker.R;
 import protect.card_locker.Utils;
 
-public class SettingsActivity extends CatimaAppCompatActivity
-{
+public class SettingsActivity extends CatimaAppCompatActivity {
+
+    private final static String RELOAD_MAIN_STATE = "mReloadMain";
+    private SettingsFragment fragment;
+
     @Override
-    protected void onCreate(Bundle savedInstanceState)
-    {
+    protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setTitle(R.string.settings);
         setContentView(R.layout.settings_activity);
         Toolbar toolbar = findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
         ActionBar actionBar = getSupportActionBar();
-        if(actionBar != null)
-        {
+        if (actionBar != null) {
             actionBar.setDisplayHomeAsUpEnabled(true);
         }
 
         // Display the fragment as the main content.
-        SettingsFragment fragment = new SettingsFragment();
-        fragment.setParentReference(this);
+        fragment = new SettingsFragment();
         getSupportFragmentManager().beginTransaction()
                 .replace(R.id.settings_container, fragment)
                 .commit();
+
+        // restore reload main state
+        if (savedInstanceState != null) {
+            fragment.mReloadMain = savedInstanceState.getBoolean(RELOAD_MAIN_STATE);
+        }
     }
 
     @Override
-    public boolean onOptionsItemSelected(MenuItem item)
-    {
+    protected void onSaveInstanceState(@NonNull Bundle outState) {
+        super.onSaveInstanceState(outState);
+        outState.putBoolean(RELOAD_MAIN_STATE, fragment.mReloadMain);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
         int id = item.getItemId();
 
-        if(id == android.R.id.home)
-        {
-            finish();
+        if (id == android.R.id.home) {
+            finishSettingsActivity();
             return true;
         }
 
         return super.onOptionsItemSelected(item);
     }
 
-    public static class SettingsFragment extends PreferenceFragmentCompat
-    {
-        private static final String DIALOG_FRAGMENT_TAG = "SettingsFragment";
-        private SettingsActivity parent;
+    @Override
+    public void onBackPressed() {
+        finishSettingsActivity();
+    }
 
-        public void setParentReference(SettingsActivity settingsActivity) {
-            parent = settingsActivity;
+    private void finishSettingsActivity() {
+        if (fragment.mReloadMain) {
+            Intent intent = new Intent();
+            intent.putExtra(MainActivity.RESTART_ACTIVITY_INTENT, true);
+            setResult(Activity.RESULT_OK, intent);
+        } else {
+            setResult(Activity.RESULT_OK);
         }
+        finish();
+    }
+
+    public static class SettingsFragment extends PreferenceFragmentCompat {
+        private static final String DIALOG_FRAGMENT_TAG = "SettingsFragment";
+
+        public boolean mReloadMain;
 
         @Override
         public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
@@ -102,31 +126,29 @@ public class SettingsActivity extends CatimaAppCompatActivity
                     AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM);
                 }
 
-                FragmentActivity activity = getActivity();
-                if (activity != null) {
-                    ActivityCompat.recreate(activity);
-                }
                 return true;
             });
 
             Preference colorPreference = findPreference(getResources().getString(R.string.setting_key_theme_color));
             assert colorPreference != null;
             colorPreference.setOnPreferenceChangeListener((preference, o) -> {
-                FragmentActivity activity = getActivity();
-                if (activity != null) {
-                    ActivityCompat.recreate(activity);
-                }
+                refreshActivity(true);
                 return true;
             });
             localePreference.setOnPreferenceChangeListener((preference, newValue) -> {
-                // Refresh the activity
-                parent.finish();
-                startActivity(parent.getIntent());
-
+                refreshActivity(true);
                 return true;
             });
         }
 
+        private void refreshActivity(boolean reloadMain) {
+            mReloadMain = reloadMain || mReloadMain;
+            Activity activity = getActivity();
+            if (activity != null) {
+                activity.recreate();
+            }
+        }
+
         @Override
         public void onDisplayPreferenceDialog(Preference preference) {
             if (preference instanceof NumberDialogPreference) {

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

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

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

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

@@ -1,16 +0,0 @@
-<?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_baseline_unfold_less_24.xml

@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M7.41,18.59L8.83,20 12,16.83 15.17,20l1.41,-1.41L12,14l-4.59,4.59zM16.59,5.41L15.17,4 12,7.17 8.83,4 7.41,5.41 12,10l4.59,-4.59z"/>
+</vector>

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

@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M12,5.83L15.17,9l1.41,-1.41L12,3 7.41,7.59 8.83,9 12,5.83zM12,18.17L8.83,15l-1.41,1.41L12,21l4.59,-4.59L15.17,15 12,18.17z"/>
+</vector>

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

@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#000000"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M12,17.27L18.18,21l-1.64,-7.03L22,9.24l-7.19,-0.61L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21z"/>
+</vector>

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

@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#000000"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M22,9.24l-7.19,-0.62L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21 12,17.27 18.18,21l-1.63,-7.03L22,9.24zM12,15.4l-3.76,2.27 1,-4.28 -3.32,-2.88 4.38,-0.38L12,6.1l1.71,4.04 4.38,0.38 -3.32,2.88 1,4.28L12,15.4z"/>
+</vector>

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

@@ -131,6 +131,17 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
 
+                <TextView
+                    android:id="@+id/translate_sub"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:padding="2dp"
+                    android:text="@string/translate_platform"
+                    android:layout_marginEnd="20dp"
+                    android:textSize="16sp"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/translate_main"/>
+
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"

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

@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.coordinatorlayout.widget.CoordinatorLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
+    tools:context="protect.card_locker.ManageGroupActivity">
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        android:id="@+id/fabSave"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="end|bottom"
+        app:srcCompat="@drawable/save_24dp"
+        android:contentDescription="@string/save"
+        android:layout_margin="16dp" />
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <com.google.android.material.appbar.AppBarLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:theme="@style/AppTheme.AppBarOverlay">
+
+            <androidx.appcompat.widget.Toolbar
+                android:id="@+id/toolbar"
+                android:layout_width="match_parent"
+                android:layout_height="?attr/actionBarSize"
+                android:background="?attr/colorPrimary"
+                app:popupTheme="@style/AppTheme.PopupOverlay" />
+
+            <com.google.android.material.tabs.TabLayout
+                android:id="@+id/groups"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:visibility="gone"
+                app:tabMode="scrollable" />
+
+        </com.google.android.material.appbar.AppBarLayout>
+
+
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/storeNameField"
+            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:hint="@string/storeName">
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/editTextGroupName"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:singleLine="true" />
+        </com.google.android.material.textfield.TextInputLayout>
+
+
+        <include
+            android:id="@+id/include"
+            layout="@layout/content_main" />
+
+    </LinearLayout>
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>

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

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout android:orientation="vertical"
+    android:padding="10.0dp"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <ImageView
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/barcode_disp_height"
+        android:layout_gravity="center_horizontal"
+        android:id="@+id/barcodeImage"
+        android:layout_weight="1.0"/>
+    <TextView
+        android:id="@+id/barcodeName"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="10.0dip"
+        android:gravity="center"
+        android:textSize="@dimen/text_size_medium"
+        android:textStyle="bold"
+        android:layout_weight="1.0" />
+</LinearLayout>

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

@@ -1,318 +1,88 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                                                     xmlns:app="http://schemas.android.com/apk/res-auto"
-                                                     android:layout_width="match_parent"
-                                                     android:layout_height="match_parent"
-                                                     android:fitsSystemWindows="true">
+<androidx.coordinatorlayout.widget.CoordinatorLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent">
 
     <com.google.android.material.appbar.AppBarLayout
-        android:layout_width="match_parent"
+        android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:theme="@style/AppTheme.AppBarOverlay">
-
         <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
             android:background="?attr/colorPrimary"
             app:popupTheme="@style/AppTheme.PopupOverlay" />
-
     </com.google.android.material.appbar.AppBarLayout>
 
-    <ScrollView
+    <LinearLayout
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
         app:layout_behavior="@string/appbar_scrolling_view_behavior"
-        android:id="@+id/scrollView">
+        android:orientation="vertical">
+        <TextView
+            android:id="@+id/explanationText"
+            android:textSize="20sp"
+            android:layout_gravity="center_vertical"
+            android:paddingStart="20.0dip"
+            android:paddingEnd="20.0dip"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toTopOf="@+id/barcodeIdLayout"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            android:text="@string/enterBarcodeInstructions" />
+        <LinearLayout
+            android:id="@+id/barcodeIdLayout"
+            android:orientation="horizontal"
+            android:padding="10.0dip"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            app:layout_constraintTop_toBottomOf="@+id/explanationText"
+            app:layout_constraintBottom_toTopOf="@+id/noBarcode"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent">
+            <TextView android:textSize="16.0sp"
+                      android:textStyle="bold"
+                      android:layout_gravity="center_vertical"
+                      android:paddingStart="20.0dip"
+                      android:paddingEnd="20.0dip"
+                      android:layout_width="wrap_content"
+                      android:layout_height="wrap_content"
+                      android:labelFor="@+id/cardId"
+                      android:text="@string/cardId" />
 
-        <LinearLayout android:orientation="vertical"
-                      android:layout_width="fill_parent"
-                      android:layout_height="wrap_content">
-            <LinearLayout android:orientation="horizontal"
-                          android:padding="10.0dip"
-                          android:layout_width="fill_parent"
-                          android:layout_height="wrap_content">
-                <TextView android:textSize="20sp"
-                          android:layout_gravity="center_vertical"
-                          android:paddingStart="20.0dip"
-                          android:paddingEnd="20.0dip"
-                          android:layout_width="wrap_content"
-                          android:layout_height="wrap_content"
-                          android:text="@string/enterBarcodeInstructions" />
-            </LinearLayout>
-            <LinearLayout android:orientation="horizontal"
-                          android:padding="10.0dip"
-                          android:layout_width="fill_parent"
-                          android:layout_height="wrap_content"
-                          android:id="@+id/barcodeIdLayout">
-                <TextView android:textSize="16.0sp"
-                          android:textStyle="bold"
-                          android:layout_gravity="center_vertical"
-                          android:paddingStart="20.0dip"
-                          android:paddingEnd="20.0dip"
-                          android:layout_width="wrap_content"
-                          android:layout_height="wrap_content"
-                          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"
-                          android:inputType="text"/>
-            </LinearLayout>
-            <LinearLayout
-                android:orientation="vertical"
+            <EditText
+                android:id="@+id/cardId"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
-                android:id="@+id/barcodesLayout"/>
-            <Button
-                android:id="@+id/noBarcode"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/barcodeNoBarcode"
-                android:textColor="#FFFFFF"
-                android:enabled="false" />
-            <LinearLayout android:orientation="vertical"
-                          android:padding="10.0dp"
-                          android:layout_width="fill_parent"
-                          android:layout_height="wrap_content">
-                <ImageView
-                    android:layout_width="match_parent"
-                    android:layout_height="@dimen/barcode_disp_height"
-                    android:layout_gravity="center_horizontal"
-                    android:id="@+id/aztecBarcode"
-                    android:layout_weight="1.0"/>
-                <TextView
-                    android:id="@+id/aztecBarcodeText"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_margin="10.0dip"
-                    android:gravity="center"
-                    android:textSize="@dimen/text_size_medium"
-                    android:textStyle="bold"
-                    android:layout_weight="1.0" />
-            </LinearLayout>
-            <LinearLayout android:orientation="vertical"
-                          android:padding="10.0dp"
-                          android:layout_width="fill_parent"
-                          android:layout_height="wrap_content">
-                <ImageView
-                    android:layout_width="match_parent"
-                    android:layout_height="@dimen/barcode_disp_height"
-                    android:layout_gravity="center_horizontal"
-                    android:id="@+id/code39Barcode"
-                    android:layout_weight="1.0"/>
-                <TextView
-                    android:id="@+id/code39BarcodeText"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_margin="10.0dip"
-                    android:gravity="center"
-                    android:textSize="@dimen/text_size_medium"
-                    android:textStyle="bold"
-                    android:layout_weight="1.0" />
-            </LinearLayout>
-            <LinearLayout android:orientation="vertical"
-                          android:padding="10.0dp"
-                          android:layout_width="fill_parent"
-                          android:layout_height="wrap_content">
-                <ImageView
-                    android:layout_width="match_parent"
-                    android:layout_height="@dimen/barcode_disp_height"
-                    android:layout_gravity="center_horizontal"
-                    android:id="@+id/code128Barcode"
-                    android:layout_weight="1.0"/>
-                <TextView
-                    android:id="@+id/code128BarcodeText"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_margin="10.0dip"
-                    android:gravity="center"
-                    android:textSize="@dimen/text_size_medium"
-                    android:textStyle="bold"
-                    android:layout_weight="1.0" />
-            </LinearLayout>
-            <LinearLayout android:orientation="vertical"
-                          android:padding="10.0dp"
-                          android:layout_width="fill_parent"
-                          android:layout_height="wrap_content">
-                <ImageView
-                    android:layout_width="match_parent"
-                    android:layout_height="@dimen/barcode_disp_height"
-                    android:layout_gravity="center_horizontal"
-                    android:id="@+id/codabarBarcode"
-                    android:layout_weight="1.0"/>
-                <TextView
-                    android:id="@+id/codabarBarcodeText"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_margin="10.0dip"
-                    android:gravity="center"
-                    android:textSize="@dimen/text_size_medium"
-                    android:textStyle="bold"
-                    android:layout_weight="1.0" />
-            </LinearLayout>
-            <LinearLayout android:orientation="vertical"
-                          android:padding="10.0dp"
-                          android:layout_width="fill_parent"
-                          android:layout_height="wrap_content">
-                <ImageView
-                    android:layout_width="match_parent"
-                    android:layout_height="@dimen/barcode_disp_height"
-                    android:layout_gravity="center_horizontal"
-                    android:id="@+id/datamatrixBarcode"
-                    android:layout_weight="1.0"/>
-                <TextView
-                    android:id="@+id/datamatrixBarcodeText"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_margin="10.0dip"
-                    android:gravity="center"
-                    android:textSize="@dimen/text_size_medium"
-                    android:textStyle="bold"
-                    android:layout_weight="1.0" />
-            </LinearLayout>
-            <LinearLayout android:orientation="vertical"
-                          android:padding="10.0dp"
-                          android:layout_width="fill_parent"
-                          android:layout_height="wrap_content">
-                <ImageView
-                    android:layout_width="match_parent"
-                    android:layout_height="@dimen/barcode_disp_height"
-                    android:layout_gravity="center_horizontal"
-                    android:id="@+id/ean8Barcode"
-                    android:layout_weight="1.0"/>
-                <TextView
-                    android:id="@+id/ean8BarcodeText"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_margin="10.0dip"
-                    android:gravity="center"
-                    android:textSize="@dimen/text_size_medium"
-                    android:textStyle="bold"
-                    android:layout_weight="1.0" />
-            </LinearLayout>
-            <LinearLayout android:orientation="vertical"
-                          android:padding="10.0dp"
-                          android:layout_width="fill_parent"
-                          android:layout_height="wrap_content">
-                <ImageView
-                    android:layout_width="match_parent"
-                    android:layout_height="@dimen/barcode_disp_height"
-                    android:layout_gravity="center_horizontal"
-                    android:id="@+id/ean13Barcode"
-                    android:layout_weight="1.0"/>
-                <TextView
-                    android:id="@+id/ean13BarcodeText"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_margin="10.0dip"
-                    android:gravity="center"
-                    android:textSize="@dimen/text_size_medium"
-                    android:textStyle="bold"
-                    android:layout_weight="1.0" />
-            </LinearLayout>
-            <LinearLayout android:orientation="vertical"
-                          android:padding="10.0dp"
-                          android:layout_width="fill_parent"
-                          android:layout_height="wrap_content">
-                <ImageView
-                    android:layout_width="match_parent"
-                    android:layout_height="@dimen/barcode_disp_height"
-                    android:layout_gravity="center_horizontal"
-                    android:id="@+id/itfBarcode"
-                    android:layout_weight="1.0"/>
-                <TextView
-                    android:id="@+id/itfBarcodeText"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_margin="10.0dip"
-                    android:gravity="center"
-                    android:textSize="@dimen/text_size_medium"
-                    android:textStyle="bold"
-                    android:layout_weight="1.0" />
-            </LinearLayout>
-            <LinearLayout android:orientation="vertical"
-                          android:padding="10.0dp"
-                          android:layout_width="fill_parent"
-                          android:layout_height="wrap_content">
-                <ImageView
-                    android:layout_width="match_parent"
-                    android:layout_height="@dimen/barcode_disp_height"
-                    android:layout_gravity="center_horizontal"
-                    android:id="@+id/pdf417Barcode"
-                    android:layout_weight="1.0"/>
-                <TextView
-                    android:id="@+id/pdf417BarcodeText"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_margin="10.0dip"
-                    android:gravity="center"
-                    android:textSize="@dimen/text_size_medium"
-                    android:textStyle="bold"
-                    android:layout_weight="1.0" />
-            </LinearLayout>
-            <LinearLayout android:orientation="vertical"
-                          android:padding="10.0dp"
-                          android:layout_width="fill_parent"
-                          android:layout_height="wrap_content">
-                <ImageView
-                    android:layout_width="match_parent"
-                    android:layout_height="@dimen/barcode_disp_height"
-                    android:layout_gravity="center_horizontal"
-                    android:id="@+id/qrcodeBarcode"
-                    android:layout_weight="1.0"/>
-                <TextView
-                    android:id="@+id/qrcodeBarcodeText"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_margin="10.0dip"
-                    android:gravity="center"
-                    android:textSize="@dimen/text_size_medium"
-                    android:textStyle="bold"
-                    android:layout_weight="1.0" />
-            </LinearLayout>
-            <LinearLayout android:orientation="vertical"
-                          android:padding="10.0dp"
-                          android:layout_width="fill_parent"
-                          android:layout_height="wrap_content">
-                <ImageView
-                    android:layout_width="match_parent"
-                    android:layout_height="@dimen/barcode_disp_height"
-                    android:layout_gravity="center_horizontal"
-                    android:id="@+id/upcaBarcode"
-                    android:layout_weight="1.0"/>
-                <TextView
-                    android:id="@+id/upcaBarcodeText"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_margin="10.0dip"
-                    android:gravity="center"
-                    android:textSize="@dimen/text_size_medium"
-                    android:textStyle="bold"
-                    android:layout_weight="1.0" />
-            </LinearLayout>
-            <LinearLayout android:orientation="vertical"
-                android:padding="10.0dp"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content">
-                <ImageView
-                    android:layout_width="match_parent"
-                    android:layout_height="@dimen/barcode_disp_height"
-                    android:layout_gravity="center_horizontal"
-                    android:id="@+id/upceBarcode"
-                    android:layout_weight="1.0"/>
-                <TextView
-                    android:id="@+id/upceBarcodeText"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_margin="10.0dip"
-                    android:gravity="center"
-                    android:textSize="@dimen/text_size_medium"
-                    android:textStyle="bold"
-                    android:layout_weight="1.0" />
-            </LinearLayout>
+                android:hint="AB1234"
+                android:importantForAutofill="no"
+                android:inputType="text"
+                android:minHeight="48dp" />
         </LinearLayout>
-    </ScrollView>
+        <Button
+            android:id="@+id/noBarcode"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:layout_constraintTop_toBottomOf="@+id/barcodeIdLayout"
+            app:layout_constraintBottom_toTopOf="@+id/barcodes"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            android:text="@string/barcodeNoBarcode"
+            android:textColor="#FFFFFF"
+            android:enabled="false" />
+        <ListView
+            android:id="@+id/barcodes"
+            android:layout_width="match_parent"
+            android:layout_height="fill_parent"
+            app:layout_constraintTop_toBottomOf="@+id/noBarcode"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            android:scrollbars="vertical" />
+    </LinearLayout>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>

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

@@ -38,7 +38,7 @@
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/list"
-        app:layoutManager="androidx.recyclerview.widget.StaggeredGridLayoutManager"
+        app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
         app:spanCount="@integer/main_view_card_columns"
         android:layout_width="match_parent"
         android:layout_height="match_parent"

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

@@ -68,14 +68,16 @@
                     android:paddingTop="@dimen/inputPadding"
                     android:orientation="horizontal">
 
-                    <androidx.cardview.widget.CardView
+                    <com.google.android.material.card.MaterialCardView
                         android:layout_width="@dimen/cardThumbnailSize"
                         android:layout_height="@dimen/cardThumbnailSize"
                         android:layout_marginEnd="@dimen/activity_margin"
                         android:layout_gravity="center_vertical"
                         app:cardCornerRadius="4dp"
                         android:paddingHorizontal="@dimen/inputPadding"
-                        app:cardElevation="0dp">
+                        app:cardElevation="0dp"
+                        app:cardBackgroundColor="@android:color/transparent"
+                        android:outlineProvider="none">
 
                         <ImageView
                             android:id="@+id/thumbnail"
@@ -84,7 +86,7 @@
                             android:contentDescription="@string/thumbnailDescription"
                             android:src="@mipmap/ic_launcher"/>
 
-                    </androidx.cardview.widget.CardView>
+                    </com.google.android.material.card.MaterialCardView>
 
                     <com.google.android.material.textfield.TextInputLayout
                         android:id="@+id/storeNameField"
@@ -97,7 +99,7 @@
                             android:id="@+id/storeNameEdit"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            />
+                            android:singleLine="true" />
 
                     </com.google.android.material.textfield.TextInputLayout>
                 </LinearLayout>
@@ -121,7 +123,7 @@
                             android:id="@+id/cardIdView"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            />
+                            android:singleLine="true" />
 
                     </com.google.android.material.textfield.TextInputLayout>
                 </LinearLayout>
@@ -347,7 +349,7 @@
                     android:paddingTop="@dimen/inputPadding">
 
                     <!-- Front image -->
-                    <androidx.cardview.widget.CardView
+                    <com.google.android.material.card.MaterialCardView
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_vertical"
@@ -369,7 +371,7 @@
                             android:scaleType="fitCenter"
                             app:srcCompat="@drawable/ic_camera_white" />
 
-                    </androidx.cardview.widget.CardView>
+                    </com.google.android.material.card.MaterialCardView>
                 </LinearLayout>
 
                 <!-- Back image -->
@@ -382,7 +384,7 @@
                     android:paddingTop="@dimen/inputPadding">
 
                     <!-- Back image -->
-                    <androidx.cardview.widget.CardView
+                    <com.google.android.material.card.MaterialCardView
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_vertical"
@@ -404,7 +406,7 @@
                             android:scaleType="fitCenter"
                             app:srcCompat="@drawable/ic_camera_white" />
 
-                    </androidx.cardview.widget.CardView>
+                    </com.google.android.material.card.MaterialCardView>
                 </LinearLayout>
             </TableLayout>
         </TableLayout>

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

@@ -1,137 +1,171 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.card.MaterialCardView
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/row"
-    android:orientation="horizontal"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_margin="8dp">
 
-    <LinearLayout
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="vertical">
+        android:layout_marginBottom="4dp">
 
-        <LinearLayout
-            android:id="@+id/information_container"
+        <com.google.android.material.card.MaterialCardView
+            android:id="@+id/icon_layout"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:padding="16dp">
+            android:layout_height="0dp"
+            android:outlineProvider="none"
+            app:cardCornerRadius="8dp"
+            app:layout_constraintBottom_toTopOf="@+id/store"
+            app:layout_constraintDimensionRatio="85.6f:53.98f"
+            app:layout_constraintTop_toTopOf="parent">
 
-            <RelativeLayout
+            <ImageView
+                android:id="@+id/thumbnail"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal">
+                android:layout_height="match_parent"
+                android:contentDescription="@string/thumbnailDescription"
+                android:scaleType="fitCenter"
+                android:src="@mipmap/ic_launcher"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
 
-                <androidx.cardview.widget.CardView
-                    android:id="@+id/thumbnail_container"
-                    android:layout_width="@dimen/cardThumbnailSize"
-                    android:layout_height="@dimen/cardThumbnailSize"
-                    app:cardCornerRadius="4dp"
-                    android:layout_alignParentStart="true">
+            <ImageView
+                android:id="@+id/selected_thumbnail"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:contentDescription="@string/thumbnailDescription"
+                android:scaleType="fitCenter"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:srcCompat="@drawable/ic_done" />
 
-                    <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>
-
-                <LinearLayout
-                    android:minHeight="@dimen/cardThumbnailSize"
-                    android:layout_height="wrap_content"
-                    android:layout_width="wrap_content"
-                    android:orientation="vertical"
-                    android:layout_gravity="center_vertical"
-                    android:layout_toEndOf="@+id/thumbnail_container">
-
-                    <TextView
-                        android:id="@+id/store"
-                        android:paddingStart="16dp"
-                        android:layout_width="wrap_content"
-                        android:layout_height="match_parent"
-                        android:gravity="left"
-                        android:textAppearance="?attr/textAppearanceHeadline6" />
-                </LinearLayout>
-
-                <ImageView
-                    android:id="@+id/star"
-                    android:layout_width="@dimen/cardThumbnailSize"
-                    android:layout_height="@dimen/cardThumbnailSize"
-                    app:srcCompat="@drawable/ic_starred_white"
-                    android:contentDescription="@string/starImage"
-                    app:tint="?attr/colorControlNormal"
-                    android:layout_alignParentEnd="true"
-                    android:visibility="gone" />
-            </RelativeLayout>
-
-            <TextView
-                android:id="@+id/note"
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/star"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                android:textAppearance="?attr/textAppearanceBody2"
-                android:textColor="?android:attr/textColorSecondary"
-                android:visibility="gone" />
+                android:layout_gravity="end">
 
-            <View android:id="@+id/info_divider"
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:layout_marginTop="16dp"
-                android:layout_marginBottom="16dp"
-                android:background="?android:attr/dividerVertical"
-                android:visibility="gone" />
+                <ImageView
+                    android:id="@+id/star_background"
+                    android:layout_width="@dimen/cardThumbnailSize"
+                    android:layout_height="@dimen/cardThumbnailSize"
+                    android:layout_gravity="end"
+                    android:alpha="0.5"
+                    android:contentDescription="@string/starImage"
+                    android:elevation="4dp"
+                    android:visibility="visible"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:srcCompat="@drawable/ic_starred_white"
+                    tools:ignore="ImageContrastCheck" />
 
-            <RelativeLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal">
-                <TextView
-                    android:id="@+id/balance"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:paddingEnd="8dp"
-                    android:textAppearance="?attr/textAppearanceBody2"
-                    android:textColor="?android:attr/textColorSecondary"
-                    app:drawableLeftCompat="@drawable/ic_baseline_payments_24"
-                    android:drawablePadding="4dp"
-                    android:layout_alignParentStart="true"
-                    android:visibility="gone" />
-                <TextView
-                    android:id="@+id/expiry"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textAppearance="?attr/textAppearanceBody2"
-                    android:textColor="?android:attr/textColorSecondary"
-                    app:drawableLeftCompat="@drawable/ic_baseline_access_time_24"
-                    android:drawablePadding="4dp"
-                    android:layout_toEndOf="@+id/balance"
-                    android:visibility="gone" />
-            </RelativeLayout>
-        </LinearLayout>
-    </LinearLayout>
+                <ImageView
+                    android:id="@+id/star_border"
+                    android:layout_width="@dimen/cardThumbnailSize"
+                    android:layout_height="@dimen/cardThumbnailSize"
+                    android:layout_gravity="end"
+                    android:alpha="0.5"
+                    android:contentDescription="@string/starImage"
+                    android:elevation="4dp"
+                    android:visibility="visible"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:srcCompat="@drawable/ic_unstarred_white"
+                    tools:ignore="ImageContrastCheck" />
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+        </com.google.android.material.card.MaterialCardView>
+
+        <TextView
+            android:id="@+id/store"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="8dp"
+            android:layout_marginEnd="8dp"
+            android:layout_marginBottom="4dp"
+            android:textAppearance="?attr/textAppearanceHeadline1"
+            app:layout_constraintTop_toBottomOf="@+id/icon_layout"
+            app:layout_constraintBottom_toTopOf="@+id/note"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            tools:text="Example store"/>
+
+        <TextView
+            android:id="@+id/note"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="8dp"
+            android:layout_marginEnd="8dp"
+            android:layout_marginBottom="4dp"
+            android:textAppearance="?attr/textAppearanceBody2"
+            android:textColor="?android:attr/textColorSecondary"
+            android:visibility="gone"
+            tools:visibility="visible"
+            app:layout_constraintTop_toBottomOf="@+id/store"
+            app:layout_constraintBottom_toTopOf="@+id/info_divider"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            tools:text="Example note"/>
+
+        <View
+            android:id="@+id/info_divider"
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_marginStart="4dp"
+            android:layout_marginEnd="4dp"
+            android:layout_marginBottom="8dp"
+            android:background="?android:attr/dividerVertical"
+            android:visibility="gone"
+            tools:visibility="visible"
+            app:layout_constraintTop_toBottomOf="@+id/note"
+            app:layout_constraintBottom_toTopOf="@+id/balance"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"/>
+
+        <TextView
+            android:id="@+id/balance"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="8dp"
+            android:layout_marginEnd="8dp"
+            android:layout_marginBottom="4dp"
+            android:textAppearance="?attr/textAppearanceBody2"
+            android:textColor="?android:attr/textColorSecondary"
+            app:drawableLeftCompat="@drawable/ic_baseline_payments_24"
+            android:drawablePadding="4dp"
+            android:visibility="gone"
+            app:layout_constraintTop_toBottomOf="@+id/info_divider"
+            app:layout_constraintBottom_toTopOf="@+id/expiry"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            tools:visibility="visible"
+            tools:text="525 points"/>
+
+        <TextView
+            android:id="@+id/expiry"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="8dp"
+            android:layout_marginEnd="8dp"
+            android:layout_marginBottom="4dp"
+            android:textAppearance="?attr/textAppearanceBody2"
+            android:textColor="?android:attr/textColorSecondary"
+            app:drawableLeftCompat="@drawable/ic_baseline_access_time_24"
+            android:drawablePadding="4dp"
+            android:visibility="gone"
+            app:layout_constraintTop_toBottomOf="@+id/balance"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            tools:visibility="visible"
+            tools:text="Tomorrow"/>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </com.google.android.material.card.MaterialCardView>

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

@@ -122,6 +122,10 @@
 
             <TextView
                 android:id="@+id/cardIdView"
+                android:enabled="true"
+                android:textIsSelectable="true"
+                android:focusable="true"
+                android:longClickable="true"
                 android:layout_width="0dp"
                 android:layout_height="0dp"
                 android:layout_marginLeft="10.0dip"
@@ -151,8 +155,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@color/inputBackground"
-        android:fitsSystemWindows="false"
         android:orientation="vertical"
+        android:paddingTop="0px"
         android:visibility="gone"
         app:behavior_hideable="false"
         app:behavior_peekHeight="80dp"
@@ -164,10 +168,10 @@
             android:layout_width="match_parent"
             android:layout_height="80dp"
             android:layout_gravity="top|start"
-            android:scaleType="fitCenter"
             android:contentDescription="@string/toggleMoreInfo"
-            app:tint="#ffffff"
-            app:srcCompat="@drawable/ic_baseline_arrow_drop_up_24" />
+            android:scaleType="fitCenter"
+            app:srcCompat="@drawable/ic_baseline_arrow_drop_up_24"
+            app:tint="#ffffff" />
 
         <androidx.core.widget.NestedScrollView
             android:id="@+id/bottomSheetContentWrapper"
@@ -181,93 +185,127 @@
 
                 <TextView
                     android:id="@+id/noteView"
-                    android:autoLink="all"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:autoLink="all"
+                    android:enabled="true"
+                    android:focusable="true"
                     android:gravity="center"
+                    android:longClickable="true"
                     android:padding="20dp"
+                    android:textIsSelectable="true"
                     android:textSize="@dimen/singleCardNoteTextSizeMin" />
 
                 <TextView
                     android:id="@+id/groupsView"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:enabled="true"
+                    android:focusable="true"
                     android:gravity="center"
+                    android:longClickable="true"
                     android:padding="20dp"
+                    android:textIsSelectable="true"
                     android:textSize="@dimen/singleCardNoteTextSizeMin" />
 
                 <TextView
                     android:id="@+id/balanceView"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:enabled="true"
+                    android:focusable="true"
                     android:gravity="center"
+                    android:longClickable="true"
                     android:padding="20dp"
+                    android:textIsSelectable="true"
                     android:textSize="@dimen/singleCardNoteTextSizeMin" />
 
                 <TextView
                     android:id="@+id/expiryView"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:enabled="true"
+                    android:focusable="true"
                     android:gravity="center"
+                    android:longClickable="true"
                     android:padding="20dp"
+                    android:textIsSelectable="true"
                     android:textSize="@dimen/singleCardNoteTextSizeMin" />
             </LinearLayout>
         </androidx.core.widget.NestedScrollView>
     </LinearLayout>
 
+
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/app_bar_layout"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
         android:background="@android:color/transparent"
         android:clipChildren="false"
         android:clipToPadding="false"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
+        android:fitsSystemWindows="true"
         android:weightSum="1.0"
-        android:fitsSystemWindows="true">
+        >
+
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/toolbar_landscape"
+            android:layout_width="fill_parent"
+            android:layout_height="?actionBarSize"
+            android:background="@android:color/transparent"
+            android:fitsSystemWindows="false"
+            android:paddingTop="0dp"
+            android:theme="@style/CardView.ActionBarTheme"
+            android:visibility="gone"
+            app:contentInsetStart="72.0dip"
+            app:layout_collapseMode="pin" />
+
         <com.google.android.material.appbar.CollapsingToolbarLayout
             android:id="@+id/collapsingToolbarLayout"
-            android:clipChildren="false"
-            android:clipToPadding="false"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
+            android:clipChildren="false"
+            android:clipToPadding="false"
             android:minHeight="56.0dip"
-            android:layout_weight="1.0"
-            app:expandedTitleMarginStart="48dp"
-            app:expandedTitleMarginEnd="64dp"
             app:contentScrim="?colorPrimary"
-            app:expandedTitleGravity="top">
+            app:expandedTitleGravity="top"
+            app:expandedTitleMarginEnd="64dp"
+            app:expandedTitleMarginStart="48dp">
+
             <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/storeName"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:maxLines="1"
-                android:ellipsize="end"
-                android:textColor="@android:color/white"
-                android:textSize="40sp"
-                android:textAlignment="center"
                 android:layout_gravity="center"
                 android:layout_marginTop="?actionBarSize"
                 android:layout_marginBottom="?actionBarSize"
-                app:layout_collapseMode="parallax"
-                android:fitsSystemWindows="true"/>
+                android:ellipsize="end"
+                android:maxLines="1"
+                android:textAlignment="center"
+                android:textColor="@android:color/white"
+                android:textSize="40sp"
+                app:layout_collapseMode="parallax" />
+
             <androidx.appcompat.widget.Toolbar
                 android:id="@id/toolbar"
-                android:background="@android:color/transparent"
-                android:theme="@style/CardView.ActionBarTheme"
                 android:layout_width="fill_parent"
                 android:layout_height="?actionBarSize"
+                android:background="@android:color/transparent"
+                android:theme="@style/CardView.ActionBarTheme"
                 app:contentInsetStart="72.0dip"
                 app:layout_collapseMode="pin" />
+
         </com.google.android.material.appbar.CollapsingToolbarLayout>
-        <androidx.appcompat.widget.Toolbar
-            android:id="@+id/toolbar_landscape"
-            android:visibility="gone"
-            android:background="@android:color/transparent"
-            android:theme="@style/CardView.ActionBarTheme"
-            android:layout_width="fill_parent"
-            android:layout_height="?actionBarSize"
-            app:contentInsetStart="72.0dip"
-            app:layout_collapseMode="pin"
-            android:paddingTop="6dp" />
     </com.google.android.material.appbar.AppBarLayout>
+
+    <ImageView
+        android:id="@+id/icon_image"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_alignParentTop="true"
+        android:fitsSystemWindows="true"
+        android:scaleType="centerCrop"
+        app:srcCompat="@drawable/ic_launcher_foreground"
+        tools:ignore="ContentDescription" />
+
+
 </androidx.coordinatorlayout.widget.CoordinatorLayout>

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

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.coordinatorlayout.widget.CoordinatorLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:theme="@style/AppTheme.AppBarOverlay">
+
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="?attr/colorPrimary"
+            app:popupTheme="@style/AppTheme.PopupOverlay"/>
+
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/list"
+            app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
+            app:spanCount="1"
+            android:layout_height="match_parent"
+            android:layout_width="match_parent" />
+    </RelativeLayout>
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>

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

@@ -8,6 +8,11 @@
         android:icon="@drawable/ic_search_white"
         app:actionViewClass="androidx.appcompat.widget.SearchView"
         app:showAsAction="always|collapseActionView"/>
+    <item
+        android:id="@+id/action_unfold"
+        android:title="@string/action_hide_details"
+        android:icon="@drawable/ic_baseline_unfold_less_24"
+        app:showAsAction="always"/>
     <item
         android:id="@+id/action_sort"
         android:title="@string/sort"

app/src/main/res/raw/contributors.txt

@@ -5,26 +5,34 @@ Allan Nordhøy
 Heimen Stoffels
 solokot
 mondstern
+Katharine Chui
+Oğuz Ersen
+IllusiveMan196
+Petr Novák
 Taco
 Gediminas Murauskas
-IllusiveMan196
 Joel A
-Samantaz Fox
-Nyatsuki
-arno-github
-Sergio Paredes
 StoyanDimitrov
-Oğuz Ersen
-Petr Novák
+Nyatsuki
+Altonss
+Samantaz Fox
+arno-github
+Ankit Tiwari
+Sergio Paredes
+laralem
 arshbeerSingh
 huuhaa
+Miha Frangež
 Michael Moroni
+Olivia (Zoe)
 betsythefc
+waffshappen
+sr093906
 K. Herbert
 Quentin PAGÈS
 String E. Fighter
 Yurical
-waffshappen
+/usr/local/ΕΨΗΕΛΩΝ
 Adolfo Jayme-Barrientos
 Alessandro Mandelli
 KovalevArtem
@@ -33,31 +41,43 @@ D. Domig
 Diego
 Jane Kong
 Lukas Grassauer
+Marnick L'Eau
 Michalis
+Rosdyana Kusuma
 schirinowski
+Thomas Bertels
 inesre
 lgasp
 phlostically
+Aditya Das
 Kevin Sicong Jiang
-Miha Frangež
 Airat
+Andreas Blaser
 BMN
+Biren
+Kasina Dheeraj
 Flav
 Franciszek Stefan
 Izzy
 Karol Kosek
 bittin
 Maciej Błędkowski
+Marco
 Mattia
+Michael Gangolf
 pbeckmann
 Peer Beckmann
-QuangDNguyen2211
+Quang Nguyen
+Reza
 Rohan Babbar 
+Ronak Upadhyay
 Rose Liverman
 Simone Dotto
+Still Hsu
 Subhashish Anand
 Tymofii Lytvynenko
 Tjipke van der Heide
+avikkundu
 opsik
 psa-jforestier
 Robin

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

@@ -24,7 +24,7 @@
         <item quantity="other"><xliff:g>%d</xliff:g> карти</item>
     </plurals>
     <string name="failedOpeningFileManager">Инсталирайте приложение за управление на файлове.</string>
-    <string name="app_license">Свободен софтуер с авторски права, лицензиран под GPLv3+.</string>
+    <string name="app_license">Свободен софтуер с авторски права, лицензиран под GPLv3+</string>
     <string name="frontImageDescription">Снимка на предната страна на карта</string>
     <string name="backImageDescription">Снимка на задната страна на карта</string>
     <string name="parsingBalanceFailed"><xliff:g>%s</xliff:g> не изглежда истинска наличност.</string>
@@ -52,7 +52,7 @@
     <string name="barcodeId">Стойност на щрихкода</string>
     <string name="importLoyaltyCardKeychain">Внасяне от Loyalty Card Keychain</string>
     <string name="importFidmeMessage">Изберете файла <i>fidme-export-request-xxxxxx.zip</i>, предварително изнесен от FidMe и ръчно изберете вида на щрихкодовете.
-\nИли създайте такъв файл от Data Protection в менюто на профила във FidMe и изберете „Extract my data“.</string>
+\nСъздайте такъв файл от Data Protection в менюто на профила във FidMe и изберете „Extract my data“.</string>
     <string name="importFidme">Внасяне от FidMe</string>
     <string name="exportOptionExplanation">Данните ще бъдат запазени на място по ваш избор.</string>
     <string name="accept">Приемане</string>
@@ -85,10 +85,10 @@
     <string name="noGroups">Докоснете бутона +, за да добавите списък.</string>
     <string name="noStoreError">Не е въведено наименование</string>
     <string name="groups">Списъци</string>
-    <string name="enter_group_name">Въведете име на списък</string>
+    <string name="enter_group_name">Въведете име на списъка</string>
     <string name="intent_import_card_from_url_share_text">Искам да споделя тази карта с вас</string>
     <string name="settings_display_barcode_max_brightness">Увеличаване на яркостта при видим щрихкод</string>
-    <string name="settings_lock_barcode_orientation">Спиране на завъртането на щрихкода</string>
+    <string name="settings_lock_barcode_orientation">Без на завъртане на щрихкода</string>
     <string name="settings_keep_screen_on">Поддържане на екрана включен</string>
     <string name="settings_disable_lockscreen_while_viewing_card">Предотвратяване на заключване на екрана</string>
     <string name="settings_max_font_size_scale">Максимален размер на шрифта</string>
@@ -106,9 +106,9 @@
     <string name="importOptionApplicationButton">Избиране чрез приложение</string>
     <string name="importing">Внасяне…</string>
     <string name="exporting">Изнасяне…</string>
-    <string name="exportFailed">Картите не могат да бъдат изнесени</string>
+    <string name="exportFailed">Картите не могат да бъдат изнесени: <xliff:g>%s</xliff:g></string>
     <string name="exportFailedTitle">Грешка при изнасяне</string>
-    <string name="importFailed">Картите не могат да бъдат внесени</string>
+    <string name="importFailed">Картите не могат да бъдат внесени: <xliff:g>%s</xliff:g></string>
     <string name="importFailedTitle">Грешка при внасяне</string>
     <string name="exportSuccessfulTitle">Резултат от изнасяне</string>
     <string name="importSuccessfulTitle">Резултат от внасяне</string>
@@ -116,7 +116,7 @@
     <string name="exportName">Изнасяне</string>
     <string name="importExport">Внасяне/изнасяне</string>
     <string name="sendLabel">Изпращане…</string>
-    <string name="scanCardBarcode">Сканиране на щрихкод от карта</string>
+    <string name="scanCardBarcode">Снемане на щрихкод от карта</string>
     <string name="editCardTitle">Редактиране на карта</string>
     <string name="share">Споделя</string>
     <string name="copy_to_clipboard">Копира идентификатора в междинната памет</string>
@@ -124,7 +124,7 @@
     <string name="importSuccessful">Картите са внесени успешно</string>
     <string name="chooseImportType">От къде ще внесете\?</string>
     <string name="importCatimaMessage">Изберете файла <i>catima.zip</i>, предварително изнесен от Catima.
-\nИли създайте такъв файл от меню Внасяне/изнасяне от друго устройство със Catima като изберете Изнасяне.</string>
+\nСъздайте такъв файл от меню Внасяне/изнасяне от друго устройство с Catima като изберете Изнасяне.</string>
     <string name="importOptionApplicationTitle">От друго приложение</string>
     <string name="importOptionFilesystemButton">Избиране от файлова система</string>
     <string name="importOptionFilesystemExplanation">Изберете определен файл от файловата система.</string>
@@ -133,9 +133,9 @@
     <string name="app_revision_fmt">Компилация: <xliff:g id="app_revision_url">%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="app_copyright_fmt" tools:ignore="PluralsCandidate">Всички права запазени © 2019–<xliff:g>%d</xliff:g> Sylvia van Os.</string>
+    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Всички права запазени © 2019–<xliff:g>%d</xliff:g> Sylvia van Os</string>
     <string name="app_copyright_old">На основата на Loyalty Card Keychain
-\nвсички права запазени © 2016–2020 Branden Archer.</string>
+\nвсички права запазени © 2016–2020 Branden Archer</string>
     <string name="about">Относно</string>
     <string name="importOptionFilesystemTitle">Внасяне от файловата система</string>
     <string name="importCatima">Внасяне от Catima</string>
@@ -156,38 +156,38 @@
     <string name="importStocard">Внасяне от Stocard</string>
     <string name="importVoucherVault">Внасяне от Voucher Vault</string>
     <string name="importVoucherVaultMessage">Изберете файла <i>vouchervault.json</i>, предварително изнесен от Voucher Vault.
-\nИли създайте такъв файл от меню Изнасяне от Voucher Vault.</string>
-    <string name="importStocardMessage">Изберете вашия <i>***-sync.zip</i> експорт от Stocard, за да го импортирате.
-\nИли го получете, като изпратите имейл на support@stocardapp.com с искане за експорт на вашите данни.</string>
+\nСъздайте такъв файл от меню „Export“ във Voucher Vault.</string>
+    <string name="importStocardMessage">Изберете файла <i>***-sync.zip</i>, предварително изнесен от Stocard.
+\nПолучете го като изпратите писмо на support@stocardapp.com с искане за изнасяне вашите данни.</string>
     <string name="importLoyaltyCardKeychainMessage">Изберете файла <i>LoyaltyCardKeychain.csv</i>, предварително изнесен от Loyalty Card Keychain.
-\nИли създайте такъв файл от меню Внасяне/изнасяне от друго устройство със Loyalty Card Keychain като изберете Изнасяне.</string>
+\nСъздайте такъв файл от меню Внасяне/изнасяне от друго устройство с Loyalty Card Keychain като изберете Изнасяне.</string>
     <string name="failedParsingImportUriError">Препратката не може да бъде анализирана за внасяне</string>
     <string name="card_ids_copied">[не превеждай този низ, https://github.com/TheLastProject/Catima/issues/278]</string>
     <string name="failedGeneratingShareURL">Грешка при създаване на адрес за споделяне. Изпратете доклад за дефект.</string>
-    <string name="deleteTitle">Изтрийте картата</string>
+    <string name="deleteTitle">Премахване на карта</string>
     <plurals name="deleteCardsTitle">
         <item quantity="one">Изтриване на <xliff:g>%d</xliff:g> карта</item>
         <item quantity="other">Изтриване на <xliff:g>%d</xliff:g> карти</item>
     </plurals>
-    <string name="deleteConfirmation">Потвърдете премахване на карта\?</string>
+    <string name="deleteConfirmation">Потвърдете премахване на картата.</string>
     <plurals name="deleteCardsConfirmation">
-        <item quantity="one">Изтриване на тази <xliff:g>%d</xliff:g> карта завинаги\?</item>
-        <item quantity="other">Изтриване на тези <xliff:g>%d</xliff:g> карти за постоянно\?</item>
+        <item quantity="one">Желаете ли <xliff:g>%d</xliff:g> карта да бъде премахната\?</item>
+        <item quantity="other">Желаете ли тези <xliff:g>%d</xliff:g> карти да бъдат премахнати\?</item>
     </plurals>
     <string name="app_contributors">Осъществено от: <xliff:g id="app_contributors">%s</xliff:g></string>
-    <string name="settings_brown_theme">Браун</string>
-    <string name="settings_grey_theme">Сив</string>
-    <string name="settings_green_theme">Зелен</string>
-    <string name="settings_sky_blue_theme">Небесно синьо</string>
+    <string name="settings_brown_theme">Кафяво</string>
+    <string name="settings_grey_theme">Сиво</string>
+    <string name="settings_green_theme">Зелено</string>
+    <string name="settings_sky_blue_theme">Небесносиньо</string>
     <string name="settings_blue_theme">Синьо</string>
-    <string name="settings_violet_theme">Виолет</string>
-    <string name="settings_magenta_theme">Магента</string>
-    <string name="settings_pink_theme">Розов</string>
+    <string name="settings_violet_theme">Виолетово</string>
+    <string name="settings_magenta_theme">Цикламено</string>
+    <string name="settings_pink_theme">Розово</string>
     <string name="settings_catima_theme">Catima</string>
     <string name="settings_theme_color">Цвят на темата</string>
     <string name="settings_system_locale">Система</string>
     <string name="settings_locale">Език</string>
-    <string name="noGroupCards">Тази група не съдържа карти</string>
+    <string name="noGroupCards">Групата не съдържа карти</string>
     <string name="toggleMoreInfo">Превключване на повече информация</string>
     <string name="barcodeImageDescriptionWithType">Изображение на щрихкод на карта от вида <xliff:g>%s</xliff:g></string>
     <string name="swipeToSwitchImages">Плъзване или задържане за смяна на изображения</string>
@@ -198,4 +198,26 @@
     <string name="sort_by_most_recently_used">Последно използване</string>
     <string name="sort_by_name">Наименование</string>
     <string name="sort">Сортиране</string>
+    <string name="credits">Заслуги</string>
+    <string name="license">Лиценз</string>
+    <string name="source_repository">Хранилище на изходния код</string>
+    <string name="on_github">в GitHub</string>
+    <string name="rate_this_app">Оценете приложението</string>
+    <string name="report_error">Докладване на грешка</string>
+    <string name="version_history">История на изданията</string>
+    <string name="on_google_play">в Google Play</string>
+    <string name="and_data_usage">и използване на данни</string>
+    <string name="help_translate_this_app">Помогнете за превода на приложението</string>
+    <string name="exportPasswordHint">Въведете парола</string>
+    <string name="exportPassword">Задаване на парола за защита на изнесеното (по избор)</string>
+    <string name="setIcon">Задаване на пиктограма</string>
+    <string name="editGroup">Променяне на списъка: <xliff:g>%s</xliff:g></string>
+    <string name="group_name_already_in_use">Има списък с това име</string>
+    <string name="group_updated">Промените са запазени</string>
+    <string name="selectColor">Избиране на цвят</string>
+    <string name="group_name_is_empty">Името на списъка не може да е празно</string>
+    <string name="group_edit">Редактиране на списък</string>
+    <string name="action_show_details">Повече детайли</string>
+    <string name="action_hide_details">По-малко детайли</string>
+    <string name="noGiftCardsGroup">Няма карти. След като добавите ще можете да ги зачислите към списък от тук.</string>
 </resources>

app/src/main/res/values-bn-rIN/strings.xml

@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="save">সংরক্ষণ</string>
+    <string name="cancel">বাতিল</string>
+    <string name="unstar">তারা মুক্ত</string>
+    <string name="star">তারা</string>
+    <string name="barcodeNoBarcode">বারকোড না বারকোড</string>
+    <string name="barcodeType">বারকোড ধরন</string>
+    <string name="note">বিঃদ্রঃ</string>
+    <string name="storeName">দোকানের নাম</string>
+    <string name="noMatchingGiftCards">কোন ম্যাচিং উপহার কার্ড নেই</string>
+    <string name="noGiftCards">উপহার কার্ড নেই</string>
+    <string name="action_add">কর্ম যোগ</string>
+    <string name="all">সব</string>
+    <string name="noGroupCards">গোষ্ঠী কার্ড নেই</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">url শেয়ার টেক্সট থেকে ইন্টেন্ট ইম্পোর্ট কার্ড</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_max_font_size_scale">সর্বোচ্চ হরফ আকার</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="starImage">তারা ছবি</string>
+    <string name="importCatima">ক্যাতিনা আগম</string>
+    <string name="importLoyaltyCardKeychain">আমদানি লয়্যালটি কার্ড কীচেন</string>
+    <string name="importStocard">স্টো কার্ড আমদানি করুন</string>
+    <string name="importVoucherVault">আমদানি ভাউচার ভল্ট</string>
+    <string name="barcodeId">বারকোড আইডি</string>
+    <string name="sameAsCardId">কার্ড আইডির মতো</string>
+    <string name="setBarcodeId">বারকোড আইডি সেট করুন</string>
+    <string name="unsupportedBarcodeType">অসমর্থিত বারকোড টাইপ</string>
+    <string name="wrongValueForBarcodeType">বারকোড টাইপের জন্য ভুল মান</string>
+    <string name="copy_to_clipboard_multiple_toast">ক্লিপবোর্ড একাধিক টোস্টে অনুলিপি করুন</string>
+    <string name="intent_import_card_from_url_share_multiple_text">url থেকে ইন্টেন্ট ইম্পোর্ট কার্ড একাধিক টেক্সট শেয়ার করে</string>
+    <string name="frontImageDescription">সামনের চিত্রের বর্ণনা</string>
+    <string name="backImageDescription">পিছনের চিত্রের বর্ণনা</string>
+    <string name="photos">ছবি</string>
+    <string name="setFrontImage">সদর ছবি স্থাপন</string>
+    <string name="setBackImage">পিছনের ছবি স্থাপন</string>
+    <string name="removeImage">ছবি অপসারণ</string>
+    <string name="takePhoto">ছবি নেত্তয়া</string>
+    <string name="updateBarcodeQuestionTitle">হালনাগাদ বারকোড প্রশ্ন শিরোনাম</string>
+    <string name="updateBarcodeQuestionText">হালনাগাদ বারকোড প্রশ্ন টেক্সট </string>
+    <string name="yes">হাঁ</string>
+    <string name="no">না</string>
+    <string name="passwordRequired">পাসওয়ার্ড প্রয়োজন</string>
+    <string name="failedGeneratingShareURL">শেয়ার ইউআরএল তৈরি করতে ব্যর্থ হয়েছে</string>
+    <string name="turn_flashlight_on">টর্চলাইট চালু করুন</string>
+    <string name="turn_flashlight_off">টর্চলাইট বন্ধ করুন</string>
+    <string name="settings_locale">লোকেল</string>
+    <string name="settings_system_locale">সিস্টেম লোকেল</string>
+    <string name="settings_theme_color">থিম রঙ</string>
+    <string name="settings_catima_theme">কটিমা থিম</string>
+    <string name="settings_pink_theme">গোলাপী থিম</string>
+    <string name="settings_magenta_theme">ম্যাজেন্টা থিম</string>
+    <string name="settings_violet_theme">ভায়োলেট থিম</string>
+    <string name="settings_blue_theme">নীল থিম</string>
+    <string name="settings_sky_blue_theme">আকাশী নীল থিম</string>
+    <string name="settings_green_theme">সবুজ থিম</string>
+    <string name="settings_brown_theme">বাদামী থিম</string>
+    <string name="sort">সাজান</string>
+    <string name="toggleMoreInfo">আরও তথ্য টগল করুন</string>
+    <string name="swipeToSwitchImages">ছবি পরিবর্তন করতে সোয়াইপ করুন</string>
+    <string name="sort_by_name">নামের দ্বারা সাজান</string>
+    <string name="sort_by_most_recently_used">সর্বাধিক সম্প্রতি ব্যবহৃত দ্বারা সাজান</string>
+    <string name="sort_by_expiry">মেয়াদ শেষ করে সাজান</string>
+    <string name="reverse">বিপরীত</string>
+    <string name="sort_by">ক্রমানুসার</string>
+    <string name="noCardExistsError">কোন কার্ড নেই ত্রুটি</string>
+    <string name="noStoreError">স্টোরেজ ত্রুটি নেই</string>
+    <string name="card_ids_copied">কার্ড আইডি কপি করা হয়েছে</string>
+    <string name="noCardsMessage">কোন কার্ড বার্তা নেই</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="deleteConfirmation">নিশ্চিতকরণ মুছে দিন</string>
+    <string name="unlockScreen">পর্দা আনলক করুন</string>
+    <string name="confirm">নিশ্চিত করুন</string>
+    <string name="delete">মুছে ফেলুন</string>
+    <string name="edit">সম্পাদনা</string>
+</resources>

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

@@ -21,12 +21,12 @@
     <string name="importExport">Import/Export</string>
     <string name="exportName">Export</string>
     <string name="importExportHelp">Zálohování karet vám umožní přesunout je do jiného zařízení.</string>
-    <string name="importSuccessfulTitle">Dovážit</string>
+    <string name="importSuccessfulTitle">Importováno</string>
     <string name="importFailedTitle">Import selhal</string>
-    <string name="importFailed">Nelze importovat karty</string>
+    <string name="importFailed">Nelze importovat karty: <xliff:g>%s</xliff:g></string>
     <string name="exportSuccessfulTitle">Exportovat</string>
     <string name="exportFailedTitle">Export selhal</string>
-    <string name="exportFailed">Nelze exportovat karty</string>
+    <string name="exportFailed">Nelze exportovat karty: <xliff:g>%s</xliff:g></string>
     <string name="importing">Importuji…</string>
     <string name="exporting">Exportuji…</string>
     <string name="noExternalStoragePermissionError">Udělit povolení externího úložiště pro import nebo export karet jako první</string>
@@ -37,7 +37,7 @@
     <string name="importOptionApplicationExplanation">K otevření souboru použijte libovolnou aplikaci nebo svého oblíbeného správce souborů.</string>
     <string name="importOptionApplicationButton">Použijte jinou aplikaci</string>
     <string name="about">O aplikaci</string>
-    <string name="app_license">Copylefted libre software, licencovaný GPLv3+</string>
+    <string name="app_license">Copyleftovaný svobodný software s licencí GPLv3+</string>
     <string name="about_title_fmt">O aplikaci <xliff:g id="app_name">%s</xliff:g></string>
     <string name="debug_version_fmt">Verze: <xliff:g id="version">%s</xliff:g></string>
     <string name="app_revision_fmt">Informace o revizi: <xliff:g id="app_revision_url">%s</xliff:g></string>
@@ -52,8 +52,8 @@
     <string name="expiryDate">Platnost</string>
     <string name="editBarcode">Upravit čárový kód</string>
     <string name="barcode">Kód</string>
-    <string name="app_resources">Zdroje třetích stran Libre: <xliff:g id="app_resources_list">%s</xliff:g></string>
-    <string name="app_libraries">Libre knihovny třetích stran: <xliff:g id="app_libraries_list">%s</xliff:g></string>
+    <string name="app_resources">Svobodné zdroje třetích stran: <xliff:g id="app_resources_list">%s</xliff:g></string>
+    <string name="app_libraries">Svobodné knihovny třetích stran: <xliff:g id="app_libraries_list">%s</xliff:g></string>
     <string name="app_copyright_old">Na základě Loyalty Card Keychain
 \ncopyright © 2016–2020 Branden Archer</string>
     <string name="exportOptionExplanation">Data budou zapsána na místo podle vašeho výběru.</string>
@@ -138,24 +138,24 @@
     <string name="setBarcodeId">Nastavení hodnoty čárového kódu</string>
     <string name="sameAsCardId">Stejné jako ID karty</string>
     <string name="importVoucherVaultMessage">Vyberte svůj <i>vouchervault.json</i> export z Voucher Vault, který chcete importovat.
-\nNebo jej vytvořte tak, že nejprve stisknete tlačítko Exportovat v aplikaci Voucher Vault.</string>
+\nVytvořte jej tak, že nejprve stisknete tlačítko Exportovat v aplikaci Voucher Vault.</string>
     <string name="importVoucherVault">Import z Voucher Vault</string>
     <string name="importStocardMessage">Vyberte svůj <i>***-sync.zip</i> export z aplikace Stocard, který chcete importovat.
-\nNebo jej získáte zasláním e-mailu na adresu support@stocardapp.com s žádostí o export vašich dat.</string>
+\nZískejte ji zasláním e-mailu na adresu support@stocardapp.com s žádostí o export vašich dat.</string>
     <string name="importStocard">Import ze Stocard</string>
     <string name="importLoyaltyCardKeychainMessage">Vyberte export <i>LoyaltyCardKeychain.csv</i> z klíčenky věrnostních karet, který chcete importovat.
-\nNebo jej vytvořte z nabídky Import/Export v Loyalty Card Keychain tak, že tam nejprve stisknete tlačítko Exportovat.</string>
+\nVytvořte jej z nabídky Import/Export v Loyalty Card Keychain tak, že tam nejprve stisknete tlačítko Exportovat.</string>
     <string name="importLoyaltyCardKeychain">Import z Loyalty Card Keychain</string>
-    <string name="importFidmeMessage">Vyberte svůj <i>fidme-export-request-xxxxxx.zip</i> export z FidMe k importu a poté vyberte typy čárových kódů ručně. 
-\nNebo jej vytvořte ze svého profilu FidMe tak, že nejprve zvolíte možnost Ochrana dat a poté stisknete tlačítko Extract moje data.</string>
+    <string name="importFidmeMessage">Vyberte svůj <i>fidme-export-request-xxxxxx.zip</i> export z FidMe k importu a poté vyberte typy čárových kódů ručně.
+\nVytvořte jej ze svého profilu FidMe tak, že nejprve zvolíte možnost Ochrana dat a poté stisknete tlačítko Extract moje data.</string>
     <string name="importFidme">Import z FidMe</string>
     <string name="importCatimaMessage">Vyberte export <i>catima.zip</i> z programu Catima, který chcete importovat.
-\nNebo jej vytvořte z nabídky Import/Export jiné aplikace Catima tak, že v ní nejprve stisknete tlačítko Exportovat.</string>
+\nVytvořte jej z nabídky Import/Export jiné aplikace Catima tak, že v ní nejprve stisknete tlačítko Exportovat.</string>
     <string name="importCatima">Import z Catima</string>
     <string name="accept">Přijmout</string>
     <string name="privacy_policy_popup_text">Oznámení o zásadách ochrany osobních údajů (vyžadováno některými obchody s aplikacemi):
 \n
-\nNejsou shromažďovány žádné údaje, což může potvrdit každý, protože naše aplikace je libre software.</string>
+\nNejsou shromažďovány žádné údaje, což může potvrdit každý, protože naše aplikace je svobodný software.</string>
     <string name="privacy_policy">Zásady soukromí</string>
     <string name="app_loyalty_card_keychain">Loyalty Card Keychain</string>
     <string name="chooseImportType">Importovat data z\?</string>
@@ -212,4 +212,14 @@
     <string name="help_translate_this_app">Pomozte s překladem této aplikace</string>
     <string name="report_error">Nahlásit chybu</string>
     <string name="on_google_play">na Google Play</string>
+    <string name="exportPassword">Nastavení hesla pro ochranu exportu (volitelné)</string>
+    <string name="exportPasswordHint">Zadejte heslo</string>
+    <string name="selectColor">Vyberte barvu</string>
+    <string name="setIcon">Nastavit ikonu</string>
+    <string name="group_edit">Upravit skupinu</string>
+    <string name="group_name_already_in_use">Již použitý název skupiny</string>
+    <string name="group_name_is_empty">Název skupiny nemůže být prázdný</string>
+    <string name="group_updated">Skupina aktualizována</string>
+    <string name="editGroup">Úprava skupiny: <xliff:g>%s</xliff:g></string>
+    <string name="noGiftCardsGroup">Zatím nemáte žádné věrnostní karty. Jakmile nějaké přidáte, můžete je přiřadit do skupiny zde.</string>
 </resources>

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

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="noGiftCards">Cliciwch y + plws botwm i ychwanegu cerdyn, neu mewnforio rhai o\'r ⋮ ddewislen cyntaf.</string>
+    <string name="action_add">Ychwanegu</string>
+    <string name="action_search">Chwilio</string>
+    <string name="noMatchingGiftCards">Nid oedd hyd i unrhyw beth. Ceisiwch newid eich chwiliad.</string>
+</resources>

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

@@ -41,10 +41,10 @@
     <string name="importExportHelp">Hvis du sikkerhedskopierer dine kort, kan du flytte dem til en anden enhed.</string>
     <string name="importSuccessfulTitle">Importeret</string>
     <string name="importFailedTitle">Import mislykkedes</string>
-    <string name="importFailed">Kunne ikke importere kort</string>
+    <string name="importFailed">Kunne ikke importere kort: <xliff:g>%s</xliff:g></string>
     <string name="exportSuccessfulTitle">Eksporteret</string>
     <string name="exportFailedTitle">Eksport mislykkedes</string>
-    <string name="exportFailed">Kunne ikke eksportere kort</string>
+    <string name="exportFailed">Kunne ikke eksportere kort: <xliff:g>%s</xliff:g></string>
     <string name="importing">Importere…</string>
     <string name="exporting">Eksportere…</string>
     <string name="settings_dark_theme">Mørk</string>
@@ -86,4 +86,11 @@
     <string name="settings_disable_lockscreen_while_viewing_card">Forebyg låseskærm</string>
     <string name="settings_keep_screen_on">LHold skærm tændt</string>
     <string name="settings_lock_barcode_orientation">Lås stregkode-orientering</string>
+    <string name="moveUp">Bevæg dig opad</string>
+    <string name="leaveWithoutSaveConfirmation">Forlade uden at gemme\?</string>
+    <string name="settings_display_barcode_max_brightness">Lysere stregkodevisning</string>
+    <string name="failedOpeningFileManager">Installer først en filhåndteringsprogram.</string>
+    <string name="moveDown">Bevæger sig nedad</string>
+    <string name="leaveWithoutSaveTitle">Afslut</string>
+    <string name="addManually">Indtast kort-ID manuelt</string>
 </resources>

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

@@ -3,7 +3,7 @@
     <string name="action_search">Suchen</string>
     <string name="action_add">Hinzufügen</string>
     <string name="noGiftCards">Füge eine Karte mit + hinzu oder importiere welche über das ⋮ Menü.</string>
-    <string name="noMatchingGiftCards">Nichts gefunden. Versuche, deine Suche zu ändern.</string>
+    <string name="noMatchingGiftCards">Keine Ergebnisse. Versuche, deine Suche zu ändern.</string>
     <string name="storeName">Name</string>
     <string name="note">Notiz</string>
     <string name="cardId">Kartennummer</string>
@@ -25,20 +25,20 @@
     <string name="cardShortcut">Shortcut zu einer Karte</string>
     <string name="noCardsMessage">Füge zuerst eine Karte hinzu</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="noCardIdError">Keine ID eingegeben</string>
+    <string name="noCardExistsError">Diese Karte konnte nicht gefunden werden</string>
     <string name="importExport">Import/Export</string>
     <string name="exportName">Export</string>
-    <string name="importExportHelp">Durch das Sichern deiner Karten kannst du sie auf ein anderes Gerät übertragen.</string>
+    <string name="importExportHelp">Wenn du deine Daten sicherst, kannst du sie auf ein anderes Gerät übertragen.</string>
     <string name="importSuccessfulTitle">Importiert</string>
     <string name="importFailedTitle">Import fehlgeschlagen</string>
-    <string name="importFailed">Karten konnten nicht importiert werden</string>
+    <string name="importFailed">Karten konnten nicht importiert werden: <xliff:g>%s</xliff:g></string>
     <string name="exportSuccessfulTitle">Exportiert</string>
     <string name="exportFailedTitle">Export fehlgeschlagen</string>
-    <string name="exportFailed">Karten konnten nicht exportiert werden</string>
+    <string name="exportFailed">Karten konnten nicht exportiert werden: <xliff:g>%s</xliff:g></string>
     <string name="importing">Importiere…</string>
     <string name="exporting">Exportiere…</string>
-    <string name="noExternalStoragePermissionError">Erlaube Speicherzugriff um Karten zu importieren oder exportieren</string>
+    <string name="noExternalStoragePermissionError">Berechtigung für den externen Speicher zum Importieren oder Exportieren von Daten erteilen</string>
     <string name="importOptionFilesystemTitle">Importiere aus dem Dateisystem</string>
     <string name="importOptionFilesystemExplanation">Wähle eine Datei vom Dateisystem aus.</string>
     <string name="importOptionFilesystemButton">Wähle vom Dateisystem</string>
@@ -46,44 +46,44 @@
     <string name="importOptionApplicationExplanation">Beliebige Anwendung oder deinen bevorzugten Dateimanager zur Dateiauswahl verwenden.</string>
     <string name="importOptionApplicationButton">Aus anderer Anwendung</string>
     <string name="about">Über</string>
-    <string name="app_license">Freie Software, lizensiert unter der GPLv3+.</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">Revisionsinfo: <xliff:g id="app_revision_url">%s</xliff:g></string>
     <string name="selectBarcodeTitle">Barcode auswählen</string>
-    <string name="copy_to_clipboard_toast">Kartennummer in die Zwischenablage kopiert</string>
-    <string name="thumbnailDescription">Vorschaubild für die Karte</string>
+    <string name="copy_to_clipboard_toast">ID in die Zwischenablage kopiert</string>
+    <string name="thumbnailDescription">Vorschaubild</string>
     <string name="settings">Einstellungen</string>
     <string name="settings_category_title_ui">Benutzeroberfläche</string>
     <string name="settings_display_barcode_max_brightness">Barcodeansicht aufhellen</string>
     <string name="settings_lock_barcode_orientation">Barcoderotation sperren</string>
-    <string name="exportSuccessful">Kartendaten exportiert</string>
-    <string name="importSuccessful">Kartendaten importiert</string>
+    <string name="exportSuccessful">Daten exportiert</string>
+    <string name="importSuccessful">Daten importiert</string>
     <string name="intent_import_card_from_url_share_text">Ich würde gerne diese Karte mit dir teilen</string>
     <string name="settings_dark_theme">Dunkel</string>
     <string name="settings_light_theme">Hell</string>
     <string name="settings_system_theme">System</string>
     <string name="settings_theme">Farbschema</string>
-    <string name="enterBarcodeInstructions">Gib die Kartennummer ein und wähle entweder den Barcode-Typ unten oder wähle \"Diese Karte hat keinen Barcode\" aus.</string>
+    <string name="enterBarcodeInstructions">Gib die ID ein und wähle unten entweder einen Barcodetyp oder „Es gibt keinen Barcode“.</string>
     <string name="app_copyright_old">Basierend auf Loyalty Card Keychain
-\nCopyright © 2016-2020 Branden Archer.</string>
+\nCopyright © 2016-2020 Branden Archer</string>
     <string name="exportOptionExplanation">Die Daten werden an einen Ort deiner Wahl geschrieben.</string>
     <string name="failedParsingImportUriError">Die Import-URI konnte nicht verarbeitet werden</string>
     <string name="share">Teilen</string>
-    <string name="barcodeNoBarcode">Diese Karte hat keinen Barcode</string>
+    <string name="barcodeNoBarcode">Es gibt keinen Barcode</string>
     <string name="barcodeType">Barcodetyp</string>
     <string name="starImage">Favoritenstern</string>
     <string name="deleteConfirmationGroup">Gruppe löschen?</string>
     <string name="all">Alle</string>
-    <string name="noGroups">Klicke auf das Pluszeichen + um eine Gruppe hinzuzufügen.</string>
-    <string name="noGroupCards">Diese Gruppe hat noch keine Karten</string>
+    <string name="noGroups">Klicke auf das Pluszeichen +, um eine Gruppe hinzuzufügen.</string>
+    <string name="noGroupCards">Diese Gruppe ist leer</string>
     <string name="groups">Gruppen</string>
     <string name="enter_group_name">Gib einen Gruppennamen ein</string>
     <string name="leaveWithoutSaveConfirmation">Beenden ohne zu speichern\?</string>
     <string name="leaveWithoutSaveTitle">Beenden</string>
     <string name="failedOpeningFileManager">Installiere zuerst einen Dateimanager.</string>
     <string name="noBarcode">Kein Barcode</string>
-    <string name="addManually">Kartennummer manuell eingeben</string>
+    <string name="addManually">ID manuell eingeben</string>
     <string name="moveDown">Nach unten verschieben</string>
     <string name="moveUp">Nach oben verschieben</string>
     <plurals name="groupCardCount">
@@ -116,17 +116,17 @@
 \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">Wählen Sie Ihren <i>vouchervault.json</i>-Export aus Voucher Vault zum Importieren aus.
-\nOder erstellen Sie ihn, indem Sie zuerst auf Export in Voucher Vault drücken.</string>
+    <string name="importVoucherVaultMessage">Wähle deinen <i>vouchervault.json</i>-Export aus Voucher Vault zum Importieren aus.
+\nErstellen Sie ihn, indem du zuerst auf Export in Voucher Vault drückst.</string>
     <string name="importVoucherVault">Aus Voucher Vault importieren</string>
-    <string name="importLoyaltyCardKeychainMessage">Wählen Sie Ihren <i>LoyaltyCardKeychain.csv</i>-Export aus Loyalty Card Keychain zum Importieren aus.
-\nOder erstellen Sie ihn über das Menü Import/Export in Loyalty Card Keychain, indem Sie dort zuerst auf Export drücken.</string>
+    <string name="importLoyaltyCardKeychainMessage">Wählen du deinen <i>LoyaltyCardKeychain.csv</i>-Export aus Loyalty Card Keychain zum Importieren aus.
+\nErstelle ihn über das Menü Import/Export in Loyalty Card Keychain, indem du dort zuerst auf Export drückst.</string>
     <string name="importLoyaltyCardKeychain">Aus Loyalty Card Keychain importieren</string>
-    <string name="importFidmeMessage">Wählen Sie Ihren <i>fidme-export-request-xxxxxx.zip</i>-Export aus FidMe zum Importieren aus und wählen Sie anschließend die Strichcodetypen manuell aus.
-\nOder erstellen Sie ihn aus Ihrem FidMe-Profil, indem Sie Datenschutz wählen und dann zuerst auf Meine Daten extrahieren drücken.</string>
+    <string name="importFidmeMessage">Wähle deinen <i>fidme-export-request-xxxxxx.zip</i>-Export aus FidMe zum Importieren aus und wähle anschließend die Strichcodetypen manuell aus.
+\nOder erstelle ihn aus deinem FidMe-Profil, indem du Datenschutz wählst und dann zuerst auf Meine Daten extrahieren drückst.</string>
     <string name="importFidme">Aus FidMe importieren</string>
-    <string name="importCatimaMessage">Wählen Sie Ihren <i>catima.zip</i>-Export aus Catima zum Importieren aus.
-\nOder erstellen Sie ihn aus dem Import/Export-Menü einer anderen Catima-Anwendung, indem Sie dort zuerst Export drücken.</string>
+    <string name="importCatimaMessage">Wähle deinen <i>catima.zip</i>-Export aus Catima zum Importieren aus.
+\nErstelle ihn aus dem Import/Export-Menü einer anderen Catima-Anwendung, indem du dort zuerst Export drückst.</string>
     <string name="importCatima">Aus Catima importieren</string>
     <string name="setBarcodeId">Manuell eingeben</string>
     <string name="sameAsCardId">Entspricht Kartennummer</string>
@@ -139,31 +139,31 @@
     <string name="wrongValueForBarcodeType">Der Wert ist für den gewählten Barcodetyp leider 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="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 diese 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_ids_copied">ID(s) kopiert</string>
     <string name="no">Nein</string>
     <string name="yes">Ja</string>
-    <string name="updateBarcodeQuestionText">Kartennummer geändert. Möchtest du auch den Barcode auf den gleichen Wert ändern?</string>
+    <string name="updateBarcodeQuestionText">Kartennummer geändert. Möchtest du auch den Barcode auf den gleichen Wert ändern\?</string>
     <string name="updateBarcodeQuestionTitle">Barcodewert aktualisieren?</string>
     <string name="takePhoto">Foto aufnehmen</string>
     <string name="removeImage">Bild entfernen</string>
     <string name="setBackImage">Kartenrückseite</string>
     <string name="setFrontImage">Kartenvorderseite</string>
     <string name="photos">Fotos</string>
-    <string name="frontImageDescription">Bild der Kartenvorderseite</string>
-    <string name="backImageDescription">Bild der Kartenrückseite</string>
+    <string name="frontImageDescription">Bild auf der Vorseite</string>
+    <string name="backImageDescription">Bild auf der Rückseite</string>
     <string name="passwordRequired">Bitte gib das Passwort ein</string>
-    <string name="importStocardMessage">Wählen Sie Ihren <i>***-sync.zip</i>-Export aus Stocard zum Importieren aus.
-\nOder Sie erhalten ihn, indem Sie eine E-Mail an support@stocardapp.com senden und um einen Export Ihrer Daten bitten.</string>
+    <string name="importStocardMessage">Wähle deinen <i>***-sync.zip</i>-Export aus Stocard zum Importieren aus.
+\nSie erhalten ihn, indem du eine E-Mail an support@stocardapp.com sendest und um einen Export deiner Daten bitten.</string>
     <string name="importStocard">Von Stocard importieren</string>
     <string name="turn_flashlight_off">Licht ausschalten</string>
     <string name="turn_flashlight_on">Licht einschalten</string>
     <string name="failedGeneratingShareURL">URL konnte nicht erstellt werden. Bitte melde das an uns.</string>
     <plurals name="selectedCardCount">
-        <item quantity="one"><xliff:g>%d</xliff:g> Karte ausgewählt</item>
-        <item quantity="other"><xliff:g>%d</xliff:g> Karten ausgewählt</item>
+        <item quantity="one"><xliff:g>%d</xliff:g> ausgewählt</item>
+        <item quantity="other"><xliff:g>%d</xliff:g> ausgewählt</item>
     </plurals>
     <string name="deleteTitle">Karte löschen</string>
     <string name="deleteConfirmation">Diese Karte wirklich löschen?</string>
@@ -189,7 +189,7 @@
     <string name="settings_theme_color">Designfarbe</string>
     <string name="app_contributors">Ermöglicht durch: <xliff:g id="app_contributors">%s</xliff:g></string>
     <string name="toggleMoreInfo">Umschalten, um weitere Informationen anzuzeigen</string>
-    <string name="barcodeImageDescriptionWithType">Bild des Kartenstrichcodes des Typs <xliff:g>%s</xliff:g></string>
+    <string name="barcodeImageDescriptionWithType">Bild <xliff:g>%s</xliff:g> Barcode</string>
     <string name="swipeToSwitchImages">Wischen oder langes Drücken zum Wechseln der Bilder</string>
     <string name="sort_by">Sortieren nach</string>
     <string name="sort_by_balance">Kontostand</string>
@@ -197,5 +197,29 @@
     <string name="sort_by_most_recently_used">Zuletzt verwendet</string>
     <string name="sort_by_name">Name</string>
     <string name="sort">Sortieren</string>
-    <string name="reverse">Umgekehrt</string>
-</resources>
+    <string name="reverse">… in umgekehrter Reihenfolge</string>
+    <string name="version_history">Versionshistorie</string>
+    <string name="credits">Dank an</string>
+    <string name="help_translate_this_app">Hilfe bei der Übersetzung</string>
+    <string name="and_data_usage">und Datennutzung</string>
+    <string name="rate_this_app">Bewerte die Anwendung</string>
+    <string name="on_google_play">auf Google Play</string>
+    <string name="license">Lizenz</string>
+    <string name="source_repository">Quellcode</string>
+    <string name="on_github">auf GitHub</string>
+    <string name="report_error">Fehler melden</string>
+    <string name="exportPassword">Lege ein Passwort fest, um deinen Export zu schützen (optional)</string>
+    <string name="exportPasswordHint">Passwort eingeben</string>
+    <string name="group_name_already_in_use">Der Gruppenname wird bereits verwendet</string>
+    <string name="group_name_is_empty">Gruppenname darf nicht leer sein</string>
+    <string name="group_updated">Gruppe aktualisiert</string>
+    <string name="editGroup">Gruppe wird bearbeitet: <xliff:g>%s</xliff:g></string>
+    <string name="group_edit">Gruppe bearbeiten</string>
+    <string name="noGiftCardsGroup">Erstelle einige Karten und ordne sie dann hier der Gruppe zu.</string>
+    <string name="setIcon">Symbol einstellen</string>
+    <string name="selectColor">Farbe auswählen</string>
+    <string name="action_show_details">Details anzeigen</string>
+    <string name="action_hide_details">Details ausblenden</string>
+    <string name="translate_platform">auf Weblate</string>
+    <string name="shortcutSelectCard">Wählen Sie eine Karte</string>
+</resources>

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

@@ -28,10 +28,10 @@
     <string name="importExportHelp">Τα εφεδρικά δεδομένα σας δίνουν την δυνατότητα να μεταφέρετε τις κάρτες σας σε μία άλλη συσκευή.</string>
     <string name="importSuccessfulTitle">Εισαγωγή επιτυχής</string>
     <string name="importFailedTitle">Εισαγωγή ανεπιτυχής</string>
-    <string name="importFailed">Δεν εισήχθει</string>
+    <string name="importFailed">Δεν εισήχθει: <xliff:g>%s</xliff:g></string>
     <string name="exportSuccessfulTitle">Εξαγωγή επιτυχής</string>
     <string name="exportFailedTitle">Εξαγωγή ανεπιτυχής</string>
-    <string name="exportFailed">Δεν εξήχθη</string>
+    <string name="exportFailed">Δεν εξήχθη: <xliff:g>%s</xliff:g></string>
     <string name="importing">Γίνεται εισαγωγή του…</string>
     <string name="exporting">Γίνεται εξαγωγή του…</string>
     <string name="noExternalStoragePermissionError">Δεν είναι δυνατή η εισαγωγή ή εξαγωγή καρτών χωρίς την άδεια πρόσβασης στον εξωτερικό χώρο αποθήκευσης</string>

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

@@ -65,8 +65,8 @@
     <string name="importOptionFilesystemExplanation">Elektu specifa dosiero de la dosiersistemo.</string>
     <string name="exportOptionExplanation">La datumoj estos skribita al loko de via elekto.</string>
     <string name="noExternalStoragePermissionError">Grant ekstera stokado permeso de importado aŭ eksportado kartoj unua</string>
-    <string name="exportFailed">Ne povis eksporti kartoj</string>
-    <string name="importFailed">Ne povis importi kartoj</string>
+    <string name="exportFailed">Ne povis eksporti kartoj: <xliff:g>%s</xliff:g></string>
+    <string name="importFailed">Ne povis importi kartoj: <xliff:g>%s</xliff:g></string>
     <string name="importExportHelp">Subtenanta supre vian kartoj permesas vin movi ilin al alia aparato.</string>
     <string name="failedParsingImportUriError">Ne eblis analizi la importado URI</string>
     <string name="noCardExistsError">Ne eblis trovi karto</string>
@@ -79,4 +79,13 @@
     <string name="unlockScreen">Malbloki Rotacio</string>
     <string name="lockScreen">Bloko Rotacio</string>
     <string name="star">Aldoni al miaj plej ŝatataj</string>
+    <string name="copy_to_clipboard_toast">Card ID kopiita al la tondujo</string>
+    <string name="settings_keep_screen_on">Teni sur ekrano</string>
+    <string name="importSuccessful">Karto datumo importitaj</string>
+    <string name="enter_group_name">Eniri nomo de la grupo</string>
+    <string name="noGroups">Klaki la + plus butonon por aldoni grupoj por categorization unua.</string>
+    <string name="all">Ĉiuj</string>
+    <string name="intent_import_card_from_url_share_text">Mi deziras dividi karto kun vi</string>
+    <string name="exportSuccessful">Karto datumo eksportita</string>
+    <string name="noGroupCards">Ĉi tiu grupo ne enhavas ajnan kartoj</string>
 </resources>

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

@@ -28,10 +28,10 @@
     <string name="importExportHelp">El respaldo le permite transferir sus tarjetas a otro dispositivo.</string>
     <string name="importSuccessfulTitle">Importado</string>
     <string name="importFailedTitle">Falló la importación</string>
-    <string name="importFailed">No se han podido importar tarjetas</string>
+    <string name="importFailed">No se han podido importar tarjetas: <xliff:g>%s</xliff:g></string>
     <string name="exportSuccessfulTitle">Exportado</string>
     <string name="exportFailedTitle">Falló la exportación</string>
-    <string name="exportFailed">No se han podido exportar las tarjetas</string>
+    <string name="exportFailed">No se han podido exportar las tarjetas: <xliff:g>%s</xliff:g></string>
     <string name="importing">Importando…</string>
     <string name="exporting">Exportando…</string>
     <string name="noExternalStoragePermissionError">Otorgar permiso de almacenamiento para importar o exportar tarjetas</string>

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

@@ -104,10 +104,10 @@
     <string name="exportOptionExplanation">Tiedot kirjoitetaan valitsemaasi sijaintiin.</string>
     <string name="exporting">Viedään…</string>
     <string name="importing">Tuodaan…</string>
-    <string name="exportFailed">Kortteja ei voitu viedä</string>
+    <string name="exportFailed">Kortteja ei voitu viedä: <xliff:g>%s</xliff:g></string>
     <string name="exportFailedTitle">Vienti epäonnistui</string>
     <string name="exportSuccessfulTitle">Vienti valmis</string>
-    <string name="importFailed">Kortteja ei voitu tuoda</string>
+    <string name="importFailed">Kortteja ei voitu tuoda: <xliff:g>%s</xliff:g></string>
     <string name="importFailedTitle">Tuonti epäonnistui</string>
     <string name="importSuccessfulTitle">Tuonti valmis</string>
     <string name="importExportHelp">Varmuuskopioimalla korttisi, voit siirtää ne toiseen laitteeseen.</string>
@@ -143,7 +143,7 @@
     <string name="note">Lisätieto</string>
     <string name="storeName">Nimi</string>
     <string name="noMatchingGiftCards">Ei hakutuloksia, kokeile toisella hakutermillä.</string>
-    <string name="noGiftCards">Lisää ensin kortti napsauttamalla + plus-painiketta, tai mene ⋮ valikkoon tuodaksesi varmuuskopiosta.</string>
+    <string name="noGiftCards">Lisää kortti napsauttamalla + plus-painiketta, tai mene ⋮ valikkoon tuodaksesi varmuuskopiosta.</string>
     <string name="action_add">Lisää</string>
     <string name="action_search">Hae</string>
     <string name="takePhoto">Ota valokuva</string>
@@ -164,8 +164,8 @@
         <item quantity="other">Poista <xliff:g>%d</xliff:g>kortit</item>
     </plurals>
     <plurals name="selectedCardCount">
-        <item quantity="one"><xliff:g>%d</xliff:g> Kortti valittu</item>
-        <item quantity="other"><xliff:g>%d</xliff:g> kortit valitut</item>
+        <item quantity="one"><xliff:g>%d</xliff:g> valittu</item>
+        <item quantity="other"><xliff:g>%d</xliff:g> valitut</item>
     </plurals>
     <string name="importStocard">Tuo Stocardista</string>
     <string name="importStocardMessage">Valitse tuotava <i>***-sync.zip</i>-vienti Stocardista.

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

@@ -1,7 +1,7 @@
 <?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="action_add">Ajouter</string>
-    <string name="noGiftCards">Cliquez sur le bouton + plus pour ajouter une carte, ou importez les depuis le menu ⋮</string>
+    <string name="noGiftCards">Cliquez sur le bouton + plus pour ajouter une carte, ou importez les depuis le menu ⋮.</string>
     <string name="storeName">Nom</string>
     <string name="note">Notes</string>
     <string name="cardId">Numéro</string>
@@ -19,22 +19,22 @@
     <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="noCardsMessage">Ajoutez d’abord une carte</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="noCardIdError">Aucun identifiant saisi</string>
+    <string name="noCardExistsError">Impossible de trouver cette carte</string>
     <string name="importExport">Importer/Exporter</string>
     <string name="exportName">Exporter</string>
-    <string name="importExportHelp">Exporter vos cartes vous permet de les récupérer sur un autre appareil.</string>
+    <string name="importExportHelp">La sauvegarde de vos données permet de les déplacer sur un autre appareil.</string>
     <string name="importSuccessfulTitle">Importé</string>
     <string name="importFailedTitle">Échec de l\'import</string>
-    <string name="importFailed">Impossible d\'importer les cartes</string>
+    <string name="importFailed">Impossible d\'importer les cartes: <xliff:g>%s</xliff:g></string>
     <string name="exportSuccessfulTitle">Exporté</string>
     <string name="exportFailedTitle">Échec de l\'export</string>
-    <string name="exportFailed">Impossible d\'exporter les cartes</string>
+    <string name="exportFailed">Impossible d\'exporter les cartes: <xliff:g>%s</xliff:g></string>
     <string name="importing">Import …</string>
     <string name="exporting">Export …</string>
-    <string name="noExternalStoragePermissionError">Veuillez autoriser l\'accès au stockage externe avant d\'importer/exporter les données</string>
+    <string name="noExternalStoragePermissionError">Accorder au stockage externe l’autorisation d’importer ou d’exporter des données</string>
     <string name="importOptionFilesystemTitle">Importer depuis le système de fichiers</string>
     <string name="importOptionFilesystemExplanation">Choisissez le fichier à importer.</string>
     <string name="importOptionFilesystemButton">Système de fichiers</string>
@@ -47,26 +47,26 @@
     <string name="debug_version_fmt">Version : <xliff:g id="version">%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="copy_to_clipboard_toast">Identifiant copié dans le presse-papiers</string>
+    <string name="thumbnailDescription">Miniature</string>
     <string name="settings">Paramètres</string>
     <string name="settings_category_title_ui">Interface utilisateur</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>
-    <string name="importSuccessful">Carte de fidélité importée</string>
+    <string name="settings_lock_barcode_orientation">Verrouiller l’orientation du code-barres</string>
+    <string name="exportSuccessful">Données exportées</string>
+    <string name="importSuccessful">Données importées</string>
     <string name="intent_import_card_from_url_share_text">Je veux partager une carte avec toi</string>
     <string name="settings_dark_theme">Sombre</string>
     <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 et choisissez le type de code-barres ci-dessous, ou « Cette carte n’a pas de code-barres ».</string>
+    <string name="enterBarcodeInstructions">Entrez l’identifiant, et choisissez un type de code-barres ci-dessous, ou « Il n’y 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="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>
+    <string name="barcodeNoBarcode">Il n’y a pas de code-barres</string>
     <string name="barcodeType">Type de code-barres</string>
     <string name="noMatchingGiftCards">Aucun résultat. Essayez de modifier votre recherche.</string>
     <string name="action_search">Rechercher</string>
@@ -82,7 +82,7 @@
     <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="addManually">Entrer manuellement l’identifiant</string>
     <string name="moveDown">Descendre</string>
     <string name="moveUp">Monter</string>
     <plurals name="groupCardCount">
@@ -91,7 +91,7 @@
     </plurals>
     <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) :
+    <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>
@@ -101,11 +101,11 @@
     <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="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="expiryDate">Date d’expiration</string>
     <string name="editBarcode">Modifier le code-barres</string>
     <string name="barcode">Code-barres</string>
     <string name="card">Carte</string>
@@ -128,21 +128,21 @@
 \nCréez-la à 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="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="sameAsCardId">Identique à l’identifiant</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 ultérieure de l’application.</string>
-    <string name="wrongValueForBarcodeType">La valeur n\'est pas valide pour le type de code-barres sélectionné</string>
+    <string name="wrongValueForBarcodeType">La valeur n’est pas valide pour le type de code-barres sélectionné</string>
     <string name="app_resources">Ressources tierces libres : <xliff:g id="app_resources_list">%s</xliff:g></string>
     <string name="app_libraries">Bibliothèques tierces libres : <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">Identifiants des cartes copiés dans le presse-papiers</string>
-    <string name="card_ids_copied">Num. de la carte copié(s)</string>
-    <string name="updateBarcodeQuestionText">Vous avez changé l\'identifiant de la carte. Voulez-vous également mettre à jour le code-barres pour utiliser la même valeur \?</string>
+    <string name="copy_to_clipboard_multiple_toast">Identifiants copiés dans le presse-papiers</string>
+    <string name="card_ids_copied">Numéro(s) copié(s)</string>
+    <string name="updateBarcodeQuestionText">Vous avez changé l’identifiant. Voulez-vous également mettre à jour le code-barres pour utiliser la même valeur \?</string>
     <string name="no">Non</string>
     <string name="yes">Oui</string>
     <string name="updateBarcodeQuestionTitle">Mettre à jour la valeur du code-barres \?</string>
@@ -151,8 +151,8 @@
     <string name="setBackImage">Définir l’image verso</string>
     <string name="setFrontImage">Définir l’image recto</string>
     <string name="photos">Photos</string>
-    <string name="backImageDescription">Image verso de la carte</string>
-    <string name="frontImageDescription">Image recto de la carte</string>
+    <string name="backImageDescription">Image du verso</string>
+    <string name="frontImageDescription">Image du recto</string>
     <string name="passwordRequired">Veuillez entrer le mot de passe</string>
     <string name="importStocardMessage">Sélectionnez votre exportation <i>***-sync.zip</i> de Stocard pour l’importer.
 \nVous pouvez l’obtenir en envoyant un courriel à support@stocardapp.com pour demander une exportation de vos données.</string>
@@ -161,8 +161,8 @@
     <string name="turn_flashlight_on">Allumer la lampe de poche</string>
     <string name="failedGeneratingShareURL">Impossible de générer une URL partageable. Veuillez signaler ceci.</string>
     <plurals name="selectedCardCount">
-        <item quantity="one"><xliff:g>%d</xliff:g> carte sélectionnée</item>
-        <item quantity="other"><xliff:g>%d</xliff:g> cartes sélectionnées</item>
+        <item quantity="one"><xliff:g>%d</xliff:g> sélectionnée</item>
+        <item quantity="other"><xliff:g>%d</xliff:g> sélectionnées</item>
     </plurals>
     <string name="deleteTitle">Supprimer la carte</string>
     <string name="deleteConfirmation">Supprimer cette carte \?</string>
@@ -187,25 +187,39 @@
     <string name="settings_catima_theme">Catima</string>
     <string name="settings_theme_color">Couleur du thème</string>
     <string name="app_contributors">Rendu possible par : <xliff:g id="app_contributors">%s</xliff:g></string>
-    <string name="noGroupCards">Ce groupe ne contient pas de cartes</string>
-    <string name="toggleMoreInfo">Activer/désactiver l\'affichage de plus d\'infos</string>
-    <string name="barcodeImageDescriptionWithType">Image du code-barres de la carte de type <xliff:g>%s</xliff:g></string>
-    <string name="swipeToSwitchImages">Balayez ou appuyez longuement pour changer d\'image</string>
+    <string name="noGroupCards">Ce groupe est vide</string>
+    <string name="toggleMoreInfo">Activer/désactiver l’affichage de plus d’infos</string>
+    <string name="barcodeImageDescriptionWithType">Image <xliff:g>%s</xliff:g> code-barres</string>
+    <string name="swipeToSwitchImages">Balayez ou appuyez longuement pour changer d’image</string>
     <string name="sort">Trier</string>
     <string name="sort_by">Trier par</string>
-    <string name="reverse">Inversé</string>
-    <string name="sort_by_expiry">Date d\'expiration</string>
+    <string name="reverse">… dans l’ordre inverse</string>
+    <string name="sort_by_expiry">Date d’expiration</string>
     <string name="sort_by_most_recently_used">Les plus récemment utilisées</string>
     <string name="sort_by_name">Nom</string>
     <string name="sort_by_balance">Solde</string>
     <string name="report_error">Signaler une erreur</string>
     <string name="on_google_play">sur Google Play</string>
-    <string name="rate_this_app">Notez cette app</string>
+    <string name="rate_this_app">Notez cette appli</string>
     <string name="and_data_usage">utilisation des données</string>
     <string name="on_github">sur GitHub</string>
     <string name="source_repository">Dépôt source</string>
     <string name="license">Licence</string>
-    <string name="help_translate_this_app">Aidez à traduire cette app</string>
+    <string name="help_translate_this_app">Aidez à traduire cette appli</string>
     <string name="credits">Contributeurs</string>
     <string name="version_history">Historique des versions</string>
-</resources>
+    <string name="exportPassword">Définissez un mot de passe pour protéger vos exportations (facultatif)</string>
+    <string name="exportPasswordHint">Entrez le mot de passe</string>
+    <string name="editGroup">Modification du groupe : <xliff:g> %s </xliff:g></string>
+    <string name="noGiftCardsGroup">Créez des cartes, puis affectez-les au groupe ici.</string>
+    <string name="group_edit">Modifier le groupe</string>
+    <string name="group_name_already_in_use">Nom de groupe déjà utilisé</string>
+    <string name="group_updated">Groupe mis à jour</string>
+    <string name="group_name_is_empty">Le nom du groupe ne peut pas être vide</string>
+    <string name="setIcon">Définir l’icône</string>
+    <string name="selectColor">Sélectionnez la couleur</string>
+    <string name="action_show_details">Afficher les détails</string>
+    <string name="action_hide_details">Masquer les détails</string>
+    <string name="translate_platform">sur Weblate</string>
+    <string name="shortcutSelectCard">Sélectionnez une carte</string>
+</resources>

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

@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="unstar">Ukloni iz favorita</string>
+    <string name="action_search">Pretraživanje</string>
+    <string name="save">Spremi</string>
+    <string name="edit">Uredi</string>
+    <string name="delete">Ukloni</string>
+    <string name="confirm">Potvrdi</string>
+    <string name="lockScreen">Rotacija bloka</string>
+    <string name="unlockScreen">Otključaj Rotaciju</string>
+    <string name="deleteTitle">Ukloni kartu</string>
+    <string name="deleteConfirmation">Izbrisati ovu karticu zauvijek\?</string>
+    <string name="copy_to_clipboard">Kopiraj ID u međuspremnik</string>
+    <string name="share">Podijeli</string>
+    <string name="sendLabel">Pošalji…</string>
+    <string name="editCardTitle">Uredi karticu</string>
+    <string name="addCardTitle">Dodaj Kartu</string>
+    <string name="scanCardBarcode">Skeniranje crtičnog koda kartice</string>
+    <string name="cardShortcut">Oznaka karte</string>
+    <string name="noCardsMessage">Najprije dodajte karticu</string>
+    <string name="card_ids_copied">Kopirani ID kartice</string>
+    <string name="noBarcode">Nema crtičnog koda</string>
+    <string name="star">Dodaj u favorite</string>
+    <string name="action_add">Dodaj</string>
+    <string name="storeName">Ime</string>
+    <string name="note">Napomena</string>
+    <string name="noMatchingGiftCards">Ništa nisam našao. Pokušajte promijeniti pretraživanje.</string>
+    <string name="cardId">ID kartice</string>
+    <string name="barcodeType">Vrsta crtičnog koda</string>
+    <string name="barcodeNoBarcode">Na ovoj kartici nema crtičnog koda</string>
+    <string name="cancel">Poništi</string>
+    <string name="noGiftCards">Pritisnite gumb + plus da biste dodali karticu ili ga najprije uvezite iz izbornika ⋮.</string>
+    <string name="noStoreError">Ime nije uneseno</string>
+    <string name="noCardExistsError">Nije moguće pronaći karticu</string>
+    <string name="failedParsingImportUriError">Nije moguće analizirati uvoz URI</string>
+    <string name="importExport">Uvoz / Izvoz</string>
+    <string name="exportName">Izvoz</string>
+    <string name="importExportHelp">Sigurnosno kopiranje kartica omogućuje vam da ih premjestite na drugi uređaj.</string>
+    <string name="importSuccessfulTitle">Uvezeno</string>
+    <string name="importFailedTitle">Nije moguće uvesti</string>
+    <string name="importFailed">Nije moguće uvesti karte: <xliff:g>%s</xliff:g></string>
+    <string name="exportSuccessfulTitle">Izvezeno</string>
+    <string name="about">Oh</string>
+    <string name="importOptionApplicationButton">Koristite drugu aplikaciju</string>
+    <string name="barcode">Barkod</string>
+    <string name="exportOptionExplanation">Podaci će biti zabilježeni na odabranom mjestu.</string>
+    <string name="exportFailedTitle">Izvoz nije uspio</string>
+    <string name="exporting">Opskrba…</string>
+    <string name="noExternalStoragePermissionError">Najprije odobrite dopuštenje za vanjsku pohranu za uvoz ili izvoz kartica</string>
+    <string name="importOptionFilesystemExplanation">Odaberite određenu datoteku iz datotečnog sustava.</string>
+    <string name="importOptionApplicationTitle">Koristite drugu aplikaciju</string>
+    <string name="settings">Postavke</string>
+    <string name="settings_dark_theme">Tamno</string>
+    <string name="exportFailed">Nije moguće izvesti karte: <xliff:g>%s</xliff:g></string>
+    <string name="importing">Uvoz…</string>
+    <string name="importOptionFilesystemTitle">Uvoz iz datotečnog sustava</string>
+    <string name="importOptionFilesystemButton">Iz datotečnog sustava</string>
+    <string name="importOptionApplicationExplanation">Koristite bilo koju aplikaciju ili omiljeni upravitelj datoteka za otvaranje datoteke.</string>
+    <string name="settings_theme">Tema</string>
+    <string name="settings_system_theme">Sustav</string>
+    <string name="settings_light_theme">Svjetlo</string>
+    <string name="settings_max_font_size_scale">Maksimalna veličina fonta</string>
+    <string name="settings_display_barcode_max_brightness">Osvijetlite izgled crtičnog koda</string>
+    <string name="moveDown">Pomicanje prema dolje</string>
+    <string name="addManually">Ručno unesite ID kartice</string>
+    <string name="thumbnailDescription">Sličica za karticu</string>
+    <string name="starImage">Omiljena zvijezda</string>
+    <string name="settings_category_title_ui">Korisničko sučelje</string>
+    <string name="settings_lock_barcode_orientation">Zaključavanje orijentacije crtičnog koda</string>
+    <string name="exportSuccessful">Izvezeni podaci o karti</string>
+    <string name="settings_keep_screen_on">Držite zaslon uključen</string>
+    <string name="settings_disable_lockscreen_while_viewing_card">Spriječiti zaključavanje zaslona</string>
+    <string name="intent_import_card_from_url_share_text">Želim podijeliti razglednicu s vama</string>
+    <string name="importSuccessful">Uvezeni podaci o karti</string>
+    <string name="enter_group_name">Unesite naziv grupe</string>
+    <string name="groups">Grupe</string>
+    <string name="noGroups">Pritisnite gumb + plus da biste najprije dodali grupe za klasifikaciju.</string>
+    <string name="noGroupCards">Ova grupa ne sadrži nikakve kartice</string>
+    <string name="addFromImage">Odaberite sliku iz galerije</string>
+    <string name="deleteConfirmationGroup">Izbriši grupu\?</string>
+    <string name="failedOpeningFileManager">Najprije instalirajte upravitelj datoteka.</string>
+    <string name="moveUp">Pomicanje gore</string>
+    <string name="leaveWithoutSaveTitle">Izlaz</string>
+    <string name="card">Karta</string>
+    <string name="leaveWithoutSaveConfirmation">Otići bez očuvanja\?</string>
+</resources>

app/src/main/res/values-in-rID/strings.xml

@@ -0,0 +1,210 @@
+<?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_url">https://github.com/TheLastProject/Catima/releases</string>
+    <string name="storeName">Nama</string>
+    <string name="note">Keterangan</string>
+    <string name="delete">Hapus</string>
+    <string name="edit">Ubah</string>
+    <string name="save">Simpan</string>
+    <string name="deleteTitle">Hapus kartu</string>
+    <string name="cardId">Kartu ID</string>
+    <string name="barcodeType">Tipe barcode</string>
+    <string name="star">Tambahkan ke favorit</string>
+    <string name="unstar">Hapus dari favorit</string>
+    <string name="action_add">Tambah</string>
+    <string name="action_search">Cari</string>
+    <string name="sort_by_name">Nama</string>
+    <string name="sort_by_balance">Saldo</string>
+    <string name="sort_by">Sortir dengan</string>
+    <string name="sort">Sortir</string>
+    <string name="credits">Kredit</string>
+    <string name="license">Lisensi</string>
+    <string name="settings">Pengaturan</string>
+    <string name="settings_system_theme">Sistem</string>
+    <string name="selectBarcodeTitle">Pilih Barcode</string>
+    <string name="deleteConfirmation">Hapus kartu ini secara permanen?</string>
+    <string name="ok">OK</string>
+    <string name="share">Bagikan</string>
+    <string name="editCardTitle">Ubah Kartu</string>
+    <string name="addCardTitle">Tambah Kartu</string>
+    <string name="scanCardBarcode">Pindai Kartu Barcode</string>
+    <string name="barcodeNoBarcode">Kartu ini tidak memiliki barcode</string>
+    <string name="cancel">Batalkan</string>
+    <string name="importExport">Import/Ekspor</string>
+    <string name="settings_category_title_ui">Tampilan Pengguna</string>
+    <string name="settings_theme">Tema</string>
+    <string name="all">Semua</string>
+    <string name="leaveWithoutSaveTitle">Keluar</string>
+    <string name="card">Kartu</string>
+    <string name="barcode">Barcode</string>
+    <string name="chooseExpiryDate">Pilih masa berlaku</string>
+    <string name="noBarcodeFound">Barcode tidak ditemukan</string>
+    <string name="errorReadingImage">TIdak dapat membaca gambar</string>
+    <string name="balance">Saldo</string>
+    <string name="currency">Mata uang</string>
+    <string name="chooseImportType">Impor data dari?</string>
+    <string name="accept">Terima</string>
+    <string name="importCatima">Impor dari Catima</string>
+    <string name="importFidme">Impor dari FidMe</string>
+    <string name="barcodeId">Nilai barcode</string>
+    <string name="sameAsCardId">Sama denga kartu ID</string>
+    <string name="setBarcodeId">Tentukan nilai barcode</string>
+    <string name="photos">Foto</string>
+    <string name="setFrontImage">Atur gambar bagian depan</string>
+    <string name="report_error">Lapor Kesalahan</string>
+    <string name="rate_this_app">Beri nilai pada aplikasi ini</string>
+    <string name="sort_by_expiry">Masa berlaku</string>
+    <string name="sort_by_most_recently_used">Paling banyak digunakan</string>
+    <string name="settings_catima_theme">Catima</string>
+    <string name="settings_pink_theme">Merah Muda</string>
+    <string name="settings_blue_theme">Biru</string>
+    <string name="settings_green_theme">Hijau</string>
+    <string name="settings_sky_blue_theme">Biru Langit</string>
+    <string name="settings_grey_theme">Abu-abu</string>
+    <string name="settings_brown_theme">Cokelat</string>
+    <string name="settings_violet_theme">Ungu</string>
+    <string name="settings_magenta_theme">Magenta</string>
+    <string name="settings_theme_color">Warna tema</string>
+    <string name="settings_system_locale">Sistem</string>
+    <string name="settings_locale">Bahasa</string>
+    <string name="turn_flashlight_on">Hidupkan lampu flash</string>
+    <string name="turn_flashlight_off">Matikan lampu flash</string>
+    <string name="exportPasswordHint">Masukan kata sandi</string>
+    <string name="yes">Ya</string>
+    <string name="no">Tidak</string>
+    <string name="takePhoto">Ambil foto</string>
+    <string name="removeImage">Hapus gambar</string>
+    <string name="setBackImage">Atur gambar bagian belakang</string>
+    <string name="intent_import_card_from_url_share_multiple_text">Saya ingin berbagi kartu dengan anda</string>
+    <string name="noGiftCards">Klik tanda + tombol tambah untuk menambahkan kartu, atau mengimpor beberapa kartu melalui menu ⋮ terlebih dahulu.</string>
+    <string name="noMatchingGiftCards">Tidak menemukan apapun. Coba untuk mengubah pencarian anda.</string>
+    <string name="noBarcode">Bukan barcode</string>
+    <string name="confirm">Konfirmasi</string>
+    <string name="copy_to_clipboard">Salin ID</string>
+    <string name="sendLabel">Kirim…</string>
+    <string name="noCardsMessage">Tambah kartu terlebih dahulu</string>
+    <string name="noStoreError">Nama masih kosong</string>
+    <string name="noCardIdError">Kartu ID masih kosong</string>
+    <string name="noCardExistsError">Tidak dapat menemukan kartu</string>
+    <string name="failedParsingImportUriError">Tidak dapat menguraikan alamat impor situs web</string>
+    <string name="exportName">Ekspor</string>
+    <string name="importSuccessfulTitle">Sudah diimpor</string>
+    <string name="importFailedTitle">Impor gagal</string>
+    <string name="importFailed">Tidak dapat mengimpor kartu: <xliff:g>%s</xliff:g></string>
+    <string name="exportSuccessfulTitle">Sudah diekspor</string>
+    <string name="exportFailedTitle">Ekspor gagal</string>
+    <string name="exportFailed">Tidak dapat mengekspor kartu: <xliff:g>%s</xliff:g></string>
+    <string name="importing">Mengimpor…</string>
+    <string name="exporting">Mengekspor…</string>
+    <string name="noExternalStoragePermissionError">Berikan izin penyimpanan eksternal untuk mengimpor atau mengekspor kartu terlebih dahulu</string>
+    <string name="exportOptionExplanation">Data akan ditulis ke lokasi pilihan Anda.</string>
+    <string name="importOptionFilesystemTitle">Impor dari sistem</string>
+    <string name="importOptionFilesystemExplanation">Pilih file dari sistem.</string>
+    <string name="importOptionFilesystemButton">Dari sistem</string>
+    <string name="importOptionApplicationTitle">Gunakan aplikasi lain</string>
+    <string name="importOptionApplicationExplanation">Gunakan aplikasi lain atau pengelola file favorit anda untuk membuka file.</string>
+    <string name="importOptionApplicationButton">Gunakan aplikasi lain</string>
+    <string name="about">Tentang</string>
+    <string name="app_copyright_fmt">Hak Cipta © 2019–<xliff:g>%d</xliff:g> Sylvia van Os</string>
+    <string name="app_copyright_old">Berdasarkan Loyalty Card Keychain 
+\nhak cipta © 2016–2020 Branden Archer</string>
+    <string name="app_license">Perangkat lunak bebas copyleft, berlisensi GPLv3+</string>
+    <string name="about_title_fmt">Tentang <xliff:g id="app_name">%s</xliff:g></string>
+    <string name="debug_version_fmt">Versi: <xliff:g id="version">%s</xliff:g></string>
+    <string name="app_revision_fmt">Info Revisi: <xliff:g id="app_revision_url">%s</xliff:g></string>
+    <string name="app_libraries">Pustaka pihak ketiga gratis: <xliff:g id="app_libraries_list">%s</xliff:g></string>
+    <string name="app_resources">Sumber daya pihak ketiga gratis: <xliff:g id="app_resources_list">%s</xliff:g></string>
+    <string name="enterBarcodeInstructions">Masukkan ID kartu, dan pilih jenis barcodenya di bawah atau \"Kartu ini tidak memiliki barcode\".</string>
+    <string name="copy_to_clipboard_toast">ID kartu telah disalin</string>
+    <string name="thumbnailDescription">Gambar tampilan untuk kartu</string>
+    <string name="starImage">Favorit</string>
+    <string name="settings_light_theme">Terang</string>
+    <string name="settings_dark_theme">Gelap</string>
+    <string name="settings_max_font_size_scale">Ukuran maksimal huruf</string>
+    <string name="settings_display_barcode_max_brightness">Terangkan tampilan barcode</string>
+    <string name="settings_lock_barcode_orientation">Kunci orientasi barcode</string>
+    <string name="settings_keep_screen_on">Biarkan layar menyala</string>
+    <string name="settings_disable_lockscreen_while_viewing_card">Mencegah layar menyala</string>
+    <string name="intent_import_card_from_url_share_text">Saya ingin berbagi kartu dengan anda</string>
+    <string name="importSuccessful">Data kartu terimpor</string>
+    <string name="exportSuccessful">Data kartu terekspor</string>
+    <string name="enter_group_name">Masukan nama grup</string>
+    <string name="groups">Grup</string>
+    <string name="noGroups">Klik pada tombol tambah + untuk menambahkan grup atau kategori terlebih dahulu.</string>
+    <string name="noGroupCards">Grup ini tidak memilik kartu</string>
+    <string name="deleteConfirmationGroup">Hapus grup?</string>
+    <string name="failedOpeningFileManager">Instal aplikasi pengelola file terlebih dahulu.</string>
+    <string name="moveUp">Pindah ke atas</string>
+    <string name="moveDown">Pindah ke bawah</string>
+    <string name="leaveWithoutSaveConfirmation">Keluar tanpa menyimpan?</string>
+    <string name="addManually">Masukan ID kartu</string>
+    <string name="addFromImage">Pilih gambar dari galeri</string>
+    <string name="groupsList">Grup: <xliff:g>%s</xliff:g></string>
+    <string name="expiryStateSentence">Masa ber: <xliff:g>%s</xliff:g></string>
+    <string name="expiryStateSentenceExpired">Kadaluwarsa: <xliff:g>%s</xliff:g></string>
+    <string name="balanceSentence">Saldo: <xliff:g>%s</xliff:g></string>
+    <string name="balancePoints"><xliff:g>%s</xliff:g> poin</string>
+    <string name="editBarcode">Ubah barcode</string>
+    <string name="expiryDate">Tanggal masa berlaku</string>
+    <string name="never">Tidak pernah</string>
+    <string name="moveBarcodeToTopOfScreen">Pindah barcode ke bagian paling depan</string>
+    <string name="moveBarcodeToCenterOfScreen">Pusatkan barcode pada layar</string>
+    <string name="points">Poin</string>
+    <string name="parsingBalanceFailed"><xliff:g>%s</xliff:g> sepertinya bukan saldo yang valid.</string>
+    <string name="app_loyalty_card_keychain">Loyalty Card Keychain</string>
+    <string name="privacy_policy">Kebijakan Privasi</string>
+    <string name="privacy_policy_popup_text">Pemberitahuan kebijakan privasi (diperlukan oleh beberapa toko aplikasi): 
+\n
+\nTIDAK ADA DATA YANG DIKUMPULKAN SAMA SEKALI, yang dapat dikonfirmasi oleh siapa pun karena aplikasi kami adalah libre software.</string>
+    <string name="importCatimaMessage">Pilih ekspor <i>catima.zip</i> Anda dari Catima untuk diimpor. 
+\nBuat dari menu Impor/Ekspor aplikasi Catima lain dengan menekan Ekspor di sana terlebih dahulu.</string>
+    <string name="importFidmeMessage">Pilih ekspor <i>fidme-export-request-xxxxxx.zip</i> Anda dari FidMe untuk diimpor, dan pilih jenis barcode secara manual setelahnya. 
+\nBuat dari profil FidMe Anda dengan memilih Perlindungan Data lalu tekan Ekstrak data saya terlebih dahulu.</string>
+    <string name="importLoyaltyCardKeychain">Impor dari Loyalty Card Keychain</string>
+    <string name="importLoyaltyCardKeychainMessage">Pilih ekspor <i>LoyaltyCardKeychain.csv</i> Anda dari Loyalty Card Keychain untuk diimpor. 
+\nBuat dari menu Import/Export di Loyalty Card Keychain dengan menekan Export terlebih dahulu.</string>
+    <string name="importStocard">Impor dari Stocard</string>
+    <string name="importStocardMessage">Pilih ekspor <i>***-sync.zip</i> Anda dari Stocard untuk diimpor. 
+\nDapatkan dengan mengirim email ke support@stocardapp.com untuk meminta ekspor data Anda.</string>
+    <string name="importVoucherVault">Impor dari Voucher Vault</string>
+    <string name="importVoucherVaultMessage">Pilih ekspor <i>vouchervault.json</i> Anda dari Vault Voucher untuk diimpor. 
+\nBuat dengan menekan Ekspor di Vault Voucher terlebih dahulu.</string>
+    <string name="unsupportedBarcodeType">Jenis barcode ini belum dapat ditampilkan. Ini mungkin didukung di versi aplikasi yang lebih baru.</string>
+    <string name="wrongValueForBarcodeType">Nilai tidak berlaku untuk jenis barcode yang dipilih</string>
+    <string name="copy_to_clipboard_multiple_toast">ID kartu telah disalin</string>
+    <string name="frontImageDescription">Gambar depan kartu</string>
+    <string name="backImageDescription">Gambar belakang kartu</string>
+    <string name="updateBarcodeQuestionTitle">Perbarui barcode?</string>
+    <string name="updateBarcodeQuestionText">Anda mengubah ID kartu. Apakah Anda juga ingin memperbarui barcode untuk menggunakan nilai yang sama?</string>
+    <string name="passwordRequired">Silahkan masukan kata sandi</string>
+    <string name="exportPassword">Tetapkan kata sandi untuk melindungi ekspor anda (opsional)</string>
+    <string name="failedGeneratingShareURL">Tidak dapat membuat alamat berbagi. Mohon laporkan ini.</string>
+    <string name="app_contributors">Pengembangan dibantu oleh: <xliff:g id="app_contributors">%s</xliff:g></string>
+    <string name="toggleMoreInfo">Tampilkan info selengkapnya</string>
+    <string name="swipeToSwitchImages">Geser atau tekan yang lama untuk mengganti gambar</string>
+    <string name="reverse">Ubah urutan</string>
+    <string name="version_history">Riwayat Versi</string>
+    <string name="help_translate_this_app">Bantu terjemahkan aplikasi ini</string>
+    <string name="source_repository">Sumber Repositori</string>
+    <string name="on_github">di GitHub</string>
+    <string name="and_data_usage">dan penggunaan data</string>
+    <string name="on_google_play">di Google Play</string>
+    <string name="lockScreen">Blokir rotasi</string>
+    <string name="unlockScreen">Buka blokir rotasi</string>
+    <string name="cardShortcut">Pintasan kartu</string>
+    <string name="card_ids_copied">ID kartu yang tersalin</string>
+    <string name="barcodeImageDescriptionWithType">Gambar dari jenis barcode <xliff:g>%s</xliff:g></string>
+    <string name="importExportHelp">Mencadangkan kartu memungkinkan anda memindahkannya ke perangkat lain.</string>
+    <plurals name="selectedCardCount">
+        <item quantity="other"><xliff:g>%d</xliff:g> kartu dipilih</item>
+    </plurals>
+    <plurals name="groupCardCount">
+        <item quantity="other"><xliff:g>%d</xliff:g> kartu</item>
+    </plurals>
+    <plurals name="deleteCardsConfirmation">
+        <item quantity="other">Hapus kartu <xliff:g>%d</xliff:g> ini secara permanen\?</item>
+    </plurals>
+    <plurals name="deleteCardsTitle">
+        <item quantity="other">Hapus <xliff:g>%d</xliff:g> kartu</item>
+    </plurals>
+</resources>

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

@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="action_add">Bæta</string>
+    <string name="noBarcode">Nei strikamerkið</string>
+    <string name="action_search">Leita að</string>
+    <string name="delete">Eyða</string>
+    <string name="unlockScreen">Opna Snúningur</string>
+    <string name="noGiftCards">Smelltu á + plús takka til að bæta kort, eða að flytja inn sumir frá ⋮ matseðill fyrst.</string>
+    <string name="note">Athugið</string>
+    <string name="barcodeType">Strikamerkið tegund</string>
+    <string name="cancel">Hætta</string>
+    <string name="noMatchingGiftCards">Vissi ekki að finna neitt. Reyna að breyta leita.</string>
+    <string name="storeName">Nafnið</string>
+    <string name="barcodeNoBarcode">Þetta kort hefur ekki strikamerkið</string>
+    <string name="star">Bæta við eftirlæti</string>
+    <string name="unstar">Fjarlægja frá eftirlæti</string>
+    <string name="save">Sparaðu</string>
+    <string name="edit">Breyta</string>
+    <string name="confirm">Staðfesta</string>
+    <string name="lockScreen">Blokk Snúningur</string>
+    <string name="ok">OK</string>
+    <string name="sendLabel">Sendu…</string>
+    <string name="deleteConfirmation">Eyða þetta kort til frambúðar\?</string>
+    <string name="share">Deila</string>
+    <string name="editCardTitle">Breyta Kort</string>
+    <string name="addCardTitle">Bæta Kort</string>
+    <string name="scanCardBarcode">Skanna Kort Strikamerkið</string>
+    <string name="noCardsMessage">Bæta kort fyrstu</string>
+    <string name="exportFailedTitle">Flytja mistókst</string>
+    <string name="exportSuccessfulTitle">Flutt</string>
+    <string name="noStoreError">Ekkert nafn slegið</string>
+    <string name="noCardExistsError">Gæti ekki fundið kort</string>
+    <string name="failedParsingImportUriError">Get ekki lesið inn URI</string>
+    <string name="exportName">Flytja</string>
+    <string name="importExportHelp">Stuðningur upp spil gerir þér kleift að færa þá til annar tæki.</string>
+    <string name="importSuccessfulTitle">Flutt</string>
+    <string name="importFailedTitle">Innflutningur mistókst</string>
+    <string name="noExternalStoragePermissionError">Grant ytri geymslu leyfi til að flytja eða flytja spil fyrstu</string>
+    <string name="exportOptionExplanation">Gögnum verður skrifað á stað af eigin vali.</string>
+    <string name="importOptionFilesystemTitle">Innflutningur frá möppuna</string>
+    <string name="importOptionFilesystemExplanation">Velja ákveðna skrá frá möppuna.</string>
+    <string name="starImage">Uppáhalds stjörnu</string>
+    <string name="never">Aldrei</string>
+    <string name="currency">Mynt</string>
+    <string name="moveBarcodeToTopOfScreen">Færa strikamerkið að efst á skjánum</string>
+    <string name="moveBarcodeToCenterOfScreen">Miðju strikamerkið á skjánum</string>
+    <string name="errorReadingImage">Gat ekki lesið ímynd</string>
+    <string name="importOptionApplicationButton">Notaðu annan app</string>
+    <string name="about">Um</string>
+    <string name="settings">Stillingar</string>
+    <string name="settings_max_font_size_scale">Max. letrið</string>
+    <string name="settings_lock_barcode_orientation">Læsa strikamerkið stefnumörkun</string>
+    <string name="settings_keep_screen_on">Halda á skjánum</string>
+    <string name="settings_disable_lockscreen_while_viewing_card">Að koma í veg fyrir að læsa skjánum</string>
+    <string name="editBarcode">Breyta strikamerkið</string>
+    <string name="settings_light_theme">Ljós</string>
+    <string name="importOptionFilesystemButton">Frá möppuna</string>
+    <string name="chooseImportType">Flytja gögn úr\?</string>
+    <string name="balance">Jafnvægi</string>
+    <string name="points">Stig</string>
+    <string name="importOptionApplicationTitle">Notaðu annan app</string>
+    <string name="importOptionApplicationExplanation">Nota allir app eða uppáhalds skráasafn að opna skrá.</string>
+    <string name="selectBarcodeTitle">Veldu Strikamerkið</string>
+    <string name="thumbnailDescription">Þumalinn fyrir kort</string>
+    <string name="settings_theme">Þema</string>
+    <string name="app_license">Copylefted frítt hugbúnaður, leyfi GPLv3+</string>
+    <string name="noBarcodeFound">Nei strikamerkið var komist</string>
+    <string name="settings_category_title_ui">Notandi tengi</string>
+    <string name="settings_system_theme">Kerfi</string>
+    <string name="settings_dark_theme">Dökk</string>
+    <string name="settings_display_barcode_max_brightness">Bjartari strikamerkið skoða</string>
+    <string name="enter_group_name">Inn nafn hópur</string>
+    <string name="intent_import_card_from_url_share_text">Ég vil deila kort með þér</string>
+    <string name="importSuccessful">Kortið gögn flutt</string>
+    <string name="groups">Tekur</string>
+    <string name="exportSuccessful">Kortagögn flutt út</string>
+    <string name="failedOpeningFileManager">Setja skráasafn fyrst.</string>
+    <string name="moveUp">Fara upp</string>
+    <string name="leaveWithoutSaveTitle">Brottför</string>
+    <string name="leaveWithoutSaveConfirmation">Fara án þess að bjarga\?</string>
+    <string name="addFromImage">Veldu mynd frá gallerí</string>
+    <string name="card">Kort</string>
+    <string name="barcode">Strikamerkið</string>
+    <string name="expiryDate">Fyrningu</string>
+    <string name="moveDown">Fara neðar</string>
+    <string name="chooseExpiryDate">Velja rennur</string>
+</resources>

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

@@ -2,12 +2,12 @@
 <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">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="noGiftCards">Premi il pulsante + per aggiungere una carta oppure importane alcune dal menù ⋮.</string>
+    <string name="noMatchingGiftCards">Nessun risultato. Prova a cambiare la tua ricerca.</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="barcodeNoBarcode">Non c\'è un codice a barre</string>
     <string name="cancel">Annulla</string>
     <string name="save">Salva</string>
     <string name="edit">Modifica</string>
@@ -15,71 +15,71 @@
     <string name="confirm">Conferma</string>
     <string name="lockScreen">Blocca rotazione</string>
     <string name="unlockScreen">Sblocca rotazione</string>
-    <string name="ok">OK</string>
-    <string name="copy_to_clipboard">Copia ID negli appunti</string>
+    <string name="ok">Ok</string>
+    <string name="copy_to_clipboard">Copia codice negli appunti</string>
     <string name="share">Condividi</string>
     <string name="sendLabel">Invia…</string>
     <string name="editCardTitle">Modifica carta</string>
     <string name="addCardTitle">Aggiungi carta</string>
-    <string name="scanCardBarcode">Scansiona il codice carta</string>
+    <string name="scanCardBarcode">Scansiona il codice</string>
     <string name="cardShortcut">Scorciatoia per la carta</string>
     <string name="noCardsMessage">Aggiungi prima una carta</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>
+    <string name="noCardIdError">Nessun codice inserito</string>
+    <string name="noCardExistsError">Impossibile trovare quella carta</string>
+    <string name="failedParsingImportUriError">Impossibile analizzare l\'URI di importazione</string>
     <string name="importExport">Importa/Esporta</string>
     <string name="exportName">Esporta</string>
-    <string name="importExportHelp">Il backup delle carte ti consente di spostarle su un altro dispositivo.</string>
+    <string name="importExportHelp">Il backup dei dati permette di spostarli su un altro dispositivo.</string>
     <string name="importSuccessfulTitle">Importato</string>
     <string name="importFailedTitle">Importazione fallita</string>
-    <string name="importFailed">Impossibile importare le carte</string>
+    <string name="importFailed">Impossibile importare le carte: <xliff:g>%s</xliff:g></string>
     <string name="exportSuccessfulTitle">Esportato</string>
     <string name="exportFailedTitle">Esportazione fallita</string>
-    <string name="exportFailed">Impossibile esportare le carte</string>
+    <string name="exportFailed">Impossibile esportare le carte: <xliff:g>%s</xliff:g></string>
     <string name="importing">Importazione in corso…</string>
     <string name="exporting">Esportazione in corso…</string>
-    <string name="noExternalStoragePermissionError">Concedi l\'autorizzazione all\'archiviazione esterna per importare o esportare prima le carte</string>
+    <string name="noExternalStoragePermissionError">Concedi il permesso di archiviazione esterna per importare o esportare dati</string>
     <string name="importOptionFilesystemTitle">Importa dall\'archivio</string>
     <string name="importOptionFilesystemExplanation">Scegli un file dall\'archivio.</string>
     <string name="importOptionFilesystemButton">Dall\'archivio</string>
-    <string name="importOptionApplicationTitle">Usa un’altra app</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’altra app</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="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 id="app_revision_url"> %s </xliff:g></string>
     <string name="selectBarcodeTitle">Seleziona codice a barre</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="enterBarcodeInstructions">Inserisci il codice e scegli un tipo di codice a barre sotto oppure seleziona «Non c\'è un codice a barre».</string>
+    <string name="copy_to_clipboard_toast">Codice copiato negli appunti</string>
+    <string name="thumbnailDescription">Miniatura</string>
     <string name="settings">Impostazioni</string>
     <string name="settings_category_title_ui">Interfaccia utente</string>
     <string name="settings_theme">Tema</string>
     <string name="settings_system_theme">Sistema</string>
     <string name="settings_light_theme">Chiaro</string>
     <string name="settings_dark_theme">Scuro</string>
-    <string name="settings_display_barcode_max_brightness">Aumenta luminosità dello schermo quando apro un codice a barre</string>
+    <string name="settings_display_barcode_max_brightness">Aumenta luminosità dello schermo quando viene aperto 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="exportSuccessful">Dati della carta esportati</string>
+    <string name="importSuccessful">Dati importati</string>
     <string name="app_copyright_old">Basato su Loyalty Card Keychain
-\ncopyright © 2016–2020 Branden Archer.</string>
+\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="starImage">Stella dei preferiti</string>
     <string name="deleteConfirmationGroup">Eliminare il gruppo\?</string>
     <string name="all">Tutti</string>
-    <string name="noGroups">Clicca sul pulsante + più per aggiungere prima i gruppi per la categorizzazione.</string>
+    <string name="noGroups">Clicca sul pulsante + per aggiungere 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>%s</xliff:g></string>
-    <string name="addManually">Inserisci manualmente l\'ID della carta</string>
+    <string name="addManually">Inserisci manualmente il codice</string>
     <string name="leaveWithoutSaveConfirmation">Uscire senza salvare\?</string>
     <string name="leaveWithoutSaveTitle">Esci</string>
     <string name="moveDown">Sposta in basso</string>
@@ -105,70 +105,70 @@
     <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="expiryStateSentence">Scadenza: <xliff:g>%s</xliff:g></string>
+    <string name="settings_keep_screen_on">Mantieni lo schermo attivo</string>
     <string name="app_loyalty_card_keychain">Loyalty Card Keychain</string>
-    <string name="chooseImportType">Importare i dati da\?</string>
-    <string name="settings_disable_lockscreen_while_viewing_card">Impedisci blocco schermo</string>
+    <string name="chooseImportType">Importa i dati da</string>
+    <string name="settings_disable_lockscreen_while_viewing_card">Impedisci il blocco dello schermo</string>
     <string name="accept">Accetta</string>
-    <string name="privacy_policy_popup_text">Informativa sulla riservatezza (spesso richiesta):
+    <string name="privacy_policy_popup_text">Informativa sulla riservatezza (richiesta da alcuni app store):
 \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">Seleziona la tua esportazione <i>vouchervault.json</i> da Voucher Vault da importare.
-\nOppure crealo premendo prima Esporta in Voucher Vault.</string>
+    <string name="importVoucherVaultMessage">Seleziona il tuo file di esportazione <i>vouchervault.json</i> da Voucher Vault per importarlo.
+\nCrealo premendo prima Esporta in Voucher Vault.</string>
     <string name="importVoucherVault">Importa da Voucher Vault</string>
-    <string name="importLoyaltyCardKeychainMessage">Seleziona la tua esportazione <i>LoyaltyCardKeychain.csv</i> da Loyalty Card Keychain per importarla.
-\nOppure createlo dal menù Importazione/Esportazione in Loyalty Card Keychain premendo prima su Esporta.</string>
+    <string name="importLoyaltyCardKeychainMessage">Seleziona il tuo file di esportazione <i>LoyaltyCardKeychain.csv</i> da Loyalty Card Keychain per importarlo.
+\nCrealo dal menù Importa/Esporta in Loyalty Card Keychain premendo prima su Esporta.</string>
     <string name="importLoyaltyCardKeychain">Importa da Loyalty Card Keychain</string>
-    <string name="importFidmeMessage">Seleziona la tua esportazione <i>fidme-export-request-xxxxxx.zip</i> da FidMe per importare, e seleziona i tipi di codice a barre manualmente dopo.
-\nOppure crearlo dal tuo profilo FidMe scegliendo Protezione Dati e poi premendo Estrai i miei dati prima.</string>
+    <string name="importFidmeMessage">Seleziona il tuo file di esportazione <i>fidme-export-request-xxxxxx.zip</i> da FidMe per importare e seleziona successivamente i tipi di codice a barre manualmente.
+\nCrealo 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">Seleziona la tua esportazione <i>catima.zip</i> da Catima per importarla.
-\nOppure crealo dal menù Importazione/Esportazione di un\'altra applicazione Catima premendo prima Esporta.</string>
+    <string name="importCatimaMessage">Seleziona il file di esportazione <i>catima.zip</i> per importarlo.
+\nCrealo 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="sameAsCardId">Uguale al codice</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="settings_max_font_size_scale">Dimensione massima del carattere</string>
     <string name="unsupportedBarcodeType">Questo tipo di codice a barre non può ancora essere visualizzato. Potrebbe essere supportato in una versione successiva 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="app_resources">Risorse libere di terze parti: <xliff:g id="app_resources_list"> %s </xliff:g></string>
+    <string name="app_libraries">Librerie libere 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="copy_to_clipboard_multiple_toast">Codici copiati negli appunti</string>
+    <string name="card_ids_copied">Codice/i copiato/i</string>
     <string name="no">No</string>
     <string name="yes">Sì</string>
-    <string name="updateBarcodeQuestionText">Hai cambiato l\'ID della carta. Vuoi anche aggiornare il codice a barre per usare lo stesso valore\?</string>
+    <string name="updateBarcodeQuestionText">Hai cambiato il codice. Vuoi anche aggiornare il codice a barre per usare lo stesso valore\?</string>
     <string name="updateBarcodeQuestionTitle">Aggiornare il valore del codice a barre\?</string>
     <string name="takePhoto">Scatta una foto</string>
-    <string name="removeImage">Rimuovi l’immagine</string>
+    <string name="removeImage">Rimuovi l\'immagine</string>
     <string name="setBackImage">Imposta immagine posteriore</string>
     <string name="setFrontImage">Imposta immagine frontale</string>
     <string name="photos">Foto</string>
-    <string name="backImageDescription">Immagine posteriore della carta</string>
-    <string name="frontImageDescription">Immagine frontale della carta</string>
+    <string name="backImageDescription">Immagine posteriore</string>
+    <string name="frontImageDescription">Immagine frontale</string>
     <string name="passwordRequired">Si prega di inserire la password</string>
-    <string name="importStocardMessage">Seleziona la tua esportazione <i>***-sync.zip</i> da Stocard per importare.
-\nOppure ottenerlo inviando un\'e-mail a support@stocardapp.com chiedendo un\'esportazione dei tuoi dati.</string>
+    <string name="importStocardMessage">Seleziona il tuo file di esportazione <i>***-sync.zip</i> da Stocard per importarlo.
+\nOttienilo inviando un\'e-mail a support@stocardapp.com chiedendo un\'esportazione dei tuoi dati.</string>
     <string name="importStocard">Importa da Stocard</string>
     <string name="turn_flashlight_off">Spegni la torcia</string>
     <string name="turn_flashlight_on">Accendi la torcia</string>
     <string name="failedGeneratingShareURL">Impossibile generare un URL condivisibile. Si prega di segnalarlo.</string>
     <plurals name="selectedCardCount">
-        <item quantity="one"><xliff:g>%d</xliff:g> carta selezionata</item>
-        <item quantity="other"><xliff:g>%d</xliff:g> carte selezionate</item>
+        <item quantity="one"><xliff:g>%d</xliff:g> selezionata</item>
+        <item quantity="other"><xliff:g>%d</xliff:g> selezionate</item>
     </plurals>
     <string name="deleteTitle">Rimuovi la carta</string>
     <string name="deleteConfirmation">Eliminare questa carta\?</string>
     <plurals name="deleteCardsConfirmation">
-        <item quantity="one">Eliminare definitivamente questa scheda <xliff:g>%d</xliff:g>\?</item>
-        <item quantity="other">Eliminare definitivamente queste schede <xliff:g>%d</xliff:g>\?</item>
+        <item quantity="one">Eliminare definitivamente questa <xliff:g>%d</xliff:g> carta\?</item>
+        <item quantity="other">Eliminare definitivamente queste <xliff:g>%d</xliff:g> carte\?</item>
     </plurals>
     <plurals name="deleteCardsTitle">
         <item quantity="one">Elimina <xliff:g>%d</xliff:g> carta</item>
@@ -187,15 +187,38 @@
     <string name="settings_catima_theme">Catima</string>
     <string name="settings_theme_color">Colore del tema</string>
     <string name="app_contributors">Reso possibile da: <xliff:g id="app_contributors">%s</xliff:g></string>
-    <string name="noGroupCards">Questo gruppo non contiene carte</string>
+    <string name="noGroupCards">Questo gruppo è vuoto</string>
     <string name="toggleMoreInfo">Attiva/disattiva la visualizzazione di altre informazioni</string>
-    <string name="barcodeImageDescriptionWithType">Immagine del codice a barre della carta del tipo <xliff:g>%s</xliff:g></string>
+    <string name="barcodeImageDescriptionWithType">Immagine del codice a barre in formato <xliff:g>%s</xliff:g></string>
     <string name="swipeToSwitchImages">Scorri o premi a lungo per cambiare immagine</string>
     <string name="sort_by">Ordina per</string>
-    <string name="reverse">Inverti</string>
+    <string name="reverse">…in ordine inverso</string>
     <string name="sort_by_balance">Saldo</string>
     <string name="sort_by_expiry">Scadenza</string>
-    <string name="sort_by_most_recently_used">Usate più di recente</string>
+    <string name="sort_by_most_recently_used">Usate più recentemente</string>
     <string name="sort_by_name">Nome</string>
     <string name="sort">Ordina</string>
-</resources>
+    <string name="license">Licenza</string>
+    <string name="source_repository">Repository del codice sorgente</string>
+    <string name="on_github">su GitHub</string>
+    <string name="exportPasswordHint">Inserisci la password</string>
+    <string name="on_google_play">su Google Play</string>
+    <string name="exportPassword">Imposta una password per proteggere la tua esportazione (opzionale)</string>
+    <string name="version_history">Cronologia delle versioni</string>
+    <string name="credits">Crediti</string>
+    <string name="help_translate_this_app">Aiuta a tradurre questa app</string>
+    <string name="and_data_usage">e utilizzo dei dati</string>
+    <string name="rate_this_app">Valuta questa applicazione</string>
+    <string name="report_error">Segnala un errore</string>
+    <string name="editGroup">Modifica del gruppo: <xliff:g>%s</xliff:g></string>
+    <string name="group_name_is_empty">Il nome del gruppo non può essere vuoto</string>
+    <string name="noGiftCardsGroup">Crea alcune carte e poi assegnale al gruppo qui.</string>
+    <string name="group_edit">Modifica il gruppo</string>
+    <string name="group_name_already_in_use">Il nome del gruppo è già in uso</string>
+    <string name="group_updated">Gruppo aggiornato</string>
+    <string name="selectColor">Seleziona il colore</string>
+    <string name="setIcon">Imposta l\'icona</string>
+    <string name="action_show_details">Mostra i dettagli</string>
+    <string name="action_hide_details">Nascondi i dettagli</string>
+    <string name="translate_platform">su Weblate</string>
+</resources>

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

@@ -53,8 +53,8 @@
     <string name="noGroups">+ボタンを押してグループを追加してください。</string>
     <string name="groups">グループ</string>
     <string name="enter_group_name">グループ名を入力</string>
-    <string name="exportSuccessful">カードのデータがエクスポートされました</string>
-    <string name="importSuccessful">カードのデータがインポートされました</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>
@@ -68,7 +68,7 @@
     <string name="settings_category_title_ui">外観</string>
     <string name="settings">設定</string>
     <string name="starImage">お気に入りのスター</string>
-    <string name="thumbnailDescription">カードのサムネイル</string>
+    <string name="thumbnailDescription">サムネイル</string>
     <string name="copy_to_clipboard_toast">カード番号をクリップボードにコピーしました</string>
     <string name="enterBarcodeInstructions">カード番号を入力し、バーコード形式を選択してください。</string>
     <string name="selectBarcodeTitle">バーコード選択</string>
@@ -76,10 +76,10 @@
     <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_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_copyright_fmt" tools:ignore="PluralsCandidate">Copyright © 2019–<xliff:g>%d</xliff:g> Sylvia van Os</string>
     <string name="app_resources">Libre third-party resources: <xliff:g id="app_resources_list">%s</xliff:g></string>
     <string name="about">Catimaについて</string>
     <string name="importOptionApplicationButton">外部のアプリを使う</string>
@@ -89,21 +89,21 @@
     <string name="importOptionFilesystemExplanation">ストレージからファイルを選択してください。</string>
     <string name="importOptionFilesystemTitle">ストレージからインポート</string>
     <string name="exportOptionExplanation">選択した場所にデータを出力します。</string>
-    <string name="noExternalStoragePermissionError">カードをインポート/エクスポートするために外部ストレージへのアクセスを許可してください</string>
+    <string name="noExternalStoragePermissionError">データをインポート/エクスポートするために外部ストレージへのアクセスを許可してください</string>
     <string name="exporting">エクスポート中…</string>
     <string name="importing">インポート中…</string>
-    <string name="exportFailed">カードをエクスポートできませんでした</string>
+    <string name="exportFailed">カードをエクスポートできませんでした: <xliff:g>%s</xliff:g></string>
     <string name="exportFailedTitle">エクスポートに失敗しました</string>
     <string name="exportSuccessfulTitle">エクスポートしました</string>
-    <string name="sameAsCardId">カードの表記と同一</string>
+    <string name="sameAsCardId">カード番号に合わせる</string>
     <string name="barcodeId">バーコード番号</string>
     <string name="importVoucherVaultMessage">Voucher Vaultでエクスポートした <i>vouchervault.json</i>ファイルを選択してください。
 \nファイルがない場合、Voucher Vaultでファイルをエクスポートしてください。</string>
     <string name="importVoucherVault">Voucher Vaultからインポート</string>
-    <string name="importFailed">カードをインポートできません</string>
+    <string name="importFailed">カードをインポートできません: <xliff:g>%s</xliff:g></string>
     <string name="importFailedTitle">インポートに失敗しました</string>
     <string name="importSuccessfulTitle">インポートしました</string>
-    <string name="importExportHelp">カードをバックアップすると、他のデバイスにカードを移すことができます。</string>
+    <string name="importExportHelp">データをバックアップすると、他のデバイスにカードを移すことができます。</string>
     <string name="exportName">エクスポート</string>
     <string name="importExport">インポート/エクスポート</string>
     <string name="failedParsingImportUriError">インポートURIを解析できません</string>
@@ -112,7 +112,7 @@
     <string name="noStoreError">名前が入力されていません</string>
     <string name="noCardsMessage">カードを追加</string>
     <string name="cardShortcut">カードのショートカット</string>
-    <string name="scanCardBarcode">カードのバーコードをスキャン</string>
+    <string name="scanCardBarcode">バーコードをスキャン</string>
     <string name="addCardTitle">カードの追加</string>
     <string name="editCardTitle">カードの編集</string>
     <string name="sendLabel">送信先を選択…</string>
@@ -129,7 +129,7 @@
     <string name="unstar">お気に入りから削除</string>
     <string name="star">お気に入りに追加</string>
     <string name="noBarcode">バーコードなし</string>
-    <string name="barcodeNoBarcode">バーコード指定なし</string>
+    <string name="barcodeNoBarcode">バーコードなし</string>
     <string name="barcodeType">バーコード形式</string>
     <string name="cardId">カード番号</string>
     <string name="note">メモ</string>
@@ -152,10 +152,10 @@
     <string name="takePhoto">写真を撮影する</string>
     <string name="removeImage">画像を削除</string>
     <string name="setBackImage">裏面の画像を設定</string>
-    <string name="setFrontImage">表面の画像を設定</string>
+    <string name="setFrontImage">オモテ面の画像を設定</string>
     <string name="photos">フォト</string>
-    <string name="backImageDescription">裏面</string>
-    <string name="frontImageDescription">表面</string>
+    <string name="backImageDescription">裏</string>
+    <string name="frontImageDescription">表</string>
     <string name="importStocardMessage">Stocardでエクスポートした<i>***-sync.zip</i>ファイルを選択してください。
 \nファイルがない場合、e-mailing support@stocardapp.comにデータのエクスポートを要求してください。</string>
     <string name="importStocard">Stocardからインポート</string>
@@ -183,7 +183,7 @@
     <string name="settings_pink_theme">Pink</string>
     <string name="settings_catima_theme">Catima</string>
     <string name="settings_theme_color">テーマカラー</string>
-    <string name="settings_system_locale">システム</string>
+    <string name="settings_system_locale">システムに従う</string>
     <string name="settings_locale">言語</string>
     <string name="noGroupCards">このグループにはカードがありません</string>
     <string name="swipeToSwitchImages">画像を切り替えるには長押し、またはスワイプ</string>
@@ -192,5 +192,29 @@
     <string name="sort_by_expiry">期限</string>
     <string name="sort_by_most_recently_used">最近使用したカード</string>
     <string name="sort_by_name">名前</string>
-    <string name="sort">ソート</string>
+    <string name="sort">並び替え</string>
+    <string name="rate_this_app">このアプリを評価する</string>
+    <string name="on_github">GitHub</string>
+    <string name="source_repository">ソースリポジトリ</string>
+    <string name="exportPassword">パスワードを設定する(不要なら空欄)</string>
+    <string name="exportPasswordHint">パスワードを入力してください</string>
+    <string name="version_history">更新履歴</string>
+    <string name="credits">貢献者</string>
+    <string name="help_translate_this_app">このアプリの翻訳を手伝う</string>
+    <string name="license">ライセンス</string>
+    <string name="on_google_play">Google Play</string>
+    <string name="report_error">エラーを報告する</string>
+    <string name="reverse">逆順</string>
+    <string name="and_data_usage">and data usage</string>
+    <string name="group_updated">グループを更新しました</string>
+    <string name="editGroup">グループ編集: <xliff:g>%s</xliff:g></string>
+    <string name="action_show_details">詳細を表示</string>
+    <string name="action_hide_details">詳細を非表示</string>
+    <string name="selectColor">色を選択</string>
+    <string name="setIcon">アイコン設定</string>
+    <string name="group_edit">グループ編集</string>
+    <string name="group_name_already_in_use">このグループ名は既に使用されています</string>
+    <string name="group_name_is_empty">グループ名を入力してください</string>
+    <string name="shortcutSelectCard">カードを選択してください</string>
+    <string name="translate_platform">on Weblate</string>
 </resources>

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

@@ -55,11 +55,11 @@
     <string name="importOptionApplicationTitle">외부 앱 사용</string>
     <string name="importOptionFilesystemExplanation">파일 시스템에서 파일을 선택합니다.</string>
     <string name="importOptionFilesystemTitle">파일 시스템에서 가져오기</string>
-    <string name="exportFailed">카드를 내보낼 수 없음</string>
+    <string name="exportFailed">카드를 내보낼 수 없음: <xliff:g>%s</xliff:g></string>
     <string name="importOptionApplicationExplanation">다른 파일 관리자 또는 앱을 사용하여 파일을 엽니다.</string>
     <string name="exportFailedTitle">내보내기 실패</string>
     <string name="exportSuccessfulTitle">내보내기 완료</string>
-    <string name="importFailed">카드를 가져올 수 없음</string>
+    <string name="importFailed">카드를 가져올 수 없음: <xliff:g>%s</xliff:g></string>
     <string name="importFailedTitle">가져오기 실패</string>
     <string name="importSuccessfulTitle">가져오기 완료</string>
     <string name="noCardIdError">카드 ID를 입력하지 않음</string>

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

@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="deleteTitle">Kaart läschen</string>
+    <string name="action_search">Sichen</string>
+    <string name="action_add">Derbäisetzen</string>
+    <string name="noBarcode">Kee barcode</string>
+    <string name="star">An meng Favoriten bäisetzen</string>
+    <string name="unstar">Aus Favoriten ewechhuelen</string>
+    <string name="cancel">Stornieren</string>
+    <string name="save">Späicheren</string>
+    <string name="edit">Änneren</string>
+    <string name="delete">Läschen</string>
+    <string name="confirm">Bestätegen</string>
+    <string name="lockScreen">Blockrotation</string>
+    <string name="unlockScreen">Déblockéieren Rotatioun</string>
+    <string name="deleteConfirmation">Dës Kaart dauerhaft läschen\?</string>
+    <string name="ok">Okay</string>
+    <string name="share">Aktie</string>
+    <string name="sendLabel">Schécken…</string>
+    <string name="editCardTitle">Kaart änneren</string>
+    <string name="addCardTitle">Kaart derbäisetzen</string>
+    <string name="cardShortcut">Kaart Bréck</string>
+    <string name="exportSuccessfulTitle">Exportéieren</string>
+    <string name="exportFailedTitle">Export fehlgeschlagen</string>
+    <string name="exportFailed">Kaarten konnten net exportéiert ginn: <xliff:g>%s</xliff:g></string>
+    <string name="importing">Importéieren…</string>
+    <string name="importOptionFilesystemTitle">Import aus dem Dateisystem</string>
+    <string name="importOptionFilesystemExplanation">Wielt eng bestëmmte Datei aus dem Dateisystem.</string>
+    <string name="importOptionFilesystemButton">Aus dem Dateisystem</string>
+    <string name="importOptionApplicationTitle">Benotzt eng aner app</string>
+    <string name="importOptionApplicationButton">Benotzt eng aner app</string>
+    <string name="app_license">Ënner Copyleft stehende fräi software, lizenséiert GPLv3+</string>
+    <string name="groups">Gruppen</string>
+    <string name="importCatima">Import aus Catima</string>
+    <string name="importFidme">Import aus FidMe</string>
+    <string name="importVoucherVault">Import aus Voucher Vault</string>
+    <string name="barcodeId">Barcode-Wäert</string>
+    <string name="sameAsCardId">Déiselwecht wéi kaart ID</string>
+    <string name="frontImageDescription">Vorderes Bild vun der Kaart</string>
+    <string name="backImageDescription">D \' hënnescht Bild vun der Kaart</string>
+    <string name="photos">Fotoen</string>
+    <string name="setFrontImage">Vorderes Bild einstellen</string>
+    <string name="setBackImage">Bild zerécksetzen</string>
+    <string name="removeImage">Bild ewechhuelen</string>
+    <string name="takePhoto">Mach eng Foto</string>
+    <string name="no">Neen</string>
+    <string name="exportPassword">Leeë Si e Passwuert fir de Schutz vun Hirem Exports fest (optional)</string>
+    <string name="exportPasswordHint">Passwuert aginn</string>
+    <string name="noMatchingGiftCards">Ech hunn näischt fonnt. Probéieren Iech, Är Sich ze änneren.</string>
+    <string name="note">Beuechten</string>
+    <string name="barcodeNoBarcode">Dës Kaart huet kee Barcode</string>
+    <string name="importExportHelp">Wann Dir Är Kaarten sécheren, kënnen Si se op een anert Instrument réckelen.</string>
+    <string name="about">Iwwer</string>
+    <string name="selectBarcodeTitle">Wielt Barcode</string>
+    <string name="intent_import_card_from_url_share_multiple_text">Ech wëll e puer Kaarten mat Iech deelen</string>
+    <string name="updateBarcodeQuestionTitle">Aktualiséiert barcode-Wäert\?</string>
+    <string name="intent_import_card_from_url_share_text">Ech wëll eng Kaart mat dir deelen</string>
+    <string name="importSuccessfulTitle">Anere sproochen</string>
+    <string name="unsupportedBarcodeType">Dee barcode-Typ kann net ugewise ginn. Et kann zu enger spéiderer Versioun vun der App ënnerstëtzt ginn.</string>
+    <string name="yes">Jo</string>
+    <string name="importFailedTitle">Import fehlgeschlagen</string>
+    <string name="importFailed">Kaarten konnten net anere sproochen ginn: <xliff:g>%s</xliff:g></string>
+    <string name="exporting">Ausführende…</string>
+    <string name="exportOptionExplanation">D \' Donnéeë ginn op eng Plaz vun Hirer Wal geschriwwen.</string>
+    <string name="importOptionApplicationExplanation">Benotzen Se eng beliebige App oder Hire bevorzugten Dateimanager, fir eng Datei ze opmaachen.</string>
+    <string name="accept">Averstane</string>
+    <string name="settings_display_barcode_max_brightness">Erhellen barcode-Usiicht</string>
+    <string name="enterBarcodeInstructions">Gitt d \' Kaarten-ID en an wielen Se entweder den Barcode-Typ ënnen oder \"Dës Kaart huet kee Barcode\".</string>
+    <string name="importStocard">Importéieren vun Stocard</string>
+    <string name="importLoyaltyCardKeychain">Import vun Loyalty Card Keychain</string>
+    <string name="setBarcodeId">Leeë Si barcode-Wäert</string>
+    <string name="wrongValueForBarcodeType">De Wäert ass fir de ausgewielt Barcode-Typ net gëllt</string>
+    <string name="copy_to_clipboard_multiple_toast">Kaarten-IDs an d \' Tëschentablag inspiréiere</string>
+    <string name="updateBarcodeQuestionText">Si hunn d \' Kaarten-ID geännert. Wëllt Dir och de Barcode aktualiséieren, fir deselwechte Wäert ze benotzen\?</string>
+    <string name="settings_dark_theme">Donkel</string>
+    <string name="settings_lock_barcode_orientation">Barcode-Ausriichtung spären</string>
+    <string name="settings_disable_lockscreen_while_viewing_card">Bildschierm spären verhënneren</string>
+    <string name="settings_light_theme">Liicht</string>
+    <string name="settings_max_font_size_scale">Max. Schrëftgréisst</string>
+    <string name="settings_keep_screen_on">Hale Si op Bildschierm</string>
+    <string name="importSuccessful">Kartendaten anere sproochen</string>
+    <string name="exportSuccessful">Exportierte Kartendaten</string>
+    <string name="enter_group_name">Gruppenname aginn</string>
+    <string name="noGroupCards">Dës Grupp ass keng Kaarten</string>
+    <plurals name="groupCardCount">
+        <item quantity="one"><xliff:g>%d</xliff:g> Kaart</item>
+        <item quantity="other"><xliff:g>%d</xliff:g> Netzwerkkarten</item>
+    </plurals>
+</resources>

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

@@ -19,13 +19,13 @@
     <string name="noCardIdError">Neįvestas kortelės ID</string>
     <string name="importExport">Importuoti/Exportuoti</string>
     <string name="exportName">Exportuoti</string>
-    <string name="importFailed">Nepavyko importuoti kortelių</string>
-    <string name="exportFailed">Nepavyko eksportuoti kortelių</string>
+    <string name="importFailed">Nepavyko importuoti kortelių: <xliff:g>%s</xliff:g></string>
+    <string name="exportFailed">Nepavyko eksportuoti kortelių: <xliff:g>%s</xliff:g></string>
     <string name="importing">Importuoja…</string>
     <string name="exporting">Eksportuoja…</string>
     <string name="noExternalStoragePermissionError">Pirmiausia suteikite išorinės saugyklos leidimą, kad galėtumėte importuoti arba eksportuoti korteles</string>
     <string name="about">Apie</string>
-    <string name="app_license">Copylefted libre programinė įranga, licencijuota GPLv3+.</string>
+    <string name="app_license">Copylefted laisvoji programinė įranga, licencijuota GPLv3+</string>
     <string name="about_title_fmt">Apie <xliff:g id="app_name">%s</xliff:g></string>
     <string name="debug_version_fmt">Versija: <xliff:g id="version">%s</xliff:g></string>
     <string name="app_revision_fmt">Revizijos info: <xliff:g id="app_revision_url">%s</xliff:g></string>
@@ -45,10 +45,10 @@
     <string name="action_search">Ieškoti</string>
     <string name="cardShortcut">Kortelės sparčioji nuoroda</string>
     <string name="importVoucherVaultMessage">Pasirinkite savo <i>vouchervault.json</i> eksportą iš Voucher Vault, kurį norite importuoti.
-\nArba sukurkite jį pirmiausia paspausdami Eksportuoti Voucher Vault.</string>
+\nSukurkite jį pirmiausia paspausdami Eksportuoti Voucher Vault.</string>
     <string name="importVoucherVault">Importuoti iš Voucher Vault</string>
     <string name="importLoyaltyCardKeychainMessage">Pasirinkite savo <i> LoyaltyCardKeychain.csv</i> eksportą iš Loyalty Card Keychain, kurį norite importuoti.
-\nArba sukurkite jį iš Loyalty Card Keychain meniu Importas/Eksportas, pirmiausia paspausdami Eksportuoti.</string>
+\nSukurkite jį iš Loyalty Card Keychain meniu Importavimas/Eksportavimas, pirmiausia paspausdami Eksportuoti.</string>
     <string name="importLoyaltyCardKeychain">Importuoti iš Loyalty Card Keychain</string>
     <string name="app_loyalty_card_keychain">Loyalty Card Keychain</string>
     <string name="parsingBalanceFailed">Panašu, kad <xliff:g> %s </xliff:g> reikšmė nėra tinkama.</string>
@@ -79,18 +79,18 @@
     <string name="sameAsCardId">Tokia pat kaip kortelės ID</string>
     <string name="barcodeId">Brūkšninio kodo reikšmė</string>
     <string name="importStocardMessage">Pasirinkite <i>***-sync.zip</i> eksportą iš Stocard, kad galėtumėte importuoti.
-\nArba gaukite susisiekę el. paštu support@stocardapp.com, prašydami eksportuoti jūsų duomenis.</string>
+\nGaukite susisiekę el. paštu support@stocardapp.com, prašydami eksportuoti jūsų duomenis.</string>
     <string name="importStocard">Importuoti iš Stocard</string>
     <string name="importFidmeMessage">Pasirinkite <i>fidme-export-request-xxxxxx.zip</i> eksportą iš FidMe, kurį norite importuoti, ir po to brūkšninių kodų tipus pasirinkite rankiniu būdu.
-\nArba sukurkite jį iš savo FidMe profilio, pasirinkę Duomenų apsauga ir pirmiausia paspaudę Išgauti mano duomenis.</string>
+\nSukurkite jį iš savo FidMe profilio, pasirinkę Duomenų apsauga ir pirmiausia paspaudę Išgauti mano duomenis.</string>
     <string name="importFidme">Importuoti iš FidMe</string>
-    <string name="importCatimaMessage">Norėdami importuoti, pasirinkite savo <i> catima.zip </i> eksportą iš Catima.
-\nArba sukurkite ją iš kitos Catima programos importavimo / eksportavimo meniu, pirmiausia paspausdami Eksportuoti ten.</string>
+    <string name="importCatimaMessage">Norėdami importuoti, pasirinkite savo <i> catima.zip </i> eksportavimą iš Catima.
+\nSukurkite ją iš kitos Catima programos importavimo / eksportavimo meniu, pirmiausia ten paspausdami Eksportuoti.</string>
     <string name="importCatima">Importuoti iš Catima</string>
     <string name="accept">Priimti</string>
     <string name="privacy_policy_popup_text">Privatumo politikos pranešimas (kurio reikalaujama kai kuriose programėlių parduotuvėse):
 \n
-\nJOKIE DUOMENYS NĖRA RENKAMI, o tai gali patvirtinti bet kas, nes mūsų programėlė yra libre programinė įranga.</string>
+\nJOKIE DUOMENYS NĖRA RENKAMI, o tai gali patvirtinti bet kas, nes mūsų programėlė yra laisvoji programinė įranga.</string>
     <string name="privacy_policy">Privatumo politika</string>
     <string name="chooseImportType">Importuoti duomenis iš\?</string>
     <string name="points">Taškai</string>
@@ -142,11 +142,11 @@
     <string name="starImage">Mėgstamiausia žvaigždė</string>
     <string name="thumbnailDescription">Kortelės miniatiūra</string>
     <string name="enterBarcodeInstructions">Įveskite kortelės ID ir toliau pasirinkite jos brūkšninio kodo tipą arba \"Ši kortelė neturi brūkšninio kodo\".</string>
-    <string name="app_resources">Libre trečiųjų šalių ištekliai: <xliff:g id="app_resources_list">%s</xliff:g></string>
-    <string name="app_libraries">Libre trečiųjų šalių bibliotekos: <xliff:g id="app_libraries_list">%s</xliff:g></string>
+    <string name="app_resources">Laisvosios trečiųjų šalių ištekliai: <xliff:g id="app_resources_list">%s</xliff:g></string>
+    <string name="app_libraries">Laisvosios trečiųjų šalių bibliotekos: <xliff:g id="app_libraries_list">%s</xliff:g></string>
     <string name="app_copyright_old">Paremta Loyalty Card Keychain
-\nautorinės teisės © 2016–2020 Branden Archer.</string>
-    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Autorinės teisės © 2019–<xliff:g>%d</xliff:g> Sylvia van Os.</string>
+\nautorinės teisės © 2016–2020 Branden Archer</string>
+    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Autorinės teisės © 2019–<xliff:g>%d</xliff:g> Sylvia van Os</string>
     <string name="importOptionApplicationButton">Naudoti kitą programą</string>
     <string name="importOptionApplicationExplanation">Norėdami atidaryti failą, naudokite bet kurią programą arba mėgstamą failų tvarkyklę.</string>
     <string name="importOptionApplicationTitle">Naudoti kitą programą</string>
@@ -202,4 +202,26 @@
     <string name="sort_by_most_recently_used">Vėliausiai naudota</string>
     <string name="sort_by_name">Pavadinimas</string>
     <string name="sort">Rikiuoti</string>
+    <string name="credits">Padėkos</string>
+    <string name="source_repository">Šaltinio repozitorija</string>
+    <string name="and_data_usage">ir duomenų naudojimas</string>
+    <string name="rate_this_app">Įvertinkite šią programėlę</string>
+    <string name="version_history">Versijų istorija</string>
+    <string name="license">Licencija</string>
+    <string name="on_github">GitHub</string>
+    <string name="on_google_play">Google Play</string>
+    <string name="help_translate_this_app">Padėkite išversti šią programėlę</string>
+    <string name="report_error">Pranešti apie klaidą</string>
+    <string name="exportPasswordHint">Įveskite slaptažodį</string>
+    <string name="exportPassword">Nustatykite slaptažodį, kad apsaugotumėte eksportavimą (neprivaloma)</string>
+    <string name="group_name_already_in_use">Toks grupės pavadinimas jau naudojamas</string>
+    <string name="group_name_is_empty">Grupės pavadinimas negali būti tuščias</string>
+    <string name="editGroup">Redaguojama grupė: <xliff:g>%s</xliff:g></string>
+    <string name="group_updated">Grupė atnaujinta</string>
+    <string name="group_edit">Redaguoti grupę</string>
+    <string name="noGiftCardsGroup">Dar neturite jokių lojalumo kortelių. Kai kelias pridėsite, galėsite jas priskirti grupei čia.</string>
+    <string name="setIcon">Nustatyti piktogramą</string>
+    <string name="selectColor">Pasirinkti spalvą</string>
+    <string name="action_hide_details">Paslėpti informaciją</string>
+    <string name="action_show_details">Rodyti išsamią informaciją</string>
 </resources>

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

@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="action_search">Meklēšana</string>
+    <string name="action_add">Pievienot</string>
+    <string name="noGiftCards">Noklikšķiniet uz pogas + plus, lai pievienotu karti, vai vispirms importējiet dažus no ⋮ izvēlnes.</string>
+    <string name="noMatchingGiftCards">Neko neatradu. Mēģiniet mainīt meklēšanu.</string>
+    <string name="storeName">Nosaukums</string>
+    <string name="note">Piezīme</string>
+    <string name="barcodeType">Svītrkoda Tips</string>
+    <string name="barcodeNoBarcode">Šai kartei nav svītrkoda</string>
+    <string name="noBarcode">Nav svītrkoda</string>
+    <string name="star">Pievienot izlasei</string>
+    <string name="unstar">Noņemt no izlases</string>
+    <string name="cancel">Atcelt</string>
+    <string name="save">Saglabāt</string>
+    <string name="edit">Rediģēt</string>
+    <string name="delete">Dzēst</string>
+    <string name="moveBarcodeToTopOfScreen">Pārvietojiet svītrkodu uz ekrāna augšdaļu</string>
+    <string name="moveBarcodeToCenterOfScreen">Centrējiet svītrkodu uz ekrāna</string>
+    <string name="errorReadingImage">Nevarēja nolasīt attēlu</string>
+    <string name="balance">Bilance</string>
+    <string name="noBarcodeFound">Svītrkods netika atrasts</string>
+    <string name="currency">Valūta</string>
+    <string name="points">Punkts</string>
+    <string name="chooseImportType">Importēt datus no\?</string>
+    <string name="sendLabel">Nosūtīt…</string>
+    <string name="editCardTitle">Rediģēt Karti</string>
+    <string name="share">Daļa</string>
+    <string name="confirm">Apstiprināt</string>
+    <string name="lockScreen">Bloķēt Rotāciju</string>
+    <string name="unlockScreen">Atbloķēt Rotāciju</string>
+    <string name="deleteTitle">Dzēst karti</string>
+    <string name="deleteConfirmation">Dzēst šo karti pastāvīgi\?</string>
+    <string name="ok">LABI</string>
+    <string name="addCardTitle">Pievienot Karti</string>
+    <string name="scanCardBarcode">Skenēšanas Kartes Svītrkods</string>
+    <string name="cardShortcut">Kartes Saīsne</string>
+    <string name="noCardsMessage">Vispirms pievienojiet karti</string>
+    <string name="noStoreError">Vārds nav ievadīts</string>
+    <string name="noCardExistsError">Nevarēja atrast karti</string>
+    <string name="failedParsingImportUriError">Nevarēja parsēt importa URI</string>
+    <string name="importExport">Imports/Eksports</string>
+    <string name="exportName">Eksports</string>
+    <string name="importExportHelp">Jūsu Karšu dublēšana ļauj pārvietot tās uz citu ierīci.</string>
+    <string name="importSuccessfulTitle">Importēts</string>
+    <string name="importFailedTitle">Neizdevās importēt</string>
+    <string name="importFailed">Nevarēja importēt kartes: <xliff:g>%s</xliff:g></string>
+    <string name="exportSuccessfulTitle">Eksports</string>
+    <string name="exportFailedTitle">Eksports neizdevās</string>
+    <string name="exportFailed">Nevarēja eksportēt kartes: <xliff:g>%s</xliff:g></string>
+    <string name="importing">Imports…</string>
+    <string name="exporting">Eksports…</string>
+    <string name="noExternalStoragePermissionError">Piešķiriet ārējai atmiņai atļauju vispirms importēt vai eksportēt kartes</string>
+    <string name="exportOptionExplanation">Dati tiks rakstīts uz vietu, pēc jūsu izvēles.</string>
+    <string name="importOptionFilesystemTitle">Importēt no failu sistēmas</string>
+    <string name="importOptionFilesystemExplanation">Izvēlieties konkrētu failu no failu sistēmas.</string>
+    <string name="importOptionFilesystemButton">No failu sistēmas</string>
+    <string name="importOptionApplicationTitle">Izmantojiet citu lietotni</string>
+    <string name="importOptionApplicationExplanation">Izmantojiet jebkuru lietotni vai savu iecienītāko failu pārvaldnieku, lai atvērtu failu.</string>
+    <string name="importOptionApplicationButton">Izmantojiet citu lietotni</string>
+    <string name="about">Par</string>
+    <string name="app_license">Copylefted libre programmatūra, licencēta GPLv3+</string>
+    <string name="selectBarcodeTitle">Izvēlieties Svītrkodu</string>
+    <string name="copy_to_clipboard_toast">Kartes ID kopēts starpliktuvē</string>
+    <string name="thumbnailDescription">Sīktēls kartei</string>
+    <string name="starImage">Mīļākā zvaigzne</string>
+    <string name="settings">Iestatījums</string>
+    <string name="settings_category_title_ui">Interfeiss</string>
+    <string name="settings_theme">Tēma</string>
+    <string name="settings_system_theme">Sistēma</string>
+    <string name="settings_light_theme">Gaisma</string>
+    <string name="settings_dark_theme">Tumšs</string>
+    <string name="settings_max_font_size_scale">Max. fonts</string>
+    <string name="settings_display_barcode_max_brightness">Izgaismojiet svītrkoda skatu</string>
+    <string name="settings_lock_barcode_orientation">Lock svītrkoda orientācija</string>
+    <string name="settings_keep_screen_on">Saglabāt ekrānu</string>
+    <string name="settings_disable_lockscreen_while_viewing_card">Novērst bloķēšanas ekrānu</string>
+    <string name="intent_import_card_from_url_share_text">Es vēlos dalīties ar jums karti</string>
+    <string name="importSuccessful">Importētie kartes dati</string>
+    <string name="exportSuccessful">Kartes dati eksportēti</string>
+    <string name="noGroups">Noklikšķiniet uz pogas + plus, lai vispirms pievienotu grupas kategorizēšanai.</string>
+    <string name="noGroupCards">Šajā grupā nav nevienas kartes</string>
+    <string name="all">Visi</string>
+    <string name="deleteConfirmationGroup">Dzēst grupu\?</string>
+    <string name="failedOpeningFileManager">Vispirms instalējiet failu pārvaldnieku.</string>
+    <string name="moveUp">Pārvietot uz augšu</string>
+    <string name="moveDown">Pārvietot uz leju</string>
+    <string name="leaveWithoutSaveTitle">Izeja</string>
+    <string name="leaveWithoutSaveConfirmation">Atstāt bez taupīšanas\?</string>
+    <string name="addFromImage">Izvēlieties attēlu no galerijas</string>
+    <string name="card">Karte</string>
+    <string name="barcode">Svītrkods</string>
+    <string name="expiryDate">Derīguma termiņš</string>
+    <string name="never">Nekad</string>
+    <string name="chooseExpiryDate">Izvēlieties derīguma termiņu</string>
+</resources>

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

@@ -29,10 +29,10 @@
     <string name="importExportHelp">Sikkerhetskopiering av kort lar deg flytte dem til en annen enhet.</string>
     <string name="importSuccessfulTitle">Importert</string>
     <string name="importFailedTitle">Kunne ikke importere</string>
-    <string name="importFailed">Klarte ikke å importere kort</string>
+    <string name="importFailed">Klarte ikke å importere kort: <xliff:g>%s</xliff:g></string>
     <string name="exportSuccessfulTitle">Eksportert</string>
     <string name="exportFailedTitle">Kunne ikke eksportere</string>
-    <string name="exportFailed">Kunne ikke eksportere kort</string>
+    <string name="exportFailed">Kunne ikke eksportere kort: <xliff:g>%s</xliff:g></string>
     <string name="importing">Importerer…</string>
     <string name="exporting">Exporterer…</string>
     <string name="noExternalStoragePermissionError">Innvilg lagringstilgang til eksternlager for å importere eller eksportere kort først</string>
@@ -44,7 +44,7 @@
     <string name="importOptionApplicationExplanation">Bruk en hvilken som helst app, eller din favoritt-filutforsker for å åpne en fil.</string>
     <string name="importOptionApplicationButton">Bruk en annen app</string>
     <string name="about">Om</string>
-    <string name="app_license">Copyleft fri programvare, lisensiert under GPLv3+.</string>
+    <string name="app_license">Gemenhetslig fri programvare, lisensiert GPLv3+</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>
@@ -64,7 +64,7 @@
     <string name="settings_system_theme">System</string>
     <string name="settings_theme">Drakt</string>
     <string name="app_copyright_old">Basert på Kundekortknippe
-\nopphavsrett 2016–2020 Branden Archer.</string>
+\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>
@@ -124,14 +124,14 @@
     <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="importVoucherVaultMessage">Velg din <i>vouchervault.json</i>-eksport fra Voucher Vault å importere.
+\nOpprett den ved å trykke «Eksport» i Voucher Vault først.</string>
     <string name="importVoucherVault">Importer fra Voucher Vault</string>
-    <string name="importLoyaltyCardKeychainMessage">Velg din <i>LoyaltyCardKeychain.csv - </i> eksporter fra kundekort Nøkkelring til import.
-\nEller lage det fra Import/Eksport-menyen i lojalitetskort Nøkkelringen ved å trykke på Eksport det første.</string>
+    <string name="importLoyaltyCardKeychainMessage">Velg din <i>LoyaltyCardKeychain.csv</i>-eksport fra Kundekortknippe å importere.
+\nOpprett den i «Import/Eksport»-menyen i Kundekortknippe ved å trykke «Eksporter» der først.</string>
     <string name="importLoyaltyCardKeychain">Importer fra Kundekortknippe</string>
-    <string name="importFidmeMessage">Velg din <i>fidme-eksport-be-xxxxxx.zip</i> eksporter fra FidMe til å importere, og velg strekkode typer manuelt etterpå.
-\nEller lage den fra FidMe profil ved å velge Beskyttelse av Data og deretter trykke Trekke ut dataene mine første.</string>
+    <string name="importFidmeMessage">Velg din <i>fidme.export-request-xxxxx.zip</i>-eksport fra FidMe å importere, for så å velge strekkodetypene manuelt etterpå-
+\nOpprett den i din FidMe-profil ved å velge «Databeskyttelse», for så å trykke «Pakk ut dataen min» først.</string>
     <string name="settings_max_font_size_scale">Maks. 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 vil dele noen kort med deg</string>
@@ -139,7 +139,7 @@
     <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_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>
+    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Opphavsrett © 2019–<xliff:g>%d</xliff:g> Sylvia van Os</string>
     <string name="updateBarcodeQuestionText">Du har endret kortets ID. Ønsker du å også oppdatere strekkoden til samme verdi?</string>
     <string name="no">Nei</string>
     <string name="yes">Ja</string>
@@ -152,18 +152,18 @@
     <string name="backImageDescription">Kortets bakside</string>
     <string name="frontImageDescription">Kortets forside</string>
     <string name="importStocardMessage">Velg din <i>***-sync.zip</i>-eksport fra Stocard å importere.
-\nEller få den ved å sende e-post til support@stocardapp.com der du etterspør eksport av dataen din.</string>
+\nSkaff den ved å sende e-post til support@stocardapp.com der du etterspør eksport av dataen din.</string>
     <string name="passwordRequired">Skriv inn passordet</string>
     <string name="importStocard">Importer fra Stocard</string>
     <string name="failedGeneratingShareURL">Klarte ikke å lage delbar nettadresse. Rapporter denne feilen.</string>
     <plurals name="selectedCardCount">
         <item quantity="one"><xliff:g>%d</xliff:g> kort valgt</item>
-        <item quantity="other"><xliff:g>%d</xliff:g> korten valgt</item>
+        <item quantity="other"><xliff:g>%d</xliff:g> kort valgt</item>
     </plurals>
     <string name="deleteConfirmation">Slett dette kortet for godt?</string>
     <plurals name="deleteCardsConfirmation">
-        <item quantity="one">Slett dette kortet for godt?</item>
-        <item quantity="other">Slett disse <xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%s</xliff:g> kortene for godt?</item>
+        <item quantity="one">Slett dette <xliff:g>%d</xliff:g> kortet for godt\?</item>
+        <item quantity="other">Slett disse <xliff:g>%d</xliff:g> kortene for godt\?</item>
     </plurals>
     <string name="turn_flashlight_on">Skru på lommelykten</string>
     <string name="turn_flashlight_off">Skru av lommelykten</string>
@@ -196,14 +196,28 @@
     <string name="sort_by_most_recently_used">Nyligst brukt</string>
     <string name="sort_by_name">Navn</string>
     <string name="sort">Sorter</string>
-    <string name="help_translate_this_app">Hjelp med å oversette denne appen</string>
+    <string name="help_translate_this_app">Bistå oversettelsen av programmet</string>
     <string name="license">Lisens</string>
     <string name="version_history">Versjonshistorikk</string>
-    <string name="importCatimaMessage">Velg din <i>catima.zip</i> fra Catima å importere. Eller lag den fra Importer/Eksporter-menyen i en annen Catima-app ved å trykke på \"Eksporter\" der først</string>
+    <string name="importCatimaMessage">Velg din <i>catima.zip</i>-eksport fra Catima å importere.
+\nOpprett den fra «Importer/Eksporter»-menyen i en annen Catima-app ved å trykke på «Eksporter» der først</string>
     <string name="source_repository">Kildekode</string>
     <string name="on_github">på GitHub</string>
     <string name="and_data_usage">og bruk av data</string>
-    <string name="rate_this_app">Vurder denne appen</string>
+    <string name="rate_this_app">Vurder dette programmet</string>
     <string name="on_google_play">på Google Play</string>
     <string name="report_error">Rapporter feil</string>
-</resources>
+    <string name="credits">Bidragsytere</string>
+    <string name="exportPassword">Sett et passord for å beskytte eksporten din (valgfritt)</string>
+    <string name="exportPasswordHint">Skriv inn passord</string>
+    <string name="group_edit">Rediger gruppe</string>
+    <string name="group_name_already_in_use">Gruppenavn allerede i bruk</string>
+    <string name="group_updated">Gruppe oppdatert</string>
+    <string name="group_name_is_empty">Gruppenavn kan ikke være tomt</string>
+    <string name="editGroup">Redigerer gruppe: <xliff:g>%s</xliff:g></string>
+    <string name="noGiftCardsGroup">Du har ingen lojalitetskort enda. Når du først har det kan du legge dem til i en gruppe her.</string>
+    <string name="action_show_details">Vis detaljer</string>
+    <string name="action_hide_details">Skjul detaljer</string>
+    <string name="selectColor">Velg farge</string>
+    <string name="setIcon">Sett ikon</string>
+</resources>

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

@@ -8,7 +8,7 @@
     <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="barcodeNoBarcode">Er is geen barcode</string>
     <string name="cancel">Annuleren</string>
     <string name="save">Opslaan</string>
     <string name="edit">Bewerken</string>
@@ -22,25 +22,25 @@
     <string name="sendLabel">Versturen…</string>
     <string name="editCardTitle">Kaart bewerken</string>
     <string name="addCardTitle">Kaart toevoegen</string>
-    <string name="scanCardBarcode">Scan de barcode van de kaart</string>
+    <string name="scanCardBarcode">Barcode scannen</string>
     <string name="cardShortcut">Kaartsnelkoppeling</string>
     <string name="noCardsMessage">Voeg eerst een kaart toe</string>
     <string name="noStoreError">Geen naam ingevoerd</string>
-    <string name="noCardIdError">Geen kaartnummer ingevoerd</string>
+    <string name="noCardIdError">Geen id ingevoerd</string>
     <string name="noCardExistsError">De kaart is niet aangetroffen</string>
     <string name="failedParsingImportUriError">Kan de import-uri niet verwerken</string>
     <string name="importExport">Importeren/Exporteren</string>
     <string name="exportName">Exporteren</string>
-    <string name="importExportHelp">Door je kaarten te back-uppen, kun je ze overzetten naar een ander apparaat.</string>
+    <string name="importExportHelp">Door je gegevens te back-uppen, kun je ze overzetten naar een ander apparaat.</string>
     <string name="importSuccessfulTitle">Importeren voltooid</string>
     <string name="importFailedTitle">Importeren mislukt</string>
-    <string name="importFailed">Het importeren is mislukt</string>
+    <string name="importFailed">Het importeren is mislukt: <xliff:g>%s</xliff:g></string>
     <string name="exportSuccessfulTitle">Exporteren voltooid</string>
     <string name="exportFailedTitle">Exporteren mislukt</string>
-    <string name="exportFailed">Het exporteren is mislukt</string>
+    <string name="exportFailed">Het exporteren is mislukt: <xliff:g>%s</xliff:g></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 gegevens 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 van het bestandssysteem.</string>
@@ -56,7 +56,7 @@
     <string name="selectBarcodeTitle">Barcode toevoegen</string>
     <string name="enterBarcodeInstructions">Voer de kaart-id in en kies daarna het soort barcode of 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="thumbnailDescription">Miniatuurvoorbeeld</string>
     <string name="settings">Instellingen</string>
     <string name="settings_category_title_ui">Vormgeving</string>
     <string name="settings_theme">Thema</string>
@@ -67,10 +67,10 @@
     <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="importSuccessful">De gegevens zijn geïmporteerd</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="exportSuccessful">De gegevens 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>
@@ -78,7 +78,7 @@
 \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="addManually">ID handmatig invoeren</string>
     <string name="leaveWithoutSaveConfirmation">Weet je zeker dat je niet wilt opslaan\?</string>
     <string name="leaveWithoutSaveTitle">Afsluiten</string>
     <string name="moveDown">Omlaag verplaatsen</string>
@@ -108,7 +108,7 @@
     <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</string>
+    <string name="settings_disable_lockscreen_while_viewing_card">Schermvergrendeling uitschakelen</string>
     <string name="settings_keep_screen_on">Scherm niet uitschakelen</string>
     <string name="privacy_policy_popup_text">Privacybeleid (vereist door sommige appwinkels):
 \n
@@ -116,15 +116,15 @@
     <string name="privacy_policy">Privacybeleid</string>
     <string name="accept">Accepteren</string>
     <string name="importVoucherVaultMessage">Kies het te importeren <i>vouchervault.json</i>-exportbestand.
-\nOf ga naar het exportmenu van Voucher Vault om een exportbestand samen te stellen.</string>
+\nGa naar het exportmenu van Voucher Vault om een exportbestand samen te stellen.</string>
     <string name="importVoucherVault">Importeren uit Voucher Vault</string>
     <string name="importLoyaltyCardKeychainMessage">Kies het te importeren genaamd <i>LoyaltyCardKeychain.csv</i>-exportbestand.
-\nOf ga naar het import-/exportmenu van Klantenkaartkluis om een exportbestand samen te stellen.</string>
+\nGa 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 <i>fidme-export-request-xxxxxx.zip</i>-exportbestand en kies nadien de juiste barcodes.
-\nOf ga naar je FidMe-profiel en druk op ‘Gegevensbescherming’ om een exportbestand samen te stellen.</string>
+\nGa naar je FidMe-profiel en druk op ‘Gegevensbescherming’ om een exportbestand samen te stellen.</string>
     <string name="importCatimaMessage">Kies het te importeren <i>Catima.zip</i>-exportbestand.
-\nOf ga naar het import-/exportmenu van Catima op een ander apparaat om een exportbestand samen te stellen.</string>
+\nGa 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>
@@ -151,18 +151,18 @@
     <string name="setFrontImage">Voorzijde kiezen</string>
     <string name="setBackImage">Achterzijde kiezen</string>
     <string name="photos">Afbeeldingen</string>
-    <string name="backImageDescription">Achterzijde van de kaart</string>
-    <string name="frontImageDescription">Voorzijde van de kaart</string>
+    <string name="backImageDescription">Achterzijde van kaart</string>
+    <string name="frontImageDescription">Voorzijde van kaart</string>
     <string name="passwordRequired">Voer het wachtwoord in</string>
     <string name="importStocardMessage">Kies het te importeren Stocard-exportbestand genaamd <i>***-sync.zip</i>.
-\nOf stuur een e-mail naar support@stocardapp.com waarin je vraagt om een exportbestand.</string>
+\nStuur een e-mail naar support@stocardapp.com waarin je vraagt om een exportbestand.</string>
     <string name="importStocard">Importeren uit Stocard</string>
     <string name="failedGeneratingShareURL">De te delen link kan niet worden gegenereerd. Meld deze fout.</string>
     <string name="turn_flashlight_off">Zaklamp uitzetten</string>
     <string name="turn_flashlight_on">Zaklamp aanzetten</string>
     <plurals name="selectedCardCount">
-        <item quantity="one"><xliff:g>%d</xliff:g> kaart geselecteerd</item>
-        <item quantity="other"><xliff:g>%d</xliff:g> kaarten geselecteerd</item>
+        <item quantity="one"><xliff:g>%d</xliff:g> geselecteerd</item>
+        <item quantity="other"><xliff:g>%d</xliff:g> geselecteerd</item>
     </plurals>
     <string name="deleteTitle">Kaart verwijderen</string>
     <plurals name="deleteCardsTitle">
@@ -189,10 +189,10 @@
     <string name="app_contributors">Mede mogelijk gemaakt door: <xliff:g id="app_contributors">%s</xliff:g></string>
     <string name="noGroupCards">Deze groep bevat geen kaarten</string>
     <string name="toggleMoreInfo">Meer informatie tonen/verbergen</string>
-    <string name="barcodeImageDescriptionWithType">Afbeelding van de barcode, type <xliff:g>%s</xliff:g></string>
+    <string name="barcodeImageDescriptionWithType">Afbeelding van barcode <xliff:g>%s</xliff:g></string>
     <string name="swipeToSwitchImages">Veeg of houd lang ingedrukt om te bladeren</string>
     <string name="sort_by">Sorteren op</string>
-    <string name="reverse">Omdraaien</string>
+    <string name="reverse">…in omgekeerde volgorde</string>
     <string name="sort_by_balance">Op saldo</string>
     <string name="sort_by_expiry">Op vervaldatum</string>
     <string name="sort_by_most_recently_used">Op onlangs gebruikt</string>
@@ -208,4 +208,18 @@
     <string name="help_translate_this_app">Help deze app te vertalen</string>
     <string name="credits">Met dank aan</string>
     <string name="version_history">Versiegeschiedenis</string>
-</resources>
+    <string name="exportPasswordHint">Voer een wachtwoord in</string>
+    <string name="exportPassword">Stel een wachtwoord in om je exportbestand te beveiligen (optioneel)</string>
+    <string name="group_name_already_in_use">Er is al een groep met deze naam</string>
+    <string name="group_updated">De groep is bijgewerkt</string>
+    <string name="group_name_is_empty">Voer een groepsnaam in</string>
+    <string name="editGroup">Groep bewerken: <xliff:g>%s</xliff:g></string>
+    <string name="noGiftCardsGroup">Voeg kaarten toe om ze hier te kunnen groeperen.</string>
+    <string name="group_edit">Groep bewerken</string>
+    <string name="setIcon">Kies een pictogram</string>
+    <string name="selectColor">Kies een kleur</string>
+    <string name="action_show_details">Details tonen</string>
+    <string name="action_hide_details">Details verbergen</string>
+    <string name="translate_platform">op Weblate</string>
+    <string name="shortcutSelectCard">Kies een kaart</string>
+</resources>