Release Catima 2.16.3

Stocard appears to keep images for deleted cards, which causes some
cards to have only images and no data, making them impossible to import.

This is most likely a bug on Stocard's side. As a workaround, we ignore
cards with no data file.

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

@@ -17,7 +17,8 @@ jobs:
           days-before-close: 90
           close-issue-message: 'This issue is missing necessary information and cannot be worked on in its current state. It has therefore been closed to keep the issue tracker clean. If you have more information, feel free to reopen it.'
           close-pr-message: 'This PR is missing necessary information and cannot be merged in its current state. It has therefore been closed to keep the issue tracker clean. If you have more information, feel free to reopen it.'
-          only-labels: 'needs info'
-          stale-issue-label: 'needs info'
-          stale-pr-label: 'needs info'
+          only-labels: 'state: needs info'
+          stale-issue-label: 'state: needs info'
+          stale-pr-label: 'state: needs info'
           remove-stale-when-updated: false
+          enable-statistics: true

CHANGELOG.md

@@ -1,5 +1,79 @@
 # Changelog
 
+## v2.16.3 - 107 (2022-04-15)
+
+- Stocard import fixes
+
+## v2.16.2 - 106 (2022-03-31)
+
+- Fix some character sequences being shown as a single character
+
+## v2.16.1 - 105 (2022-03-25)
+
+- Fix gray block appearing on invalid value for barcode
+- Stocard import fixes
+
+## v2.16.0 - 104 (2022-03-09)
+
+- Save card detail expansion state
+- Minor UI fixes
+
+## v2.15.2 - 103 (2022-02-11)
+
+- Fix manual language selection not applying everywhere
+- Fix crash in edit view on regionless locale
+
+## v2.15.1 - 102 (2022-02-10)
+
+- Various minor fixes
+- Fix crash when using Norwegian translation
+
+## v2.15.0 - 101 (2022-02-06)
+
+- Fix cropper not using theme colour
+- Fix minor theming issues
+- Add pure black dark theme for OLED screens
+
+## v2.14.1 - 100 (2022-01-15)
+
+- Hide search, expand and sort icons until there is at least 1 card
+- Various theming fixes
+
+## v2.14.0 - 99 (2022-01-14)
+
+- Material You redesign
+
+## v2.13.1 - 98 (2022-01-09)
+
+- Fix various TalkBack-related bugs
+
+## v2.13.0 - 97 (2022-01-03)
+
+- Fixed pressing the save button multiple times creating multiple entries
+- Lower card header size when hiding details to fit even more cards
+- Restructure edit screen
+- Improve star icon contrast in main view
+
+## v2.12.0 - 96 (2021-12-23)
+
+- Add CODE 93 support
+- Various minor bugfixes and improvements
+
+## 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

FUNDING.yml

@@ -0,0 +1,3 @@
+github: TheLastProject
+custom:
+  - "https://paypal.me/sylviavanos"

app/build.gradle

@@ -18,8 +18,8 @@ android {
         applicationId "me.hackerchick.catima"
         minSdkVersion 21
         targetSdkVersion 31
-        versionCode 92
-        versionName "2.10.0"
+        versionCode 107
+        versionName "2.16.3"
 
         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,24 +80,24 @@ android {
 
 dependencies {
 // AndroidX
-    implementation 'androidx.appcompat:appcompat:1.4.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.2'
+    implementation 'androidx.appcompat:appcompat:1.4.1'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
     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'
+    implementation 'androidx.preference:preference:1.2.0'
+    implementation 'com.google.android.material:material:1.5.0'
+    implementation 'com.github.yalantis:ucrop:2.2.8'
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
 
 // Splash Screen
-    implementation 'androidx.core:core-splashscreen:1.0.0-alpha02'
+    implementation 'androidx.core:core-splashscreen:1.0.0-beta02'
 
 // Third-party
     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 'com.github.invissvenska:NumberPickerPreference:1.0.4'
     implementation 'net.lingala.zip4j:zip4j:2.9.1'
 
 // SpotBugs
@@ -106,7 +106,7 @@ dependencies {
 // Testing
     testImplementation 'androidx.test:core:1.4.0'
     testImplementation 'junit:junit:4.13.2'
-    testImplementation 'org.robolectric:robolectric:4.7.1'
+    testImplementation 'org.robolectric:robolectric:4.7.3'
 }
 
 tasks.withType(SpotBugsTask) {

app/src/main/AndroidManifest.xml

@@ -37,11 +37,11 @@
         <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"
@@ -116,8 +116,8 @@
         </activity>
 
         <activity
-            android:name="com.yalantis.ucrop.UCropActivity"
-            android:theme="@style/Theme.AppCompat.NoActionBar"/>
+            android:name=".UCropWrapper"
+            android:theme="@style/AppTheme.NoActionBar" />
 
         <provider
             android:name="androidx.core.content.FileProvider"
@@ -128,6 +128,11 @@
                 android:name="android.support.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>

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

@@ -151,13 +151,13 @@ public class AboutActivity extends CatimaAppCompatActivity implements View.OnCli
         } else if (id == R.id.translate) {
             url = "https://hosted.weblate.org/engage/catima/";
         } else if (id == R.id.license) {
-            url = "https://github.com/TheLastProject/Catima/blob/master/LICENSE";
+            url = "https://github.com/CatimaLoyalty/Android/blob/master/LICENSE";
         } else if (id == R.id.repo) {
-            url = "https://github.com/TheLastProject/Catima/";
+            url = "https://github.com/CatimaLoyalty/Android/";
         } else if (id == R.id.privacy) {
             url = "https://catima.app/privacy-policy/";
         } else if (id == R.id.report_error) {
-            url = "https://github.com/TheLastProject/Catima/issues";
+            url = "https://github.com/CatimaLoyalty/Android/issues";
         } else if (id == R.id.rate) {
             url = "https://play.google.com/store/apps/details?id=me.hackerchick.catima";
         } else {

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

@@ -5,6 +5,7 @@ import android.graphics.Bitmap;
 import android.graphics.Color;
 import android.graphics.PorterDuff;
 import android.util.Log;
+import android.util.TypedValue;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
@@ -46,7 +47,7 @@ public class BarcodeImageWriterTask implements CompatCallable<Bitmap> {
     BarcodeImageWriterTask(
             Context context, ImageView imageView, String cardIdString,
             CatimaBarcode barcodeFormat, TextView textView,
-            boolean showFallback, Runnable callback
+            boolean showFallback, Runnable callback, boolean roundCornerPadding
     ) {
         mContext = context;
 
@@ -60,18 +61,32 @@ public class BarcodeImageWriterTask implements CompatCallable<Bitmap> {
         cardId = cardIdString;
         format = barcodeFormat;
 
+        int padding = 0;
+        // Some barcodes already have internal whitespace and shouldn't get extra padding
+        // TODO: Get rid of this hack by somehow detecting this extra whitespace
+        if (roundCornerPadding && !barcodeFormat.hasInternalPadding()) {
+            padding = Math.round(TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 10, context.getResources().getDisplayMetrics()));
+        }
+
         final int MAX_WIDTH = getMaxWidth(format);
 
+        int tempImageHeight;
+        int tempImageWidth;
+
         if (imageView.getWidth() < MAX_WIDTH) {
-            imageHeight = imageView.getHeight();
-            imageWidth = imageView.getWidth();
+            tempImageHeight = imageView.getHeight();
+            tempImageWidth = imageView.getWidth();
         } else {
             // Scale down the image to reduce the memory needed to produce it
-            imageWidth = MAX_WIDTH;
+            tempImageWidth = MAX_WIDTH;
             double ratio = (double) MAX_WIDTH / (double) imageView.getWidth();
-            imageHeight = (int) (imageView.getHeight() * ratio);
+            tempImageHeight = (int) (imageView.getHeight() * ratio);
         }
 
+        // Ensure space for padding if wanted
+        imageWidth = tempImageWidth;
+        imageHeight = tempImageHeight - padding;
+
         this.showFallback = showFallback;
     }
 
@@ -120,6 +135,8 @@ public class BarcodeImageWriterTask implements CompatCallable<Bitmap> {
                 return "C0C";
             case CODE_39:
                 return "CODE_39";
+            case CODE_93:
+                return "CODE_93";
             case CODE_128:
                 return "CODE_128";
             case EAN_8:

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

@@ -76,6 +76,7 @@ public class BarcodeSelectorAdapter extends ArrayAdapter<CatimaBarcodeWithValue>
         final CatimaBarcode format = CatimaBarcode.fromName(formatType);
 
         image.setImageBitmap(null);
+        image.setClipToOutline(true);
 
         if (image.getHeight() == 0) {
             // The size of the ImageView is not yet available as it has not
@@ -89,13 +90,13 @@ public class BarcodeSelectorAdapter extends ArrayAdapter<CatimaBarcodeWithValue>
 
                             Log.d(TAG, "Generating barcode for type " + formatType);
 
-                            BarcodeImageWriterTask barcodeWriter = new BarcodeImageWriterTask(getContext(), image, cardId, format, text, true, null);
+                            BarcodeImageWriterTask barcodeWriter = new BarcodeImageWriterTask(getContext(), image, cardId, format, text, true, null, true);
                             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);
+            BarcodeImageWriterTask barcodeWriter = new BarcodeImageWriterTask(getContext(), image, cardId, format, text, true, null, true);
             mTasks.executeTask(TaskHandler.TYPE.BARCODE, barcodeWriter);
         }
     }

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

@@ -5,12 +5,17 @@ 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 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);
     }
 
@@ -58,6 +63,7 @@ public abstract class BaseCursorAdapter<V extends RecyclerView.ViewHolder> exten
 
         if (inputCursor != null) {
             mCursor = inputCursor;
+            mRowIDColumn = mCursor.getColumnIndex(mRowIDColumnName);
             mDataValid = true;
             notifyDataSetChanged();
         } else {

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

@@ -1,68 +1,62 @@
 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.view.Menu;
+import android.view.MenuItem;
 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 CatimaAppCompatActivity implements LoyaltyCardCursorAdapter.CardAdapterListener {
     static final String TAG = "Catima";
-    final DBHelper mDb = new DBHelper(this);
+    private SQLiteDatabase mDatabase;
+    private LoyaltyCardCursorAdapter mAdapter;
 
     @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);
+        setSupportActionBar(toolbar);
 
         // 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();
-
-        final LoyaltyCardCursorAdapter adapter = new LoyaltyCardCursorAdapter(this, cardCursor, this);
-        cardList.setAdapter(adapter);
+        Cursor cardCursor = DBHelper.getLoyaltyCardCursor(mDatabase);
+        mAdapter = new LoyaltyCardCursorAdapter(this, cardCursor, this);
+        cardList.setAdapter(mAdapter);
     }
 
     private void onClickAction(int position) {
-        Cursor selected = mDb.getLoyaltyCardCursor();
+        Cursor selected = DBHelper.getLoyaltyCardCursor(mDatabase);
         selected.moveToPosition(position);
         LoyaltyCard loyaltyCard = LoyaltyCard.toLoyaltyCard(selected);
 
@@ -75,6 +69,26 @@ public class CardShortcutConfigure extends AppCompatActivity implements LoyaltyC
         finish();
     }
 
+    @Override
+    public boolean onCreateOptionsMenu(Menu inputMenu) {
+        getMenuInflater().inflate(R.menu.card_details_menu, inputMenu);
+        Utils.updateMenuCardDetailsButtonState(inputMenu.findItem(R.id.action_unfold), mAdapter.showingDetails());
+        return super.onCreateOptionsMenu(inputMenu);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem inputItem) {
+        int id = inputItem.getItemId();
+
+        if (id == R.id.action_unfold) {
+            mAdapter.showDetails(!mAdapter.showingDetails());
+            invalidateOptionsMenu();
+
+            return true;
+        }
+
+        return super.onOptionsItemSelected(inputItem);
+    }
 
     @Override
     public void onRowClicked(int inputPosition) {

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

@@ -1,20 +1,15 @@
 package protect.card_locker;
 
 import android.content.Context;
-import android.content.SharedPreferences;
-import android.content.res.Resources;
-import android.util.TypedValue;
-
-import java.util.HashMap;
+import android.graphics.Color;
+import android.os.Build;
+import android.os.Bundle;
+import android.view.View;
 
+import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
-import androidx.preference.PreferenceManager;
 
 public class CatimaAppCompatActivity extends AppCompatActivity {
-
-    SharedPreferences pref;
-    HashMap<String, Integer> supportedThemes;
-
     @Override
     protected void attachBaseContext(Context base) {
         // Apply chosen language
@@ -22,32 +17,28 @@ public class CatimaAppCompatActivity extends AppCompatActivity {
     }
 
     @Override
-    public Resources.Theme getTheme() {
-        if (supportedThemes == null) {
-            supportedThemes = new HashMap<>();
-            supportedThemes.put(getString(R.string.settings_key_blue_theme), R.style.AppTheme_blue);
-            supportedThemes.put(getString(R.string.settings_key_brown_theme), R.style.AppTheme_brown);
-            supportedThemes.put(getString(R.string.settings_key_green_theme), R.style.AppTheme_green);
-            supportedThemes.put(getString(R.string.settings_key_grey_theme), R.style.AppTheme_grey);
-            supportedThemes.put(getString(R.string.settings_key_magenta_theme), R.style.AppTheme_magenta);
-            supportedThemes.put(getString(R.string.settings_key_pink_theme), R.style.AppTheme_pink);
-            supportedThemes.put(getString(R.string.settings_key_sky_blue_theme), R.style.AppTheme_sky_blue);
-            supportedThemes.put(getString(R.string.settings_key_violet_theme), R.style.AppTheme_violet);
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        // XXX splash screen activity has to do this after installing splash screen before view inflate
+        if (!this.getClass().getSimpleName().equals(MainActivity.class.getSimpleName())) {
+            Utils.patchColors(this);
         }
-
-        Resources.Theme theme = super.getTheme();
-        pref = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
-        String themeName = pref.getString(getString(R.string.setting_key_theme_color), getString(R.string.settings_key_catima_theme));
-
-        theme.applyStyle(Utils.mapGetOrDefault(supportedThemes, themeName, R.style.AppTheme_NoActionBar), true);
-
-        return theme;
     }
 
-    public int getThemeColor() {
-        TypedValue typedValue = new TypedValue();
-        Resources.Theme theme = getTheme();
-        theme.resolveAttribute(R.attr.colorPrimary, typedValue, true);
-        return typedValue.data;
+    @Override
+    protected void onPostCreate(@Nullable Bundle savedInstanceState) {
+        super.onPostCreate(savedInstanceState);
+        // material 3 designer does not consider status bar colors
+        // XXX changing this in onCreate causes issues with the splash screen activity, so doing this here
+        boolean darkMode = Utils.isDarkModeEnabled(this);
+        if (Build.VERSION.SDK_INT >= 23) {
+            getWindow().setStatusBarColor(Color.TRANSPARENT);
+            getWindow().getDecorView().setSystemUiVisibility(darkMode ? 0 : View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
+        } else {
+            // icons are always white back then
+            getWindow().setStatusBarColor(darkMode ? Color.TRANSPARENT : Color.argb(127, 0, 0, 0));
+        }
+        // XXX android 9 and below has a nasty rendering bug if the theme was patched earlier
+        Utils.postPatchColors(this);
     }
 }

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

@@ -10,6 +10,7 @@ public class CatimaBarcode {
     public static final List<BarcodeFormat> barcodeFormats = Collections.unmodifiableList(Arrays.asList(
             BarcodeFormat.AZTEC,
             BarcodeFormat.CODE_39,
+            BarcodeFormat.CODE_93,
             BarcodeFormat.CODE_128,
             BarcodeFormat.CODABAR,
             BarcodeFormat.DATA_MATRIX,
@@ -25,6 +26,7 @@ public class CatimaBarcode {
     public static final List<String> barcodePrettyNames = Collections.unmodifiableList(Arrays.asList(
             "Aztec",
             "Code 39",
+            "Code 93",
             "Code 128",
             "Codabar",
             "Data Matrix",
@@ -70,6 +72,11 @@ public class CatimaBarcode {
                 || mBarcodeFormat == BarcodeFormat.QR_CODE;
     }
 
+    public boolean hasInternalPadding() {
+        return mBarcodeFormat == BarcodeFormat.PDF_417
+                || mBarcodeFormat == BarcodeFormat.QR_CODE;
+    }
+
     public BarcodeFormat format() {
         return mBarcodeFormat;
     }

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

@@ -71,12 +71,8 @@ public class DBHelper extends SQLiteOpenHelper {
         Descending
     }
 
-    private Context mContext;
-
     public DBHelper(Context context) {
         super(context, DATABASE_NAME, null, DATABASE_VERSION);
-
-        mContext = context;
     }
 
     @Override
@@ -115,7 +111,6 @@ public class DBHelper extends SQLiteOpenHelper {
                 "tokenize=unicode61);");
     }
 
-
     @Override
     public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
         if (oldVersion < 2 && newVersion >= 2) {
@@ -309,7 +304,7 @@ public class DBHelper extends SQLiteOpenHelper {
         }
     }
 
-    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
@@ -341,22 +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();
@@ -371,56 +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();
@@ -436,24 +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();
@@ -466,53 +426,49 @@ 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,
+        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 boolean updateLoyaltyCardZoomLevel(int loyaltyCardId, int zoomLevel) {
-        SQLiteDatabase db = getWritableDatabase();
+    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 = db.update(LoyaltyCardDbIds.TABLE, contentValues,
+        int rowsUpdated = database.update(LoyaltyCardDbIds.TABLE, contentValues,
                 whereAttrs(LoyaltyCardDbIds.ID),
                 withArgs(loyaltyCardId));
         Log.d("updateLoyaltyCardZLevel", "Rows changed = " + rowsUpdated);
         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 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;
 
@@ -526,9 +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));
@@ -551,11 +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));
 
@@ -564,46 +517,30 @@ 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
         for (ImageLocationType imageLocationType : ImageLocationType.values()) {
             try {
-                Utils.saveCardImage(mContext, null, id, imageLocationType);
+                Utils.saveCardImage(context, null, id, imageLocationType);
             } catch (FileNotFoundException e) {
                 e.printStackTrace();
             }
@@ -612,9 +549,9 @@ public class DBHelper extends SQLiteOpenHelper {
         return (rowsDeleted == 1);
     }
 
-    public Cursor getLoyaltyCardCursor() {
+    public static Cursor getLoyaltyCardCursor(SQLiteDatabase database) {
         // An empty string will match everything
-        return getLoyaltyCardCursor("");
+        return getLoyaltyCardCursor(database, "");
     }
 
     /**
@@ -623,8 +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);
     }
 
     /**
@@ -634,8 +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);
     }
 
     /**
@@ -646,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()) {
@@ -673,7 +608,7 @@ 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.trim().isEmpty() ? " " : " AND " + LoyaltyCardDbFTS.TABLE + " MATCH ? ") +
@@ -690,9 +625,8 @@ public class DBHelper extends SQLiteOpenHelper {
      *
      * @return Integer
      */
-    public int getLoyaltyCardCount() {
-        SQLiteDatabase db = getReadableDatabase();
-        return (int) DatabaseUtils.queryNumEntries(db, LoyaltyCardDbIds.TABLE);
+    public static int getLoyaltyCardCount(SQLiteDatabase database) {
+        return (int) DatabaseUtils.queryNumEntries(database, LoyaltyCardDbIds.TABLE);
     }
 
     /**
@@ -700,15 +634,13 @@ 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() {
-        Cursor data = getGroupCursor();
+    public static List<Group> getGroups(SQLiteDatabase database) {
+        Cursor data = getGroupCursor(database);
 
         List<Group> groups = new ArrayList<>();
 
@@ -726,15 +658,14 @@ public class DBHelper extends SQLiteOpenHelper {
         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) {
             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));
 
@@ -742,9 +673,8 @@ 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;
@@ -757,14 +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<>();
 
@@ -783,99 +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;
         }
@@ -886,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;
         }
@@ -908,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/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,28 +13,21 @@ 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;
+    public final Context mContext;
+    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;
         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
@@ -43,16 +37,12 @@ class GroupCursorAdapter extends BaseCursorAdapter<GroupCursorAdapter.GroupListI
         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()));

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

@@ -10,14 +10,20 @@ 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.content.ContextCompat;
+
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -26,21 +32,15 @@ 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;
+import protect.card_locker.importexport.ImportExportResultType;
 
 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;
 
@@ -49,6 +49,10 @@ public class ImportExportActivity extends CatimaAppCompatActivity {
     private DataFormat importDataFormat;
     private String exportPassword;
 
+    private ActivityResultLauncher<Intent> fileCreateLauncher;
+    private ActivityResultLauncher<String> fileOpenLauncher;
+    private ActivityResultLauncher<Intent> filePickerLauncher;
+
     final private TaskHandler mTasks = new TaskHandler();
 
     @Override
@@ -76,6 +80,49 @@ public class ImportExportActivity extends CatimaAppCompatActivity {
                     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.toCharArray(), true);
+            } catch (IOException e) {
+                Log.e(TAG, "Failed to export file: " + result.toString(), e);
+                onExportComplete(new ImportExportResult(ImportExportResultType.GenericFailure, result.toString()), 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);
@@ -83,60 +130,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) {
-                AlertDialog.Builder builder = new AlertDialog.Builder(ImportExportActivity.this);
-                builder.setTitle(R.string.exportPassword);
+        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;
+            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);
+            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();
-                    chooseFileWithIntent(intentCreateDocumentAction, CHOOSE_EXPORT_LOCATION);
-                });
-                builder.setNegativeButton(R.string.cancel, (dialogInterface, i) -> dialogInterface.cancel());
-                builder.show();
+            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(new ImportExportResult(ImportExportResultType.GenericFailure, e.toString()), uri, importDataFormat);
+        }
+    }
+
+    private void chooseImportType(boolean choosePicker) {
         List<CharSequence> betaImportOptions = new ArrayList<>();
         betaImportOptions.add("Fidme");
         betaImportOptions.add("Stocard");
@@ -194,7 +238,17 @@ public class ImportExportActivity extends CatimaAppCompatActivity {
                             .setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
                                 @Override
                                 public void onClick(DialogInterface dialog, int which) {
-                                    chooseFileWithIntent(baseIntent, IMPORT);
+                                    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)
@@ -297,63 +351,58 @@ 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());
 
         builder.show();
     }
 
+    private String buildResultDialogMessage(ImportExportResult result, boolean isImport) {
+        int messageId;
+
+        if (result.resultType() == ImportExportResultType.Success) {
+            messageId = isImport ? R.string.importSuccessful : R.string.exportSuccessful;
+        } else {
+            messageId = isImport ? R.string.importFailed : R.string.exportFailed;
+        }
+
+        StringBuilder messageBuilder = new StringBuilder(getResources().getString(messageId));
+        if (result.developerDetails() != null) {
+            messageBuilder.append("\n\n");
+            messageBuilder.append(getResources().getString(R.string.include_if_asking_support));
+            messageBuilder.append("\n\n");
+            messageBuilder.append(result.developerDetails());
+        }
+
+        return messageBuilder.toString();
+    }
+
     private void onImportComplete(ImportExportResult result, Uri path, DataFormat dataFormat) {
-        if (result == ImportExportResult.BadPassword) {
+        ImportExportResultType resultType = result.resultType();
+
+        if (resultType == ImportExportResultType.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.setTitle(resultType == ImportExportResultType.Success ? R.string.importSuccessfulTitle : R.string.importFailedTitle);
+        builder.setMessage(buildResultDialogMessage(result, true));
+        builder.setNeutralButton(R.string.ok, (dialog, which) -> dialog.dismiss());
 
         builder.create().show();
     }
 
     private void onExportComplete(ImportExportResult result, final Uri path) {
+        ImportExportResultType resultType = result.resultType();
+
         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.setTitle(resultType == ImportExportResultType.Success ? R.string.exportSuccessfulTitle : R.string.exportFailedTitle);
+        builder.setMessage(buildResultDialogMessage(result, false));
         builder.setNeutralButton(R.string.ok, (dialog, which) -> dialog.dismiss());
 
-        if (result == ImportExportResult.Success) {
+        if (resultType == ImportExportResultType.Success) {
             final CharSequence sendLabel = ImportExportActivity.this.getResources().getText(R.string.sendLabel);
 
             builder.setPositiveButton(sendLabel, (dialog, which) -> {
@@ -373,69 +422,4 @@ public class ImportExportActivity extends CatimaAppCompatActivity {
 
         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;
-        }
-
-        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, exportPassword.toCharArray(), true);
-            } 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, true);
-            }
-        } catch (IOException 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);
-    }
 }

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

@@ -4,6 +4,7 @@ import android.app.Activity;
 import android.app.ProgressDialog;
 import android.content.Context;
 import android.content.DialogInterface;
+import android.database.sqlite.SQLiteDatabase;
 import android.util.Log;
 
 import java.io.IOException;
@@ -15,6 +16,7 @@ import java.nio.charset.StandardCharsets;
 import protect.card_locker.async.CompatCallable;
 import protect.card_locker.importexport.DataFormat;
 import protect.card_locker.importexport.ImportExportResult;
+import protect.card_locker.importexport.ImportExportResultType;
 import protect.card_locker.importexport.MultiFormatExporter;
 import protect.card_locker.importexport.MultiFormatImporter;
 
@@ -59,22 +61,23 @@ public class ImportExportTask implements CompatCallable<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 importResult = MultiFormatImporter.importData(context, database, stream, format, password);
 
-        Log.i(TAG, "Import result: " + importResult.name());
+        Log.i(TAG, "Import result: " + importResult);
 
         return importResult;
     }
 
-    private ImportExportResult performExport(Context context, OutputStream stream, DBHelper db, char[] password) {
-        ImportExportResult result = ImportExportResult.GenericFailure;
+    private ImportExportResult performExport(Context context, OutputStream stream, SQLiteDatabase database, char[] password) {
+        ImportExportResult result;
 
         try {
             OutputStreamWriter writer = new OutputStreamWriter(stream, StandardCharsets.UTF_8);
-            result = MultiFormatExporter.exportData(context, db, stream, format, password);
+            result = MultiFormatExporter.exportData(context, database, stream, format, password);
             writer.close();
         } catch (IOException e) {
+            result = new ImportExportResult(ImportExportResultType.GenericFailure, e.toString());
             Log.e(TAG, "Unable to export file", e);
         }
 
@@ -98,15 +101,17 @@ public class ImportExportTask implements CompatCallable<ImportExportResult> {
     }
 
     protected ImportExportResult doInBackground(Void... nothing) {
-        final DBHelper db = new DBHelper(activity);
+        final SQLiteDatabase database = new DBHelper(activity).getWritableDatabase();
         ImportExportResult result;
 
         if (doImport) {
-            result = performImport(activity.getApplicationContext(), inputStream, db, password);
+            result = performImport(activity.getApplicationContext(), inputStream, database, password);
         } else {
-            result = performExport(activity.getApplicationContext(), outputStream, db, password);
+            result = performExport(activity.getApplicationContext(), outputStream, database, password);
         }
 
+        database.close();
+
         return result;
     }
 

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

@@ -33,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);
@@ -197,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

@@ -10,6 +10,9 @@ import android.graphics.Paint;
 import android.graphics.Rect;
 import android.graphics.Typeface;
 import android.text.TextPaint;
+import android.util.Log;
+
+import androidx.core.graphics.PaintCompat;
 
 /**
  * Original from https://github.com/andOTP/andOTP/blob/master/app/src/main/java/org/shadowice/flocke/andotp/Utilities/LetterBitmap.java
@@ -48,7 +51,6 @@ class LetterBitmap {
     public LetterBitmap(Context context, String displayName, String key, int tileLetterFontSize,
                         int width, int height, Integer backgroundColor, Integer textColor) {
         TextPaint paint = new TextPaint();
-        paint.setTypeface(Typeface.create("sans-serif-light", Typeface.BOLD));
 
         if (textColor != null) {
             paint.setColor(textColor);
@@ -58,6 +60,8 @@ class LetterBitmap {
 
         paint.setTextAlign(Paint.Align.CENTER);
         paint.setAntiAlias(true);
+        paint.setTextSize(tileLetterFontSize);
+        paint.setTypeface(Typeface.defaultFromStyle(Typeface.BOLD));
 
         if (backgroundColor == null) {
             mColor = getDefaultColor(context, key);
@@ -66,22 +70,31 @@ class LetterBitmap {
         }
 
         mBitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
-        String firstChar = displayName.substring(0, 1);
+        String firstChar = displayName.substring(0, 1).toUpperCase();
+        int firstCharEnd = 2;
+        while (firstCharEnd <= displayName.length()) {
+            // Test for the longest render-able string
+            // But ignore containing only a-Z0-9 to not render things like ffi as a single character
+            String test = displayName.substring(0, firstCharEnd);
+            if (!isAlphabetical(test) && PaintCompat.hasGlyph(paint, test)) {
+                firstChar = test;
+            }
+            firstCharEnd++;
+        }
+
+        Log.d("LetterBitmap", "using sequence " + firstChar + " to render first char which has length " + firstChar.length());
 
         final Canvas c = new Canvas();
         c.setBitmap(mBitmap);
         c.drawColor(mColor);
 
-        char[] firstCharArray = new char[1];
-        firstCharArray[0] = firstChar.toUpperCase().charAt(0);
-        paint.setTextSize(tileLetterFontSize);
-
-        // The bounds that enclose the letter
         Rect bounds = new Rect();
+        paint.getTextBounds(firstChar, 0, firstChar.length(), bounds);
+        c.drawText(firstChar,
+                0, firstChar.length(),
+                width / 2.0f, (height - (bounds.bottom + bounds.top)) / 2.0f
+                , paint);
 
-        paint.getTextBounds(firstCharArray, 0, 1, bounds);
-        c.drawText(firstCharArray, 0, 1, width / 2.0f, height / 2.0f
-                + (bounds.bottom - bounds.top) / 2.0f, paint);
     }
 
     /**
@@ -112,6 +125,10 @@ class LetterBitmap {
         return colors.getColor(color, Color.BLACK);
     }
 
+    private static boolean isAlphabetical(String string) {
+        return string.matches("[a-zA-Z0-9]*");
+    }
+
     /**
      * Determine the color which the letter tile will use if no default
      * color is provided.

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,6 +1,7 @@
 package protect.card_locker;
 
 import android.content.Context;
+import android.content.SharedPreferences;
 import android.content.res.Resources;
 import android.database.Cursor;
 import android.graphics.Bitmap;
@@ -15,6 +16,7 @@ import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.core.content.ContextCompat;
 import androidx.core.graphics.BlendModeColorFilterCompat;
 import androidx.core.graphics.BlendModeCompat;
@@ -25,23 +27,24 @@ 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 protect.card_locker.preferences.Settings;
 
 public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCursorAdapter.LoyaltyCardListItemViewHolder> {
     private int mCurrentSelectedIndex = -1;
-    private Cursor mCursor;
     Settings mSettings;
     boolean mDarkModeEnabled;
-    private final Context mContext;
+    public final Context mContext;
     private final CardAdapterListener mListener;
     protected SparseBooleanArray mSelectedItems;
     protected SparseBooleanArray mAnimationItemsIndex;
     private boolean mReverseAllAnimations = false;
-    private boolean mShowDetails = true;
+    private boolean mShowDetails;
 
     public LoyaltyCardCursorAdapter(Context inputContext, Cursor inputCursor, CardAdapterListener inputListener) {
-        super(inputCursor);
+        super(inputCursor, DBHelper.LoyaltyCardDbIds.ID);
         setHasStableIds(true);
         mSettings = new Settings(inputContext);
         mContext = inputContext;
@@ -51,18 +54,30 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
 
         mDarkModeEnabled = Utils.isDarkModeEnabled(inputContext);
 
-        swapCursor(mCursor);
+        refreshState();
+
+        swapCursor(inputCursor);
     }
 
-    @Override
-    public void swapCursor(Cursor inputCursor) {
-        super.swapCursor(inputCursor);
-        mCursor = inputCursor;
+    public void refreshState() {
+        // Retrieve user details preference
+        SharedPreferences cardDetailsPref = mContext.getSharedPreferences(
+                mContext.getString(R.string.sharedpreference_card_details),
+                Context.MODE_PRIVATE);
+        mShowDetails = cardDetailsPref.getBoolean(mContext.getString(R.string.sharedpreference_card_details_show), true);
     }
 
     public void showDetails(boolean show) {
         mShowDetails = show;
         notifyDataSetChanged();
+
+        // Store in Shared Preference to restore next adapter launch
+        SharedPreferences cardDetailsPref = mContext.getSharedPreferences(
+                mContext.getString(R.string.sharedpreference_card_details),
+                Context.MODE_PRIVATE);
+        SharedPreferences.Editor cardDetailsPrefEditor = cardDetailsPref.edit();
+        cardDetailsPrefEditor.putBoolean(mContext.getString(R.string.sharedpreference_card_details_show), show);
+        cardDetailsPrefEditor.apply();
     }
 
     public boolean showingDetails() {
@@ -75,67 +90,37 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
         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);
 
-        int size = mSettings.getFontSizeMax(mSettings.getSmallFont());
-
-        if (mDarkModeEnabled) {
-            inputHolder.mStarIcon.setColorFilter(BlendModeColorFilterCompat.createBlendModeColorFilterCompat(Color.WHITE, BlendModeCompat.SRC_ATOP));
-        }
-
         LoyaltyCard loyaltyCard = LoyaltyCard.toLoyaltyCard(inputCursor);
 
-        inputHolder.mStoreField.setText(loyaltyCard.store);
-        inputHolder.mStoreField.setTextSize(mSettings.getFontSizeMax(mSettings.getMediumFont()));
+        inputHolder.setStoreField(loyaltyCard.store);
         if (mShowDetails && !loyaltyCard.note.isEmpty()) {
-            inputHolder.mNoteField.setVisibility(View.VISIBLE);
-            inputHolder.mNoteField.setText(loyaltyCard.note);
-            inputHolder.mNoteField.setTextSize(size);
+            inputHolder.setNoteField(loyaltyCard.note);
         } else {
-            inputHolder.mNoteField.setVisibility(View.GONE);
+            inputHolder.setNoteField(null);
         }
 
         if (mShowDetails && !loyaltyCard.balance.equals(new BigDecimal("0"))) {
-            int drawableSize = dpToPx((size * 24) / 14, mContext);
-            inputHolder.mDivider.setVisibility(View.VISIBLE);
-            inputHolder.mBalanceField.setVisibility(View.VISIBLE);
-            Drawable balanceIcon = inputHolder.mBalanceField.getCompoundDrawables()[0];
-            balanceIcon.setBounds(0, 0, drawableSize, drawableSize);
-            inputHolder.mBalanceField.setCompoundDrawablesRelative(balanceIcon, null, null, null);
-            if (mDarkModeEnabled) {
-                balanceIcon.setColorFilter(BlendModeColorFilterCompat.createBlendModeColorFilterCompat(Color.WHITE, BlendModeCompat.SRC_ATOP));
-            }
-            inputHolder.mBalanceField.setText(Utils.formatBalance(mContext, loyaltyCard.balance, loyaltyCard.balanceType));
-            inputHolder.mBalanceField.setTextSize(size);
+            inputHolder.setBalanceField(loyaltyCard.balance, loyaltyCard.balanceType);
         } else {
-            inputHolder.mBalanceField.setVisibility(View.GONE);
+            inputHolder.setBalanceField(null, null);
         }
 
         if (mShowDetails && loyaltyCard.expiry != null) {
-            int drawableSize = dpToPx((size * 24) / 14, mContext);
-            inputHolder.mDivider.setVisibility(View.VISIBLE);
-            inputHolder.mExpiryField.setVisibility(View.VISIBLE);
-            Drawable expiryIcon = inputHolder.mExpiryField.getCompoundDrawables()[0];
-            expiryIcon.setBounds(0, 0, drawableSize, drawableSize);
-            inputHolder.mExpiryField.setCompoundDrawablesRelative(expiryIcon, null, null, null);
-            if (Utils.hasExpired(loyaltyCard.expiry)) {
-                expiryIcon.setColorFilter(BlendModeColorFilterCompat.createBlendModeColorFilterCompat(Color.RED, BlendModeCompat.SRC_ATOP));
-                inputHolder.mExpiryField.setTextColor(Color.RED);
-            } else if (mDarkModeEnabled) {
-                expiryIcon.setColorFilter(BlendModeColorFilterCompat.createBlendModeColorFilterCompat(Color.WHITE, BlendModeCompat.SRC_ATOP));
-            }
-            inputHolder.mExpiryField.setText(DateFormat.getDateInstance(DateFormat.LONG).format(loyaltyCard.expiry));
-            inputHolder.mExpiryField.setTextSize(size);
+            inputHolder.setExpiryField(loyaltyCard.expiry);
         } else {
-            inputHolder.mExpiryField.setVisibility(View.GONE);
+            inputHolder.setExpiryField(null);
         }
 
+        setHeaderHeight(inputHolder, mShowDetails);
         Bitmap cardIcon = Utils.retrieveCardImage(mContext, loyaltyCard.id, ImageLocationType.icon);
         if (cardIcon != null) {
             inputHolder.mCardIcon.setImageBitmap(cardIcon);
@@ -144,9 +129,9 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
             inputHolder.mCardIcon.setImageBitmap(Utils.generateIcon(mContext, loyaltyCard.store, loyaltyCard.headerColor).getLetterTile());
             inputHolder.mCardIcon.setScaleType(ImageView.ScaleType.FIT_CENTER);
         }
-        inputHolder.mIconLayout.setBackgroundColor(loyaltyCard.headerColor != null ? loyaltyCard.headerColor : ContextCompat.getColor(mContext, R.color.colorPrimary));
+        inputHolder.setIconBackgroundColor(loyaltyCard.headerColor != null ? loyaltyCard.headerColor : R.attr.colorPrimary);
 
-        inputHolder.mStarIcon.setVisibility(loyaltyCard.starStatus != 0 ? View.VISIBLE : View.GONE);
+        inputHolder.toggleStar(loyaltyCard.starStatus != 0, itemSelected(inputCursor.getPosition()));
 
         inputHolder.itemView.setActivated(mSelectedItems.get(inputCursor.getPosition(), false));
         applyIconAnimation(inputHolder, inputCursor.getPosition());
@@ -156,6 +141,19 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
         inputHolder.mRow.requestLayout();
     }
 
+    private void setHeaderHeight(LoyaltyCardListItemViewHolder inputHolder, boolean expanded) {
+        int iconHeight;
+        if (expanded) {
+            iconHeight = ViewGroup.LayoutParams.MATCH_PARENT;
+        } else {
+            iconHeight = (int) mContext.getResources().getDimension(R.dimen.cardThumbnailSize);
+        }
+
+        inputHolder.mIconLayout.getLayoutParams().height = expanded ? 0 : iconHeight;
+        inputHolder.mCardIcon.getLayoutParams().height = iconHeight;
+        inputHolder.mTickIcon.getLayoutParams().height = iconHeight;
+    }
+
     private void applyClickEvents(LoyaltyCardListItemViewHolder inputHolder, final int inputPosition) {
         inputHolder.mRow.setOnClickListener(inputView -> mListener.onRowClicked(inputPosition));
 
@@ -166,38 +164,26 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
         });
     }
 
+    private boolean itemSelected(int inputPosition) {
+        return mSelectedItems.get(inputPosition, false);
+    }
+
     private void applyIconAnimation(LoyaltyCardListItemViewHolder inputHolder, int inputPosition) {
-        if (mSelectedItems.get(inputPosition, false)) {
+        if (itemSelected(inputPosition)) {
             inputHolder.mCardIcon.setVisibility(View.GONE);
-            resetIconYAxis(inputHolder.mTickIcon);
             inputHolder.mTickIcon.setVisibility(View.VISIBLE);
             if (mCurrentSelectedIndex == inputPosition) {
-                LoyaltyCardAnimator.flipView(mContext, inputHolder.mTickIcon, inputHolder.mCardIcon, true);
                 resetCurrentIndex();
             }
         } else {
             inputHolder.mTickIcon.setVisibility(View.GONE);
-            resetIconYAxis(inputHolder.mCardIcon);
             inputHolder.mCardIcon.setVisibility(View.VISIBLE);
             if ((mReverseAllAnimations && mAnimationItemsIndex.get(inputPosition, false)) || mCurrentSelectedIndex == inputPosition) {
-                LoyaltyCardAnimator.flipView(mContext, inputHolder.mTickIcon, inputHolder.mCardIcon, false);
                 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) {
         mCurrentSelectedIndex = inputPosition;
         if (mSelectedItems.get(inputPosition, false)) {
@@ -243,25 +229,30 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
         void onRowLongClicked(int inputPosition);
     }
 
-    public static class LoyaltyCardListItemViewHolder extends RecyclerView.ViewHolder {
+    public class LoyaltyCardListItemViewHolder extends RecyclerView.ViewHolder {
 
         public TextView mStoreField, mNoteField, mBalanceField, mExpiryField;
-        public ImageView mCardIcon, mStarIcon, mTickIcon;
-        public MaterialCardView mIconLayout, mRow;
+        public ImageView mCardIcon, mStarBackground, mStarBorder, mTickIcon;
+        public MaterialCardView mRow, mIconLayout;
+        public ConstraintLayout mStar;
         public View mDivider;
 
-        public LoyaltyCardListItemViewHolder(View inputView, CardAdapterListener inputListener) {
+        private int mIconBackgroundColor;
+
+        protected LoyaltyCardListItemViewHolder(View inputView, CardAdapterListener inputListener) {
             super(inputView);
             mRow = inputView.findViewById(R.id.row);
-            mIconLayout = inputView.findViewById(R.id.icon_layout);
             mDivider = inputView.findViewById(R.id.info_divider);
             mStoreField = inputView.findViewById(R.id.store);
             mNoteField = inputView.findViewById(R.id.note);
             mBalanceField = inputView.findViewById(R.id.balance);
             mExpiryField = inputView.findViewById(R.id.expiry);
 
+            mIconLayout = inputView.findViewById(R.id.icon_layout);
             mCardIcon = inputView.findViewById(R.id.thumbnail);
-            mStarIcon = inputView.findViewById(R.id.star);
+            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());
@@ -269,6 +260,101 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
                 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_white);
+                mStarBackground.setImageResource(R.drawable.ic_starred_black);
+            } else {
+                mStarBorder.setImageResource(R.drawable.ic_unstarred_black);
+                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) {

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

@@ -9,6 +9,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.content.res.TypedArray;
+import android.database.sqlite.SQLiteDatabase;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.Color;
@@ -35,6 +36,7 @@ import android.widget.Toast;
 
 import com.google.android.material.chip.Chip;
 import com.google.android.material.chip.ChipGroup;
+import com.google.android.material.color.MaterialColors;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.google.android.material.snackbar.Snackbar;
 import com.google.android.material.tabs.TabLayout;
@@ -67,12 +69,14 @@ import androidx.activity.result.contract.ActivityResultContracts;
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.widget.AppCompatTextView;
 import androidx.appcompat.widget.Toolbar;
 import androidx.core.content.ContextCompat;
 import androidx.core.content.FileProvider;
 import androidx.exifinterface.media.ExifInterface;
 import androidx.fragment.app.DialogFragment;
 import androidx.palette.graphics.Palette;
+
 import protect.card_locker.async.TaskHandler;
 
 public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
@@ -132,6 +136,8 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
 
     Button enterButton;
 
+    Toolbar toolbar;
+
     int loyaltyCardId;
     boolean updateLoyaltyCard;
     String cardId;
@@ -141,7 +147,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
 
     Uri importLoyaltyCardUri = null;
 
-    DBHelper db;
+    SQLiteDatabase mDatabase;
     ImportURIHelper importUriHelper;
 
     boolean hasChanged = false;
@@ -151,7 +157,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
     AlertDialog confirmExitDialog = null;
 
     boolean validBalance = true;
-    Runnable warnOnInvalidBarcodeType;
+    Runnable barcodeImageGenerationFinishedCallback;
 
     HashMap<String, Currency> currencies = new HashMap<>();
 
@@ -176,6 +182,16 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
 
     final private TaskHandler mTasks = new TaskHandler();
 
+    // store system locale for Build.VERSION.SDK_INT < Build.VERSION_CODES.N
+    private Locale mSystemLocale;
+
+    @Override
+    protected void attachBaseContext(Context base) {
+        // store system locale
+        mSystemLocale = Locale.getDefault();
+        super.attachBaseContext(base);
+    }
+
     private static LoyaltyCard updateTempState(LoyaltyCard loyaltyCard, LoyaltyCardField fieldName, Object value) {
         return new LoyaltyCard(
                 (int) (fieldName == LoyaltyCardField.id ? value : loyaltyCard.id),
@@ -196,6 +212,10 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
     private void updateTempState(LoyaltyCardField fieldName, Object value) {
         tempLoyaltyCard = updateTempState(tempLoyaltyCard, fieldName, value);
 
+        if (initDone && (fieldName == LoyaltyCardField.cardId || fieldName == LoyaltyCardField.barcodeId || fieldName == LoyaltyCardField.barcodeType)) {
+            generateBarcode();
+        }
+
         hasChanged = true;
     }
 
@@ -211,7 +231,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
 
         importLoyaltyCardUri = intent.getData();
 
-        Log.d(TAG, "View activity: id=" + loyaltyCardId
+        Log.d(TAG, "Edit activity: id=" + loyaltyCardId
                 + ", updateLoyaltyCard=" + updateLoyaltyCard);
     }
 
@@ -274,16 +294,17 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
         super.onCreate(savedInstanceState);
 
         setContentView(R.layout.loyalty_card_edit_activity);
-        Toolbar toolbar = findViewById(R.id.toolbar);
+        toolbar = findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
         ActionBar actionBar = getSupportActionBar();
         if (actionBar != null) {
             actionBar.setDisplayHomeAsUpEnabled(true);
         }
 
+        mDatabase = new DBHelper(this).getWritableDatabase();
+
         extractIntentFields(getIntent());
 
-        db = new DBHelper(this);
         importUriHelper = new ImportURIHelper(this);
 
         for (Currency currency : Currency.getAvailableCurrencies()) {
@@ -302,6 +323,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
         barcodeIdField = findViewById(R.id.barcodeIdField);
         barcodeTypeField = findViewById(R.id.barcodeTypeField);
         barcodeImage = findViewById(R.id.barcode);
+        barcodeImage.setClipToOutline(true);
         barcodeImageLayout = findViewById(R.id.barcodeLayout);
         barcodeCaptureLayout = findViewById(R.id.barcodeCaptureLayout);
         cardImageFrontHolder = findViewById(R.id.frontImageHolder);
@@ -310,11 +332,10 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
         cardImageBack = findViewById(R.id.backImage);
 
         enterButton = findViewById(R.id.enterButton);
-        cardImageFront.setBackgroundColor(getThemeColor());
-        cardImageBack.setBackgroundColor(getThemeColor());
 
-        warnOnInvalidBarcodeType = () -> {
+        barcodeImageGenerationFinishedCallback = () -> {
             if (!(boolean) barcodeImage.getTag()) {
+                barcodeImageLayout.setVisibility(View.GONE);
                 Toast.makeText(LoyaltyCardEditActivity.this, getString(R.string.wrongValueForBarcodeType), Toast.LENGTH_LONG).show();
             }
         };
@@ -426,16 +447,12 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
                     LocaleList locales = getApplicationContext().getResources().getConfiguration().getLocales();
 
-                    for (int i = locales.size() - 1; i > 0; i--) {
+                    for (int i = locales.size() - 1; i >= 0; i--) {
                         Locale locale = locales.get(i);
-                        String currencySymbol = Currency.getInstance(locale).getSymbol();
-                        currencyList.remove(currencySymbol);
-                        currencyList.add(0, currencySymbol);
+                        currencyPrioritizeLocaleSymbols(currencyList, locale);
                     }
                 } else {
-                    String currencySymbol = Currency.getInstance(getApplicationContext().getResources().getConfiguration().locale).getSymbol();
-                    currencyList.remove(currencySymbol);
-                    currencyList.add(0, currencySymbol);
+                    currencyPrioritizeLocaleSymbols(currencyList, mSystemLocale);
                 }
 
                 currencyList.add(0, getString(R.string.points));
@@ -511,8 +528,6 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
                 } else {
                     updateTempState(LoyaltyCardField.barcodeId, s.toString());
                 }
-
-                generateOrHideBarcode();
             }
 
             @Override
@@ -543,8 +558,6 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
                         } catch (IllegalArgumentException e) {
                         }
                     }
-
-                    generateOrHideBarcode();
                 }
             }
 
@@ -656,7 +669,6 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
         });
 
         mCropperOptions = new UCrop.Options();
-        setCropperTheme();
     }
 
     // ucrop 2.2.6 initial aspect ratio is glitched when 0x0 is used as the initial ratio option
@@ -676,13 +688,24 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
                 new AspectRatio(getResources().getString(R.string.ucrop_label_original).toUpperCase(), sourceWidth, sourceHeight),
                 new AspectRatio(getResources().getString(R.string.card).toUpperCase(), 85.6f, 53.98f)
         );
-    }
 
-    private void setCropperTheme() {
-        mCropperOptions.setToolbarColor(ContextCompat.getColor(this, R.color.colorPrimary));
-        mCropperOptions.setStatusBarColor(ContextCompat.getColor(this, R.color.colorPrimaryDark));
-        mCropperOptions.setToolbarWidgetColor(Color.WHITE);
-        mCropperOptions.setActiveControlsWidgetColor(ContextCompat.getColor(this, R.color.colorPrimary));
+        // Fix theming
+
+        int colorPrimary = MaterialColors.getColor(this, R.attr.colorPrimary, ContextCompat.getColor(this, R.color.md_theme_light_primary));
+        int colorOnPrimary = MaterialColors.getColor(this, R.attr.colorOnPrimary, ContextCompat.getColor(this, R.color.md_theme_light_onPrimary));
+        int colorSurface = MaterialColors.getColor(this, R.attr.colorSurface, ContextCompat.getColor(this, R.color.md_theme_light_surface));
+        int colorOnSurface = MaterialColors.getColor(this, R.attr.colorOnSurface, ContextCompat.getColor(this, R.color.md_theme_light_onSurface));
+        int colorBackground = MaterialColors.getColor(this, android.R.attr.colorBackground, ContextCompat.getColor(this, R.color.md_theme_light_onSurface));
+        mCropperOptions.setToolbarColor(colorSurface);
+        mCropperOptions.setStatusBarColor(colorSurface);
+        mCropperOptions.setToolbarWidgetColor(colorOnSurface);
+        mCropperOptions.setRootViewBackgroundColor(colorBackground);
+        // set tool tip to be the darker of primary color
+        if (Utils.isDarkModeEnabled(this)) {
+            mCropperOptions.setActiveControlsWidgetColor(colorOnPrimary);
+        } else {
+            mCropperOptions.setActiveControlsWidgetColor(colorPrimary);
+        }
     }
 
     @Override
@@ -729,7 +752,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
 
         if (tempLoyaltyCard == null) {
             if (updateLoyaltyCard) {
-                tempLoyaltyCard = db.getLoyaltyCard(loyaltyCardId);
+                tempLoyaltyCard = DBHelper.getLoyaltyCard(mDatabase, loyaltyCardId);
                 if (tempLoyaltyCard == null) {
                     Log.w(TAG, "Could not lookup loyalty card " + loyaltyCardId);
                     Toast.makeText(this, R.string.noCardExistsError, Toast.LENGTH_LONG).show();
@@ -792,9 +815,9 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
         barcodeTypeField.setText(tempLoyaltyCard.barcodeType != null ? tempLoyaltyCard.barcodeType.prettyName() : getString(R.string.noBarcode));
 
         if (groupsChips.getChildCount() == 0) {
-            List<Group> existingGroups = db.getGroups();
+            List<Group> existingGroups = DBHelper.getGroups(mDatabase);
 
-            List<Group> loyaltyCardGroups = db.getLoyaltyCardGroups(loyaltyCardId);
+            List<Group> loyaltyCardGroups = DBHelper.getLoyaltyCardGroups(mDatabase, loyaltyCardId);
 
             if (existingGroups.isEmpty()) {
                 groupsChips.setVisibility(View.GONE);
@@ -802,7 +825,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
                 groupsChips.setVisibility(View.VISIBLE);
             }
 
-            for (Group group : db.getGroups()) {
+            for (Group group : DBHelper.getGroups(mDatabase)) {
                 Chip chip = (Chip) getLayoutInflater().inflate(R.layout.layout_chip_choice, groupsChips, false);
                 chip.setText(group._id);
                 chip.setTag(group);
@@ -832,10 +855,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
         // Generate random header color
         if (tempLoyaltyCard.headerColor == null) {
             // Select a random color to start out with.
-            TypedArray colors = getResources().obtainTypedArray(R.array.letter_tile_colors);
-            final int color = (int) (Math.random() * colors.length());
-            updateTempState(LoyaltyCardField.headerColor, colors.getColor(color, Color.BLACK));
-            colors.recycle();
+            updateTempState(LoyaltyCardField.headerColor, Utils.getRandomHeaderColor(this));
         }
 
         // It can't be null because we set it in updateTempState but SpotBugs insists it can be
@@ -876,7 +896,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
             hasChanged = hadChanges;
         }
 
-        generateOrHideBarcode();
+        generateBarcode();
 
         enterButton.setOnClickListener(new EditCardIdAndBarcode());
         barcodeImage.setOnClickListener(new EditCardIdAndBarcode());
@@ -896,7 +916,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
     protected void setColorFromIcon() {
         Object icon = thumbnail.getTag();
         if (icon != null && (icon instanceof Bitmap)) {
-            updateTempState(LoyaltyCardField.headerColor, new Palette.Builder((Bitmap) icon).generate().getDominantColor(tempLoyaltyCard.headerColor != null ? tempLoyaltyCard.headerColor : ContextCompat.getColor(this, R.color.colorPrimary)));
+            updateTempState(LoyaltyCardField.headerColor, Utils.getHeaderColorFromImage((Bitmap) icon, tempLoyaltyCard.headerColor != null ? tempLoyaltyCard.headerColor : R.attr.colorPrimary));
         } else {
             Log.d("setColorFromIcon", "attempting header color change from icon but icon does not exist");
         }
@@ -1230,6 +1250,11 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
     }
 
     private void doSave() {
+        if (isFinishing()) {
+            // If we are done saving, ignore any queued up save button presses
+            return;
+        }
+
         if (tempStoredOldBarcodeValue != null) {
             askBarcodeChange(this::doSave);
             return;
@@ -1258,7 +1283,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
         }
 
         if (updateLoyaltyCard) {   //update of "starStatus" not necessary, since it cannot be changed in this activity (only in ViewActivity)
-            db.updateLoyaltyCard(loyaltyCardId, tempLoyaltyCard.store, tempLoyaltyCard.note, tempLoyaltyCard.expiry, tempLoyaltyCard.balance, tempLoyaltyCard.balanceType, tempLoyaltyCard.cardId, tempLoyaltyCard.barcodeId, tempLoyaltyCard.barcodeType, tempLoyaltyCard.headerColor);
+            DBHelper.updateLoyaltyCard(mDatabase, loyaltyCardId, tempLoyaltyCard.store, tempLoyaltyCard.note, tempLoyaltyCard.expiry, tempLoyaltyCard.balance, tempLoyaltyCard.balanceType, tempLoyaltyCard.cardId, tempLoyaltyCard.barcodeId, tempLoyaltyCard.barcodeType, tempLoyaltyCard.headerColor);
             try {
                 Utils.saveCardImage(this, (Bitmap) cardImageFront.getTag(), loyaltyCardId, ImageLocationType.front);
                 Utils.saveCardImage(this, (Bitmap) cardImageBack.getTag(), loyaltyCardId, ImageLocationType.back);
@@ -1268,7 +1293,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
             }
             Log.i(TAG, "Updated " + loyaltyCardId + " to " + cardId);
         } else {
-            loyaltyCardId = (int) db.insertLoyaltyCard(tempLoyaltyCard.store, tempLoyaltyCard.note, tempLoyaltyCard.expiry, tempLoyaltyCard.balance, tempLoyaltyCard.balanceType, tempLoyaltyCard.cardId, tempLoyaltyCard.barcodeId, tempLoyaltyCard.barcodeType, tempLoyaltyCard.headerColor, 0, tempLoyaltyCard.lastUsed);
+            loyaltyCardId = (int) DBHelper.insertLoyaltyCard(mDatabase, tempLoyaltyCard.store, tempLoyaltyCard.note, tempLoyaltyCard.expiry, tempLoyaltyCard.balance, tempLoyaltyCard.balanceType, tempLoyaltyCard.cardId, tempLoyaltyCard.barcodeId, tempLoyaltyCard.barcodeType, tempLoyaltyCard.headerColor, 0, tempLoyaltyCard.lastUsed);
             try {
                 Utils.saveCardImage(this, (Bitmap) cardImageFront.getTag(), loyaltyCardId, ImageLocationType.front);
                 Utils.saveCardImage(this, (Bitmap) cardImageBack.getTag(), loyaltyCardId, ImageLocationType.back);
@@ -1278,9 +1303,9 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
             }
         }
 
-        db.setLoyaltyCardGroups(loyaltyCardId, selectedGroups);
+        DBHelper.setLoyaltyCardGroups(mDatabase, loyaltyCardId, selectedGroups);
 
-        ShortcutHelper.updateShortcuts(this, db.getLoyaltyCard(loyaltyCardId));
+        ShortcutHelper.updateShortcuts(this, DBHelper.getLoyaltyCard(mDatabase, loyaltyCardId));
 
         finish();
     }
@@ -1312,8 +1337,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
                 builder.setPositiveButton(R.string.confirm, (dialog, which) -> {
                     Log.e(TAG, "Deleting card: " + loyaltyCardId);
 
-                    DBHelper db = new DBHelper(LoyaltyCardEditActivity.this);
-                    db.deleteLoyaltyCard(loyaltyCardId);
+                    DBHelper.deleteLoyaltyCard(mDatabase, LoyaltyCardEditActivity.this, loyaltyCardId);
 
                     ShortcutHelper.removeShortcut(LoyaltyCardEditActivity.this, loyaltyCardId);
 
@@ -1377,36 +1401,40 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
                 }
             }
         }
-        mCropperLauncher.launch(
-                UCrop.of(
-                        sourceUri,
-                        destUri
-                ).withOptions(mCropperOptions)
-                        .getIntent(this)
-        );
+        Intent ucropIntent = UCrop.of(
+                sourceUri,
+                destUri
+        ).withOptions(mCropperOptions)
+                .getIntent(this);
+        ucropIntent.setClass(this, UCropWrapper.class);
+        for (int i = 0; i < toolbar.getChildCount(); i++) {
+            // send toolbar font details to ucrop wrapper
+            View child = toolbar.getChildAt(i);
+            if (child instanceof AppCompatTextView) {
+                AppCompatTextView childTextView = (AppCompatTextView) child;
+                ucropIntent.putExtra(UCropWrapper.UCROP_TOOLBAR_TYPEFACE_STYLE, childTextView.getTypeface().getStyle());
+                break;
+            }
+        }
+        mCropperLauncher.launch(ucropIntent);
     }
 
-    private void showBarcode() {
-        barcodeImageLayout.setVisibility(View.VISIBLE);
-    }
+    private void generateBarcode() {
+        if (tempLoyaltyCard == null) {
+            return;
+        }
 
-    private void hideBarcode() {
-        barcodeImageLayout.setVisibility(View.GONE);
-    }
+        mTasks.flushTaskList(TaskHandler.TYPE.BARCODE, true, false, false);
 
-    private void generateOrHideBarcode() {
         String cardIdString = tempLoyaltyCard.barcodeId != null ? tempLoyaltyCard.barcodeId : tempLoyaltyCard.cardId;
         CatimaBarcode barcodeFormat = tempLoyaltyCard.barcodeType;
 
-        if (barcodeFormat == null || cardIdString.isEmpty() || !barcodeFormat.isSupported()) {
-            hideBarcode();
-        } else {
-            generateBarcode(cardIdString, barcodeFormat);
+        if (cardIdString == null || barcodeFormat == null) {
+            barcodeImageLayout.setVisibility(View.GONE);
+            return;
         }
-    }
 
-    private void generateBarcode(String cardIdString, CatimaBarcode barcodeFormat) {
-        mTasks.flushTaskList(TaskHandler.TYPE.BARCODE, true, false, false);
+        barcodeImageLayout.setVisibility(View.VISIBLE);
 
         if (barcodeImage.getHeight() == 0) {
             Log.d(TAG, "ImageView size is not known known at start, waiting for load");
@@ -1419,17 +1447,15 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
                             barcodeImage.getViewTreeObserver().removeOnGlobalLayoutListener(this);
 
                             Log.d(TAG, "ImageView size now known");
-                            BarcodeImageWriterTask barcodeWriter = new BarcodeImageWriterTask(getApplicationContext(), barcodeImage, cardIdString, barcodeFormat, null, false, warnOnInvalidBarcodeType);
+                            BarcodeImageWriterTask barcodeWriter = new BarcodeImageWriterTask(getApplicationContext(), barcodeImage, cardIdString, barcodeFormat, null, false, barcodeImageGenerationFinishedCallback, true);
                             mTasks.executeTask(TaskHandler.TYPE.BARCODE, barcodeWriter);
                         }
                     });
         } else {
             Log.d(TAG, "ImageView size known known, creating barcode");
-            BarcodeImageWriterTask barcodeWriter = new BarcodeImageWriterTask(getApplicationContext(), barcodeImage, cardIdString, barcodeFormat, null, false, warnOnInvalidBarcodeType);
+            BarcodeImageWriterTask barcodeWriter = new BarcodeImageWriterTask(getApplicationContext(), barcodeImage, cardIdString, barcodeFormat, null, false, barcodeImageGenerationFinishedCallback, true);
             mTasks.executeTask(TaskHandler.TYPE.BARCODE, barcodeWriter);
         }
-
-        showBarcode();
     }
 
     private void generateIcon(String store) {
@@ -1459,32 +1485,36 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
         }
 
         View cardPart = findViewById(R.id.cardPart);
-        View barcodePart = findViewById(R.id.barcodePart);
+        View optionsPart = findViewById(R.id.optionsPart);
         View picturesPart = findViewById(R.id.picturesPart);
 
         if (getString(R.string.card).equals(part)) {
             cardPart.setVisibility(View.VISIBLE);
-            barcodePart.setVisibility(View.GONE);
-            picturesPart.setVisibility(View.GONE);
-
-            // Explicitly hide barcode (fixes blurriness on redraw)
-            hideBarcode();
-        } else if (getString(R.string.barcode).equals(part)) {
-            cardPart.setVisibility(View.GONE);
-            barcodePart.setVisibility(View.VISIBLE);
+            optionsPart.setVisibility(View.GONE);
             picturesPart.setVisibility(View.GONE);
 
             // Redraw barcode due to size change (Visibility.GONE sets it to 0)
-            generateOrHideBarcode();
+            generateBarcode();
+        } else if (getString(R.string.options).equals(part)) {
+            cardPart.setVisibility(View.GONE);
+            optionsPart.setVisibility(View.VISIBLE);
+            picturesPart.setVisibility(View.GONE);
         } else if (getString(R.string.photos).equals(part)) {
             cardPart.setVisibility(View.GONE);
-            barcodePart.setVisibility(View.GONE);
+            optionsPart.setVisibility(View.GONE);
             picturesPart.setVisibility(View.VISIBLE);
-
-            // Explicitly hide barcode (fixes blurriness on redraw)
-            hideBarcode();
         } else {
             throw new UnsupportedOperationException();
         }
     }
+
+    private void currencyPrioritizeLocaleSymbols(ArrayList<String> currencyList, Locale locale) {
+        try {
+            String currencySymbol = Currency.getInstance(locale).getSymbol();
+            currencyList.remove(currencySymbol);
+            currencyList.add(0, currencySymbol);
+        } catch (IllegalArgumentException e) {
+            Log.d(TAG, "Could not get currency data for locale info: " + e);
+        }
+    }
 }

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

@@ -3,6 +3,9 @@ package protect.card_locker;
 import android.app.Application;
 
 import androidx.appcompat.app.AppCompatDelegate;
+
+import com.google.android.material.color.DynamicColors;
+
 import protect.card_locker.preferences.Settings;
 
 public class LoyaltyCardLockerApplication extends Application {

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

@@ -2,7 +2,9 @@ package protect.card_locker;
 
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
+import android.content.res.ColorStateList;
 import android.content.res.Configuration;
+import android.database.sqlite.SQLiteDatabase;
 import android.graphics.Bitmap;
 import android.graphics.Color;
 import android.graphics.Outline;
@@ -31,6 +33,7 @@ import android.widget.Toast;
 
 import com.google.android.material.appbar.AppBarLayout;
 import com.google.android.material.bottomsheet.BottomSheetBehavior;
+import com.google.android.material.color.MaterialColors;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 
 import java.io.UnsupportedEncodingException;
@@ -45,9 +48,11 @@ import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.content.res.AppCompatResources;
 import androidx.appcompat.widget.AppCompatTextView;
 import androidx.appcompat.widget.Toolbar;
+import androidx.constraintlayout.widget.ConstraintLayout;
 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;
@@ -61,6 +66,7 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
     private GestureDetector mGestureDetector;
 
     CoordinatorLayout coordinatorLayout;
+    ConstraintLayout mainLayout;
     TextView cardIdFieldView;
     BottomSheetBehavior behavior;
     LinearLayout bottomSheet;
@@ -83,7 +89,7 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
     int loyaltyCardId;
     LoyaltyCard loyaltyCard;
     boolean rotationEnabled;
-    DBHelper db;
+    SQLiteDatabase database;
     ImportURIHelper importURIHelper;
     Settings settings;
 
@@ -116,6 +122,7 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
     private final int HEADER_FILTER_ALPHA = 127;
 
     final private TaskHandler mTasks = new TaskHandler();
+    Runnable barcodeImageGenerationFinishedCallback;
 
     @Override
     public boolean onDown(MotionEvent e) {
@@ -256,10 +263,11 @@ 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);
+        mainLayout = findViewById(R.id.mainLayout);
         cardIdFieldView = findViewById(R.id.cardIdView);
         bottomSheet = findViewById(R.id.bottom_sheet);
         bottomSheetContentWrapper = findViewById(R.id.bottomSheetContentWrapper);
@@ -271,6 +279,7 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
         storeName = findViewById(R.id.storeName);
         maximizeButton = findViewById(R.id.maximizeButton);
         mainImage = findViewById(R.id.mainImage);
+        mainImage.setClipToOutline(true);
         dotIndicator = findViewById(R.id.dotIndicator);
         minimizeButton = findViewById(R.id.minimizeButton);
         collapsingToolbarLayout = findViewById(R.id.collapsingToolbarLayout);
@@ -278,11 +287,21 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
         iconImage = findViewById(R.id.icon_image);
         landscapeToolbar = findViewById(R.id.toolbar_landscape);
 
+        barcodeImageGenerationFinishedCallback = () -> {
+            if (!(boolean) mainImage.getTag()) {
+                mainImage.setVisibility(View.GONE);
+                imageTypes.remove(ImageType.BARCODE);
+
+                // Redraw UI
+                setDotIndicator(Utils.isDarkModeEnabled(LoyaltyCardViewActivity.this));
+                setFullscreen(isFullscreen);
+
+                Toast.makeText(LoyaltyCardViewActivity.this, getString(R.string.wrongValueForBarcodeType), Toast.LENGTH_LONG).show();
+            }
+        };
+
         centerGuideline = findViewById(R.id.centerGuideline);
         barcodeScaler = findViewById(R.id.barcodeScaler);
-        maximizeButton.setBackgroundColor(getThemeColor());
-        minimizeButton.setBackgroundColor(getThemeColor());
-        bottomSheetButton.setBackgroundColor(getThemeColor());
         barcodeScaler.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
             @Override
             public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
@@ -296,11 +315,11 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
                 Log.d(TAG, "Scaling to " + scale);
 
                 loyaltyCard.zoomLevel = progress;
-                db.updateLoyaltyCardZoomLevel(loyaltyCardId, loyaltyCard.zoomLevel);
+                DBHelper.updateLoyaltyCardZoomLevel(database, loyaltyCardId, loyaltyCard.zoomLevel);
 
                 setCenterGuideline(loyaltyCard.zoomLevel);
 
-                drawMainImage(mainImageIndex, true);
+                drawMainImage(mainImageIndex, true, isFullscreen);
             }
 
             @Override
@@ -377,9 +396,13 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
             editButton.hide();
         } else if (newState == BottomSheetBehavior.STATE_EXPANDED) {
             bottomSheetButton.setImageResource(R.drawable.ic_baseline_arrow_drop_down_24);
+            bottomSheetButton.setContentDescription(getString(R.string.hideMoreInfo));
+            mainLayout.setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_NO_HIDE_DESCENDANTS);
             editButton.hide();
         } else if (newState == BottomSheetBehavior.STATE_COLLAPSED) {
             bottomSheetButton.setImageResource(R.drawable.ic_baseline_arrow_drop_up_24);
+            bottomSheetButton.setContentDescription(getString(R.string.showMoreInfo));
+            mainLayout.setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_AUTO);
             if (!isFullscreen) {
                 editButton.show();
             }
@@ -392,7 +415,7 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
 
     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()) {
+        if (appBarLayout.getHeight() != 0 && 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())
@@ -465,7 +488,7 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
             window.setAttributes(attributes);
         }
 
-        loyaltyCard = db.getLoyaltyCard(loyaltyCardId);
+        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();
@@ -492,7 +515,7 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
             noteView.setVisibility(View.GONE);
         }
 
-        List<Group> loyaltyCardGroups = db.getLoyaltyCardGroups(loyaltyCardId);
+        List<Group> loyaltyCardGroups = DBHelper.getLoyaltyCardGroups(database, loyaltyCardId);
 
         if (loyaltyCardGroups.size() > 0) {
             List<String> groupNames = new ArrayList<>();
@@ -521,7 +544,7 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
             int expiryString = R.string.expiryStateSentence;
             if (Utils.hasExpired(loyaltyCard.expiry)) {
                 expiryString = R.string.expiryStateSentenceExpired;
-                expiryView.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.alert));
+                expiryView.setTextColor(Color.RED);
             }
             expiryView.setText(getString(expiryString, DateFormat.getDateInstance(DateFormat.LONG).format(loyaltyCard.expiry)));
             expiryView.setTextSize(settings.getFontSizeMax(settings.getMediumFont()));
@@ -559,6 +582,30 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
         storeName.setTextColor(textColor);
         landscapeToolbar.setTitleTextColor(textColor);
 
+        // Also apply colours to UI elements
+        int darkenedColor = ColorUtils.blendARGB(backgroundHeaderColor, Color.BLACK, 0.1f);
+        barcodeScaler.setProgressTintList(ColorStateList.valueOf(darkenedColor));
+        barcodeScaler.setThumbTintList(ColorStateList.valueOf(darkenedColor));
+        maximizeButton.setBackgroundColor(darkenedColor);
+        minimizeButton.setBackgroundColor(darkenedColor);
+        bottomSheetButton.setBackgroundColor(darkenedColor);
+        maximizeButton.setColorFilter(textColor);
+        minimizeButton.setColorFilter(textColor);
+        bottomSheetButton.setColorFilter(textColor);
+        int complementaryColor = Utils.getComplementaryColor(darkenedColor);
+        editButton.setBackgroundTintList(ColorStateList.valueOf(complementaryColor));
+        Drawable editButtonIcon = editButton.getDrawable();
+        editButtonIcon.mutate();
+        int colorPrimary = MaterialColors.getColor(this, R.attr.colorPrimary, ContextCompat.getColor(this, R.color.md_theme_light_primary));
+        int colorOnPrimary = MaterialColors.getColor(this, R.attr.colorOnPrimary, ContextCompat.getColor(this, R.color.md_theme_light_onPrimary));
+        boolean darkMode = Utils.isDarkModeEnabled(this);
+        if (Utils.needsDarkForeground(complementaryColor)) {
+            editButtonIcon.setTint(darkMode ? colorOnPrimary : colorPrimary);
+        } else {
+            editButtonIcon.setTint(darkMode ? colorPrimary : colorOnPrimary);
+        }
+        editButton.setImageDrawable(editButtonIcon);
+
         Bitmap icon = Utils.retrieveCardImage(this, loyaltyCard.id, ImageLocationType.icon);
         if (icon != null) {
             int backgroundAlphaColor = Utils.needsDarkForeground(backgroundHeaderColor) ? Color.WHITE : Color.BLACK;
@@ -583,8 +630,11 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
         // Make notification area light if dark icons are needed
         if (Build.VERSION.SDK_INT >= 23) {
             window.getDecorView().setSystemUiVisibility(backgroundNeedsDarkIcons ? View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR : 0);
+            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);
@@ -613,30 +663,14 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
             imageTypes.add(ImageType.IMAGE_BACK);
         }
 
-        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, darkMode));
-
-                LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT);
-                params.setMargins(8, 0, 8, 0);
-
-                dotIndicator.addView(dots[i], params);
-            }
-
-            dotIndicator.setVisibility(View.VISIBLE);
-        }
+        setDotIndicator(darkMode);
 
         setFullscreen(isFullscreen);
 
         // restore bottomSheet UI states from changing orientation
         changeUiToBottomSheetState(bottomSheetState);
 
-        db.updateLoyaltyCardLastUsed(loyaltyCard.id);
+        DBHelper.updateLoyaltyCardLastUsed(database, loyaltyCard.id);
     }
 
     @Override
@@ -661,7 +695,7 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
             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));
@@ -712,7 +746,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;
         }
@@ -773,7 +807,7 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
         }
     }
 
-    private void drawBarcode() {
+    private void drawBarcode(boolean addPadding) {
         mTasks.flushTaskList(TaskHandler.TYPE.BARCODE, true, false, false);
         if (format != null) {
             BarcodeImageWriterTask barcodeWriter = new BarcodeImageWriterTask(
@@ -783,12 +817,13 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
                     format,
                     null,
                     false,
-                    null);
+                    barcodeImageGenerationFinishedCallback,
+                    addPadding);
             mTasks.executeTask(TaskHandler.TYPE.BARCODE, barcodeWriter);
         }
     }
 
-    private void redrawBarcodeAfterResize() {
+    private void redrawBarcodeAfterResize(boolean addPadding) {
         if (format != null) {
             mainImage.getViewTreeObserver().addOnGlobalLayoutListener(
                     new ViewTreeObserver.OnGlobalLayoutListener() {
@@ -797,13 +832,13 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
                             mainImage.getViewTreeObserver().removeOnGlobalLayoutListener(this);
 
                             Log.d(TAG, "ImageView size now known");
-                            drawBarcode();
+                            drawBarcode(addPadding);
                         }
                     });
         }
     }
 
-    private void drawMainImage(int index, boolean waitForResize) {
+    private void drawMainImage(int index, boolean waitForResize, boolean isFullscreen) {
         if (imageTypes.isEmpty()) {
             mainImage.setVisibility(View.GONE);
             return;
@@ -819,18 +854,28 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
         ImageType wantedImageType = imageTypes.get(index);
 
         if (wantedImageType == ImageType.BARCODE) {
-            if (waitForResize) {
-                redrawBarcodeAfterResize();
+            // Use border in non-fullscreen mode
+            if (!isFullscreen) {
+                mainImage.setBackground(AppCompatResources.getDrawable(this, R.drawable.round_outline));
             } else {
-                drawBarcode();
+                mainImage.setBackgroundColor(Color.WHITE);
             }
-            mainImage.setBackgroundColor(Color.WHITE);
+
+            if (waitForResize) {
+                redrawBarcodeAfterResize(!isFullscreen);
+            } else {
+                drawBarcode(!isFullscreen);
+            }
+
+            mainImage.setContentDescription(getString(R.string.barcodeImageDescriptionWithType, format.prettyName()));
         } else if (wantedImageType == ImageType.IMAGE_FRONT) {
             mainImage.setImageBitmap(frontImageBitmap);
             mainImage.setBackgroundColor(Color.TRANSPARENT);
+            mainImage.setContentDescription(getString(R.string.frontImageDescription));
         } else if (wantedImageType == ImageType.IMAGE_BACK) {
             mainImage.setImageBitmap(backImageBitmap);
             mainImage.setBackgroundColor(Color.TRANSPARENT);
+            mainImage.setContentDescription(getString(R.string.backImageDescription));
         } else {
             throw new IllegalArgumentException("Unknown image type: " + wantedImageType);
         }
@@ -851,7 +896,26 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
 
         mainImageIndex = newIndex;
 
-        drawMainImage(newIndex, false);
+        drawMainImage(newIndex, false, isFullscreen);
+    }
+
+    private void setDotIndicator(boolean darkMode) {
+        dotIndicator.removeAllViews();
+        if (imageTypes.size() >= 2) {
+            dots = new ImageView[imageTypes.size()];
+
+            for (int i = 0; i < imageTypes.size(); i++) {
+                dots[i] = new ImageView(this);
+                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);
+
+                dotIndicator.addView(dots[i], params);
+            }
+
+            dotIndicator.setVisibility(View.VISIBLE);
+        }
     }
 
     /**
@@ -867,7 +931,7 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
         if (enabled && !imageTypes.isEmpty()) {
             Log.d(TAG, "Move into fullscreen");
 
-            drawMainImage(mainImageIndex, true);
+            drawMainImage(mainImageIndex, true, isFullscreen);
 
             barcodeScaler.setProgress(loyaltyCard.zoomLevel);
             setCenterGuideline(loyaltyCard.zoomLevel);
@@ -888,6 +952,7 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
             // Or the barcode will be centered instead of on top of the screen
             // Don't ask me why...
             appBarLayout.setVisibility(View.INVISIBLE);
+            iconImage.setVisibility(View.INVISIBLE);
             collapsingToolbarLayout.setVisibility(View.GONE);
             landscapeToolbar.setVisibility(View.GONE);
 
@@ -912,7 +977,7 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
             // Reset center guideline
             setCenterGuideline(100);
 
-            drawMainImage(mainImageIndex, true);
+            drawMainImage(mainImageIndex, true, isFullscreen);
 
             // Show maximize and hide minimize button and scaler
             maximizeButton.setVisibility(imageTypes.isEmpty() ? View.GONE : View.VISIBLE);
@@ -929,6 +994,7 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
             // And restore 24dp paddingTop for appBarLayout
             appBarLayout.setVisibility(View.VISIBLE);
             setupOrientation();
+            iconImage.setVisibility(View.VISIBLE);
 
             // Show other UI elements
             cardIdFieldView.setVisibility(View.VISIBLE);

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

@@ -1,13 +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.database.Cursor;
 import android.database.CursorIndexOutOfBoundsException;
+import android.database.sqlite.SQLiteDatabase;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.GestureDetector;
@@ -18,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;
 
@@ -26,22 +36,18 @@ 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.splashscreen.SplashScreen;
-import androidx.recyclerview.widget.RecyclerView;
 import protect.card_locker.preferences.SettingsActivity;
 
 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;
+    private int mLoyaltyCardCount = 0;
     protected String mFilter = "";
     protected Object mGroup = null;
     protected DBHelper.LoyaltyCardOrder mOrder = DBHelper.LoyaltyCardOrder.Alpha;
@@ -52,6 +58,9 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
     private View mNoMatchingCardsText;
     private View mNoGroupCardsText;
 
+    private ActivityResultLauncher<Intent> mBarcodeScannerLauncher;
+    private ActivityResultLauncher<Intent> mSettingsLauncher;
+
     private ActionMode.Callback mCurrentActionModeCallback = new ActionMode.Callback() {
         @Override
         public boolean onCreateActionMode(ActionMode inputMode, Menu inputMenu) {
@@ -132,12 +141,10 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
                 }
 
                 builder.setPositiveButton(R.string.confirm, (dialog, which) -> {
-                    DBHelper db = new DBHelper(MainActivity.this);
-
                     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);
                     }
@@ -145,7 +152,7 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
                     TabLayout.Tab tab = ((TabLayout) findViewById(R.id.groups)).getTabAt(selectedTab);
                     mGroup = tab != null ? tab.getTag() : null;
 
-                    updateLoyaltyCardList();
+                    updateLoyaltyCardList(true);
 
                     dialog.dismiss();
                 });
@@ -163,12 +170,6 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
         public void onDestroyActionMode(ActionMode inputMode) {
             mAdapter.clearSelections();
             mCurrentActionMode = null;
-            mCardList.post(new Runnable() {
-                @Override
-                public void run() {
-                    mAdapter.resetAnimationIndex();
-                }
-            });
         }
     };
 
@@ -177,10 +178,14 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
         super.onCreate(inputSavedInstanceState);
         SplashScreen.installSplashScreen(this);
         setTitle(R.string.app_name);
+        // XXX color patching has to be done again after setting splash screen
+        Utils.patchColors(this);
         setContentView(R.layout.main_activity);
         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
@@ -188,7 +193,7 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
                 selectedTab = tab.getPosition();
                 Log.d("onTabSelected", "Tab Position " + tab.getPosition());
                 mGroup = tab.getTag();
-                updateLoyaltyCardList();
+                updateLoyaltyCardList(false);
                 // Store active tab in Shared Preference to restore next app launch
                 SharedPreferences activeTabPref = getApplicationContext().getSharedPreferences(
                         getString(R.string.sharedpreference_active_tab),
@@ -228,7 +233,7 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
         registerForContextMenu(mCardList);
 
         mGroup = null;
-        updateLoyaltyCardList();
+        updateLoyaltyCardList(true);
 
         /*
          * This was added for Huawei, but Huawei is just too much of a fucking pain.
@@ -260,23 +265,48 @@ 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() {
         super.onResume();
 
+        mAdapter.refreshState();
+
         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
@@ -309,7 +339,7 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
             assert tab != null;
             mGroup = tab.getTag();
         }
-        updateLoyaltyCardList();
+        updateLoyaltyCardList(true);
         // End of active tab logic
 
         FloatingActionButton addButton = findViewById(R.id.fabAdd);
@@ -320,72 +350,52 @@ 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();
-            }
-            updateLoyaltyCardList();
-
-            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;
-            }
+        if (!mSearchView.isIconified()) {
+            mSearchView.setIconified(true);
+            return;
         }
 
         super.onBackPressed();
     }
 
-    private void updateLoyaltyCardList() {
+    private void displayCardSetupOptions(Menu menu, boolean shouldShow) {
+        for (int id : new int[]{R.id.action_search, R.id.action_unfold, R.id.action_sort}) {
+            menu.findItem(id).setVisible(shouldShow);
+        }
+    }
+
+    private void updateLoyaltyCardCount() {
+        mLoyaltyCardCount = DBHelper.getLoyaltyCardCount(mDatabase);
+    }
+
+    private void updateLoyaltyCardList(boolean updateCount) {
         Group group = null;
         if (mGroup != null) {
             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 (updateCount) {
+            updateLoyaltyCardCount();
+            // Update menu icons if necessary
+            invalidateOptionsMenu();
+        }
+
+        if (mLoyaltyCardCount > 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) {
                 mCardList.setVisibility(View.VISIBLE);
                 mNoMatchingCardsText.setVisibility(View.GONE);
@@ -404,6 +414,7 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
         } else {
             mCardList.setVisibility(View.GONE);
             mHelpText.setVisibility(View.VISIBLE);
+
             mNoMatchingCardsText.setVisibility(View.GONE);
             mNoGroupCardsText.setVisibility(View.GONE);
         }
@@ -414,9 +425,7 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
     }
 
     public void updateTabGroups(TabLayout groupsTabLayout) {
-        final DBHelper db = new DBHelper(this);
-
-        List<Group> newGroups = db.getGroups();
+        List<Group> newGroups = DBHelper.getGroups(mDatabase);
 
         if (newGroups.size() == 0) {
             groupsTabLayout.removeAllTabs();
@@ -443,22 +452,23 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
 
     @Override
     public boolean onCreateOptionsMenu(Menu inputMenu) {
-        this.mMenu = inputMenu;
-
         getMenuInflater().inflate(R.menu.main_menu, inputMenu);
 
+        Utils.updateMenuCardDetailsButtonState(inputMenu.findItem(R.id.action_unfold), mAdapter.showingDetails());
+        displayCardSetupOptions(inputMenu, mLoyaltyCardCount > 0);
+
         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);
+            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) {
                     return false;
@@ -472,7 +482,7 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
                     TabLayout.Tab currentTab = groupsTabLayout.getTabAt(groupsTabLayout.getSelectedTabPosition());
                     mGroup = currentTab != null ? currentTab.getTag() : null;
 
-                    updateLoyaltyCardList();
+                    updateLoyaltyCardList(false);
 
                     return true;
                 }
@@ -486,23 +496,13 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
         int id = inputItem.getItemId();
 
         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);
+            mAdapter.showDetails(!mAdapter.showingDetails());
+            invalidateOptionsMenu();
 
             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());
             for (int i = 0; i < loyaltyCardOrders.size(); i++) {
@@ -542,25 +542,25 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
 
         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) {
             Intent i = new Intent(getApplicationContext(), ImportExportActivity.class);
-            startActivityForResult(i, Utils.MAIN_REQUEST);
+            startActivity(i);
             return true;
         }
 
         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) {
             Intent i = new Intent(getApplicationContext(), AboutActivity.class);
-            startActivityForResult(i, Utils.MAIN_REQUEST);
+            startActivity(i);
             return true;
         }
 
@@ -582,7 +582,7 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
         sortPrefEditor.apply();
 
         // Update card list
-        updateLoyaltyCardList();
+        updateLoyaltyCardList(false);
     }
 
     @Override
@@ -702,8 +702,6 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
         if (mAdapter.getSelectedItemCount() > 0) {
             enableActionMode(inputPosition);
         } else {
-            Cursor selected = mAdapter.getCursor();
-            selected.moveToPosition(inputPosition);
             // FIXME
             //
             // There is a really nasty edge case that can happen when someone taps a card but right
@@ -714,7 +712,7 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
             // click is being processed. Sadly, I have not yet found a way to make that possible.
             LoyaltyCard loyaltyCard;
             try {
-                loyaltyCard = LoyaltyCard.toLoyaltyCard(selected);
+                loyaltyCard = mAdapter.getCard(inputPosition);
             } catch (CursorIndexOutOfBoundsException e) {
                 Log.w(TAG, "Prevented crash from tap + swipe on ID " + inputPosition + ": " + e);
                 return;
@@ -728,7 +726,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

@@ -1,11 +1,13 @@
 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.Menu;
+import android.view.MenuItem;
 import android.view.View;
 import android.widget.EditText;
 import android.widget.TextView;
@@ -25,7 +27,7 @@ import androidx.recyclerview.widget.RecyclerView;
 
 public class ManageGroupActivity extends CatimaAppCompatActivity implements ManageGroupCursorAdapter.CardAdapterListener {
 
-    private final DBHelper mDB = new DBHelper(this);
+    private SQLiteDatabase mDatabase;
     private ManageGroupCursorAdapter mAdapter;
 
     private final String SAVE_INSTANCE_ADAPTER_STATE = "adapterState";
@@ -45,6 +47,8 @@ public class ManageGroupActivity extends CatimaAppCompatActivity implements Mana
         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);
@@ -70,7 +74,7 @@ public class ManageGroupActivity extends CatimaAppCompatActivity implements Mana
                     return;
                 }
                 if (!mGroup._id.equals(currentGroupName)) {
-                    if (mDB.getGroup(currentGroupName) != null) {
+                    if (DBHelper.getGroup(mDatabase, currentGroupName) != null) {
                         mGroupNameNotInUse = false;
                         mGroupNameText.setError(getResources().getText(R.string.group_name_already_in_use));
                     } else {
@@ -86,7 +90,7 @@ public class ManageGroupActivity extends CatimaAppCompatActivity implements Mana
             throw (new IllegalArgumentException("this activity expects a group loaded into it's intent"));
         }
         Log.d("groupId", "groupId: " + groupId);
-        mGroup = mDB.getGroup(groupId);
+        mGroup = DBHelper.getGroup(mDatabase, groupId);
         if (mGroup == null) {
             throw (new IllegalArgumentException("cannot load group " + groupId + " from database"));
         }
@@ -123,7 +127,7 @@ public class ManageGroupActivity extends CatimaAppCompatActivity implements Mana
 
             mAdapter.commitToDatabase();
             if (!currentGroupName.equals(mGroup._id)) {
-                mDB.updateGroup(mGroup._id, currentGroupName);
+                DBHelper.updateGroup(mDatabase, mGroup._id, currentGroupName);
             }
             Toast.makeText(getApplicationContext(), R.string.group_updated, Toast.LENGTH_SHORT).show();
             finish();
@@ -153,6 +157,26 @@ public class ManageGroupActivity extends CatimaAppCompatActivity implements Mana
         return ret;
     }
 
+    @Override
+    public boolean onCreateOptionsMenu(Menu inputMenu) {
+        getMenuInflater().inflate(R.menu.card_details_menu, inputMenu);
+        Utils.updateMenuCardDetailsButtonState(inputMenu.findItem(R.id.action_unfold), mAdapter.showingDetails());
+        return super.onCreateOptionsMenu(inputMenu);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem inputItem) {
+        int id = inputItem.getItemId();
+
+        if (id == R.id.action_unfold) {
+            mAdapter.showDetails(!mAdapter.showingDetails());
+            invalidateOptionsMenu();
+
+            return true;
+        }
+
+        return super.onOptionsItemSelected(inputItem);
+    }
 
     @Override
     protected void onSaveInstanceState(@NonNull Bundle outState) {
@@ -163,9 +187,9 @@ public class ManageGroupActivity extends CatimaAppCompatActivity implements Mana
     }
 
     private void updateLoyaltyCardList() {
-        mAdapter.swapCursor(mDB.getLoyaltyCardCursor());
+        mAdapter.swapCursor(DBHelper.getLoyaltyCardCursor(mDatabase));
 
-        if (mAdapter.getCountFromCursor() == 0) {
+        if (mAdapter.getItemCount() == 0) {
             mCardList.setVisibility(View.GONE);
             mHelpText.setVisibility(View.VISIBLE);
         } else {
@@ -205,7 +229,7 @@ public class ManageGroupActivity extends CatimaAppCompatActivity implements Mana
 
     @Override
     public void onRowLongClicked(int inputPosition) {
-        // do nothing for now
+        mAdapter.toggleSelection(inputPosition);
     }
 
     @Override

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

@@ -2,24 +2,27 @@ 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;
 
+import androidx.recyclerview.widget.RecyclerView;
+
 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 DBHelper mDb;
+    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<>();
-        mDb = new DBHelper(inputContext);
+        mDatabase = new DBHelper(inputContext).getWritableDatabase();
     }
 
     @Override
@@ -47,7 +50,7 @@ public class ManageGroupCursorAdapter extends LoyaltyCardCursorAdapter {
         if (cache != null) {
             return cache;
         }
-        List<Group> groups = mDb.getLoyaltyCardGroups(cardId);
+        List<Group> groups = DBHelper.getLoyaltyCardGroups(mDatabase, cardId);
         mGetGroupCache.put(cardId, groups);
         return groups;
     }
@@ -94,7 +97,7 @@ public class ManageGroupCursorAdapter extends LoyaltyCardCursorAdapter {
             } else {
                 groups.remove(mGroup);
             }
-            mDb.setLoyaltyCardGroups(cardId, groups);
+            DBHelper.setLoyaltyCardGroups(mDatabase, cardId, groups);
         }
     }
 
@@ -105,8 +108,4 @@ public class ManageGroupCursorAdapter extends LoyaltyCardCursorAdapter {
     public HashMap<Integer, Boolean> exportInGroupState() {
         return new HashMap<>(mInGroupOverlay);
     }
-
-    public int getCountFromCursor() {
-        return super.getCursor().getCount();
-    }
 }

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

@@ -3,6 +3,7 @@ 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;
@@ -26,7 +27,7 @@ import androidx.recyclerview.widget.RecyclerView;
 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;
@@ -42,6 +43,8 @@ public class ManageGroupsActivity extends CatimaAppCompatActivity implements Gro
         if (actionBar != null) {
             actionBar.setDisplayHomeAsUpEnabled(true);
         }
+
+        mDatabase = new DBHelper(this).getWritableDatabase();
     }
 
     @Override
@@ -72,9 +75,9 @@ public class ManageGroupsActivity extends CatimaAppCompatActivity implements Gro
     }
 
     private void updateGroupList() {
-        mAdapter.swapCursor(mDb.getGroupCursor());
+        mAdapter.swapCursor(DBHelper.getGroupCursor(mDatabase));
 
-        if (mDb.getGroupCount() == 0) {
+        if (DBHelper.getGroupCount(mDatabase) == 0) {
             mGroupList.setVisibility(View.GONE);
             mHelpText.setVisibility(View.VISIBLE);
 
@@ -106,7 +109,7 @@ 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);
         builder.setTitle(R.string.enter_group_name);
         final EditText input = new EditText(this);
         input.setInputType(InputType.TYPE_CLASS_TEXT);
@@ -118,11 +121,11 @@ public class ManageGroupsActivity extends CatimaAppCompatActivity implements Gro
                 Toast.makeText(getApplicationContext(), R.string.group_name_is_empty, Toast.LENGTH_SHORT).show();
                 return;
             }
-            if (mDb.getGroup(inputString) != null) {
+            if (DBHelper.getGroup(mDatabase, inputString) != null) {
                 Toast.makeText(getApplicationContext(), R.string.group_name_already_in_use, Toast.LENGTH_SHORT).show();
                 return;
             }
-            mDb.insertGroup(inputString);
+            DBHelper.insertGroup(mDatabase, inputString);
             updateGroupList();
         });
         builder.setNegativeButton(getString(R.string.cancel), (dialog, which) -> dialog.cancel());
@@ -138,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
@@ -160,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();
@@ -195,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/ScanActivity.java

@@ -20,6 +20,8 @@ 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;
 
@@ -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;
@@ -60,6 +66,8 @@ public class ScanActivity extends CatimaAppCompatActivity {
 
         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);
 
@@ -159,8 +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;
@@ -193,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,6 +2,7 @@ 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;
@@ -45,7 +46,7 @@ class ShortcutHelper {
     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);
 
@@ -88,7 +89,7 @@ class ShortcutHelper {
         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)

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

@@ -0,0 +1,79 @@
+package protect.card_locker;
+
+import android.content.Intent;
+import android.graphics.Color;
+import android.graphics.Typeface;
+import android.graphics.drawable.Drawable;
+import android.os.Build;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.FrameLayout;
+import android.widget.LinearLayout;
+
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.AppCompatImageView;
+import androidx.core.content.ContextCompat;
+import androidx.core.graphics.ColorUtils;
+
+import com.google.android.material.color.MaterialColors;
+import com.google.android.material.textview.MaterialTextView;
+import com.yalantis.ucrop.UCropActivity;
+
+public class UCropWrapper extends UCropActivity {
+    public static final String UCROP_TOOLBAR_TYPEFACE_STYLE = "ucop_toolbar_typeface_style";
+
+    @Override
+    protected void onPostCreate(@Nullable Bundle savedInstanceState) {
+        super.onPostCreate(savedInstanceState);
+        boolean darkMode = Utils.isDarkModeEnabled(this);
+        // setup status bar to look like the rest of the app
+        if (Build.VERSION.SDK_INT >= 23) {
+            getWindow().getDecorView().setSystemUiVisibility(darkMode ? 0 : View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
+        } else {
+            // icons are always white back then
+            if (!darkMode) {
+                getWindow().setStatusBarColor(ColorUtils.compositeColors(Color.argb(127, 0, 0, 0), getWindow().getStatusBarColor()));
+            }
+        }
+
+        // find and check views that we wish to color modify
+        // for when we update ucrop or switch to another cropper
+        View check = findViewById(com.yalantis.ucrop.R.id.wrapper_controls);
+        if (check instanceof FrameLayout) {
+            FrameLayout controls = (FrameLayout) check;
+            check = findViewById(com.yalantis.ucrop.R.id.wrapper_states);
+            if (check instanceof LinearLayout) {
+                LinearLayout states = (LinearLayout) check;
+                for (int i = 0; i < controls.getChildCount(); i++) {
+                    check = controls.getChildAt(i);
+                    if (check instanceof AppCompatImageView) {
+                        AppCompatImageView controlsBackgroundImage = (AppCompatImageView) check;
+                        // everything gathered and are as expected, now perform color patching
+                        Utils.patchColors(this);
+                        int colorSurface = MaterialColors.getColor(this, R.attr.colorSurface, ContextCompat.getColor(this, R.color.md_theme_light_surface));
+                        int colorOnSurface = MaterialColors.getColor(this, R.attr.colorOnSurface, ContextCompat.getColor(this, R.color.md_theme_light_onSurface));
+
+                        Drawable controlsBackgroundImageDrawable = controlsBackgroundImage.getBackground();
+                        controlsBackgroundImageDrawable.mutate();
+                        controlsBackgroundImageDrawable.setTint(darkMode ? colorOnSurface : colorSurface);
+                        controlsBackgroundImage.setBackgroundDrawable(controlsBackgroundImageDrawable);
+
+                        states.setBackgroundColor(darkMode ? colorSurface : colorOnSurface);
+                        break;
+                    }
+                }
+            }
+        }
+
+        // change toolbar font
+        check = findViewById(com.yalantis.ucrop.R.id.toolbar_title);
+        if (check instanceof MaterialTextView) {
+            MaterialTextView toolbarTextview = (MaterialTextView) check;
+            Intent intent = getIntent();
+            int style = intent.getIntExtra(UCROP_TOOLBAR_TYPEFACE_STYLE, -1);
+            if (style != -1) {
+                toolbarTextview.setTypeface(Typeface.defaultFromStyle(style));
+            }
+        }
+    }
+}

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

@@ -5,6 +5,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.res.Configuration;
 import android.content.res.Resources;
+import android.content.res.TypedArray;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.Color;
@@ -14,8 +15,12 @@ import android.os.Build;
 import android.os.LocaleList;
 import android.provider.MediaStore;
 import android.util.Log;
+import android.util.TypedValue;
+import android.view.Menu;
+import android.view.MenuItem;
 import android.widget.Toast;
 
+import com.google.android.material.color.DynamicColors;
 import com.google.zxing.BinaryBitmap;
 import com.google.zxing.LuminanceSource;
 import com.google.zxing.MultiFormatReader;
@@ -39,9 +44,12 @@ import java.util.GregorianCalendar;
 import java.util.Locale;
 import java.util.Map;
 
+import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.app.AppCompatDelegate;
 import androidx.core.graphics.ColorUtils;
 import androidx.exifinterface.media.ExifInterface;
+
+import androidx.palette.graphics.Palette;
 import protect.card_locker.preferences.Settings;
 
 public class Utils {
@@ -84,7 +92,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);
@@ -206,7 +214,7 @@ public class Utils {
 
         if (currency == null) {
             numberFormat.setMaximumFractionDigits(0);
-            return context.getString(R.string.balancePoints, numberFormat.format(value));
+            return context.getResources().getQuantityString(R.plurals.balancePoints, value.intValue(), numberFormat.format(value));
         }
 
         NumberFormat currencyFormat = NumberFormat.getCurrencyInstance();
@@ -448,4 +456,82 @@ public class Utils {
         return loadImage(context.getCacheDir() + "/" + name);
     }
 
+    // https://stackoverflow.com/a/59324801/8378787
+    public static int getComplementaryColor(int color) {
+        int R = color & 255;
+        int G = (color >> 8) & 255;
+        int B = (color >> 16) & 255;
+        int A = (color >> 24) & 255;
+        R = 255 - R;
+        G = 255 - G;
+        B = 255 - B;
+        return R + (G << 8) + (B << 16) + (A << 24);
+    }
+
+    // replace colors in the current theme
+    public static void patchColors(AppCompatActivity activity) {
+        Settings settings = new Settings(activity);
+        String color = settings.getColor();
+
+        Resources.Theme theme = activity.getTheme();
+        Resources resources = activity.getResources();
+        if (color.equals(resources.getString(R.string.settings_key_pink_theme))) {
+            theme.applyStyle(R.style.pink, true);
+        } else if (color.equals(resources.getString(R.string.settings_key_magenta_theme))) {
+            theme.applyStyle(R.style.magenta, true);
+        } else if (color.equals(resources.getString(R.string.settings_key_violet_theme))) {
+            theme.applyStyle(R.style.violet, true);
+        } else if (color.equals(resources.getString(R.string.settings_key_blue_theme))) {
+            theme.applyStyle(R.style.blue, true);
+        } else if (color.equals(resources.getString(R.string.settings_key_sky_blue_theme))) {
+            theme.applyStyle(R.style.skyblue, true);
+        } else if (color.equals(resources.getString(R.string.settings_key_green_theme))) {
+            theme.applyStyle(R.style.green, true);
+        } else if (color.equals(resources.getString(R.string.settings_key_brown_theme))) {
+            theme.applyStyle(R.style.brown, true);
+        } else if (color.equals(resources.getString(R.string.settings_key_catima_theme))) {
+            // catima theme is AppTheme itself, no dynamic colors nor applyStyle
+        } else {
+            // final catch all in case of invalid theme value from older versions
+            // also handles R.string.settings_key_system_theme
+            DynamicColors.applyIfAvailable(activity);
+        }
+
+        if (isDarkModeEnabled(activity) && settings.getOledDark()) {
+            theme.applyStyle(R.style.DarkBackground, true);
+        }
+    }
+
+    // XXX android 9 and below has issues with patched theme where the background becomes a
+    // rendering mess
+    // use after views are inflated
+    public static void postPatchColors(AppCompatActivity activity) {
+        TypedValue typedValue = new TypedValue();
+        activity.getTheme().resolveAttribute(android.R.attr.colorBackground, typedValue, true);
+        activity.findViewById(android.R.id.content).setBackgroundColor(typedValue.data);
+    }
+
+    public static void updateMenuCardDetailsButtonState(MenuItem item, boolean currentlyExpanded) {
+        if (currentlyExpanded) {
+            item.setIcon(R.drawable.ic_baseline_unfold_less_24);
+            item.setTitle(R.string.action_hide_details);
+        } else {
+            item.setIcon(R.drawable.ic_baseline_unfold_more_24);
+            item.setTitle(R.string.action_show_details);
+        }
+    }
+
+    public static int getHeaderColorFromImage(Bitmap image, int fallback) {
+        if (image == null) {
+            return fallback;
+        }
+
+        return new Palette.Builder(image).generate().getDominantColor(R.attr.colorPrimary);
+    }
+
+    public static int getRandomHeaderColor(Context context) {
+        TypedArray colors = context.getResources().obtainTypedArray(R.array.letter_tile_colors);
+        final int color = (int) (Math.random() * colors.length());
+        return colors.getColor(color, Color.BLACK);
+    }
 }

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

@@ -2,6 +2,7 @@ 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;
@@ -31,7 +32,7 @@ import protect.card_locker.Utils;
  * format.
  */
 public class CatimaExporter implements Exporter {
-    public void exportData(Context context, DBHelper db, OutputStream output, char[] password) throws IOException, InterruptedException {
+    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];
@@ -48,7 +49,7 @@ public class CatimaExporter implements Exporter {
         // 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 = createZipParameters("catima.csv", password);
@@ -60,7 +61,7 @@ public class CatimaExporter implements Exporter {
         zipOutputStream.closeEntry();
 
         // Loop over all cards again
-        Cursor cardCursor = db.getLoyaltyCardCursor();
+        Cursor cardCursor = DBHelper.getLoyaltyCardCursor(database);
         while (cardCursor.moveToNext()) {
             // For each card
             LoyaltyCard card = LoyaltyCard.toLoyaltyCard(cardCursor);
@@ -94,7 +95,7 @@ public class CatimaExporter implements Exporter {
         return zipParameters;
     }
 
-    private void writeCSV(DBHelper db, OutputStreamWriter output) throws IOException, InterruptedException {
+    private void writeCSV(SQLiteDatabase database, OutputStreamWriter output) throws IOException, InterruptedException {
         CSVPrinter printer = new CSVPrinter(output, CSVFormat.RFC4180);
 
         // Print the version
@@ -105,7 +106,7 @@ 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()) {
             Group group = Group.toGroup(groupCursor);
@@ -136,7 +137,7 @@ 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()) {
             LoyaltyCard card = LoyaltyCard.toLoyaltyCard(cardCursor);
@@ -168,12 +169,12 @@ 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()) {
             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);
             }
 

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

@@ -40,7 +40,7 @@ import protect.card_locker.ZipUtils;
  * 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 void importData(Context context, SQLiteDatabase database, InputStream input, char[] password) throws IOException, FormatException, InterruptedException {
         InputStream bufferedInputStream = new BufferedInputStream(input);
         bufferedInputStream.mark(100);
 
@@ -55,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 {
@@ -66,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);
@@ -87,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));
@@ -99,15 +99,12 @@ public class CatimaImporter implements Importer {
         bufferedReader.close();
     }
 
-    public void parseV1(Context context, DBHelper db, BufferedReader input) throws IOException, FormatException, InterruptedException {
+    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, db, record);
+                importLoyaltyCard(context, database, record);
 
                 if (Thread.currentThread().isInterrupted()) {
                     throw new InterruptedException();
@@ -115,19 +112,12 @@ public class CatimaImporter implements Importer {
             }
 
             parser.close();
-            database.setTransactionSuccessful();
         } 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 = "";
 
@@ -145,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
@@ -153,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
@@ -161,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
@@ -185,16 +175,12 @@ 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.builder().setHeader().build());
 
@@ -215,11 +201,11 @@ 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.builder().setHeader().build());
 
@@ -240,11 +226,11 @@ 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.builder().setHeader().build());
 
@@ -265,7 +251,7 @@ public class CatimaImporter implements Importer {
         }
 
         for (CSVRecord record : records) {
-            importCardGroupMapping(database, db, record);
+            importCardGroupMapping(database, record);
         }
     }
 
@@ -273,7 +259,7 @@ 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)
+    private void importLoyaltyCard(Context context, SQLiteDatabase database, CSVRecord record)
             throws IOException, FormatException {
         int id = CSVHelpers.extractInt(DBHelper.LoyaltyCardDbIds.ID, record, false);
 
@@ -343,31 +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/Exporter.java

@@ -1,12 +1,11 @@
 package protect.card_locker.importexport;
 
 import android.content.Context;
+import android.database.sqlite.SQLiteDatabase;
 
 import java.io.IOException;
 import java.io.OutputStream;
 
-import protect.card_locker.DBHelper;
-
 /**
  * Interface for a class which can export the contents of the database
  * in a given format.
@@ -17,5 +16,5 @@ public interface Exporter {
      *
      * @throws IOException
      */
-    void exportData(Context context, DBHelper db, OutputStream output, char[] password) 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

@@ -21,6 +21,7 @@ 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)
@@ -30,7 +31,7 @@ import protect.card_locker.FormatException;
  * 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 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);
 
@@ -52,14 +53,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.builder().setDelimiter(';').setHeader().build());
 
         try {
             for (CSVRecord record : fidmeParser) {
-                importLoyaltyCard(database, db, record);
+                importLoyaltyCard(context, database, record);
 
                 if (Thread.currentThread().isInterrupted()) {
                     throw new InterruptedException();
@@ -71,10 +69,6 @@ public class FidmeImporter implements Importer {
             fidmeParser.close();
         }
 
-        database.setTransactionSuccessful();
-        database.endTransaction();
-        database.close();
-
         zipInputStream.close();
     }
 
@@ -82,8 +76,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(Context context, SQLiteDatabase database, CSVRecord record)
+            throws FormatException {
         // A loyalty card export from Fidme contains the following fields:
         // Retailer (store name)
         // Program (program name)
@@ -124,11 +118,12 @@ public class FidmeImporter implements Importer {
         // TODO: Hook this into our own loyalty card DB if we ever get one
         CatimaBarcode barcodeType = null;
 
-        // No favourite data in the export either
+        // No favourite data or colour in the export either
         int starStatus = 0;
+        int headerColor = Utils.getRandomHeaderColor(context);
 
         // 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, headerColor, starStatus, null);
     }
 }

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

@@ -1,7 +1,23 @@
 package protect.card_locker.importexport;
 
-public enum ImportExportResult {
-    Success,
-    GenericFailure,
-    BadPassword;
+public class ImportExportResult {
+    private ImportExportResultType resultType;
+    private String developerDetails;
+
+    public ImportExportResult(ImportExportResultType resultType) {
+        this(resultType, null);
+    }
+
+    public ImportExportResult(ImportExportResultType resultType, String developerDetails) {
+        this.resultType = resultType;
+        this.developerDetails = developerDetails;
+    }
+
+    public ImportExportResultType resultType() {
+        return resultType;
+    }
+
+    public String developerDetails() {
+        return developerDetails;
+    }
 }

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

@@ -0,0 +1,7 @@
+package protect.card_locker.importexport;
+
+public enum ImportExportResultType {
+    Success,
+    GenericFailure,
+    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,7 +9,6 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.text.ParseException;
 
-import protect.card_locker.DBHelper;
 import protect.card_locker.FormatException;
 
 /**
@@ -23,5 +23,5 @@ public interface Importer {
      * @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,13 +1,12 @@
 package protect.card_locker.importexport;
 
 import android.content.Context;
+import android.database.sqlite.SQLiteDatabase;
 import android.util.Log;
 
 import java.io.IOException;
 import java.io.OutputStream;
 
-import protect.card_locker.DBHelper;
-
 public class MultiFormatExporter {
     private static final String TAG = "Catima";
 
@@ -21,7 +20,7 @@ public class MultiFormatExporter {
      * 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, char[] password) {
+    public static ImportExportResult exportData(Context context, SQLiteDatabase database, OutputStream output, DataFormat format, char[] password) {
         Exporter exporter = null;
 
         switch (format) {
@@ -33,20 +32,20 @@ public class MultiFormatExporter {
                 break;
         }
 
+        String error;
         if (exporter != null) {
             try {
-                exporter.exportData(context, db, output, password);
-                return ImportExportResult.Success;
-            } catch (IOException e) {
-                Log.e(TAG, "Failed to export data", e);
-            } catch (InterruptedException e) {
+                exporter.exportData(context, database, output, password);
+                return new ImportExportResult(ImportExportResultType.Success);
+            } catch (Exception e) {
                 Log.e(TAG, "Failed to export data", e);
+                error = e.toString();
             }
-
-            return ImportExportResult.GenericFailure;
         } else {
-            Log.e(TAG, "Unsupported data format exported: " + format.name());
-            return ImportExportResult.GenericFailure;
+            error = "Unsupported data format exported: " + format.name();
+            Log.e(TAG, error);
         }
+
+        return new ImportExportResult(ImportExportResultType.GenericFailure, error);
     }
 }

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;
@@ -11,7 +12,6 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.text.ParseException;
 
-import protect.card_locker.DBHelper;
 import protect.card_locker.FormatException;
 
 public class MultiFormatImporter {
@@ -28,7 +28,7 @@ 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) {
@@ -46,20 +46,26 @@ public class MultiFormatImporter {
                 break;
         }
 
+        String error = null;
         if (importer != null) {
+            database.beginTransaction();
             try {
-                importer.importData(context, db, input, password);
-                return ImportExportResult.Success;
+                importer.importData(context, database, input, password);
+                database.setTransactionSuccessful();
+                return new ImportExportResult(ImportExportResultType.Success);
             } catch (ZipException e) {
-                return ImportExportResult.BadPassword;
-            } catch (IOException | FormatException | InterruptedException | JSONException | ParseException | NullPointerException e) {
+                return new ImportExportResult(ImportExportResultType.BadPassword);
+            } catch (Exception e) {
                 Log.e(TAG, "Failed to import data", e);
+                error = e.toString();
+            } finally {
+                database.endTransaction();
             }
-
         } else {
-            Log.e(TAG, "Unsupported data format imported: " + format.name());
+            error = "Unsupported data format imported: " + format.name();
+            Log.e(TAG, error);
         }
 
-        return ImportExportResult.GenericFailure;
+        return new ImportExportResult(ImportExportResultType.GenericFailure, error);
     }
 }

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

@@ -3,6 +3,7 @@ package protect.card_locker.importexport;
 import android.content.Context;
 import android.database.sqlite.SQLiteDatabase;
 import android.graphics.Bitmap;
+import android.util.Log;
 
 import com.google.zxing.BarcodeFormat;
 
@@ -39,15 +40,17 @@ import protect.card_locker.ZipUtils;
  * 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 {
+    private static final String TAG = "Catima";
+
+    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<>();
+        HashMap<String, HashMap<String, Object>> providers = new HashMap<>();
 
         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) {
-                HashMap<String, String> recordData = new HashMap<>();
+                HashMap<String, Object> recordData = new HashMap<>();
                 recordData.put("name", record.get("name"));
                 recordData.put("barcodeFormat", record.get("barcodeFormat"));
 
@@ -62,6 +65,8 @@ public class StocardImporter implements Importer {
         ZipInputStream zipInputStream = new ZipInputStream(input, password);
 
         String[] providersFileName = null;
+        String[] customProvidersBaseName = null;
+        String customProviderId = "";
         String[] cardBaseName = null;
         String cardName = "";
         LocalFileHeader localFileHeader;
@@ -78,6 +83,14 @@ public class StocardImporter implements Importer {
                         nameParts[0],
                         "analytics-properties.json"
                 };
+                customProvidersBaseName = new String[]{
+                        nameParts[0],
+                        "sync",
+                        "data",
+                        "users",
+                        nameParts[0],
+                        "loyalty-card-custom-providers"
+                };
                 cardBaseName = new String[]{
                         nameParts[0],
                         "sync",
@@ -88,6 +101,33 @@ public class StocardImporter implements Importer {
                 };
             }
 
+            if (startsWith(nameParts, customProvidersBaseName, 1)) {
+                // Extract providerId
+                customProviderId = nameParts[customProvidersBaseName.length].split("\\.", 2)[0];
+
+                // Name file
+                if (nameParts.length == customProvidersBaseName.length + 1) {
+                    // Ignore the .txt file
+                    if (fileName.endsWith(".json")) {
+                        JSONObject jsonObject = ZipUtils.readJSON(zipInputStream);
+
+                        providers = appendToHashMap(
+                                providers,
+                                customProviderId,
+                                "name",
+                                jsonObject.getString("name")
+                        );
+                    }
+                } else if (fileName.endsWith("logo.png")) {
+                    providers = appendToHashMap(
+                            providers,
+                            customProviderId,
+                            "logo",
+                            ZipUtils.readImage(zipInputStream)
+                    );
+                }
+            }
+
             if (startsWith(nameParts, cardBaseName, 1)) {
                 // Extract cardName
                 cardName = nameParts[cardBaseName.length].split("\\.", 2)[0];
@@ -98,24 +138,33 @@ public class StocardImporter implements Importer {
                     if (fileName.endsWith(".json")) {
                         JSONObject jsonObject = ZipUtils.readJSON(zipInputStream);
 
-                        loyaltyCardHashMap = appendToLoyaltyCardHashMap(
+                        loyaltyCardHashMap = appendToHashMap(
                                 loyaltyCardHashMap,
                                 cardName,
                                 "cardId",
                                 jsonObject.getString("input_id")
                         );
-                        loyaltyCardHashMap = appendToLoyaltyCardHashMap(
+
+                        // Provider ID can be either custom or not, extract whatever version is relevant
+                        String customProviderPrefix = "/users/" + nameParts[0] + "/loyalty-card-custom-providers/";
+                        String providerId = jsonObject
+                                .getJSONObject("input_provider_reference")
+                                .getString("identifier");
+                        if (providerId.startsWith(customProviderPrefix)) {
+                            providerId = providerId.substring(customProviderPrefix.length());
+                        } else {
+                            providerId = providerId.substring("/loyalty-card-providers/".length());
+                        }
+
+                        loyaltyCardHashMap = appendToHashMap(
                                 loyaltyCardHashMap,
                                 cardName,
                                 "_providerId",
-                                jsonObject
-                                        .getJSONObject("input_provider_reference")
-                                        .getString("identifier")
-                                        .substring("/loyalty-card-providers/".length())
+                                providerId
                         );
 
                         if (jsonObject.has("input_barcode_format")) {
-                            loyaltyCardHashMap = appendToLoyaltyCardHashMap(
+                            loyaltyCardHashMap = appendToHashMap(
                                     loyaltyCardHashMap,
                                     cardName,
                                     "barcodeType",
@@ -124,7 +173,7 @@ public class StocardImporter implements Importer {
                         }
                     }
                 } else if (fileName.endsWith("notes/default.json")) {
-                    loyaltyCardHashMap = appendToLoyaltyCardHashMap(
+                    loyaltyCardHashMap = appendToHashMap(
                             loyaltyCardHashMap,
                             cardName,
                             "note",
@@ -132,14 +181,14 @@ public class StocardImporter implements Importer {
                                     .getString("content")
                     );
                 } else if (fileName.endsWith("/images/front.png")) {
-                    loyaltyCardHashMap = appendToLoyaltyCardHashMap(
+                    loyaltyCardHashMap = appendToHashMap(
                             loyaltyCardHashMap,
                             cardName,
                             "frontImage",
                             ZipUtils.readImage(zipInputStream)
                     );
                 } else if (fileName.endsWith("/images/back.png")) {
-                    loyaltyCardHashMap = appendToLoyaltyCardHashMap(
+                    loyaltyCardHashMap = appendToHashMap(
                             loyaltyCardHashMap,
                             cardName,
                             "backImage",
@@ -153,27 +202,43 @@ 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);
 
-            String store = providerData != null ? providerData.get("name") : providerId;
+            if (providerId == null) {
+                Log.d(TAG, "Missing providerId for card " + loyaltyCardData + ", ignoring...");
+                continue;
+            }
+
+            HashMap<String, Object> providerData = providers.get(providerId);
+
+            String store = providerData != null ? providerData.get("name").toString() : providerId;
             String note = (String) Utils.mapGetOrDefault(loyaltyCardData, "note", "");
             String cardId = (String) loyaltyCardData.get("cardId");
             String barcodeTypeString = (String) Utils.mapGetOrDefault(loyaltyCardData, "barcodeType", providerData != null ? providerData.get("barcodeFormat") : null);
             CatimaBarcode barcodeType = null;
-            if (barcodeTypeString != null) {
+            if (barcodeTypeString != null && !barcodeTypeString.isEmpty()) {
                 if (barcodeTypeString.equals("RSS_DATABAR_EXPANDED")) {
                     barcodeType = CatimaBarcode.fromBarcode(BarcodeFormat.RSS_EXPANDED);
+                } else if (barcodeTypeString.equals("GS1_128")) {
+                    barcodeType = CatimaBarcode.fromBarcode(BarcodeFormat.CODE_128);
                 } else {
                     barcodeType = CatimaBarcode.fromName(barcodeTypeString);
                 }
             }
 
-            long loyaltyCardInternalId = db.insertLoyaltyCard(database, store, note, null, BigDecimal.valueOf(0), null, cardId, null, barcodeType, null, 0, null);
+            int headerColor = Utils.getRandomHeaderColor(context);
+            Bitmap cardIcon = null;
+            if (providerData != null && providerData.containsKey("logo")) {
+                cardIcon = (Bitmap) providerData.get("logo");
+                headerColor = Utils.getHeaderColorFromImage(cardIcon, headerColor);
+            }
+
+            long loyaltyCardInternalId = DBHelper.insertLoyaltyCard(database, store, note, null, BigDecimal.valueOf(0), null, cardId, null, barcodeType, headerColor, 0, null);
+
+            if (cardIcon != null) {
+                Utils.saveCardImage(context, cardIcon, (int) loyaltyCardInternalId, ImageLocationType.icon);
+            }
 
             if (loyaltyCardData.containsKey("frontImage")) {
                 Utils.saveCardImage(context, (Bitmap) loyaltyCardData.get("frontImage"), (int) loyaltyCardInternalId, ImageLocationType.front);
@@ -183,10 +248,6 @@ public class StocardImporter implements Importer {
             }
         }
 
-        database.setTransactionSuccessful();
-        database.endTransaction();
-        database.close();
-
         zipInputStream.close();
     }
 
@@ -204,7 +265,7 @@ public class StocardImporter implements Importer {
         return true;
     }
 
-    private HashMap<String, HashMap<String, Object>> appendToLoyaltyCardHashMap(HashMap<String, HashMap<String, Object>> loyaltyCardHashMap, String cardID, String key, Object value) {
+    private HashMap<String, HashMap<String, Object>> appendToHashMap(HashMap<String, HashMap<String, Object>> loyaltyCardHashMap, String cardID, String key, Object value) {
         HashMap<String, Object> loyaltyCardData = loyaltyCardHashMap.get(cardID);
         if (loyaltyCardData == null) {
             loyaltyCardData = new HashMap<>();

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

@@ -36,7 +36,7 @@ import protect.card_locker.Utils;
  * 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 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();
@@ -46,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);
@@ -129,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

@@ -9,36 +9,37 @@ import androidx.annotation.IntegerRes;
 import androidx.annotation.StringRes;
 import androidx.appcompat.app.AppCompatDelegate;
 import androidx.preference.PreferenceManager;
+
 import protect.card_locker.R;
 import protect.card_locker.Utils;
 
 public class Settings {
-    private Context context;
-    private SharedPreferences settings;
+    private final Context mContext;
+    private SharedPreferences mSettings;
 
     public Settings(Context context) {
-        this.context = context;
-        this.settings = PreferenceManager.getDefaultSharedPreferences(context);
+        mContext = context.getApplicationContext();
+        mSettings = PreferenceManager.getDefaultSharedPreferences(context);
     }
 
     private String getResString(@StringRes int resId) {
-        return context.getString(resId);
+        return mContext.getString(resId);
     }
 
     private int getResInt(@IntegerRes int resId) {
-        return context.getResources().getInteger(resId);
+        return mContext.getResources().getInteger(resId);
     }
 
     private String getString(@StringRes int keyId, String defaultValue) {
-        return settings.getString(getResString(keyId), defaultValue);
+        return mSettings.getString(getResString(keyId), defaultValue);
     }
 
     private int getInt(@StringRes int keyId, @IntegerRes int defaultId) {
-        return settings.getInt(getResString(keyId), getResInt(defaultId));
+        return mSettings.getInt(getResString(keyId), getResInt(defaultId));
     }
 
     private boolean getBoolean(@StringRes int keyId, boolean defaultValue) {
-        return settings.getBoolean(getResString(keyId), defaultValue);
+        return mSettings.getBoolean(getResString(keyId), defaultValue);
     }
 
     public Locale getLocale() {
@@ -102,4 +103,12 @@ public class Settings {
     public boolean getDisableLockscreenWhileViewingCard() {
         return getBoolean(R.string.settings_key_disable_lockscreen_while_viewing_card, true);
     }
+
+    public boolean getOledDark() {
+        return getBoolean(R.string.settings_key_oled_dark, false);
+    }
+
+    public String getColor() {
+        return getString(R.string.setting_key_theme_color, mContext.getResources().getString(R.string.settings_key_system_theme));
+    }
 }

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

@@ -1,6 +1,7 @@
 package protect.card_locker.preferences;
 
 
+import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
 import android.view.MenuItem;
@@ -9,22 +10,29 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
 
+import androidx.annotation.NonNull;
 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 com.google.android.material.color.DynamicColors;
+
 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 {
+
+    private final static String RELOAD_MAIN_STATE = "mReloadMain";
+    private SettingsFragment fragment;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -38,10 +46,21 @@ public class SettingsActivity extends CatimaAppCompatActivity {
         }
 
         // Display the fragment as the main content.
-        SettingsFragment fragment = new SettingsFragment();
+        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
+    protected void onSaveInstanceState(@NonNull Bundle outState) {
+        super.onSaveInstanceState(outState);
+        outState.putBoolean(RELOAD_MAIN_STATE, fragment.mReloadMain);
     }
 
     @Override
@@ -49,16 +68,34 @@ public class SettingsActivity extends CatimaAppCompatActivity {
         int id = item.getItemId();
 
         if (id == android.R.id.home) {
-            finish();
+            finishSettingsActivity();
             return true;
         }
 
         return super.onOptionsItemSelected(item);
     }
 
+    @Override
+    public void onBackPressed() {
+        finishSettingsActivity();
+    }
+
+    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) {
             // Load the preferences from an XML resource
@@ -91,30 +128,39 @@ 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));
+            localePreference.setOnPreferenceChangeListener((preference, newValue) -> {
+                refreshActivity(true);
+                return true;
+            });
+
+            Preference oledDarkPreference = findPreference(getResources().getString(R.string.settings_key_oled_dark));
+            assert oledDarkPreference != null;
+            oledDarkPreference.setOnPreferenceChangeListener((preference, newValue) -> {
+                refreshActivity(true);
+                return true;
+            });
+
+            ListPreference 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
-                Intent intent = new Intent(getContext(), SettingsActivity.class);
-                intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
-                getContext().startActivity(intent);
+            if (!DynamicColors.isDynamicColorAvailable()) {
+                colorPreference.setEntryValues(R.array.color_values_no_dynamic);
+                colorPreference.setEntries(R.array.color_value_strings_no_dynamic);
+            }
+        }
 
-                return true;
-            });
+        private void refreshActivity(boolean reloadMain) {
+            mReloadMain = reloadMain || mReloadMain;
+            Activity activity = getActivity();
+            if (activity != null) {
+                activity.recreate();
+            }
         }
 
         @Override

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_add_white_24dp.xml

@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
+<vector android:height="24dp" android:tint="?attr/colorControlNormal"
     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="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>

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

@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
+<vector android:height="24dp" android:tint="?attr/colorControlNormal"
     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="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z"/>

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

@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
+<vector android:height="24dp" android:tint="?attr/colorControlNormal"
     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,10l5,5 5,-5z"/>

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

@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
+<vector android:height="24dp" android:tint="?attr/colorControlNormal"
     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,14l5,-5 5,5z"/>

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

@@ -1,5 +1,5 @@
 <vector android:autoMirrored="true" android:height="24dp"
-    android:tint="#FFFFFF" android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal" 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="M3,18h6v-2L3,16v2zM3,6v2h18L21,6L3,6zM3,13h12v-2L3,11v2z"/>
 </vector>

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

@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
+<vector android:height="24dp" android:tint="?attr/colorControlNormal"
     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"/>

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

@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
+<vector android:height="24dp" android:tint="?attr/colorControlNormal"
     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"/>

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

@@ -2,7 +2,8 @@
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
   <path
       android:fillColor="#FFFFFFFF"
       android:pathData="M16,1L4,1c-1.1,0 -2,0.9 -2,2v14h2L4,3h12L16,1zM19,5L8,5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h11c1.1,0 2,-0.9 2,-2L21,7c0,-1.1 -0.9,-2 -2,-2zM19,21L8,21L8,7h11v14z"/>

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

@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
+<vector android:height="24dp" android:tint="?attr/colorControlNormal"
     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="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7H6v12zM19,4h-3.5l-1,-1h-5l-1,1H5v2h14V4z"/>

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

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

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

@@ -2,7 +2,8 @@
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
   <path
       android:pathData="M18,5l0,-3l-12,0l0,1.17l1.83,1.83z"
       android:fillColor="#FFFFFF"/>

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

@@ -2,7 +2,8 @@
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
   <path
       android:pathData="M6,2h12v3h-12z"
       android:fillColor="#FFFFFF"/>

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

@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
+<vector android:height="24dp" android:tint="?attr/colorControlNormal"
     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="M10,4H4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2V8c0,-1.1 -0.9,-2 -2,-2h-8l-2,-2z"/>

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

@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
+<vector android:height="24dp" android:tint="?attr/colorControlNormal"
     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="M9,3L5,6.99h3L8,14h2L10,6.99h3L9,3zM16,17.01L16,10h-2v7.01h-3L15,21l4,-3.99h-3z"/>

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

@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
+<vector android:height="24dp" android:tint="?attr/colorControlNormal"
     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,17c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6h1.9c0,-1.71 1.39,-3.1 3.1,-3.1 1.71,0 3.1,1.39 3.1,3.1v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM18,20L6,20L6,10h12v10z"/>

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

@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
+<vector android:height="24dp" android:tint="?attr/colorControlNormal"
     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="M18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM12,17c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2zM15.1,8L8.9,8L8.9,6c0,-1.71 1.39,-3.1 3.1,-3.1 1.71,0 3.1,1.39 3.1,3.1v2z"/>

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

@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
+<vector android:height="24dp" android:tint="?attr/colorControlNormal"
     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="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z"/>

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

@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
+<vector android:height="24dp" android:tint="?attr/colorControlNormal"
     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="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z"/>

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/drawable/list_row.xml

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

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

@@ -0,0 +1,5 @@
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="#FFFFFF" />
+    <corners android:radius="10dp" />
+</shape>

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

@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
+<vector android:height="24dp" android:tint="?attr/colorControlNormal"
     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="M17,3L5,3c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2L21,7l-4,-4zM12,19c-1.66,0 -3,-1.34 -3,-3s1.34,-3 3,-3 3,1.34 3,3 -1.34,3 -3,3zM15,9L5,9L5,5h10v4z"/>

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

@@ -10,15 +10,13 @@
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:theme="@style/AppTheme.AppBarOverlay">
+        android:layout_height="wrap_content">
 
-        <androidx.appcompat.widget.Toolbar
+        <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-            android:background="?attr/colorPrimary"
-            app:popupTheme="@style/AppTheme.PopupOverlay"/>
+            style="?attr/toolbarStyle" />
 
     </com.google.android.material.appbar.AppBarLayout>
 
@@ -46,7 +44,6 @@
                     android:fontFamily="sans-serif-medium"
                     android:padding="2dp"
                     android:text="@string/version_history"
-                    android:textColor="@color/colorSecondaryText"
                     android:textSize="18sp"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
@@ -61,12 +58,12 @@
                     app:layout_constraintTop_toBottomOf="@id/version_history_main" />
 
                 <TextView
+                    android:importantForAccessibility="no"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_margin="8dp"
                     android:fontFamily="sans-serif-medium"
                     android:text="@string/arrow"
-                    android:textColor="@color/colorSecondaryText"
                     android:textSize="20sp"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
@@ -86,7 +83,6 @@
                     android:fontFamily="sans-serif-medium"
                     android:padding="2dp"
                     android:text="@string/credits"
-                    android:textColor="@color/colorSecondaryText"
                     android:textSize="18sp"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
@@ -101,12 +97,12 @@
                     app:layout_constraintTop_toBottomOf="@id/credits_main" />
 
                 <TextView
+                    android:importantForAccessibility="no"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_margin="8dp"
                     android:fontFamily="sans-serif-medium"
                     android:text="@string/arrow"
-                    android:textColor="@color/colorSecondaryText"
                     android:textSize="20sp"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
@@ -126,18 +122,28 @@
                     android:fontFamily="sans-serif-medium"
                     android:padding="2dp"
                     android:text="@string/help_translate_this_app"
-                    android:textColor="@color/colorSecondaryText"
                     android:textSize="18sp"
                     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:importantForAccessibility="no"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_margin="8dp"
                     android:fontFamily="sans-serif-medium"
                     android:text="@string/arrow"
-                    android:textColor="@color/colorSecondaryText"
                     android:textSize="20sp"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
@@ -157,7 +163,6 @@
                     android:fontFamily="sans-serif-medium"
                     android:padding="2dp"
                     android:text="@string/license"
-                    android:textColor="@color/colorSecondaryText"
                     android:textSize="18sp"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
@@ -174,12 +179,12 @@
                     app:layout_constraintTop_toBottomOf="@id/license_main"/>
 
                 <TextView
+                    android:importantForAccessibility="no"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_margin="8dp"
                     android:fontFamily="sans-serif-medium"
                     android:text="@string/arrow"
-                    android:textColor="@color/colorSecondaryText"
                     android:textSize="20sp"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
@@ -199,7 +204,6 @@
                     android:fontFamily="sans-serif-medium"
                     android:padding="2dp"
                     android:text="@string/source_repository"
-                    android:textColor="@color/colorSecondaryText"
                     android:textSize="18sp"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
@@ -215,12 +219,12 @@
                     app:layout_constraintTop_toBottomOf="@id/repo_main" />
 
                 <TextView
+                    android:importantForAccessibility="no"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_margin="8dp"
                     android:fontFamily="sans-serif-medium"
                     android:text="@string/arrow"
-                    android:textColor="@color/colorSecondaryText"
                     android:textSize="20sp"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
@@ -240,7 +244,6 @@
                     android:fontFamily="sans-serif-medium"
                     android:padding="2dp"
                     android:text="@string/privacy_policy"
-                    android:textColor="@color/colorSecondaryText"
                     android:textSize="18sp"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
@@ -256,12 +259,12 @@
                     app:layout_constraintTop_toBottomOf="@id/privacy_main" />
 
                 <TextView
+                    android:importantForAccessibility="no"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_margin="8dp"
                     android:fontFamily="sans-serif-medium"
                     android:text="@string/arrow"
-                    android:textColor="@color/colorSecondaryText"
                     android:textSize="20sp"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
@@ -281,7 +284,6 @@
                     android:fontFamily="sans-serif-medium"
                     android:padding="2dp"
                     android:text="@string/rate_this_app"
-                    android:textColor="@color/colorSecondaryText"
                     android:textSize="18sp"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
@@ -297,12 +299,12 @@
                     app:layout_constraintTop_toBottomOf="@id/rate_main" />
 
                 <TextView
+                    android:importantForAccessibility="no"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_margin="8dp"
                     android:fontFamily="sans-serif-medium"
                     android:text="@string/arrow"
-                    android:textColor="@color/colorSecondaryText"
                     android:textSize="20sp"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
@@ -322,7 +324,6 @@
                     android:fontFamily="sans-serif-medium"
                     android:padding="2dp"
                     android:text="@string/report_error"
-                    android:textColor="@color/colorSecondaryText"
                     android:textSize="18sp"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
@@ -338,12 +339,12 @@
                     android:padding="2dp"/>
 
                 <TextView
+                    android:importantForAccessibility="no"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_margin="8dp"
                     android:fontFamily="sans-serif-medium"
                     android:text="@string/arrow"
-                    android:textColor="@color/colorSecondaryText"
                     android:textSize="20sp"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"

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

@@ -22,15 +22,13 @@
 
         <com.google.android.material.appbar.AppBarLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:theme="@style/AppTheme.AppBarOverlay">
+            android:layout_height="wrap_content">
 
-            <androidx.appcompat.widget.Toolbar
+            <com.google.android.material.appbar.MaterialToolbar
                 android:id="@+id/toolbar"
                 android:layout_width="match_parent"
                 android:layout_height="?attr/actionBarSize"
-                android:background="?attr/colorPrimary"
-                app:popupTheme="@style/AppTheme.PopupOverlay" />
+                style="?attr/toolbarStyle" />
 
             <com.google.android.material.tabs.TabLayout
                 android:id="@+id/groups"

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

@@ -5,6 +5,8 @@
     android:layout_height="wrap_content"
     xmlns:android="http://schemas.android.com/apk/res/android">
     <ImageView
+        android:background="@drawable/round_outline"
+        android:importantForAccessibility="no"
         android:layout_width="match_parent"
         android:layout_height="@dimen/barcode_disp_height"
         android:layout_gravity="center_horizontal"

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

@@ -2,19 +2,19 @@
 <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="fill_parent"
     android:layout_height="fill_parent">
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:theme="@style/AppTheme.AppBarOverlay">
-        <androidx.appcompat.widget.Toolbar
+        android:layout_height="wrap_content">
+
+        <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-            android:background="?attr/colorPrimary"
-            app:popupTheme="@style/AppTheme.PopupOverlay" />
+            style="?attr/toolbarStyle" />
     </com.google.android.material.appbar.AppBarLayout>
 
     <LinearLayout
@@ -62,7 +62,8 @@
                 android:hint="AB1234"
                 android:importantForAutofill="no"
                 android:inputType="text"
-                android:minHeight="48dp" />
+                android:minHeight="48dp"
+                tools:ignore="ContentDescription" />
         </LinearLayout>
         <Button
             android:id="@+id/noBarcode"

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

@@ -42,8 +42,9 @@
         app:spanCount="@integer/main_view_card_columns"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:paddingBottom="80dp"
+        android:clipToPadding="false"
         android:scrollbars="vertical"
-        android:background="@color/mainLoyaltyCardBackground"
         android:visibility="gone"/>
 
 </RelativeLayout>

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

@@ -43,8 +43,7 @@
             android:layout_height="@dimen/cardThumbnailSize"
             android:layout_weight="1"
             app:srcCompat="@drawable/ic_baseline_arrow_drop_up_24"
-            android:contentDescription="@string/moveUp"
-            app:tint="@color/iconColor"/>
+            android:contentDescription="@string/moveUp"/>
 
         <ImageButton
             android:id="@+id/moveDown"
@@ -52,8 +51,7 @@
             android:layout_height="@dimen/cardThumbnailSize"
             android:layout_weight="1"
             app:srcCompat="@drawable/ic_baseline_arrow_drop_down_24"
-            android:contentDescription="@string/moveDown"
-            app:tint="@color/iconColor"/>
+            android:contentDescription="@string/moveDown"/>
 
         <ImageButton
             android:id="@+id/edit"
@@ -61,8 +59,7 @@
             android:layout_height="@dimen/cardThumbnailSize"
             android:layout_weight="1"
             app:srcCompat="@drawable/ic_mode_edit_white_24dp"
-            android:contentDescription="@string/edit"
-            app:tint="@color/iconColor"/>
+            android:contentDescription="@string/edit"/>
 
         <ImageButton
             android:id="@+id/delete"
@@ -70,8 +67,7 @@
             android:layout_height="@dimen/cardThumbnailSize"
             android:layout_weight="1"
             app:srcCompat="@drawable/ic_delete_white_24dp"
-            android:contentDescription="@string/delete"
-            app:tint="@color/iconColor"/>
+            android:contentDescription="@string/delete"/>
 
     </LinearLayout>
 

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

@@ -21,6 +21,8 @@
         android:id="@+id/list"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:paddingBottom="80dp"
+        android:clipToPadding="false"
         android:scrollbars="vertical"
         android:visibility="gone" />
 </RelativeLayout>

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

@@ -7,15 +7,13 @@
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:theme="@style/AppTheme.AppBarOverlay">
+        android:layout_height="wrap_content">
 
-        <androidx.appcompat.widget.Toolbar
+        <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-            android:background="?attr/colorPrimary"
-            app:popupTheme="@style/AppTheme.PopupOverlay" />
+            style="?attr/toolbarStyle" />
 
     </com.google.android.material.appbar.AppBarLayout>
 

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

@@ -4,6 +4,6 @@
     android:layout_height="wrap_content"
     android:paddingLeft="8dp"
     android:paddingRight="8dp"
-    style="@style/Widget.MaterialComponents.Chip.Choice"
+    style="@style/Widget.MaterialComponents.Chip.Filter"
     app:checkedIconVisible="true"
-    android:textAppearance="?android:attr/textAppearance" />
+    android:textAppearance="?android:attr/textAppearance" />

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

@@ -18,15 +18,13 @@
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:theme="@style/AppTheme.AppBarOverlay">
+        android:layout_height="wrap_content">
 
-        <androidx.appcompat.widget.Toolbar
+        <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-            android:background="?attr/colorPrimary"
-            app:popupTheme="@style/AppTheme.PopupOverlay" />
+            style="?attr/toolbarStyle" />
 
         <com.google.android.material.tabs.TabLayout
             android:id="@+id/tabs"
@@ -39,7 +37,7 @@
             <com.google.android.material.tabs.TabItem
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/barcode"/>
+                android:text="@string/options"/>
             <com.google.android.material.tabs.TabItem
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -50,7 +48,6 @@
 
     <ScrollView android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
-                android:background="@color/inputContrastBackground"
                 app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">
         <TableLayout
             android:layout_width="match_parent"
@@ -76,8 +73,7 @@
                         app:cardCornerRadius="4dp"
                         android:paddingHorizontal="@dimen/inputPadding"
                         app:cardElevation="0dp"
-                        app:cardBackgroundColor="@android:color/transparent"
-                        android:outlineProvider="none">
+                        app:cardBackgroundColor="@android:color/transparent">
 
                         <ImageView
                             android:id="@+id/thumbnail"
@@ -128,6 +124,95 @@
                     </com.google.android.material.textfield.TextInputLayout>
                 </LinearLayout>
 
+                <!-- Barcode ID -->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingHorizontal="@dimen/inputPadding"
+                    android:paddingTop="@dimen/inputPadding"
+                    android:orientation="horizontal">
+
+                    <!-- Barcode ID -->
+                    <com.google.android.material.textfield.TextInputLayout
+                        android:id="@+id/barcodeIdView"
+                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1.0"
+                        android:hint="@string/barcodeId"
+                        android:labelFor="@+id/barcodeIdView">
+
+                        <AutoCompleteTextView
+                            android:id="@+id/barcodeIdField"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:inputType="none"/>
+
+                    </com.google.android.material.textfield.TextInputLayout>
+                </LinearLayout>
+
+                <!-- Barcode type -->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingHorizontal="@dimen/inputPadding"
+                    android:paddingTop="@dimen/inputPadding"
+                    android:orientation="horizontal">
+
+                    <!-- Barcode type -->
+                    <com.google.android.material.textfield.TextInputLayout
+                        android:id="@+id/barcodeTypeView"
+                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1.0"
+                        android:hint="@string/barcodeType"
+                        android:labelFor="@+id/barcodeTypeField">
+
+                        <AutoCompleteTextView
+                            android:id="@+id/barcodeTypeField"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:inputType="none"/>
+                    </com.google.android.material.textfield.TextInputLayout>
+                </LinearLayout>
+
+                <!-- Barcode -->
+                <LinearLayout android:orientation="horizontal"
+                    android:layout_marginTop="10.0dp"
+                    android:layout_marginStart="10.0dp"
+                    android:layout_marginEnd="10.0dp"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:id="@+id/barcodeLayout">
+                    <ImageView
+                        android:background="@drawable/round_outline"
+                        android:importantForAccessibility="no"
+                        android:layout_width="0dp"
+                        android:layout_height="@dimen/barcode_disp_height"
+                        android:layout_gravity="center_horizontal"
+                        android:id="@+id/barcode"
+                        android:layout_weight="1.0"/>
+                </LinearLayout>
+
+                <!-- Buttons -->
+                <LinearLayout android:orientation="horizontal"
+                    android:padding="10.0dip"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:id="@+id/barcodeCaptureLayout">
+                    <Button android:id="@+id/enterButton"
+                        android:layout_margin="@dimen/inputMargin"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:text="@string/editBarcode"
+                        android:layout_weight="1.0"/>
+                </LinearLayout>
+            </TableLayout>
+            <TableLayout
+                android:id="@+id/optionsPart"
+                android:visibility="gone">
+
                 <!-- Note -->
                 <LinearLayout
                     android:layout_width="match_parent"
@@ -161,6 +246,7 @@
                     android:orientation="horizontal">
 
                     <com.google.android.material.chip.ChipGroup
+                        android:contentDescription="@string/groups"
                         android:id="@+id/groupChips"
                         android:layout_height="match_parent"
                         android:layout_width="match_parent"
@@ -240,99 +326,6 @@
                     </com.google.android.material.textfield.TextInputLayout>
                 </LinearLayout>
             </TableLayout>
-            <TableLayout
-                android:id="@+id/barcodePart"
-                android:visibility="gone">
-
-                <!-- Barcode ID -->
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:paddingHorizontal="@dimen/inputPadding"
-                    android:paddingTop="@dimen/inputPadding"
-                    android:orientation="horizontal">
-
-                    <!-- Barcode ID -->
-                    <com.google.android.material.textfield.TextInputLayout
-                        android:id="@+id/barcodeIdView"
-                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1.0"
-                        android:hint="@string/barcodeId"
-                        android:labelFor="@+id/barcodeIdView">
-
-                        <AutoCompleteTextView
-                            android:id="@+id/barcodeIdField"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:inputType="none"/>
-
-                    </com.google.android.material.textfield.TextInputLayout>
-                </LinearLayout>
-
-                <!-- Barcode type -->
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:paddingHorizontal="@dimen/inputPadding"
-                    android:paddingTop="@dimen/inputPadding"
-                    android:orientation="horizontal">
-
-                    <!-- Barcode type -->
-                    <com.google.android.material.textfield.TextInputLayout
-                        android:id="@+id/barcodeTypeView"
-                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1.0"
-                        android:hint="@string/barcodeType"
-                        android:labelFor="@+id/barcodeTypeField">
-
-                        <AutoCompleteTextView
-                            android:id="@+id/barcodeTypeField"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:inputType="none"/>
-                    </com.google.android.material.textfield.TextInputLayout>
-                </LinearLayout>
-
-                <!-- Barcode -->
-                <View
-                    android:layout_height="@dimen/inputBorderThickness"
-                    android:layout_width="match_parent" />
-
-                <LinearLayout android:orientation="horizontal"
-                              android:padding="10.0dip"
-                              android:layout_width="fill_parent"
-                              android:layout_height="wrap_content"
-                              android:visibility="gone"
-                              android:id="@+id/barcodeLayout">
-                    <ImageView
-                        android:layout_width="0dp"
-                        android:layout_height="@dimen/barcode_disp_height"
-                        android:layout_gravity="center_horizontal"
-                        android:padding="10.0dp"
-                        android:background="#ffffff"
-                        android:id="@+id/barcode"
-                        android:layout_weight="1.0"/>
-                </LinearLayout>
-
-                <!-- Buttons -->
-                <LinearLayout android:orientation="horizontal"
-                    android:padding="10.0dip"
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:id="@+id/barcodeCaptureLayout">
-                    <Button android:id="@+id/enterButton"
-                        android:layout_margin="@dimen/inputMargin"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:text="@string/editBarcode"
-                        android:textColor="#FFFFFF"
-                        android:layout_weight="1.0"/>
-                </LinearLayout>
-            </TableLayout>
 
             <TableLayout
                 android:id="@+id/picturesPart"
@@ -369,7 +362,8 @@
                             android:minHeight="50dp"
                             android:contentDescription="@string/frontImageDescription"
                             android:scaleType="fitCenter"
-                            app:srcCompat="@drawable/ic_camera_white" />
+                            app:srcCompat="@drawable/ic_camera_white"
+                            android:background="?attr/colorPrimary" />
 
                     </com.google.android.material.card.MaterialCardView>
                 </LinearLayout>
@@ -404,7 +398,8 @@
                             android:minHeight="50dp"
                             android:contentDescription="@string/backImageDescription"
                             android:scaleType="fitCenter"
-                            app:srcCompat="@drawable/ic_camera_white" />
+                            app:srcCompat="@drawable/ic_camera_white"
+                            android:background="?attr/colorPrimary" />
 
                     </com.google.android.material.card.MaterialCardView>
                 </LinearLayout>

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

@@ -16,48 +16,76 @@
             android:id="@+id/icon_layout"
             android:layout_width="match_parent"
             android:layout_height="0dp"
-            app:layout_constraintDimensionRatio="2:1"
+            android:outlineProvider="none"
             app:cardCornerRadius="8dp"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toTopOf="@+id/store">
+            app:strokeWidth="0dp"
+            app:layout_constraintBottom_toTopOf="@+id/store"
+            app:layout_constraintDimensionRatio="85.6f:53.98f"
+            app:layout_constraintTop_toTopOf="parent">
 
             <ImageView
+                android:importantForAccessibility="no"
                 android:id="@+id/thumbnail"
-                android:scaleType="fitCenter"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:contentDescription="@string/thumbnailDescription"
+                android:scaleType="fitCenter"
                 android:src="@mipmap/ic_launcher"
-                app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent" />
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
 
             <ImageView
+                android:importantForAccessibility="no"
                 android:id="@+id/selected_thumbnail"
-                android:scaleType="fitCenter"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:contentDescription="@string/thumbnailDescription"
-                app:srcCompat="@drawable/ic_done"
-                app:layout_constraintTop_toTopOf="parent"
+                android:scaleType="fitCenter"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"/>
-
-            <ImageView
-                android:id="@+id/star"
-                android:layout_width="@dimen/cardThumbnailSize"
-                android:layout_height="@dimen/cardThumbnailSize"
-                android:layout_gravity="end"
-                app:srcCompat="@drawable/ic_starred_white"
-                android:contentDescription="@string/starImage"
-                app:tint="?attr/colorControlNormal"
-                android:visibility="gone"
-                tools:visibility="visible"
-                android:elevation="4dp"
+                app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintEnd_toEndOf="parent" />
+                app:srcCompat="@drawable/ic_done" />
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/star"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="end">
+
+                <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/starred"
+                    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" />
+
+                <ImageView
+                    android:importantForAccessibility="no"
+                    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_black"
+                    tools:ignore="ImageContrastCheck" />
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
         </com.google.android.material.card.MaterialCardView>
 
         <TextView

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

@@ -25,6 +25,7 @@
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
         <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/mainLayout"
             android:layout_width="fill_parent"
             android:layout_height="match_parent"
             android:orientation="vertical">
@@ -54,11 +55,12 @@
                 android:padding="0dp"
                 app:srcCompat="@drawable/ic_baseline_arrow_drop_up_24"
                 android:contentDescription="@string/moveBarcodeToTopOfScreen"
-                app:tint="#ffffff"
+                app:tint="?attr/colorOnPrimary"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintBottom_toTopOf="@+id/mainImage"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent" />
+                app:layout_constraintStart_toStartOf="parent"
+                android:background="?attr/colorPrimary" />
 
             <ImageView
                 android:id="@+id/mainImage"
@@ -85,10 +87,11 @@
                 android:padding="0dp"
                 app:srcCompat="@drawable/ic_baseline_arrow_drop_down_24"
                 android:contentDescription="@string/moveBarcodeToCenterOfScreen"
-                app:tint="#ffffff"
+                app:tint="?attr/colorOnPrimary"
                 app:layout_constraintTop_toBottomOf="@+id/mainImage"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent" />
+                app:layout_constraintStart_toStartOf="parent"
+                android:background="?attr/colorPrimary" />
 
             <LinearLayout
                 android:id="@+id/dotIndicator"
@@ -107,6 +110,7 @@
                 app:layout_constraintTop_toBottomOf="@+id/minimizeButton"/>
 
             <SeekBar
+                android:contentDescription="@string/set_scale"
                 android:id="@+id/barcodeScaler"
                 android:visibility="gone"
                 android:max="100"
@@ -154,7 +158,7 @@
         android:id="@+id/bottom_sheet"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@color/inputBackground"
+        android:background="?android:colorBackground"
         android:orientation="vertical"
         android:paddingTop="0px"
         android:visibility="gone"
@@ -168,10 +172,11 @@
             android:layout_width="match_parent"
             android:layout_height="80dp"
             android:layout_gravity="top|start"
-            android:contentDescription="@string/toggleMoreInfo"
+            android:contentDescription="@string/showMoreInfo"
             android:scaleType="fitCenter"
             app:srcCompat="@drawable/ic_baseline_arrow_drop_up_24"
-            app:tint="#ffffff" />
+            app:tint="?attr/colorOnPrimary"
+            android:background="?attr/colorPrimary" />
 
         <androidx.core.widget.NestedScrollView
             android:id="@+id/bottomSheetContentWrapper"
@@ -247,14 +252,13 @@
         android:weightSum="1.0"
         >
 
-        <androidx.appcompat.widget.Toolbar
+        <com.google.android.material.appbar.MaterialToolbar
             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" />
@@ -290,7 +294,6 @@
                 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" />
 

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

@@ -19,15 +19,13 @@
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:theme="@style/AppTheme.AppBarOverlay">
+        android:layout_height="wrap_content">
 
-        <androidx.appcompat.widget.Toolbar
+        <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-            android:background="?attr/colorPrimary"
-            app:popupTheme="@style/AppTheme.PopupOverlay"/>
+            style="?attr/toolbarStyle" />
 
         <com.google.android.material.tabs.TabLayout
             android:id="@+id/groups"

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

@@ -19,15 +19,13 @@
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:theme="@style/AppTheme.AppBarOverlay">
+        android:layout_height="wrap_content">
 
-        <androidx.appcompat.widget.Toolbar
+        <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-            android:background="?attr/colorPrimary"
-            app:popupTheme="@style/AppTheme.PopupOverlay"/>
+            style="?attr/toolbarStyle" />
 
     </com.google.android.material.appbar.AppBarLayout>
 

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

@@ -9,15 +9,13 @@
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:theme="@style/AppTheme.AppBarOverlay">
+        android:layout_height="wrap_content">
 
-        <androidx.appcompat.widget.Toolbar
+        <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-            android:background="?attr/colorPrimary"
-            app:popupTheme="@style/AppTheme.PopupOverlay" />
+            style="?attr/toolbarStyle" />
 
     </com.google.android.material.appbar.AppBarLayout>
 
@@ -25,6 +23,7 @@
         android:id="@+id/zxing_barcode_scanner"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:layout_marginTop="?attr/actionBarSize"
         app:zxing_scanner_layout="@layout/custom_barcode_scanner">
     </com.journeyapps.barcodescanner.DecoratedBarcodeView>
-</RelativeLayout>
+</RelativeLayout>

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

@@ -1,27 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:orientation="vertical">
+    android:fitsSystemWindows="true"
+    tools:context="protect.card_locker.preferences.SettingsActivity">
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:theme="@style/AppTheme.AppBarOverlay">
+        android:layout_height="wrap_content">
 
-        <androidx.appcompat.widget.Toolbar
+        <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
+            style="?attr/toolbarStyle"
             android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:background="?attr/colorPrimary"
-            app:popupTheme="@style/AppTheme.PopupOverlay"/>
+            android:layout_height="?attr/actionBarSize" />
 
     </com.google.android.material.appbar.AppBarLayout>
 
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/settings_container"
         android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+        android:layout_height="match_parent"
+        android:layout_marginTop="?attr/actionBarSize" />
 
-</LinearLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>

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

@@ -0,0 +1,34 @@
+<?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">
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            style="?attr/toolbarStyle" />
+
+    </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/card_details_menu.xml

@@ -0,0 +1,9 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+      xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/action_unfold"
+        android:title="@string/action_hide_details"
+        android:icon="@drawable/ic_baseline_unfold_less_24"
+        app:showAsAction="always"
+        android:visible="true"/>
+</menu>

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

@@ -7,22 +7,25 @@
         android:title="@string/action_search"
         android:icon="@drawable/ic_search_white"
         app:actionViewClass="androidx.appcompat.widget.SearchView"
-        app:showAsAction="always|collapseActionView"/>
+        app:showAsAction="always|collapseActionView"
+        android:visible="false"/>
     <item
         android:id="@+id/action_unfold"
         android:title="@string/action_hide_details"
         android:icon="@drawable/ic_baseline_unfold_less_24"
-        app:showAsAction="always"/>
+        app:showAsAction="always"
+        android:visible="false"/>
     <item
         android:id="@+id/action_sort"
         android:title="@string/sort"
         android:icon="@drawable/ic_baseline_sort_24"
-        app:showAsAction="always"/>
+        app:showAsAction="always"
+        android:visible="false"/>
     <item
         android:id="@+id/action_manage_groups"
         android:icon="@drawable/ic_folder_white"
         android:title="@string/groups"
-        app:showAsAction="ifRoom"/>
+        app:showAsAction="never"/>
     <item
         android:id="@+id/action_import_export"
         android:icon="@drawable/ic_import_export_white_24dp"

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

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

app/src/main/res/raw/stocard_stores.csv

@@ -440,7 +440,7 @@ _id,name,barcodeFormat
 450,CAD,EAN_13
 451,Camomilla,EAN_13
 452,"Carpisa Yamamay",EAN_13
-453,Carrefour,EAN_13
+453,Carrefour,CODE_128
 454,"Cisalfa Sport",EAN_13
 455,Coin,ITF
 456,Comet,EAN_13

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

@@ -11,7 +11,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>
@@ -25,18 +25,18 @@
     </plurals>
     <string name="failedOpeningFileManager">Инсталирайте приложение за управление на файлове.</string>
     <string name="app_license">Свободен софтуер с авторски права, лицензиран под GPLv3+</string>
-    <string name="frontImageDescription">Снимка на предната страна на карта</string>
-    <string name="backImageDescription">Снимка на задната страна на карта</string>
+    <string name="frontImageDescription">Снимка на предната страна</string>
+    <string name="backImageDescription">Снимка на задната страна</string>
     <string name="parsingBalanceFailed"><xliff:g>%s</xliff:g> не изглежда истинска наличност.</string>
     <string name="no">Не</string>
     <string name="yes">Да</string>
     <string name="setBackImage">Снимка на задната страна</string>
     <string name="setFrontImage">Снимка на предната страна</string>
     <string name="photos">Снимки</string>
-    <string name="importOptionApplicationExplanation">Изберете файл чрез друго приложение.</string>
-    <string name="noExternalStoragePermissionError">Дайте разрешение за достъп до хранилището, за да работи внасянето и изнасянето</string>
+    <string name="importOptionApplicationExplanation">Изберете файл на друго приложение.</string>
+    <string name="noExternalStoragePermissionError">Разрешете достъп до хранилището, за да работи внасянето и изнасянето</string>
     <string name="noCardExistsError">Картата не е намерена</string>
-    <string name="updateBarcodeQuestionText">Идентификаторът е променен. Желаете ли с неговата стойност да бъде променен и щрихкода\?</string>
+    <string name="updateBarcodeQuestionText">Идентификаторът е променен. Желаете ли с неговата стойност да бъде променен и щрихкодът\?</string>
     <string name="updateBarcodeQuestionTitle">Обновяване на щрихкода\?</string>
     <string name="noCardIdError">Не е въведен идентификатор</string>
     <string name="noCardsMessage">Добавете карта</string>
@@ -80,7 +80,6 @@
     <string name="groupsList">Списъци: <xliff:g>%s</xliff:g></string>
     <string name="expiryStateSentence">Валидност: <xliff:g>%s</xliff:g></string>
     <string name="expiryStateSentenceExpired">Изтекла: <xliff:g>%s</xliff:g></string>
-    <string name="balancePoints"><xliff:g>%s</xliff:g> точки</string>
     <string name="balanceSentence">Наличност: <xliff:g>%s</xliff:g></string>
     <string name="noGroups">Докоснете бутона +, за да добавите списък.</string>
     <string name="noStoreError">Не е въведено наименование</string>
@@ -99,33 +98,33 @@
     <string name="settings_category_title_ui">Потребителски интерфейс</string>
     <string name="settings">Настройки</string>
     <string name="starImage">Звезда за любимо</string>
-    <string name="thumbnailDescription">Миниатюра на картата</string>
-    <string name="copy_to_clipboard_toast">Идентификаторът на картата е копиран в междинната памет</string>
-    <string name="enterBarcodeInstructions">Въведете идентификатор на картата или като изберете вида на щрихкода или докоснете бутона „Картата няма щрихкод“.</string>
+    <string name="thumbnailDescription">Миниатюра</string>
+    <string name="copy_to_clipboard_toast">Идентификаторът е копиран в междинната памет</string>
+    <string name="enterBarcodeInstructions">Въведете идентификатор и или изберете вида на щрихкода, или докоснете бутона „Липсва щрихкод“.</string>
     <string name="selectBarcodeTitle">Избиране на щрихкод</string>
     <string name="importOptionApplicationButton">Избиране чрез приложение</string>
     <string name="importing">Внасяне…</string>
     <string name="exporting">Изнасяне…</string>
-    <string name="exportFailed">Картите не могат да бъдат изнесени</string>
+    <string name="exportFailed">Данните не могат да бъдат изнесени</string>
     <string name="exportFailedTitle">Грешка при изнасяне</string>
-    <string name="importFailed">Картите не могат да бъдат внесени</string>
+    <string name="importFailed">Данните не могат да бъдат внесени</string>
     <string name="importFailedTitle">Грешка при внасяне</string>
     <string name="exportSuccessfulTitle">Резултат от изнасяне</string>
     <string name="importSuccessfulTitle">Резултат от внасяне</string>
-    <string name="importExportHelp">Резервните копия на картите ви дават възможност да ги преместите на друго устройство.</string>
+    <string name="importExportHelp">Резервните копия на данните ви дават възможност да ги премествате на друго устройство.</string>
     <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>
     <string name="ok">Добре</string>
-    <string name="importSuccessful">Картите са внесени успешно</string>
-    <string name="chooseImportType">От къде ще внесете\?</string>
+    <string name="importSuccessful">Данните са внесени</string>
+    <string name="chooseImportType">Внасяне на данни на</string>
     <string name="importCatimaMessage">Изберете файла <i>catima.zip</i>, предварително изнесен от Catima.
 \nСъздайте такъв файл от меню Внасяне/изнасяне от друго устройство с Catima като изберете Изнасяне.</string>
-    <string name="importOptionApplicationTitle">От друго приложение</string>
+    <string name="importOptionApplicationTitle">Чрез друго приложение</string>
     <string name="importOptionFilesystemButton">Избиране от файлова система</string>
     <string name="importOptionFilesystemExplanation">Изберете определен файл от файловата система.</string>
     <string name="app_resources">Свободни ресурси: <xliff:g id="app_resources_list">%s</xliff:g></string>
@@ -139,12 +138,12 @@
     <string name="about">Относно</string>
     <string name="importOptionFilesystemTitle">Внасяне от файловата система</string>
     <string name="importCatima">Внасяне от Catima</string>
-    <string name="exportSuccessful">Картите са изнесени успешно</string>
+    <string name="exportSuccessful">Данните са изнесени</string>
     <string name="unlockScreen">Разрешава автоматичното завъртане</string>
     <string name="lockScreen">Спира автоматичното завъртане</string>
     <plurals name="selectedCardCount">
-        <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="deleteConfirmationGroup">Изтриване на група\?</string>
     <string name="moveDown">Преместване надолу</string>
@@ -162,14 +161,13 @@
     <string name="importLoyaltyCardKeychainMessage">Изберете файла <i>LoyaltyCardKeychain.csv</i>, предварително изнесен от Loyalty Card Keychain.
 \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>
     <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>
@@ -187,12 +185,11 @@
     <string name="settings_theme_color">Цвят на темата</string>
     <string name="settings_system_locale">Система</string>
     <string name="settings_locale">Език</string>
-    <string name="noGroupCards">Групата не съдържа карти</string>
-    <string name="toggleMoreInfo">Превключване на повече информация</string>
-    <string name="barcodeImageDescriptionWithType">Изображение на щрихкод на карта от вида <xliff:g>%s</xliff:g></string>
+    <string name="noGroupCards">Групата е празна</string>
+    <string name="barcodeImageDescriptionWithType">Изображение на щрихкод от вид <xliff:g>%s</xliff:g></string>
     <string name="swipeToSwitchImages">Плъзване или задържане за смяна на изображения</string>
     <string name="sort_by">Сортиране по</string>
-    <string name="reverse">Наобратно</string>
+    <string name="reverse">…в обратен ред</string>
     <string name="sort_by_balance">Наличност</string>
     <string name="sort_by_expiry">Валидност</string>
     <string name="sort_by_most_recently_used">Последно използване</string>
@@ -217,4 +214,21 @@
     <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>
+    <string name="translate_platform">в Weblate</string>
+    <string name="shortcutSelectCard">Избор на карта</string>
+    <string name="starred">Със звезда</string>
+    <string name="set_scale">Мащаб</string>
+    <string name="showMoreInfo">Показване на информация</string>
+    <string name="hideMoreInfo">Скриване на информация</string>
+    <string name="options">Настройки</string>
+    <string name="card_ids_copied">Идентификаторите са копирани</string>
+    <plurals name="balancePoints">
+        <item quantity="one"><xliff:g>%s</xliff:g> точка</item>
+        <item quantity="other"><xliff:g>%s</xliff:g> точки</item>
+    </plurals>
+    <string name="settings_oled_dark">Чисто черен фон за тъмната тема</string>
+    <string name="include_if_asking_support">Ако искате да потърсите поддръжка, включете следната информация:</string>
 </resources>

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

@@ -66,7 +66,6 @@
     <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>

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

@@ -66,7 +66,6 @@
     <string name="settings_green_theme">Zeleno</string>
     <string name="settings_brown_theme">Braun</string>
     <string name="sort">Poništi sortiranje</string>
-    <string name="toggleMoreInfo">Uključi savjete</string>
     <string name="swipeToSwitchImages">Swipe ili long press za prebacivanje slika</string>
     <string name="sort_by_name">Ime</string>
     <string name="sort_by_most_recently_used">Nedavno Korišten</string>

app/src/main/res/values-cs/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">Přidat</string>
-    <string name="noGiftCards">Klepnutím na tlačítko + plus přidáte kartu nebo ji nejprve importujete z nabídky⋮.</string>
+    <string name="noGiftCards">Klepnutím na tlačítko + plus přidáte kartu nebo ji nejprve importujete z nabídky ⋮.</string>
     <string name="storeName">Název</string>
     <string name="note">Poznámka</string>
     <string name="cardId">ID karty</string>
@@ -15,21 +15,21 @@
     <string name="sendLabel">Odeslat…</string>
     <string name="editCardTitle">Editovat věrnostní kartu</string>
     <string name="addCardTitle">Přidat věrnostní kartu</string>
-    <string name="scanCardBarcode">Skenování Čárový Kód Karty</string>
+    <string name="scanCardBarcode">Skenování čárového kódu</string>
     <string name="noStoreError">Zadáno žádné jméno</string>
-    <string name="noCardIdError">Žádné ID karty zadáno</string>
+    <string name="noCardIdError">ID nezadáno</string>
     <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="importExportHelp">Zálohování dat vám umožní přesunout je do jiného zařízení.</string>
     <string name="importSuccessfulTitle">Importováno</string>
     <string name="importFailedTitle">Import selhal</string>
-    <string name="importFailed">Nelze importovat karty</string>
-    <string name="exportSuccessfulTitle">Exportovat</string>
+    <string name="importFailed">Nelze provést import</string>
+    <string name="exportSuccessfulTitle">Exportováno</string>
     <string name="exportFailedTitle">Export selhal</string>
-    <string name="exportFailed">Nelze exportovat karty</string>
+    <string name="exportFailed">Nelze provést export</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>
+    <string name="noExternalStoragePermissionError">Udělit oprávnění přístupu k externímu úložišti pro import nebo export dat</string>
     <string name="importOptionFilesystemTitle">Import ze souborového systému</string>
     <string name="importOptionFilesystemExplanation">Vyberte konkrétní soubor v uložišti.</string>
     <string name="importOptionFilesystemButton">Ze souborového systému</string>
@@ -42,7 +42,7 @@
     <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>
     <string name="selectBarcodeTitle">Vyberte čárový kód</string>
-    <string name="copy_to_clipboard_toast">ID karty zkopírované do schránky</string>
+    <string name="copy_to_clipboard_toast">ID zkopírované do schránky</string>
     <string name="deleteTitle">Smazat kartu</string>
     <string name="deleteConfirmation">Opravdu chcete smazat tuto věrnostní kartu?</string>
     <string name="moveBarcodeToCenterOfScreen">Střed čárového kódu na obrazovce</string>
@@ -58,7 +58,7 @@
 \ncopyright © 2016–2020 Branden Archer</string>
     <string name="exportOptionExplanation">Data budou zapsána na místo podle vašeho výběru.</string>
     <string name="failedParsingImportUriError">Nelze analyzovat import URI</string>
-    <string name="noCardExistsError">Nelze najít kartu</string>
+    <string name="noCardExistsError">Kartu nelze najít</string>
     <string name="noCardsMessage">Nejprve přidejte kartu</string>
     <string name="cardShortcut">Zástupce Karty</string>
     <string name="share">Podíl</string>
@@ -69,10 +69,10 @@
     <string name="noBarcode">Žádný čárový kód</string>
     <string name="barcodeNoBarcode">Tato karta nemá čárový kód</string>
     <string name="barcodeType">Typ čárového kódu</string>
-    <string name="noMatchingGiftCards">Nic jsem nenašel. Zkuste změnit vyhledávání.</string>
+    <string name="noMatchingGiftCards">Nic nenalezeno. Zkuste změnit vyhledávání.</string>
     <string name="action_search">Vyhledávání</string>
-    <string name="thumbnailDescription">Miniatura karty</string>
-    <string name="card_ids_copied">Zkopírované ID karty(karet)</string>
+    <string name="thumbnailDescription">Miniatura</string>
+    <string name="card_ids_copied">Zkopírované ID</string>
     <plurals name="deleteCardsConfirmation">
         <item quantity="one">Opravdu chcete kartu <xliff:g>%d</xliff:g> trvale odstranit\?</item>
         <item quantity="few">Opravdu chcete karty <xliff:g>%d</xliff:g> trvale odstranit\?</item>
@@ -83,7 +83,7 @@
         <item quantity="few">Odstranit karty <xliff:g>%d</xliff:g></item>
         <item quantity="other">Odstranit karty <xliff:g>%d</xliff:g></item>
     </plurals>
-    <string name="importSuccessful">Data karty importována</string>
+    <string name="importSuccessful">Data importována</string>
     <string name="intent_import_card_from_url_share_text">Chci s Vámi sdílet kartu</string>
     <string name="settings_disable_lockscreen_while_viewing_card">Bránit uzamykání obrazovky</string>
     <string name="settings_keep_screen_on">Udržovat obrazovku zapnutou</string>
@@ -96,13 +96,12 @@
     <string name="settings_category_title_ui">Uživatelské rozhraní</string>
     <string name="settings">Nastavení</string>
     <string name="card">Karta</string>
-    <string name="balancePoints"><xliff:g>%s</xliff:g> bodů</string>
     <string name="balanceSentence">Zůstatek: <xliff:g>%s</xliff:g></string>
     <string name="expiryStateSentenceExpired">Platnost vypršela: <xliff:g>%s</xliff:g></string>
     <string name="expiryStateSentence">Platí do: <xliff:g>%s</xliff:g></string>
     <string name="moveDown">Přesunout dolů</string>
     <string name="moveUp">Přesunout nahoru</string>
-    <string name="enterBarcodeInstructions">Zadejte ID karty a níže vyberte typ čárového kódu nebo \"Tato karta nemá čárový kód\".</string>
+    <string name="enterBarcodeInstructions">Zadejte ID a níže vyberte typ čárového kódu nebo \"Tato karta nemá čárový kód\".</string>
     <string name="settings_brown_theme">Hnědá</string>
     <string name="settings_grey_theme">Šedá</string>
     <string name="settings_green_theme">Zelená</string>
@@ -121,22 +120,22 @@
     <string name="passwordRequired">Zadejte prosím heslo</string>
     <string name="no">Ne</string>
     <string name="yes">Ano</string>
-    <string name="updateBarcodeQuestionText">Změnili jste ID karty. Chcete také aktualizovat čárový kód, aby používal stejnou hodnotu\?</string>
+    <string name="updateBarcodeQuestionText">Změnili jste ID. Chcete také aktualizovat čárový kód, aby používal stejnou hodnotu\?</string>
     <string name="updateBarcodeQuestionTitle">Aktualizovat hodnotu čárového kódu\?</string>
     <string name="takePhoto">Pořídit fotku</string>
     <string name="removeImage">Odstranit obrázek</string>
     <string name="setBackImage">Nastavit obrázek zadní strany</string>
     <string name="setFrontImage">Nastavit obrázek přední strany</string>
     <string name="photos">Fotky</string>
-    <string name="backImageDescription">Obrázek zadní strany karty</string>
-    <string name="frontImageDescription">Obrázek přední strany karty</string>
+    <string name="backImageDescription">Obrázek zadní strany</string>
+    <string name="frontImageDescription">Obrázek přední strany</string>
     <string name="intent_import_card_from_url_share_multiple_text">Chci s Vámi sdílet kartu</string>
-    <string name="copy_to_clipboard_multiple_toast">ID karty zkopírováno do schránky</string>
+    <string name="copy_to_clipboard_multiple_toast">ID zkopírováno do schránky</string>
     <string name="wrongValueForBarcodeType">Hodnota není platná pro vybraný typ čárového kódu</string>
     <string name="unsupportedBarcodeType">Tento typ čárového kódu zatím nelze zobrazit. Možná bude podporován v pozdější verzi aplikace.</string>
     <string name="barcodeId">Hodnota čárového kódu</string>
     <string name="setBarcodeId">Nastavení hodnoty čárového kódu</string>
-    <string name="sameAsCardId">Stejné jako ID karty</string>
+    <string name="sameAsCardId">Stejné jako ID</string>
     <string name="importVoucherVaultMessage">Vyberte svůj <i>vouchervault.json</i> export z Voucher Vault, který chcete importovat.
 \nVytvořte jej tak, že nejprve stisknete tlačítko Exportovat v aplikaci Voucher Vault.</string>
     <string name="importVoucherVault">Import z Voucher Vault</string>
@@ -158,7 +157,7 @@
 \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>
+    <string name="chooseImportType">Importovat data z</string>
     <string name="parsingBalanceFailed"><xliff:g>%s</xliff:g> se nezdá být platným zůstatkem.</string>
     <string name="points">Body</string>
     <string name="currency">Měna</string>
@@ -167,7 +166,7 @@
     <string name="noBarcodeFound">Čarový kód nenalezen</string>
     <string name="groupsList">Skupiny: <xliff:g>%s</xliff:g></string>
     <string name="addFromImage">Výběr obrázku z galerie</string>
-    <string name="addManually">Ruční zadání ID karty</string>
+    <string name="addManually">Ruční zadání ID</string>
     <string name="leaveWithoutSaveConfirmation">Ukončit bez uložení\?</string>
     <string name="leaveWithoutSaveTitle">Ukončit</string>
     <string name="failedOpeningFileManager">Nejprve si nainstalujte správce souborů.</string>
@@ -178,10 +177,10 @@
         <item quantity="few"><xliff:g>%d</xliff:g> karty</item>
         <item quantity="other"><xliff:g>%d</xliff:g> karet</item>
     </plurals>
-    <string name="noGroups">Kliknutím na tlačítko + plus nejprve přidejte skupiny pro kategorizaci.</string>
+    <string name="noGroups">Kliknutím na tlačítko + plus přidejte skupiny pro kategorizaci.</string>
     <string name="groups">Skupiny</string>
     <string name="enter_group_name">Zadejte název skupiny</string>
-    <string name="exportSuccessful">Data karty exportována</string>
+    <string name="exportSuccessful">Data exportována</string>
     <string name="settings_display_barcode_max_brightness">Rozjasněné zobrazení čárového kódu</string>
     <string name="starImage">Oblíbená hvězda</string>
     <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Copyright © 2019–<xliff:g>%d</xliff:g> Sylvia van Os</string>
@@ -191,17 +190,16 @@
         <item quantity="other">Vybráno <xliff:g>%d</xliff:g> karet</item>
     </plurals>
     <string name="app_contributors">Přispěli: <xliff:g id="app_contributors">%s</xliff:g></string>
-    <string name="noGroupCards">Tato skupina neobsahuje žádné karty</string>
+    <string name="noGroupCards">Tato skupina je prázdná</string>
     <string name="sort_by">Seřadit podle</string>
-    <string name="reverse">Obrátit</string>
+    <string name="reverse">…v obráceném pořadí</string>
     <string name="sort_by_balance">Zůstatek</string>
     <string name="sort_by_expiry">Vypršení</string>
     <string name="sort_by_most_recently_used">Naposledy použité</string>
     <string name="sort_by_name">Název</string>
     <string name="swipeToSwitchImages">Přejetím nebo dlouhým stisknutím přepínáte obrázky</string>
-    <string name="toggleMoreInfo">Přepnout zobrazení dalších informací</string>
     <string name="sort">Seřadit</string>
-    <string name="barcodeImageDescriptionWithType">Obrázek čárového kódu karty typu <xliff:g>%s</xliff:g></string>
+    <string name="barcodeImageDescriptionWithType">Obrázek čárového kódu <xliff:g>%s</xliff:g></string>
     <string name="version_history">Historie verzí</string>
     <string name="rate_this_app">Ohodnoťte tuto aplikaci</string>
     <string name="and_data_usage">a využití dat</string>
@@ -222,4 +220,18 @@
     <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>
+    <string name="shortcutSelectCard">Vybrat kartu</string>
+    <string name="action_show_details">Zobrazit detaily</string>
+    <string name="action_hide_details">Skrýt detaily</string>
+    <string name="translate_platform">na Weblate</string>
+    <string name="showMoreInfo">Zobrazit podrobnosti</string>
+    <string name="hideMoreInfo">Skrýt podrobnosti</string>
+    <string name="starred">S hvězdičkou</string>
+    <string name="set_scale">Nastavení měřítka</string>
+    <string name="options">Volby</string>
+    <plurals name="balancePoints">
+        <item quantity="one"><xliff:g>%s</xliff:g> bod</item>
+        <item quantity="few"><xliff:g>%s</xliff:g> body</item>
+        <item quantity="other"><xliff:g>%s</xliff:g> bodů</item>
+    </plurals>
 </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">Import konnte nicht durchgeführt werden</string>
     <string name="exportSuccessfulTitle">Exportiert</string>
     <string name="exportFailedTitle">Export fehlgeschlagen</string>
-    <string name="exportFailed">Karten konnten nicht exportiert werden</string>
+    <string name="exportFailed">Export konnte nicht durchgeführt werden</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>
@@ -51,39 +51,39 @@
     <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>
     <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">
@@ -92,7 +92,7 @@
     </plurals>
     <string name="groupsList">Gruppen: <xliff:g>%s</xliff:g></string>
     <string name="app_loyalty_card_keychain">Loyalty Card Keychain</string>
-    <string name="chooseImportType">Daten importieren aus?</string>
+    <string name="chooseImportType">Daten importieren aus</string>
     <string name="parsingBalanceFailed"><xliff:g>%s</xliff:g> scheint kein gültiges Guthaben zu sein.</string>
     <string name="points">Punkte</string>
     <string name="currency">Währung</string>
@@ -105,7 +105,6 @@
     <string name="editBarcode">Barcode ändern</string>
     <string name="barcode">Strichcode</string>
     <string name="card">Karte</string>
-    <string name="balancePoints"><xliff:g>%s</xliff:g> Punkte</string>
     <string name="balanceSentence">Guthaben: <xliff:g>%s</xliff:g></string>
     <string name="expiryStateSentenceExpired">Abgelaufen: <xliff:g>%s</xliff:g></string>
     <string name="expiryStateSentence">Läuft ab: <xliff:g>%s</xliff:g></string>
@@ -116,17 +115,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.
-\nErstellen 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.
-\nErstellen 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.
-\nErstellen 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>
@@ -142,28 +141,28 @@
     <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.
-\nSie 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>
@@ -188,8 +187,7 @@
     <string name="settings_catima_theme">Catima</string>
     <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,7 +195,7 @@
     <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>
+    <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>
@@ -208,14 +206,29 @@
     <string name="source_repository">Quellcode</string>
     <string name="on_github">auf GitHub</string>
     <string name="report_error">Fehler melden</string>
-    <string name="exportPassword">Legen Sie ein Passwort fest, um Ihren Export zu schützen (optional)</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">Sie haben noch keine Kundenkarten. Sobald Sie welche hinzugefügt haben, können Sie sie hier der Gruppe zuordnen.</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>
+    <string name="options">Optionen</string>
+    <string name="hideMoreInfo">Infos ausblenden</string>
+    <string name="set_scale">Größe festlegen</string>
+    <string name="showMoreInfo">Infos anzeigen</string>
+    <string name="starred">als Favorit</string>
+    <plurals name="balancePoints">
+        <item quantity="one"><xliff:g>%s</xliff:g> Punkt</item>
+        <item quantity="other"><xliff:g>%s</xliff:g> Punkte</item>
+    </plurals>
+    <string name="settings_oled_dark">Rein schwarzer Hintergrund für dunkles Thema</string>
+    <string name="include_if_asking_support">Wenn Sie Unterstützung anfordern möchten, geben Sie bitte die folgenden Informationen an:</string>
 </resources>

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

@@ -64,7 +64,7 @@
     <string name="share">Compartir</string>
     <string name="barcodeNoBarcode">Esta tarjeta no tiene código de barras</string>
     <string name="barcodeType">Tipo de código de barras</string>
-    <string name="noMatchingGiftCards">No se ha encontrado nada. Pruebe a modificar su búsqueda.</string>
+    <string name="noMatchingGiftCards">Sin resultados. Pruebe modificando su búsqueda.</string>
     <string name="action_search">Buscar</string>
     <string name="app_revision_fmt">Información de la revisión: <xliff:g id="app_revision_url">%s</xliff:g></string>
     <string name="noGroups">Primero pulse en el botón «+» para añadir grupos de categorización.</string>
@@ -99,7 +99,6 @@
     <string name="editBarcode">Editar el código de barras</string>
     <string name="barcode">Código de barras</string>
     <string name="card">Tarjeta</string>
-    <string name="balancePoints"><xliff:g>%s</xliff:g> puntos</string>
     <string name="expiryStateSentenceExpired">Expirado: <xliff:g>%s</xliff:g></string>
     <string name="expiryStateSentence">Expira: <xliff:g>%s</xliff:g></string>
     <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Derechos de autor © 2019-<xliff:g>%d</xliff:g> de Sylvia van Os.</string>