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

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

@@ -17,8 +17,7 @@ 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: 'state: needs info'
-          stale-issue-label: 'state: needs info'
-          stale-pr-label: 'state: needs info'
+          only-labels: 'needs info'
+          stale-issue-label: 'needs info'
+          stale-pr-label: 'needs info'
           remove-stale-when-updated: false
-          enable-statistics: true

CHANGELOG.md

@@ -1,101 +1,8 @@
 # Changelog
 
-## v2.20.0 - 114
-
-- Add Monochrome icon for Android 13
-- Improve first launch screen
-- Fidme import fixes
-
-## 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)
+## Unreleased - 96
 
 - Add CODE 93 support
-- Various minor bugfixes and improvements
 
 ## v2.11.2 - 95 (2021-12-04)
 

FUNDING.yml

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

Gemfile.lock

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

app/build.gradle

@@ -18,8 +18,8 @@ android {
         applicationId "me.hackerchick.catima"
         minSdkVersion 21
         targetSdkVersion 31
-        versionCode 114
-        versionName "2.20.0"
+        versionCode 95
+        versionName "2.11.2"
 
         vectorDrawables.useSupportLibrary true
         multiDexEnabled true
@@ -80,25 +80,25 @@ android {
 
 dependencies {
 // AndroidX
-    implementation 'androidx.appcompat:appcompat:1.4.2'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
+    implementation 'androidx.appcompat:appcompat:1.4.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.2'
     implementation 'androidx.exifinterface:exifinterface:1.3.3'
     implementation 'androidx.palette:palette:1.0.0'
-    implementation 'androidx.preference:preference:1.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'
+    implementation 'androidx.preference:preference:1.1.1'
+    implementation 'com.google.android.material:material:1.4.0'
+    implementation 'com.github.yalantis:ucrop:2.2.7'
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
 
 // Splash Screen
-    implementation 'androidx.core:core-splashscreen:1.0.0'
+    implementation 'androidx.core:core-splashscreen:1.0.0-alpha02'
 
 // Third-party
     implementation 'com.journeyapps:zxing-android-embedded:4.3.0@aar'
-    implementation 'com.google.zxing:core:3.5.0'
+    implementation 'com.google.zxing:core:3.4.1'
     implementation 'org.apache.commons:commons-csv:1.9.0'
     implementation 'com.jaredrummler:colorpicker:1.1.0'
     implementation 'com.github.invissvenska:NumberPickerPreference:1.0.4'
-    implementation 'net.lingala.zip4j:zip4j:2.11.2'
+    implementation 'net.lingala.zip4j:zip4j:2.9.1'
 
 // SpotBugs
     implementation 'io.wcm.tooling.spotbugs:io.wcm.tooling.spotbugs.annotations:1.0.0'
@@ -106,7 +106,7 @@ dependencies {
 // Testing
     testImplementation 'androidx.test:core:1.4.0'
     testImplementation 'junit:junit:4.13.2'
-    testImplementation 'org.robolectric:robolectric:4.8.2'
+    testImplementation 'org.robolectric:robolectric:4.7.3'
 }
 
 tasks.withType(SpotBugsTask) {

app/src/main/AndroidManifest.xml

@@ -116,7 +116,7 @@
         </activity>
 
         <activity
-            android:name=".UCropWrapper"
+            android:name="com.yalantis.ucrop.UCropActivity"
             android:theme="@style/AppTheme.NoActionBar" />
 
         <provider
@@ -134,5 +134,7 @@
                 <action android:name="android.service.controls.ControlsProviderService" />
             </intent-filter>
         </service>
+
     </application>
+
 </manifest>

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

@@ -1,6 +1,5 @@
 package protect.card_locker;
 
-import android.content.ActivityNotFoundException;
 import android.content.Intent;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
@@ -10,7 +9,6 @@ import android.util.Log;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.TextView;
-import android.widget.Toast;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -65,7 +63,6 @@ public class AboutActivity extends CatimaAppCompatActivity implements View.OnCli
         USED_LIBRARIES.add(new ThirdPartyInfo("Color Picker", "https://github.com/jaredrummler/ColorPicker", "Apache 2.0"));
         USED_LIBRARIES.add(new ThirdPartyInfo("Commons CSV", "https://commons.apache.org/proper/commons-csv/", "Apache 2.0"));
         USED_LIBRARIES.add(new ThirdPartyInfo("NumberPickerPreference", "https://github.com/invissvenska/NumberPickerPreference", "GNU LGPL 3.0"));
-        USED_LIBRARIES.add(new ThirdPartyInfo("uCrop", "https://github.com/Yalantis/uCrop", "Apache 2.0"));
         USED_LIBRARIES.add(new ThirdPartyInfo("Zip4j", "https://github.com/srikanth-lingala/zip4j", "Apache 2.0"));
         USED_LIBRARIES.add(new ThirdPartyInfo("ZXing", "https://github.com/zxing/zxing", "Apache 2.0"));
         USED_LIBRARIES.add(new ThirdPartyInfo("ZXing Android Embedded", "https://github.com/journeyapps/zxing-android-embedded", "Apache 2.0"));
@@ -154,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/CatimaLoyalty/Android/blob/master/LICENSE";
+            url = "https://github.com/TheLastProject/Catima/blob/master/LICENSE";
         } else if (id == R.id.repo) {
-            url = "https://github.com/CatimaLoyalty/Android/";
+            url = "https://github.com/TheLastProject/Catima/";
         } else if (id == R.id.privacy) {
             url = "https://catima.app/privacy-policy/";
         } else if (id == R.id.report_error) {
-            url = "https://github.com/CatimaLoyalty/Android/issues";
+            url = "https://github.com/TheLastProject/Catima/issues";
         } else if (id == R.id.rate) {
             url = "https://play.google.com/store/apps/details?id=me.hackerchick.catima";
         } else {
@@ -169,12 +166,7 @@ public class AboutActivity extends CatimaAppCompatActivity implements View.OnCli
 
         Intent intent = new Intent(Intent.ACTION_VIEW);
         intent.setData(Uri.parse(url));
-        try {
-            startActivity(intent);
-        } catch (ActivityNotFoundException e) {
-            Toast.makeText(this, R.string.failedToOpenUrl, Toast.LENGTH_LONG).show();
-            Log.e(TAG, "No activity found to handle intent", e);
-        }
+        startActivity(intent);
     }
 
 }

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

@@ -5,7 +5,6 @@ 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;
@@ -47,7 +46,7 @@ public class BarcodeImageWriterTask implements CompatCallable<Bitmap> {
     BarcodeImageWriterTask(
             Context context, ImageView imageView, String cardIdString,
             CatimaBarcode barcodeFormat, TextView textView,
-            boolean showFallback, Runnable callback, boolean roundCornerPadding
+            boolean showFallback, Runnable callback
     ) {
         mContext = context;
 
@@ -61,32 +60,18 @@ 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) {
-            tempImageHeight = imageView.getHeight();
-            tempImageWidth = imageView.getWidth();
+            imageHeight = imageView.getHeight();
+            imageWidth = imageView.getWidth();
         } else {
             // Scale down the image to reduce the memory needed to produce it
-            tempImageWidth = MAX_WIDTH;
+            imageWidth = MAX_WIDTH;
             double ratio = (double) MAX_WIDTH / (double) imageView.getWidth();
-            tempImageHeight = (int) (imageView.getHeight() * ratio);
+            imageHeight = (int) (imageView.getHeight() * ratio);
         }
 
-        // Ensure space for padding if wanted
-        imageWidth = tempImageWidth;
-        imageHeight = tempImageHeight - padding;
-
         this.showFallback = showFallback;
     }
 

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

@@ -76,7 +76,6 @@ 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
@@ -90,13 +89,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, true);
+                            BarcodeImageWriterTask barcodeWriter = new BarcodeImageWriterTask(getContext(), image, cardId, format, text, true, null);
                             mTasks.executeTask(TaskHandler.TYPE.BARCODE, barcodeWriter);
                         }
                     });
         } else {
             Log.d(TAG, "Generating barcode for type " + formatType);
-            BarcodeImageWriterTask barcodeWriter = new BarcodeImageWriterTask(getContext(), image, cardId, format, text, true, null, true);
+            BarcodeImageWriterTask barcodeWriter = new BarcodeImageWriterTask(getContext(), image, cardId, format, text, true, null);
             mTasks.executeTask(TaskHandler.TYPE.BARCODE, barcodeWriter);
         }
     }

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

@@ -4,10 +4,9 @@ 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;
@@ -17,10 +16,9 @@ import androidx.recyclerview.widget.RecyclerView;
 /**
  * The configuration screen for creating a shortcut.
  */
-public class CardShortcutConfigure extends CatimaAppCompatActivity implements LoyaltyCardCursorAdapter.CardAdapterListener {
+public class CardShortcutConfigure extends AppCompatActivity implements LoyaltyCardCursorAdapter.CardAdapterListener {
     static final String TAG = "Catima";
     private SQLiteDatabase mDatabase;
-    private LoyaltyCardCursorAdapter mAdapter;
 
     @Override
     public void onCreate(Bundle bundle) {
@@ -35,34 +33,26 @@ public class CardShortcutConfigure extends CatimaAppCompatActivity implements Lo
         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
-        int cardCount = DBHelper.getLoyaltyCardCount(mDatabase);
-        if (cardCount == 0) {
+        if (DBHelper.getLoyaltyCardCount(mDatabase) == 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, DBHelper.LoyaltyCardArchiveFilter.Unarchived);
-        mAdapter = new LoyaltyCardCursorAdapter(this, cardCursor, this);
-        cardList.setAdapter(mAdapter);
+        Cursor cardCursor = DBHelper.getLoyaltyCardCursor(mDatabase);
+        final LoyaltyCardCursorAdapter adapter = new LoyaltyCardCursorAdapter(this, cardCursor, this);
+        cardList.setAdapter(adapter);
     }
 
     private void onClickAction(int position) {
-        Cursor selected = DBHelper.getLoyaltyCardCursor(mDatabase, DBHelper.LoyaltyCardArchiveFilter.Unarchived);
+        Cursor selected = DBHelper.getLoyaltyCardCursor(mDatabase);
         selected.moveToPosition(position);
         LoyaltyCard loyaltyCard = LoyaltyCard.toLoyaltyCard(selected);
 
@@ -75,26 +65,6 @@ public class CardShortcutConfigure extends CatimaAppCompatActivity implements Lo
         finish();
     }
 
-    @Override
-    public boolean onCreateOptionsMenu(Menu inputMenu) {
-        getMenuInflater().inflate(R.menu.card_details_menu, inputMenu);
-        Utils.updateMenuCardDetailsButtonState(inputMenu.findItem(R.id.action_unfold), mAdapter.showingDetails());
-        return super.onCreateOptionsMenu(inputMenu);
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem inputItem) {
-        int id = inputItem.getItemId();
-
-        if (id == R.id.action_unfold) {
-            mAdapter.showDetails(!mAdapter.showingDetails());
-            invalidateOptionsMenu();
-
-            return true;
-        }
-
-        return super.onOptionsItemSelected(inputItem);
-    }
 
     @Override
     public void onRowClicked(int inputPosition) {

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

@@ -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, DBHelper.LoyaltyCardArchiveFilter.Unarchived);
+        Cursor loyaltyCardCursor = DBHelper.getLoyaltyCardCursor(mDatabase);
         return subscriber -> {
             while (loyaltyCardCursor.moveToNext()) {
                 LoyaltyCard card = LoyaltyCard.toLoyaltyCard(loyaltyCardCursor);

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

@@ -1,15 +1,20 @@
 package protect.card_locker;
 
 import android.content.Context;
-import android.graphics.Color;
-import android.os.Build;
-import android.os.Bundle;
-import android.view.View;
+import android.content.SharedPreferences;
+import android.content.res.Resources;
+import android.util.TypedValue;
 
-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
@@ -17,25 +22,32 @@ public class CatimaAppCompatActivity extends AppCompatActivity {
     }
 
     @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        Utils.patchColors(this);
+    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;
     }
 
-    @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);
+    public int getThemeColor() {
+        TypedValue typedValue = new TypedValue();
+        Resources.Theme theme = getTheme();
+        theme.resolveAttribute(R.attr.colorPrimary, typedValue, true);
+        return typedValue.data;
     }
 }

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

@@ -72,11 +72,6 @@ public class CatimaBarcode {
                 || mBarcodeFormat == BarcodeFormat.QR_CODE;
     }
 
-    public boolean hasInternalPadding() {
-        return mBarcodeFormat == BarcodeFormat.PDF_417
-                || mBarcodeFormat == BarcodeFormat.QR_CODE;
-    }
-
     public BarcodeFormat format() {
         return mBarcodeFormat;
     }

app/src/main/java/protect/card_locker/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 = 15;
+    public static final int DATABASE_VERSION = 14;
 
     public static class LoyaltyCardDbGroups {
         public static final String TABLE = "groups";
@@ -45,7 +45,6 @@ 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 {
@@ -72,12 +71,6 @@ public class DBHelper extends SQLiteOpenHelper {
         Descending
     }
 
-    public enum LoyaltyCardArchiveFilter {
-        All,
-        Archived,
-        Unarchived
-    }
-
     public DBHelper(Context context) {
         super(context, DATABASE_NAME, null, DATABASE_VERSION);
     }
@@ -104,8 +97,7 @@ 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.ARCHIVE_STATUS + " INTEGER DEFAULT '0' )");
+                LoyaltyCardDbIds.ZOOM_LEVEL + " INTEGER DEFAULT '100' )");
 
         // create associative table for cards in groups
         db.execSQL("CREATE TABLE " + LoyaltyCardDbIdsGroups.TABLE + "(" +
@@ -310,10 +302,6 @@ 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) {
@@ -361,7 +349,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 archiveStatus) {
+            final int starStatus, final Long lastUsed) {
         database.beginTransaction();
 
         // Card
@@ -377,7 +365,6 @@ 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
@@ -393,7 +380,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 int archiveStatus) {
+            final Integer headerColor, final int starStatus, final Long lastUsed) {
         database.beginTransaction();
 
         // Card
@@ -410,7 +397,6 @@ 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
@@ -426,7 +412,7 @@ public class DBHelper extends SQLiteOpenHelper {
             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 int archiveStatus) {
+            final Integer headerColor) {
         database.beginTransaction();
 
         // Card
@@ -440,10 +426,6 @@ public class DBHelper extends SQLiteOpenHelper {
         contentValues.put(LoyaltyCardDbIds.BARCODE_ID, barcodeId);
         contentValues.put(LoyaltyCardDbIds.BARCODE_TYPE, barcodeType != null ? barcodeType.name() : null);
         contentValues.put(LoyaltyCardDbIds.HEADER_COLOR, headerColor);
-        contentValues.put(LoyaltyCardDbIds.STAR_STATUS, starStatus);
-        contentValues.put(LoyaltyCardDbIds.LAST_USED, lastUsed != null ? lastUsed : Utils.getUnixTime());
-        contentValues.put(LoyaltyCardDbIds.ARCHIVE_STATUS, archiveStatus);
-
         int rowsUpdated = database.update(LoyaltyCardDbIds.TABLE, contentValues,
                 whereAttrs(LoyaltyCardDbIds.ID), withArgs(id));
 
@@ -456,15 +438,6 @@ 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);
@@ -576,35 +549,9 @@ 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, LoyaltyCardArchiveFilter.All);
-    }
-
-    public static Cursor getLoyaltyCardCursor(SQLiteDatabase database, LoyaltyCardArchiveFilter archiveFilter) {
-        // An empty string will match everything
-        return getLoyaltyCardCursor(database, "", archiveFilter);
+        return getLoyaltyCardCursor(database, "");
     }
 
     /**
@@ -613,8 +560,8 @@ public class DBHelper extends SQLiteOpenHelper {
      * @param filter
      * @return Cursor
      */
-    public static Cursor getLoyaltyCardCursor(SQLiteDatabase database, final String filter, LoyaltyCardArchiveFilter archiveFilter) {
-        return getLoyaltyCardCursor(database, filter, null, archiveFilter);
+    public static Cursor getLoyaltyCardCursor(SQLiteDatabase database, final String filter) {
+        return getLoyaltyCardCursor(database, filter, null);
     }
 
     /**
@@ -624,8 +571,8 @@ public class DBHelper extends SQLiteOpenHelper {
      * @param group
      * @return Cursor
      */
-    public static Cursor getLoyaltyCardCursor(SQLiteDatabase database, final String filter, Group group, LoyaltyCardArchiveFilter archiveFilter) {
-        return getLoyaltyCardCursor(database, filter, group, LoyaltyCardOrder.Alpha, LoyaltyCardOrderDirection.Ascending, archiveFilter);
+    public static Cursor getLoyaltyCardCursor(SQLiteDatabase database, final String filter, Group group) {
+        return getLoyaltyCardCursor(database, filter, group, LoyaltyCardOrder.Alpha, LoyaltyCardOrderDirection.Ascending);
     }
 
     /**
@@ -636,7 +583,7 @@ public class DBHelper extends SQLiteOpenHelper {
      * @param order
      * @return Cursor
      */
-    public static Cursor getLoyaltyCardCursor(SQLiteDatabase database, String filter, Group group, LoyaltyCardOrder order, LoyaltyCardOrderDirection direction, LoyaltyCardArchiveFilter archiveFilter) {
+    public static Cursor getLoyaltyCardCursor(SQLiteDatabase database, String filter, Group group, LoyaltyCardOrder order, LoyaltyCardOrderDirection direction) {
         StringBuilder groupFilter = new StringBuilder();
         String limitString = "";
 
@@ -659,11 +606,6 @@ 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 +
@@ -671,9 +613,7 @@ public class DBHelper extends SQLiteOpenHelper {
                 " ON " + LoyaltyCardDbFTS.TABLE + "." + LoyaltyCardDbFTS.ID + " = " + LoyaltyCardDbIds.TABLE + "." + LoyaltyCardDbIds.ID +
                 (filter.trim().isEmpty() ? " " : " AND " + LoyaltyCardDbFTS.TABLE + " MATCH ? ") +
                 groupFilter.toString() +
-                archiveFilterString +
-                " ORDER BY " + LoyaltyCardDbIds.TABLE + "." + LoyaltyCardDbIds.ARCHIVE_STATUS + " ASC, " +
-                LoyaltyCardDbIds.TABLE + "." + LoyaltyCardDbIds.STAR_STATUS + " DESC, " +
+                " ORDER BY " + LoyaltyCardDbIds.TABLE + "." + LoyaltyCardDbIds.STAR_STATUS + " DESC, " +
                 " (CASE WHEN " + LoyaltyCardDbIds.TABLE + "." + orderField + " IS NULL THEN 1 ELSE 0 END), " +
                 LoyaltyCardDbIds.TABLE + "." + orderField + " COLLATE NOCASE " + getDbDirection(order, direction) + ", " +
                 LoyaltyCardDbIds.TABLE + "." + LoyaltyCardDbIds.STORE + " COLLATE NOCASE ASC " +

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

@@ -1,7 +1,6 @@
 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;
@@ -16,7 +15,7 @@ import protect.card_locker.preferences.Settings;
 
 public class GroupCursorAdapter extends BaseCursorAdapter<GroupCursorAdapter.GroupListItemViewHolder> {
     Settings mSettings;
-    public final Context mContext;
+    private final Context mContext;
     private final GroupAdapterListener mListener;
     SQLiteDatabase mDatabase;
 
@@ -24,7 +23,7 @@ public class GroupCursorAdapter extends BaseCursorAdapter<GroupCursorAdapter.Gro
         super(inputCursor, DBHelper.LoyaltyCardDbGroups.ORDER);
         setHasStableIds(true);
         mSettings = new Settings(inputContext);
-        mContext = inputContext;
+        mContext = inputContext.getApplicationContext();
         mListener = inputListener;
         mDatabase = new DBHelper(inputContext).getReadableDatabase();
 
@@ -44,18 +43,8 @@ public class GroupCursorAdapter extends BaseCursorAdapter<GroupCursorAdapter.Gro
         inputHolder.mName.setText(group._id);
 
         int groupCardCount = DBHelper.getGroupCardCount(mDatabase, group._id);
-        int archivedCardCount = DBHelper.getArchivedCardsCount(mDatabase, group._id);
+        inputHolder.mCardCount.setText(mContext.getResources().getQuantityString(R.plurals.groupCardCount, groupCardCount, groupCardCount));
 
-        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()));
 

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

@@ -1,7 +1,10 @@
 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;
@@ -16,23 +19,26 @@ import android.widget.EditText;
 import android.widget.FrameLayout;
 import android.widget.Toast;
 
-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.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 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";
@@ -52,6 +58,12 @@ 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);
@@ -92,10 +104,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.toCharArray(), true);
+                startExport(writer, uri, exportPassword != null ? exportPassword.toCharArray() : null, true);
             } catch (IOException e) {
                 Log.e(TAG, "Failed to export file: " + result.toString(), e);
-                onExportComplete(new ImportExportResult(ImportExportResultType.GenericFailure, result.toString()), uri);
+                onExportComplete(ImportExportResult.GenericFailure, uri);
             }
 
         });
@@ -173,7 +185,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(new ImportExportResult(ImportExportResultType.GenericFailure, e.toString()), uri, importDataFormat);
+            onImportComplete(ImportExportResult.GenericFailure, uri, importDataFormat);
         }
     }
 
@@ -254,22 +266,59 @@ 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 = 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();
-                    }
+        ImportExportTask.TaskCompleteListener listener = (result, dataFormat1) -> {
+            onImportComplete(result, targetUri, dataFormat1);
+            if (closeWhenDone) {
+                try {
+                    target.close();
+                } catch (IOException ioException) {
+                    ioException.printStackTrace();
                 }
             }
         };
 
+        startProgressNotification(true);
         importExporter = new ImportExportTask(ImportExportActivity.this,
                 dataFormat, target, password, listener);
         mTasks.executeTask(TaskHandler.TYPE.IMPORT, importExporter);
@@ -277,20 +326,18 @@ 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 = new ImportExportTask.TaskCompleteListener() {
-            @Override
-            public void onTaskComplete(ImportExportResult result, DataFormat dataFormat) {
-                onExportComplete(result, targetUri);
-                if (closeWhenDone) {
-                    try {
-                        target.close();
-                    } catch (IOException ioException) {
-                        ioException.printStackTrace();
-                    }
+        ImportExportTask.TaskCompleteListener listener = (result, dataFormat) -> {
+            onExportComplete(result, targetUri);
+            if (closeWhenDone) {
+                try {
+                    target.close();
+                } catch (IOException ioException) {
+                    ioException.printStackTrace();
                 }
             }
         };
 
+        startProgressNotification(false);
         importExporter = new ImportExportTask(ImportExportActivity.this,
                 DataFormat.Catima, target, password, listener);
         mTasks.executeTask(TaskHandler.TYPE.EXPORT, importExporter);
@@ -355,68 +402,28 @@ public class ImportExportActivity extends CatimaAppCompatActivity {
         builder.show();
     }
 
-    private String buildResultDialogMessage(ImportExportResult result, boolean isImport) {
-        int messageId;
-
-        if (result.resultType() == ImportExportResultType.Success) {
-            messageId = isImport ? R.string.importSuccessful : R.string.exportSuccessful;
-        } else {
-            messageId = isImport ? R.string.importFailed : R.string.exportFailed;
-        }
-
-        StringBuilder messageBuilder = new StringBuilder(getResources().getString(messageId));
-        if (result.developerDetails() != null) {
-            messageBuilder.append("\n\n");
-            messageBuilder.append(getResources().getString(R.string.include_if_asking_support));
-            messageBuilder.append("\n\n");
-            messageBuilder.append(result.developerDetails());
-        }
-
-        return messageBuilder.toString();
-    }
-
     private void onImportComplete(ImportExportResult result, Uri path, DataFormat dataFormat) {
-        ImportExportResultType resultType = result.resultType();
+        endProgressNotification(true, result, null);
 
-        if (resultType == ImportExportResultType.BadPassword) {
+        if (result == ImportExportResult.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) {
-        ImportExportResultType resultType = result.resultType();
+        PendingIntent pendingIntent = null;
 
-        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());
+        if (result == ImportExportResult.Success) {
+            Intent sendIntent = new Intent(Intent.ACTION_SEND);
+            sendIntent.putExtra(Intent.EXTRA_STREAM, path);
+            sendIntent.setType("text/csv");
 
-        if (resultType == ImportExportResultType.Success) {
-            final CharSequence sendLabel = ImportExportActivity.this.getResources().getText(R.string.sendLabel);
+            // set flag to give temporary permission to external app to use the FileProvider
+            sendIntent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
 
-            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();
-            });
+            pendingIntent = PendingIntent.getActivity(this, NOTIFICATION_EXPORT, sendIntent, PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_IMMUTABLE);
         }
 
-        builder.create().show();
+        endProgressNotification(false, result, pendingIntent);
     }
 }

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

@@ -1,7 +1,7 @@
 package protect.card_locker;
 
 import android.app.Activity;
-import android.app.ProgressDialog;
+import android.app.NotificationManager;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.database.sqlite.SQLiteDatabase;
@@ -13,25 +13,23 @@ 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 Activity activity;
-    private boolean doImport;
-    private DataFormat format;
+    private final Activity activity;
+    private final boolean doImport;
+    private final DataFormat format;
     private OutputStream outputStream;
     private InputStream inputStream;
-    private char[] password;
-    private TaskCompleteListener listener;
-
-    private ProgressDialog progress;
+    private final char[] password;
+    private final TaskCompleteListener listener;
 
     /**
      * Constructor which will setup a task for exporting to the given file
@@ -62,22 +60,21 @@ public class ImportExportTask implements CompatCallable<ImportExportResult> {
     }
 
     private ImportExportResult performImport(Context context, InputStream stream, SQLiteDatabase database, char[] password) {
-        ImportExportResult importResult = MultiFormatImporter.importData(context, database, stream, format, password);
+        ImportExportResult result = MultiFormatImporter.importData(context, database, stream, format, password);
 
-        Log.i(TAG, "Import result: " + importResult);
+        Log.i(TAG, "Import result: " + result.name());
 
-        return importResult;
+        return result;
     }
 
     private ImportExportResult performExport(Context context, OutputStream stream, SQLiteDatabase database, char[] password) {
-        ImportExportResult result;
+        ImportExportResult result = ImportExportResult.GenericFailure;
 
         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);
         }
 
@@ -86,20 +83,6 @@ 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;
@@ -116,15 +99,15 @@ public class ImportExportTask implements CompatCallable<ImportExportResult> {
     }
 
     public void onPostExecute(Object castResult) {
-        listener.onTaskComplete((ImportExportResult) castResult, format);
+        ImportExportResult result = (ImportExportResult) castResult;
+
+        listener.onTaskComplete(result, format);
 
-        progress.dismiss();
         Log.i(TAG, (doImport ? "Import" : "Export") + " Complete");
     }
 
-    protected void onCancelled() {
-        progress.dismiss();
-        Log.i(TAG, (doImport ? "Import" : "Export") + " Cancelled");
+    @Override
+    public void onPreExecute() {
     }
 
     protected void stop() {

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,0);
+            return new LoyaltyCard(-1, store, note, expiry, balance, balanceType, cardId, barcodeId, barcodeType, headerColor, 0, Utils.getUnixTime(), 100);
         } catch (NullPointerException | NumberFormatException | UnsupportedEncodingException ex) {
             throw new InvalidObjectException("Not a valid import URI");
         }

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

@@ -10,9 +10,6 @@ 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
@@ -51,6 +48,7 @@ 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);
@@ -60,8 +58,6 @@ 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);
@@ -70,31 +66,22 @@ class LetterBitmap {
         }
 
         mBitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
-        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());
+        String firstChar = displayName.substring(0, 1);
 
         final Canvas c = new Canvas();
         c.setBitmap(mBitmap);
         c.drawColor(mColor);
 
-        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);
+        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(firstCharArray, 0, 1, bounds);
+        c.drawText(firstCharArray, 0, 1, width / 2.0f, height / 2.0f
+                + (bounds.bottom - bounds.top) / 2.0f, paint);
     }
 
     /**
@@ -125,10 +112,6 @@ class LetterBitmap {
         return colors.getColor(color, Color.BLACK);
     }
 
-    private static boolean isAlphabetical(String string) {
-        return string.matches("[a-zA-Z0-9]*");
-    }
-
     /**
      * Determine the color which the letter tile will use if no default
      * color is provided.

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

@@ -29,15 +29,13 @@ 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, final int archiveStatus) {
+                       @Nullable final Integer headerColor, final int starStatus, final long lastUsed, final int zoomLevel) {
         this.id = id;
         this.store = store;
         this.note = note;
@@ -51,7 +49,6 @@ public class LoyaltyCard implements Parcelable {
         this.starStatus = starStatus;
         this.lastUsed = lastUsed;
         this.zoomLevel = zoomLevel;
-        this.archiveStatus = archiveStatus;
     }
 
     protected LoyaltyCard(Parcel in) {
@@ -71,7 +68,6 @@ public class LoyaltyCard implements Parcelable {
         starStatus = in.readInt();
         lastUsed = in.readLong();
         zoomLevel = in.readInt();
-        archiveStatus = in.readInt();
     }
 
     @Override
@@ -89,7 +85,6 @@ public class LoyaltyCard implements Parcelable {
         parcel.writeInt(starStatus);
         parcel.writeLong(lastUsed);
         parcel.writeInt(zoomLevel);
-        parcel.writeInt(archiveStatus);
     }
 
     public static LoyaltyCard toLoyaltyCard(Cursor cursor) {
@@ -103,7 +98,6 @@ 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);
@@ -130,7 +124,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,archived);
+        return new LoyaltyCard(id, store, note, expiry, balance, balanceType, cardId, barcodeId, barcodeType, headerColor, starred, lastUsed, zoomLevel);
     }
 
     @Override

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

@@ -1,7 +1,6 @@
 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;
@@ -16,6 +15,12 @@ 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;
@@ -24,58 +29,36 @@ 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;
-    public final Context mContext;
+    private final Context mContext;
     private final CardAdapterListener mListener;
     protected SparseBooleanArray mSelectedItems;
     protected SparseBooleanArray mAnimationItemsIndex;
     private boolean mReverseAllAnimations = false;
-    private boolean mShowDetails;
+    private boolean mShowDetails = true;
 
     public LoyaltyCardCursorAdapter(Context inputContext, Cursor inputCursor, CardAdapterListener inputListener) {
         super(inputCursor, DBHelper.LoyaltyCardDbIds.ID);
         setHasStableIds(true);
         mSettings = new Settings(inputContext);
-        mContext = inputContext;
+        mContext = inputContext.getApplicationContext();
         mListener = inputListener;
         mSelectedItems = new SparseBooleanArray();
         mAnimationItemsIndex = new SparseBooleanArray();
 
         mDarkModeEnabled = 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() {
@@ -118,7 +101,6 @@ 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);
@@ -127,9 +109,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 : R.attr.colorPrimary);
+        inputHolder.setIconBackgroundColor(loyaltyCard.headerColor != null ? loyaltyCard.headerColor : ContextCompat.getColor(mContext, R.color.colorPrimary));
 
-        inputHolder.toggleCardStateIcon(loyaltyCard.starStatus != 0, loyaltyCard.archiveStatus != 0, itemSelected(inputCursor.getPosition()));
+        inputHolder.toggleStar(loyaltyCard.starStatus != 0, itemSelected(inputCursor.getPosition()));
 
         inputHolder.itemView.setActivated(mSelectedItems.get(inputCursor.getPosition(), false));
         applyIconAnimation(inputHolder, inputCursor.getPosition());
@@ -139,19 +121,6 @@ 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));
 
@@ -168,12 +137,14 @@ 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();
             }
@@ -228,15 +199,13 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
     public class LoyaltyCardListItemViewHolder extends RecyclerView.ViewHolder {
 
         public TextView mStoreField, mNoteField, mBalanceField, mExpiryField;
-        public ImageView mCardIcon, mStarBackground, mStarBorder, mTickIcon, mArchivedBackground;
-        public MaterialCardView mRow, mIconLayout;
-        public ConstraintLayout mStar, mArchived;
+        public ImageView mCardIcon, mStarBackground, mStarBorder, mTickIcon;
+        public MaterialCardView mRow;
+        public ConstraintLayout mStar;
         public View mDivider;
 
         private int mIconBackgroundColor;
 
-
-
         protected LoyaltyCardListItemViewHolder(View inputView, CardAdapterListener inputListener) {
             super(inputView);
             mRow = inputView.findViewById(R.id.row);
@@ -245,13 +214,11 @@ 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());
@@ -286,12 +253,10 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
                 mDivider.setVisibility(View.VISIBLE);
                 mBalanceField.setVisibility(View.VISIBLE);
                 Drawable balanceIcon = mBalanceField.getCompoundDrawables()[0];
-                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));
-                    }
+                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);
@@ -308,25 +273,21 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
                 mDivider.setVisibility(View.VISIBLE);
                 mExpiryField.setVisibility(View.VISIBLE);
                 Drawable expiryIcon = mExpiryField.getCompoundDrawables()[0];
-                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));
-                    }
+                expiryIcon.setBounds(0, 0, drawableSize, drawableSize);
+                mExpiryField.setCompoundDrawablesRelative(expiryIcon, null, null, null);
+                if (Utils.hasExpired(expiry)) {
+                    expiryIcon.setColorFilter(BlendModeColorFilterCompat.createBlendModeColorFilterCompat(Color.RED, BlendModeCompat.SRC_ATOP));
+                    mExpiryField.setTextColor(Color.RED);
+                } else if (mDarkModeEnabled) {
+                    expiryIcon.setColorFilter(BlendModeColorFilterCompat.createBlendModeColorFilterCompat(Color.WHITE, BlendModeCompat.SRC_ATOP));
                 }
                 mExpiryField.setText(DateFormat.getDateInstance(DateFormat.LONG).format(expiry));
-                if (Utils.hasExpired(expiry)) {
-                    mExpiryField.setTextColor(Color.RED);
-                }
                 mExpiryField.setTextSize(size);
             }
             mExpiryField.requestLayout();
         }
 
-        public void toggleCardStateIcon(boolean enableStar, boolean enableArchive, boolean colorByTheme) {
+        public void toggleStar(boolean enable, boolean colorByTheme) {
             /* the below code does not work in android 5! hence the change of drawable instead
             boolean needDarkForeground = Utils.needsDarkForeground(mIconBackgroundColor);
             Drawable borderDrawable = mStarBorder.getDrawable().mutate();
@@ -340,33 +301,20 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
             if (colorByTheme) {
                 dark = !mDarkModeEnabled;
             }
-
             if (dark) {
-                mStarBorder.setImageResource(R.drawable.ic_unstarred_white);
-                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_black);
+            } else {
+                mStarBorder.setImageResource(R.drawable.ic_unstarred_white);
                 mStarBackground.setImageResource(R.drawable.ic_starred_white);
-                mArchivedBackground.setImageResource(R.drawable.ic_baseline_archive_24);
             }
-
-            if (enableStar) {
+            if (enable) {
                 mStar.setVisibility(View.VISIBLE);
-            } else{
+            } 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) {

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,7 +36,6 @@ 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;
@@ -51,7 +50,6 @@ 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;
@@ -70,12 +68,13 @@ 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 {
@@ -107,7 +106,6 @@ 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";
@@ -117,7 +115,6 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
     TabLayout tabs;
 
     ImageView thumbnail;
-    ImageView thumbnailEditIcon;
     EditText storeFieldEdit;
     EditText noteFieldEdit;
     ChipGroup groupsChips;
@@ -137,11 +134,8 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
 
     Button enterButton;
 
-    Toolbar toolbar;
-
     int loyaltyCardId;
     boolean updateLoyaltyCard;
-    boolean duplicateFromLoyaltyCardId;
     String cardId;
     String barcodeId;
     String barcodeType;
@@ -159,7 +153,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
     AlertDialog confirmExitDialog = null;
 
     boolean validBalance = true;
-    Runnable barcodeImageGenerationFinishedCallback;
+    Runnable warnOnInvalidBarcodeType;
 
     HashMap<String, Currency> currencies = new HashMap<>();
 
@@ -207,19 +201,13 @@ 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),
-                0, // Unimportant, always set to null in doSave so the DB updates it to the current timestamp
-                100, // Unimportant, not updated in doSave, defaults to 100 for new cards
-                (int) (fieldName == LoyaltyCardField.archiveStatus ? value : loyaltyCard.archiveStatus)
+                Utils.getUnixTime(), 100
         );
     }
 
     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;
     }
 
@@ -227,7 +215,6 @@ 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;
@@ -236,7 +223,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
 
         importLoyaltyCardUri = intent.getData();
 
-        Log.d(TAG, "Edit activity: id=" + loyaltyCardId
+        Log.d(TAG, "View activity: id=" + loyaltyCardId
                 + ", updateLoyaltyCard=" + updateLoyaltyCard);
     }
 
@@ -299,7 +286,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
         super.onCreate(savedInstanceState);
 
         setContentView(R.layout.loyalty_card_edit_activity);
-        toolbar = findViewById(R.id.toolbar);
+        Toolbar toolbar = findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
         ActionBar actionBar = getSupportActionBar();
         if (actionBar != null) {
@@ -318,7 +305,6 @@ 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);
@@ -329,7 +315,6 @@ 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);
@@ -338,10 +323,11 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
         cardImageBack = findViewById(R.id.backImage);
 
         enterButton = findViewById(R.id.enterButton);
+        cardImageFront.setBackgroundColor(getThemeColor());
+        cardImageBack.setBackgroundColor(getThemeColor());
 
-        barcodeImageGenerationFinishedCallback = () -> {
+        warnOnInvalidBarcodeType = () -> {
             if (!(boolean) barcodeImage.getTag()) {
-                barcodeImageLayout.setVisibility(View.GONE);
                 Toast.makeText(LoyaltyCardEditActivity.this, getString(R.string.wrongValueForBarcodeType), Toast.LENGTH_LONG).show();
             }
         };
@@ -404,10 +390,11 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
             @Override
             public void onTextChanged(CharSequence s, int start, int before, int count) {
                 try {
-                    BigDecimal balance = Utils.parseBalance(s.toString(), tempLoyaltyCard.balanceType);
+                    BigDecimal balance = Utils.parseCurrency(s.toString(), Utils.currencyHasDecimals(tempLoyaltyCard.balanceType));
                     updateTempState(LoyaltyCardField.balance, balance);
                     validBalance = true;
-                } catch (ParseException e) {
+
+                } catch (NumberFormatException e) {
                     validBalance = false;
                     e.printStackTrace();
                 }
@@ -454,10 +441,14 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
 
                     for (int i = locales.size() - 1; i >= 0; i--) {
                         Locale locale = locales.get(i);
-                        currencyPrioritizeLocaleSymbols(currencyList, locale);
+                        String currencySymbol = Currency.getInstance(locale).getSymbol();
+                        currencyList.remove(currencySymbol);
+                        currencyList.add(0, currencySymbol);
                     }
                 } else {
-                    currencyPrioritizeLocaleSymbols(currencyList, mSystemLocale);
+                    String currencySymbol = Currency.getInstance(mSystemLocale).getSymbol();
+                    currencyList.remove(currencySymbol);
+                    currencyList.add(0, currencySymbol);
                 }
 
                 currencyList.add(0, getString(R.string.points));
@@ -533,6 +524,8 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
                 } else {
                     updateTempState(LoyaltyCardField.barcodeId, s.toString());
                 }
+
+                generateOrHideBarcode();
             }
 
             @Override
@@ -563,6 +556,8 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
                         } catch (IllegalArgumentException e) {
                         }
                     }
+
+                    generateOrHideBarcode();
                 }
             }
 
@@ -674,6 +669,7 @@ 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
@@ -693,24 +689,13 @@ 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)
         );
+    }
 
-        // 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);
-        }
+    private void setCropperTheme() {
+        mCropperOptions.setToolbarColor(getThemeColor());
+        mCropperOptions.setStatusBarColor(getThemeColor());
+        mCropperOptions.setToolbarWidgetColor(Color.WHITE);
+        mCropperOptions.setActiveControlsWidgetColor(getThemeColor());
     }
 
     @Override
@@ -754,8 +739,9 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
 
         onResuming = true;
 
+
         if (tempLoyaltyCard == null) {
-            if (updateLoyaltyCard || duplicateFromLoyaltyCardId) {
+            if (updateLoyaltyCard) {
                 tempLoyaltyCard = DBHelper.getLoyaltyCard(mDatabase, loyaltyCardId);
                 if (tempLoyaltyCard == null) {
                     Log.w(TAG, "Could not lookup loyalty card " + loyaltyCardId);
@@ -773,7 +759,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,0);
+                tempLoyaltyCard = new LoyaltyCard(-1, "", "", null, new BigDecimal("0"), null, "", null, null, null, 0, Utils.getUnixTime(), 100);
 
             }
         }
@@ -781,11 +767,7 @@ 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);
                 }
@@ -863,7 +845,16 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
         // Generate random header color
         if (tempLoyaltyCard.headerColor == null) {
             // Select a random color to start out with.
-            updateTempState(LoyaltyCardField.headerColor, Utils.getRandomHeaderColor(this));
+            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());
         }
 
         // Update from intent
@@ -898,7 +889,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
             hasChanged = hadChanges;
         }
 
-        generateBarcode();
+        generateOrHideBarcode();
 
         enterButton.setOnClickListener(new EditCardIdAndBarcode());
         barcodeImage.setOnClickListener(new EditCardIdAndBarcode());
@@ -912,28 +903,13 @@ 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)) {
-            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);
+            updateTempState(LoyaltyCardField.headerColor, new Palette.Builder((Bitmap) icon).generate().getDominantColor(tempLoyaltyCard.headerColor != null ? tempLoyaltyCard.headerColor : ContextCompat.getColor(this, R.color.colorPrimary)));
         } else {
             Log.d("setColorFromIcon", "attempting header color change from icon but icon does not exist");
         }
@@ -977,12 +953,16 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
         super.onRequestPermissionsResult(requestCode, permissions, grantResults);
 
         if (grantResults[0] == PackageManager.PERMISSION_GRANTED) {
-            if (requestCode == PERMISSION_REQUEST_CAMERA_IMAGE_FRONT) {
-                takePhotoForCard(Utils.CARD_IMAGE_FROM_CAMERA_FRONT);
-            } else if (requestCode == PERMISSION_REQUEST_CAMERA_IMAGE_BACK) {
-                takePhotoForCard(Utils.CARD_IMAGE_FROM_CAMERA_BACK);
-            } else if (requestCode == PERMISSION_REQUEST_CAMERA_IMAGE_ICON) {
-                takePhotoForCard(Utils.CARD_IMAGE_FROM_CAMERA_ICON);
+            try {
+                if (requestCode == PERMISSION_REQUEST_CAMERA_IMAGE_FRONT) {
+                    takePhotoForCard(Utils.CARD_IMAGE_FROM_CAMERA_FRONT);
+                } else if (requestCode == PERMISSION_REQUEST_CAMERA_IMAGE_BACK) {
+                    takePhotoForCard(Utils.CARD_IMAGE_FROM_CAMERA_BACK);
+                } else if (requestCode == PERMISSION_REQUEST_CAMERA_IMAGE_ICON) {
+                    takePhotoForCard(Utils.CARD_IMAGE_FROM_CAMERA_ICON);
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
             }
         }
     }
@@ -1111,9 +1091,6 @@ 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);
 
@@ -1181,14 +1158,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
 
                 Intent i = new Intent(Intent.ACTION_PICK);
                 i.setType("image/*");
-
-                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);
-                }
-
+                mPhotoPickerLauncher.launch(i);
                 return null;
             });
 
@@ -1218,10 +1188,6 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
                             callable.call();
                         } catch (Exception e) {
                             e.printStackTrace();
-
-                            // Rethrow as NoSuchElementException
-                            // This isn't really true, but a View.OnClickListener doesn't allow throwing other types
-                            throw new NoSuchElementException(e.getMessage());
                         }
                     })
                     .show();
@@ -1255,16 +1221,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
             int day = c.get(Calendar.DAY_OF_MONTH);
 
             // Create a new instance of DatePickerDialog and return it
-            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();
+            return new DatePickerDialog(getActivity(), this, year, month, day);
         }
 
         public void onDateSet(DatePicker view, int year, int month, int day) {
@@ -1286,11 +1243,6 @@ 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;
@@ -1318,40 +1270,41 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
             selectedGroups.add((Group) chip.getTag());
         }
 
-        // Both update and new card save with lastUsed set to null
-        // This makes the DBHelper set it to the current date
-        // So that new and edited card are always on top when sorting by recently used
-        if (updateLoyaltyCard) {
-            DBHelper.updateLoyaltyCard(mDatabase, loyaltyCardId, tempLoyaltyCard.store, tempLoyaltyCard.note, tempLoyaltyCard.expiry, tempLoyaltyCard.balance, tempLoyaltyCard.balanceType, tempLoyaltyCard.cardId, tempLoyaltyCard.barcodeId, tempLoyaltyCard.barcodeType, tempLoyaltyCard.headerColor, tempLoyaltyCard.starStatus, null, tempLoyaltyCard.archiveStatus);
+        if (updateLoyaltyCard) {   //update of "starStatus" not necessary, since it cannot be changed in this activity (only in ViewActivity)
+            DBHelper.updateLoyaltyCard(mDatabase, loyaltyCardId, tempLoyaltyCard.store, tempLoyaltyCard.note, tempLoyaltyCard.expiry, tempLoyaltyCard.balance, tempLoyaltyCard.balanceType, tempLoyaltyCard.cardId, tempLoyaltyCard.barcodeId, tempLoyaltyCard.barcodeType, tempLoyaltyCard.headerColor);
+            try {
+                Utils.saveCardImage(this, (Bitmap) cardImageFront.getTag(), loyaltyCardId, ImageLocationType.front);
+                Utils.saveCardImage(this, (Bitmap) cardImageBack.getTag(), loyaltyCardId, ImageLocationType.back);
+                Utils.saveCardImage(this, (Bitmap) thumbnail.getTag(), loyaltyCardId, ImageLocationType.icon);
+            } catch (FileNotFoundException e) {
+                e.printStackTrace();
+            }
+            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, null, 0);
+            loyaltyCardId = (int) DBHelper.insertLoyaltyCard(mDatabase, tempLoyaltyCard.store, tempLoyaltyCard.note, tempLoyaltyCard.expiry, tempLoyaltyCard.balance, tempLoyaltyCard.balanceType, tempLoyaltyCard.cardId, tempLoyaltyCard.barcodeId, tempLoyaltyCard.barcodeType, tempLoyaltyCard.headerColor, 0, tempLoyaltyCard.lastUsed);
+            try {
+                Utils.saveCardImage(this, (Bitmap) cardImageFront.getTag(), loyaltyCardId, ImageLocationType.front);
+                Utils.saveCardImage(this, (Bitmap) cardImageBack.getTag(), loyaltyCardId, ImageLocationType.back);
+                Utils.saveCardImage(this, (Bitmap) thumbnail.getTag(), loyaltyCardId, ImageLocationType.icon);
+            } catch (FileNotFoundException e) {
+                e.printStackTrace();
+            }
         }
 
-        try {
-            Utils.saveCardImage(this, (Bitmap) cardImageFront.getTag(), loyaltyCardId, ImageLocationType.front);
-            Utils.saveCardImage(this, (Bitmap) cardImageBack.getTag(), loyaltyCardId, ImageLocationType.back);
-            Utils.saveCardImage(this, (Bitmap) thumbnail.getTag(), loyaltyCardId, ImageLocationType.icon);
-        } catch (FileNotFoundException e) {
-            e.printStackTrace();
-        }
-
-        Log.i(TAG, "Set " + loyaltyCardId + " to " + cardId + " (update: " + updateLoyaltyCard + ")");
-
         DBHelper.setLoyaltyCardGroups(mDatabase, loyaltyCardId, selectedGroups);
 
         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) {
-        getMenuInflater().inflate(R.menu.card_add_menu, menu);
+        if (updateLoyaltyCard) {
+            getMenuInflater().inflate(R.menu.card_update_menu, menu);
+        } else {
+            getMenuInflater().inflate(R.menu.card_add_menu, menu);
+        }
 
         return super.onCreateOptionsMenu(menu);
     }
@@ -1360,9 +1313,30 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
     public boolean onOptionsItemSelected(MenuItem item) {
         int id = item.getItemId();
 
-        if (id == android.R.id.home) {
-            askBeforeQuitIfChanged();
-            return true;
+        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;
         }
 
         return super.onOptionsItemSelected(item);
@@ -1415,40 +1389,36 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
                 }
             }
         }
-        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);
+        mCropperLauncher.launch(
+                UCrop.of(
+                        sourceUri,
+                        destUri
+                ).withOptions(mCropperOptions)
+                        .getIntent(this)
+        );
     }
 
-    private void generateBarcode() {
-        if (tempLoyaltyCard == null) {
-            return;
-        }
+    private void showBarcode() {
+        barcodeImageLayout.setVisibility(View.VISIBLE);
+    }
 
-        mTasks.flushTaskList(TaskHandler.TYPE.BARCODE, true, false, false);
+    private void hideBarcode() {
+        barcodeImageLayout.setVisibility(View.GONE);
+    }
 
+    private void generateOrHideBarcode() {
         String cardIdString = tempLoyaltyCard.barcodeId != null ? tempLoyaltyCard.barcodeId : tempLoyaltyCard.cardId;
         CatimaBarcode barcodeFormat = tempLoyaltyCard.barcodeType;
 
-        if (cardIdString == null || barcodeFormat == null) {
-            barcodeImageLayout.setVisibility(View.GONE);
-            return;
+        if (barcodeFormat == null || cardIdString.isEmpty() || !barcodeFormat.isSupported()) {
+            hideBarcode();
+        } else {
+            generateBarcode(cardIdString, barcodeFormat);
         }
+    }
 
-        barcodeImageLayout.setVisibility(View.VISIBLE);
+    private void generateBarcode(String cardIdString, CatimaBarcode barcodeFormat) {
+        mTasks.flushTaskList(TaskHandler.TYPE.BARCODE, true, false, false);
 
         if (barcodeImage.getHeight() == 0) {
             Log.d(TAG, "ImageView size is not known known at start, waiting for load");
@@ -1461,15 +1431,17 @@ 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, barcodeImageGenerationFinishedCallback, true);
+                            BarcodeImageWriterTask barcodeWriter = new BarcodeImageWriterTask(getApplicationContext(), barcodeImage, cardIdString, barcodeFormat, null, false, warnOnInvalidBarcodeType);
                             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, barcodeImageGenerationFinishedCallback, true);
+            BarcodeImageWriterTask barcodeWriter = new BarcodeImageWriterTask(getApplicationContext(), barcodeImage, cardIdString, barcodeFormat, null, false, warnOnInvalidBarcodeType);
             mTasks.executeTask(TaskHandler.TYPE.BARCODE, barcodeWriter);
         }
+
+        showBarcode();
     }
 
     private void generateIcon(String store) {
@@ -1499,36 +1471,32 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
         }
 
         View cardPart = findViewById(R.id.cardPart);
-        View optionsPart = findViewById(R.id.optionsPart);
+        View barcodePart = findViewById(R.id.barcodePart);
         View picturesPart = findViewById(R.id.picturesPart);
 
         if (getString(R.string.card).equals(part)) {
             cardPart.setVisibility(View.VISIBLE);
-            optionsPart.setVisibility(View.GONE);
+            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);
             picturesPart.setVisibility(View.GONE);
 
             // Redraw barcode due to size change (Visibility.GONE sets it to 0)
-            generateBarcode();
-        } else if (getString(R.string.options).equals(part)) {
-            cardPart.setVisibility(View.GONE);
-            optionsPart.setVisibility(View.VISIBLE);
-            picturesPart.setVisibility(View.GONE);
+            generateOrHideBarcode();
         } else if (getString(R.string.photos).equals(part)) {
             cardPart.setVisibility(View.GONE);
-            optionsPart.setVisibility(View.GONE);
+            barcodePart.setVisibility(View.GONE);
             picturesPart.setVisibility(View.VISIBLE);
+
+            // Explicitly hide barcode (fixes blurriness on redraw)
+            hideBarcode();
         } else {
             throw new UnsupportedOperationException();
         }
     }
-
-    private void currencyPrioritizeLocaleSymbols(ArrayList<String> currencyList, Locale locale) {
-        try {
-            String currencySymbol = Currency.getInstance(locale).getSymbol();
-            currencyList.remove(currencySymbol);
-            currencyList.add(0, currencySymbol);
-        } catch (IllegalArgumentException e) {
-            Log.d(TAG, "Could not get currency data for locale info: " + e);
-        }
-    }
 }

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

@@ -11,6 +11,5 @@ public enum LoyaltyCardField {
     barcodeId,
     barcodeType,
     headerColor,
-    starStatus,
-    archiveStatus
+    starStatus
 }

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

@@ -2,21 +2,15 @@ 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;
@@ -24,6 +18,7 @@ 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;
@@ -35,22 +30,8 @@ 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.bottomappbar.BottomAppBar;
+import com.google.android.material.bottomsheet.BottomSheetBehavior;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 
 import java.io.UnsupportedEncodingException;
@@ -60,6 +41,19 @@ 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;
 
@@ -69,12 +63,15 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
     private GestureDetector mGestureDetector;
 
     CoordinatorLayout coordinatorLayout;
-    ConstraintLayout mainLayout;
     TextView cardIdFieldView;
-    BottomAppBar bottomAppBar;
-    ImageButton bottomAppBarInfoButton;
-    ImageButton bottomAppBarPreviousButton;
-    ImageButton bottomAppBarNextButton;
+    BottomSheetBehavior behavior;
+    LinearLayout bottomSheet;
+    NestedScrollView bottomSheetContentWrapper;
+    ImageView bottomSheetButton;
+    TextView noteView;
+    TextView groupsView;
+    TextView balanceView;
+    TextView expiryView;
     AppCompatTextView storeName;
     ImageButton maximizeButton;
     ImageView mainImage;
@@ -83,14 +80,10 @@ 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;
@@ -116,13 +109,15 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
     private ImageView[] dots;
     boolean isBarcodeSupported = true;
 
+    int bottomSheetState;
+
     static final String STATE_IMAGEINDEX = "imageIndex";
     static final String STATE_FULLSCREEN = "isFullscreen";
+    static final String STATE_BOTTOMSHEET = "bottomSheetState";
 
     private final int HEADER_FILTER_ALPHA = 127;
 
     final private TaskHandler mTasks = new TaskHandler();
-    Runnable barcodeImageGenerationFinishedCallback;
 
     @Override
     public boolean onDown(MotionEvent e) {
@@ -207,7 +202,6 @@ 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);
     }
 
@@ -228,7 +222,6 @@ 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 {
@@ -251,45 +244,16 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-        if (savedInstanceState == null) {
-            Bundle incomingIntentExtras = getIntent().getExtras();
-
-            if (incomingIntentExtras == null) {
-                Toast.makeText(this, R.string.noCardExistsError, Toast.LENGTH_LONG).show();
-                finish();
-                return;
-            }
-
-            int transitionRight = incomingIntentExtras.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);
@@ -298,40 +262,29 @@ 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) {
@@ -349,7 +302,7 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
 
                 setCenterGuideline(loyaltyCard.zoomLevel);
 
-                drawMainImage(mainImageIndex, true, isFullscreen);
+                drawMainImage(mainImageIndex, true);
             }
 
             @Override
@@ -381,6 +334,33 @@ 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) {
@@ -389,144 +369,57 @@ 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);
+    }
 
-        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())
+    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)
                 );
-                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) {
@@ -540,6 +433,7 @@ 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);
     }
 
@@ -581,8 +475,6 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
             return;
         }
 
-        loyaltyCardGroups = DBHelper.getLoyaltyCardGroups(database, loyaltyCardId);
-
         setupOrientation();
 
         format = loyaltyCard.barcodeType;
@@ -594,6 +486,56 @@ 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(
@@ -619,22 +561,6 @@ 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;
@@ -653,14 +579,9 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
         backgroundNeedsDarkIcons = Utils.needsDarkForeground(backgroundHeaderColor);
         ActionBar actionBar = getSupportActionBar();
         if (actionBar != null) {
-            actionBar.setHomeAsUpIndicator(getIcon(R.drawable.home_arrow_back_white, backgroundNeedsDarkIcons));
+            actionBar.setHomeAsUpIndicator(getIcon(R.drawable.ic_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);
@@ -697,15 +618,30 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
             imageTypes.add(ImageType.IMAGE_BACK);
         }
 
-        setDotIndicator(Utils.isDarkModeEnabled(this));
+        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);
+        }
 
         setFullscreen(isFullscreen);
 
-        DBHelper.updateLoyaltyCardLastUsed(database, loyaltyCard.id);
-    }
+        // restore bottomSheet UI states from changing orientation
+        changeUiToBottomSheetState(bottomSheetState);
 
-    private void fixImageButtonColor(ImageButton imageButton) {
-        imageButton.setColorFilter(BlendModeColorFilterCompat.createBlendModeColorFilterCompat(backgroundNeedsDarkIcons ? Color.BLACK : Color.WHITE, BlendModeCompat.SRC_ATOP));
+        DBHelper.updateLoyaltyCardLastUsed(database, loyaltyCard.id);
     }
 
     @Override
@@ -721,17 +657,18 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         getMenuInflater().inflate(R.menu.card_view_menu, menu);
-        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);
+        // 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);
         }
 
-        menu.findItem(R.id.action_overflow).setIcon(getIcon(R.drawable.ic_overflow_menu, backgroundNeedsDarkIcons));
+        loyaltyCard = DBHelper.getLoyaltyCard(database, loyaltyCardId);
+        starred = loyaltyCard.starStatus != 0;
+
         menu.findItem(R.id.action_share).setIcon(getIcon(R.drawable.ic_share_white, backgroundNeedsDarkIcons));
 
         return super.onCreateOptionsMenu(menu);
@@ -755,78 +692,46 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
     public boolean onOptionsItemSelected(MenuItem item) {
         int id = item.getItemId();
 
-        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);
-
+        switch (id) {
+            case android.R.id.home:
                 finish();
-                dialog.dismiss();
-            });
-            builder.setNegativeButton(R.string.cancel, (dialog, which) -> dialog.dismiss());
-            AlertDialog dialog = builder.create();
-            dialog.show();
+                break;
 
-            return true;
+            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 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);
@@ -852,7 +757,28 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
         }
     }
 
-    private void drawBarcode(boolean addPadding) {
+    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() {
         mTasks.flushTaskList(TaskHandler.TYPE.BARCODE, true, false, false);
         if (format != null) {
             BarcodeImageWriterTask barcodeWriter = new BarcodeImageWriterTask(
@@ -862,13 +788,12 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
                     format,
                     null,
                     false,
-                    barcodeImageGenerationFinishedCallback,
-                    addPadding);
+                    null);
             mTasks.executeTask(TaskHandler.TYPE.BARCODE, barcodeWriter);
         }
     }
 
-    private void redrawBarcodeAfterResize(boolean addPadding) {
+    private void redrawBarcodeAfterResize() {
         if (format != null) {
             mainImage.getViewTreeObserver().addOnGlobalLayoutListener(
                     new ViewTreeObserver.OnGlobalLayoutListener() {
@@ -877,13 +802,13 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
                             mainImage.getViewTreeObserver().removeOnGlobalLayoutListener(this);
 
                             Log.d(TAG, "ImageView size now known");
-                            drawBarcode(addPadding);
+                            drawBarcode();
                         }
                     });
         }
     }
 
-    private void drawMainImage(int index, boolean waitForResize, boolean isFullscreen) {
+    private void drawMainImage(int index, boolean waitForResize) {
         if (imageTypes.isEmpty()) {
             mainImage.setVisibility(View.GONE);
             return;
@@ -899,28 +824,18 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
         ImageType wantedImageType = imageTypes.get(index);
 
         if (wantedImageType == ImageType.BARCODE) {
-            // Use border in non-fullscreen mode
-            if (!isFullscreen) {
-                mainImage.setBackground(AppCompatResources.getDrawable(this, R.drawable.round_outline));
-            } else {
-                mainImage.setBackgroundColor(Color.WHITE);
-            }
-
             if (waitForResize) {
-                redrawBarcodeAfterResize(!isFullscreen);
+                redrawBarcodeAfterResize();
             } else {
-                drawBarcode(!isFullscreen);
+                drawBarcode();
             }
-
-            mainImage.setContentDescription(getString(R.string.barcodeImageDescriptionWithType, format.prettyName()));
+            mainImage.setBackgroundColor(Color.WHITE);
         } 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);
         }
@@ -941,26 +856,7 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
 
         mainImageIndex = newIndex;
 
-        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);
-        }
+        drawMainImage(newIndex, false);
     }
 
     /**
@@ -976,7 +872,7 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
         if (enabled && !imageTypes.isEmpty()) {
             Log.d(TAG, "Move into fullscreen");
 
-            drawMainImage(mainImageIndex, true, isFullscreen);
+            drawMainImage(mainImageIndex, true);
 
             barcodeScaler.setProgress(loyaltyCard.zoomLevel);
             setCenterGuideline(loyaltyCard.zoomLevel);
@@ -992,15 +888,22 @@ 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);
-            bottomAppBar.setVisibility(View.GONE);
-            editButton.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);
 
             // Set Android to fullscreen mode
             getWindow().getDecorView().setSystemUiVisibility(
@@ -1014,7 +917,7 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
             // Reset center guideline
             setCenterGuideline(100);
 
-            drawMainImage(mainImageIndex, true, isFullscreen);
+            drawMainImage(mainImageIndex, true);
 
             // Show maximize and hide minimize button and scaler
             maximizeButton.setVisibility(imageTypes.isEmpty() ? View.GONE : View.VISIBLE);
@@ -1028,14 +931,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);
-            editButton.setVisibility(View.VISIBLE);
-            bottomAppBar.setVisibility(View.VISIBLE);
+            makeBottomSheetVisibleIfUseful();
+            editButton.show();
 
             // Unset fullscreen mode
             getWindow().getDecorView().setSystemUiVisibility(
@@ -1043,6 +946,11 @@ 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());

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

@@ -17,20 +17,10 @@ import android.view.MenuItem;
 import android.view.MotionEvent;
 import android.view.View;
 import android.widget.CheckBox;
-import android.widget.TextView;
 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;
@@ -42,7 +32,6 @@ 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;
@@ -58,20 +47,16 @@ 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;
     protected DBHelper.LoyaltyCardOrderDirection mOrderDirection = DBHelper.LoyaltyCardOrderDirection.Ascending;
     protected int selectedTab = 0;
     private RecyclerView mCardList;
-    private View mHelpSection;
+    private View mHelpText;
     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;
 
@@ -155,8 +140,10 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
                 }
 
                 builder.setPositiveButton(R.string.confirm, (dialog, which) -> {
+                    DBHelper db = new DBHelper(MainActivity.this);
+
                     for (LoyaltyCard loyaltyCard : mAdapter.getSelectedItems()) {
-                        Log.d(TAG, "Deleting card: " + loyaltyCard.id);
+                        Log.e(TAG, "Deleting card: " + loyaltyCard.id);
 
                         DBHelper.deleteLoyaltyCard(mDatabase, MainActivity.this, loyaltyCard.id);
 
@@ -166,7 +153,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(true);
+                    updateLoyaltyCardList();
 
                     dialog.dismiss();
                 });
@@ -176,44 +163,6 @@ 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;
         }
@@ -227,28 +176,13 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
 
     @Override
     protected void onCreate(Bundle inputSavedInstanceState) {
-        extractIntentFields(getIntent());
-        SplashScreen.installSplashScreen(this);
         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);
-        }
-
+        SplashScreen.installSplashScreen(this);
+        setTitle(R.string.app_name);
+        setContentView(R.layout.main_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);
@@ -258,7 +192,7 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
                 selectedTab = tab.getPosition();
                 Log.d("onTabSelected", "Tab Position " + tab.getPosition());
                 mGroup = tab.getTag();
-                updateLoyaltyCardList(false);
+                updateLoyaltyCardList();
                 // Store active tab in Shared Preference to restore next app launch
                 SharedPreferences activeTabPref = getApplicationContext().getSharedPreferences(
                         getString(R.string.sharedpreference_active_tab),
@@ -283,11 +217,12 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
 
         View.OnTouchListener gestureTouchListener = (v, event) -> mGestureDetector.onTouchEvent(event);
 
-        mHelpSection = findViewById(R.id.helpSection);
+        mHelpText = findViewById(R.id.helpText);
         mNoMatchingCardsText = findViewById(R.id.noMatchingCardsText);
         mNoGroupCardsText = findViewById(R.id.noGroupCardsText);
         mCardList = findViewById(R.id.list);
 
+        mHelpText.setOnTouchListener(gestureTouchListener);
         mNoMatchingCardsText.setOnTouchListener(gestureTouchListener);
         mCardList.setOnTouchListener(gestureTouchListener);
         mNoGroupCardsText.setOnTouchListener(gestureTouchListener);
@@ -297,7 +232,7 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
         registerForContextMenu(mCardList);
 
         mGroup = null;
-        updateLoyaltyCardList(true);
+        updateLoyaltyCardList();
 
         /*
          * This was added for Huawei, but Huawei is just too much of a fucking pain.
@@ -362,8 +297,6 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
     protected void onResume() {
         super.onResume();
 
-        mAdapter.refreshState();
-
         if (mCurrentActionMode != null) {
             mAdapter.clearSelections();
             mCurrentActionMode.finish();
@@ -403,28 +336,24 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
             assert tab != null;
             mGroup = tab.getTag();
         }
-        updateLoyaltyCardList(true);
+        updateLoyaltyCardList();
         // End of active tab logic
 
-        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();
-        }
+        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;
@@ -433,37 +362,20 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
         super.onBackPressed();
     }
 
-    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) {
+    private void updateLoyaltyCardList() {
         Group group = null;
         if (mGroup != null) {
             group = (Group) mGroup;
         }
 
-        mAdapter.swapCursor(DBHelper.getLoyaltyCardCursor(mDatabase, mFilter, group, mOrder, mOrderDirection, mArchiveMode ? DBHelper.LoyaltyCardArchiveFilter.Archived : DBHelper.LoyaltyCardArchiveFilter.Unarchived));
+        mAdapter.swapCursor(DBHelper.getLoyaltyCardCursor(mDatabase, mFilter, group, mOrder, mOrderDirection));
 
-        if (updateCount) {
-            updateLoyaltyCardCount();
-            // Update menu icons if necessary
-            invalidateOptionsMenu();
-        }
-
-        if (mLoyaltyCardCount > 0) {
+        if (DBHelper.getLoyaltyCardCount(mDatabase) > 0) {
             // We want the cardList to be visible regardless of the filtered match count
             // to ensure that the noMatchingCardsText doesn't end up being shown below
             // the keyboard
-            mHelpSection.setVisibility(View.GONE);
+            mHelpText.setVisibility(View.GONE);
             mNoGroupCardsText.setVisibility(View.GONE);
-
             if (mAdapter.getItemCount() > 0) {
                 mCardList.setVisibility(View.VISIBLE);
                 mNoMatchingCardsText.setVisibility(View.GONE);
@@ -480,15 +392,8 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
                 }
             }
         } else {
-            if (mArchiveMode) {
-                // If an user deletes the last card in archive mode, we should close the activity
-                // This will move us back to the main view
-                finish();
-            }
-
             mCardList.setVisibility(View.GONE);
-            mHelpSection.setVisibility(View.VISIBLE);
-
+            mHelpText.setVisibility(View.VISIBLE);
             mNoMatchingCardsText.setVisibility(View.GONE);
             mNoGroupCardsText.setVisibility(View.GONE);
         }
@@ -498,11 +403,6 @@ 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);
 
@@ -527,19 +427,11 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
         }
 
         groupsTabLayout.setVisibility(View.VISIBLE);
-
     }
 
     @Override
     public boolean onCreateOptionsMenu(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);
+        getMenuInflater().inflate(R.menu.main_menu, inputMenu);
 
         SearchManager searchManager = (SearchManager) getSystemService(Context.SEARCH_SERVICE);
         if (searchManager != null) {
@@ -566,21 +458,12 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
                     TabLayout.Tab currentTab = groupsTabLayout.getTabAt(groupsTabLayout.getSelectedTabPosition());
                     mGroup = currentTab != null ? currentTab.getTag() : null;
 
-                    updateLoyaltyCardList(false);
+                    updateLoyaltyCardList();
 
                     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);
     }
 
@@ -588,18 +471,24 @@ 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) {
-            mAdapter.showDetails(!mAdapter.showingDetails());
-            invalidateOptionsMenu();
+            boolean shouldShow = !mAdapter.showingDetails();
+
+            if (shouldShow) {
+                inputItem.setIcon(R.drawable.ic_baseline_unfold_less_24);
+                inputItem.setTitle(R.string.action_hide_details);
+            } else {
+                inputItem.setIcon(R.drawable.ic_baseline_unfold_more_24);
+                inputItem.setTitle(R.string.action_show_details);
+            }
+
+            mAdapter.showDetails(shouldShow);
 
             return true;
         }
 
         if (id == R.id.action_sort) {
+            TabLayout.Tab tab = ((TabLayout) findViewById(R.id.groups)).getTabAt(selectedTab);
             AtomicInteger currentIndex = new AtomicInteger();
             List<DBHelper.LoyaltyCardOrder> loyaltyCardOrders = Arrays.asList(DBHelper.LoyaltyCardOrder.values());
             for (int i = 0; i < loyaltyCardOrders.size(); i++) {
@@ -615,21 +504,17 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
             final View customLayout = getLayoutInflater().inflate(R.layout.sorting_option, null);
             builder.setView(customLayout);
 
-            CheckBox showReversed = (CheckBox) customLayout.findViewById(R.id.checkBox_reverse);
-
-
-            showReversed.setChecked(mOrderDirection == DBHelper.LoyaltyCardOrderDirection.Descending);
-
+            CheckBox ch = (CheckBox) customLayout.findViewById(R.id.checkBox_reverse);
+            ch.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) -> {
-
-                setSort(
-                        loyaltyCardOrders.get(currentIndex.get()),
-                        showReversed.isChecked() ? DBHelper.LoyaltyCardOrderDirection.Descending : DBHelper.LoyaltyCardOrderDirection.Ascending
-                );
-
+                if (ch.isChecked()) {
+                    setSort(loyaltyCardOrders.get(currentIndex.get()), DBHelper.LoyaltyCardOrderDirection.Descending);
+                } else {
+                    setSort(loyaltyCardOrders.get(currentIndex.get()), DBHelper.LoyaltyCardOrderDirection.Ascending);
+                }
                 dialog.dismiss();
             });
 
@@ -647,15 +532,6 @@ 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;
-        }
-
         if (id == R.id.action_import_export) {
             Intent i = new Intent(getApplicationContext(), ImportExportActivity.class);
             startActivity(i);
@@ -674,7 +550,6 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
             return true;
         }
 
-
         return super.onOptionsItemSelected(inputItem);
     }
 
@@ -693,7 +568,7 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
         sortPrefEditor.apply();
 
         // Update card list
-        updateLoyaltyCardList(false);
+        updateLoyaltyCardList();
     }
 
     @Override
@@ -796,47 +671,10 @@ 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);
             }
@@ -845,7 +683,6 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
         }
     }
 
-
     @Override
     public void onRowClicked(int inputPosition) {
         if (mAdapter.getSelectedItemCount() > 0) {
@@ -867,22 +704,15 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
                 return;
             }
 
-            Intent intent = new Intent(this, LoyaltyCardViewActivity.class);
-            intent.setAction("");
+            Intent i = new Intent(this, LoyaltyCardViewActivity.class);
+            i.setAction("");
             final Bundle b = new Bundle();
             b.putInt("id", loyaltyCard.id);
-
-            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);
+            i.putExtras(b);
 
             ShortcutHelper.updateShortcuts(MainActivity.this, loyaltyCard);
 
-            startActivity(intent);
+            startActivity(i);
         }
     }
 }

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

@@ -1,13 +1,12 @@
 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;
@@ -35,7 +34,7 @@ public class ManageGroupActivity extends CatimaAppCompatActivity implements Mana
 
     protected Group mGroup = null;
     private RecyclerView mCardList;
-    private TextView noGroupCardsText;
+    private TextView mHelpText;
     private EditText mGroupNameText;
 
     private boolean mGroupNameNotInUse;
@@ -49,7 +48,7 @@ public class ManageGroupActivity extends CatimaAppCompatActivity implements Mana
 
         mDatabase = new DBHelper(this).getWritableDatabase();
 
-        noGroupCardsText = findViewById(R.id.noGroupCardsText);
+        mHelpText = findViewById(R.id.helpText);
         mCardList = findViewById(R.id.list);
         FloatingActionButton saveButton = findViewById(R.id.fabSave);
 
@@ -133,7 +132,7 @@ public class ManageGroupActivity extends CatimaAppCompatActivity implements Mana
             finish();
         });
         // this setText is here because content_main.xml is reused from main activity
-        noGroupCardsText.setText(getResources().getText(R.string.noGiftCardsGroup));
+        mHelpText.setText(getResources().getText(R.string.noGiftCardsGroup));
         updateLoyaltyCardList();
     }
 
@@ -157,26 +156,6 @@ 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) {
@@ -191,10 +170,10 @@ public class ManageGroupActivity extends CatimaAppCompatActivity implements Mana
 
         if (mAdapter.getItemCount() == 0) {
             mCardList.setVisibility(View.GONE);
-            noGroupCardsText.setVisibility(View.VISIBLE);
+            mHelpText.setVisibility(View.VISIBLE);
         } else {
             mCardList.setVisibility(View.VISIBLE);
-            noGroupCardsText.setVisibility(View.GONE);
+            mHelpText.setVisibility(View.GONE);
         }
     }
 

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);
+        AlertDialog.Builder builder = new AlertDialog.Builder(this, R.style.AlertDialogTheme);
         builder.setTitle(R.string.enter_group_name);
         final EditText input = new EditText(this);
         input.setInputType(InputType.TYPE_CLASS_TEXT);

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

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

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

@@ -1,7 +1,6 @@
 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;
@@ -207,11 +206,6 @@ public class ScanActivity extends CatimaAppCompatActivity {
     public void addFromImage(View view) {
         Intent photoPickerIntent = new Intent(Intent.ACTION_PICK);
         photoPickerIntent.setType("image/*");
-        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);
-        }
+        photoPickerLauncher.launch(photoPickerIntent);
     }
 }

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

@@ -1,79 +0,0 @@
-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));
-            }
-        }
-    }
-}

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

@@ -5,7 +5,6 @@ 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;
@@ -15,11 +14,8 @@ 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;
@@ -36,7 +32,6 @@ 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;
@@ -44,11 +39,9 @@ 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 {
@@ -213,7 +206,7 @@ public class Utils {
 
         if (currency == null) {
             numberFormat.setMaximumFractionDigits(0);
-            return context.getResources().getQuantityString(R.plurals.balancePoints, value.intValue(), numberFormat.format(value));
+            return context.getString(R.string.balancePoints, numberFormat.format(value));
         }
 
         NumberFormat currencyFormat = NumberFormat.getCurrencyInstance();
@@ -238,19 +231,32 @@ public class Utils {
         return numberFormat.format(value);
     }
 
-    static public BigDecimal parseBalance(String value, Currency currency) throws ParseException {
-        NumberFormat numberFormat = NumberFormat.getInstance();
-
+    static public Boolean currencyHasDecimals(Currency currency) {
         if (currency == null) {
-            numberFormat.setMaximumFractionDigits(0);
-        } else {
-            numberFormat.setMinimumFractionDigits(currency.getDefaultFractionDigits());
-            numberFormat.setMaximumFractionDigits(currency.getDefaultFractionDigits());
+            return false;
         }
 
-        Log.d(TAG, numberFormat.parse(value).toString());
+        return currency.getDefaultFractionDigits() != 0;
+    }
 
-        return new BigDecimal(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);
     }
 
     static public byte[] bitmapToByteArray(Bitmap bitmap) {
@@ -442,82 +448,4 @@ public class Utils {
         return loadImage(context.getCacheDir() + "/" + name);
     }
 
-    // https://stackoverflow.com/a/59324801/8378787
-    public static int getComplementaryColor(int color) {
-        int R = color & 255;
-        int G = (color >> 8) & 255;
-        int B = (color >> 16) & 255;
-        int A = (color >> 24) & 255;
-        R = 255 - R;
-        G = 255 - G;
-        B = 255 - B;
-        return R + (G << 8) + (B << 16) + (A << 24);
-    }
-
-    // replace colors in the current theme
-    public static void patchColors(AppCompatActivity activity) {
-        Settings settings = new Settings(activity);
-        String color = settings.getColor();
-
-        Resources.Theme theme = activity.getTheme();
-        Resources resources = activity.getResources();
-        if (color.equals(resources.getString(R.string.settings_key_pink_theme))) {
-            theme.applyStyle(R.style.pink, true);
-        } else if (color.equals(resources.getString(R.string.settings_key_magenta_theme))) {
-            theme.applyStyle(R.style.magenta, true);
-        } else if (color.equals(resources.getString(R.string.settings_key_violet_theme))) {
-            theme.applyStyle(R.style.violet, true);
-        } else if (color.equals(resources.getString(R.string.settings_key_blue_theme))) {
-            theme.applyStyle(R.style.blue, true);
-        } else if (color.equals(resources.getString(R.string.settings_key_sky_blue_theme))) {
-            theme.applyStyle(R.style.skyblue, true);
-        } else if (color.equals(resources.getString(R.string.settings_key_green_theme))) {
-            theme.applyStyle(R.style.green, true);
-        } else if (color.equals(resources.getString(R.string.settings_key_brown_theme))) {
-            theme.applyStyle(R.style.brown, true);
-        } else if (color.equals(resources.getString(R.string.settings_key_catima_theme))) {
-            // catima theme is AppTheme itself, no dynamic colors nor applyStyle
-        } else {
-            // final catch all in case of invalid theme value from older versions
-            // also handles R.string.settings_key_system_theme
-            DynamicColors.applyIfAvailable(activity);
-        }
-
-        if (isDarkModeEnabled(activity) && settings.getOledDark()) {
-            theme.applyStyle(R.style.DarkBackground, true);
-        }
-    }
-
-    // XXX android 9 and below has issues with patched theme where the background becomes a
-    // rendering mess
-    // use after views are inflated
-    public static void postPatchColors(AppCompatActivity activity) {
-        TypedValue typedValue = new TypedValue();
-        activity.getTheme().resolveAttribute(android.R.attr.colorBackground, typedValue, true);
-        activity.findViewById(android.R.id.content).setBackgroundColor(typedValue.data);
-    }
-
-    public static void updateMenuCardDetailsButtonState(MenuItem item, boolean currentlyExpanded) {
-        if (currentlyExpanded) {
-            item.setIcon(R.drawable.ic_baseline_unfold_less_24);
-            item.setTitle(R.string.action_hide_details);
-        } else {
-            item.setIcon(R.drawable.ic_baseline_unfold_more_24);
-            item.setTitle(R.string.action_show_details);
-        }
-    }
-
-    public static int getHeaderColorFromImage(Bitmap image, int fallback) {
-        if (image == null) {
-            return fallback;
-        }
-
-        return new Palette.Builder(image).generate().getDominantColor(R.attr.colorPrimary);
-    }
-
-    public static int getRandomHeaderColor(Context context) {
-        TypedArray colors = context.getResources().obtainTypedArray(R.array.letter_tile_colors);
-        final int color = (int) (Math.random() * colors.length());
-        return colors.getColor(color, Color.BLACK);
-    }
 }

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

@@ -135,8 +135,7 @@ public class CatimaExporter implements Exporter {
                 DBHelper.LoyaltyCardDbIds.BARCODE_TYPE,
                 DBHelper.LoyaltyCardDbIds.HEADER_COLOR,
                 DBHelper.LoyaltyCardDbIds.STAR_STATUS,
-                DBHelper.LoyaltyCardDbIds.LAST_USED,
-                DBHelper.LoyaltyCardDbIds.ARCHIVE_STATUS);
+                DBHelper.LoyaltyCardDbIds.LAST_USED);
 
         Cursor cardCursor = DBHelper.getLoyaltyCardCursor(database);
 
@@ -154,8 +153,7 @@ public class CatimaExporter implements Exporter {
                     card.barcodeType != null ? card.barcodeType.name() : "",
                     card.headerColor,
                     card.starStatus,
-                    card.lastUsed,
-                    card.archiveStatus);
+                    card.lastUsed);
 
             if (Thread.currentThread().isInterrupted()) {
                 throw new InterruptedException();

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

@@ -321,15 +321,6 @@ 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);
@@ -338,7 +329,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,archiveStatus);
+        DBHelper.insertLoyaltyCard(database, id, store, note, expiry, balance, balanceType, cardId, barcodeId, barcodeType, headerColor, starStatus, lastUsed);
     }
 
     /**

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

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

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

@@ -21,7 +21,6 @@ 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)
@@ -57,7 +56,7 @@ public class FidmeImporter implements Importer {
 
         try {
             for (CSVRecord record : fidmeParser) {
-                importLoyaltyCard(context, database, record);
+                importLoyaltyCard(database, record);
 
                 if (Thread.currentThread().isInterrupted()) {
                     throw new InterruptedException();
@@ -76,7 +75,7 @@ public class FidmeImporter implements Importer {
      * Import a single loyalty card into the database using the given
      * session.
      */
-    private void importLoyaltyCard(Context context, SQLiteDatabase database, CSVRecord record)
+    private void importLoyaltyCard(SQLiteDatabase database, CSVRecord record)
             throws FormatException {
         // A loyalty card export from Fidme contains the following fields:
         // Retailer (store name)
@@ -110,10 +109,7 @@ public class FidmeImporter implements Importer {
         // The ID is called reference
         String cardId = CSVHelpers.extractString("Reference", record, "");
         if (cardId.isEmpty()) {
-            // Fidme deletes the card id if a card is expired
-            // Because Catima considers the card id a required field, we ignore these expired cards
-            // https://github.com/CatimaLoyalty/Android/issues/1005
-            return;
+            throw new FormatException("No card ID listed, but is required");
         }
 
         // Sadly, Fidme exports don't contain the card type
@@ -121,13 +117,11 @@ 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 or colour in the export either
+        // No favourite data 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, headerColor, starStatus, null,archiveStatus);
+        DBHelper.insertLoyaltyCard(database, store, note, null, BigDecimal.valueOf(0), null, cardId, null, barcodeType, null, starStatus, null);
     }
 }

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

@@ -1,23 +1,7 @@
 package protect.card_locker.importexport;
 
-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;
-    }
+public enum ImportExportResult {
+    Success,
+    GenericFailure,
+    BadPassword;
 }

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

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

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

@@ -4,8 +4,11 @@ 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";
 
@@ -31,20 +34,20 @@ public class MultiFormatExporter {
                 break;
         }
 
-        String error;
         if (exporter != null) {
             try {
                 exporter.exportData(context, database, output, password);
-                return new ImportExportResult(ImportExportResultType.Success);
-            } catch (Exception e) {
+                return ImportExportResult.Success;
+            } catch (IOException e) {
+                Log.e(TAG, "Failed to export data", e);
+            } catch (InterruptedException e) {
                 Log.e(TAG, "Failed to export data", e);
-                error = e.toString();
             }
-        } else {
-            error = "Unsupported data format exported: " + format.name();
-            Log.e(TAG, error);
-        }
 
-        return new ImportExportResult(ImportExportResultType.GenericFailure, error);
+            return ImportExportResult.GenericFailure;
+        } else {
+            Log.e(TAG, "Unsupported data format exported: " + format.name());
+            return ImportExportResult.GenericFailure;
+        }
     }
 }

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

@@ -6,7 +6,14 @@ 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";
@@ -40,31 +47,23 @@ public class MultiFormatImporter {
                 break;
         }
 
-        String error = null;
         if (importer != null) {
             database.beginTransaction();
             try {
                 importer.importData(context, database, input, password);
                 database.setTransactionSuccessful();
-                return new ImportExportResult(ImportExportResultType.Success);
+                return ImportExportResult.Success;
             } catch (ZipException 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) {
+                return ImportExportResult.BadPassword;
+            } catch (IOException | FormatException | InterruptedException | JSONException | ParseException | NullPointerException e) {
                 Log.e(TAG, "Failed to import data", e);
-                error = e.toString();
             } finally {
                 database.endTransaction();
             }
         } else {
-            error = "Unsupported data format imported: " + format.name();
-            Log.e(TAG, error);
+            Log.e(TAG, "Unsupported data format imported: " + format.name());
         }
 
-        return new ImportExportResult(ImportExportResultType.GenericFailure, error);
+        return ImportExportResult.GenericFailure;
     }
 }

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

@@ -3,7 +3,6 @@ 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;
 
@@ -40,17 +39,15 @@ 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, Object>> providers = new HashMap<>();
+        HashMap<String, HashMap<String, String>> providers = new HashMap<>();
 
         final CSVParser parser = new CSVParser(new InputStreamReader(context.getResources().openRawResource(R.raw.stocard_stores), StandardCharsets.UTF_8), CSVFormat.RFC4180.builder().setHeader().build());
 
         try {
             for (CSVRecord record : parser) {
-                HashMap<String, Object> recordData = new HashMap<>();
+                HashMap<String, String> recordData = new HashMap<>();
                 recordData.put("name", record.get("name"));
                 recordData.put("barcodeFormat", record.get("barcodeFormat"));
 
@@ -65,8 +62,6 @@ 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;
@@ -83,14 +78,6 @@ 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",
@@ -101,33 +88,6 @@ 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];
@@ -138,33 +98,24 @@ public class StocardImporter implements Importer {
                     if (fileName.endsWith(".json")) {
                         JSONObject jsonObject = ZipUtils.readJSON(zipInputStream);
 
-                        loyaltyCardHashMap = appendToHashMap(
+                        loyaltyCardHashMap = appendToLoyaltyCardHashMap(
                                 loyaltyCardHashMap,
                                 cardName,
                                 "cardId",
                                 jsonObject.getString("input_id")
                         );
-
-                        // 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 = appendToLoyaltyCardHashMap(
                                 loyaltyCardHashMap,
                                 cardName,
                                 "_providerId",
-                                providerId
+                                jsonObject
+                                        .getJSONObject("input_provider_reference")
+                                        .getString("identifier")
+                                        .substring("/loyalty-card-providers/".length())
                         );
 
                         if (jsonObject.has("input_barcode_format")) {
-                            loyaltyCardHashMap = appendToHashMap(
+                            loyaltyCardHashMap = appendToLoyaltyCardHashMap(
                                     loyaltyCardHashMap,
                                     cardName,
                                     "barcodeType",
@@ -173,7 +124,7 @@ public class StocardImporter implements Importer {
                         }
                     }
                 } else if (fileName.endsWith("notes/default.json")) {
-                    loyaltyCardHashMap = appendToHashMap(
+                    loyaltyCardHashMap = appendToLoyaltyCardHashMap(
                             loyaltyCardHashMap,
                             cardName,
                             "note",
@@ -181,14 +132,14 @@ public class StocardImporter implements Importer {
                                     .getString("content")
                     );
                 } else if (fileName.endsWith("/images/front.png")) {
-                    loyaltyCardHashMap = appendToHashMap(
+                    loyaltyCardHashMap = appendToLoyaltyCardHashMap(
                             loyaltyCardHashMap,
                             cardName,
                             "frontImage",
                             ZipUtils.readImage(zipInputStream)
                     );
                 } else if (fileName.endsWith("/images/back.png")) {
-                    loyaltyCardHashMap = appendToHashMap(
+                    loyaltyCardHashMap = appendToLoyaltyCardHashMap(
                             loyaltyCardHashMap,
                             cardName,
                             "backImage",
@@ -204,41 +155,22 @@ 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);
 
-            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 store = providerData != null ? providerData.get("name") : 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 && !barcodeTypeString.isEmpty()) {
+            if (barcodeTypeString != null) {
                 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);
                 }
             }
 
-            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);
-            }
+            long loyaltyCardInternalId = DBHelper.insertLoyaltyCard(database, store, note, null, BigDecimal.valueOf(0), null, cardId, null, barcodeType, null, 0, null);
 
             if (loyaltyCardData.containsKey("frontImage")) {
                 Utils.saveCardImage(context, (Bitmap) loyaltyCardData.get("frontImage"), (int) loyaltyCardInternalId, ImageLocationType.front);
@@ -265,7 +197,7 @@ public class StocardImporter implements Importer {
         return true;
     }
 
-    private HashMap<String, HashMap<String, Object>> appendToHashMap(HashMap<String, HashMap<String, Object>> loyaltyCardHashMap, String cardID, String key, Object value) {
+    private HashMap<String, HashMap<String, Object>> appendToLoyaltyCardHashMap(HashMap<String, HashMap<String, Object>> loyaltyCardHashMap, String cardID, String key, Object value) {
         HashMap<String, Object> loyaltyCardData = loyaltyCardHashMap.get(cardID);
         if (loyaltyCardData == null) {
             loyaltyCardData = new HashMap<>();

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

@@ -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(),0);
+            DBHelper.insertLoyaltyCard(database, store, "", expiry, balance, balanceType, cardId, null, barcodeType, headerColor, 0, Utils.getUnixTime());
         }
 
         bufferedReader.close();

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 String getCardViewOrientation() {
-        return getString(R.string.settings_key_card_orientation, getResString(R.string.settings_key_follow_system_orientation));
+    public boolean getLockBarcodeScreenOrientation() {
+        return getBoolean(R.string.settings_key_lock_barcode_orientation, false);
     }
 
     public boolean getKeepScreenOn() {
@@ -102,12 +102,4 @@ public class Settings {
     public boolean getDisableLockscreenWhileViewingCard() {
         return getBoolean(R.string.settings_key_disable_lockscreen_while_viewing_card, true);
     }
-
-    public boolean getOledDark() {
-        return getBoolean(R.string.settings_key_oled_dark, false);
-    }
-
-    public String getColor() {
-        return getString(R.string.setting_key_theme_color, mContext.getResources().getString(R.string.settings_key_system_theme));
-    }
 }

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

@@ -6,12 +6,6 @@ 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;
@@ -20,6 +14,11 @@ 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;
@@ -130,28 +129,16 @@ public class SettingsActivity extends CatimaAppCompatActivity {
                 return true;
             });
 
-            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));
+            Preference colorPreference = findPreference(getResources().getString(R.string.setting_key_theme_color));
             assert colorPreference != null;
             colorPreference.setOnPreferenceChangeListener((preference, o) -> {
                 refreshActivity(true);
                 return true;
             });
-            if (!DynamicColors.isDynamicColorAvailable()) {
-                colorPreference.setEntryValues(R.array.color_values_no_dynamic);
-                colorPreference.setEntries(R.array.color_value_strings_no_dynamic);
-            }
+            localePreference.setOnPreferenceChangeListener((preference, newValue) -> {
+                refreshActivity(true);
+                return true;
+            });
         }
 
         private void refreshActivity(boolean reloadMain) {

app/src/main/res/anim/slide_in_left.xml

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

app/src/main/res/anim/slide_in_right.xml

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

app/src/main/res/anim/slide_out_left.xml

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

app/src/main/res/anim/slide_out_right.xml

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

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

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

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

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

app/src/main/res/drawable/ic_arrow_back_white.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="M10,6L8.59,7.41 13.17,12l-4.58,4.59L10,18l6,-6z"/>
+    <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>

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

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

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

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

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

@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="?attr/colorControlNormal"
+<vector android:height="24dp" android:tint="#FFFFFF"
     android:viewportHeight="24" android:viewportWidth="24"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="@android:color/white" android:pathData="M7,10l5,5 5,-5z"/>

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

@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="?attr/colorControlNormal"
+<vector android:height="24dp" android:tint="#FFFFFF"
     android:viewportHeight="24" android:viewportWidth="24"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="@android:color/white" android:pathData="M7,14l5,-5 5,5z"/>

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

@@ -1,5 +0,0 @@
-<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="M15.41,7.41L14,6l-6,6 6,6 1.41,-1.41L10.83,12z"/>
-</vector>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,27 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M53.26,40.92l14.35,-6.39l2.86,6.42"
-      android:strokeAlpha="0.4"
-      android:fillAlpha="0.4"/>
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M36.14,40.95l2.86,-6.42l14.24,6.34"
-      android:strokeAlpha="0.4"
-      android:fillAlpha="0.4"/>
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M40.01,37.17l7.73,3.44H38.48l1.53,-3.44m26.58,0 l1.53,3.44H58.86l7.73,-3.44M39,34.53l-2.86,6.42v1.66H70.47V40.95L67.61,34.53 53.27,40.92l-0.02,-0.05L39,34.53Z"/>
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M74.07,51.23l4.93,1.41l-6.44,22.48l-37.61,-10.79l39.13,0l0,-13.11z"
-      android:strokeAlpha="0.7"
-      android:fillAlpha="0.7"/>
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M34.94,40.95C31.66,40.95 29,46.19 29,52.64s2.66,11.69 5.94,11.69L74.07,64.34L74.07,40.95ZM41.21,51.08 L40.15,50.02 44.43,45.74 48.71,50.02 47.65,51.08 44.43,47.86ZM58.02,56.56a3.11,3.11 0,0 1,-2.93 2.05,3.15 3.15,0 0,1 -0.55,-0.05 3.11,3.11 0,0 1,-1.83 -1.04,3.12 3.12,0 0,1 -5.3,-0.96 0.75,0.75 0,0 1,1.41 -0.51,1.62 1.62,0 0,0 3.14,-0.55 0.75,0.75 0,0 1,1.5 0,1.62 1.62,0 0,0 3.14,0.55 0.75,0.75 0,0 1,1.41 0.51ZM64.14,51.08 L60.92,47.86L57.71,51.08l-1.06,-1.06 4.28,-4.28 4.28,4.28Z"/>
-</vector>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,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="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"/>
+    <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"/>
 </vector>

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

@@ -10,13 +10,15 @@
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:theme="@style/AppTheme.AppBarOverlay">
 
-        <com.google.android.material.appbar.MaterialToolbar
+        <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-            style="?attr/toolbarStyle" />
+            android:background="?attr/colorPrimary"
+            app:popupTheme="@style/AppTheme.PopupOverlay"/>
 
     </com.google.android.material.appbar.AppBarLayout>
 
@@ -44,6 +46,7 @@
                     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" />
@@ -58,12 +61,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"
@@ -83,6 +86,7 @@
                     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" />
@@ -97,12 +101,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"
@@ -122,6 +126,7 @@
                     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" />
@@ -138,12 +143,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"
@@ -163,6 +168,7 @@
                     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" />
@@ -179,12 +185,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"
@@ -204,6 +210,7 @@
                     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" />
@@ -219,12 +226,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"
@@ -244,6 +251,7 @@
                     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" />
@@ -259,12 +267,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"
@@ -284,6 +292,7 @@
                     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" />
@@ -299,12 +308,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"
@@ -324,6 +333,7 @@
                     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" />
@@ -339,12 +349,12 @@
                     android:padding="2dp"/>
 
                 <TextView
-                    android:importantForAccessibility="no"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_margin="8dp"
                     android:fontFamily="sans-serif-medium"
                     android:text="@string/arrow"
+                    android:textColor="@color/colorSecondaryText"
                     android:textSize="20sp"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"

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

@@ -7,15 +7,14 @@
     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"
-        android:layout_margin="16dp"
+        app:srcCompat="@drawable/save_24dp"
         android:contentDescription="@string/save"
-        app:srcCompat="@drawable/ic_done" />
+        android:layout_margin="16dp" />
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -23,13 +22,15 @@
 
         <com.google.android.material.appbar.AppBarLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content"
+            android:theme="@style/AppTheme.AppBarOverlay">
 
-            <com.google.android.material.appbar.MaterialToolbar
+            <androidx.appcompat.widget.Toolbar
                 android:id="@+id/toolbar"
                 android:layout_width="match_parent"
                 android:layout_height="?attr/actionBarSize"
-                style="?attr/toolbarStyle" />
+                android:background="?attr/colorPrimary"
+                app:popupTheme="@style/AppTheme.PopupOverlay" />
 
             <com.google.android.material.tabs.TabLayout
                 android:id="@+id/groups"

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

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

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

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

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

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

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

@@ -9,33 +9,14 @@
     tools:context="protect.card_locker.MainActivity"
     tools:showIn="@layout/main_activity">
 
-    <LinearLayout
-        android:id="@+id/helpSection"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:visibility="gone">
-
-        <ImageView
-            android:layout_width="match_parent"
-            android:layout_height="184dp"
-            android:scaleType="fitCenter"
-            android:src="@drawable/ic_launcher_foreground" />
-
-        <TextView
-            style="@style/TextAppearance.Material3.HeadlineLarge"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:text="@string/welcome" />
-
-        <TextView
-            style="@style/AppTheme.TextView.NoData"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:text="@string/noGiftCards"/>
-    </LinearLayout>
+    <TextView
+        style="@style/AppTheme.TextView.NoData"
+        android:id="@+id/helpText"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:gravity="center"
+        android:text="@string/noGiftCards"
+        android:visibility="gone"/>
 
     <TextView
         style="@style/AppTheme.TextView.NoData"
@@ -45,7 +26,7 @@
         android:gravity="center"
         android:text="@string/noMatchingGiftCards"
         android:visibility="gone"/>
-
+    
     <TextView
         style="@style/AppTheme.TextView.NoData"
         android:id="@+id/noGroupCardsText"
@@ -61,9 +42,8 @@
         app:spanCount="@integer/main_view_card_columns"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:paddingBottom="80dp"
-        android:clipToPadding="false"
         android:scrollbars="vertical"
+        android:background="@color/mainLoyaltyCardBackground"
         android:visibility="gone"/>
 
 </RelativeLayout>

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

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

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

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

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

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

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

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

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

@@ -12,19 +12,21 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="end|bottom"
-        android:layout_margin="16dp"
+        app:srcCompat="@drawable/save_24dp"
         android:contentDescription="@string/save"
-        app:srcCompat="@drawable/ic_done" />
+        android:layout_margin="16dp" />
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:theme="@style/AppTheme.AppBarOverlay">
 
-        <com.google.android.material.appbar.MaterialToolbar
+        <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-            style="?attr/toolbarStyle" />
+            android:background="?attr/colorPrimary"
+            app:popupTheme="@style/AppTheme.PopupOverlay" />
 
         <com.google.android.material.tabs.TabLayout
             android:id="@+id/tabs"
@@ -37,7 +39,7 @@
             <com.google.android.material.tabs.TabItem
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/options"/>
+                android:text="@string/barcode"/>
             <com.google.android.material.tabs.TabItem
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -48,6 +50,7 @@
 
     <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"
@@ -73,7 +76,8 @@
                         app:cardCornerRadius="4dp"
                         android:paddingHorizontal="@dimen/inputPadding"
                         app:cardElevation="0dp"
-                        app:cardBackgroundColor="@android:color/transparent">
+                        app:cardBackgroundColor="@android:color/transparent"
+                        android:outlineProvider="none">
 
                         <ImageView
                             android:id="@+id/thumbnail"
@@ -82,17 +86,6 @@
                             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
@@ -135,95 +128,6 @@
                     </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"
@@ -257,7 +161,6 @@
                     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"
@@ -337,6 +240,99 @@
                     </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"
@@ -373,8 +369,7 @@
                             android:minHeight="50dp"
                             android:contentDescription="@string/frontImageDescription"
                             android:scaleType="fitCenter"
-                            app:srcCompat="@drawable/ic_camera_white"
-                            android:background="?attr/colorPrimary" />
+                            app:srcCompat="@drawable/ic_camera_white" />
 
                     </com.google.android.material.card.MaterialCardView>
                 </LinearLayout>
@@ -409,8 +404,7 @@
                             android:minHeight="50dp"
                             android:contentDescription="@string/backImageDescription"
                             android:scaleType="fitCenter"
-                            app:srcCompat="@drawable/ic_camera_white"
-                            android:background="?attr/colorPrimary" />
+                            app:srcCompat="@drawable/ic_camera_white" />
 
                     </com.google.android.material.card.MaterialCardView>
                 </LinearLayout>

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

@@ -18,13 +18,11 @@
             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"
@@ -37,7 +35,6 @@
                 app:layout_constraintTop_toTopOf="parent" />
 
             <ImageView
-                android:importantForAccessibility="no"
                 android:id="@+id/selected_thumbnail"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
@@ -47,15 +44,13 @@
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
-                app:srcCompat="@drawable/ic_done"
-                android:background="@color/md_theme_dark_onSelected" />
+                app:srcCompat="@drawable/ic_done" />
 
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:id="@+id/star"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_gravity="end"
-                tools:ignore="ExtraText">
+                android:layout_gravity="end">
 
                 <ImageView
                     android:id="@+id/star_background"
@@ -63,7 +58,7 @@
                     android:layout_height="@dimen/cardThumbnailSize"
                     android:layout_gravity="end"
                     android:alpha="0.5"
-                    android:contentDescription="@string/starred"
+                    android:contentDescription="@string/starImage"
                     android:elevation="4dp"
                     android:visibility="visible"
                     app:layout_constraintEnd_toEndOf="parent"
@@ -72,7 +67,6 @@
                     tools:ignore="ImageContrastCheck" />
 
                 <ImageView
-                    android:importantForAccessibility="no"
                     android:id="@+id/star_border"
                     android:layout_width="@dimen/cardThumbnailSize"
                     android:layout_height="@dimen/cardThumbnailSize"
@@ -83,38 +77,11 @@
                     android:visibility="visible"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintTop_toTopOf="parent"
-                    app:srcCompat="@drawable/ic_unstarred_black"
+                    app:srcCompat="@drawable/ic_unstarred_white"
                     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
@@ -200,6 +167,5 @@
             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>

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

@@ -8,6 +8,234 @@
     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"
@@ -16,15 +244,17 @@
         android:clipChildren="false"
         android:clipToPadding="false"
         android:fitsSystemWindows="true"
-        android:weightSum="1.0">
+        android:weightSum="1.0"
+        >
 
-        <com.google.android.material.appbar.MaterialToolbar
+        <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar_landscape"
             android:layout_width="fill_parent"
             android:layout_height="?actionBarSize"
             android:background="@android:color/transparent"
             android:fitsSystemWindows="false"
             android:paddingTop="0dp"
+            android:theme="@style/CardView.ActionBarTheme"
             android:visibility="gone"
             app:contentInsetStart="72.0dip"
             app:layout_collapseMode="pin" />
@@ -60,6 +290,7 @@
                 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" />
 
@@ -76,202 +307,5 @@
         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>

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

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

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

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

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

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

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

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

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

@@ -3,18 +3,19 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:fitsSystemWindows="true">
+    android:layout_height="match_parent">
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:theme="@style/AppTheme.AppBarOverlay">
 
-        <com.google.android.material.appbar.MaterialToolbar
+        <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-            style="?attr/toolbarStyle" />
+            android:background="?attr/colorPrimary"
+            app:popupTheme="@style/AppTheme.PopupOverlay"/>
 
     </com.google.android.material.appbar.AppBarLayout>
 

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

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

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

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

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

@@ -2,6 +2,20 @@
 <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"
@@ -9,48 +23,11 @@
         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="never"/>
+        app:showAsAction="ifRoom"/>
+
 </menu>

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

@@ -2,46 +2,19 @@
 <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" />
-
-    <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>
+</menu>

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

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

app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -2,5 +2,4 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/ic_launcher_background"/>
     <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-    <monochrome android:drawable="@drawable/ic_launcher_monochrome"/>
 </adaptive-icon>

app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -2,5 +2,4 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/ic_launcher_background"/>
     <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-    <monochrome android:drawable="@drawable/ic_launcher_monochrome"/>
 </adaptive-icon>

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

@@ -2,128 +2,85 @@ Sylvia van Os
 Branden Archer
 J. Lavoie
 Allan Nordhøy
-solokot
 Heimen Stoffels
-Oğuz Ersen
-Katharine Chui
+solokot
 mondstern
+Katharine Chui
+Oğuz Ersen
 IllusiveMan196
-Altonss
-StoyanDimitrov
 Petr Novák
-Joel A
-Michael Moroni
 Taco
 Gediminas Murauskas
-SlavekB
+Joel A
+StoyanDimitrov
 Nyatsuki
+Altonss
 Samantaz Fox
-laralem
 arno-github
 Ankit Tiwari
 Sergio Paredes
-huuhaa
+laralem
 arshbeerSingh
-Quentin PAGÈS
+huuhaa
 Miha Frangež
-sr093906
-Freddo espresso
-mdvhimself
-Maciej Błędkowski
+Michael Moroni
 Olivia (Zoe)
 betsythefc
-Silvério Santos
 waffshappen
-ati3
-Giovanni
-Jane Kong
+sr093906
 K. Herbert
-Magnitudee
-Still Hsu
+Quentin PAGÈS
 String E. Fighter
 Yurical
-rr-vesp
-alajemba-vik
 /usr/local/ΕΨΗΕΛΩΝ
 Adolfo Jayme-Barrientos
 Alessandro Mandelli
 KovalevArtem
-Artem M.
-Astrohops1
 Clonewayx
 D. Domig
 Diego
-Fede Pujol
+Jane Kong
 Lukas Grassauer
 Marnick L'Eau
 Michalis
-Michał
-Neko Nekowazarashi
 Rosdyana Kusuma
-umoenks
+schirinowski
 Thomas Bertels
-Runner
-ce i moa
 inesre
 lgasp
 phlostically
 Aditya Das
-Asier
 Kevin Sicong Jiang
-tfuxu
-Ahmed Saleh
 Airat
-Alexander Ivanov
-sNiXx
-Ashish Yadav
+Andreas Blaser
 BMN
 Biren
-Booc Sylvan
-Colgrave
-Csaba
-Mylou53
-danieluhrinyi
 Kasina Dheeraj
-Donno
-Eric
 Flav
 Franciszek Stefan
-Grzegorz
-HowITsDone
 Izzy
-Jean-Baptiste
-Jean-Luc Tibaux
-krkk
+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
-Titas Pažereckas
-Tom Sawyer
-Tony C
 Tymofii Lytvynenko
-Vancha March
-Yevgeny M
-Avik Kundu
-gbonaspetti
+Tjipke van der Heide
+avikkundu
 opsik
-pooyanazari
 psa-jforestier
 Robin
 sergio
 Marcus
 techwebpd
-tygyh
-unstartdev