Release Catima 2.19.0

Merge pull request #982 from CatimaLoyalty/create-pull-request/patch-1660454689
Update contributors
2025-12-24 23:57:53 -05:00 · 2022-08-14 14:26:12 +02:00 · 2022-08-14 08:48:18 +02:00 · 2022-08-14 05:24:49 +00:00 · 2022-08-13 15:45:23 +02:00 · 2022-08-13 14:19:41 +02:00
486 changed files with 5644 additions and 2485 deletions
--- a/.github/workflows/autoclose-needs-info.yml
+++ b/.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
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,95 @@
 # Changelog

-## Unreleased - 96
+## v2.19.0 - 113
+
+- Add previous and next buttons to the loyalty card view
+- Fix foreground colour on edit button
+- Replace floppy disk save icon with checkmark
+
+## v2.18.2 - 112
+
+- Make the possibility to set a custom header more visible
+
+## v2.18.1 - 111
+
+- Arabic language support
+- Display archived card count in group overview
+- Fix balance parsing bugs (made cards not savable in Arabic and other language with non-Western numbers)
+- Fix custom theme not applying to main screen correctly
+- Improve display of selected cards
+- Fix crash when leaving cardview in RTL layouts for cards with expiry or balance
+- Fix back arrow in card view pointing the wrong way in RTL layouts
+
+## v2.17.1 - 109
+
+- Fix incorrect text colour on "No barcode" button
+
+## v2.17.0 - 108
+
+- Add card duplication feature
+- Don't allow choosing expiry before 1970 (they never worked anyway)
+- Add support for archiving cards
+- Move delete from edit to view
+- Remove rotation lock icon in favour of a new rotation lock setting
+
+## 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)

--- a/FUNDING.yml
+++ b/FUNDING.yml
@@ -0,0 +1,3 @@
+github: TheLastProject
+custom:
+  - "https://paypal.me/sylviavanos"
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,29 +1,30 @@
 GEM
  remote: https://rubygems.org/
  specs:
-    CFPropertyList (3.0.3)
+    CFPropertyList (3.0.5)
+      rexml
    addressable (2.8.0)
      public_suffix (>= 2.0.2, < 5.0)
    artifactory (3.0.15)
    atomos (0.1.3)
    aws-eventstream (1.2.0)
-    aws-partitions (1.501.0)
-    aws-sdk-core (3.121.0)
+    aws-partitions (1.597.0)
+    aws-sdk-core (3.131.1)
      aws-eventstream (~> 1, >= 1.0.2)
-      aws-partitions (~> 1, >= 1.239.0)
+      aws-partitions (~> 1, >= 1.525.0)
      aws-sigv4 (~> 1.1)
-      jmespath (~> 1.0)
-    aws-sdk-kms (1.48.0)
-      aws-sdk-core (~> 3, >= 3.120.0)
+      jmespath (~> 1, >= 1.6.1)
+    aws-sdk-kms (1.57.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.102.0)
-      aws-sdk-core (~> 3, >= 3.120.0)
+    aws-sdk-s3 (1.114.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
      aws-sdk-kms (~> 1)
      aws-sigv4 (~> 1.4)
-    aws-sigv4 (1.4.0)
+    aws-sigv4 (1.5.0)
      aws-eventstream (~> 1, >= 1.0.2)
    babosa (1.0.4)
-    claide (1.0.3)
+    claide (1.1.0)
    colored (1.2)
    colored2 (3.1.2)
    commander (4.6.0)
@@ -34,18 +35,19 @@ GEM
    domain_name (0.5.20190701)
      unf (>= 0.0.5, < 1.0.0)
    dotenv (2.7.6)
-    emoji_regex (3.2.2)
-    excon (0.85.0)
-    faraday (1.7.2)
+    emoji_regex (3.2.3)
+    excon (0.92.3)
+    faraday (1.10.0)
      faraday-em_http (~> 1.0)
      faraday-em_synchrony (~> 1.0)
      faraday-excon (~> 1.1)
-      faraday-httpclient (~> 1.0.1)
+      faraday-httpclient (~> 1.0)
+      faraday-multipart (~> 1.0)
      faraday-net_http (~> 1.0)
-      faraday-net_http_persistent (~> 1.1)
+      faraday-net_http_persistent (~> 1.0)
      faraday-patron (~> 1.0)
      faraday-rack (~> 1.0)
-      multipart-post (>= 1.2, < 3)
+      faraday-retry (~> 1.0)
      ruby2_keywords (>= 0.0.4)
    faraday-cookie_jar (0.0.7)
      faraday (>= 0.8.0)
@@ -54,14 +56,17 @@ GEM
    faraday-em_synchrony (1.0.0)
    faraday-excon (1.1.0)
    faraday-httpclient (1.0.1)
+    faraday-multipart (1.0.4)
+      multipart-post (~> 2)
    faraday-net_http (1.0.1)
    faraday-net_http_persistent (1.2.0)
    faraday-patron (1.0.0)
    faraday-rack (1.0.0)
-    faraday_middleware (1.1.0)
+    faraday-retry (1.0.3)
+    faraday_middleware (1.2.0)
      faraday (~> 1.0)
-    fastimage (2.2.5)
-    fastlane (2.193.1)
+    fastimage (2.2.6)
+    fastlane (2.206.2)
      CFPropertyList (>= 2.3, < 4.0.0)
      addressable (>= 2.8, < 3.0.0)
      artifactory (~> 3.0)
@@ -101,9 +106,9 @@ GEM
      xcpretty (~> 0.3.0)
      xcpretty-travis-formatter (>= 0.0.3)
    gh_inspector (1.1.3)
-    google-apis-androidpublisher_v3 (0.11.0)
+    google-apis-androidpublisher_v3 (0.21.0)
      google-apis-core (>= 0.4, < 2.a)
-    google-apis-core (0.4.1)
+    google-apis-core (0.5.0)
      addressable (~> 2.5, >= 2.5.1)
      googleauth (>= 0.16.2, < 2.a)
      httpclient (>= 2.8.1, < 3.a)
@@ -112,53 +117,53 @@ GEM
      retriable (>= 2.0, < 4.a)
      rexml
      webrick
-    google-apis-iamcredentials_v1 (0.7.0)
+    google-apis-iamcredentials_v1 (0.10.0)
      google-apis-core (>= 0.4, < 2.a)
-    google-apis-playcustomapp_v1 (0.5.0)
+    google-apis-playcustomapp_v1 (0.7.0)
      google-apis-core (>= 0.4, < 2.a)
-    google-apis-storage_v1 (0.6.0)
+    google-apis-storage_v1 (0.14.0)
      google-apis-core (>= 0.4, < 2.a)
    google-cloud-core (1.6.0)
      google-cloud-env (~> 1.0)
      google-cloud-errors (~> 1.0)
-    google-cloud-env (1.5.0)
-      faraday (>= 0.17.3, < 2.0)
-    google-cloud-errors (1.1.0)
-    google-cloud-storage (1.34.1)
-      addressable (~> 2.5)
+    google-cloud-env (1.6.0)
+      faraday (>= 0.17.3, < 3.0)
+    google-cloud-errors (1.2.0)
+    google-cloud-storage (1.36.2)
+      addressable (~> 2.8)
      digest-crc (~> 0.4)
      google-apis-iamcredentials_v1 (~> 0.1)
      google-apis-storage_v1 (~> 0.1)
      google-cloud-core (~> 1.6)
      googleauth (>= 0.16.2, < 2.a)
      mini_mime (~> 1.0)
-    googleauth (0.17.1)
-      faraday (>= 0.17.3, < 2.0)
+    googleauth (1.1.3)
+      faraday (>= 0.17.3, < 3.a)
      jwt (>= 1.4, < 3.0)
      memoist (~> 0.16)
      multi_json (~> 1.11)
      os (>= 0.9, < 2.0)
-      signet (~> 0.15)
+      signet (>= 0.16, < 2.a)
    highline (2.0.3)
-    http-cookie (1.0.4)
+    http-cookie (1.0.5)
      domain_name (~> 0.5)
    httpclient (2.8.3)
-    jmespath (1.4.0)
-    json (2.5.1)
-    jwt (2.2.3)
+    jmespath (1.6.1)
+    json (2.6.2)
+    jwt (2.4.1)
    memoist (0.16.2)
    mini_magick (4.11.0)
-    mini_mime (1.1.1)
+    mini_mime (1.1.2)
    multi_json (1.15.0)
    multipart-post (2.0.0)
    nanaimo (0.3.0)
    naturally (2.2.1)
    optparse (0.1.1)
-    os (1.1.1)
+    os (1.1.4)
    plist (3.6.0)
-    public_suffix (4.0.6)
+    public_suffix (4.0.7)
    rake (13.0.6)
-    representable (3.1.1)
+    representable (3.2.0)
      declarative (< 0.1.0)
      trailblazer-option (>= 0.1.1, < 0.2.0)
      uber (< 0.2.0)
@@ -168,9 +173,9 @@ GEM
    ruby2_keywords (0.0.5)
    rubyzip (2.3.2)
    security (0.1.3)
-    signet (0.16.0)
+    signet (0.16.1)
      addressable (~> 2.8)
-      faraday (>= 0.17.3, < 2.0)
+      faraday (>= 0.17.5, < 3.0)
      jwt (>= 1.5, < 3.0)
      multi_json (~> 1.10)
    simctl (1.6.8)
@@ -179,7 +184,7 @@ GEM
    terminal-notifier (2.0.0)
    terminal-table (1.8.0)
      unicode-display_width (~> 1.1, >= 1.1.1)
-    trailblazer-option (0.1.1)
+    trailblazer-option (0.1.2)
    tty-cursor (0.7.1)
    tty-screen (0.8.1)
    tty-spinner (0.9.3)
@@ -187,8 +192,8 @@ GEM
    uber (0.1.0)
    unf (0.1.4)
      unf_ext
-    unf_ext (0.0.8)
-    unicode-display_width (1.7.0)
+    unf_ext (0.0.8.2)
+    unicode-display_width (1.8.0)
    webrick (1.7.0)
    word_wrap (1.0.0)
    xcodeproj (1.21.0)
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -18,8 +18,8 @@ android {
        applicationId "me.hackerchick.catima"
        minSdkVersion 21
        targetSdkVersion 31
-        versionCode 95
-        versionName "2.11.2"
+        versionCode 113
+        versionName "2.19.0"

        vectorDrawables.useSupportLibrary true
        multiDexEnabled true
@@ -80,25 +80,25 @@ android {

 dependencies {
 // AndroidX
-    implementation 'androidx.appcompat:appcompat:1.4.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.2'
+    implementation 'androidx.appcompat:appcompat:1.4.2'
+    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'
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
+    implementation 'androidx.preference:preference:1.2.0'
+    implementation 'com.google.android.material:material:1.6.1'
+    implementation 'com.github.yalantis:ucrop:2.2.8'
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.6'

 // Splash Screen
-    implementation 'androidx.core:core-splashscreen:1.0.0-alpha02'
+    implementation 'androidx.core:core-splashscreen:1.0.0'

 // Third-party
    implementation 'com.journeyapps:zxing-android-embedded:4.3.0@aar'
-    implementation 'com.google.zxing:core:3.4.1'
+    implementation 'com.google.zxing:core:3.5.0'
    implementation 'org.apache.commons:commons-csv:1.9.0'
    implementation 'com.jaredrummler:colorpicker:1.1.0'
    implementation 'com.github.invissvenska:NumberPickerPreference:1.0.4'
-    implementation 'net.lingala.zip4j:zip4j:2.9.1'
+    implementation 'net.lingala.zip4j:zip4j:2.11.1'

 // SpotBugs
    implementation 'io.wcm.tooling.spotbugs:io.wcm.tooling.spotbugs.annotations:1.0.0'
@@ -106,7 +106,7 @@ dependencies {
 // Testing
    testImplementation 'androidx.test:core:1.4.0'
    testImplementation 'junit:junit:4.13.2'
-    testImplementation 'org.robolectric:robolectric:4.7.3'
+    testImplementation 'org.robolectric:robolectric:4.8.1'
 }

 tasks.withType(SpotBugsTask) {
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -116,7 +116,7 @@
        </activity>

        <activity
-            android:name="com.yalantis.ucrop.UCropActivity"
+            android:name=".UCropWrapper"
            android:theme="@style/AppTheme.NoActionBar" />

        <provider
@@ -134,7 +134,5 @@
                <action android:name="android.service.controls.ControlsProviderService" />
            </intent-filter>
        </service>
-
    </application>
-
 </manifest>
--- a/app/src/main/java/protect/card_locker/AboutActivity.java
+++ b/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 {
--- a/app/src/main/java/protect/card_locker/BarcodeImageWriterTask.java
+++ b/app/src/main/java/protect/card_locker/BarcodeImageWriterTask.java
@@ -5,6 +5,7 @@ import android.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;
    }

--- a/app/src/main/java/protect/card_locker/BarcodeSelectorAdapter.java
+++ b/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);
        }
    }
--- a/app/src/main/java/protect/card_locker/CardShortcutConfigure.java
+++ b/app/src/main/java/protect/card_locker/CardShortcutConfigure.java
@@ -4,9 +4,10 @@ import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.os.Bundle;
 import android.util.Log;
+import android.view.Menu;
+import android.view.MenuItem;
 import android.widget.Toast;

-import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
 import androidx.core.content.pm.ShortcutInfoCompat;
 import androidx.core.content.pm.ShortcutManagerCompat;
@@ -16,9 +17,10 @@ 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";
    private SQLiteDatabase mDatabase;
+    private LoyaltyCardCursorAdapter mAdapter;

    @Override
    public void onCreate(Bundle bundle) {
@@ -33,26 +35,34 @@ public class CardShortcutConfigure extends AppCompatActivity implements LoyaltyC
        setContentView(R.layout.simple_toolbar_list_activity);
        Toolbar toolbar = findViewById(R.id.toolbar);
        toolbar.setTitle(R.string.shortcutSelectCard);
+        setSupportActionBar(toolbar);

        // If there are no cards, bail
-        if (DBHelper.getLoyaltyCardCount(mDatabase) == 0) {
+        int cardCount = DBHelper.getLoyaltyCardCount(mDatabase);
+        if (cardCount == 0) {
            Toast.makeText(this, R.string.noCardsMessage, Toast.LENGTH_LONG).show();
            finish();
        }

+        // If all cards are archived, bail
+        if (DBHelper.getArchivedCardsCount(mDatabase) == cardCount) {
+            Toast.makeText(this, R.string.noUnarchivedCardsMessage, 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));
        }

-        Cursor cardCursor = DBHelper.getLoyaltyCardCursor(mDatabase);
-        final LoyaltyCardCursorAdapter adapter = new LoyaltyCardCursorAdapter(this, cardCursor, this);
-        cardList.setAdapter(adapter);
+        Cursor cardCursor = DBHelper.getLoyaltyCardCursor(mDatabase, DBHelper.LoyaltyCardArchiveFilter.Unarchived);
+        mAdapter = new LoyaltyCardCursorAdapter(this, cardCursor, this);
+        cardList.setAdapter(mAdapter);
    }

    private void onClickAction(int position) {
-        Cursor selected = DBHelper.getLoyaltyCardCursor(mDatabase);
+        Cursor selected = DBHelper.getLoyaltyCardCursor(mDatabase, DBHelper.LoyaltyCardArchiveFilter.Unarchived);
        selected.moveToPosition(position);
        LoyaltyCard loyaltyCard = LoyaltyCard.toLoyaltyCard(selected);

@@ -65,6 +75,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) {
--- a/app/src/main/java/protect/card_locker/CardsOnPowerScreenService.java
+++ b/app/src/main/java/protect/card_locker/CardsOnPowerScreenService.java
@@ -16,13 +16,13 @@ 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;

+import androidx.annotation.NonNull;
+import androidx.annotation.RequiresApi;
+
@RequiresApi(Build.VERSION_CODES.R)
 public class CardsOnPowerScreenService extends ControlsProviderService {

@@ -40,7 +40,7 @@ public class CardsOnPowerScreenService extends ControlsProviderService {
    @NonNull
    @Override
    public Flow.Publisher<Control> createPublisherForAllAvailable() {
-        Cursor loyaltyCardCursor = DBHelper.getLoyaltyCardCursor(mDatabase);
+        Cursor loyaltyCardCursor = DBHelper.getLoyaltyCardCursor(mDatabase, DBHelper.LoyaltyCardArchiveFilter.Unarchived);
        return subscriber -> {
            while (loyaltyCardCursor.moveToNext()) {
                LoyaltyCard card = LoyaltyCard.toLoyaltyCard(loyaltyCardCursor);
--- a/app/src/main/java/protect/card_locker/CatimaAppCompatActivity.java
+++ b/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 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;
-
-import java.util.HashMap;

 public class CatimaAppCompatActivity extends AppCompatActivity {
-
-    SharedPreferences pref;
-    HashMap<String, Integer> supportedThemes;
-
    @Override
    protected void attachBaseContext(Context base) {
        // Apply chosen language
@@ -22,32 +17,25 @@ 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);
-        }
-
-        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;
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        Utils.patchColors(this);
    }

-    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);
    }
 }
--- a/app/src/main/java/protect/card_locker/CatimaBarcode.java
+++ b/app/src/main/java/protect/card_locker/CatimaBarcode.java
@@ -72,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;
    }
--- a/app/src/main/java/protect/card_locker/DBHelper.java
+++ b/app/src/main/java/protect/card_locker/DBHelper.java
@@ -21,7 +21,7 @@ import java.util.List;
 public class DBHelper extends SQLiteOpenHelper {
    public static final String DATABASE_NAME = "Catima.db";
    public static final int ORIGINAL_DATABASE_VERSION = 1;
-    public static final int DATABASE_VERSION = 14;
+    public static final int DATABASE_VERSION = 15;

    public static class LoyaltyCardDbGroups {
        public static final String TABLE = "groups";
@@ -45,6 +45,7 @@ public class DBHelper extends SQLiteOpenHelper {
        public static final String STAR_STATUS = "starstatus";
        public static final String LAST_USED = "lastused";
        public static final String ZOOM_LEVEL = "zoomlevel";
+        public static final String ARCHIVE_STATUS = "archive";
    }

    public static class LoyaltyCardDbIdsGroups {
@@ -71,6 +72,12 @@ public class DBHelper extends SQLiteOpenHelper {
        Descending
    }

+    public enum LoyaltyCardArchiveFilter {
+        All,
+        Archived,
+        Unarchived
+    }
+
    public DBHelper(Context context) {
        super(context, DATABASE_NAME, null, DATABASE_VERSION);
    }
@@ -97,7 +104,8 @@ public class DBHelper extends SQLiteOpenHelper {
                LoyaltyCardDbIds.BARCODE_TYPE + " TEXT," +
                LoyaltyCardDbIds.STAR_STATUS + " INTEGER DEFAULT '0'," +
                LoyaltyCardDbIds.LAST_USED + " INTEGER DEFAULT '0', " +
-                LoyaltyCardDbIds.ZOOM_LEVEL + " INTEGER DEFAULT '100' )");
+                LoyaltyCardDbIds.ZOOM_LEVEL + " INTEGER DEFAULT '100', " +
+                LoyaltyCardDbIds.ARCHIVE_STATUS + " INTEGER DEFAULT '0' )");

        // create associative table for cards in groups
        db.execSQL("CREATE TABLE " + LoyaltyCardDbIdsGroups.TABLE + "(" +
@@ -302,6 +310,10 @@ public class DBHelper extends SQLiteOpenHelper {
            db.execSQL("ALTER TABLE " + LoyaltyCardDbIds.TABLE
                    + " ADD COLUMN " + LoyaltyCardDbIds.ZOOM_LEVEL + " INTEGER DEFAULT '100' ");
        }
+        if (oldVersion < 15 && newVersion >= 15) {
+            db.execSQL("ALTER TABLE " + LoyaltyCardDbIds.TABLE
+                    + " ADD COLUMN " + LoyaltyCardDbIds.ARCHIVE_STATUS + " INTEGER DEFAULT '0' ");
+        }
    }

    private static ContentValues generateFTSContentValues(final int id, final String store, final String note) {
@@ -349,7 +361,7 @@ public class DBHelper extends SQLiteOpenHelper {
            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) {
+            final int starStatus, final Long lastUsed,final int archiveStatus) {
        database.beginTransaction();

        // Card
@@ -365,6 +377,7 @@ 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());
+        contentValues.put(LoyaltyCardDbIds.ARCHIVE_STATUS, archiveStatus);
        long id = database.insert(LoyaltyCardDbIds.TABLE, null, contentValues);

        // FTS
@@ -380,7 +393,7 @@ public class DBHelper extends SQLiteOpenHelper {
            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) {
+            final Integer headerColor, final int starStatus, final Long lastUsed, final int archiveStatus) {
        database.beginTransaction();

        // Card
@@ -397,6 +410,7 @@ 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());
+        contentValues.put(LoyaltyCardDbIds.ARCHIVE_STATUS, archiveStatus);
        database.insert(LoyaltyCardDbIds.TABLE, null, contentValues);

        // FTS
@@ -438,6 +452,15 @@ public class DBHelper extends SQLiteOpenHelper {
        return (rowsUpdated == 1);
    }

+    public static boolean updateLoyaltyCardArchiveStatus(SQLiteDatabase database, final int id, final int archiveStatus) {
+        ContentValues contentValues = new ContentValues();
+        contentValues.put(LoyaltyCardDbIds.ARCHIVE_STATUS, archiveStatus);
+        int rowsUpdated = database.update(LoyaltyCardDbIds.TABLE, contentValues,
+                whereAttrs(LoyaltyCardDbIds.ID),
+                withArgs(id));
+        return (rowsUpdated == 1);
+    }
+
    public static boolean updateLoyaltyCardStarStatus(SQLiteDatabase database, final int id, final int starStatus) {
        ContentValues contentValues = new ContentValues();
        contentValues.put(LoyaltyCardDbIds.STAR_STATUS, starStatus);
@@ -549,9 +572,35 @@ public class DBHelper extends SQLiteOpenHelper {
        return (rowsDeleted == 1);
    }

+    public static int getArchivedCardsCount(SQLiteDatabase database) {
+        return (int) DatabaseUtils.queryNumEntries(database, LoyaltyCardDbIds.TABLE,
+                whereAttrs(LoyaltyCardDbIds.ARCHIVE_STATUS), withArgs(1));
+    }
+
+    public static int getArchivedCardsCount(SQLiteDatabase database, final String groupName) {
+        Cursor data = database.rawQuery(
+                "select * from " + LoyaltyCardDbIds.TABLE + " c " +
+                        " LEFT JOIN " + LoyaltyCardDbIdsGroups.TABLE + " cg " +
+                        " ON c." + LoyaltyCardDbIds.ID + " = cg." + LoyaltyCardDbIdsGroups.cardID +
+                " where " + LoyaltyCardDbIds.ARCHIVE_STATUS + " = 1" +
+                " AND " + LoyaltyCardDbIdsGroups.groupID + "= ?",
+                withArgs(groupName)
+        );
+
+        int count = data.getCount();
+
+        data.close();
+        return count;
+    }
+
    public static Cursor getLoyaltyCardCursor(SQLiteDatabase database) {
        // An empty string will match everything
-        return getLoyaltyCardCursor(database, "");
+        return getLoyaltyCardCursor(database, LoyaltyCardArchiveFilter.All);
+    }
+
+    public static Cursor getLoyaltyCardCursor(SQLiteDatabase database, LoyaltyCardArchiveFilter archiveFilter) {
+        // An empty string will match everything
+        return getLoyaltyCardCursor(database, "", archiveFilter);
    }

    /**
@@ -560,8 +609,8 @@ public class DBHelper extends SQLiteOpenHelper {
     * @param filter
     * @return Cursor
     */
-    public static Cursor getLoyaltyCardCursor(SQLiteDatabase database, final String filter) {
-        return getLoyaltyCardCursor(database, filter, null);
+    public static Cursor getLoyaltyCardCursor(SQLiteDatabase database, final String filter, LoyaltyCardArchiveFilter archiveFilter) {
+        return getLoyaltyCardCursor(database, filter, null, archiveFilter);
    }

    /**
@@ -571,8 +620,8 @@ public class DBHelper extends SQLiteOpenHelper {
     * @param group
     * @return Cursor
     */
-    public static Cursor getLoyaltyCardCursor(SQLiteDatabase database, final String filter, Group group) {
-        return getLoyaltyCardCursor(database, filter, group, LoyaltyCardOrder.Alpha, LoyaltyCardOrderDirection.Ascending);
+    public static Cursor getLoyaltyCardCursor(SQLiteDatabase database, final String filter, Group group, LoyaltyCardArchiveFilter archiveFilter) {
+        return getLoyaltyCardCursor(database, filter, group, LoyaltyCardOrder.Alpha, LoyaltyCardOrderDirection.Ascending, archiveFilter);
    }

    /**
@@ -583,7 +632,7 @@ public class DBHelper extends SQLiteOpenHelper {
     * @param order
     * @return Cursor
     */
-    public static Cursor getLoyaltyCardCursor(SQLiteDatabase database, String filter, Group group, LoyaltyCardOrder order, LoyaltyCardOrderDirection direction) {
+    public static Cursor getLoyaltyCardCursor(SQLiteDatabase database, String filter, Group group, LoyaltyCardOrder order, LoyaltyCardOrderDirection direction, LoyaltyCardArchiveFilter archiveFilter) {
        StringBuilder groupFilter = new StringBuilder();
        String limitString = "";

@@ -606,6 +655,11 @@ public class DBHelper extends SQLiteOpenHelper {
            }
        }

+        String archiveFilterString = "";
+        if (archiveFilter != LoyaltyCardArchiveFilter.All) {
+            archiveFilterString = " AND " + LoyaltyCardDbIds.TABLE + "." + LoyaltyCardDbIds.ARCHIVE_STATUS + " = " + (archiveFilter.equals(LoyaltyCardArchiveFilter.Unarchived) ? 0 : 1);
+        }
+
        String orderField = getFieldForOrder(order);

        return database.rawQuery("SELECT " + LoyaltyCardDbIds.TABLE + ".* FROM " + LoyaltyCardDbIds.TABLE +
@@ -613,7 +667,9 @@ public class DBHelper extends SQLiteOpenHelper {
                " ON " + LoyaltyCardDbFTS.TABLE + "." + LoyaltyCardDbFTS.ID + " = " + LoyaltyCardDbIds.TABLE + "." + LoyaltyCardDbIds.ID +
                (filter.trim().isEmpty() ? " " : " AND " + LoyaltyCardDbFTS.TABLE + " MATCH ? ") +
                groupFilter.toString() +
-                " ORDER BY " + LoyaltyCardDbIds.TABLE + "." + LoyaltyCardDbIds.STAR_STATUS + " DESC, " +
+                archiveFilterString +
+                " ORDER BY " + LoyaltyCardDbIds.TABLE + "." + LoyaltyCardDbIds.ARCHIVE_STATUS + " ASC, " +
+                LoyaltyCardDbIds.TABLE + "." + LoyaltyCardDbIds.STAR_STATUS + " DESC, " +
                " (CASE WHEN " + LoyaltyCardDbIds.TABLE + "." + orderField + " IS NULL THEN 1 ELSE 0 END), " +
                LoyaltyCardDbIds.TABLE + "." + orderField + " COLLATE NOCASE " + getDbDirection(order, direction) + ", " +
                LoyaltyCardDbIds.TABLE + "." + LoyaltyCardDbIds.STORE + " COLLATE NOCASE ASC " +
--- a/app/src/main/java/protect/card_locker/GroupCursorAdapter.java
+++ b/app/src/main/java/protect/card_locker/GroupCursorAdapter.java
@@ -1,6 +1,7 @@
 package protect.card_locker;

 import android.content.Context;
+import android.content.res.Resources;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.view.LayoutInflater;
@@ -15,7 +16,7 @@ import protect.card_locker.preferences.Settings;

 public class GroupCursorAdapter extends BaseCursorAdapter<GroupCursorAdapter.GroupListItemViewHolder> {
    Settings mSettings;
-    private final Context mContext;
+    public final Context mContext;
    private final GroupAdapterListener mListener;
    SQLiteDatabase mDatabase;

@@ -23,7 +24,7 @@ public class GroupCursorAdapter extends BaseCursorAdapter<GroupCursorAdapter.Gro
        super(inputCursor, DBHelper.LoyaltyCardDbGroups.ORDER);
        setHasStableIds(true);
        mSettings = new Settings(inputContext);
-        mContext = inputContext.getApplicationContext();
+        mContext = inputContext;
        mListener = inputListener;
        mDatabase = new DBHelper(inputContext).getReadableDatabase();

@@ -43,8 +44,18 @@ public class GroupCursorAdapter extends BaseCursorAdapter<GroupCursorAdapter.Gro
        inputHolder.mName.setText(group._id);

        int groupCardCount = DBHelper.getGroupCardCount(mDatabase, group._id);
-        inputHolder.mCardCount.setText(mContext.getResources().getQuantityString(R.plurals.groupCardCount, groupCardCount, groupCardCount));
+        int archivedCardCount = DBHelper.getArchivedCardsCount(mDatabase, group._id);

+        Resources resources = mContext.getResources();
+
+        String cardCountText;
+        if (archivedCardCount > 0) {
+            cardCountText = resources.getQuantityString(R.plurals.groupCardCountWithArchived, groupCardCount, groupCardCount, archivedCardCount);
+        }  else {
+            cardCountText = resources.getQuantityString(R.plurals.groupCardCount, groupCardCount, groupCardCount);
+        }
+
+        inputHolder.mCardCount.setText(cardCountText);
        inputHolder.mName.setTextSize(mSettings.getFontSizeMax(mSettings.getMediumFont()));
        inputHolder.mCardCount.setTextSize(mSettings.getFontSizeMax(mSettings.getSmallFont()));

--- a/app/src/main/java/protect/card_locker/ImportExportActivity.java
+++ b/app/src/main/java/protect/card_locker/ImportExportActivity.java
@@ -1,10 +1,7 @@
 package protect.card_locker;

 import android.Manifest;
-import android.app.NotificationManager;
-import android.app.PendingIntent;
 import android.content.ActivityNotFoundException;
-import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.pm.PackageManager;
@@ -19,26 +16,23 @@ import android.widget.EditText;
 import android.widget.FrameLayout;
 import android.widget.Toast;

-import androidx.activity.result.ActivityResultLauncher;
-import androidx.activity.result.contract.ActivityResultContracts;
-import androidx.appcompat.app.ActionBar;
-import androidx.appcompat.app.AlertDialog;
-import androidx.appcompat.widget.Toolbar;
-import androidx.core.app.ActivityCompat;
-import androidx.core.app.NotificationCompat;
-import androidx.core.content.ContextCompat;
-
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.List;

+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 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";
@@ -58,12 +52,6 @@ public class ImportExportActivity extends CatimaAppCompatActivity {

    final private TaskHandler mTasks = new TaskHandler();

-    private NotificationManager mNotifyManager;
-    private NotificationCompat.Builder mBuilder;
-
-    private static final int NOTIFICATION_IMPORT = 1;
-    private static final int NOTIFICATION_EXPORT = 2;
-
    @Override
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
@@ -104,10 +92,10 @@ public class ImportExportActivity extends CatimaAppCompatActivity {
            try {
                OutputStream writer = getContentResolver().openOutputStream(uri);
                Log.e(TAG, "Starting file export with: " + result.toString());
-                startExport(writer, uri, exportPassword != null ? exportPassword.toCharArray() : null, true);
+                startExport(writer, uri, exportPassword.toCharArray(), true);
            } catch (IOException e) {
                Log.e(TAG, "Failed to export file: " + result.toString(), e);
-                onExportComplete(ImportExportResult.GenericFailure, uri);
+                onExportComplete(new ImportExportResult(ImportExportResultType.GenericFailure, result.toString()), uri);
            }

        });
@@ -185,7 +173,7 @@ public class ImportExportActivity extends CatimaAppCompatActivity {
            startImport(reader, uri, importDataFormat, password, true);
        } catch (IOException e) {
            Log.e(TAG, "Failed to import file: " + uri.toString(), e);
-            onImportComplete(ImportExportResult.GenericFailure, uri, importDataFormat);
+            onImportComplete(new ImportExportResult(ImportExportResultType.GenericFailure, e.toString()), uri, importDataFormat);
        }
    }

@@ -266,59 +254,22 @@ public class ImportExportActivity extends CatimaAppCompatActivity {
        builder.show();
    }

-    private void startProgressNotification(boolean importing) {
-        mNotifyManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
-        mBuilder = new NotificationCompat.Builder(this, NotificationType.getImportExportChannel(this));
-        mBuilder.setContentTitle(getString(importing ? R.string.importing : R.string.exporting))
-                .setContentText(null)
-                .setSmallIcon(R.drawable.ic_import_export_white_24dp)
-                .setColor(getThemeColor())
-                .setProgress(0, 0, true);
-        mNotifyManager.notify(importing ? NOTIFICATION_IMPORT : NOTIFICATION_EXPORT, mBuilder.build());
-    }
-
-    private void endProgressNotification(boolean importing, ImportExportResult result, PendingIntent sendIntent) {
-        String notificationTitle;
-        String notificationMessage;
-
-        if (result.equals(ImportExportResult.Success)) {
-            notificationTitle = getString(importing ? R.string.importSuccessfulTitle : R.string.exportSuccessfulTitle);
-            notificationMessage = getString(importing ? R.string.importSuccessful : R.string.exportSuccessful);
-        } else {
-            int reason = R.string.unknown_failure;
-            if (result.equals(ImportExportResult.BadPassword)) {
-                reason = R.string.incorrect_password;
-            }
-
-            notificationTitle = getString(importing ? R.string.importFailedTitle : R.string.exportFailedTitle);
-            notificationMessage = String.format(getString(importing ? R.string.importFailed : R.string.exportFailed), getString(reason));
-        }
-
-        mBuilder.setContentTitle(notificationTitle)
-                .setContentText(notificationMessage)
-                .setProgress(0,0, false);
-
-        if (sendIntent != null) {
-            mBuilder.addAction(R.drawable.ic_share, getString(R.string.sendLabel), sendIntent);
-        }
-
-        mNotifyManager.notify(importing ? NOTIFICATION_IMPORT : NOTIFICATION_EXPORT, mBuilder.build());
-    }
-
    private void startImport(final InputStream target, final Uri targetUri, final DataFormat dataFormat, final char[] password, final boolean closeWhenDone) {
        mTasks.flushTaskList(TaskHandler.TYPE.IMPORT, true, false, false);
-        ImportExportTask.TaskCompleteListener listener = (result, dataFormat1) -> {
-            onImportComplete(result, targetUri, dataFormat1);
-            if (closeWhenDone) {
-                try {
-                    target.close();
-                } catch (IOException ioException) {
-                    ioException.printStackTrace();
+        ImportExportTask.TaskCompleteListener listener = new ImportExportTask.TaskCompleteListener() {
+            @Override
+            public void onTaskComplete(ImportExportResult result, DataFormat dataFormat) {
+                onImportComplete(result, targetUri, dataFormat);
+                if (closeWhenDone) {
+                    try {
+                        target.close();
+                    } catch (IOException ioException) {
+                        ioException.printStackTrace();
+                    }
                }
            }
        };

-        startProgressNotification(true);
        importExporter = new ImportExportTask(ImportExportActivity.this,
                dataFormat, target, password, listener);
        mTasks.executeTask(TaskHandler.TYPE.IMPORT, importExporter);
@@ -326,18 +277,20 @@ public class ImportExportActivity extends CatimaAppCompatActivity {

    private void startExport(final OutputStream target, final Uri targetUri, char[] password, final boolean closeWhenDone) {
        mTasks.flushTaskList(TaskHandler.TYPE.EXPORT, true, false, false);
-        ImportExportTask.TaskCompleteListener listener = (result, dataFormat) -> {
-            onExportComplete(result, targetUri);
-            if (closeWhenDone) {
-                try {
-                    target.close();
-                } catch (IOException ioException) {
-                    ioException.printStackTrace();
+        ImportExportTask.TaskCompleteListener listener = new ImportExportTask.TaskCompleteListener() {
+            @Override
+            public void onTaskComplete(ImportExportResult result, DataFormat dataFormat) {
+                onExportComplete(result, targetUri);
+                if (closeWhenDone) {
+                    try {
+                        target.close();
+                    } catch (IOException ioException) {
+                        ioException.printStackTrace();
+                    }
                }
            }
        };

-        startProgressNotification(false);
        importExporter = new ImportExportTask(ImportExportActivity.this,
                DataFormat.Catima, target, password, listener);
        mTasks.executeTask(TaskHandler.TYPE.EXPORT, importExporter);
@@ -402,28 +355,68 @@ public class ImportExportActivity extends CatimaAppCompatActivity {
        builder.show();
    }

-    private void onImportComplete(ImportExportResult result, Uri path, DataFormat dataFormat) {
-        endProgressNotification(true, result, null);
+    private String buildResultDialogMessage(ImportExportResult result, boolean isImport) {
+        int messageId;

-        if (result == ImportExportResult.BadPassword) {
-            retryWithPassword(dataFormat, path);
+        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) {
+        ImportExportResultType resultType = result.resultType();
+
+        if (resultType == ImportExportResultType.BadPassword) {
+            retryWithPassword(dataFormat, path);
+            return;
+        }
+
+        AlertDialog.Builder builder = new AlertDialog.Builder(this);
+        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) {
-        PendingIntent pendingIntent = null;
+        ImportExportResultType resultType = result.resultType();

-        if (result == ImportExportResult.Success) {
-            Intent sendIntent = new Intent(Intent.ACTION_SEND);
-            sendIntent.putExtra(Intent.EXTRA_STREAM, path);
-            sendIntent.setType("text/csv");
+        AlertDialog.Builder builder = new AlertDialog.Builder(this);
+        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());

-            // set flag to give temporary permission to external app to use the FileProvider
-            sendIntent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
+        if (resultType == ImportExportResultType.Success) {
+            final CharSequence sendLabel = ImportExportActivity.this.getResources().getText(R.string.sendLabel);

-            pendingIntent = PendingIntent.getActivity(this, NOTIFICATION_EXPORT, sendIntent, PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_IMMUTABLE);
+            builder.setPositiveButton(sendLabel, (dialog, which) -> {
+                Intent sendIntent = new Intent(Intent.ACTION_SEND);
+                sendIntent.putExtra(Intent.EXTRA_STREAM, path);
+                sendIntent.setType("text/csv");
+
+                // set flag to give temporary permission to external app to use the FileProvider
+                sendIntent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
+
+                ImportExportActivity.this.startActivity(Intent.createChooser(sendIntent,
+                        sendLabel));
+
+                dialog.dismiss();
+            });
        }

-        endProgressNotification(false, result, pendingIntent);
+        builder.create().show();
    }
 }
--- a/app/src/main/java/protect/card_locker/ImportExportTask.java
+++ b/app/src/main/java/protect/card_locker/ImportExportTask.java
@@ -1,7 +1,7 @@
 package protect.card_locker;

 import android.app.Activity;
-import android.app.NotificationManager;
+import android.app.ProgressDialog;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.database.sqlite.SQLiteDatabase;
@@ -13,23 +13,25 @@ import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.nio.charset.StandardCharsets;

-import androidx.core.app.NotificationCompat;
 import protect.card_locker.async.CompatCallable;
 import protect.card_locker.importexport.DataFormat;
 import protect.card_locker.importexport.ImportExportResult;
+import protect.card_locker.importexport.ImportExportResultType;
 import protect.card_locker.importexport.MultiFormatExporter;
 import protect.card_locker.importexport.MultiFormatImporter;

 public class ImportExportTask implements CompatCallable<ImportExportResult> {
    private static final String TAG = "Catima";

-    private final Activity activity;
-    private final boolean doImport;
-    private final DataFormat format;
+    private Activity activity;
+    private boolean doImport;
+    private DataFormat format;
    private OutputStream outputStream;
    private InputStream inputStream;
-    private final char[] password;
-    private final TaskCompleteListener listener;
+    private char[] password;
+    private TaskCompleteListener listener;
+
+    private ProgressDialog progress;

    /**
     * Constructor which will setup a task for exporting to the given file
@@ -60,21 +62,22 @@ public class ImportExportTask implements CompatCallable<ImportExportResult> {
    }

    private ImportExportResult performImport(Context context, InputStream stream, SQLiteDatabase database, char[] password) {
-        ImportExportResult result = MultiFormatImporter.importData(context, database, stream, format, password);
+        ImportExportResult importResult = MultiFormatImporter.importData(context, database, stream, format, password);

-        Log.i(TAG, "Import result: " + result.name());
+        Log.i(TAG, "Import result: " + importResult);

-        return result;
+        return importResult;
    }

    private ImportExportResult performExport(Context context, OutputStream stream, SQLiteDatabase database, char[] password) {
-        ImportExportResult result = ImportExportResult.GenericFailure;
+        ImportExportResult result;

        try {
            OutputStreamWriter writer = new OutputStreamWriter(stream, StandardCharsets.UTF_8);
            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);
        }

@@ -83,6 +86,20 @@ public class ImportExportTask implements CompatCallable<ImportExportResult> {
        return result;
    }

+    public void onPreExecute() {
+        progress = new ProgressDialog(activity);
+        progress.setTitle(doImport ? R.string.importing : R.string.exporting);
+
+        progress.setOnDismissListener(new DialogInterface.OnDismissListener() {
+            @Override
+            public void onDismiss(DialogInterface dialog) {
+                ImportExportTask.this.stop();
+            }
+        });
+
+        progress.show();
+    }
+
    protected ImportExportResult doInBackground(Void... nothing) {
        final SQLiteDatabase database = new DBHelper(activity).getWritableDatabase();
        ImportExportResult result;
@@ -99,15 +116,15 @@ public class ImportExportTask implements CompatCallable<ImportExportResult> {
    }

    public void onPostExecute(Object castResult) {
-        ImportExportResult result = (ImportExportResult) castResult;
-
-        listener.onTaskComplete(result, format);
+        listener.onTaskComplete((ImportExportResult) castResult, format);

+        progress.dismiss();
        Log.i(TAG, (doImport ? "Import" : "Export") + " Complete");
    }

-    @Override
-    public void onPreExecute() {
+    protected void onCancelled() {
+        progress.dismiss();
+        Log.i(TAG, (doImport ? "Import" : "Export") + " Cancelled");
    }

    protected void stop() {
--- a/app/src/main/java/protect/card_locker/ImportURIHelper.java
+++ b/app/src/main/java/protect/card_locker/ImportURIHelper.java
@@ -116,7 +116,7 @@ public class ImportURIHelper {
                headerColor = Integer.parseInt(unparsedHeaderColor);
            }

-            return new LoyaltyCard(-1, store, note, expiry, balance, balanceType, cardId, barcodeId, barcodeType, headerColor, 0, Utils.getUnixTime(), 100);
+            return new LoyaltyCard(-1, store, note, expiry, balance, balanceType, cardId, barcodeId, barcodeType, headerColor, 0, Utils.getUnixTime(), 100,0);
        } catch (NullPointerException | NumberFormatException | UnsupportedEncodingException ex) {
            throw new InvalidObjectException("Not a valid import URI");
        }
--- a/app/src/main/java/protect/card_locker/LetterBitmap.java
+++ b/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.
--- a/app/src/main/java/protect/card_locker/LoyaltyCard.java
+++ b/app/src/main/java/protect/card_locker/LoyaltyCard.java
@@ -29,13 +29,14 @@ public class LoyaltyCard implements Parcelable {
    public final Integer headerColor;

    public final int starStatus;
+    public final int archiveStatus;
    public final long lastUsed;
    public int zoomLevel;

    public LoyaltyCard(final int id, final String store, final String note, final Date expiry,
                       final BigDecimal balance, final Currency balanceType, final String cardId,
                       @Nullable final String barcodeId, @Nullable final CatimaBarcode barcodeType,
-                       @Nullable final Integer headerColor, final int starStatus, final long lastUsed, final int zoomLevel) {
+                       @Nullable final Integer headerColor, final int starStatus, final long lastUsed, final int zoomLevel,final int archiveStatus) {
        this.id = id;
        this.store = store;
        this.note = note;
@@ -49,6 +50,7 @@ public class LoyaltyCard implements Parcelable {
        this.starStatus = starStatus;
        this.lastUsed = lastUsed;
        this.zoomLevel = zoomLevel;
+        this.archiveStatus = archiveStatus;
    }

    protected LoyaltyCard(Parcel in) {
@@ -68,6 +70,7 @@ public class LoyaltyCard implements Parcelable {
        starStatus = in.readInt();
        lastUsed = in.readLong();
        zoomLevel = in.readInt();
+        archiveStatus = in.readInt();
    }

    @Override
@@ -85,6 +88,7 @@ public class LoyaltyCard implements Parcelable {
        parcel.writeInt(starStatus);
        parcel.writeLong(lastUsed);
        parcel.writeInt(zoomLevel);
+        parcel.writeInt(archiveStatus);
    }

    public static LoyaltyCard toLoyaltyCard(Cursor cursor) {
@@ -98,6 +102,7 @@ public class LoyaltyCard implements Parcelable {
        int starred = cursor.getInt(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.STAR_STATUS));
        long lastUsed = cursor.getLong(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.LAST_USED));
        int zoomLevel = cursor.getInt(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.ZOOM_LEVEL));
+        int archived = cursor.getInt(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.ARCHIVE_STATUS));

        int barcodeTypeColumn = cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.BARCODE_TYPE);
        int balanceTypeColumn = cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.BALANCE_TYPE);
@@ -124,7 +129,7 @@ public class LoyaltyCard implements Parcelable {
            headerColor = cursor.getInt(headerColorColumn);
        }

-        return new LoyaltyCard(id, store, note, expiry, balance, balanceType, cardId, barcodeId, barcodeType, headerColor, starred, lastUsed, zoomLevel);
+        return new LoyaltyCard(id, store, note, expiry, balance, balanceType, cardId, barcodeId, barcodeType, headerColor, starred, lastUsed, zoomLevel,archived);
    }

    @Override
--- a/app/src/main/java/protect/card_locker/LoyaltyCardCursorAdapter.java
+++ b/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,12 +16,6 @@ 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;
-import androidx.recyclerview.widget.RecyclerView;
-
 import com.google.android.material.card.MaterialCardView;

 import java.math.BigDecimal;
@@ -29,36 +24,58 @@ import java.util.ArrayList;
 import java.util.Currency;
 import java.util.Date;

+import androidx.constraintlayout.widget.ConstraintLayout;
+import androidx.core.graphics.BlendModeColorFilterCompat;
+import androidx.core.graphics.BlendModeCompat;
+import androidx.recyclerview.widget.RecyclerView;
 import protect.card_locker.preferences.Settings;

 public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCursorAdapter.LoyaltyCardListItemViewHolder> {
    private int mCurrentSelectedIndex = -1;
    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, DBHelper.LoyaltyCardDbIds.ID);
        setHasStableIds(true);
        mSettings = new Settings(inputContext);
-        mContext = inputContext.getApplicationContext();
+        mContext = inputContext;
        mListener = inputListener;
        mSelectedItems = new SparseBooleanArray();
        mAnimationItemsIndex = new SparseBooleanArray();

        mDarkModeEnabled = Utils.isDarkModeEnabled(inputContext);

+        refreshState();
+
        swapCursor(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() {
@@ -101,6 +118,7 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
            inputHolder.setExpiryField(null);
        }

+        setHeaderHeight(inputHolder, mShowDetails);
        Bitmap cardIcon = Utils.retrieveCardImage(mContext, loyaltyCard.id, ImageLocationType.icon);
        if (cardIcon != null) {
            inputHolder.mCardIcon.setImageBitmap(cardIcon);
@@ -109,9 +127,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.setIconBackgroundColor(loyaltyCard.headerColor != null ? loyaltyCard.headerColor : ContextCompat.getColor(mContext, R.color.colorPrimary));
+        inputHolder.setIconBackgroundColor(loyaltyCard.headerColor != null ? loyaltyCard.headerColor : R.attr.colorPrimary);

-        inputHolder.toggleStar(loyaltyCard.starStatus != 0, itemSelected(inputCursor.getPosition()));
+        inputHolder.toggleCardStateIcon(loyaltyCard.starStatus != 0, loyaltyCard.archiveStatus != 0, itemSelected(inputCursor.getPosition()));

        inputHolder.itemView.setActivated(mSelectedItems.get(inputCursor.getPosition(), false));
        applyIconAnimation(inputHolder, inputCursor.getPosition());
@@ -121,6 +139,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));

@@ -137,14 +168,12 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso

    private void applyIconAnimation(LoyaltyCardListItemViewHolder inputHolder, int inputPosition) {
        if (itemSelected(inputPosition)) {
-            inputHolder.mCardIcon.setVisibility(View.GONE);
            inputHolder.mTickIcon.setVisibility(View.VISIBLE);
            if (mCurrentSelectedIndex == inputPosition) {
                resetCurrentIndex();
            }
        } else {
            inputHolder.mTickIcon.setVisibility(View.GONE);
-            inputHolder.mCardIcon.setVisibility(View.VISIBLE);
            if ((mReverseAllAnimations && mAnimationItemsIndex.get(inputPosition, false)) || mCurrentSelectedIndex == inputPosition) {
                resetCurrentIndex();
            }
@@ -199,13 +228,15 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
    public class LoyaltyCardListItemViewHolder extends RecyclerView.ViewHolder {

        public TextView mStoreField, mNoteField, mBalanceField, mExpiryField;
-        public ImageView mCardIcon, mStarBackground, mStarBorder, mTickIcon;
-        public MaterialCardView mRow;
-        public ConstraintLayout mStar;
+        public ImageView mCardIcon, mStarBackground, mStarBorder, mTickIcon, mArchivedBackground;
+        public MaterialCardView mRow, mIconLayout;
+        public ConstraintLayout mStar, mArchived;
        public View mDivider;

        private int mIconBackgroundColor;

+
+
        protected LoyaltyCardListItemViewHolder(View inputView, CardAdapterListener inputListener) {
            super(inputView);
            mRow = inputView.findViewById(R.id.row);
@@ -214,11 +245,13 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
            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);
            mStar = inputView.findViewById(R.id.star);
            mStarBackground = inputView.findViewById(R.id.star_background);
            mStarBorder = inputView.findViewById(R.id.star_border);
+            mArchived = inputView.findViewById(R.id.archivedIcon);
+            mArchivedBackground = inputView.findViewById(R.id.archive_background);
            mTickIcon = inputView.findViewById(R.id.selected_thumbnail);
            inputView.setOnLongClickListener(view -> {
                inputListener.onRowClicked(getAdapterPosition());
@@ -253,10 +286,12 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
                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));
+                if (balanceIcon != null) {
+                    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);
@@ -273,21 +308,25 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
                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));
+                if (expiryIcon != null) {
+                    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));
+                    } else if (mDarkModeEnabled) {
+                        expiryIcon.setColorFilter(BlendModeColorFilterCompat.createBlendModeColorFilterCompat(Color.WHITE, BlendModeCompat.SRC_ATOP));
+                    }
                }
                mExpiryField.setText(DateFormat.getDateInstance(DateFormat.LONG).format(expiry));
+                if (Utils.hasExpired(expiry)) {
+                    mExpiryField.setTextColor(Color.RED);
+                }
                mExpiryField.setTextSize(size);
            }
            mExpiryField.requestLayout();
        }

-        public void toggleStar(boolean enable, boolean colorByTheme) {
+        public void toggleCardStateIcon(boolean enableStar, boolean enableArchive, 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();
@@ -301,20 +340,33 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
            if (colorByTheme) {
                dark = !mDarkModeEnabled;
            }
+
            if (dark) {
-                mStarBorder.setImageResource(R.drawable.ic_unstarred_black);
-                mStarBackground.setImageResource(R.drawable.ic_starred_black);
-            } else {
                mStarBorder.setImageResource(R.drawable.ic_unstarred_white);
-                mStarBackground.setImageResource(R.drawable.ic_starred_white);
-            }
-            if (enable) {
-                mStar.setVisibility(View.VISIBLE);
+                mStarBackground.setImageResource(R.drawable.ic_starred_black);
+                mArchivedBackground.setImageResource(R.drawable.ic_baseline_archive_24_black);
            } else {
+                mStarBorder.setImageResource(R.drawable.ic_unstarred_black);
+                mStarBackground.setImageResource(R.drawable.ic_starred_white);
+                mArchivedBackground.setImageResource(R.drawable.ic_baseline_archive_24);
+            }
+
+            if (enableStar) {
+                mStar.setVisibility(View.VISIBLE);
+            } else{
                mStar.setVisibility(View.GONE);
            }
+
+            if (enableArchive) {
+                mArchived.setVisibility(View.VISIBLE);
+            } else{
+                mArchived.setVisibility(View.GONE);
+            }
+
            mStarBorder.invalidate();
            mStarBackground.invalidate();
+            mArchivedBackground.invalidate();
+
        }

        public void setIconBackgroundColor(int color) {
--- a/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java
+++ b/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java
@@ -5,10 +5,10 @@ import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.DatePickerDialog;
 import android.app.Dialog;
+import android.content.ActivityNotFoundException;
 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;
@@ -36,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;
@@ -50,6 +51,7 @@ import java.io.IOException;
 import java.io.InvalidObjectException;
 import java.math.BigDecimal;
 import java.text.DateFormat;
+import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Collections;
@@ -68,13 +70,12 @@ 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 {
@@ -106,6 +107,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
    private static final int PERMISSION_REQUEST_CAMERA_IMAGE_ICON = 102;

    public static final String BUNDLE_ID = "id";
+    public static final String BUNDLE_DUPLICATE_ID = "duplicateId";
    public static final String BUNDLE_UPDATE = "update";
    public static final String BUNDLE_CARDID = "cardId";
    public static final String BUNDLE_BARCODEID = "barcodeId";
@@ -115,6 +117,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
    TabLayout tabs;

    ImageView thumbnail;
+    ImageView thumbnailEditIcon;
    EditText storeFieldEdit;
    EditText noteFieldEdit;
    ChipGroup groupsChips;
@@ -134,8 +137,11 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {

    Button enterButton;

+    Toolbar toolbar;
+
    int loyaltyCardId;
    boolean updateLoyaltyCard;
+    boolean duplicateFromLoyaltyCardId;
    String cardId;
    String barcodeId;
    String barcodeType;
@@ -153,7 +159,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
    AlertDialog confirmExitDialog = null;

    boolean validBalance = true;
-    Runnable warnOnInvalidBarcodeType;
+    Runnable barcodeImageGenerationFinishedCallback;

    HashMap<String, Currency> currencies = new HashMap<>();

@@ -201,13 +207,17 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
                (CatimaBarcode) (fieldName == LoyaltyCardField.barcodeType ? value : loyaltyCard.barcodeType),
                (Integer) (fieldName == LoyaltyCardField.headerColor ? value : loyaltyCard.headerColor),
                (int) (fieldName == LoyaltyCardField.starStatus ? value : loyaltyCard.starStatus),
-                Utils.getUnixTime(), 100
+                Utils.getUnixTime(), 100, (int) (fieldName == LoyaltyCardField.archiveStatus ? value : loyaltyCard.archiveStatus)
        );
    }

    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;
    }

@@ -215,6 +225,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
        final Bundle b = intent.getExtras();
        loyaltyCardId = b != null ? b.getInt(BUNDLE_ID) : 0;
        updateLoyaltyCard = b != null && b.getBoolean(BUNDLE_UPDATE, false);
+        duplicateFromLoyaltyCardId = b != null && b.getBoolean(BUNDLE_DUPLICATE_ID, false);

        cardId = b != null ? b.getString(BUNDLE_CARDID) : null;
        barcodeId = b != null ? b.getString(BUNDLE_BARCODEID) : null;
@@ -223,7 +234,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);
    }

@@ -286,7 +297,7 @@ 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) {
@@ -305,6 +316,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {

        tabs = findViewById(R.id.tabs);
        thumbnail = findViewById(R.id.thumbnail);
+        thumbnailEditIcon = findViewById(R.id.thumbnailEditIcon);
        storeFieldEdit = findViewById(R.id.storeNameEdit);
        noteFieldEdit = findViewById(R.id.noteEdit);
        groupsChips = findViewById(R.id.groupChips);
@@ -315,6 +327,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);
@@ -323,11 +336,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();
            }
        };
@@ -390,11 +402,10 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
            @Override
            public void onTextChanged(CharSequence s, int start, int before, int count) {
                try {
-                    BigDecimal balance = Utils.parseCurrency(s.toString(), Utils.currencyHasDecimals(tempLoyaltyCard.balanceType));
+                    BigDecimal balance = Utils.parseBalance(s.toString(), tempLoyaltyCard.balanceType);
                    updateTempState(LoyaltyCardField.balance, balance);
                    validBalance = true;
-
-                } catch (NumberFormatException e) {
+                } catch (ParseException e) {
                    validBalance = false;
                    e.printStackTrace();
                }
@@ -441,14 +452,10 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {

                    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(mSystemLocale).getSymbol();
-                    currencyList.remove(currencySymbol);
-                    currencyList.add(0, currencySymbol);
+                    currencyPrioritizeLocaleSymbols(currencyList, mSystemLocale);
                }

                currencyList.add(0, getString(R.string.points));
@@ -524,8 +531,6 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
                } else {
                    updateTempState(LoyaltyCardField.barcodeId, s.toString());
                }
-
-                generateOrHideBarcode();
            }

            @Override
@@ -556,8 +561,6 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
                        } catch (IllegalArgumentException e) {
                        }
                    }
-
-                    generateOrHideBarcode();
                }
            }

@@ -669,7 +672,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
@@ -689,13 +691,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(getThemeColor());
-        mCropperOptions.setStatusBarColor(getThemeColor());
-        mCropperOptions.setToolbarWidgetColor(Color.WHITE);
-        mCropperOptions.setActiveControlsWidgetColor(getThemeColor());
+        // 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
@@ -739,9 +752,8 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {

        onResuming = true;

-
        if (tempLoyaltyCard == null) {
-            if (updateLoyaltyCard) {
+            if (updateLoyaltyCard || duplicateFromLoyaltyCardId) {
                tempLoyaltyCard = DBHelper.getLoyaltyCard(mDatabase, loyaltyCardId);
                if (tempLoyaltyCard == null) {
                    Log.w(TAG, "Could not lookup loyalty card " + loyaltyCardId);
@@ -759,7 +771,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
                }
            } else {
                // New card, use default values
-                tempLoyaltyCard = new LoyaltyCard(-1, "", "", null, new BigDecimal("0"), null, "", null, null, null, 0, Utils.getUnixTime(), 100);
+                tempLoyaltyCard = new LoyaltyCard(-1, "", "", null, new BigDecimal("0"), null, "", null, null, null, 0, Utils.getUnixTime(), 100,0);

            }
        }
@@ -767,7 +779,11 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
        if (!initDone) {
            if (updateLoyaltyCard) {
                setTitle(R.string.editCardTitle);
+            } else {
+                setTitle(R.string.addCardTitle);
+            }

+            if (updateLoyaltyCard || duplicateFromLoyaltyCardId) {
                if (!mFrontImageUnsaved && !croppedFrontImage() && !mFrontImageRemoved) {
                    setCardImage(cardImageFront, Utils.retrieveCardImage(this, tempLoyaltyCard.id, ImageLocationType.front), true);
                }
@@ -845,16 +861,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();
-        }
-
-        // It can't be null because we set it in updateTempState but SpotBugs insists it can be
-        // NP_NULL_ON_SOME_PATH: Possible null pointer dereference
-        if (tempLoyaltyCard.headerColor != null) {
-            thumbnail.setOnClickListener(new ChooseCardImage());
+            updateTempState(LoyaltyCardField.headerColor, Utils.getRandomHeaderColor(this));
        }

        // Update from intent
@@ -889,7 +896,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
            hasChanged = hadChanges;
        }

-        generateOrHideBarcode();
+        generateBarcode();

        enterButton.setOnClickListener(new EditCardIdAndBarcode());
        barcodeImage.setOnClickListener(new EditCardIdAndBarcode());
@@ -903,13 +910,28 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {

        generateIcon(storeFieldEdit.getText().toString());

+        // It can't be null because we set it in updateTempState but SpotBugs insists it can be
+        // NP_NULL_ON_SOME_PATH: Possible null pointer dereference and
+        // NP_NULL_PARAM_DEREF: Method call passes null for non-null parameter
+        Integer headerColor = tempLoyaltyCard.headerColor;
+        if (headerColor != null) {
+            thumbnail.setOnClickListener(new ChooseCardImage());
+            thumbnailEditIcon.setBackgroundColor(Utils.needsDarkForeground(headerColor) ? Color.BLACK : Color.WHITE);
+            thumbnailEditIcon.setColorFilter(Utils.needsDarkForeground(headerColor) ? Color.WHITE : Color.BLACK);
+        }
+
        onResuming = false;
    }

    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)));
+            int headerColor = Utils.getHeaderColorFromImage((Bitmap) icon, tempLoyaltyCard.headerColor != null ? tempLoyaltyCard.headerColor : R.attr.colorPrimary);
+
+            updateTempState(LoyaltyCardField.headerColor, headerColor);
+
+            thumbnailEditIcon.setBackgroundColor(Utils.needsDarkForeground(headerColor) ? Color.BLACK : Color.WHITE);
+            thumbnailEditIcon.setColorFilter(Utils.needsDarkForeground(headerColor) ? Color.WHITE : Color.BLACK);
        } else {
            Log.d("setColorFromIcon", "attempting header color change from icon but icon does not exist");
        }
@@ -1091,6 +1113,9 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
                        public void onColorSelected(int dialogId, int color) {
                            updateTempState(LoyaltyCardField.headerColor, color);

+                            thumbnailEditIcon.setBackgroundColor(Utils.needsDarkForeground(color) ? Color.BLACK : Color.WHITE);
+                            thumbnailEditIcon.setColorFilter(Utils.needsDarkForeground(color) ? Color.WHITE : Color.BLACK);
+
                            // Unset image if set
                            thumbnail.setTag(null);

@@ -1158,7 +1183,14 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {

                Intent i = new Intent(Intent.ACTION_PICK);
                i.setType("image/*");
-                mPhotoPickerLauncher.launch(i);
+
+                try {
+                    mPhotoPickerLauncher.launch(i);
+                } catch (ActivityNotFoundException e) {
+                    Toast.makeText(getApplicationContext(), R.string.failedLaunchingPhotoPicker, Toast.LENGTH_LONG).show();
+                    Log.e(TAG, "No activity found to handle intent", e);
+                }
+
                return null;
            });

@@ -1221,7 +1253,16 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
            int day = c.get(Calendar.DAY_OF_MONTH);

            // Create a new instance of DatePickerDialog and return it
-            return new DatePickerDialog(getActivity(), this, year, month, day);
+            DatePickerDialog datePickerDialog = new DatePickerDialog(getActivity(), this, year, month, day);
+            datePickerDialog.getDatePicker().setMinDate(getMinDateOfDatePicker());
+            return datePickerDialog;
+        }
+
+        private long getMinDateOfDatePicker()
+        {
+            Calendar minDateCalendar = Calendar.getInstance();
+            minDateCalendar.set(1970, 0, 1);
+            return minDateCalendar.getTimeInMillis();
        }

        public void onDateSet(DatePicker view, int year, int month, int day) {
@@ -1243,6 +1284,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;
@@ -1281,7 +1327,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
            }
            Log.i(TAG, "Updated " + loyaltyCardId + " to " + cardId);
        } else {
-            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);
+            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,0);
            try {
                Utils.saveCardImage(this, (Bitmap) cardImageFront.getTag(), loyaltyCardId, ImageLocationType.front);
                Utils.saveCardImage(this, (Bitmap) cardImageBack.getTag(), loyaltyCardId, ImageLocationType.back);
@@ -1295,16 +1341,16 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {

        ShortcutHelper.updateShortcuts(this, DBHelper.getLoyaltyCard(mDatabase, loyaltyCardId));

+        if(duplicateFromLoyaltyCardId){
+            Intent intent = new Intent(getApplicationContext(), MainActivity.class);
+            startActivity(intent);
+        }
        finish();
    }

    @Override
    public boolean onCreateOptionsMenu(Menu menu) {
-        if (updateLoyaltyCard) {
-            getMenuInflater().inflate(R.menu.card_update_menu, menu);
-        } else {
-            getMenuInflater().inflate(R.menu.card_add_menu, menu);
-        }
+        getMenuInflater().inflate(R.menu.card_add_menu, menu);

        return super.onCreateOptionsMenu(menu);
    }
@@ -1313,30 +1359,9 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
    public boolean onOptionsItemSelected(MenuItem item) {
        int id = item.getItemId();

-        switch (id) {
-            case android.R.id.home:
-                askBeforeQuitIfChanged();
-                break;
-
-            case R.id.action_delete:
-                AlertDialog.Builder builder = new AlertDialog.Builder(this);
-                builder.setTitle(R.string.deleteTitle);
-                builder.setMessage(R.string.deleteConfirmation);
-                builder.setPositiveButton(R.string.confirm, (dialog, which) -> {
-                    Log.e(TAG, "Deleting card: " + loyaltyCardId);
-
-                    DBHelper.deleteLoyaltyCard(mDatabase, LoyaltyCardEditActivity.this, loyaltyCardId);
-
-                    ShortcutHelper.removeShortcut(LoyaltyCardEditActivity.this, loyaltyCardId);
-
-                    finish();
-                    dialog.dismiss();
-                });
-                builder.setNegativeButton(R.string.cancel, (dialog, which) -> dialog.dismiss());
-                AlertDialog dialog = builder.create();
-                dialog.show();
-
-                return true;
+        if (id == android.R.id.home) {
+            askBeforeQuitIfChanged();
+            return true;
        }

        return super.onOptionsItemSelected(item);
@@ -1389,36 +1414,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");
@@ -1431,17 +1460,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) {
@@ -1471,32 +1498,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);
+        }
+    }
 }
--- a/app/src/main/java/protect/card_locker/LoyaltyCardField.java
+++ b/app/src/main/java/protect/card_locker/LoyaltyCardField.java
@@ -11,5 +11,6 @@ public enum LoyaltyCardField {
    barcodeId,
    barcodeType,
    headerColor,
-    starStatus
+    starStatus,
+    archiveStatus
 }
--- a/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java
+++ b/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java
@@ -2,15 +2,21 @@ 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;
+import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.os.Bundle;
+import android.text.SpannableStringBuilder;
+import android.text.Spanned;
 import android.text.TextUtils;
+import android.text.style.ForegroundColorSpan;
+import android.text.util.Linkify;
 import android.util.Log;
 import android.util.TypedValue;
 import android.view.GestureDetector;
@@ -18,7 +24,6 @@ import android.view.Menu;
 import android.view.MenuItem;
 import android.view.MotionEvent;
 import android.view.View;
-import android.view.ViewGroup;
 import android.view.ViewOutlineProvider;
 import android.view.ViewTreeObserver;
 import android.view.Window;
@@ -30,8 +35,22 @@ import android.widget.SeekBar;
 import android.widget.TextView;
 import android.widget.Toast;

+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AlertDialog;
+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.graphics.BlendModeColorFilterCompat;
+import androidx.core.graphics.BlendModeCompat;
+import androidx.core.graphics.ColorUtils;
+import androidx.core.graphics.drawable.DrawableCompat;
+import androidx.core.widget.TextViewCompat;
+
 import com.google.android.material.appbar.AppBarLayout;
-import com.google.android.material.bottomsheet.BottomSheetBehavior;
+import com.google.android.material.bottomappbar.BottomAppBar;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;

 import java.io.UnsupportedEncodingException;
@@ -41,19 +60,6 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;

-import androidx.annotation.NonNull;
-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.Guideline;
-import androidx.coordinatorlayout.widget.CoordinatorLayout;
-import androidx.core.content.ContextCompat;
-import androidx.core.graphics.ColorUtils;
-import androidx.core.graphics.drawable.DrawableCompat;
-import androidx.core.widget.NestedScrollView;
-import androidx.core.widget.TextViewCompat;
-
 import protect.card_locker.async.TaskHandler;
 import protect.card_locker.preferences.Settings;

@@ -63,15 +69,12 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
    private GestureDetector mGestureDetector;

    CoordinatorLayout coordinatorLayout;
+    ConstraintLayout mainLayout;
    TextView cardIdFieldView;
-    BottomSheetBehavior behavior;
-    LinearLayout bottomSheet;
-    NestedScrollView bottomSheetContentWrapper;
-    ImageView bottomSheetButton;
-    TextView noteView;
-    TextView groupsView;
-    TextView balanceView;
-    TextView expiryView;
+    BottomAppBar bottomAppBar;
+    ImageButton bottomAppBarInfoButton;
+    ImageButton bottomAppBarPreviousButton;
+    ImageButton bottomAppBarNextButton;
    AppCompatTextView storeName;
    ImageButton maximizeButton;
    ImageView mainImage;
@@ -80,10 +83,14 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
    View collapsingToolbarLayout;
    AppBarLayout appBarLayout;
    ImageView iconImage;
+    Toolbar portraitToolbar;
    Toolbar landscapeToolbar;

    int loyaltyCardId;
+    ArrayList<Integer> cardList;
+
    LoyaltyCard loyaltyCard;
+    List<Group> loyaltyCardGroups;
    boolean rotationEnabled;
    SQLiteDatabase database;
    ImportURIHelper importURIHelper;
@@ -109,15 +116,13 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
    private ImageView[] dots;
    boolean isBarcodeSupported = true;

-    int bottomSheetState;
-
    static final String STATE_IMAGEINDEX = "imageIndex";
    static final String STATE_FULLSCREEN = "isFullscreen";
-    static final String STATE_BOTTOMSHEET = "bottomSheetState";

    private final int HEADER_FILTER_ALPHA = 127;

    final private TaskHandler mTasks = new TaskHandler();
+    Runnable barcodeImageGenerationFinishedCallback;

    @Override
    public boolean onDown(MotionEvent e) {
@@ -202,6 +207,7 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
    private void extractIntentFields(Intent intent) {
        final Bundle b = intent.getExtras();
        loyaltyCardId = b != null ? b.getInt("id") : 0;
+        cardList = b != null ? b.getIntegerArrayList("cardList") : null;
        Log.d(TAG, "View activity: id=" + loyaltyCardId);
    }

@@ -222,6 +228,7 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
        Drawable unwrappedIcon = AppCompatResources.getDrawable(this, icon);
        assert unwrappedIcon != null;
        Drawable wrappedIcon = DrawableCompat.wrap(unwrappedIcon);
+        wrappedIcon.mutate();
        if (dark) {
            DrawableCompat.setTint(wrappedIcon, Color.BLACK);
        } else {
@@ -244,16 +251,38 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements

    @Override
    protected void onCreate(Bundle savedInstanceState) {
+        if (savedInstanceState == null) {
+            Intent incomingIntent = getIntent();
+            int transitionRight = incomingIntent.getExtras().getInt("transition_right", -1);
+            if (transitionRight == 1) {
+                // right side transition
+                overridePendingTransition(R.anim.slide_in_right, R.anim.slide_out_left);
+            } else if (transitionRight == 0) {
+                // left side transition
+                overridePendingTransition(R.anim.slide_in_left, R.anim.slide_out_right);
+            }
+        }
+
        super.onCreate(savedInstanceState);

+        settings = new Settings(this);
+
+        String cardOrientation = settings.getCardViewOrientation();
+        if (cardOrientation.equals(getString(R.string.settings_key_lock_on_opening_orientation))) {
+            setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LOCKED);
+        } else if (cardOrientation.equals(getString(R.string.settings_key_portrait_orientation))) {
+            setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
+        } else if (cardOrientation.equals(getString(R.string.settings_key_landscape_orientation))) {
+            setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
+        } else {
+            setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED);
+        }
+
        if (savedInstanceState != null) {
            mainImageIndex = savedInstanceState.getInt(STATE_IMAGEINDEX);
            isFullscreen = savedInstanceState.getBoolean(STATE_FULLSCREEN);
-            bottomSheetState = savedInstanceState.getInt(STATE_BOTTOMSHEET);
        }

-        settings = new Settings(this);
-
        extractIntentFields(getIntent());

        setContentView(R.layout.loyalty_card_view_layout);
@@ -262,29 +291,40 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
        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);
-        bottomSheetButton = findViewById(R.id.bottomSheetButton);
-        noteView = findViewById(R.id.noteView);
-        groupsView = findViewById(R.id.groupsView);
-        balanceView = findViewById(R.id.balanceView);
-        expiryView = findViewById(R.id.expiryView);
        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);
        appBarLayout = findViewById(R.id.app_bar_layout);
+        bottomAppBar = findViewById(R.id.bottom_app_bar);
        iconImage = findViewById(R.id.icon_image);
+        portraitToolbar = findViewById(R.id.toolbar);
        landscapeToolbar = findViewById(R.id.toolbar_landscape);

+        bottomAppBarInfoButton = findViewById(R.id.button_show_info);
+        bottomAppBarPreviousButton = findViewById(R.id.button_previous);
+        bottomAppBarNextButton = findViewById(R.id.button_next);
+
+        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) {
@@ -302,7 +342,7 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements

                setCenterGuideline(loyaltyCard.zoomLevel);

-                drawMainImage(mainImageIndex, true);
+                drawMainImage(mainImageIndex, true, isFullscreen);
            }

            @Override
@@ -334,33 +374,6 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
        });
        editButton.bringToFront();

-        behavior = BottomSheetBehavior.from(bottomSheet);
-        behavior.addBottomSheetCallback(new BottomSheetBehavior.BottomSheetCallback() {
-            @Override
-            public void onStateChanged(@NonNull View bottomSheet, int newState) {
-                changeUiToBottomSheetState(newState);
-            }
-
-            @Override
-            public void onSlide(@NonNull View bottomSheet, float slideOffset) {
-            }
-        });
-
-        bottomSheetButton.setOnClickListener(v -> {
-            if (behavior.getState() == BottomSheetBehavior.STATE_EXPANDED) {
-                behavior.setState(BottomSheetBehavior.STATE_COLLAPSED);
-            } else {
-                behavior.setState(BottomSheetBehavior.STATE_EXPANDED);
-            }
-        });
-
-        appBarLayout.addOnLayoutChangeListener(new View.OnLayoutChangeListener() {
-            @Override
-            public void onLayoutChange(View v, int left, int top, int right, int bottom, int oldLeft, int oldTop, int oldRight, int oldBottom) {
-                adjustLayoutHeights();
-            }
-        });
-
        appBarLayout.setOutlineProvider(new ViewOutlineProvider() {
            @Override
            public void getOutline(View view, Outline outline) {
@@ -369,57 +382,144 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
            }
        });

+        bottomAppBarInfoButton.setOnClickListener(view -> showInfoDialog());
+        bottomAppBarPreviousButton.setOnClickListener(view -> prevNextCard(false));
+        bottomAppBarNextButton.setOnClickListener(view -> prevNextCard(true));
+
        mGestureDetector = new GestureDetector(this, this);
        View.OnTouchListener gestureTouchListener = (v, event) -> mGestureDetector.onTouchEvent(event);
        mainImage.setOnTouchListener(gestureTouchListener);
-    }

-    private void changeUiToBottomSheetState(int newState) {
-        if (newState == BottomSheetBehavior.STATE_DRAGGING) {
-            editButton.hide();
-        } else if (newState == BottomSheetBehavior.STATE_EXPANDED) {
-            bottomSheetButton.setImageResource(R.drawable.ic_baseline_arrow_drop_down_24);
-            editButton.hide();
-        } else if (newState == BottomSheetBehavior.STATE_COLLAPSED) {
-            bottomSheetButton.setImageResource(R.drawable.ic_baseline_arrow_drop_up_24);
-            if (!isFullscreen) {
-                editButton.show();
-            }
-
-            // Scroll bottomsheet content back to top
-            bottomSheetContentWrapper.setScrollY(0);
-        }
-        bottomSheetState = newState;
-    }
-
-    private void adjustLayoutHeights() {
-        // use getLayoutParams instead of getHeight when heights are pre-determined in xml! getHeight could return 0 if a View is not inflated
-        if (iconImage.getLayoutParams().height != appBarLayout.getHeight()) {
-            Log.d("adjustLayoutHeights", "setting imageIcon height from: " + iconImage.getLayoutParams().height + " to: " + appBarLayout.getHeight());
-            iconImage.setLayoutParams(new CoordinatorLayout.LayoutParams(
-                    CoordinatorLayout.LayoutParams.MATCH_PARENT, appBarLayout.getHeight())
-            );
-        }
-        int bottomSheetHeight = getResources().getDisplayMetrics().heightPixels - appBarLayout.getHeight() - bottomSheetButton.getLayoutParams().height;
-        ViewGroup.LayoutParams params = bottomSheetContentWrapper.getLayoutParams();
-        if (params.height != bottomSheetHeight || params.width != LinearLayout.LayoutParams.MATCH_PARENT) {
-            // XXX android 5 - 9 has so much quirks with setting bottomSheetContent height
-            // just invalidate the wrapper works on 10 onward
-            // bottomSheetContentWrapper.invalidate();
-            // The below worked on android 5 but not 6, reloading the card then it breaks again on 6, entirely random :(
-            // for (int i = 0; i < bottomSheetContentWrapper.getChildCount(); i++) {
-            //     bottomSheetContentWrapper.getChildAt(i).invalidate();
-            // }
-            // since it's basically allergic to getting enlarged then shrunk again, and setting it at all when fullscreen makes no sense
-            if (!isFullscreen) {
-                Log.d("adjustLayoutHeights", "setting bottomSheet height from: " + params.height + " to: " + bottomSheetHeight);
-                bottomSheetContentWrapper.setLayoutParams(
-                        new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, bottomSheetHeight)
+        appBarLayout.addOnLayoutChangeListener(new View.OnLayoutChangeListener() {
+            @Override
+            public void onLayoutChange(View v, int left, int top, int right, int bottom, int oldLeft, int oldTop, int oldRight, int oldBottom) {
+                iconImage.setLayoutParams(new CoordinatorLayout.LayoutParams(
+                        CoordinatorLayout.LayoutParams.MATCH_PARENT, appBarLayout.getHeight())
                );
+                iconImage.setClipBounds(new Rect(left, top, right, bottom));
            }
+        });
+    }
+
+    private SpannableStringBuilder padSpannableString(SpannableStringBuilder spannableStringBuilder) {
+        if (spannableStringBuilder.length() > 0) {
+            spannableStringBuilder.append("\n\n");
+        }
+
+        return spannableStringBuilder;
+    }
+
+    private boolean hasBalance(LoyaltyCard loyaltyCard) {
+        return !loyaltyCard.balance.equals(new BigDecimal(0));
+    }
+
+    private void showInfoDialog() {
+        AlertDialog.Builder infoDialog = new AlertDialog.Builder(this);
+
+        TextView infoTitleView = new TextView(this);
+        infoTitleView.setPadding(20, 20, 20, 20);
+        infoTitleView.setTextSize(settings.getFontSizeMax(settings.getMediumFont()));
+        infoTitleView.setText(loyaltyCard.store);
+        infoDialog.setCustomTitle(infoTitleView);
+        infoDialog.setTitle(loyaltyCard.store);
+
+        TextView infoTextview = new TextView(this);
+        infoTextview.setPadding(20, 0, 20, 0);
+        infoTextview.setAutoLinkMask(Linkify.ALL);
+        infoTextview.setTextIsSelectable(true);
+
+        SpannableStringBuilder infoText = new SpannableStringBuilder();
+        if (!loyaltyCard.note.isEmpty()) {
+            infoText.append(loyaltyCard.note);
+        }
+
+        if (loyaltyCardGroups.size() > 0) {
+            List<String> groupNames = new ArrayList<>();
+            for (Group group : loyaltyCardGroups) {
+                groupNames.add(group._id);
+            }
+
+            padSpannableString(infoText);
+            infoText.append(getString(R.string.groupsList, TextUtils.join(", ", groupNames)));
+        }
+
+        if (hasBalance(loyaltyCard)) {
+            padSpannableString(infoText);
+            infoText.append(getString(R.string.balanceSentence, Utils.formatBalance(this, loyaltyCard.balance, loyaltyCard.balanceType)));
+        }
+
+        if (loyaltyCard.expiry != null) {
+            String formattedExpiry = DateFormat.getDateInstance(DateFormat.LONG).format(loyaltyCard.expiry);
+
+            padSpannableString(infoText);
+            if (Utils.hasExpired(loyaltyCard.expiry)) {
+                int start = infoText.length();
+
+                infoText.append(getString(R.string.expiryStateSentenceExpired, formattedExpiry));
+                infoText.setSpan(new ForegroundColorSpan(Color.RED), start, infoText.length(), Spanned.SPAN_INCLUSIVE_INCLUSIVE);
+            } else {
+                infoText.append(getString(R.string.expiryStateSentence, formattedExpiry));
+            }
+        }
+
+        infoTextview.setText(infoText);
+
+        infoDialog.setView(infoTextview);
+        infoDialog.setPositiveButton(R.string.ok, (dialogInterface, i) -> dialogInterface.dismiss());
+        infoDialog.create().show();
+    }
+
+    private void setBottomAppBarButtonState() {
+        if (!loyaltyCard.note.isEmpty() || !loyaltyCardGroups.isEmpty() || hasBalance(loyaltyCard) || loyaltyCard.expiry != null) {
+            bottomAppBarInfoButton.setVisibility(View.VISIBLE);
+        } else {
+            bottomAppBarInfoButton.setVisibility(View.GONE);
+        }
+
+        if (cardList == null || cardList.size() == 1) {
+            bottomAppBarPreviousButton.setVisibility(View.GONE);
+            bottomAppBarNextButton.setVisibility(View.GONE);
+        } else {
+            bottomAppBarPreviousButton.setVisibility(View.VISIBLE);
+            bottomAppBarNextButton.setVisibility(View.VISIBLE);
        }
    }

+    private void prevNextCard(boolean next) {
+        // If we're in RTL layout, we want the "left" button to be "next" instead of "previous"
+        // So we swap next around
+        boolean transitionRight = next;
+        if (getResources().getConfiguration().getLayoutDirection() == View.LAYOUT_DIRECTION_RTL) {
+            next = !next;
+        }
+
+        int cardListPosition = cardList.indexOf(loyaltyCardId);
+
+        if (next) {
+            if (cardListPosition == cardList.size() - 1) {
+                cardListPosition = 0;
+            } else {
+                cardListPosition = cardListPosition + 1;
+            }
+        } else {
+            if (cardListPosition == 0) {
+                cardListPosition = cardList.size() - 1;
+            } else {
+                cardListPosition = cardListPosition - 1;
+            }
+        }
+
+        loyaltyCardId = cardList.get(cardListPosition);
+
+        // Restart activity with new card id and index
+        Intent intent = getIntent();
+        Bundle b = intent.getExtras();
+        b.putInt("id", loyaltyCardId);
+        b.putInt("transition_right", transitionRight ? 1 : 0);
+        intent.putExtras(b);
+        intent.setFlags(intent.getFlags() | Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
+        startActivity(intent);
+    }

    @Override
    public void onNewIntent(Intent intent) {
@@ -433,7 +533,6 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
    public void onSaveInstanceState(Bundle savedInstanceState) {
        savedInstanceState.putInt(STATE_IMAGEINDEX, mainImageIndex);
        savedInstanceState.putBoolean(STATE_FULLSCREEN, isFullscreen);
-        savedInstanceState.putInt(STATE_BOTTOMSHEET, bottomSheetState);
        super.onSaveInstanceState(savedInstanceState);
    }

@@ -475,6 +574,8 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
            return;
        }

+        loyaltyCardGroups = DBHelper.getLoyaltyCardGroups(database, loyaltyCardId);
+
        setupOrientation();

        format = loyaltyCard.barcodeType;
@@ -486,56 +587,6 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
                settings.getFontSizeMin(settings.getLargeFont()), settings.getFontSizeMax(settings.getLargeFont()),
                1, TypedValue.COMPLEX_UNIT_SP);

-        if (loyaltyCard.note.length() > 0) {
-            noteView.setVisibility(View.VISIBLE);
-            noteView.setText(loyaltyCard.note);
-            noteView.setTextSize(settings.getFontSizeMax(settings.getMediumFont()));
-        } else {
-            noteView.setVisibility(View.GONE);
-        }
-
-        List<Group> loyaltyCardGroups = DBHelper.getLoyaltyCardGroups(database, loyaltyCardId);
-
-        if (loyaltyCardGroups.size() > 0) {
-            List<String> groupNames = new ArrayList<>();
-            for (Group group : loyaltyCardGroups) {
-                groupNames.add(group._id);
-            }
-
-            groupsView.setVisibility(View.VISIBLE);
-            groupsView.setText(getString(R.string.groupsList, TextUtils.join(", ", groupNames)));
-            groupsView.setTextSize(settings.getFontSizeMax(settings.getMediumFont()));
-        } else {
-            groupsView.setVisibility(View.GONE);
-        }
-
-        if (!loyaltyCard.balance.equals(new BigDecimal(0))) {
-            balanceView.setVisibility(View.VISIBLE);
-            balanceView.setText(getString(R.string.balanceSentence, Utils.formatBalance(this, loyaltyCard.balance, loyaltyCard.balanceType)));
-            balanceView.setTextSize(settings.getFontSizeMax(settings.getMediumFont()));
-        } else {
-            balanceView.setVisibility(View.GONE);
-        }
-
-        if (loyaltyCard.expiry != null) {
-            expiryView.setVisibility(View.VISIBLE);
-
-            int expiryString = R.string.expiryStateSentence;
-            if (Utils.hasExpired(loyaltyCard.expiry)) {
-                expiryString = R.string.expiryStateSentenceExpired;
-                expiryView.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.alert));
-            }
-            expiryView.setText(getString(expiryString, DateFormat.getDateInstance(DateFormat.LONG).format(loyaltyCard.expiry)));
-            expiryView.setTextSize(settings.getFontSizeMax(settings.getMediumFont()));
-        } else {
-            expiryView.setVisibility(View.GONE);
-        }
-        expiryView.setTag(loyaltyCard.expiry);
-
-        if (!isFullscreen) {
-            makeBottomSheetVisibleIfUseful();
-        }
-
        storeName.setText(loyaltyCard.store);
        storeName.setTextSize(settings.getFontSizeMax(settings.getLargeFont()));
        TextViewCompat.setAutoSizeTextTypeUniformWithConfiguration(
@@ -561,6 +612,22 @@ 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);
+        bottomAppBar.setBackgroundColor(darkenedColor);
+        maximizeButton.setColorFilter(textColor);
+        minimizeButton.setColorFilter(textColor);
+        int complementaryColor = Utils.getComplementaryColor(darkenedColor);
+        editButton.setBackgroundTintList(ColorStateList.valueOf(complementaryColor));
+        Drawable editButtonIcon = editButton.getDrawable();
+        editButtonIcon.mutate();
+        editButtonIcon.setTint(Utils.needsDarkForeground(complementaryColor) ? Color.BLACK : Color.WHITE);
+        editButton.setImageDrawable(editButtonIcon);
+
        Bitmap icon = Utils.retrieveCardImage(this, loyaltyCard.id, ImageLocationType.icon);
        if (icon != null) {
            int backgroundAlphaColor = Utils.needsDarkForeground(backgroundHeaderColor) ? Color.WHITE : Color.BLACK;
@@ -579,9 +646,14 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
        backgroundNeedsDarkIcons = Utils.needsDarkForeground(backgroundHeaderColor);
        ActionBar actionBar = getSupportActionBar();
        if (actionBar != null) {
-            actionBar.setHomeAsUpIndicator(getIcon(R.drawable.ic_arrow_back_white, backgroundNeedsDarkIcons));
+            actionBar.setHomeAsUpIndicator(getIcon(R.drawable.home_arrow_back_white, backgroundNeedsDarkIcons));
        }

+        fixImageButtonColor(bottomAppBarInfoButton);
+        fixImageButtonColor(bottomAppBarPreviousButton);
+        fixImageButtonColor(bottomAppBarNextButton);
+        setBottomAppBarButtonState();
+
        // 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);
@@ -618,32 +690,17 @@ 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(Utils.isDarkModeEnabled(this));

        setFullscreen(isFullscreen);

-        // restore bottomSheet UI states from changing orientation
-        changeUiToBottomSheetState(bottomSheetState);
-
        DBHelper.updateLoyaltyCardLastUsed(database, loyaltyCard.id);
    }

+    private void fixImageButtonColor(ImageButton imageButton) {
+        imageButton.setColorFilter(BlendModeColorFilterCompat.createBlendModeColorFilterCompat(backgroundNeedsDarkIcons ? Color.BLACK : Color.WHITE, BlendModeCompat.SRC_ATOP));
+    }
+
    @Override
    public void onBackPressed() {
        if (isFullscreen) {
@@ -657,18 +714,17 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
    @Override
    public boolean onCreateOptionsMenu(Menu menu) {
        getMenuInflater().inflate(R.menu.card_view_menu, menu);
-
-        // Always calculate lockscreen icon, it may need a black color
-        boolean lockBarcodeScreenOrientation = settings.getLockBarcodeScreenOrientation();
-        MenuItem item = menu.findItem(R.id.action_lock_unlock);
-        setOrientatonLock(item, lockBarcodeScreenOrientation);
-        if (lockBarcodeScreenOrientation) {
-            item.setVisible(false);
-        }
-
-        loyaltyCard = DBHelper.getLoyaltyCard(database, loyaltyCardId);
        starred = loyaltyCard.starStatus != 0;

+        if (loyaltyCard.archiveStatus != 0) {
+            menu.findItem(R.id.action_unarchive).setVisible(true);
+            menu.findItem(R.id.action_archive).setVisible(false);
+        } else {
+            menu.findItem(R.id.action_unarchive).setVisible(false);
+            menu.findItem(R.id.action_archive).setVisible(true);
+        }
+
+        menu.findItem(R.id.action_overflow).setIcon(getIcon(R.drawable.ic_overflow_menu, backgroundNeedsDarkIcons));
        menu.findItem(R.id.action_share).setIcon(getIcon(R.drawable.ic_share_white, backgroundNeedsDarkIcons));

        return super.onCreateOptionsMenu(menu);
@@ -692,46 +748,78 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
    public boolean onOptionsItemSelected(MenuItem item) {
        int id = item.getItemId();

-        switch (id) {
-            case android.R.id.home:
+        if (id == android.R.id.home) {
+            finish();
+        } else if (id == R.id.action_share) {
+            try {
+                importURIHelper.startShareIntent(Arrays.asList(loyaltyCard));
+            } catch (UnsupportedEncodingException e) {
+                Toast.makeText(LoyaltyCardViewActivity.this, R.string.failedGeneratingShareURL, Toast.LENGTH_LONG).show();
+                e.printStackTrace();
+            }
+
+            return true;
+        } else if (id == R.id.action_duplicate) {
+            Intent intent = new Intent(getApplicationContext(), LoyaltyCardEditActivity.class);
+            Bundle bundle = new Bundle();
+            bundle.putInt("id", loyaltyCardId);
+            bundle.putBoolean("duplicateId", true);
+            intent.putExtras(bundle);
+            startActivity(intent);
+
+            return true;
+        } else if (id == R.id.action_star_unstar) {
+            starred = !starred;
+            DBHelper.updateLoyaltyCardStarStatus(database, loyaltyCardId, starred ? 1 : 0);
+
+            // Re-init loyaltyCard with new data from DB
+            onResume();
+
+            return true;
+        } else if (id == R.id.action_archive) {
+            DBHelper.updateLoyaltyCardArchiveStatus(database, loyaltyCardId, 1);
+            Toast.makeText(LoyaltyCardViewActivity.this, R.string.archived, Toast.LENGTH_LONG).show();
+
+            // Re-init loyaltyCard with new data from DB
+            onResume();
+
+            return true;
+        } else if (id == R.id.action_unarchive) {
+            DBHelper.updateLoyaltyCardArchiveStatus(database, loyaltyCardId, 0);
+            Toast.makeText(LoyaltyCardViewActivity.this, R.string.unarchived, Toast.LENGTH_LONG).show();
+
+            // Re-init loyaltyCard with new data from DB
+            onResume();
+
+            return true;
+        } else if (id == R.id.action_delete) {
+            AlertDialog.Builder builder = new AlertDialog.Builder(this);
+            builder.setTitle(R.string.deleteTitle);
+            builder.setMessage(R.string.deleteConfirmation);
+            builder.setPositiveButton(R.string.confirm, (dialog, which) -> {
+                Log.e(TAG, "Deleting card: " + loyaltyCardId);
+
+                DBHelper.deleteLoyaltyCard(database, LoyaltyCardViewActivity.this, loyaltyCardId);
+
+                ShortcutHelper.removeShortcut(LoyaltyCardViewActivity.this, loyaltyCardId);
+
                finish();
-                break;
+                dialog.dismiss();
+            });
+            builder.setNegativeButton(R.string.cancel, (dialog, which) -> dialog.dismiss());
+            AlertDialog dialog = builder.create();
+            dialog.show();

-            case R.id.action_share:
-                try {
-                    importURIHelper.startShareIntent(Arrays.asList(loyaltyCard));
-                } catch (UnsupportedEncodingException e) {
-                    Toast.makeText(LoyaltyCardViewActivity.this, R.string.failedGeneratingShareURL, Toast.LENGTH_LONG).show();
-                    e.printStackTrace();
-                }
-                return true;
-
-            case R.id.action_lock_unlock:
-                if (rotationEnabled) {
-                    setOrientatonLock(item, true);
-                } else {
-                    setOrientatonLock(item, false);
-                }
-                rotationEnabled = !rotationEnabled;
-                return true;
-
-            case R.id.action_star_unstar:
-                starred = !starred;
-                DBHelper.updateLoyaltyCardStarStatus(database, loyaltyCardId, starred ? 1 : 0);
-                invalidateOptionsMenu();
-                return true;
+            return true;
        }

        return super.onOptionsItemSelected(item);
    }

    private void setupOrientation() {
-        Toolbar portraitToolbar = findViewById(R.id.toolbar);
-
        int orientation = getResources().getConfiguration().orientation;
        if (orientation == Configuration.ORIENTATION_LANDSCAPE) {
            Log.d(TAG, "Detected landscape mode");
-
            setTitle(loyaltyCard.store);

            collapsingToolbarLayout.setVisibility(View.GONE);
@@ -757,28 +845,7 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
        }
    }

-    private void setOrientatonLock(MenuItem item, boolean lock) {
-        if (lock) {
-
-            item.setIcon(getIcon(R.drawable.ic_lock_outline_white_24dp, backgroundNeedsDarkIcons));
-            item.setTitle(R.string.unlockScreen);
-            setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_NOSENSOR);
-        } else {
-            item.setIcon(getIcon(R.drawable.ic_lock_open_white_24dp, backgroundNeedsDarkIcons));
-            item.setTitle(R.string.lockScreen);
-            setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED);
-        }
-    }
-
-    private void makeBottomSheetVisibleIfUseful() {
-        if (noteView.getVisibility() == View.VISIBLE || groupsView.getVisibility() == View.VISIBLE || balanceView.getVisibility() == View.VISIBLE || expiryView.getVisibility() == View.VISIBLE) {
-            bottomSheet.setVisibility(View.VISIBLE);
-        } else {
-            bottomSheet.setVisibility(View.GONE);
-        }
-    }
-
-    private void drawBarcode() {
+    private void drawBarcode(boolean addPadding) {
        mTasks.flushTaskList(TaskHandler.TYPE.BARCODE, true, false, false);
        if (format != null) {
            BarcodeImageWriterTask barcodeWriter = new BarcodeImageWriterTask(
@@ -788,12 +855,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() {
@@ -802,13 +870,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;
@@ -824,18 +892,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);
        }
@@ -856,7 +934,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);
+        }
    }

    /**
@@ -872,7 +969,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,22 +985,15 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
            }

            // Hide toolbars
-            //
-            // Appbar needs to be invisible and have padding removed
-            // 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);

            // Hide other UI elements
            cardIdFieldView.setVisibility(View.GONE);
-            bottomSheet.setVisibility(View.GONE);
-            behavior.setState(BottomSheetBehavior.STATE_COLLAPSED);
-            editButton.hide();
-
-            // android 5-9, avoid padding growing on top of bottomSheet
-            coordinatorLayout.removeView(bottomSheet);
+            bottomAppBar.setVisibility(View.GONE);
+            editButton.setVisibility(View.GONE);

            // Set Android to fullscreen mode
            getWindow().getDecorView().setSystemUiVisibility(
@@ -917,7 +1007,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);
@@ -931,14 +1021,14 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
            }

            // Show appropriate toolbar
-            // And restore 24dp paddingTop for appBarLayout
            appBarLayout.setVisibility(View.VISIBLE);
            setupOrientation();
+            iconImage.setVisibility(View.VISIBLE);

            // Show other UI elements
            cardIdFieldView.setVisibility(View.VISIBLE);
-            makeBottomSheetVisibleIfUseful();
-            editButton.show();
+            editButton.setVisibility(View.VISIBLE);
+            bottomAppBar.setVisibility(View.VISIBLE);

            // Unset fullscreen mode
            getWindow().getDecorView().setSystemUiVisibility(
@@ -946,11 +1036,6 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
                            & ~View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY
                            & ~View.SYSTEM_UI_FLAG_FULLSCREEN
            );
-
-            // android 5-9, avoid padding growing on top of bottomSheet
-            if (bottomSheet.getParent() != coordinatorLayout) {
-                coordinatorLayout.addView(bottomSheet);
-            }
        }

        Log.d("setFullScreen", "Is full screen enabled? " + enabled + " Zoom Level = " + barcodeScaler.getProgress());
--- a/app/src/main/java/protect/card_locker/MainActivity.java
+++ b/app/src/main/java/protect/card_locker/MainActivity.java
@@ -19,8 +19,17 @@ import android.view.View;
 import android.widget.CheckBox;
 import android.widget.Toast;

+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import com.google.android.material.tabs.TabLayout;
+
+import java.io.UnsupportedEncodingException;
+import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
+
 import androidx.activity.result.ActivityResultLauncher;
 import androidx.activity.result.contract.ActivityResultContracts;
+import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.view.ActionMode;
 import androidx.appcompat.widget.SearchView;
@@ -32,6 +41,7 @@ import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.google.android.material.tabs.TabLayout;

 import java.io.UnsupportedEncodingException;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -47,6 +57,7 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
    private ActionMode mCurrentActionMode;
    private SearchView mSearchView;
    private GestureDetector mGestureDetector;
+    private int mLoyaltyCardCount = 0;
    protected String mFilter = "";
    protected Object mGroup = null;
    protected DBHelper.LoyaltyCardOrder mOrder = DBHelper.LoyaltyCardOrder.Alpha;
@@ -57,6 +68,9 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
    private View mNoMatchingCardsText;
    private View mNoGroupCardsText;

+    private boolean mArchiveMode;
+    public static final String BUNDLE_ARCHIVE_MODE = "archiveMode";
+
    private ActivityResultLauncher<Intent> mBarcodeScannerLauncher;
    private ActivityResultLauncher<Intent> mSettingsLauncher;

@@ -140,10 +154,8 @@ 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);
+                        Log.d(TAG, "Deleting card: " + loyaltyCard.id);

                        DBHelper.deleteLoyaltyCard(mDatabase, MainActivity.this, loyaltyCard.id);

@@ -153,7 +165,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,6 +175,44 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard

                return true;
            }
+            else if(inputItem.getItemId() == R.id.action_archive){
+                for (LoyaltyCard loyaltyCard : mAdapter.getSelectedItems()) {
+                    Log.d(TAG, "Archiving card: " + loyaltyCard.id);
+                    DBHelper.updateLoyaltyCardArchiveStatus(mDatabase, loyaltyCard.id,1);
+                    updateLoyaltyCardList(false);
+                    inputMode.finish();
+                    invalidateOptionsMenu();
+                }
+                return true;
+            }
+            else if(inputItem.getItemId() == R.id.action_unarchive){
+                for (LoyaltyCard loyaltyCard : mAdapter.getSelectedItems()) {
+                    Log.d(TAG, "Unarchiving card: " + loyaltyCard.id);
+                    DBHelper.updateLoyaltyCardArchiveStatus(mDatabase, loyaltyCard.id,0);
+                    updateLoyaltyCardList(false);
+                    inputMode.finish();
+                    invalidateOptionsMenu();
+                }
+                return true;
+            }
+            else if(inputItem.getItemId() == R.id.action_star){
+                for (LoyaltyCard loyaltyCard : mAdapter.getSelectedItems()) {
+                    Log.d(TAG, "Starring card: " + loyaltyCard.id);
+                    DBHelper.updateLoyaltyCardStarStatus(mDatabase, loyaltyCard.id, 1);
+                    updateLoyaltyCardList(false);
+                    inputMode.finish();
+                }
+                return true;
+            }
+            else if(inputItem.getItemId() == R.id.action_unstar){
+                for (LoyaltyCard loyaltyCard : mAdapter.getSelectedItems()) {
+                    Log.d(TAG, "Unstarring card: " + loyaltyCard.id);
+                    DBHelper.updateLoyaltyCardStarStatus(mDatabase, loyaltyCard.id, 0);
+                    updateLoyaltyCardList(false);
+                    inputMode.finish();
+                }
+                return true;
+            }

            return false;
        }
@@ -176,13 +226,28 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard

    @Override
    protected void onCreate(Bundle inputSavedInstanceState) {
-        super.onCreate(inputSavedInstanceState);
+        extractIntentFields(getIntent());
        SplashScreen.installSplashScreen(this);
-        setTitle(R.string.app_name);
-        setContentView(R.layout.main_activity);
+        super.onCreate(inputSavedInstanceState);
+        if(!mArchiveMode) {
+            setTitle(R.string.app_name);
+            setContentView(R.layout.main_activity);
+        }
+        else{
+            setTitle(R.string.archiveList);
+            setContentView(R.layout.archive_activity);
+        }
+
        Toolbar toolbar = findViewById(R.id.toolbar);
        setSupportActionBar(toolbar);

+        if(mArchiveMode){
+            ActionBar actionBar = getSupportActionBar();
+            if (actionBar != null) {
+                actionBar.setDisplayHomeAsUpEnabled(true);
+            }
+        }
+
        mDatabase = new DBHelper(this).getWritableDatabase();

        TabLayout groupsTabLayout = findViewById(R.id.groups);
@@ -192,7 +257,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),
@@ -232,7 +297,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.
@@ -297,6 +362,8 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
    protected void onResume() {
        super.onResume();

+        mAdapter.refreshState();
+
        if (mCurrentActionMode != null) {
            mAdapter.clearSelections();
            mCurrentActionMode.finish();
@@ -336,24 +403,28 @@ 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);
-        addButton.setOnClickListener(v -> {
-            Intent intent = new Intent(getApplicationContext(), ScanActivity.class);
-            Bundle bundle = new Bundle();
-            if (selectedTab != 0) {
-                bundle.putString(LoyaltyCardEditActivity.BUNDLE_ADDGROUP, groupsTabLayout.getTabAt(selectedTab).getText().toString());
-            }
-            intent.putExtras(bundle);
-            mBarcodeScannerLauncher.launch(intent);
-        });
-        addButton.bringToFront();
+        if (!mArchiveMode) {
+            FloatingActionButton addButton = findViewById(R.id.fabAdd);
+
+            addButton.setOnClickListener(v -> {
+                Intent intent = new Intent(getApplicationContext(), ScanActivity.class);
+                Bundle bundle = new Bundle();
+                if (selectedTab != 0) {
+                    bundle.putString(LoyaltyCardEditActivity.BUNDLE_ADDGROUP, groupsTabLayout.getTabAt(selectedTab).getText().toString());
+                }
+                intent.putExtras(bundle);
+                mBarcodeScannerLauncher.launch(intent);
+            });
+            addButton.bringToFront();
+        }
    }

    @Override
    public void onBackPressed() {
+
        if (!mSearchView.isIconified()) {
            mSearchView.setIconified(true);
            return;
@@ -362,20 +433,37 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
        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(DBHelper.getLoyaltyCardCursor(mDatabase, mFilter, group, mOrder, mOrderDirection));
+        mAdapter.swapCursor(DBHelper.getLoyaltyCardCursor(mDatabase, mFilter, group, mOrder, mOrderDirection, mArchiveMode ? DBHelper.LoyaltyCardArchiveFilter.Archived : DBHelper.LoyaltyCardArchiveFilter.Unarchived));

-        if (DBHelper.getLoyaltyCardCount(mDatabase) > 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);
@@ -394,6 +482,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);
        }
@@ -403,6 +492,11 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
        }
    }

+    private void extractIntentFields(Intent intent) {
+        final Bundle b = intent.getExtras();
+        mArchiveMode = b != null && b.getBoolean(BUNDLE_ARCHIVE_MODE, false);
+    }
+
    public void updateTabGroups(TabLayout groupsTabLayout) {
        List<Group> newGroups = DBHelper.getGroups(mDatabase);

@@ -427,11 +521,19 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
        }

        groupsTabLayout.setVisibility(View.VISIBLE);
+
    }

    @Override
    public boolean onCreateOptionsMenu(Menu inputMenu) {
-        getMenuInflater().inflate(R.menu.main_menu, inputMenu);
+        if(!mArchiveMode)
+            getMenuInflater().inflate(R.menu.main_menu, inputMenu);
+        else{
+            getMenuInflater().inflate(R.menu.archive_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) {
@@ -458,12 +560,20 @@ 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;
                }
            });
        }
+        if(!mArchiveMode) {
+            if (DBHelper.getArchivedCardsCount(mDatabase) == 0) {
+                inputMenu.findItem(R.id.action_archived).setVisible(false);
+            } else {
+                inputMenu.findItem(R.id.action_archived).setVisible(true);
+            }
+        }
+
        return super.onCreateOptionsMenu(inputMenu);
    }

@@ -471,24 +581,18 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
    public boolean onOptionsItemSelected(MenuItem inputItem) {
        int id = inputItem.getItemId();

+        if (id == android.R.id.home) {
+            onBackPressed();
+        }
+
        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++) {
@@ -504,17 +608,21 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
            final View customLayout = getLayoutInflater().inflate(R.layout.sorting_option, null);
            builder.setView(customLayout);

-            CheckBox ch = (CheckBox) customLayout.findViewById(R.id.checkBox_reverse);
-            ch.setChecked(mOrderDirection == DBHelper.LoyaltyCardOrderDirection.Descending);
+            CheckBox showReversed = (CheckBox) customLayout.findViewById(R.id.checkBox_reverse);
+
+
+            showReversed.setChecked(mOrderDirection == DBHelper.LoyaltyCardOrderDirection.Descending);
+

            builder.setSingleChoiceItems(R.array.sort_types_array, currentIndex.get(), (dialog, which) -> currentIndex.set(which));

            builder.setPositiveButton(R.string.sort, (dialog, which) -> {
-                if (ch.isChecked()) {
-                    setSort(loyaltyCardOrders.get(currentIndex.get()), DBHelper.LoyaltyCardOrderDirection.Descending);
-                } else {
-                    setSort(loyaltyCardOrders.get(currentIndex.get()), DBHelper.LoyaltyCardOrderDirection.Ascending);
-                }
+
+                setSort(
+                        loyaltyCardOrders.get(currentIndex.get()),
+                        showReversed.isChecked() ? DBHelper.LoyaltyCardOrderDirection.Descending : DBHelper.LoyaltyCardOrderDirection.Ascending
+                );
+
                dialog.dismiss();
            });

@@ -550,6 +658,16 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
            return true;
        }

+        if(id == R.id.action_archived){
+            Intent i = new Intent(getApplicationContext(), MainActivity.class);
+            Bundle bundle = new Bundle();
+            bundle.putBoolean("archiveMode", true);
+            i.putExtras(bundle);
+            startActivity(i);
+            return true;
+        }
+
+
        return super.onOptionsItemSelected(inputItem);
    }

@@ -568,7 +686,7 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
        sortPrefEditor.apply();

        // Update card list
-        updateLoyaltyCardList();
+        updateLoyaltyCardList(false);
    }

    @Override
@@ -671,10 +789,47 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
            mCurrentActionMode.setTitle(getResources().getQuantityString(R.plurals.selectedCardCount, count, count));

            MenuItem editItem = mCurrentActionMode.getMenu().findItem(R.id.action_edit);
+            MenuItem archiveItem = mCurrentActionMode.getMenu().findItem(R.id.action_archive);
+            MenuItem unarchiveItem = mCurrentActionMode.getMenu().findItem(R.id.action_unarchive);
+            MenuItem starItem = mCurrentActionMode.getMenu().findItem(R.id.action_star);
+            MenuItem unstarItem = mCurrentActionMode.getMenu().findItem(R.id.action_unstar);
+
+            boolean hasStarred = false;
+            boolean hasUnstarred = false;
+
+            if(!mArchiveMode) {
+                unarchiveItem.setVisible(false);
+                archiveItem.setVisible(true);
+            }
+            else{
+                unarchiveItem.setVisible(true);
+                archiveItem.setVisible(false);
+            }
+
+            for (LoyaltyCard loyaltyCard : mAdapter.getSelectedItems()) {
+
+                if (loyaltyCard.starStatus == 1) {
+                    hasStarred = true;
+                } else {
+                    hasUnstarred = true;
+                }
+
+                if (hasStarred && hasUnstarred) {
+                    hasStarred = true;
+                    hasUnstarred = true;
+                    break;
+                }
+            }
+
            if (count == 1) {
+                starItem.setVisible(!hasStarred);
+                unstarItem.setVisible(!hasUnstarred);
                editItem.setVisible(true);
                editItem.setEnabled(true);
            } else {
+                starItem.setVisible(hasUnstarred);
+                unstarItem.setVisible(hasStarred);
+
                editItem.setVisible(false);
                editItem.setEnabled(false);
            }
@@ -683,6 +838,7 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
        }
    }

+
    @Override
    public void onRowClicked(int inputPosition) {
        if (mAdapter.getSelectedItemCount() > 0) {
@@ -704,15 +860,22 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
                return;
            }

-            Intent i = new Intent(this, LoyaltyCardViewActivity.class);
-            i.setAction("");
+            Intent intent = new Intent(this, LoyaltyCardViewActivity.class);
+            intent.setAction("");
            final Bundle b = new Bundle();
            b.putInt("id", loyaltyCard.id);
-            i.putExtras(b);
+
+            ArrayList<Integer> cardList = new ArrayList<>();
+            for (int i = 0; i < mAdapter.getItemCount(); i++) {
+                cardList.add(mAdapter.getCard(i).id);
+            }
+
+            b.putIntegerArrayList("cardList", cardList);
+            intent.putExtras(b);

            ShortcutHelper.updateShortcuts(MainActivity.this, loyaltyCard);

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

 import android.app.Activity;
+import android.content.ActivityNotFoundException;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.os.Bundle;
@@ -206,6 +207,11 @@ public class ScanActivity extends CatimaAppCompatActivity {
    public void addFromImage(View view) {
        Intent photoPickerIntent = new Intent(Intent.ACTION_PICK);
        photoPickerIntent.setType("image/*");
-        photoPickerLauncher.launch(photoPickerIntent);
+        try {
+            photoPickerLauncher.launch(photoPickerIntent);
+        } catch (ActivityNotFoundException e) {
+            Toast.makeText(getApplicationContext(), R.string.failedLaunchingPhotoPicker, Toast.LENGTH_LONG).show();
+            Log.e(TAG, "No activity found to handle intent", e);
+        }
    }
 }
--- a/app/src/main/java/protect/card_locker/UCropWrapper.java
+++ b/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 com.google.android.material.color.MaterialColors;
+import com.google.android.material.textview.MaterialTextView;
+import com.yalantis.ucrop.UCropActivity;
+
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.AppCompatImageView;
+import androidx.core.content.ContextCompat;
+import androidx.core.graphics.ColorUtils;
+
+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));
+            }
+        }
+    }
+}
--- a/app/src/main/java/protect/card_locker/Utils.java
+++ b/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,11 @@ import android.os.Build;
 import android.os.LocaleList;
 import android.provider.MediaStore;
 import android.util.Log;
+import android.util.TypedValue;
+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;
@@ -32,6 +36,7 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.text.NumberFormat;
+import java.text.ParseException;
 import java.util.Calendar;
 import java.util.Currency;
 import java.util.Date;
@@ -39,9 +44,11 @@ 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 {
@@ -206,7 +213,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();
@@ -231,32 +238,19 @@ public class Utils {
        return numberFormat.format(value);
    }

-    static public Boolean currencyHasDecimals(Currency currency) {
+    static public BigDecimal parseBalance(String value, Currency currency) throws ParseException {
+        NumberFormat numberFormat = NumberFormat.getInstance();
+
        if (currency == null) {
-            return false;
+            numberFormat.setMaximumFractionDigits(0);
+        } else {
+            numberFormat.setMinimumFractionDigits(currency.getDefaultFractionDigits());
+            numberFormat.setMaximumFractionDigits(currency.getDefaultFractionDigits());
        }

-        return currency.getDefaultFractionDigits() != 0;
-    }
+        Log.d(TAG, numberFormat.parse(value).toString());

-    static public BigDecimal parseCurrency(String value, Boolean hasDecimals) throws NumberFormatException {
-        // If there are no decimals expected, remove all separators before parsing
-        if (!hasDecimals) {
-            value = value.replaceAll("[^0-9]", "");
-            return new BigDecimal(value);
-        }
-
-        // There are many ways users can write a currency, so we fix it up a bit
-        // 1. Replace all non-numbers with dots
-        value = value.replaceAll("[^0-9]", ".");
-
-        // 2. Remove all but the last dot
-        while (value.split("\\.").length > 2) {
-            value = value.replaceFirst("\\.", "");
-        }
-
-        // Parse as BigDecimal
-        return new BigDecimal(value);
+        return new BigDecimal(numberFormat.parse(value).toString());
    }

    static public byte[] bitmapToByteArray(Bitmap bitmap) {
@@ -448,4 +442,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);
+    }
 }
--- a/app/src/main/java/protect/card_locker/importexport/CatimaExporter.java
+++ b/app/src/main/java/protect/card_locker/importexport/CatimaExporter.java
@@ -135,7 +135,8 @@ public class CatimaExporter implements Exporter {
                DBHelper.LoyaltyCardDbIds.BARCODE_TYPE,
                DBHelper.LoyaltyCardDbIds.HEADER_COLOR,
                DBHelper.LoyaltyCardDbIds.STAR_STATUS,
-                DBHelper.LoyaltyCardDbIds.LAST_USED);
+                DBHelper.LoyaltyCardDbIds.LAST_USED,
+                DBHelper.LoyaltyCardDbIds.ARCHIVE_STATUS);

        Cursor cardCursor = DBHelper.getLoyaltyCardCursor(database);

@@ -153,7 +154,8 @@ public class CatimaExporter implements Exporter {
                    card.barcodeType != null ? card.barcodeType.name() : "",
                    card.headerColor,
                    card.starStatus,
-                    card.lastUsed);
+                    card.lastUsed,
+                    card.archiveStatus);

            if (Thread.currentThread().isInterrupted()) {
                throw new InterruptedException();
--- a/app/src/main/java/protect/card_locker/importexport/CatimaImporter.java
+++ b/app/src/main/java/protect/card_locker/importexport/CatimaImporter.java
@@ -321,6 +321,15 @@ public class CatimaImporter implements Importer {
        }
        if (starStatus != 1) starStatus = 0;

+        int archiveStatus = 0;
+        try {
+            archiveStatus = CSVHelpers.extractInt(DBHelper.LoyaltyCardDbIds.ARCHIVE_STATUS, record, false);
+        } catch (FormatException _e) {
+            // This field did not exist in versions 2.16.3 and before
+            // We catch this exception so we can still import old backups
+        }
+        if (archiveStatus != 1) archiveStatus = 0;
+
        Long lastUsed = 0L;
        try {
            lastUsed = CSVHelpers.extractLong(DBHelper.LoyaltyCardDbIds.LAST_USED, record, false);
@@ -329,7 +338,7 @@ public class CatimaImporter implements Importer {
            // We catch this exception so we can still import old backups
        }

-        DBHelper.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,archiveStatus);
    }

    /**
--- a/app/src/main/java/protect/card_locker/importexport/Exporter.java
+++ b/app/src/main/java/protect/card_locker/importexport/Exporter.java
@@ -6,8 +6,6 @@ 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.
--- a/app/src/main/java/protect/card_locker/importexport/FidmeImporter.java
+++ b/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)
@@ -56,7 +57,7 @@ public class FidmeImporter implements Importer {

        try {
            for (CSVRecord record : fidmeParser) {
-                importLoyaltyCard(database, record);
+                importLoyaltyCard(context, database, record);

                if (Thread.currentThread().isInterrupted()) {
                    throw new InterruptedException();
@@ -75,7 +76,7 @@ public class FidmeImporter implements Importer {
     * Import a single loyalty card into the database using the given
     * session.
     */
-    private void importLoyaltyCard(SQLiteDatabase database, CSVRecord record)
+    private void importLoyaltyCard(Context context, SQLiteDatabase database, CSVRecord record)
            throws FormatException {
        // A loyalty card export from Fidme contains the following fields:
        // Retailer (store name)
@@ -117,11 +118,13 @@ 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 archiveStatus = 0;
+        int headerColor = Utils.getRandomHeaderColor(context);

        // TODO: Front and back image

-        DBHelper.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,archiveStatus);
    }
 }
--- a/app/src/main/java/protect/card_locker/importexport/ImportExportResult.java
+++ b/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;
+    }
 }
--- a/app/src/main/java/protect/card_locker/importexport/ImportExportResultType.java
+++ b/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;
+}
--- a/app/src/main/java/protect/card_locker/importexport/MultiFormatExporter.java
+++ b/app/src/main/java/protect/card_locker/importexport/MultiFormatExporter.java
@@ -4,11 +4,8 @@ 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";

@@ -34,20 +31,20 @@ public class MultiFormatExporter {
                break;
        }

+        String error;
        if (exporter != null) {
            try {
                exporter.exportData(context, database, output, password);
-                return ImportExportResult.Success;
-            } catch (IOException e) {
-                Log.e(TAG, "Failed to export data", e);
-            } catch (InterruptedException e) {
+                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);
    }
 }
--- a/app/src/main/java/protect/card_locker/importexport/MultiFormatImporter.java
+++ b/app/src/main/java/protect/card_locker/importexport/MultiFormatImporter.java
@@ -6,14 +6,7 @@ import android.util.Log;

 import net.lingala.zip4j.exception.ZipException;

-import org.json.JSONException;
-
-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 {
    private static final String TAG = "Catima";
@@ -47,23 +40,31 @@ public class MultiFormatImporter {
                break;
        }

+        String error = null;
        if (importer != null) {
            database.beginTransaction();
            try {
                importer.importData(context, database, input, password);
                database.setTransactionSuccessful();
-                return ImportExportResult.Success;
+                return new ImportExportResult(ImportExportResultType.Success);
            } catch (ZipException e) {
-                return ImportExportResult.BadPassword;
-            } catch (IOException | FormatException | InterruptedException | JSONException | ParseException | NullPointerException e) {
+                if (e.getType().equals(ZipException.Type.WRONG_PASSWORD)) {
+                    return new ImportExportResult(ImportExportResultType.BadPassword);
+                } else {
+                    Log.e(TAG, "Failed to import data", e);
+                    error = e.toString();
+                }
+            } 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);
    }
 }
--- a/app/src/main/java/protect/card_locker/importexport/StocardImporter.java
+++ b/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 {
+    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",
@@ -155,22 +204,41 @@ public class StocardImporter implements Importer {

        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 = DBHelper.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,0);
+
+            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);
@@ -197,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<>();
--- a/app/src/main/java/protect/card_locker/importexport/VoucherVaultImporter.java
+++ b/app/src/main/java/protect/card_locker/importexport/VoucherVaultImporter.java
@@ -126,7 +126,7 @@ public class VoucherVaultImporter implements Importer {
                    throw new FormatException("Unknown colour type found: " + colorFromJSON);
            }

-            DBHelper.insertLoyaltyCard(database, 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(),0);
        }

        bufferedReader.close();
--- a/app/src/main/java/protect/card_locker/preferences/Settings.java
+++ b/app/src/main/java/protect/card_locker/preferences/Settings.java
@@ -91,8 +91,8 @@ public class Settings {
        return getBoolean(R.string.settings_key_display_barcode_max_brightness, true);
    }

-    public boolean getLockBarcodeScreenOrientation() {
-        return getBoolean(R.string.settings_key_lock_barcode_orientation, false);
+    public String getCardViewOrientation() {
+        return getString(R.string.settings_key_card_orientation, getResString(R.string.settings_key_follow_system_orientation));
    }

    public boolean getKeepScreenOn() {
@@ -102,4 +102,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));
+    }
 }
--- a/app/src/main/java/protect/card_locker/preferences/SettingsActivity.java
+++ b/app/src/main/java/protect/card_locker/preferences/SettingsActivity.java
@@ -6,6 +6,12 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.view.MenuItem;

+import com.google.android.material.color.DynamicColors;
+
+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;
@@ -14,11 +20,6 @@ import androidx.fragment.app.DialogFragment;
 import androidx.preference.ListPreference;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceFragmentCompat;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-
 import nl.invissvenska.numberpickerpreference.NumberDialogPreference;
 import nl.invissvenska.numberpickerpreference.NumberPickerPreferenceDialogFragment;
 import protect.card_locker.CatimaAppCompatActivity;
@@ -129,16 +130,28 @@ public class SettingsActivity extends CatimaAppCompatActivity {
                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) -> {
                refreshActivity(true);
                return true;
            });
-            localePreference.setOnPreferenceChangeListener((preference, newValue) -> {
-                refreshActivity(true);
-                return true;
-            });
+            if (!DynamicColors.isDynamicColorAvailable()) {
+                colorPreference.setEntryValues(R.array.color_values_no_dynamic);
+                colorPreference.setEntries(R.array.color_value_strings_no_dynamic);
+            }
        }

        private void refreshActivity(boolean reloadMain) {
--- a/app/src/main/res/anim/slide_in_left.xml
+++ b/app/src/main/res/anim/slide_in_left.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- https://stackoverflow.com/questions/5151591/android-left-to-right-slide-animation/5151774#5151774 -->
+    <translate
+        android:duration="200"
+        android:fromXDelta="-100%"
+        android:fromYDelta="0%"
+        android:toXDelta="0%"
+        android:toYDelta="0%" />
+</set>
--- a/app/src/main/res/anim/slide_in_right.xml
+++ b/app/src/main/res/anim/slide_in_right.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- https://stackoverflow.com/questions/5151591/android-left-to-right-slide-animation/5151774#5151774 -->
+    <translate
+        android:duration="200"
+        android:fromXDelta="100%"
+        android:fromYDelta="0%"
+        android:toXDelta="0%"
+        android:toYDelta="0%" />
+</set>
--- a/app/src/main/res/anim/slide_out_left.xml
+++ b/app/src/main/res/anim/slide_out_left.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- https://stackoverflow.com/questions/5151591/android-left-to-right-slide-animation/5151774#5151774 -->
+    <translate
+        android:duration="200"
+        android:fromXDelta="0%"
+        android:fromYDelta="0%"
+        android:toXDelta="-100%"
+        android:toYDelta="0%" />
+</set>
--- a/app/src/main/res/anim/slide_out_right.xml
+++ b/app/src/main/res/anim/slide_out_right.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- https://stackoverflow.com/questions/5151591/android-left-to-right-slide-animation/5151774#5151774 -->
+    <translate
+        android:duration="200"
+        android:fromXDelta="0%"
+        android:fromYDelta="0%"
+        android:toXDelta="100%"
+        android:toYDelta="0%" />
+</set>
--- a/app/src/main/res/drawable/home_arrow_back_white.xml
+++ b/app/src/main/res/drawable/home_arrow_back_white.xml
@@ -0,0 +1,5 @@
+<vector android:autoMirrored="true" 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"/>
+</vector>
--- a/app/src/main/res/drawable/ic_add_white_24dp.xml
+++ b/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"/>
--- a/app/src/main/res/drawable/ic_baseline_archive_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_archive_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="@android:color/white">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M20.54,5.23l-1.39,-1.68C18.88,3.21 18.47,3 18,3H6c-0.47,0 -0.88,0.21 -1.16,0.55L3.46,5.23C3.17,5.57 3,6.02 3,6.5V19c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2V6.5c0,-0.48 -0.17,-0.93 -0.46,-1.27zM12,17.5L6.5,12H10v-2h4v2h3.5L12,17.5zM5.12,5l0.81,-1h12l0.94,1H5.12z"/>
+</vector>
--- a/app/src/main/res/drawable/ic_baseline_archive_24_black.xml
+++ b/app/src/main/res/drawable/ic_baseline_archive_24_black.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="@android:color/black">
+    <path
+        android:fillColor="@android:color/black"
+        android:pathData="M20.54,5.23l-1.39,-1.68C18.88,3.21 18.47,3 18,3H6c-0.47,0 -0.88,0.21 -1.16,0.55L3.46,5.23C3.17,5.57 3,6.02 3,6.5V19c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2V6.5c0,-0.48 -0.17,-0.93 -0.46,-1.27zM12,17.5L6.5,12H10v-2h4v2h3.5L12,17.5zM5.12,5l0.81,-1h12l0.94,1H5.12z"/>
+</vector>
--- a/app/src/main/res/drawable/ic_baseline_arrow_drop_down_24.xml
+++ b/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"/>
--- a/app/src/main/res/drawable/ic_baseline_arrow_drop_up_24.xml
+++ b/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"/>
--- a/app/src/main/res/drawable/ic_baseline_chevron_left_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_chevron_left_24.xml
@@ -1,5 +1,5 @@
 <vector android:height="24dp" android:tint="#FFFFFF"
    android:viewportHeight="24" android:viewportWidth="24"
    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z"/>
+    <path android:fillColor="@android:color/white" android:pathData="M15.41,7.41L14,6l-6,6 6,6 1.41,-1.41L10.83,12z"/>
 </vector>
--- a/app/src/main/res/drawable/ic_baseline_chevron_right_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_chevron_right_24.xml
@@ -1,5 +1,5 @@
 <vector android:height="24dp" android:tint="#FFFFFF"
    android:viewportHeight="24" android:viewportWidth="24"
    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="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"/>
+    <path android:fillColor="@android:color/white" android:pathData="M10,6L8.59,7.41 13.17,12l-4.58,4.59L10,18l6,-6z"/>
 </vector>
--- a/app/src/main/res/drawable/ic_baseline_info_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_info_24.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,17h-2v-6h2v6zM13,9h-2L11,7h2v2z"/>
+</vector>
--- a/app/src/main/res/drawable/ic_baseline_sort_24.xml
+++ b/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>
--- a/app/src/main/res/drawable/ic_baseline_unfold_less_24.xml
+++ b/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"/>
--- a/app/src/main/res/drawable/ic_baseline_unfold_more_24.xml
+++ b/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"/>
--- a/app/src/main/res/drawable/ic_copy.xml
+++ b/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"/>
--- a/app/src/main/res/drawable/ic_delete_white_24dp.xml
+++ b/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"/>
--- a/app/src/main/res/drawable/ic_done.xml
+++ b/app/src/main/res/drawable/ic_done.xml
@@ -1,7 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="@color/colorPrimary"
    android:viewportWidth="24"
    android:viewportHeight="24">
  <path
--- a/app/src/main/res/drawable/ic_flashlight_off_white_24dp.xml
+++ b/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"/>
--- a/app/src/main/res/drawable/ic_flashlight_on_white_24dp.xml
+++ b/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"/>
--- a/app/src/main/res/drawable/ic_folder_white.xml
+++ b/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"/>
--- a/app/src/main/res/drawable/ic_import_export_white_24dp.xml
+++ b/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"/>
--- a/app/src/main/res/drawable/ic_lock_open_white_24dp.xml
+++ b/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"/>
--- a/app/src/main/res/drawable/ic_lock_outline_white_24dp.xml
+++ b/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"/>
--- a/app/src/main/res/drawable/ic_mode_edit_white_24dp.xml
+++ b/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"/>
--- a/app/src/main/res/drawable/ic_overflow_menu.xml
+++ b/app/src/main/res/drawable/ic_overflow_menu.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M12,8c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,16c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z"/>
+</vector>
--- a/app/src/main/res/drawable/ic_search_white.xml
+++ b/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"/>
--- a/app/src/main/res/drawable/list_row.xml
+++ b/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>
--- a/app/src/main/res/drawable/round_outline.xml
+++ b/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>
--- a/app/src/main/res/layout/about_activity.xml
+++ b/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,7 +122,6 @@
                    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" />
@@ -143,12 +138,12 @@
                    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"
@@ -168,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" />
@@ -185,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"
@@ -210,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" />
@@ -226,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"
@@ -251,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" />
@@ -267,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"
@@ -292,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" />
@@ -308,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"
@@ -333,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" />
@@ -349,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"
--- a/app/src/main/res/layout/activity_manage_group.xml
+++ b/app/src/main/res/layout/activity_manage_group.xml
@@ -7,14 +7,15 @@
    android:layout_height="match_parent"
    android:fitsSystemWindows="true"
    tools:context="protect.card_locker.ManageGroupActivity">
+
    <com.google.android.material.floatingactionbutton.FloatingActionButton
        android:id="@+id/fabSave"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_gravity="end|bottom"
-        app:srcCompat="@drawable/save_24dp"
+        android:layout_margin="16dp"
        android:contentDescription="@string/save"
-        android:layout_margin="16dp" />
+        app:srcCompat="@drawable/ic_done" />
    <LinearLayout
        android:layout_width="match_parent"
        android:layout_height="match_parent"
@@ -22,15 +23,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"
--- a/app/src/main/res/layout/archive_activity.xml
+++ b/app/src/main/res/layout/archive_activity.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.coordinatorlayout.widget.CoordinatorLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
+    tools:context="protect.card_locker.MainActivity">
+
+    <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.tabs.TabLayout
+            android:id="@+id/groups"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:tabMode="scrollable"
+            android:visibility="gone"/>
+
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <include layout="@layout/content_main"/>
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
--- a/app/src/main/res/layout/barcode_layout.xml
+++ b/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"
--- a/app/src/main/res/layout/barcode_selector_activity.xml
+++ b/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"
@@ -73,7 +74,6 @@
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toStartOf="parent"
            android:text="@string/barcodeNoBarcode"
-            android:textColor="#FFFFFF"
            android:enabled="false" />
        <ListView
            android:id="@+id/barcodes"
--- a/app/src/main/res/layout/content_main.xml
+++ b/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>
--- a/app/src/main/res/layout/group_layout.xml
+++ b/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>

--- a/app/src/main/res/layout/group_main.xml
+++ b/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>
--- a/app/src/main/res/layout/import_export_activity.xml
+++ b/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>

--- a/app/src/main/res/layout/layout_chip_choice.xml
+++ b/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" />
--- a/app/src/main/res/layout/loyalty_card_edit_activity.xml
+++ b/app/src/main/res/layout/loyalty_card_edit_activity.xml
@@ -12,21 +12,19 @@
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_gravity="end|bottom"
-        app:srcCompat="@drawable/save_24dp"
+        android:layout_margin="16dp"
        android:contentDescription="@string/save"
-        android:layout_margin="16dp" />
+        app:srcCompat="@drawable/ic_done" />

    <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"
@@ -86,6 +82,17 @@
                            android:contentDescription="@string/thumbnailDescription"
                            android:src="@mipmap/ic_launcher"/>

+                        <com.google.android.material.imageview.ShapeableImageView
+                            android:id="@+id/thumbnailEditIcon"
+                            app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Material3.FloatingActionButton"
+                            android:layout_width="@dimen/cardThumbnailEditOverlaySize"
+                            android:layout_height="@dimen/cardThumbnailEditOverlaySize"
+                            android:layout_gravity="bottom|end"
+                            android:layout_margin="4dp"
+                            app:contentPadding="4dp"
+                            android:alpha="0.8"
+                            android:src="@drawable/ic_mode_edit_white_24dp"/>
+
                    </com.google.android.material.card.MaterialCardView>

                    <com.google.android.material.textfield.TextInputLayout
@@ -128,6 +135,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 +257,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 +337,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 +373,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 +409,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>
--- a/app/src/main/res/layout/loyalty_card_layout.xml
+++ b/app/src/main/res/layout/loyalty_card_layout.xml
@@ -18,11 +18,13 @@
            android:layout_height="0dp"
            android:outlineProvider="none"
            app:cardCornerRadius="8dp"
+            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:layout_width="match_parent"
                android:layout_height="match_parent"
@@ -35,6 +37,7 @@
                app:layout_constraintTop_toTopOf="parent" />

            <ImageView
+                android:importantForAccessibility="no"
                android:id="@+id/selected_thumbnail"
                android:layout_width="match_parent"
                android:layout_height="match_parent"
@@ -44,13 +47,15 @@
                app:layout_constraintEnd_toEndOf="parent"
                app:layout_constraintStart_toStartOf="parent"
                app:layout_constraintTop_toTopOf="parent"
-                app:srcCompat="@drawable/ic_done" />
+                app:srcCompat="@drawable/ic_done"
+                android:background="@color/md_theme_dark_onSelected" />

            <androidx.constraintlayout.widget.ConstraintLayout
                android:id="@+id/star"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
-                android:layout_gravity="end">
+                android:layout_gravity="end"
+                tools:ignore="ExtraText">

                <ImageView
                    android:id="@+id/star_background"
@@ -58,7 +63,7 @@
                    android:layout_height="@dimen/cardThumbnailSize"
                    android:layout_gravity="end"
                    android:alpha="0.5"
-                    android:contentDescription="@string/starImage"
+                    android:contentDescription="@string/starred"
                    android:elevation="4dp"
                    android:visibility="visible"
                    app:layout_constraintEnd_toEndOf="parent"
@@ -67,6 +72,7 @@
                    tools:ignore="ImageContrastCheck" />

                <ImageView
+                    android:importantForAccessibility="no"
                    android:id="@+id/star_border"
                    android:layout_width="@dimen/cardThumbnailSize"
                    android:layout_height="@dimen/cardThumbnailSize"
@@ -77,11 +83,38 @@
                    android:visibility="visible"
                    app:layout_constraintEnd_toEndOf="parent"
                    app:layout_constraintTop_toTopOf="parent"
-                    app:srcCompat="@drawable/ic_unstarred_white"
+                    app:srcCompat="@drawable/ic_unstarred_black"
                    tools:ignore="ImageContrastCheck" />

            </androidx.constraintlayout.widget.ConstraintLayout>

+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/archivedIcon"
+                android:layout_width="match_parent"
+                android:layout_height="149dp"
+                android:layout_gravity="end"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintHorizontal_bias="0.5"
+                app:layout_constraintStart_toEndOf="@+id/thumbnail"
+                tools:layout_editor_absoluteX="355dp">
+
+                <ImageView
+                    android:id="@+id/archive_background"
+                    android:layout_width="41dp"
+                    android:layout_height="44dp"
+                    android:layout_gravity="end"
+                    android:alpha="0.5"
+                    android:contentDescription="@string/archived"
+                    android:elevation="4dp"
+                    android:rotationX="2"
+                    android:visibility="visible"
+                    app:srcCompat="@drawable/ic_baseline_archive_24"
+                    tools:ignore="ImageContrastCheck,MissingConstraints"
+                    tools:layout_editor_absoluteX="0dp"
+                    tools:layout_editor_absoluteY="-1dp" />
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
        </com.google.android.material.card.MaterialCardView>

        <TextView
@@ -167,5 +200,6 @@
            app:layout_constraintStart_toStartOf="parent"
            tools:visibility="visible"
            tools:text="Tomorrow"/>
+
    </androidx.constraintlayout.widget.ConstraintLayout>
-</com.google.android.material.card.MaterialCardView>
+</com.google.android.material.card.MaterialCardView>
--- a/app/src/main/res/layout/loyalty_card_view_layout.xml
+++ b/app/src/main/res/layout/loyalty_card_view_layout.xml
@@ -8,234 +8,6 @@
    android:layout_height="fill_parent"
    android:fitsSystemWindows="true">

-    <com.google.android.material.floatingactionbutton.FloatingActionButton
-        android:id="@+id/fabEdit"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="end|bottom"
-        app:srcCompat="@drawable/ic_mode_edit_white_24dp"
-        android:contentDescription="@string/edit"
-        android:layout_margin="16dp" />
-
-    <FrameLayout
-        android:clipChildren="false"
-        android:clipToPadding="false"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior">
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="fill_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical">
-
-            <androidx.constraintlayout.widget.Guideline
-                android:id="@+id/centerGuideline"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                app:layout_constraintGuide_percent="0.5"/>
-
-            <androidx.constraintlayout.widget.Guideline
-                android:id="@+id/scalerGuideline"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                app:layout_constraintGuide_percent="0.75"/>
-
-            <ImageButton
-                android:id="@+id/maximizeButton"
-                android:visibility="gone"
-                android:layout_width="match_parent"
-                android:layout_height="40dp"
-                android:layout_marginStart="15.0dip"
-                android:layout_marginEnd="15.0dip"
-                android:layout_marginTop="10dp"
-                android:padding="0dp"
-                app:srcCompat="@drawable/ic_baseline_arrow_drop_up_24"
-                android:contentDescription="@string/moveBarcodeToTopOfScreen"
-                app:tint="#ffffff"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintBottom_toTopOf="@+id/mainImage"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent" />
-
-            <ImageView
-                android:id="@+id/mainImage"
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:orientation="horizontal"
-                android:layout_marginTop="10dp"
-                android:layout_marginBottom="10dp"
-                android:layout_marginStart="15.0dip"
-                android:layout_marginEnd="15.0dip"
-                app:layout_constraintBottom_toTopOf="@+id/centerGuideline"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/maximizeButton"/>
-
-            <ImageButton
-                android:id="@+id/minimizeButton"
-                android:visibility="gone"
-                android:layout_width="match_parent"
-                android:layout_height="40dp"
-                android:layout_marginStart="15.0dip"
-                android:layout_marginEnd="15.0dip"
-                android:layout_marginTop="10dp"
-                android:padding="0dp"
-                app:srcCompat="@drawable/ic_baseline_arrow_drop_down_24"
-                android:contentDescription="@string/moveBarcodeToCenterOfScreen"
-                app:tint="#ffffff"
-                app:layout_constraintTop_toBottomOf="@+id/mainImage"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent" />
-
-            <LinearLayout
-                android:id="@+id/dotIndicator"
-                android:visibility="gone"
-                android:gravity="center_vertical"
-                android:layout_gravity="center_vertical"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:layout_marginTop="10dp"
-                android:layout_marginBottom="10dp"
-                android:layout_marginStart="15.0dip"
-                android:layout_marginEnd="15.0dip"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/minimizeButton"/>
-
-            <SeekBar
-                android:id="@+id/barcodeScaler"
-                android:visibility="gone"
-                android:max="100"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_margin="@dimen/inputPadding"
-                android:layout_marginStart="15.0dip"
-                android:layout_marginEnd="15.0dip"
-                app:layout_constraintTop_toBottomOf="@+id/scalerGuideline"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent" />
-
-            <TextView
-                android:id="@+id/cardIdView"
-                android:enabled="true"
-                android:textIsSelectable="true"
-                android:focusable="true"
-                android:longClickable="true"
-                android:layout_width="0dp"
-                android:layout_height="0dp"
-                android:layout_marginLeft="10.0dip"
-                android:layout_marginRight="10.0dip"
-                android:paddingBottom="80dp"
-                app:layout_constraintTop_toBottomOf="@+id/dotIndicator"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                android:textAlignment="center"
-                app:autoSizeTextType="uniform"
-                app:autoSizeMinTextSize="@dimen/singleCardCardIdTextSizeMin"
-                app:autoSizeMaxTextSize="@dimen/singleCardCardIdTextSizeMax"
-                android:ellipsize="end"/>
-
-        </androidx.constraintlayout.widget.ConstraintLayout>
-
-        <View
-            android:id="@+id/drop_shadow_actionbar"
-            android:layout_width="fill_parent"
-            android:layout_height="5.0dip"
-            android:layout_gravity="top"/>
-    </FrameLayout>
-
-    <LinearLayout
-        android:id="@+id/bottom_sheet"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@color/inputBackground"
-        android:orientation="vertical"
-        android:paddingTop="0px"
-        android:visibility="gone"
-        app:behavior_hideable="false"
-        app:behavior_peekHeight="80dp"
-        app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior"
-        tools:visibility="visible">
-
-        <ImageButton
-            android:id="@+id/bottomSheetButton"
-            android:layout_width="match_parent"
-            android:layout_height="80dp"
-            android:layout_gravity="top|start"
-            android:contentDescription="@string/toggleMoreInfo"
-            android:scaleType="fitCenter"
-            app:srcCompat="@drawable/ic_baseline_arrow_drop_up_24"
-            app:tint="#ffffff" />
-
-        <androidx.core.widget.NestedScrollView
-            android:id="@+id/bottomSheetContentWrapper"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
-
-                <TextView
-                    android:id="@+id/noteView"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:autoLink="all"
-                    android:enabled="true"
-                    android:focusable="true"
-                    android:gravity="center"
-                    android:longClickable="true"
-                    android:padding="20dp"
-                    android:textIsSelectable="true"
-                    android:textSize="@dimen/singleCardNoteTextSizeMin" />
-
-                <TextView
-                    android:id="@+id/groupsView"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:enabled="true"
-                    android:focusable="true"
-                    android:gravity="center"
-                    android:longClickable="true"
-                    android:padding="20dp"
-                    android:textIsSelectable="true"
-                    android:textSize="@dimen/singleCardNoteTextSizeMin" />
-
-                <TextView
-                    android:id="@+id/balanceView"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:enabled="true"
-                    android:focusable="true"
-                    android:gravity="center"
-                    android:longClickable="true"
-                    android:padding="20dp"
-                    android:textIsSelectable="true"
-                    android:textSize="@dimen/singleCardNoteTextSizeMin" />
-
-                <TextView
-                    android:id="@+id/expiryView"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:enabled="true"
-                    android:focusable="true"
-                    android:gravity="center"
-                    android:longClickable="true"
-                    android:padding="20dp"
-                    android:textIsSelectable="true"
-                    android:textSize="@dimen/singleCardNoteTextSizeMin" />
-            </LinearLayout>
-        </androidx.core.widget.NestedScrollView>
-    </LinearLayout>
-
-
    <com.google.android.material.appbar.AppBarLayout
        android:id="@+id/app_bar_layout"
        android:layout_width="fill_parent"
@@ -244,17 +16,15 @@
        android:clipChildren="false"
        android:clipToPadding="false"
        android:fitsSystemWindows="true"
-        android:weightSum="1.0"
-        >
+        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 +60,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" />

@@ -307,5 +76,202 @@
        app:srcCompat="@drawable/ic_launcher_foreground"
        tools:ignore="ContentDescription" />

+    <FrameLayout
+        android:clipChildren="false"
+        android:clipToPadding="false"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        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">
+
+            <androidx.constraintlayout.widget.Guideline
+                android:id="@+id/centerGuideline"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                app:layout_constraintGuide_percent="0.5"/>
+
+            <androidx.constraintlayout.widget.Guideline
+                android:id="@+id/scalerGuideline"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                app:layout_constraintGuide_percent="0.75"/>
+
+            <ImageButton
+                android:id="@+id/maximizeButton"
+                android:layout_width="match_parent"
+                android:layout_height="40dp"
+                android:layout_marginStart="15.0dip"
+                android:layout_marginTop="10dp"
+                android:layout_marginEnd="15.0dip"
+                android:background="?attr/colorPrimary"
+                android:contentDescription="@string/moveBarcodeToTopOfScreen"
+                android:padding="0dp"
+                android:visibility="gone"
+                app:layout_constraintBottom_toTopOf="@+id/mainImage"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:srcCompat="@drawable/ic_baseline_arrow_drop_up_24"
+                app:tint="?attr/colorOnPrimary"
+                tools:visibility="visible" />
+
+            <ImageView
+                android:id="@+id/mainImage"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:orientation="horizontal"
+                android:layout_marginTop="10dp"
+                android:layout_marginBottom="10dp"
+                android:layout_marginStart="15.0dip"
+                android:layout_marginEnd="15.0dip"
+                app:layout_constraintBottom_toTopOf="@+id/centerGuideline"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/maximizeButton"/>
+
+            <ImageButton
+                android:id="@+id/minimizeButton"
+                android:layout_width="match_parent"
+                android:layout_height="40dp"
+                android:layout_marginStart="15.0dip"
+                android:layout_marginTop="10dp"
+                android:layout_marginEnd="15.0dip"
+                android:background="?attr/colorPrimary"
+                android:contentDescription="@string/moveBarcodeToCenterOfScreen"
+                android:padding="0dp"
+                android:visibility="gone"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/mainImage"
+                app:srcCompat="@drawable/ic_baseline_arrow_drop_down_24"
+                app:tint="?attr/colorOnPrimary"
+                tools:visibility="visible" />
+
+            <LinearLayout
+                android:id="@+id/dotIndicator"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:layout_marginStart="15.0dip"
+                android:layout_marginTop="10dp"
+                android:layout_marginEnd="15.0dip"
+                android:gravity="center_vertical"
+                android:orientation="horizontal"
+                android:visibility="gone"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/minimizeButton"
+                tools:visibility="visible" />
+
+            <SeekBar
+                android:id="@+id/barcodeScaler"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="@dimen/inputPadding"
+                android:layout_marginStart="15.0dip"
+                android:layout_marginEnd="15.0dip"
+                android:contentDescription="@string/set_scale"
+                android:max="100"
+                android:visibility="gone"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/scalerGuideline" />
+
+            <TextView
+                android:id="@+id/cardIdView"
+                android:enabled="true"
+                android:textIsSelectable="true"
+                android:focusable="true"
+                android:longClickable="true"
+                android:layout_width="0dp"
+                android:layout_height="0dp"
+                android:layout_marginLeft="10.0dip"
+                android:layout_marginRight="10.0dip"
+                android:paddingBottom="80dp"
+                app:layout_constraintTop_toBottomOf="@+id/dotIndicator"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                android:textAlignment="center"
+                app:autoSizeTextType="uniform"
+                app:autoSizeMinTextSize="@dimen/singleCardCardIdTextSizeMin"
+                app:autoSizeMaxTextSize="@dimen/singleCardCardIdTextSizeMax"
+                android:ellipsize="end"/>
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+        <View
+            android:id="@+id/drop_shadow_actionbar"
+            android:layout_width="fill_parent"
+            android:layout_height="5.0dip"
+            android:layout_gravity="top"/>
+    </FrameLayout>
+
+    <com.google.android.material.bottomappbar.BottomAppBar
+        android:id="@+id/bottom_app_bar"
+        style="@style/Widget.MaterialComponents.BottomAppBar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom"
+        android:background="?attr/colorPrimary"
+        app:contentInsetLeft="0dp"
+        app:contentInsetStart="0dp"
+        app:contentInsetRight="0dp"
+        app:contentInsetEnd="0dp"
+        app:fabAlignmentMode="center">
+
+        <ImageButton
+            android:id="@+id/button_previous"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_gravity="left"
+            android:paddingStart="12dp"
+            android:paddingEnd="12dp"
+            android:background="@android:color/transparent"
+            android:src="@drawable/ic_baseline_chevron_left_24"
+            android:tooltipText="@string/previousCard"
+            android:visibility="gone" />
+
+        <ImageButton
+            android:id="@+id/button_show_info"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_gravity="start"
+            android:paddingStart="12dp"
+            android:paddingEnd="12dp"
+            android:background="@android:color/transparent"
+            android:src="@drawable/ic_baseline_info_24"
+            android:tooltipText="@string/showMoreInfo"
+            android:visibility="gone" />
+
+        <ImageButton
+            android:id="@+id/button_next"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_gravity="right"
+            android:paddingStart="12dp"
+            android:paddingEnd="12dp"
+            android:background="@android:color/transparent"
+            android:src="@drawable/ic_baseline_chevron_right_24"
+            android:tooltipText="@string/nextCard"
+            android:visibility="gone" />
+
+    </com.google.android.material.bottomappbar.BottomAppBar>
+
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        android:id="@+id/fabEdit"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:srcCompat="@drawable/ic_mode_edit_white_24dp"
+        android:contentDescription="@string/edit"
+        app:layout_anchor="@id/bottom_app_bar" />

 </androidx.coordinatorlayout.widget.CoordinatorLayout>
--- a/app/src/main/res/layout/main_activity.xml
+++ b/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"
--- a/app/src/main/res/layout/manage_groups_activity.xml
+++ b/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>

--- a/app/src/main/res/layout/scan_activity.xml
+++ b/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>
--- a/app/src/main/res/layout/settings_activity.xml
+++ b/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>
--- a/app/src/main/res/layout/simple_toolbar_list_activity.xml
+++ b/app/src/main/res/layout/simple_toolbar_list_activity.xml
@@ -3,19 +3,18 @@
    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:layout_height="match_parent"
+    android:fitsSystemWindows="true">

    <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>

--- a/app/src/main/res/menu/archive_menu.xml
+++ b/app/src/main/res/menu/archive_menu.xml
@@ -0,0 +1,24 @@
+<menu 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"
+    tools:context="protect.card_locker.MainActivity">
+    <item
+        android:id="@+id/action_search"
+        android:title="@string/action_search"
+        android:icon="@drawable/ic_search_white"
+        app:actionViewClass="androidx.appcompat.widget.SearchView"
+        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"
+        android:visible="false"/>
+    <item
+        android:id="@+id/action_sort"
+        android:title="@string/sort"
+        android:icon="@drawable/ic_baseline_sort_24"
+        app:showAsAction="always"
+        android:visible="false"/>
+</menu>
--- a/app/src/main/res/menu/card_details_menu.xml
+++ b/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>
--- a/app/src/main/res/menu/card_longclick_menu.xml
+++ b/app/src/main/res/menu/card_longclick_menu.xml
@@ -2,20 +2,6 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
      xmlns:app="http://schemas.android.com/apk/res-auto">

-    <item
-        android:id="@+id/action_copy_to_clipboard"
-        android:title="@string/copy_to_clipboard"
-        android:icon="@drawable/ic_copy"
-        android:titleCondensed="@string/copy_to_clipboard"
-        app:showAsAction="ifRoom"/>
-
-    <item
-        android:id="@+id/action_share"
-        android:title="@string/share"
-        android:icon="@drawable/ic_share"
-        android:titleCondensed="@string/share"
-        app:showAsAction="ifRoom"/>
-
    <item
        android:id="@+id/action_edit"
        android:icon="@drawable/ic_edit"
@@ -23,11 +9,48 @@
        android:titleCondensed="@string/editCardTitle"
        app:showAsAction="ifRoom"/>

+    <item
+        android:id="@+id/action_copy_to_clipboard"
+        android:icon="@drawable/ic_copy"
+        android:title="@string/copy_to_clipboard"
+        android:titleCondensed="@string/copy_to_clipboard"
+        app:showAsAction="ifRoom"/>
+
+    <item
+        android:id="@+id/action_share"
+        android:icon="@drawable/ic_share"
+        android:title="@string/share"
+        android:titleCondensed="@string/share"
+        app:showAsAction="ifRoom"/>
+
+    <item
+        android:id="@+id/action_star"
+        android:title="@string/star"
+        android:titleCondensed="@string/star"
+        app:showAsAction="never"/>
+
+    <item
+        android:id="@+id/action_unstar"
+        android:title="@string/unstar"
+        android:titleCondensed="@string/unstar"
+        app:showAsAction="never"/>
+
+    <item
+        android:id="@+id/action_archive"
+        android:title="@string/archive"
+        android:titleCondensed="@string/archive"
+        app:showAsAction="never"/>
+
+    <item
+        android:id="@+id/action_unarchive"
+        android:title="@string/unarchive"
+        android:titleCondensed="@string/unarchive"
+        app:showAsAction="never"/>
+
    <item
        android:id="@+id/action_delete"
        android:icon="@drawable/ic_delete_white_24dp"
        android:title="@string/delete"
        android:titleCondensed="@string/delete"
-        app:showAsAction="ifRoom"/>
-
+        app:showAsAction="never"/>
 </menu>
--- a/app/src/main/res/menu/card_view_menu.xml
+++ b/app/src/main/res/menu/card_view_menu.xml
@@ -2,19 +2,46 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
      xmlns:app="http://schemas.android.com/apk/res-auto">

-    <item
-        android:id="@+id/action_lock_unlock"
-        android:icon="@drawable/ic_lock_open_white_24dp"
-        android:title="@string/lockScreen"
-        app:showAsAction="always"/>
    <item
        android:id="@+id/action_share"
        android:icon="@drawable/ic_share_white"
        android:title="@string/share"
        app:showAsAction="always"/>
+
    <item
        android:id="@+id/action_star_unstar"
        android:icon="@drawable/ic_unstarred_white"
        android:title="@string/star"
        app:showAsAction="always" />
-</menu>
+
+    <item
+        android:id="@+id/action_overflow"
+        android:title="@string/overflowMenu"
+        android:icon="@drawable/ic_overflow_menu"
+        app:showAsAction="always">
+
+        <menu>
+
+            <item
+                android:id="@+id/action_duplicate"
+                android:title="@string/duplicateCard"
+                app:showAsAction="never" />
+
+            <item
+                android:id="@+id/action_archive"
+                android:title="@string/archive"
+                app:showAsAction="never"/>
+            <item
+                android:id="@+id/action_unarchive"
+                android:title="@string/unarchive"
+                app:showAsAction="never"/>
+            <item
+                android:id="@+id/action_delete"
+                android:title="@string/delete"
+                app:showAsAction="never"/>
+
+        </menu>
+
+    </item>
+
+</menu>
--- a/app/src/main/res/menu/main_menu.xml
+++ b/app/src/main/res/menu/main_menu.xml
@@ -7,22 +7,29 @@
        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_archived"
+        android:title="@string/archiveList"
+        app:showAsAction="never"/>
    <item
        android:id="@+id/action_import_export"
        android:icon="@drawable/ic_import_export_white_24dp"
--- a/app/src/main/res/raw/contributors.txt
+++ b/app/src/main/res/raw/contributors.txt
@@ -2,85 +2,108 @@ Sylvia van Os
 Branden Archer
 J. Lavoie
 Allan Nordhøy
-Heimen Stoffels
 solokot
-mondstern
+Heimen Stoffels
 Katharine Chui
 Oğuz Ersen
+mondstern
 IllusiveMan196
+Altonss
+StoyanDimitrov
 Petr Novák
+Joel A
 Taco
 Gediminas Murauskas
-Joel A
-StoyanDimitrov
+Michael Moroni
 Nyatsuki
-Altonss
+SlavekB
 Samantaz Fox
 arno-github
 Ankit Tiwari
 Sergio Paredes
 laralem
-arshbeerSingh
 huuhaa
+arshbeerSingh
+Quentin PAGÈS
 Miha Frangež
-Michael Moroni
+sr093906
+Freddo espresso
+mdvhimself
+Maciej Błędkowski
 Olivia (Zoe)
 betsythefc
+Silvério Santos
 waffshappen
-sr093906
+ati3
+Giovanni
+Jane Kong
 K. Herbert
-Quentin PAGÈS
+Still Hsu
 String E. Fighter
 Yurical
+rr-vesp
+alajemba-vik
 /usr/local/ΕΨΗΕΛΩΝ
 Adolfo Jayme-Barrientos
 Alessandro Mandelli
 KovalevArtem
+Artem M.
+Astrohops1
 Clonewayx
 D. Domig
 Diego
-Jane Kong
 Lukas Grassauer
 Marnick L'Eau
 Michalis
+Michał
 Rosdyana Kusuma
-schirinowski
+umoenks
 Thomas Bertels
+Runner
 inesre
 lgasp
 phlostically
 Aditya Das
+Asier
 Kevin Sicong Jiang
 Airat
-Andreas Blaser
+sNiXx
 BMN
 Biren
+Mylou53
 Kasina Dheeraj
+Eric
 Flav
 Franciszek Stefan
+Grzegorz
 Izzy
 Karol Kosek
 bittin
-Maciej Błędkowski
 Marco
 Mattia
 Michael Gangolf
+Moi Toi
 pbeckmann
 Peer Beckmann
 Quang Nguyen
+Ratnesh
 Reza
 Rohan Babbar 
 Ronak Upadhyay
 Rose Liverman
+Samarth Asthan
 Simone Dotto
-Still Hsu
 Subhashish Anand
+darkodo
 Tymofii Lytvynenko
-Tjipke van der Heide
-avikkundu
+Vancha March
+Yevgeny M
+Avik Kundu
 opsik
+pooyanazari
 psa-jforestier
 Robin
 sergio
 Marcus
 techwebpd
+unstartdev
--- a/app/src/main/res/raw/stocard_stores.csv
+++ b/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
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -0,0 +1,272 @@
+<?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_search">بحث</string>
+    <string name="action_add">اضف</string>
+    <string name="noGiftCards">اضغط علي زر + لاضافة بطاقة, او استورد بعض منهم من قائمة ال ⋮.</string>
+    <string name="noMatchingGiftCards">لا نتائج. حاول تغيير بحثك.</string>
+    <string name="storeName">اسم</string>
+    <string name="note">مذكرة</string>
+    <string name="cardId">بطاقة شخصية</string>
+    <string name="barcodeType">نوع الباركود</string>
+    <string name="barcodeNoBarcode">لا يوجد باركود</string>
+    <string name="noBarcode">لا يوجد باركود</string>
+    <string name="star">اضف الي المفضلة</string>
+    <string name="unstar">حذف من المفضلة</string>
+    <string name="cancel">الغاء</string>
+    <string name="save">حفظ</string>
+    <string name="edit">تعديل</string>
+    <string name="delete">مسح</string>
+    <string name="confirm">تأكيد</string>
+    <string name="deleteConfirmation">مسح هذة البطاقة نهائيا؟</string>
+    <string name="ok">حسنا</string>
+    <string name="copy_to_clipboard">نسخ البطاقة الشخصية الي الحافظة</string>
+    <string name="share">شارك</string>
+    <string name="sendLabel">ارسل…</string>
+    <string name="editCardTitle">عدل بطاقة</string>
+    <string name="addCardTitle">اضف بطاقة</string>
+    <string name="scanCardBarcode">مسح باركود</string>
+    <string name="cardShortcut">اختصار البطاقة</string>
+    <string name="noCardsMessage">اضف بطاقة أولا</string>
+    <string name="card_ids_copied">البطاقة(ات) الشخصية المنسوخة</string>
+    <string name="barcodeImageDescriptionWithType">صورة <xliff:g>%s</xliff:g> باركود</string>
+    <string name="noStoreError">لا يوجد اسم مدخل</string>
+    <string name="noCardIdError">لا يوجد بطاقة شخصية مدخلة</string>
+    <string name="noCardExistsError">لا يمكن العثور علي هذه البطاقة</string>
+    <string name="failedParsingImportUriError">لا يمكن تحليل الرابط المستورد</string>
+    <string name="importExport">استيراد/تصدير</string>
+    <string name="importExportHelp">عمل نسخ احتطياتي لبياناتك يسمح نقلها لجهاز اخر.</string>
+    <string name="importFailed">لا يمكن عمل الاستيراد</string>
+    <string name="exportSuccessfulTitle">متصدر</string>
+    <string name="exportFailedTitle">فشل التصدير</string>
+    <string name="exportFailed">لا يمكن عمل التصدير</string>
+    <string name="noExternalStoragePermissionError">امنح التخزين الخارجي اذن لاستيراد وتصدير البيانات</string>
+    <string name="exportOptionExplanation">ستتم كتابة البيانات في الموقع الذي تختاره.</string>
+    <string name="importOptionFilesystemButton">من نظام الملفات</string>
+    <string name="importOptionApplicationTitle">استخدم تطبيقًا آخر</string>
+    <string name="importOptionApplicationExplanation">استخدم أي تطبيق أو مدير الملفات المفضل لديك لفتح ملف.</string>
+    <string name="importOptionApplicationButton">استخدم تطبيقًا آخر</string>
+    <string name="about">حول</string>
+    <string name="app_copyright_old">بناء على Loyalty Card Keychain
+\nحقوق النشر © 2016-2020 Branden Archer</string>
+    <string name="app_license">البرمجيات الحرة متروكة الحقوق, ترخيص +GPLv3</string>
+    <string name="app_revision_fmt">معلومات المراجعة: <xliff:g id="app_revision_url">%s</xliff:g></string>
+    <string name="app_libraries">مكتبات الطرف الثالث الحرة: <xliff:g id="app_libraries_list">%s</xliff:g></string>
+    <string name="selectBarcodeTitle">اختار الباركود</string>
+    <string name="enterBarcodeInstructions">أدخل بطاقة هوية ، واختر نوع الباركود أدناه ، أو \"لا يوجد باركود\".</string>
+    <string name="copy_to_clipboard_toast">تم نسخ بطاقة الهوية إلى الحافظة</string>
+    <string name="thumbnailDescription">صورة مصغرة</string>
+    <string name="starImage">نجم مفضل</string>
+    <string name="settings">اعدادات</string>
+    <string name="settings_category_title_ui">واجهة المستخدم</string>
+    <string name="settings_light_theme">فاتح</string>
+    <string name="settings_dark_theme">داكن</string>
+    <string name="settings_card_orientation">اتجاه الباركود</string>
+    <string name="settings_portrait_orientation">الوضع الرأسي</string>
+    <string name="settings_landscape_orientation">الوضع الأفقي</string>
+    <string name="settings_theme">مظهر</string>
+    <string name="settings_max_font_size_scale">اقصي. حجم الخط</string>
+    <string name="settings_display_barcode_max_brightness">عرض مشرق علي الباركود</string>
+    <string name="importSuccessful">تم استيراد البيانات</string>
+    <string name="exportSuccessful">تم تصدير البيانات</string>
+    <string name="enter_group_name">أدخل اسم المجموعة</string>
+    <string name="group_edit">تعديل المجموعة</string>
+    <string name="noGroups">اضغط زر + لإضافة مجموعات للتصنيف.</string>
+    <string name="noGroupCards">هذه المجموعة فارغة</string>
+    <string name="group_name_already_in_use">اسم المجموعة قيد الاستخدام بالفعل</string>
+    <string name="group_name_is_empty">لا يمكن أن يكون اسم المجموعة فارغًا</string>
+    <string name="group_updated">تم تحديث المجموعة</string>
+    <string name="all">الكل</string>
+    <string name="deleteConfirmationGroup">هل تريد حذف المجموعة؟</string>
+    <string name="failedOpeningFileManager">قم بتثبيت مدير الملفات أولاً.</string>
+    <string name="moveUp">تحرك لأعلى</string>
+    <string name="addFromImage">حدد صورة من المعرض</string>
+    <string name="balance">الرصيد</string>
+    <string name="currency">العملة</string>
+    <string name="points">نقاط</string>
+    <string name="parsingBalanceFailed"><xliff:g>%s</xliff:g> لا يبدو أنه رصيد صالح.</string>
+    <string name="chooseImportType">استيراد البيانات من</string>
+    <string name="app_loyalty_card_keychain">Loyalty Card Keychain</string>
+    <string name="privacy_policy">سياسة الخصوصية</string>
+    <string name="accept">قبول</string>
+    <string name="importCatima">الاستيراد من Catima</string>
+    <string name="importCatimaMessage">حدد ملفك <i>catima.zip</i> تصدير من Catima للاستيراد.
+\nقم بإنشائه من قائمة الاستيراد / التصدير لتطبيق Catima آخر بالضغط على تصدير هناك أولاً.</string>
+    <string name="importFidme">الاستيراد من FidMe</string>
+    <string name="importFidmeMessage">حدد ملفك <i>fidme-export-request-xxxxxx.zip</i> تصدير من FidMe للاستيراد ، ثم حدد أنواع الباركود يدويًا بعد ذلك.
+\nقم بإنشائه من ملف تعريف FidMe الخاص بك عن طريق اختيار حماية البيانات ثم الضغط على استخراج بياناتي أولاً.</string>
+    <string name="importStocardMessage">حدد ملفك <i>***-sync.zip</i> تصدير من Stocard للاستيراد.
+\nاحصل عليه عن طريق إرسال بريد إلكتروني إلى support@stocardapp.com لطلب تصدير بياناتك.</string>
+    <string name="importVoucherVault">الاستيراد من Voucher Vault</string>
+    <string name="importVoucherVaultMessage">حدد ملفك <i>vouchervault.json</i> تصدير من Voucher Vault للاستيراد.
+\nقم بإنشائه بالضغط على تصدير في Voucher Vault أولاً.</string>
+    <string name="barcodeId">قيمة الباركود</string>
+    <string name="sameAsCardId">نفس بطاقة الهوية</string>
+    <string name="setBarcodeId">قم بتعيين قيمة الباركود</string>
+    <string name="unsupportedBarcodeType">لا يمكن عرض نوع الباركود هذا. قد يكون مدعومًا في إصدار أحدث من التطبيق.</string>
+    <string name="wrongValueForBarcodeType">القيمة غير صالحة لنوع الباركود المحدد</string>
+    <string name="copy_to_clipboard_multiple_toast">تم نسخ بطاقات الهوية إلى الحافظة</string>
+    <string name="intent_import_card_from_url_share_multiple_text">أريد مشاركة بعض البطاقات معك</string>
+    <string name="frontImageDescription">الصورة الأمامية</string>
+    <string name="backImageDescription">الصورة الخلفية</string>
+    <string name="photos">الصور</string>
+    <string name="setFrontImage">تعيين الصورة الأمامية</string>
+    <string name="setBackImage">الصورة الخلفية</string>
+    <string name="removeImage">إزالة الصورة</string>
+    <string name="takePhoto">التقاط صورة</string>
+    <string name="updateBarcodeQuestionTitle">هل تريد تحديث قيمة الباركود؟</string>
+    <string name="updateBarcodeQuestionText">لقد قمت بتغيير بطاقة الهوية. هل تريد أيضًا تحديث الباركود لاستخدام نفس القيمة؟</string>
+    <string name="yes">نعم</string>
+    <string name="no">لا</string>
+    <string name="passwordRequired">الرجاء إدخال كلمة المرور</string>
+    <string name="exportPassword">قم بتعيين كلمة مرور لحماية التصدير (اختياري)</string>
+    <string name="exportPasswordHint">أدخل كلمة المرور</string>
+    <string name="turn_flashlight_on">قم بتشغيل المصباح</string>
+    <string name="turn_flashlight_off">أطفئ المصباح</string>
+    <string name="settings_locale">لغة</string>
+    <string name="settings_system_locale">النظام</string>
+    <string name="setIcon">تعيين رمز</string>
+    <string name="settings_catima_theme">Catima</string>
+    <string name="settings_pink_theme">زهري</string>
+    <string name="settings_magenta_theme">أرجواني</string>
+    <string name="settings_violet_theme">البنفسجي</string>
+    <string name="settings_blue_theme">أزرق</string>
+    <string name="settings_sky_blue_theme">أزرق سماوي</string>
+    <string name="settings_green_theme">أخضر</string>
+    <string name="settings_grey_theme">رمادي</string>
+    <string name="settings_brown_theme">بني</string>
+    <string name="app_contributors">أصبح ممكنًا بواسطة: <xliff:g id="app_contributors">%s</xliff:g></string>
+    <string name="sort">فرز</string>
+    <string name="showMoreInfo">اظهر المعلومات</string>
+    <string name="hideMoreInfo">إخفاء المعلومات</string>
+    <string name="swipeToSwitchImages">اسحب أو اضغط لفترة طويلة لتبديل الصور</string>
+    <string name="sort_by_balance">الرصيد</string>
+    <string name="reverse">... بترتيب معكوس</string>
+    <string name="sort_by">صنف حسب</string>
+    <string name="settings_oled_dark">خلفية سوداء نقية لمظهر داكن</string>
+    <string name="credits">الاعتمادات</string>
+    <string name="source_repository">مستودع المصدر</string>
+    <string name="and_data_usage">واستخدام البيانات</string>
+    <string name="rate_this_app">قيم هذا التطبيق</string>
+    <string name="translate_platform">على Weblate</string>
+    <string name="shortcutSelectCard">اختر بطاقة</string>
+    <string name="options">خيارات</string>
+    <string name="starred">مميز بنجمة</string>
+    <string name="set_scale">ضبط النطاق</string>
+    <string name="include_if_asking_support">إذا كنت ترغب في طلب الدعم ، فقم بتضمين المعلومات التالية:</string>
+    <string name="duplicateCard">كرر</string>
+    <string name="archive">ضع الي الأرشيف</string>
+    <string name="unarchive">أخرج من الأرشيف</string>
+    <string name="archived">تمت أرشفة البطاقة</string>
+    <string name="unarchived">البطاقة غير مؤرشفة</string>
+    <string name="archiveList">أرشيف</string>
+    <string name="failedLaunchingPhotoPicker">تعذر العثور على تطبيق معرض مدعوم</string>
+    <string name="noGiftCardsGroup">انشئ بعض من البطاقات, و عيينهم لهذة المجموعة.</string>
+    <string name="deleteTitle">مسح بطاقة</string>
+    <plurals name="selectedCardCount">
+        <item quantity="zero"><xliff:g>%d</xliff:g> محدد</item>
+        <item quantity="one"><xliff:g>%d</xliff:g> محددة</item>
+        <item quantity="two"><xliff:g>%d</xliff:g> محدد</item>
+        <item quantity="few"><xliff:g>%d</xliff:g> محدد</item>
+        <item quantity="many"><xliff:g>%d</xliff:g> محدد</item>
+        <item quantity="other"><xliff:g>%d</xliff:g> محدد</item>
+    </plurals>
+    <string name="importing">جار الاستيراد…</string>
+    <string name="exportName">تصدير</string>
+    <string name="exporting">جار التصدير…</string>
+    <string name="importSuccessfulTitle">مستورد</string>
+    <string name="importFailedTitle">فشل الاستيراد</string>
+    <string name="sort_by_most_recently_used">الأكثر أستعمالا مؤخرا</string>
+    <string name="license">رخصة</string>
+    <string name="sort_by_name">اسم</string>
+    <string name="version_history">تاريخ النسخة</string>
+    <string name="action_hide_details">أخف التفاصيل</string>
+    <plurals name="groupCardCountWithArchived">
+        <item quantity="zero"><xliff:g>%1$d</xliff:g> بطاقة ( <xliff:g id="archivedCount">%2$d</xliff:g> مؤرشفة)</item>
+        <item quantity="one"><xliff:g>%1$d</xliff:g> بطاقة ( <xliff:g id="archivedCount">%2$d</xliff:g> مؤرشفة)</item>
+        <item quantity="two"><xliff:g>%1$d</xliff:g> بطاقة ( <xliff:g id="archivedCount">%2$d</xliff:g> مؤرشفة)</item>
+        <item quantity="few"><xliff:g>%1$d</xliff:g> بطاقات ( <xliff:g id="archivedCount">%2$d</xliff:g> مؤرشفة)</item>
+        <item quantity="many"><xliff:g>%1$d</xliff:g> بطاقات ( <xliff:g id="archivedCount">%2$d</xliff:g> مؤرشفة)</item>
+        <item quantity="other"><xliff:g>%1$d</xliff:g> بطاقات ( <xliff:g id="archivedCount">%2$d</xliff:g> مؤرشفة)</item>
+    </plurals>
+    <plurals name="deleteCardsTitle">
+        <item quantity="zero">مسح <xliff:g>%d</xliff:g> بطاقة</item>
+        <item quantity="one">مسح <xliff:g>%d</xliff:g> بطاقة</item>
+        <item quantity="two">مسح <xliff:g>%d</xliff:g> بطاقة</item>
+        <item quantity="few">مسح <xliff:g>%d</xliff:g> بطاقات</item>
+        <item quantity="many">مسح <xliff:g>%d</xliff:g> بطاقات</item>
+        <item quantity="other">مسح <xliff:g>%d</xliff:g> بطاقات</item>
+    </plurals>
+    <plurals name="deleteCardsConfirmation">
+        <item quantity="zero">مسح هذه <xliff:g>%d</xliff:g> بطاقة نهائيا؟</item>
+        <item quantity="one">مسح هذه <xliff:g>%d</xliff:g> بطاقة نهائيا؟</item>
+        <item quantity="two">مسح هذه <xliff:g>%d</xliff:g> بطاقة نهائيا؟</item>
+        <item quantity="few">مسح هذه <xliff:g>%d</xliff:g> بطاقات نهائيا؟</item>
+        <item quantity="many">مسح هذه <xliff:g>%d</xliff:g> بطاقات نهائيا؟</item>
+        <item quantity="other">مسح هذه <xliff:g>%d</xliff:g> بطاقات نهائيا؟</item>
+    </plurals>
+    <string name="importOptionFilesystemTitle">الاستيراد من نظام الملفات</string>
+    <string name="importOptionFilesystemExplanation">اختر ملفًا محددًا من نظام الملفات.</string>
+    <string name="about_title_fmt">حول <xliff:g id="app_name">%s</xliff:g></string>
+    <string name="debug_version_fmt">نسخة: <xliff:g id="version">%s</xliff:g></string>
+    <string name="settings_system_theme">نظام</string>
+    <string name="settings_lock_on_opening_orientation">قفل على الاتجاه عند فتح البطاقة</string>
+    <string name="app_resources">موارد الطرف الثالث الحرة: <xliff:g id="app_resources_list">%s</xliff:g></string>
+    <string name="settings_follow_system_orientation">نظام المتابعة</string>
+    <string name="groups">مجموعات</string>
+    <string name="barcode">باركود</string>
+    <string name="settings_keep_screen_on">حافظ على الشاشة قيد التشغيل</string>
+    <string name="intent_import_card_from_url_share_text">اريد مشاركة بطاقة معك</string>
+    <string name="groupsList">مجموعات: <xliff:g>%s</xliff:g></string>
+    <string name="settings_disable_lockscreen_while_viewing_card">منع قفل الشاشة</string>
+    <string name="leaveWithoutSaveTitle">خروج</string>
+    <string name="editGroup">مجموعة التعديل: <xliff:g>%s</xliff:g></string>
+    <plurals name="groupCardCount">
+        <item quantity="zero"><xliff:g>%d</xliff:g> بطاقة</item>
+        <item quantity="one"><xliff:g>%d</xliff:g> بطاقة</item>
+        <item quantity="two"><xliff:g>%d</xliff:g> بطاقة</item>
+        <item quantity="few"><xliff:g>%d</xliff:g> بطاقات</item>
+        <item quantity="many"><xliff:g>%d</xliff:g> بطاقات</item>
+        <item quantity="other"><xliff:g>%d</xliff:g> بطاقات</item>
+    </plurals>
+    <string name="moveDown">تحرك لأسفل</string>
+    <string name="leaveWithoutSaveConfirmation">المغادرة دون حفظ؟</string>
+    <string name="addManually">أدخل بطاقة الهوية يدويًا</string>
+    <string name="moveBarcodeToTopOfScreen">انقل الباركود إلى أعلى الشاشة</string>
+    <string name="balanceSentence">الرصيد: <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="moveBarcodeToCenterOfScreen">قم بتوسيط الرمز الشريطي على الشاشة</string>
+    <plurals name="balancePoints">
+        <item quantity="zero"><xliff:g>%s</xliff:g> نقطة</item>
+        <item quantity="one"><xliff:g>%s</xliff:g> نقطة</item>
+        <item quantity="two"><xliff:g>%s</xliff:g> نقطة</item>
+        <item quantity="few"><xliff:g>%s</xliff:g> نقطات</item>
+        <item quantity="many"><xliff:g>%s</xliff:g> نقطات</item>
+        <item quantity="other"><xliff:g>%s</xliff:g> نقطات</item>
+    </plurals>
+    <string name="card">بطاقة</string>
+    <string name="selectColor">إختر لون</string>
+    <string name="editBarcode">تعديل الباركود</string>
+    <string name="expiryDate">تاريخ انتهاء الصلاحية</string>
+    <string name="never">أبداً</string>
+    <string name="chooseExpiryDate">اختر تاريخ انتهاء الصلاحية</string>
+    <string name="errorReadingImage">لا يمكن قراءة الصورة</string>
+    <string name="noBarcodeFound">لم يتم العثور على باركود</string>
+    <string name="on_github">على GitHub</string>
+    <string name="report_error">الإبلاغ عن خطأ</string>
+    <string name="sort_by_expiry">انقضاء</string>
+    <string name="noUnarchivedCardsMessage">لا توجد بطاقات غير مؤرشفة موجودة</string>
+    <string name="importLoyaltyCardKeychain">الاستيراد من Loyalty Card Keychain</string>
+    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Copyright © 2019–<xliff:g>%d</xliff:g> Sylvia van Os</string>
+    <string name="importLoyaltyCardKeychainMessage">حدد ملفك <i>LoyaltyCardKeychain.csv</i> التصدير من Loyalty Card Keychain للاستيراد.
+\nقم بإنشائه من قائمة الاستيراد / التصدير في Loyalty Card Keychain بالضغط على تصدير هناك أولاً.</string>
+    <string name="importStocard">الاستيراد من Stocard</string>
+    <string name="privacy_policy_popup_text">إشعار سياسة الخصوصية (مطلوب من قبل بعض متاجر التطبيقات):
+\n
+\nلا يتم جمع أي بيانات على الإطلاق ، والتي يمكن لأي شخص تأكيدها لأن تطبيقنا هو برنامج حر.</string>
+    <string name="failedGeneratingShareURL">تعذر إنشاء عنوان URL قابل للمشاركة. الرجاء الإبلاغ عن هذا.</string>
+    <string name="help_translate_this_app">ساعد في ترجمة هذا التطبيق</string>
+    <string name="action_show_details">اظهر التفاصيل</string>
+    <string name="on_google_play">على Google Play</string>
+    <string name="settings_theme_color">لون المظهر</string>
+</resources>
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -10,8 +10,8 @@
    <string name="cancel">Отказ</string>
    <string name="unstar">Премахва от любими</string>
    <string name="star">Добавя към любими</string>
-    <string name="noBarcode">Без щрихкод</string>
-    <string name="barcodeNoBarcode">Картата няма щрихкод</string>
+    <string name="noBarcode">Липсва щрихкод</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>
@@ -88,7 +87,6 @@
    <string name="enter_group_name">Въведете име на списъка</string>
    <string name="intent_import_card_from_url_share_text">Искам да споделя тази карта с вас</string>
    <string name="settings_display_barcode_max_brightness">Увеличаване на яркостта при видим щрихкод</string>
-    <string name="settings_lock_barcode_orientation">Без на завъртане на щрихкода</string>
    <string name="settings_keep_screen_on">Поддържане на екрана включен</string>
    <string name="settings_disable_lockscreen_while_viewing_card">Предотвратяване на заключване на екрана</string>
    <string name="settings_max_font_size_scale">Максимален размер на шрифта</string>
@@ -99,33 +97,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">Картите не могат да бъдат изнесени: <xliff:g>%s</xliff:g></string>
+    <string name="exportFailed">Данните не могат да бъдат изнесени</string>
    <string name="exportFailedTitle">Грешка при изнасяне</string>
-    <string name="importFailed">Картите не могат да бъдат внесени: <xliff:g>%s</xliff:g></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 +137,10 @@
    <string name="about">Относно</string>
    <string name="importOptionFilesystemTitle">Внасяне от файловата система</string>
    <string name="importCatima">Внасяне от Catima</string>
-    <string name="exportSuccessful">Картите са изнесени успешно</string>
-    <string name="unlockScreen">Разрешава автоматичното завъртане</string>
-    <string name="lockScreen">Спира автоматичното завъртане</string>
+    <string name="exportSuccessful">Данните са изнесени</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 +158,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="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 +182,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>
@@ -219,5 +213,38 @@
    <string name="group_edit">Редактиране на списък</string>
    <string name="action_show_details">Повече детайли</string>
    <string name="action_hide_details">По-малко детайли</string>
-    <string name="noGiftCardsGroup">Няма карти. След като добавите ще можете да ги зачислите към списък от тук.</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>
+    <string name="settings_card_orientation">Положение на щрихкода</string>
+    <string name="settings_follow_system_orientation">Според системата</string>
+    <string name="settings_portrait_orientation">Портретно</string>
+    <string name="settings_landscape_orientation">Пейзажно</string>
+    <string name="settings_lock_on_opening_orientation">Използване на положението, използвано при отваряне на картата</string>
+    <string name="duplicateCard">Дублиране</string>
+    <string name="archive">Архивиране</string>
+    <string name="unarchive">Изваждане от архива</string>
+    <string name="archived">Картата е архивирана</string>
+    <string name="unarchived">Карта е извадена от архива</string>
+    <string name="archiveList">Архив</string>
+    <string name="noUnarchivedCardsMessage">Няма карти извън архива</string>
+    <string name="failedLaunchingPhotoPicker">Не е намерено поддържано приложение за галерия.</string>
+    <plurals name="groupCardCountWithArchived">
+        <item quantity="one"><xliff:g>%1$d</xliff:g> карта (<xliff:g id="archivedCount">%2$d</xliff:g> архивирана)</item>
+        <item quantity="other"><xliff:g>%1$d</xliff:g> карти (<xliff:g id="archivedCount">%2$d</xliff:g> архивирани)</item>
+    </plurals>
+    <string name="previousCard">Предишна</string>
+    <string name="nextCard">Следваща</string>
 </resources>
--- a/Show More
+++ b/Show More