Experiment: Use Extended Floating Action Buttons

2025-12-24 15:47:53 -05:00 · 2022-02-03 22:37:25 +01:00
1134 changed files with 6922 additions and 17027 deletions
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -3,12 +3,12 @@ name: Android CI
 on:
  push:
    branches:
-      - main
+      - master
      - staging
      - trying
  pull_request:
    branches:
-      - main
+      - master

 jobs:
  build:
--- a/.github/workflows/autoclose-needs-info.yml
+++ b/.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
--- a/.github/workflows/calibreapp-image-actions.yml
+++ b/.github/workflows/calibreapp-image-actions.yml
@@ -1,8 +1,8 @@
-name: Compress Images on Push to Main
+name: Compress Images on Push to Master
 on:
  push:
    branches:
-      - main
+      - master
    paths:
      - '**.jpg'
      - '**.jpeg'
--- a/.github/workflows/changelog-to-fastlane.yml
+++ b/.github/workflows/changelog-to-fastlane.yml
@@ -2,7 +2,7 @@ name: Convert CHANGELOG to Fastlane
 on:
  push:
    branches:
-      - main
+      - master

 jobs:
  convert_changelog_to_fastlane:
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -0,0 +1,73 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches:
+      - master
+  schedule:
+    - cron: '33 1 * * 4'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'java' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
+        # Learn more:
+        # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v1
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    #- run: |
+    #   make bootstrap
+    #   make release
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1
--- a/.github/workflows/contributors-to-file.yml
+++ b/.github/workflows/contributors-to-file.yml
@@ -6,7 +6,7 @@ on:
 jobs:
  contributors_to_file:
    runs-on: ubuntu-latest
-    if: github.ref == 'refs/heads/main'
+    if: github.ref == 'refs/heads/master'
    name: Write contributors to file
    steps:
    - name: Checkout repo
--- a/.github/workflows/gradle-wrapper-validation.yml
+++ b/.github/workflows/gradle-wrapper-validation.yml
@@ -1,10 +0,0 @@
-name: "Validate Gradle Wrapper"
-on: [push, pull_request]
-
-jobs:
-  validation:
-    name: "Validation"
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - uses: gradle/wrapper-validation-action@v1
--- a/.gitignore
+++ b/.gitignore
@@ -8,8 +8,3 @@ captures/
 **/release
 **/debug
 app/*.log
-
-# Bundle
-/.bundle/
-/vendor/bundle
-/lib/bundler/man/
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,98 +1,6 @@
 # Changelog

-## v2.22.1 - 119
-
- Use Material You colours on more devices (Google library update)
-
-## v2.22.0 - 118
-
- Support setting start of card validity
- Fix Stocard import (Stocard's export format changed)
-
-## v2.21.2 - 117
-
- Remove unnecessary permissions
- Target Android 13
-
-## v2.21.1 - 116
-
- Fix quick spend dialog not allowing , separator
- Support loading image from file manager
-
-## v2.21.0 - 115
-
- Open image in gallery on long-press
- Apply Material style to dialogs
- Support creating card by sharing an image to Catima
- Add quick spend button to card screen
-
-## 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)
+## Unreleased - 101

 - Fix cropper not using theme colour
 - Fix minor theming issues
@@ -618,7 +526,7 @@ Additional features/improvements:
 ## v0.7 - 7 (2016-07-14)

 - Long-click of a card brings up option to copy card ID to the clipboard. ([pull #49](https://github.com/brarcher/loyalty-card-locker/issues/49))
- Back button on Import/Export view now works, moving user to main view
+- Back button on Input/Export view now works, moving user to main view

 ## v0.6 - 6 (2016-05-23)

--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -8,20 +8,7 @@ to the rules described here, but by following the instructions below you
 should have a much easier time getting your work merged with the upstream
 project.

-## Translation Changes
-
-Translation changes are managed through [Weblate](https://hosted.weblate.org/projects/catima/).
-Please do not supply translation updates directly through GitHub.
-
-Weblate requires an account to translate changes, so please log in before
-you start translating.
-
-While using Weblate, please do not ignore any of its warnings. They exist
-for good reason.
-
-## Code Changes
-
-### Test Your Code
+## Test Your Code

 There are four possible tests you can run to verify your code.  The first
 is unit tests, which check the basic functionality of the application, and
@@ -41,14 +28,14 @@ and SpotBugs, run using:
 The final check is by testing the application on a live device and verifying
 the basic functionality works as expected.

-### Make Sure Your Code is Tested
+## Make Sure Your Code is Tested

 The Catima code uses a fair number of unit tests to verify that
 the basic functionality is working. Submissions which add functionality
 or significantly change the existing code should include additional tests
 to verify the proper operation of the proposed changes.

-### Explain Your Work
+## Explain Your Work

 At the top of every patch you should include a description of the problem you
 are trying to solve, how you solved it, and why you chose the solution you
@@ -57,7 +44,7 @@ if you can describe/include a reproducer for the problem in the description as
 well as instructions on how to test for the bug and verify that it has been
 fixed.

-### Sign Your Work
+## Sign Your Work

 The sign-off is a simple line at the end of the patch description, which
 certifies that you wrote it or otherwise have the right to pass it on as an
@@ -95,10 +82,10 @@ your real name, saying:

 	Signed-off-by: Random J Developer <random@developer.example.org>

-### Submit Patch(es) for Review
+## Submit Patch(es) for Review

 Finally, you will need to submit your patches so that they can be reviewed
 and potentially merged into the main Catima repository. The preferred
 way to do this is to submit a Pull Request to the Catima project.
-Changes need to apply cleanly onto the main branch and pass all
+Changes need to apply cleanly onto the master branch and pass all
 unit tests and produce no errors during static analysis.
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,30 +1,29 @@
 GEM
  remote: https://rubygems.org/
  specs:
-    CFPropertyList (3.0.6)
-      rexml
-    addressable (2.8.1)
-      public_suffix (>= 2.0.2, < 6.0)
+    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.701.0)
-    aws-sdk-core (3.170.0)
+    aws-partitions (1.501.0)
+    aws-sdk-core (3.121.0)
      aws-eventstream (~> 1, >= 1.0.2)
-      aws-partitions (~> 1, >= 1.651.0)
-      aws-sigv4 (~> 1.5)
-      jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.62.0)
-      aws-sdk-core (~> 3, >= 3.165.0)
+      aws-partitions (~> 1, >= 1.239.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.119.0)
-      aws-sdk-core (~> 3, >= 3.165.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.102.0)
+      aws-sdk-core (~> 3, >= 3.120.0)
      aws-sdk-kms (~> 1)
      aws-sigv4 (~> 1.4)
-    aws-sigv4 (1.5.2)
+    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)
@@ -34,20 +33,19 @@ GEM
      rake (>= 12.0.0, < 14.0.0)
    domain_name (0.5.20190701)
      unf (>= 0.0.5, < 1.0.0)
-    dotenv (2.8.1)
-    emoji_regex (3.2.3)
-    excon (0.98.0)
-    faraday (1.10.3)
+    dotenv (2.7.6)
+    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.211.0)
+    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.32.0)
-      google-apis-core (>= 0.9.1, < 2.a)
-    google-apis-core (0.10.0)
+    google-apis-androidpublisher_v3 (0.11.0)
+      google-apis-core (>= 0.4, < 2.a)
+    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.16.0)
-      google-apis-core (>= 0.9.1, < 2.a)
-    google-apis-playcustomapp_v1 (0.12.0)
-      google-apis-core (>= 0.9.1, < 2.a)
-    google-apis-storage_v1 (0.19.0)
-      google-apis-core (>= 0.9.0, < 2.a)
+    google-apis-iamcredentials_v1 (0.7.0)
+      google-apis-core (>= 0.4, < 2.a)
+    google-apis-playcustomapp_v1 (0.5.0)
+      google-apis-core (>= 0.4, < 2.a)
+    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.3.0)
-    google-cloud-storage (1.44.0)
-      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.19.0)
+      google-apis-storage_v1 (~> 0.1)
      google-cloud-core (~> 1.6)
      googleauth (>= 0.16.2, < 2.a)
      mini_mime (~> 1.0)
-    googleauth (1.3.0)
-      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.2)
-    json (2.6.3)
-    jwt (2.6.0)
+    jmespath (1.4.0)
+    json (2.5.1)
+    jwt (2.2.3)
    memoist (0.16.2)
-    mini_magick (4.12.0)
-    mini_mime (1.1.2)
+    mini_magick (4.11.0)
+    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 (5.0.1)
+    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,18 +168,18 @@ GEM
    ruby2_keywords (0.0.5)
    rubyzip (2.3.2)
    security (0.1.3)
-    signet (0.17.0)
+    signet (0.16.0)
      addressable (~> 2.8)
-      faraday (>= 0.17.5, < 3.a)
+      faraday (>= 0.17.3, < 2.0)
      jwt (>= 1.5, < 3.0)
      multi_json (~> 1.10)
-    simctl (1.6.10)
+    simctl (1.6.8)
      CFPropertyList
      naturally
    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,11 +187,11 @@ GEM
    uber (0.1.0)
    unf (0.1.4)
      unf_ext
-    unf_ext (0.0.8.2)
-    unicode-display_width (1.8.0)
-    webrick (1.8.1)
+    unf_ext (0.0.8)
+    unicode-display_width (1.7.0)
+    webrick (1.7.0)
    word_wrap (1.0.0)
-    xcodeproj (1.22.0)
+    xcodeproj (1.21.0)
      CFPropertyList (>= 2.3.3, < 4.0)
      atomos (~> 0.1.3)
      claide (>= 1.0.2, < 2.0)
@@ -215,4 +210,4 @@ DEPENDENCIES
  fastlane

 BUNDLED WITH
-   2.3.26
+   2.1.4
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,9 +1,7 @@
 import com.github.spotbugs.snom.SpotBugsTask

-plugins {
-    id 'com.android.application'
-    id 'com.github.spotbugs'
-}
+apply plugin: 'com.android.application'
+apply plugin: 'com.github.spotbugs'

 spotbugs {
    ignoreFailures = false
@@ -13,14 +11,15 @@ spotbugs {
 }

 android {
-    compileSdk 33
+    compileSdkVersion 31
+    buildToolsVersion "31.0.0"

    defaultConfig {
        applicationId "me.hackerchick.catima"
-        minSdk 21
-        targetSdk 33
-        versionCode 119
-        versionName "2.22.1"
+        minSdkVersion 21
+        targetSdkVersion 31
+        versionCode 100
+        versionName "2.14.1"

        vectorDrawables.useSupportLibrary true
        multiDexEnabled true
@@ -38,10 +37,6 @@ android {
        }
    }

-    buildFeatures {
-        viewBinding true
-    }
-
    bundle {
        language {
            enableSplit = false
@@ -58,6 +53,10 @@ android {
        targetCompatibility JavaVersion.VERSION_11
    }

+    lintOptions {
+        disable "GoogleAppIndexingWarning", "ButtonStyle", "AlwaysShowAction",
+                "MissingTranslation", "MissingPrefix"
+    }

    sourceSets {
        test {
@@ -77,41 +76,37 @@ android {
            includeAndroidResources true
        }
    }
-    lint {
-        lintConfig file('lint.xml')
-    }
-    namespace 'protect.card_locker'
 }

 dependencies {
 // AndroidX
-    implementation 'androidx.appcompat:appcompat:1.6.1'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    implementation 'androidx.exifinterface:exifinterface:1.3.6'
+    implementation 'androidx.appcompat:appcompat:1.4.1'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
+    implementation 'androidx.exifinterface:exifinterface:1.3.3'
    implementation 'androidx.palette:palette:1.0.0'
    implementation 'androidx.preference:preference:1.2.0'
-    implementation 'com.google.android.material:material:1.8.0'
+    implementation 'com.google.android.material:material:1.5.0'
    implementation 'com.github.yalantis:ucrop:2.2.8'
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.3'
+    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-beta01'

 // Third-party
    implementation 'com.journeyapps:zxing-android-embedded:4.3.0@aar'
-    implementation 'com.google.zxing:core:3.5.1'
+    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.5'
+    implementation 'net.lingala.zip4j:zip4j:2.9.1'

 // SpotBugs
    implementation 'io.wcm.tooling.spotbugs:io.wcm.tooling.spotbugs.annotations:1.0.0'

 // Testing
-    testImplementation 'androidx.test:core:1.5.0'
+    testImplementation 'androidx.test:core:1.4.0'
    testImplementation 'junit:junit:4.13.2'
-    testImplementation 'org.robolectric:robolectric:4.10'
+    testImplementation 'org.robolectric:robolectric:4.7.3'
 }

 tasks.withType(SpotBugsTask) {
--- a/app/config/spotbugs/exclude.xml
+++ b/app/config/spotbugs/exclude.xml
@@ -6,8 +6,5 @@
    <Match>
        <Class name="~.*Manifest\$.*"/>
    </Match>
-    <Match>
-        <Class name="~.*Binding" />
-    </Match>

 </FindBugsFilter>
--- a/app/lint.xml
+++ b/app/lint.xml
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<lint>
-    <issue id="AlwaysShowAction" severity="ignore" />
-    <issue id="ButtonStyle" severity="ignore" />
-    <issue id="GoogleAppIndexingWarning" severity="ignore" />
-    <issue id="MissingTranslation" severity="ignore" />
-    <issue id="MissingPrefix" severity="ignore" />
-</lint>
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools">
+    xmlns:tools="http://schemas.android.com/tools"
+    package="protect.card_locker">

    <uses-sdk tools:overrideLibrary="com.google.zxing.client.android" />

    <uses-permission android:name="android.permission.CAMERA" />
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" android:maxSdkVersion="23" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />

    <uses-feature
        android:name="android.hardware.camera"
@@ -31,12 +33,6 @@

                <category android:name="android.intent.category.LAUNCHER" />
            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.SEND" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:mimeType="image/*" />
-            </intent-filter>
        </activity>
        <activity
            android:name=".AboutActivity"
@@ -106,39 +102,7 @@
        <activity
            android:name=".ImportExportActivity"
            android:label="@string/importExport"
-            android:exported="true"
-            android:theme="@style/AppTheme.NoActionBar">
-
-            <!-- ZIP Intent Filter -->
-            <intent-filter
-                android:label="@string/importCards">
-                <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:mimeType="application/zip" />
-                <data android:scheme="content"/>
-                <data android:host="*"/>
-            </intent-filter>
-
-            <!-- JSON Intent Filter -->
-            <intent-filter
-                android:label="@string/importCards">
-                <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:mimeType="application/json" />
-                <data android:scheme="content"/>
-                <data android:host="*"/>
-            </intent-filter>
-
-            <!-- CSV Intent Filter -->
-            <intent-filter
-                android:label="@string/importCards">
-                <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:scheme="content"/>
-                <data android:host="*" />
-                <data android:mimeType="text/comma-separated-values" />
-            </intent-filter>
-        </activity>
+            android:theme="@style/AppTheme.NoActionBar" />
        <activity
            android:name=".CardShortcutConfigure"
            android:exported="true"
@@ -152,7 +116,7 @@
        </activity>

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

        <provider
@@ -170,5 +134,7 @@
                <action android:name="android.service.controls.ControlsProviderService" />
            </intent-filter>
        </service>
+
    </application>
+
 </manifest>
--- a/app/src/main/java/protect/card_locker/AboutActivity.java
+++ b/app/src/main/java/protect/card_locker/AboutActivity.java
@@ -1,46 +1,135 @@
 package protect.card_locker;

+import android.content.Intent;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.net.Uri;
 import android.os.Bundle;
+import android.util.Log;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.TextView;

-import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.List;

+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.widget.Toolbar;
+import androidx.constraintlayout.widget.ConstraintLayout;
+import androidx.core.text.HtmlCompat;

-import protect.card_locker.databinding.AboutActivityBinding;
-
-public class AboutActivity extends CatimaAppCompatActivity {
-
+public class AboutActivity extends CatimaAppCompatActivity implements View.OnClickListener {
    private static final String TAG = "Catima";
-
-    private AboutActivityBinding binding;
-    private AboutContent content;
+    ConstraintLayout version_history, translate, license, repo, privacy, error, credits, rate;

    @Override
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
-        binding = AboutActivityBinding.inflate(getLayoutInflater());
-        content = new AboutContent(this);
-        setTitle(content.getPageTitle());
-        setContentView(binding.getRoot());
-        setSupportActionBar(binding.toolbar);
-        enableToolbarBackButton();
+        setTitle(R.string.about);
+        setContentView(R.layout.about_activity);
+        Toolbar toolbar = findViewById(R.id.toolbar);
+        setSupportActionBar(toolbar);
+        ActionBar actionBar = getSupportActionBar();
+        if (actionBar != null) {
+            actionBar.setDisplayHomeAsUpEnabled(true);
+        }

-        TextView copyright = binding.creditsSub;
-        copyright.setText(content.getCopyright());
-        TextView versionHistory = binding.versionHistorySub;
-        versionHistory.setText(content.getVersionHistory());
+        StringBuilder contributors = new StringBuilder().append("<br/>");

-        binding.versionHistory.setTag("https://catima.app/changelog/");
-        binding.translate.setTag("https://hosted.weblate.org/engage/catima/");
-        binding.license.setTag("https://github.com/CatimaLoyalty/Android/blob/main/LICENSE");
-        binding.repo.setTag("https://github.com/CatimaLoyalty/Android/");
-        binding.privacy.setTag("https://catima.app/privacy-policy/");
-        binding.reportError.setTag("https://github.com/CatimaLoyalty/Android/issues");
-        binding.rate.setTag("https://play.google.com/store/apps/details?id=me.hackerchick.catima");
+        BufferedReader reader = new BufferedReader(new InputStreamReader(getResources().openRawResource(R.raw.contributors), StandardCharsets.UTF_8));

-        bindClickListeners();
+        try {
+            while (true) {
+                String tmp = reader.readLine();
+
+                if (tmp == null || tmp.isEmpty()) {
+                    reader.close();
+                    break;
+                }
+
+                contributors.append("<br/>");
+                contributors.append(tmp);
+            }
+        } catch (IOException ignored) {
+        }
+
+        final List<ThirdPartyInfo> USED_LIBRARIES = new ArrayList<>();
+        USED_LIBRARIES.add(new ThirdPartyInfo("Color Picker", "https://github.com/jaredrummler/ColorPicker", "Apache 2.0"));
+        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("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"));
+
+        final List<ThirdPartyInfo> USED_ASSETS = new ArrayList<>();
+        USED_ASSETS.add(new ThirdPartyInfo("Android icons", "https://fonts.google.com/icons?selected=Material+Icons", "Apache 2.0"));
+
+        StringBuilder libs = new StringBuilder().append("<br/>");
+        for (ThirdPartyInfo entry : USED_LIBRARIES) {
+            libs.append("<br/><a href=\"").append(entry.url()).append("\">").append(entry.name()).append("</a> (").append(entry.license()).append(")");
+        }
+
+        StringBuilder resources = new StringBuilder().append("<br/>");
+        for (ThirdPartyInfo entry : USED_ASSETS) {
+            resources.append("<br/><a href=\"").append(entry.url()).append("\">").append(entry.name()).append("</a> (").append(entry.license()).append(")");
+        }
+
+        String appName = getString(R.string.app_name);
+        int year = Calendar.getInstance().get(Calendar.YEAR);
+
+        String version = "?";
+        try {
+            PackageInfo pi = getPackageManager().getPackageInfo(getPackageName(), 0);
+            version = pi.versionName;
+        } catch (PackageManager.NameNotFoundException e) {
+            Log.w(TAG, "Package name not found", e);
+        }
+
+        TextView copyright = findViewById(R.id.credits_sub);
+        copyright.setText(String.format(getString(R.string.app_copyright_fmt), year));
+        TextView vHistory = findViewById(R.id.version_history_sub);
+        vHistory.setText(String.format(getString(R.string.debug_version_fmt), version));
+
+        setTitle(String.format(getString(R.string.about_title_fmt), appName));
+
+        version_history = findViewById(R.id.version_history);
+        translate = findViewById(R.id.translate);
+        license = findViewById(R.id.license);
+        repo = findViewById(R.id.repo);
+        privacy = findViewById(R.id.privacy);
+        error = findViewById(R.id.report_error);
+        credits = findViewById(R.id.credits);
+        rate = findViewById(R.id.rate);
+
+        version_history.setOnClickListener(this);
+        translate.setOnClickListener(this);
+        license.setOnClickListener(this);
+        repo.setOnClickListener(this);
+        privacy.setOnClickListener(this);
+        error.setOnClickListener(this);
+        rate.setOnClickListener(this);
+
+        StringBuilder contributorInfo = new StringBuilder();
+        contributorInfo.append(HtmlCompat.fromHtml(String.format(getString(R.string.app_contributors), contributors.toString()), HtmlCompat.FROM_HTML_MODE_COMPACT));
+        contributorInfo.append("\n\n");
+        contributorInfo.append(getString(R.string.app_copyright_old));
+        contributorInfo.append("\n\n");
+        contributorInfo.append(HtmlCompat.fromHtml(String.format(getString(R.string.app_libraries), libs.toString()), HtmlCompat.FROM_HTML_MODE_COMPACT));
+        contributorInfo.append("\n\n");
+        contributorInfo.append(HtmlCompat.fromHtml(String.format(getString(R.string.app_resources), resources.toString()), HtmlCompat.FROM_HTML_MODE_COMPACT));
+
+        credits.setOnClickListener(view -> new AlertDialog.Builder(this)
+                .setTitle(R.string.credits)
+                .setMessage(contributorInfo.toString())
+                .setPositiveButton(R.string.ok, (dialogInterface, i) -> {
+                })
+                .show());
    }

    @Override
@@ -53,47 +142,31 @@ public class AboutActivity extends CatimaAppCompatActivity {
    }

    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-        content.destroy();
-        clearClickListeners();
-        binding = null;
+    public void onClick(View view) {
+        int id = view.getId();
+
+        String url;
+        if (id == R.id.version_history) {
+            url = "https://catima.app/changelog/";
+        } 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";
+        } else if (id == R.id.repo) {
+            url = "https://github.com/CatimaLoyalty/Android/";
+        } else if (id == R.id.privacy) {
+            url = "https://catima.app/privacy-policy/";
+        } else if (id == R.id.report_error) {
+            url = "https://github.com/CatimaLoyalty/Android/issues";
+        } else if (id == R.id.rate) {
+            url = "https://play.google.com/store/apps/details?id=me.hackerchick.catima";
+        } else {
+            return;
+        }
+
+        Intent intent = new Intent(Intent.ACTION_VIEW);
+        intent.setData(Uri.parse(url));
+        startActivity(intent);
    }

-    private void bindClickListeners() {
-        View.OnClickListener openExternalBrowser = view -> {
-            Object tag = view.getTag();
-            if (tag instanceof String && ((String) tag).startsWith("https://")) {
-                (new OpenWebLinkHandler()).openBrowser(this, (String) tag);
-            }
-        };
-        binding.versionHistory.setOnClickListener(openExternalBrowser);
-        binding.translate.setOnClickListener(openExternalBrowser);
-        binding.license.setOnClickListener(openExternalBrowser);
-        binding.repo.setOnClickListener(openExternalBrowser);
-        binding.privacy.setOnClickListener(openExternalBrowser);
-        binding.reportError.setOnClickListener(openExternalBrowser);
-        binding.rate.setOnClickListener(openExternalBrowser);
-
-        binding.credits.setOnClickListener(view -> showCredits());
-    }
-
-    private void clearClickListeners() {
-        binding.versionHistory.setOnClickListener(null);
-        binding.translate.setOnClickListener(null);
-        binding.license.setOnClickListener(null);
-        binding.repo.setOnClickListener(null);
-        binding.privacy.setOnClickListener(null);
-        binding.reportError.setOnClickListener(null);
-        binding.rate.setOnClickListener(null);
-        binding.credits.setOnClickListener(null);
-    }
-
-    private void showCredits() {
-        new MaterialAlertDialogBuilder(this)
-                .setTitle(R.string.credits)
-                .setMessage(content.getContributorInfo())
-                .setPositiveButton(R.string.ok, null)
-                .show();
-    }
 }
--- a/app/src/main/java/protect/card_locker/AboutContent.java
+++ b/app/src/main/java/protect/card_locker/AboutContent.java
@@ -1,111 +0,0 @@
-package protect.card_locker;
-
-import android.content.Context;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
-import android.util.Log;
-
-import androidx.core.text.HtmlCompat;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.List;
-
-public class AboutContent {
-
-    public static final String TAG = "Catima";
-
-    public Context context;
-
-    public AboutContent(Context context) {
-        this.context = context;
-    }
-
-    public void destroy() {
-        this.context = null;
-    }
-
-    public String getPageTitle() {
-        return String.format(context.getString(R.string.about_title_fmt), context.getString(R.string.app_name));
-    }
-
-    public String getAppVersion() {
-        String version = "?";
-        try {
-            PackageInfo pi = context.getPackageManager().getPackageInfo(context.getPackageName(), 0);
-            version = pi.versionName;
-        } catch (PackageManager.NameNotFoundException e) {
-            Log.w(TAG, "Package name not found", e);
-        }
-
-        return version;
-    }
-
-    public int getCurrentYear() {
-        return Calendar.getInstance().get(Calendar.YEAR);
-    }
-
-    public String getCopyright() {
-        return String.format(context.getString(R.string.app_copyright_fmt), getCurrentYear());
-    }
-
-    public String getContributors() {
-        String contributors;
-        try {
-            contributors = "<br/>" + Utils.readTextFile(context, R.raw.contributors);
-        }  catch (IOException ignored) {
-            return "";
-        }
-        return contributors.replace("\n", "<br />");
-    }
-
-    public String getThirdPartyLibraries() {
-        final List<ThirdPartyInfo> usedLibraries = new ArrayList<>();
-        usedLibraries.add(new ThirdPartyInfo("Color Picker", "https://github.com/jaredrummler/ColorPicker", "Apache 2.0"));
-        usedLibraries.add(new ThirdPartyInfo("Commons CSV", "https://commons.apache.org/proper/commons-csv/", "Apache 2.0"));
-        usedLibraries.add(new ThirdPartyInfo("NumberPickerPreference", "https://github.com/invissvenska/NumberPickerPreference", "GNU LGPL 3.0"));
-        usedLibraries.add(new ThirdPartyInfo("uCrop", "https://github.com/Yalantis/uCrop", "Apache 2.0"));
-        usedLibraries.add(new ThirdPartyInfo("Zip4j", "https://github.com/srikanth-lingala/zip4j", "Apache 2.0"));
-        usedLibraries.add(new ThirdPartyInfo("ZXing", "https://github.com/zxing/zxing", "Apache 2.0"));
-        usedLibraries.add(new ThirdPartyInfo("ZXing Android Embedded", "https://github.com/journeyapps/zxing-android-embedded", "Apache 2.0"));
-
-        StringBuilder result = new StringBuilder("<br/>");
-        for (ThirdPartyInfo entry : usedLibraries) {
-            result.append("<br/>")
-                .append(entry.toHtml());
-        }
-
-        return result.toString();
-    }
-
-    public String getUsedThirdPartyAssets() {
-        final List<ThirdPartyInfo> usedAssets = new ArrayList<>();
-        usedAssets.add(new ThirdPartyInfo("Android icons", "https://fonts.google.com/icons?selected=Material+Icons", "Apache 2.0"));
-
-        StringBuilder result = new StringBuilder().append("<br/>");
-        for (ThirdPartyInfo entry : usedAssets) {
-            result.append("<br/>")
-                    .append(entry.toHtml());
-        }
-
-        return result.toString();
-    }
-
-    public String getContributorInfo() {
-        StringBuilder contributorInfo = new StringBuilder();
-        contributorInfo.append(HtmlCompat.fromHtml(String.format(context.getString(R.string.app_contributors), getContributors()), HtmlCompat.FROM_HTML_MODE_COMPACT));
-        contributorInfo.append("\n\n");
-        contributorInfo.append(context.getString(R.string.app_copyright_old));
-        contributorInfo.append("\n\n");
-        contributorInfo.append(HtmlCompat.fromHtml(String.format(context.getString(R.string.app_libraries), getThirdPartyLibraries()), HtmlCompat.FROM_HTML_MODE_COMPACT));
-        contributorInfo.append("\n\n");
-        contributorInfo.append(HtmlCompat.fromHtml(String.format(context.getString(R.string.app_resources), getUsedThirdPartyAssets()), HtmlCompat.FROM_HTML_MODE_COMPACT));
-
-        return contributorInfo.toString();
-    }
-
-    public String getVersionHistory() {
-        return String.format(context.getString(R.string.debug_version_fmt), getAppVersion());
-    }
-}
--- a/app/src/main/java/protect/card_locker/BarcodeImageWriterTask.java
+++ b/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;
    }

--- a/app/src/main/java/protect/card_locker/BarcodeSelectorActivity.java
+++ b/app/src/main/java/protect/card_locker/BarcodeSelectorActivity.java
@@ -19,8 +19,6 @@ import java.util.ArrayList;
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.widget.Toolbar;

-import protect.card_locker.databinding.BarcodeSelectorActivityBinding;
-
 /**
 * This activity is callable and will allow a user to enter
 * barcode data and generate all barcodes possible for
@@ -28,7 +26,6 @@ import protect.card_locker.databinding.BarcodeSelectorActivityBinding;
 * data and type will be returned to the caller.
 */
 public class BarcodeSelectorActivity extends CatimaAppCompatActivity implements BarcodeSelectorAdapter.BarcodeSelectorListener {
-    private BarcodeSelectorActivityBinding binding;
    private static final String TAG = "Catima";

    // Result this activity will return
@@ -43,15 +40,17 @@ public class BarcodeSelectorActivity extends CatimaAppCompatActivity implements
    @Override
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
-        binding = BarcodeSelectorActivityBinding.inflate(getLayoutInflater());
        setTitle(R.string.selectBarcodeTitle);
-        setContentView(binding.getRoot());
-        Toolbar toolbar = binding.toolbar;
+        setContentView(R.layout.barcode_selector_activity);
+        Toolbar toolbar = findViewById(R.id.toolbar);
        setSupportActionBar(toolbar);
-        enableToolbarBackButton();
+        ActionBar actionBar = getSupportActionBar();
+        if (actionBar != null) {
+            actionBar.setDisplayHomeAsUpEnabled(true);
+        }

-        EditText cardId = binding.cardId;
-        ListView mBarcodeList = binding.barcodes;
+        EditText cardId = findViewById(R.id.cardId);
+        ListView mBarcodeList = findViewById(R.id.barcodes);
        mAdapter = new BarcodeSelectorAdapter(this, new ArrayList<>(), this);
        mBarcodeList.setAdapter(mAdapter);

@@ -67,7 +66,7 @@ public class BarcodeSelectorActivity extends CatimaAppCompatActivity implements
                    runOnUiThread(() -> {
                        generateBarcodes(s.toString());

-                        View noBarcodeButtonView = binding.noBarcode;
+                        View noBarcodeButtonView = findViewById(R.id.noBarcode);
                        setButtonListener(noBarcodeButtonView, s.toString());
                        noBarcodeButtonView.setEnabled(s.length() > 0);
                    });
--- a/app/src/main/java/protect/card_locker/BarcodeSelectorAdapter.java
+++ b/app/src/main/java/protect/card_locker/BarcodeSelectorAdapter.java
@@ -13,7 +13,6 @@ import android.widget.TextView;
 import java.util.ArrayList;

 import protect.card_locker.async.TaskHandler;
-import protect.card_locker.databinding.BarcodeLayoutBinding;

 public class BarcodeSelectorAdapter extends ArrayAdapter<CatimaBarcodeWithValue> {
    private static final String TAG = "Catima";
@@ -52,10 +51,9 @@ public class BarcodeSelectorAdapter extends ArrayAdapter<CatimaBarcodeWithValue>
        if (convertView == null) {
            viewHolder = new ViewHolder();
            LayoutInflater inflater = LayoutInflater.from(getContext());
-            BarcodeLayoutBinding barcodeLayoutBinding = BarcodeLayoutBinding.inflate(inflater, parent, false);
-            convertView = barcodeLayoutBinding.getRoot();
-            viewHolder.image = barcodeLayoutBinding.barcodeImage;
-            viewHolder.text = barcodeLayoutBinding.barcodeName;
+            convertView = inflater.inflate(R.layout.barcode_layout, parent, false);
+            viewHolder.image = convertView.findViewById(R.id.barcodeImage);
+            viewHolder.text = convertView.findViewById(R.id.barcodeName);
            convertView.setTag(viewHolder);
        } else {
            viewHolder = (ViewHolder) convertView.getTag();
@@ -78,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
@@ -92,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);
        }
    }
--- a/app/src/main/java/protect/card_locker/CardShortcutConfigure.java
+++ b/app/src/main/java/protect/card_locker/CardShortcutConfigure.java
@@ -4,68 +4,55 @@ 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;
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;

-import protect.card_locker.databinding.SimpleToolbarListActivityBinding;
-
 /**
 * The configuration screen for creating a shortcut.
 */
-public class CardShortcutConfigure extends CatimaAppCompatActivity implements LoyaltyCardCursorAdapter.CardAdapterListener {
-    private SimpleToolbarListActivityBinding binding;
+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) {
        super.onCreate(bundle);
-        binding = SimpleToolbarListActivityBinding.inflate(getLayoutInflater());
+
        mDatabase = new DBHelper(this).getReadableDatabase();

        // Set the result to CANCELED.  This will cause nothing to happen if the
        // aback button is pressed.
        setResult(RESULT_CANCELED);

-        setContentView(binding.getRoot());
-        Toolbar toolbar = binding.toolbar;
+        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 = binding.list;
+        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);

@@ -78,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) {
--- a/app/src/main/java/protect/card_locker/CardsOnPowerScreenService.java
+++ b/app/src/main/java/protect/card_locker/CardsOnPowerScreenService.java
@@ -1,5 +1,6 @@
 package protect.card_locker;

+import android.annotation.SuppressLint;
 import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
@@ -15,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 {

@@ -39,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);
@@ -68,9 +69,10 @@ public class CardsOnPowerScreenService extends ControlsProviderService {
            subscriber.onSubscribe(new NoOpSubscription());
            for (String controlId : controlIds) {
                Control control;
-                Integer cardId = this.controlIdToCardId(controlId);
-                LoyaltyCard card = DBHelper.getLoyaltyCard(mDatabase, cardId);
-                if (card != null) {
+
+                try {
+                    Integer cardId = this.controlIdToCardId(controlId);
+                    LoyaltyCard card = DBHelper.getLoyaltyCard(mDatabase, cardId);
                    Intent openIntent = new Intent(this, LoyaltyCardViewActivity.class)
                            .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
                            .putExtra("id", card.id);
@@ -83,7 +85,7 @@ public class CardsOnPowerScreenService extends ControlsProviderService {
                            .setControlTemplate(new StatelessTemplate(controlId))
                            .setCustomIcon(Icon.createWithBitmap(getIcon(this, card)))
                            .build();
-                } else {
+                } catch (NullPointerException ignored) {
                    Intent mainScreenIntent = new Intent(this, MainActivity.class)
                            .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
                    PendingIntent pendingIntent = PendingIntent.getActivity(getBaseContext(), -1, mainScreenIntent, PendingIntent.FLAG_IMMUTABLE);
@@ -135,7 +137,7 @@ public class CardsOnPowerScreenService extends ControlsProviderService {
        closePowerScreenOnAndroid11();
    }

-    @SuppressWarnings({"MissingPermission", "deprecation"})
+    @SuppressLint({"MissingPermission", "deprecation"})
    private void closePowerScreenOnAndroid11() {
        // Android 12 will auto-close the power screen, but earlier versions won't
        // Lint complains about this but on Android 11 the permission is not needed
--- a/app/src/main/java/protect/card_locker/CatimaAppCompatActivity.java
+++ b/app/src/main/java/protect/card_locker/CatimaAppCompatActivity.java
@@ -6,11 +6,8 @@ import android.os.Build;
 import android.os.Bundle;
 import android.view.View;

-import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AppCompatActivity;
-import androidx.core.view.WindowInsetsControllerCompat;

 public class CatimaAppCompatActivity extends AppCompatActivity {
    @Override
@@ -22,7 +19,11 @@ public class CatimaAppCompatActivity extends AppCompatActivity {
    @Override
    protected void onCreate(@Nullable Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
-        Utils.patchColors(this);
+        // XXX on the splash screen activity, aka the main activity, this has to be executed after applying dynamic colors, not before
+        // so running this only on non main for now
+        if (!this.getClass().getSimpleName().equals(MainActivity.class.getSimpleName())) {
+            Utils.patchOledDarkTheme(this);
+        }
    }

    @Override
@@ -30,27 +31,17 @@ public class CatimaAppCompatActivity extends AppCompatActivity {
        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) {
-            View decorView = getWindow().getDecorView();
-            WindowInsetsControllerCompat wic = new WindowInsetsControllerCompat(getWindow(), decorView);
-            wic.setAppearanceLightStatusBars(!darkMode);
            getWindow().setStatusBarColor(Color.TRANSPARENT);
+            getWindow().getDecorView().setSystemUiVisibility(Utils.isDarkModeEnabled(this) ? 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));
+            getWindow().setStatusBarColor(Utils.isDarkModeEnabled(this) ? 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);
-    }
-
-    protected void enableToolbarBackButton() {
-        ActionBar actionBar = getSupportActionBar();
-        if (actionBar != null) {
-            actionBar.setDisplayHomeAsUpEnabled(true);
+        // the splash screen activity needs the fix regardless to solve a dynamic color api issue
+        if (!this.getClass().getSimpleName().equals(MainActivity.class.getSimpleName())) {
+            Utils.postPatchOledDarkTheme(this);
        }
    }
-
-    public void onMockedRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
-    }
 }
--- a/app/src/main/java/protect/card_locker/CatimaBarcode.java
+++ b/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;
    }
--- a/app/src/main/java/protect/card_locker/DBHelper.java
+++ b/app/src/main/java/protect/card_locker/DBHelper.java
@@ -21,7 +21,7 @@ import java.util.List;
 public class DBHelper extends SQLiteOpenHelper {
    public static final String DATABASE_NAME = "Catima.db";
    public static final int ORIGINAL_DATABASE_VERSION = 1;
-    public static final int DATABASE_VERSION = 16;
+    public static final int DATABASE_VERSION = 14;

    public static class LoyaltyCardDbGroups {
        public static final String TABLE = "groups";
@@ -33,7 +33,6 @@ public class DBHelper extends SQLiteOpenHelper {
        public static final String TABLE = "cards";
        public static final String ID = "_id";
        public static final String STORE = "store";
-        public static final String VALID_FROM = "validfrom";
        public static final String EXPIRY = "expiry";
        public static final String BALANCE = "balance";
        public static final String BALANCE_TYPE = "balancetype";
@@ -46,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 {
@@ -73,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);
    }
@@ -96,7 +88,6 @@ public class DBHelper extends SQLiteOpenHelper {
                LoyaltyCardDbIds.ID + " INTEGER primary key autoincrement," +
                LoyaltyCardDbIds.STORE + " TEXT not null," +
                LoyaltyCardDbIds.NOTE + " TEXT not null," +
-                LoyaltyCardDbIds.VALID_FROM + " INTEGER," +
                LoyaltyCardDbIds.EXPIRY + " INTEGER," +
                LoyaltyCardDbIds.BALANCE + " TEXT not null DEFAULT '0'," +
                LoyaltyCardDbIds.BALANCE_TYPE + " TEXT," +
@@ -106,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 + "(" +
@@ -312,15 +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' ");
-        }
-
-        if (oldVersion < 16 && newVersion >= 16) {
-            db.execSQL("ALTER TABLE " + LoyaltyCardDbIds.TABLE
-                    + " ADD COLUMN " + LoyaltyCardDbIds.VALID_FROM + " INTEGER");
-        }
    }

    private static ContentValues generateFTSContentValues(final int id, final String store, final String note) {
@@ -365,17 +346,16 @@ public class DBHelper extends SQLiteOpenHelper {
    }

    public static long insertLoyaltyCard(
-            final SQLiteDatabase database, final String store, final String note, final Date validFrom,
-            final Date expiry, final BigDecimal balance, final Currency balanceType, final String cardId,
+            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
        ContentValues contentValues = new ContentValues();
        contentValues.put(LoyaltyCardDbIds.STORE, store);
        contentValues.put(LoyaltyCardDbIds.NOTE, note);
-        contentValues.put(LoyaltyCardDbIds.VALID_FROM, validFrom != null ? validFrom.getTime() : null);
        contentValues.put(LoyaltyCardDbIds.EXPIRY, expiry != null ? expiry.getTime() : null);
        contentValues.put(LoyaltyCardDbIds.BALANCE, balance.toString());
        contentValues.put(LoyaltyCardDbIds.BALANCE_TYPE, balanceType != null ? balanceType.getCurrencyCode() : null);
@@ -385,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
@@ -399,10 +378,9 @@ public class DBHelper extends SQLiteOpenHelper {

    public static long insertLoyaltyCard(
            final SQLiteDatabase database, final int id, final String store, final String note,
-            final Date validFrom, 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 Date expiry, final BigDecimal balance, final Currency balanceType,
+            final String cardId, final String barcodeId, final CatimaBarcode barcodeType,
+            final Integer headerColor, final int starStatus, final Long lastUsed) {
        database.beginTransaction();

        // Card
@@ -410,7 +388,6 @@ public class DBHelper extends SQLiteOpenHelper {
        contentValues.put(LoyaltyCardDbIds.ID, id);
        contentValues.put(LoyaltyCardDbIds.STORE, store);
        contentValues.put(LoyaltyCardDbIds.NOTE, note);
-        contentValues.put(LoyaltyCardDbIds.VALID_FROM, validFrom != null ? validFrom.getTime() : null);
        contentValues.put(LoyaltyCardDbIds.EXPIRY, expiry != null ? expiry.getTime() : null);
        contentValues.put(LoyaltyCardDbIds.BALANCE, balance.toString());
        contentValues.put(LoyaltyCardDbIds.BALANCE_TYPE, balanceType != null ? balanceType.getCurrencyCode() : null);
@@ -420,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
@@ -434,17 +410,15 @@ public class DBHelper extends SQLiteOpenHelper {

    public static boolean updateLoyaltyCard(
            SQLiteDatabase database, final int id, final String store, final String note,
-            final Date validFrom, 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 Date expiry, final BigDecimal balance, final Currency balanceType,
+            final String cardId, final String barcodeId, final CatimaBarcode barcodeType,
+            final Integer headerColor) {
        database.beginTransaction();

        // Card
        ContentValues contentValues = new ContentValues();
        contentValues.put(LoyaltyCardDbIds.STORE, store);
        contentValues.put(LoyaltyCardDbIds.NOTE, note);
-        contentValues.put(LoyaltyCardDbIds.VALID_FROM, validFrom != null ? validFrom.getTime() : null);
        contentValues.put(LoyaltyCardDbIds.EXPIRY, expiry != null ? expiry.getTime() : null);
        contentValues.put(LoyaltyCardDbIds.BALANCE, balance.toString());
        contentValues.put(LoyaltyCardDbIds.BALANCE_TYPE, balanceType != null ? balanceType.getCurrencyCode() : null);
@@ -452,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));

@@ -468,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);
@@ -506,15 +467,6 @@ public class DBHelper extends SQLiteOpenHelper {
        return (rowsUpdated == 1);
    }

-    public static boolean updateLoyaltyCardBalance(SQLiteDatabase database, final int id, final BigDecimal newBalance) {
-        ContentValues contentValues = new ContentValues();
-        contentValues.put(LoyaltyCardDbIds.BALANCE, newBalance.toString());
-        int rowsUpdated = database.update(LoyaltyCardDbIds.TABLE, contentValues,
-                whereAttrs(LoyaltyCardDbIds.ID),
-                withArgs(id));
-        return (rowsUpdated == 1);
-    }
-
    public static LoyaltyCard getLoyaltyCard(SQLiteDatabase database, final int id) {
        Cursor data = database.query(LoyaltyCardDbIds.TABLE, null, whereAttrs(LoyaltyCardDbIds.ID), withArgs(id), null, null, null);

@@ -597,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, "");
    }

    /**
@@ -634,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);
    }

    /**
@@ -645,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);
    }

    /**
@@ -657,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 = "";

@@ -680,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 +
@@ -692,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 " +
--- a/app/src/main/java/protect/card_locker/GroupCursorAdapter.java
+++ b/app/src/main/java/protect/card_locker/GroupCursorAdapter.java
@@ -1,24 +1,21 @@
 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;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.ImageButton;
 import android.widget.TextView;

 import androidx.annotation.NonNull;
+import androidx.appcompat.widget.AppCompatImageButton;
 import androidx.recyclerview.widget.RecyclerView;
-
-import protect.card_locker.databinding.GroupLayoutBinding;
 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;

@@ -26,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();

@@ -35,14 +32,9 @@ public class GroupCursorAdapter extends BaseCursorAdapter<GroupCursorAdapter.Gro

    @NonNull
    @Override
-    public GroupCursorAdapter.GroupListItemViewHolder onCreateViewHolder(@NonNull ViewGroup inputParent, int inputViewType) {
-        return new GroupListItemViewHolder(
-                GroupLayoutBinding.inflate(
-                        LayoutInflater.from(inputParent.getContext()),
-                        inputParent,
-                        false
-                )
-        );
+    public GroupCursorAdapter.GroupListItemViewHolder onCreateViewHolder(ViewGroup inputParent, int inputViewType) {
+        View itemView = LayoutInflater.from(inputParent.getContext()).inflate(R.layout.group_layout, inputParent, false);
+        return new GroupListItemViewHolder(itemView);
    }

    public void onBindViewHolder(GroupListItemViewHolder inputHolder, Cursor inputCursor) {
@@ -51,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()));

@@ -88,16 +70,16 @@ public class GroupCursorAdapter extends BaseCursorAdapter<GroupCursorAdapter.Gro

    public static class GroupListItemViewHolder extends RecyclerView.ViewHolder {
        public TextView mName, mCardCount;
-        public ImageButton mMoveUp, mMoveDown, mEdit, mDelete;
+        public AppCompatImageButton mMoveUp, mMoveDown, mEdit, mDelete;

-        public GroupListItemViewHolder(GroupLayoutBinding groupLayoutBinding) {
-            super(groupLayoutBinding.getRoot());
-            mName = groupLayoutBinding.name;
-            mCardCount = groupLayoutBinding.cardCount;
-            mMoveUp = groupLayoutBinding.moveUp;
-            mMoveDown = groupLayoutBinding.moveDown;
-            mEdit = groupLayoutBinding.edit;
-            mDelete = groupLayoutBinding.delete;
+        public GroupListItemViewHolder(View inputView) {
+            super(inputView);
+            mName = inputView.findViewById(R.id.name);
+            mCardCount = inputView.findViewById(R.id.cardCount);
+            mMoveUp = inputView.findViewById(R.id.moveUp);
+            mMoveDown = inputView.findViewById(R.id.moveDown);
+            mEdit = inputView.findViewById(R.id.edit);
+            mDelete = inputView.findViewById(R.id.delete);
        }
    }
 }
--- a/app/src/main/java/protect/card_locker/ImportExportActivity.java
+++ b/app/src/main/java/protect/card_locker/ImportExportActivity.java
@@ -16,33 +16,31 @@ 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.annotation.Nullable;
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.widget.Toolbar;
 import androidx.core.app.ActivityCompat;
 import androidx.core.content.ContextCompat;

-import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+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.databinding.ImportExportActivityBinding;
 import protect.card_locker.importexport.DataFormat;
 import protect.card_locker.importexport.ImportExportResult;
-import protect.card_locker.importexport.ImportExportResultType;

 public class ImportExportActivity extends CatimaAppCompatActivity {
-    private ImportExportActivityBinding binding;
    private static final String TAG = "Catima";

+    private static final int PERMISSIONS_EXTERNAL_STORAGE = 1;
+
    private ImportExportTask importExporter;

    private String importAlertTitle;
@@ -59,16 +57,26 @@ public class ImportExportActivity extends CatimaAppCompatActivity {
    @Override
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
-        binding = ImportExportActivityBinding.inflate(getLayoutInflater());
        setTitle(R.string.importExport);
-        setContentView(binding.getRoot());
-        Toolbar toolbar = binding.toolbar;
+        setContentView(R.layout.import_export_activity);
+        Toolbar toolbar = findViewById(R.id.toolbar);
        setSupportActionBar(toolbar);
-        enableToolbarBackButton();
+        ActionBar actionBar = getSupportActionBar();
+        if (actionBar != null) {
+            actionBar.setDisplayHomeAsUpEnabled(true);
+        }

-        Intent fileIntent = getIntent();
-        if (fileIntent != null && fileIntent.getType() != null) {
-            chooseImportType(false, fileIntent.getData());
+        // If the application does not have permissions to external
+        // storage, ask for it now
+
+        if (ContextCompat.checkSelfPermission(ImportExportActivity.this,
+                Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED ||
+                ContextCompat.checkSelfPermission(ImportExportActivity.this,
+                        Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
+            ActivityCompat.requestPermissions(ImportExportActivity.this,
+                    new String[]{Manifest.permission.READ_EXTERNAL_STORAGE,
+                            Manifest.permission.WRITE_EXTERNAL_STORAGE},
+                    PERMISSIONS_EXTERNAL_STORAGE);
        }

        // would use ActivityResultContracts.CreateDocument() but mime type cannot be set
@@ -89,7 +97,7 @@ public class ImportExportActivity extends CatimaAppCompatActivity {
                startExport(writer, uri, exportPassword.toCharArray(), true);
            } catch (IOException e) {
                Log.e(TAG, "Failed to export file: " + result.toString(), e);
-                onExportComplete(new ImportExportResult(ImportExportResultType.GenericFailure, result.toString()), uri);
+                onExportComplete(ImportExportResult.GenericFailure, uri);
            }

        });
@@ -120,9 +128,9 @@ public class ImportExportActivity extends CatimaAppCompatActivity {
        intentCreateDocumentAction.setType("application/zip");
        intentCreateDocumentAction.putExtra(Intent.EXTRA_TITLE, "catima.zip");

-        Button exportButton = binding.exportButton;
+        Button exportButton = findViewById(R.id.exportButton);
        exportButton.setOnClickListener(v -> {
-            AlertDialog.Builder builder = new MaterialAlertDialogBuilder(ImportExportActivity.this);
+            AlertDialog.Builder builder = new AlertDialog.Builder(ImportExportActivity.this);
            builder.setTitle(R.string.exportPassword);

            FrameLayout container = new FrameLayout(ImportExportActivity.this);
@@ -152,12 +160,12 @@ public class ImportExportActivity extends CatimaAppCompatActivity {
        });

        // Check that there is a file manager available
-        Button importFilesystem = binding.importOptionFilesystemButton;
-        importFilesystem.setOnClickListener(v -> chooseImportType(false, null));
+        Button importFilesystem = findViewById(R.id.importOptionFilesystemButton);
+        importFilesystem.setOnClickListener(v -> chooseImportType(false));

        // Check that there is an app that data can be imported from
-        Button importApplication = binding.importOptionApplicationButton;
-        importApplication.setOnClickListener(v -> chooseImportType(true, null));
+        Button importApplication = findViewById(R.id.importOptionApplicationButton);
+        importApplication.setOnClickListener(v -> chooseImportType(true));
    }

    private void openFileForImport(Uri uri, char[] password) {
@@ -167,13 +175,11 @@ 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);
        }
    }

-    private void chooseImportType(boolean choosePicker,
-                                  @Nullable Uri fileData) {
-
+    private void chooseImportType(boolean choosePicker) {
        List<CharSequence> betaImportOptions = new ArrayList<>();
        betaImportOptions.add("Fidme");
        betaImportOptions.add("Stocard");
@@ -187,7 +193,7 @@ public class ImportExportActivity extends CatimaAppCompatActivity {
            importOptions.add(importOption);
        }

-        AlertDialog.Builder builder = new MaterialAlertDialogBuilder(this);
+        AlertDialog.Builder builder = new AlertDialog.Builder(this);
        builder.setTitle(R.string.chooseImportType)
                .setItems(importOptions.toArray(new CharSequence[importOptions.size()]), (dialog, which) -> {
                    switch (which) {
@@ -225,12 +231,7 @@ public class ImportExportActivity extends CatimaAppCompatActivity {
                            throw new IllegalArgumentException("Unknown DataFormat");
                    }

-                    if (fileData != null) {
-                        openFileForImport(fileData, null);
-                        return;
-                    }
-
-                    new MaterialAlertDialogBuilder(this)
+                    new AlertDialog.Builder(this)
                            .setTitle(importAlertTitle)
                            .setMessage(importAlertMessage)
                            .setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
@@ -297,6 +298,30 @@ public class ImportExportActivity extends CatimaAppCompatActivity {
        mTasks.executeTask(TaskHandler.TYPE.EXPORT, importExporter);
    }

+    @Override
+    public void onRequestPermissionsResult(int requestCode, String permissions[], int[] grantResults) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+
+        if (requestCode == PERMISSIONS_EXTERNAL_STORAGE) {
+            // If request is cancelled, the result arrays are empty.
+            boolean success = grantResults.length > 0;
+
+            for (int grant : grantResults) {
+                if (grant != PackageManager.PERMISSION_GRANTED) {
+                    success = false;
+                }
+            }
+
+            if (!success) {
+                // External storage permission rejected, inform user that
+                // import/export is prevented
+                Toast.makeText(getApplicationContext(), R.string.noExternalStoragePermissionError,
+                        Toast.LENGTH_LONG).show();
+            }
+
+        }
+    }
+
    @Override
    protected void onDestroy() {
        mTasks.flushTaskList(TaskHandler.TYPE.IMPORT, true, false, false);
@@ -317,7 +342,7 @@ public class ImportExportActivity extends CatimaAppCompatActivity {
    }

    private void retryWithPassword(DataFormat dataFormat, Uri uri) {
-        AlertDialog.Builder builder = new MaterialAlertDialogBuilder(this);
+        AlertDialog.Builder builder = new AlertDialog.Builder(this);
        builder.setTitle(R.string.passwordRequired);

        final EditText input = new EditText(this);
@@ -332,51 +357,56 @@ 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();
-
-        if (resultType == ImportExportResultType.BadPassword) {
+        if (result == ImportExportResult.BadPassword) {
            retryWithPassword(dataFormat, path);
            return;
        }

-        AlertDialog.Builder builder = new MaterialAlertDialogBuilder(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());
+        AlertDialog.Builder builder = new AlertDialog.Builder(this);
+
+        int messageId;
+
+        if (result == ImportExportResult.Success) {
+            builder.setTitle(R.string.importSuccessfulTitle);
+            messageId = R.string.importSuccessful;
+        } else {
+            builder.setTitle(R.string.importFailedTitle);
+            messageId = R.string.importFailed;
+        }
+
+        final String message = getResources().getString(messageId);
+
+        builder.setMessage(message);
+        builder.setNeutralButton(R.string.ok, new DialogInterface.OnClickListener() {
+            @Override
+            public void onClick(DialogInterface dialog, int which) {
+                dialog.dismiss();
+            }
+        });

        builder.create().show();
    }

    private void onExportComplete(ImportExportResult result, final Uri path) {
-        ImportExportResultType resultType = result.resultType();
+        AlertDialog.Builder builder = new AlertDialog.Builder(this);

-        AlertDialog.Builder builder = new MaterialAlertDialogBuilder(this);
-        builder.setTitle(resultType == ImportExportResultType.Success ? R.string.exportSuccessfulTitle : R.string.exportFailedTitle);
-        builder.setMessage(buildResultDialogMessage(result, false));
+        int messageId;
+
+        if (result == ImportExportResult.Success) {
+            builder.setTitle(R.string.exportSuccessfulTitle);
+            messageId = R.string.exportSuccessful;
+        } else {
+            builder.setTitle(R.string.exportFailedTitle);
+            messageId = R.string.exportFailed;
+        }
+
+        final String message = getResources().getString(messageId);
+
+        builder.setMessage(message);
        builder.setNeutralButton(R.string.ok, (dialog, which) -> dialog.dismiss());

-        if (resultType == ImportExportResultType.Success) {
+        if (result == ImportExportResult.Success) {
            final CharSequence sendLabel = ImportExportActivity.this.getResources().getText(R.string.sendLabel);

            builder.setPositiveButton(sendLabel, (dialog, which) -> {
--- a/app/src/main/java/protect/card_locker/ImportExportTask.java
+++ b/app/src/main/java/protect/card_locker/ImportExportTask.java
@@ -16,7 +16,6 @@ import java.nio.charset.StandardCharsets;
 import protect.card_locker.async.CompatCallable;
 import protect.card_locker.importexport.DataFormat;
 import protect.card_locker.importexport.ImportExportResult;
-import protect.card_locker.importexport.ImportExportResultType;
 import protect.card_locker.importexport.MultiFormatExporter;
 import protect.card_locker.importexport.MultiFormatImporter;

@@ -64,20 +63,19 @@ 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);

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

        return importResult;
    }

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

--- a/app/src/main/java/protect/card_locker/ImportURIHelper.java
+++ b/app/src/main/java/protect/card_locker/ImportURIHelper.java
@@ -18,7 +18,6 @@ import java.util.List;
 public class ImportURIHelper {
    private static final String STORE = DBHelper.LoyaltyCardDbIds.STORE;
    private static final String NOTE = DBHelper.LoyaltyCardDbIds.NOTE;
-    private static final String VALID_FROM = DBHelper.LoyaltyCardDbIds.VALID_FROM;
    private static final String EXPIRY = DBHelper.LoyaltyCardDbIds.EXPIRY;
    private static final String BALANCE = DBHelper.LoyaltyCardDbIds.BALANCE;
    private static final String BALANCE_TYPE = DBHelper.LoyaltyCardDbIds.BALANCE_TYPE;
@@ -63,7 +62,6 @@ public class ImportURIHelper {
        try {
            // These values are allowed to be null
            CatimaBarcode barcodeType = null;
-            Date validFrom = null;
            Date expiry = null;
            BigDecimal balance = new BigDecimal("0");
            Currency balanceType = null;
@@ -108,10 +106,6 @@ public class ImportURIHelper {
            if (unparsedBalanceType != null && !unparsedBalanceType.equals("")) {
                balanceType = Currency.getInstance(unparsedBalanceType);
            }
-            String unparsedValidFrom = kv.get(VALID_FROM);
-            if (unparsedValidFrom != null && !unparsedValidFrom.equals("")) {
-                validFrom = new Date(Long.parseLong(unparsedValidFrom));
-            }
            String unparsedExpiry = kv.get(EXPIRY);
            if (unparsedExpiry != null && !unparsedExpiry.equals("")) {
                expiry = new Date(Long.parseLong(unparsedExpiry));
@@ -122,8 +116,8 @@ public class ImportURIHelper {
                headerColor = Integer.parseInt(unparsedHeaderColor);
            }

-            return new LoyaltyCard(-1, store, note, validFrom, expiry, balance, balanceType, cardId, barcodeId, barcodeType, headerColor, 0, Utils.getUnixTime(), 100, 0);
-        } catch (NumberFormatException | UnsupportedEncodingException | ArrayIndexOutOfBoundsException ex) {
+            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");
        }
    }
@@ -155,9 +149,6 @@ public class ImportURIHelper {
        if (loyaltyCard.balanceType != null) {
            fragment = appendFragment(fragment, BALANCE_TYPE, loyaltyCard.balanceType.getCurrencyCode());
        }
-        if (loyaltyCard.validFrom != null) {
-            fragment = appendFragment(fragment, VALID_FROM, String.valueOf(loyaltyCard.validFrom.getTime()));
-        }
        if (loyaltyCard.expiry != null) {
            fragment = appendFragment(fragment, EXPIRY, String.valueOf(loyaltyCard.expiry.getTime()));
        }
--- a/app/src/main/java/protect/card_locker/LetterBitmap.java
+++ b/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.
--- a/app/src/main/java/protect/card_locker/LoyaltyCard.java
+++ b/app/src/main/java/protect/card_locker/LoyaltyCard.java
@@ -14,7 +14,6 @@ public class LoyaltyCard implements Parcelable {
    public final int id;
    public final String store;
    public final String note;
-    public final Date validFrom;
    public final Date expiry;
    public final BigDecimal balance;
    public final Currency balanceType;
@@ -30,20 +29,16 @@ 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 validFrom,
-                       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) {
+    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) {
        this.id = id;
        this.store = store;
        this.note = note;
-        this.validFrom = validFrom;
        this.expiry = expiry;
        this.balance = balance;
        this.balanceType = balanceType;
@@ -54,15 +49,12 @@ public class LoyaltyCard implements Parcelable {
        this.starStatus = starStatus;
        this.lastUsed = lastUsed;
        this.zoomLevel = zoomLevel;
-        this.archiveStatus = archiveStatus;
    }

    protected LoyaltyCard(Parcel in) {
        id = in.readInt();
        store = in.readString();
        note = in.readString();
-        long tmpValidFrom = in.readLong();
-        validFrom = tmpValidFrom != -1 ? new Date(tmpValidFrom) : null;
        long tmpExpiry = in.readLong();
        expiry = tmpExpiry != -1 ? new Date(tmpExpiry) : null;
        balance = (BigDecimal) in.readValue(BigDecimal.class.getClassLoader());
@@ -76,7 +68,6 @@ public class LoyaltyCard implements Parcelable {
        starStatus = in.readInt();
        lastUsed = in.readLong();
        zoomLevel = in.readInt();
-        archiveStatus = in.readInt();
    }

    @Override
@@ -84,7 +75,6 @@ public class LoyaltyCard implements Parcelable {
        parcel.writeInt(id);
        parcel.writeString(store);
        parcel.writeString(note);
-        parcel.writeLong(validFrom != null ? validFrom.getTime() : -1);
        parcel.writeLong(expiry != null ? expiry.getTime() : -1);
        parcel.writeValue(balance);
        parcel.writeValue(balanceType);
@@ -95,14 +85,12 @@ public class LoyaltyCard implements Parcelable {
        parcel.writeInt(starStatus);
        parcel.writeLong(lastUsed);
        parcel.writeInt(zoomLevel);
-        parcel.writeInt(archiveStatus);
    }

    public static LoyaltyCard toLoyaltyCard(Cursor cursor) {
        int id = cursor.getInt(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.ID));
        String store = cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.STORE));
        String note = cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.NOTE));
-        long validFromLong = cursor.getLong(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.VALID_FROM));
        long expiryLong = cursor.getLong(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.EXPIRY));
        BigDecimal balance = new BigDecimal(cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.BALANCE)));
        String cardId = cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.CARD_ID));
@@ -110,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);
@@ -118,7 +105,6 @@ public class LoyaltyCard implements Parcelable {

        CatimaBarcode barcodeType = null;
        Currency balanceType = null;
-        Date validFrom = null;
        Date expiry = null;
        Integer headerColor = null;

@@ -130,10 +116,6 @@ public class LoyaltyCard implements Parcelable {
            balanceType = Currency.getInstance(cursor.getString(balanceTypeColumn));
        }

-        if (validFromLong > 0) {
-            validFrom = new Date(validFromLong);
-        }
-
        if (expiryLong > 0) {
            expiry = new Date(expiryLong);
        }
@@ -142,7 +124,7 @@ public class LoyaltyCard implements Parcelable {
            headerColor = cursor.getInt(headerColorColumn);
        }

-        return new LoyaltyCard(id, store, note, validFrom, 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
--- a/app/src/main/java/protect/card_locker/LoyaltyCardCursorAdapter.java
+++ b/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,84 +15,60 @@ import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;

-import com.google.android.material.card.MaterialCardView;
-import com.google.android.material.color.MaterialColors;
-
-import java.math.BigDecimal;
-import java.text.DateFormat;
-import java.util.ArrayList;
-
-import androidx.annotation.NonNull;
 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 protect.card_locker.databinding.LoyaltyCardLayoutBinding;
+import com.google.android.material.card.MaterialCardView;
+
+import java.math.BigDecimal;
+import java.text.DateFormat;
+import java.util.ArrayList;
+import java.util.Currency;
+import java.util.Date;
+
 import protect.card_locker.preferences.Settings;

 public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCursorAdapter.LoyaltyCardListItemViewHolder> {
    private int mCurrentSelectedIndex = -1;
    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() {
        return mShowDetails;
    }

-    @NonNull
    @Override
-    public LoyaltyCardListItemViewHolder onCreateViewHolder(@NonNull ViewGroup inputParent, int inputViewType) {
-        LoyaltyCardLayoutBinding loyaltyCardLayoutBinding = LoyaltyCardLayoutBinding.inflate(
-                LayoutInflater.from(inputParent.getContext()),
-                inputParent,
-                false
-        );
-        return new LoyaltyCardListItemViewHolder(loyaltyCardLayoutBinding, mListener);
+    public LoyaltyCardListItemViewHolder onCreateViewHolder(ViewGroup inputParent, int inputViewType) {
+        View itemView = LayoutInflater.from(inputParent.getContext()).inflate(R.layout.loyalty_card_layout, inputParent, false);
+        return new LoyaltyCardListItemViewHolder(itemView, mListener);
    }

    public LoyaltyCard getCard(int position) {
@@ -115,21 +90,15 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
        }

        if (mShowDetails && !loyaltyCard.balance.equals(new BigDecimal("0"))) {
-            inputHolder.setExtraField(inputHolder.mBalanceField, Utils.formatBalance(mContext, loyaltyCard.balance, loyaltyCard.balanceType), null);
+            inputHolder.setBalanceField(loyaltyCard.balance, loyaltyCard.balanceType);
        } else {
-            inputHolder.setExtraField(inputHolder.mBalanceField, null, null);
-        }
-
-        if (mShowDetails && loyaltyCard.validFrom != null) {
-            inputHolder.setExtraField(inputHolder.mValidFromField, DateFormat.getDateInstance(DateFormat.LONG).format(loyaltyCard.validFrom), Utils.isNotYetValid(loyaltyCard.validFrom) ? Color.RED : null);
-        } else {
-            inputHolder.setExtraField(inputHolder.mValidFromField, null, null);
+            inputHolder.setBalanceField(null, null);
        }

        if (mShowDetails && loyaltyCard.expiry != null) {
-            inputHolder.setExtraField(inputHolder.mExpiryField, DateFormat.getDateInstance(DateFormat.LONG).format(loyaltyCard.expiry), Utils.hasExpired(loyaltyCard.expiry) ? Color.RED : null);
+            inputHolder.setExpiryField(loyaltyCard.expiry);
        } else {
-            inputHolder.setExtraField(inputHolder.mExpiryField, null, null);
+            inputHolder.setExpiryField(null);
        }

        setHeaderHeight(inputHolder, mShowDetails);
@@ -143,7 +112,7 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
        }
        inputHolder.setIconBackgroundColor(loyaltyCard.headerColor != null ? loyaltyCard.headerColor : R.attr.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());
@@ -182,12 +151,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();
            }
@@ -241,34 +212,29 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso

    public class LoyaltyCardListItemViewHolder extends RecyclerView.ViewHolder {

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

        private int mIconBackgroundColor;

+        protected LoyaltyCardListItemViewHolder(View inputView, CardAdapterListener inputListener) {
+            super(inputView);
+            mRow = inputView.findViewById(R.id.row);
+            mDivider = inputView.findViewById(R.id.info_divider);
+            mStoreField = inputView.findViewById(R.id.store);
+            mNoteField = inputView.findViewById(R.id.note);
+            mBalanceField = inputView.findViewById(R.id.balance);
+            mExpiryField = inputView.findViewById(R.id.expiry);

-
-        protected LoyaltyCardListItemViewHolder(LoyaltyCardLayoutBinding loyaltyCardLayoutBinding, CardAdapterListener inputListener) {
-            super(loyaltyCardLayoutBinding.getRoot());
-            View inputView = loyaltyCardLayoutBinding.getRoot();
-            mRow = loyaltyCardLayoutBinding.row;
-            mDivider = loyaltyCardLayoutBinding.infoDivider;
-            mStoreField = loyaltyCardLayoutBinding.store;
-            mNoteField = loyaltyCardLayoutBinding.note;
-            mBalanceField = loyaltyCardLayoutBinding.balance;
-            mValidFromField = loyaltyCardLayoutBinding.validFrom;
-            mExpiryField = loyaltyCardLayoutBinding.expiry;
-            mIconLayout = loyaltyCardLayoutBinding.iconLayout;
-            mCardIcon = loyaltyCardLayoutBinding.thumbnail;
-            mStar = loyaltyCardLayoutBinding.star;
-            mStarBackground = loyaltyCardLayoutBinding.starBackground;
-            mStarBorder = loyaltyCardLayoutBinding.starBorder;
-            mArchived = loyaltyCardLayoutBinding.archivedIcon;
-            mArchivedBackground = loyaltyCardLayoutBinding.archiveBackground;
-            mTickIcon = loyaltyCardLayoutBinding.selectedThumbnail;
+            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);
+            mTickIcon = inputView.findViewById(R.id.selected_thumbnail);
            inputView.setOnLongClickListener(view -> {
                inputListener.onRowClicked(getAdapterPosition());
                inputView.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS);
@@ -276,41 +242,6 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
            });
        }

-        private void setExtraField(TextView field, String text, Integer color) {
-            // If text is null, hide the field
-            // If iconColor is null, use the default text and icon color based on theme
-            if (text == null) {
-                field.setVisibility(View.GONE);
-                field.requestLayout();
-                return;
-            }
-
-            int size = mSettings.getFontSizeMax(mSettings.getSmallFont());
-
-            field.setVisibility(View.VISIBLE);
-            field.setText(text);
-            field.setTextSize(size);
-            field.setTextColor(color != null ? color : MaterialColors.getColor(mContext, R.attr.colorSecondary, ContextCompat.getColor(mContext, mDarkModeEnabled ? R.color.md_theme_dark_secondary : R.color.md_theme_light_secondary)));
-
-            int drawableSize = dpToPx((size * 24) / 14, mContext);
-            mDivider.setVisibility(View.VISIBLE);
-            field.setVisibility(View.VISIBLE);
-            Drawable icon = field.getCompoundDrawables()[0];
-            if (icon != null) {
-                icon.mutate();
-                icon.setBounds(0, 0, drawableSize, drawableSize);
-                field.setCompoundDrawablesRelative(icon, null, null, null);
-
-                if (color != null) {
-                    icon.setColorFilter(BlendModeColorFilterCompat.createBlendModeColorFilterCompat(color, BlendModeCompat.SRC_ATOP));
-                } else {
-                    icon.setColorFilter(BlendModeColorFilterCompat.createBlendModeColorFilterCompat(mDarkModeEnabled ? Color.WHITE : Color.BLACK, BlendModeCompat.SRC_ATOP));
-                }
-            }
-
-            field.requestLayout();
-        }
-
        public void setStoreField(String text) {
            mStoreField.setText(text);
            mStoreField.setTextSize(mSettings.getFontSizeMax(mSettings.getMediumFont()));
@@ -328,7 +259,50 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
            mNoteField.requestLayout();
        }

-        public void toggleCardStateIcon(boolean enableStar, boolean enableArchive, boolean colorByTheme) {
+        public void setBalanceField(BigDecimal balance, Currency balanceType) {
+            if (balance == null) {
+                mBalanceField.setVisibility(View.GONE);
+            } else {
+                int size = mSettings.getFontSizeMax(mSettings.getSmallFont());
+                int drawableSize = dpToPx((size * 24) / 14, mContext);
+                mDivider.setVisibility(View.VISIBLE);
+                mBalanceField.setVisibility(View.VISIBLE);
+                Drawable balanceIcon = mBalanceField.getCompoundDrawables()[0];
+                balanceIcon.setBounds(0, 0, drawableSize, drawableSize);
+                mBalanceField.setCompoundDrawablesRelative(balanceIcon, null, null, null);
+                if (mDarkModeEnabled) {
+                    balanceIcon.setColorFilter(BlendModeColorFilterCompat.createBlendModeColorFilterCompat(Color.WHITE, BlendModeCompat.SRC_ATOP));
+                }
+                mBalanceField.setText(Utils.formatBalance(mContext, balance, balanceType));
+                mBalanceField.setTextSize(size);
+            }
+            mBalanceField.requestLayout();
+        }
+
+        public void setExpiryField(Date expiry) {
+            if (expiry == null) {
+                mExpiryField.setVisibility(View.GONE);
+            } else {
+                int size = mSettings.getFontSizeMax(mSettings.getSmallFont());
+                int drawableSize = dpToPx((size * 24) / 14, mContext);
+                mDivider.setVisibility(View.VISIBLE);
+                mExpiryField.setVisibility(View.VISIBLE);
+                Drawable expiryIcon = mExpiryField.getCompoundDrawables()[0];
+                expiryIcon.setBounds(0, 0, drawableSize, drawableSize);
+                mExpiryField.setCompoundDrawablesRelative(expiryIcon, null, null, null);
+                if (Utils.hasExpired(expiry)) {
+                    expiryIcon.setColorFilter(BlendModeColorFilterCompat.createBlendModeColorFilterCompat(Color.RED, BlendModeCompat.SRC_ATOP));
+                    mExpiryField.setTextColor(Color.RED);
+                } else if (mDarkModeEnabled) {
+                    expiryIcon.setColorFilter(BlendModeColorFilterCompat.createBlendModeColorFilterCompat(Color.WHITE, BlendModeCompat.SRC_ATOP));
+                }
+                mExpiryField.setText(DateFormat.getDateInstance(DateFormat.LONG).format(expiry));
+                mExpiryField.setTextSize(size);
+            }
+            mExpiryField.requestLayout();
+        }
+
+        public void toggleStar(boolean enable, boolean colorByTheme) {
            /* the below code does not work in android 5! hence the change of drawable instead
            boolean needDarkForeground = Utils.needsDarkForeground(mIconBackgroundColor);
            Drawable borderDrawable = mStarBorder.getDrawable().mutate();
@@ -342,33 +316,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_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) {
--- a/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java
+++ b/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java
@@ -5,10 +5,10 @@ import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.DatePickerDialog;
 import android.app.Dialog;
-import android.content.ActivityNotFoundException;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
+import android.content.res.TypedArray;
 import android.database.sqlite.SQLiteDatabase;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
@@ -20,7 +20,6 @@ import android.os.LocaleList;
 import android.text.Editable;
 import android.text.InputType;
 import android.util.Log;
-import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
@@ -38,8 +37,7 @@ import android.widget.Toast;
 import com.google.android.material.chip.Chip;
 import com.google.android.material.chip.ChipGroup;
 import com.google.android.material.color.MaterialColors;
-import com.google.android.material.dialog.MaterialAlertDialogBuilder;
-import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton;
 import com.google.android.material.snackbar.Snackbar;
 import com.google.android.material.tabs.TabLayout;
 import com.jaredrummler.android.colorpicker.ColorPickerDialog;
@@ -53,13 +51,11 @@ 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;
 import java.util.Currency;
 import java.util.Date;
-import java.util.GregorianCalendar;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
@@ -71,22 +67,18 @@ import java.util.concurrent.Callable;
 import androidx.activity.result.ActivityResultLauncher;
 import androidx.activity.result.contract.ActivityResultContracts;
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.annotation.StringRes;
 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;
-import protect.card_locker.databinding.LayoutChipChoiceBinding;
-import protect.card_locker.databinding.LoyaltyCardEditActivityBinding;

 public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
-    private LoyaltyCardEditActivityBinding binding;
    private static final String TAG = "Catima";

    private final String STATE_TAB_INDEX = "savedTab";
@@ -113,26 +105,22 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
    private static final int PERMISSION_REQUEST_CAMERA_IMAGE_FRONT = 100;
    private static final int PERMISSION_REQUEST_CAMERA_IMAGE_BACK = 101;
    private static final int PERMISSION_REQUEST_CAMERA_IMAGE_ICON = 102;
-    private static final int PERMISSION_REQUEST_STORAGE_IMAGE_FRONT = 103;
-    private static final int PERMISSION_REQUEST_STORAGE_IMAGE_BACK = 104;
-    private static final int PERMISSION_REQUEST_STORAGE_IMAGE_ICON = 105;

    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";
    public static final String BUNDLE_BARCODETYPE = "barcodeType";
    public static final String BUNDLE_ADDGROUP = "addGroup";

+    ExtendedFloatingActionButton saveButton;
+
    TabLayout tabs;

    ImageView thumbnail;
-    ImageView thumbnailEditIcon;
    EditText storeFieldEdit;
    EditText noteFieldEdit;
    ChipGroup groupsChips;
-    AutoCompleteTextView validFromField;
    AutoCompleteTextView expiryField;
    EditText balanceField;
    AutoCompleteTextView balanceCurrencyField;
@@ -149,11 +137,8 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {

    Button enterButton;

-    Toolbar toolbar;
-
    int loyaltyCardId;
    boolean updateLoyaltyCard;
-    boolean duplicateFromLoyaltyCardId;
    String cardId;
    String barcodeId;
    String barcodeType;
@@ -211,7 +196,6 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
                (int) (fieldName == LoyaltyCardField.id ? value : loyaltyCard.id),
                (String) (fieldName == LoyaltyCardField.store ? value : loyaltyCard.store),
                (String) (fieldName == LoyaltyCardField.note ? value : loyaltyCard.note),
-                (Date) (fieldName == LoyaltyCardField.validFrom ? value : loyaltyCard.validFrom),
                (Date) (fieldName == LoyaltyCardField.expiry ? value : loyaltyCard.expiry),
                (BigDecimal) (fieldName == LoyaltyCardField.balance ? value : loyaltyCard.balance),
                (Currency) (fieldName == LoyaltyCardField.balanceType ? value : loyaltyCard.balanceType),
@@ -220,9 +204,7 @@ 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
        );
    }

@@ -240,7 +222,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;
@@ -257,7 +238,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
    @Override
    public void onSaveInstanceState(@NonNull Bundle savedInstanceState) {
        super.onSaveInstanceState(savedInstanceState);
-        tabs = binding.tabs;
+        tabs = findViewById(R.id.tabs);
        savedInstanceState.putInt(STATE_TAB_INDEX, tabs.getSelectedTabPosition());
        savedInstanceState.putParcelable(STATE_TEMP_CARD, tempLoyaltyCard);
        savedInstanceState.putInt(STATE_REQUESTED_IMAGE, mRequestedImage);
@@ -294,7 +275,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
    public void onRestoreInstanceState(@NonNull Bundle savedInstanceState) {
        tempLoyaltyCard = savedInstanceState.getParcelable(STATE_TEMP_CARD);
        super.onRestoreInstanceState(savedInstanceState);
-        tabs = binding.tabs;
+        tabs = findViewById(R.id.tabs);
        tabs.selectTab(tabs.getTabAt(savedInstanceState.getInt(STATE_TAB_INDEX)));
        mRequestedImage = savedInstanceState.getInt(STATE_REQUESTED_IMAGE);
        mFrontImageUnsaved = savedInstanceState.getInt(STATE_FRONT_IMAGE_UNSAVED) == 1;
@@ -310,11 +291,14 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
    @Override
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
-        binding = LoyaltyCardEditActivityBinding.inflate(getLayoutInflater());
-        setContentView(binding.getRoot());
-        toolbar = binding.toolbar;
+
+        setContentView(R.layout.loyalty_card_edit_activity);
+        Toolbar toolbar = findViewById(R.id.toolbar);
        setSupportActionBar(toolbar);
-        enableToolbarBackButton();
+        ActionBar actionBar = getSupportActionBar();
+        if (actionBar != null) {
+            actionBar.setDisplayHomeAsUpEnabled(true);
+        }

        mDatabase = new DBHelper(this).getWritableDatabase();

@@ -326,29 +310,26 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
            currencies.put(currency.getSymbol(), currency);
        }

-        tabs = binding.tabs;
-        thumbnail = binding.thumbnail;
-        thumbnailEditIcon = binding.thumbnailEditIcon;
-        storeFieldEdit = binding.storeNameEdit;
-        noteFieldEdit = binding.noteEdit;
-        groupsChips = binding.groupChips;
-        validFromField = binding.validFromField;
-        expiryField = binding.expiryField;
-        balanceField = binding.balanceField;
-        balanceCurrencyField = binding.balanceCurrencyField;
-        cardIdFieldView = binding.cardIdView;
-        barcodeIdField = binding.barcodeIdField;
-        barcodeTypeField = binding.barcodeTypeField;
-        barcodeImage = binding.barcode;
-        barcodeImage.setClipToOutline(true);
-        barcodeImageLayout = binding.barcodeLayout;
-        barcodeCaptureLayout = binding.barcodeCaptureLayout;
-        cardImageFrontHolder = binding.frontImageHolder;
-        cardImageBackHolder = binding.backImageHolder;
-        cardImageFront = binding.frontImage;
-        cardImageBack = binding.backImage;
+        tabs = findViewById(R.id.tabs);
+        thumbnail = findViewById(R.id.thumbnail);
+        storeFieldEdit = findViewById(R.id.storeNameEdit);
+        noteFieldEdit = findViewById(R.id.noteEdit);
+        groupsChips = findViewById(R.id.groupChips);
+        expiryField = findViewById(R.id.expiryField);
+        balanceField = findViewById(R.id.balanceField);
+        balanceCurrencyField = findViewById(R.id.balanceCurrencyField);
+        cardIdFieldView = findViewById(R.id.cardIdView);
+        barcodeIdField = findViewById(R.id.barcodeIdField);
+        barcodeTypeField = findViewById(R.id.barcodeTypeField);
+        barcodeImage = findViewById(R.id.barcode);
+        barcodeImageLayout = findViewById(R.id.barcodeLayout);
+        barcodeCaptureLayout = findViewById(R.id.barcodeCaptureLayout);
+        cardImageFrontHolder = findViewById(R.id.frontImageHolder);
+        cardImageBackHolder = findViewById(R.id.backImageHolder);
+        cardImageFront = findViewById(R.id.frontImage);
+        cardImageBack = findViewById(R.id.backImage);

-        enterButton = binding.enterButton;
+        enterButton = findViewById(R.id.enterButton);

        barcodeImageGenerationFinishedCallback = () -> {
            if (!(boolean) barcodeImage.getTag()) {
@@ -372,9 +353,38 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
            }
        });

-        addDateFieldTextChangedListener(validFromField, R.string.anyDate, R.string.chooseValidFromDate, LoyaltyCardField.validFrom);
+        expiryField.addTextChangedListener(new SimpleTextWatcher() {
+            CharSequence lastValue;

-        addDateFieldTextChangedListener(expiryField, R.string.never, R.string.chooseExpiryDate, LoyaltyCardField.expiry);
+            @Override
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+                lastValue = s;
+            }
+
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+                if (s.toString().equals(getString(R.string.never))) {
+                    expiryField.setTag(null);
+                } else if (s.toString().equals(getString(R.string.chooseExpiryDate))) {
+                    if (!lastValue.toString().equals(getString(R.string.chooseExpiryDate))) {
+                        expiryField.setText(lastValue);
+                    }
+                    DialogFragment datePickerFragment = new DatePickerFragment(LoyaltyCardEditActivity.this, expiryField);
+                    datePickerFragment.show(getSupportFragmentManager(), "datePicker");
+                }
+
+                updateTempState(LoyaltyCardField.expiry, expiryField.getTag());
+            }
+
+            @Override
+            public void afterTextChanged(Editable s) {
+                ArrayList<String> expiryList = new ArrayList<>();
+                expiryList.add(0, getString(R.string.never));
+                expiryList.add(1, getString(R.string.chooseExpiryDate));
+                ArrayAdapter<String> expiryAdapter = new ArrayAdapter<>(LoyaltyCardEditActivity.this, android.R.layout.select_dialog_item, expiryList);
+                expiryField.setAdapter(expiryAdapter);
+            }
+        });

        balanceField.setOnFocusChangeListener((v, hasFocus) -> {
            if (!hasFocus) {
@@ -386,10 +396,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();
                }
@@ -436,10 +447,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));
@@ -491,7 +506,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
                        barcodeIdField.setText(lastValue);
                    }

-                    AlertDialog.Builder builder = new MaterialAlertDialogBuilder(LoyaltyCardEditActivity.this);
+                    AlertDialog.Builder builder = new AlertDialog.Builder(LoyaltyCardEditActivity.this);
                    builder.setTitle(R.string.setBarcodeId);
                    final EditText input = new EditText(LoyaltyCardEditActivity.this);
                    input.setInputType(InputType.TYPE_CLASS_TEXT);
@@ -677,22 +692,9 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
        );

        // 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);
-        }
+        mCropperOptions.setToolbarColor(colorPrimary);
+        mCropperOptions.setStatusBarColor(colorPrimary);
    }

    @Override
@@ -736,8 +738,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);
@@ -755,7 +758,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
                }
            } else {
                // New card, use default values
-                tempLoyaltyCard = new LoyaltyCard(-1, "", "", null, 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);

            }
        }
@@ -763,11 +766,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);
                }
@@ -798,8 +797,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {

        storeFieldEdit.setText(tempLoyaltyCard.store);
        noteFieldEdit.setText(tempLoyaltyCard.note);
-        formatDateField(this, validFromField, tempLoyaltyCard.validFrom);
-        formatDateField(this, expiryField, tempLoyaltyCard.expiry);
+        formatExpiryField(this, expiryField, tempLoyaltyCard.expiry);
        formatBalanceCurrencyField(tempLoyaltyCard.balanceType);
        cardIdFieldView.setText(tempLoyaltyCard.cardId);
        barcodeIdField.setText(tempLoyaltyCard.barcodeId != null ? tempLoyaltyCard.barcodeId : getString(R.string.sameAsCardId));
@@ -817,9 +815,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
            }

            for (Group group : DBHelper.getGroups(mDatabase)) {
-                LayoutChipChoiceBinding chipChoiceBinding = LayoutChipChoiceBinding
-                        .inflate(LayoutInflater.from(groupsChips.getContext()), groupsChips, false);
-                Chip chip = chipChoiceBinding.getRoot();
+                Chip chip = (Chip) getLayoutInflater().inflate(R.layout.layout_chip_choice, groupsChips, false);
                chip.setText(group._id);
                chip.setTag(group);

@@ -848,7 +844,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
@@ -891,34 +896,19 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
        cardImageFrontHolder.setOnClickListener(new ChooseCardImage());
        cardImageBackHolder.setOnClickListener(new ChooseCardImage());

-        FloatingActionButton saveButton = binding.fabSave;
+        saveButton = findViewById(R.id.fabSave);
        saveButton.setOnClickListener(v -> doSave());
        saveButton.bringToFront();

        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 :  R.attr.colorPrimary));
        } else {
            Log.d("setColorFromIcon", "attempting header color change from icon but icon does not exist");
        }
@@ -934,62 +924,13 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
        }
    }

-    protected void addDateFieldTextChangedListener(AutoCompleteTextView dateField, @StringRes int defaultOptionStringId, @StringRes int chooseDateOptionStringId, LoyaltyCardField loyaltyCardField) {
-        dateField.addTextChangedListener(new SimpleTextWatcher() {
-            CharSequence lastValue;
+    protected static void formatExpiryField(Context context, EditText expiryField, Date expiry) {
+        expiryField.setTag(expiry);

-            @Override
-            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-                lastValue = s;
-            }
-
-            @Override
-            public void onTextChanged(CharSequence s, int start, int before, int count) {
-                if (s.toString().equals(getString(defaultOptionStringId))) {
-                    dateField.setTag(null);
-                } else if (s.toString().equals(getString(chooseDateOptionStringId))) {
-                    if (!lastValue.toString().equals(getString(chooseDateOptionStringId))) {
-                        dateField.setText(lastValue);
-                    }
-                    DialogFragment datePickerFragment = new DatePickerFragment(
-                            LoyaltyCardEditActivity.this,
-                            dateField,
-                            // if the expiry date is being set, set date picker's minDate to the 'valid from' date
-                            loyaltyCardField == LoyaltyCardField.expiry ? (Date) validFromField.getTag() : null,
-                            // if the 'valid from' date is being set, set date picker's maxDate to the expiry date
-                            loyaltyCardField == LoyaltyCardField.validFrom ? (Date) expiryField.getTag() : null);
-                    datePickerFragment.show(getSupportFragmentManager(), "datePicker");
-                }
-
-                updateTempState(loyaltyCardField, dateField.getTag());
-            }
-
-            @Override
-            public void afterTextChanged(Editable s) {
-                ArrayList<String> dropdownOptions = new ArrayList<>();
-                dropdownOptions.add(0, getString(defaultOptionStringId));
-                dropdownOptions.add(1, getString(chooseDateOptionStringId));
-                ArrayAdapter<String> dropdownOptionsAdapter = new ArrayAdapter<>(LoyaltyCardEditActivity.this, android.R.layout.select_dialog_item, dropdownOptions);
-                dateField.setAdapter(dropdownOptionsAdapter);
-            }
-        });
-    }
-
-    protected static void formatDateField(Context context, EditText textField, Date date) {
-        textField.setTag(date);
-
-        if (date == null) {
-            String text;
-            if (textField.getId() == R.id.validFromField) {
-                text = context.getString(R.string.anyDate);
-            } else if (textField.getId() == R.id.expiryField) {
-                text = context.getString(R.string.never);
-            } else {
-                throw new IllegalArgumentException("Unknown textField Id " + textField.getId());
-            }
-            textField.setText(text);
+        if (expiry == null) {
+            expiryField.setText(context.getString(R.string.never));
        } else {
-            textField.setText(DateFormat.getDateInstance(DateFormat.LONG).format(date));
+            expiryField.setText(DateFormat.getDateInstance(DateFormat.LONG).format(expiry));
        }
    }

@@ -1010,59 +951,18 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
        super.onRequestPermissionsResult(requestCode, permissions, grantResults);

-        onMockedRequestPermissionsResult(requestCode, permissions, grantResults);
-    }
-
-    public void onMockedRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
-        boolean granted = grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED;
-        Integer failureReason = null;
-
-        if (requestCode == PERMISSION_REQUEST_CAMERA_IMAGE_FRONT) {
-            if (granted) {
-                takePhotoForCard(Utils.CARD_IMAGE_FROM_CAMERA_FRONT);
-                return;
+        if (grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+            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();
            }
-
-            failureReason = R.string.cameraPermissionRequired;
-        } else if (requestCode == PERMISSION_REQUEST_CAMERA_IMAGE_BACK) {
-            if (granted) {
-                takePhotoForCard(Utils.CARD_IMAGE_FROM_CAMERA_BACK);
-                return;
-            }
-
-            failureReason = R.string.cameraPermissionRequired;
-        } else if (requestCode == PERMISSION_REQUEST_CAMERA_IMAGE_ICON) {
-            if (granted) {
-                takePhotoForCard(Utils.CARD_IMAGE_FROM_CAMERA_ICON);
-                return;
-            }
-
-            failureReason = R.string.cameraPermissionRequired;
-        } else if (requestCode == PERMISSION_REQUEST_STORAGE_IMAGE_FRONT) {
-            if (granted) {
-                selectImageFromGallery(Utils.CARD_IMAGE_FROM_FILE_FRONT);
-                return;
-            }
-
-            failureReason = R.string.storageReadPermissionRequired;
-        } else if (requestCode == PERMISSION_REQUEST_STORAGE_IMAGE_BACK) {
-            if (granted) {
-                selectImageFromGallery(Utils.CARD_IMAGE_FROM_FILE_BACK);
-                return;
-            }
-
-            failureReason = R.string.storageReadPermissionRequired;
-        } else if (requestCode == PERMISSION_REQUEST_STORAGE_IMAGE_ICON) {
-            if (granted) {
-                selectImageFromGallery(Utils.CARD_IMAGE_FROM_FILE_ICON);
-                return;
-            }
-
-            failureReason = R.string.storageReadPermissionRequired;
-        }
-
-        if (failureReason != null) {
-            Toast.makeText(this, failureReason, Toast.LENGTH_LONG).show();
        }
    }

@@ -1079,7 +979,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
            return;
        }

-        new MaterialAlertDialogBuilder(this)
+        new AlertDialog.Builder(this)
                .setTitle(R.string.updateBarcodeQuestionTitle)
                .setMessage(R.string.updateBarcodeQuestionText)
                .setPositiveButton(R.string.yes, (dialog, which) -> {
@@ -1113,7 +1013,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
        }

        if (confirmExitDialog == null) {
-            AlertDialog.Builder builder = new MaterialAlertDialogBuilder(this);
+            AlertDialog.Builder builder = new AlertDialog.Builder(this);
            builder.setTitle(R.string.leaveWithoutSaveTitle);
            builder.setMessage(R.string.leaveWithoutSaveConfirmation);
            builder.setPositiveButton(R.string.confirm, (dialog, which) -> {
@@ -1134,24 +1034,6 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
        mPhotoTakerLauncher.launch(photoURI);
    }

-    private void selectImageFromGallery(int type) {
-        mRequestedImage = type;
-
-        Intent photoPickerIntent = new Intent(Intent.ACTION_PICK);
-        photoPickerIntent.setType("image/*");
-        Intent contentIntent = new Intent(Intent.ACTION_GET_CONTENT);
-        contentIntent.setType("image/*");
-        Intent chooserIntent = Intent.createChooser(photoPickerIntent, getString(R.string.addFromImage));
-        chooserIntent.putExtra(Intent.EXTRA_INITIAL_INTENTS, new Intent[] { contentIntent });
-
-        try {
-            mPhotoPickerLauncher.launch(chooserIntent);
-        } catch (ActivityNotFoundException e) {
-            Toast.makeText(getApplicationContext(), R.string.failedLaunchingPhotoPicker, Toast.LENGTH_LONG).show();
-            Log.e(TAG, "No activity found to handle intent", e);
-        }
-    }
-
    class EditCardIdAndBarcode implements View.OnClickListener {
        @Override
        public void onClick(View v) {
@@ -1208,9 +1090,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);

@@ -1233,38 +1112,52 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
            }

            cardOptions.put(getString(R.string.takePhoto), () -> {
-                int permissionRequestType;
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                    int permissionRequestType;

-                if (v.getId() == R.id.frontImageHolder) {
-                    permissionRequestType = PERMISSION_REQUEST_CAMERA_IMAGE_FRONT;
-                } else if (v.getId() == R.id.backImageHolder) {
-                    permissionRequestType = PERMISSION_REQUEST_CAMERA_IMAGE_BACK;
-                } else if (v.getId() == R.id.thumbnail) {
-                    permissionRequestType = PERMISSION_REQUEST_CAMERA_IMAGE_ICON;
+                    if (v.getId() == R.id.frontImageHolder) {
+                        permissionRequestType = PERMISSION_REQUEST_CAMERA_IMAGE_FRONT;
+                    } else if (v.getId() == R.id.backImageHolder) {
+                        permissionRequestType = PERMISSION_REQUEST_CAMERA_IMAGE_BACK;
+                    } else if (v.getId() == R.id.thumbnail) {
+                        permissionRequestType = PERMISSION_REQUEST_CAMERA_IMAGE_ICON;
+                    } else {
+                        throw new IllegalArgumentException("Unknown ID type " + v.getId());
+                    }
+
+                    requestPermissions(new String[]{Manifest.permission.CAMERA}, permissionRequestType);
                } else {
-                    throw new IllegalArgumentException("Unknown ID type " + v.getId());
+                    int cardImageType;
+
+                    if (v.getId() == R.id.frontImageHolder) {
+                        cardImageType = Utils.CARD_IMAGE_FROM_CAMERA_FRONT;
+                    } else if (v.getId() == R.id.backImageHolder) {
+                        cardImageType = Utils.CARD_IMAGE_FROM_CAMERA_BACK;
+                    } else if (v.getId() == R.id.thumbnail) {
+                        cardImageType = Utils.CARD_IMAGE_FROM_CAMERA_ICON;
+                    } else {
+                        throw new IllegalArgumentException("Unknown ID type " + v.getId());
+                    }
+
+                    takePhotoForCard(cardImageType);
                }
-
-                PermissionUtils.requestCameraPermission(LoyaltyCardEditActivity.this, permissionRequestType);
-
                return null;
            });

            cardOptions.put(getString(R.string.addFromImage), () -> {
-                int permissionRequestType;
-
                if (v.getId() == R.id.frontImageHolder) {
-                    permissionRequestType = PERMISSION_REQUEST_STORAGE_IMAGE_FRONT;
+                    mRequestedImage = Utils.CARD_IMAGE_FROM_FILE_FRONT;
                } else if (v.getId() == R.id.backImageHolder) {
-                    permissionRequestType = PERMISSION_REQUEST_STORAGE_IMAGE_BACK;
+                    mRequestedImage = Utils.CARD_IMAGE_FROM_FILE_BACK;
                } else if (v.getId() == R.id.thumbnail) {
-                    permissionRequestType = PERMISSION_REQUEST_STORAGE_IMAGE_ICON;
+                    mRequestedImage = Utils.CARD_IMAGE_FROM_FILE_ICON;
                } else {
                    throw new IllegalArgumentException("Unknown ID type " + v.getId());
                }

-                PermissionUtils.requestStorageReadPermission(LoyaltyCardEditActivity.this, permissionRequestType);
-
+                Intent i = new Intent(Intent.ACTION_PICK);
+                i.setType("image/*");
+                mPhotoPickerLauncher.launch(i);
                return null;
            });

@@ -1280,7 +1173,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
                throw new IllegalArgumentException("Unknown ID type " + v.getId());
            }

-            new MaterialAlertDialogBuilder(LoyaltyCardEditActivity.this)
+            new AlertDialog.Builder(LoyaltyCardEditActivity.this)
                    .setTitle(getString(titleResource))
                    .setItems(cardOptions.keySet().toArray(new CharSequence[cardOptions.size()]), (dialog, which) -> {
                        Iterator<Callable<Void>> callables = cardOptions.values().iterator();
@@ -1294,10 +1187,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();
@@ -1308,17 +1197,11 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
            implements DatePickerDialog.OnDateSetListener {

        final Context context;
-        final EditText textFieldEdit;
-        @Nullable
-        final Date minDate;
-        @Nullable
-        final Date maxDate;
+        final EditText expiryFieldEdit;

-        DatePickerFragment(Context context, EditText textFieldEdit, @Nullable Date minDate, @Nullable Date maxDate) {
+        DatePickerFragment(Context context, EditText expiryFieldEdit) {
            this.context = context;
-            this.textFieldEdit = textFieldEdit;
-            this.minDate = minDate;
-            this.maxDate = maxDate;
+            this.expiryFieldEdit = expiryFieldEdit;
        }

        @NonNull
@@ -1327,7 +1210,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
            // Use the current date as the default date in the picker
            final Calendar c = Calendar.getInstance();

-            Date date = (Date) textFieldEdit.getTag();
+            Date date = (Date) expiryFieldEdit.getTag();
            if (date != null) {
                c.setTime(date);
            }
@@ -1337,30 +1220,15 @@ 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(minDate != null ? minDate.getTime() : getDefaultMinDateOfDatePicker());
-            datePickerDialog.getDatePicker().setMaxDate(maxDate != null ? maxDate.getTime() : getDefaultMaxDateOfDatePicker());
-            return datePickerDialog;
-        }
-
-        private long getDefaultMinDateOfDatePicker() {
-            Calendar minDateCalendar = Calendar.getInstance();
-            minDateCalendar.set(1970, 0, 1);
-            return minDateCalendar.getTimeInMillis();
-        }
-
-        private long getDefaultMaxDateOfDatePicker() {
-            Calendar maxDateCalendar = Calendar.getInstance();
-            maxDateCalendar.set(2100, 11, 31);
-            return maxDateCalendar.getTimeInMillis();
+            return new DatePickerDialog(getActivity(), this, year, month, day);
        }

        public void onDateSet(DatePicker view, int year, int month, int day) {
-            Calendar c = new GregorianCalendar();
+            Calendar c = Calendar.getInstance();
            c.set(Calendar.YEAR, year);
            c.set(Calendar.MONTH, month);
            c.set(Calendar.DAY_OF_MONTH, day);
-            c.set(Calendar.HOUR_OF_DAY, 0);
+            c.set(Calendar.HOUR, 0);
            c.set(Calendar.MINUTE, 0);
            c.set(Calendar.SECOND, 0);
            c.set(Calendar.MILLISECOND, 0);
@@ -1369,7 +1237,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {

            Date date = new Date(unixTime);

-            formatDateField(context, textFieldEdit, date);
+            formatExpiryField(context, expiryFieldEdit, date);
        }
    }

@@ -1399,6 +1267,10 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
            return;
        }

+        // Validation done, save
+        saveButton.setText(R.string.saving);
+        saveButton.setIcon(null);
+
        List<Group> selectedGroups = new ArrayList<>();

        for (Integer chipId : groupsChips.getCheckedChipIds()) {
@@ -1406,40 +1278,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.validFrom, 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.validFrom, 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);
    }
@@ -1448,9 +1321,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);
@@ -1503,22 +1397,13 @@ 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() {
@@ -1549,13 +1434,13 @@ 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, barcodeImageGenerationFinishedCallback);
                            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, barcodeImageGenerationFinishedCallback);
            mTasks.executeTask(TaskHandler.TYPE.BARCODE, barcodeWriter);
        }
    }
@@ -1586,9 +1471,9 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
            return;
        }

-        View cardPart = binding.cardPart;
-        View optionsPart = binding.optionsPart;
-        View picturesPart = binding.picturesPart;
+        View cardPart = findViewById(R.id.cardPart);
+        View optionsPart = findViewById(R.id.optionsPart);
+        View picturesPart = findViewById(R.id.picturesPart);

        if (getString(R.string.card).equals(part)) {
            cardPart.setVisibility(View.VISIBLE);
@@ -1609,14 +1494,4 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
            throw new UnsupportedOperationException();
        }
    }
-
-    private void currencyPrioritizeLocaleSymbols(ArrayList<String> currencyList, Locale locale) {
-        try {
-            String currencySymbol = Currency.getInstance(locale).getSymbol();
-            currencyList.remove(currencySymbol);
-            currencyList.add(0, currencySymbol);
-        } catch (IllegalArgumentException e) {
-            Log.d(TAG, "Could not get currency data for locale info: " + e);
-        }
-    }
 }
--- a/app/src/main/java/protect/card_locker/LoyaltyCardField.java
+++ b/app/src/main/java/protect/card_locker/LoyaltyCardField.java
@@ -4,7 +4,6 @@ public enum LoyaltyCardField {
    id,
    store,
    note,
-    validFrom,
    expiry,
    balance,
    balanceType,
@@ -12,6 +11,5 @@ public enum LoyaltyCardField {
    barcodeId,
    barcodeType,
    headerColor,
-    starStatus,
-    archiveStatus
+    starStatus
 }
--- a/app/src/main/java/protect/card_locker/LoyaltyCardLockerApplication.java
+++ b/app/src/main/java/protect/card_locker/LoyaltyCardLockerApplication.java
@@ -3,6 +3,9 @@ package protect.card_locker;
 import android.app.Application;

 import androidx.appcompat.app.AppCompatDelegate;
+
+import com.google.android.material.color.DynamicColors;
+
 import protect.card_locker.preferences.Settings;

 public class LoyaltyCardLockerApplication extends Application {
@@ -13,5 +16,6 @@ public class LoyaltyCardLockerApplication extends Application {

        Settings settings = new Settings(this);
        AppCompatDelegate.setDefaultNightMode(settings.getTheme());
+        DynamicColors.applyToActivitiesIfAvailable(this);
    }
 }
--- a/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java
+++ b/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java
--- a/app/src/main/java/protect/card_locker/MainActivity.java
+++ b/app/src/main/java/protect/card_locker/MainActivity.java
@@ -9,14 +9,10 @@ import android.content.Intent;
 import android.content.SharedPreferences;
 import android.database.CursorIndexOutOfBoundsException;
 import android.database.sqlite.SQLiteDatabase;
-import android.graphics.Bitmap;
-import android.net.Uri;
 import android.os.Bundle;
-import android.util.DisplayMetrics;
 import android.util.Log;
 import android.util.TypedValue;
 import android.view.GestureDetector;
-import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.MotionEvent;
@@ -26,58 +22,42 @@ import android.widget.Toast;

 import androidx.activity.result.ActivityResultLauncher;
 import androidx.activity.result.contract.ActivityResultContracts;
-import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.view.ActionMode;
 import androidx.appcompat.widget.SearchView;
+import androidx.appcompat.widget.Toolbar;
 import androidx.core.splashscreen.SplashScreen;
 import androidx.recyclerview.widget.RecyclerView;

-import com.google.android.material.dialog.MaterialAlertDialogBuilder;
-import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import com.google.android.material.color.DynamicColors;
+import com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton;
 import com.google.android.material.tabs.TabLayout;

-import java.io.IOException;
 import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;

-import protect.card_locker.databinding.ArchiveActivityBinding;
-import protect.card_locker.databinding.ContentMainBinding;
-import protect.card_locker.databinding.MainActivityBinding;
-import protect.card_locker.databinding.SortingOptionBinding;
 import protect.card_locker.preferences.SettingsActivity;

 public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCardCursorAdapter.CardAdapterListener, GestureDetector.OnGestureListener {
-    private MainActivityBinding binding;
-    private ArchiveActivityBinding archiveActivityBinding;
-    private ContentMainBinding contentMainBinding;
    private static final String TAG = "Catima";
    public static final String RESTART_ACTIVITY_INTENT = "restart_activity_intent";

-    private static final int MEDIUM_SCALE_FACTOR_DIP = 460;
-
    private SQLiteDatabase mDatabase;
    private LoyaltyCardCursorAdapter mAdapter;
    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 TabLayout groupsTabLayout;
-
-    private boolean mArchiveMode;
-    public static final String BUNDLE_ARCHIVE_MODE = "archiveMode";

    private ActivityResultLauncher<Intent> mBarcodeScannerLauncher;
    private ActivityResultLauncher<Intent> mSettingsLauncher;
@@ -148,7 +128,7 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
                inputMode.finish();
                return true;
            } else if (inputItem.getItemId() == R.id.action_delete) {
-                AlertDialog.Builder builder = new MaterialAlertDialogBuilder(MainActivity.this);
+                AlertDialog.Builder builder = new AlertDialog.Builder(MainActivity.this);
                // The following may seem weird, but it is necessary to give translators enough flexibility.
                // For example, in Russian, Android's plural quantity "one" actually refers to "any number ending on 1 but not ending in 11".
                // So while in English the extra non-plural form seems unnecessary duplication, it is necessary to give translators enough flexibility.
@@ -162,18 +142,20 @@ 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);

                        ShortcutHelper.removeShortcut(MainActivity.this, loyaltyCard.id);
                    }

-                    TabLayout.Tab tab = groupsTabLayout.getTabAt(selectedTab);
+                    TabLayout.Tab tab = ((TabLayout) findViewById(R.id.groups)).getTabAt(selectedTab);
                    mGroup = tab != null ? tab.getTag() : null;

-                    updateLoyaltyCardList(true);
+                    updateLoyaltyCardList();

                    dialog.dismiss();
                });
@@ -181,40 +163,6 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
                AlertDialog dialog = builder.create();
                dialog.show();

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

@@ -230,38 +178,35 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard

    @Override
    protected void onCreate(Bundle inputSavedInstanceState) {
-        extractIntentFields(getIntent());
-        SplashScreen.installSplashScreen(this);
        super.onCreate(inputSavedInstanceState);
-        if (!mArchiveMode) {
-            binding = MainActivityBinding.inflate(getLayoutInflater());
-            setTitle(R.string.app_name);
-            setContentView(binding.getRoot());
-            setSupportActionBar(binding.toolbar);
-            groupsTabLayout = binding.groups;
-            contentMainBinding = ContentMainBinding.bind(binding.include.getRoot());
-        } else {
-            archiveActivityBinding = ArchiveActivityBinding.inflate(getLayoutInflater());
-            setTitle(R.string.archiveList);
-            setContentView(archiveActivityBinding.getRoot());
-            setSupportActionBar(archiveActivityBinding.toolbar);
-            groupsTabLayout = archiveActivityBinding.groups;
-            contentMainBinding = ContentMainBinding.bind(archiveActivityBinding.include.getRoot());
-        }
+        SplashScreen.installSplashScreen(this);

-        if(mArchiveMode) {
-            enableToolbarBackButton();
-        }
+        // onPreCreate can't tell this activity uses a material theme due to splash screen, force color application here
+        DynamicColors.applyIfAvailable(this);
+        Utils.patchOledDarkTheme(this);
+        setTitle(R.string.app_name);
+
+        setContentView(R.layout.main_activity);
+
+        // XXX more dynamic color fixing due to splash screen
+        // without this the background color will get stuck with the old color before dynamic color
+        TypedValue typedValue = new TypedValue();
+        getTheme().resolveAttribute(android.R.attr.colorBackground, typedValue, true);
+        findViewById(android.R.id.content).setBackgroundColor(typedValue.data);
+
+        Toolbar toolbar = findViewById(R.id.toolbar);
+        setSupportActionBar(toolbar);

        mDatabase = new DBHelper(this).getWritableDatabase();

+        TabLayout groupsTabLayout = findViewById(R.id.groups);
        groupsTabLayout.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
            @Override
            public void onTabSelected(TabLayout.Tab tab) {
                selectedTab = tab.getPosition();
                Log.d("onTabSelected", "Tab Position " + tab.getPosition());
                mGroup = tab.getTag();
-                updateLoyaltyCardList(false);
+                updateLoyaltyCardList();
                // Store active tab in Shared Preference to restore next app launch
                SharedPreferences activeTabPref = getApplicationContext().getSharedPreferences(
                        getString(R.string.sharedpreference_active_tab),
@@ -286,11 +231,12 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard

        View.OnTouchListener gestureTouchListener = (v, event) -> mGestureDetector.onTouchEvent(event);

-        mHelpSection = contentMainBinding.helpSection;
-        mNoMatchingCardsText = contentMainBinding.noMatchingCardsText;
-        mNoGroupCardsText = contentMainBinding.noGroupCardsText;
-        mCardList = contentMainBinding.list;
+        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);
@@ -300,7 +246,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.
@@ -334,17 +280,21 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
         */

        mBarcodeScannerLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), result -> {
-            // Exit early if the user cancelled the scan (pressed back/home)
-            if (result.getResultCode() != RESULT_OK) {
-                return;
-            }
-
            Intent intent = result.getData();
            BarcodeValues barcodeValues = Utils.parseSetBarcodeActivityResult(Utils.BARCODE_SCAN, result.getResultCode(), intent, this);

-            Bundle inputBundle = intent.getExtras();
-            String group = inputBundle != null ? inputBundle.getString(LoyaltyCardEditActivity.BUNDLE_ADDGROUP) : null;
-            processBarcodeValues(barcodeValues, group);
+            if (!barcodeValues.isEmpty()) {
+                Intent newIntent = new Intent(getApplicationContext(), LoyaltyCardEditActivity.class);
+                Bundle newBundle = new Bundle();
+                newBundle.putString(LoyaltyCardEditActivity.BUNDLE_BARCODETYPE, barcodeValues.format());
+                newBundle.putString(LoyaltyCardEditActivity.BUNDLE_CARDID, barcodeValues.content());
+                Bundle inputBundle = intent.getExtras();
+                if (inputBundle != null && inputBundle.getString(LoyaltyCardEditActivity.BUNDLE_ADDGROUP) != null) {
+                    newBundle.putString(LoyaltyCardEditActivity.BUNDLE_ADDGROUP, inputBundle.getString(LoyaltyCardEditActivity.BUNDLE_ADDGROUP));
+                }
+                newIntent.putExtras(newBundle);
+                startActivity(newIntent);
+            }
        });

        mSettingsLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), result -> {
@@ -361,8 +311,6 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
    protected void onResume() {
        super.onResume();

-        mAdapter.refreshState();
-
        if (mCurrentActionMode != null) {
            mAdapter.clearSelections();
            mCurrentActionMode.finish();
@@ -373,30 +321,21 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
        }

        // Start of active tab logic
+        TabLayout groupsTabLayout = findViewById(R.id.groups);
        updateTabGroups(groupsTabLayout);

-        // Restore selected tab from Shared Preference
+        // Restore settings from Shared Preference
        SharedPreferences activeTabPref = getApplicationContext().getSharedPreferences(
                getString(R.string.sharedpreference_active_tab),
                Context.MODE_PRIVATE);
        selectedTab = activeTabPref.getInt(getString(R.string.sharedpreference_active_tab), 0);
-
-        // Restore sort preferences from Shared Preferences
-        // If one of the sorting prefererences has never been set or is set to an invalid value,
-        // stick to the defaults.
        SharedPreferences sortPref = getApplicationContext().getSharedPreferences(
                getString(R.string.sharedpreference_sort),
                Context.MODE_PRIVATE);
-
-        String orderString = sortPref.getString(getString(R.string.sharedpreference_sort_order), null);
-        String orderDirectionString = sortPref.getString(getString(R.string.sharedpreference_sort_direction), null);
-
-        if (orderString != null && orderDirectionString != null) {
-            try {
-                mOrder = DBHelper.LoyaltyCardOrder.valueOf(orderString);
-                mOrderDirection = DBHelper.LoyaltyCardOrderDirection.valueOf(orderDirectionString);
-            } catch (IllegalArgumentException ignored) {
-            }
+        try {
+            mOrder = DBHelper.LoyaltyCardOrder.valueOf(sortPref.getString(getString(R.string.sharedpreference_sort_order), null));
+            mOrderDirection = DBHelper.LoyaltyCardOrderDirection.valueOf(sortPref.getString(getString(R.string.sharedpreference_sort_direction), null));
+        } catch (IllegalArgumentException | NullPointerException ignored) {
        }

        mGroup = null;
@@ -410,32 +349,26 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
            groupsTabLayout.selectTab(tab);
            assert tab != null;
            mGroup = tab.getTag();
-        } else if (!mArchiveMode) {
-            scaleScreen();
        }
-
-        updateLoyaltyCardList(true);
+        updateLoyaltyCardList();
        // End of active tab logic

-        if (!mArchiveMode) {
-            FloatingActionButton addButton = binding.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();
-        }
+        ExtendedFloatingActionButton 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 != null && !mSearchView.isIconified()) {
+        if (!mSearchView.isIconified()) {
            mSearchView.setIconified(true);
            return;
        }
@@ -443,36 +376,37 @@ 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 displayCardSetupOptions(boolean shouldShow) {
+        View search = findViewById(R.id.action_search);
+        View folder = findViewById(R.id.action_unfold);
+        View sort = findViewById(R.id.action_sort);
+
+        if (search != null && mSearchView.isIconified()) {
+            search.setVisibility(shouldShow ? View.VISIBLE : View.GONE);
+        }
+        if (folder != null) {
+            folder.setVisibility(shouldShow ? View.VISIBLE : View.GONE);
+        }
+        if (sort != null) {
+            sort.setVisibility(shouldShow ? View.VISIBLE : View.GONE);
        }
    }

-    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);
+            displayCardSetupOptions(true);

            if (mAdapter.getItemCount() > 0) {
                mCardList.setVisibility(View.VISIBLE);
@@ -490,14 +424,9 @@ 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);
+            displayCardSetupOptions(false);

            mNoMatchingCardsText.setVisibility(View.GONE);
            mNoGroupCardsText.setVisibility(View.GONE);
@@ -508,72 +437,6 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
        }
    }

-    private void processBarcodeValues(BarcodeValues barcodeValues, String group) {
-        if (barcodeValues.isEmpty()) {
-            throw new IllegalArgumentException("barcodesValues may not be empty");
-        }
-
-        Intent newIntent = new Intent(getApplicationContext(), LoyaltyCardEditActivity.class);
-        Bundle newBundle = new Bundle();
-        newBundle.putString(LoyaltyCardEditActivity.BUNDLE_BARCODETYPE, barcodeValues.format());
-        newBundle.putString(LoyaltyCardEditActivity.BUNDLE_CARDID, barcodeValues.content());
-        if (group != null) {
-            newBundle.putString(LoyaltyCardEditActivity.BUNDLE_ADDGROUP, group);
-        }
-        newIntent.putExtras(newBundle);
-        startActivity(newIntent);
-    }
-
-    private void onSharedIntent(Intent intent) {
-        String receivedAction = intent.getAction();
-        String receivedType = intent.getType();
-
-        // Check if an image was shared to us
-        if (Intent.ACTION_SEND.equals(receivedAction)) {
-            if (!receivedType.startsWith("image/")) {
-                Log.e(TAG, "Wrong mime-type");
-                return;
-            }
-
-            BarcodeValues barcodeValues;
-            Bitmap bitmap;
-
-            Uri data = intent.getParcelableExtra(Intent.EXTRA_STREAM);
-            if (data == null) {
-                Toast.makeText(this, R.string.errorReadingImage, Toast.LENGTH_LONG).show();
-                finish();
-                return;
-            }
-
-            try {
-                bitmap = Utils.retrieveImageFromUri(this, data);
-            } catch (IOException e) {
-                Log.e(TAG, "Error getting data from image file");
-                e.printStackTrace();
-                Toast.makeText(this, R.string.errorReadingImage, Toast.LENGTH_LONG).show();
-                finish();
-                return;
-            }
-
-            barcodeValues = Utils.getBarcodeFromBitmap(bitmap);
-
-            if (barcodeValues.isEmpty()) {
-                Log.i(TAG, "No barcode found in image file");
-                Toast.makeText(this, R.string.noBarcodeFound, Toast.LENGTH_LONG).show();
-                finish();
-                return;
-            }
-
-            processBarcodeValues(barcodeValues, null);
-        }
-    }
-
-    private void extractIntentFields(Intent intent) {
-        final Bundle b = intent.getExtras();
-        mArchiveMode = b != null && b.getBoolean(BUNDLE_ARCHIVE_MODE, false);
-        onSharedIntent(intent);
-    }
-
    public void updateTabGroups(TabLayout groupsTabLayout) {
        List<Group> newGroups = DBHelper.getGroups(mDatabase);

@@ -598,19 +461,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) {
@@ -633,24 +488,16 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
                public boolean onQueryTextChange(String newText) {
                    mFilter = newText;

+                    TabLayout groupsTabLayout = findViewById(R.id.groups);
                    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);
    }

@@ -658,18 +505,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++) {
@@ -679,29 +532,23 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
                }
            }

-            AlertDialog.Builder builder = new MaterialAlertDialogBuilder(MainActivity.this);
+            AlertDialog.Builder builder = new AlertDialog.Builder(MainActivity.this);
            builder.setTitle(R.string.sort_by);

-            SortingOptionBinding sortingOptionBinding = SortingOptionBinding
-                    .inflate(LayoutInflater.from(MainActivity.this), null, false);
-            final View customLayout = sortingOptionBinding.getRoot();
+            final View customLayout = getLayoutInflater().inflate(R.layout.sorting_option, null);
            builder.setView(customLayout);

-            CheckBox showReversed = sortingOptionBinding.checkBoxReverse;
-
-
-            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();
            });

@@ -719,15 +566,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);
@@ -746,7 +584,6 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
            return true;
        }

-
        return super.onOptionsItemSelected(inputItem);
    }

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

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

    @Override
@@ -808,6 +645,7 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
            return false;
        }

+        TabLayout groupsTabLayout = findViewById(R.id.groups);
        if (groupsTabLayout.getTabCount() < 2) {
            return false;
        }
@@ -857,16 +695,6 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
        toggleSelection(inputPosition);
    }

-    private void scaleScreen() {
-        DisplayMetrics displayMetrics = new DisplayMetrics();
-        getWindowManager().getDefaultDisplay().getMetrics(displayMetrics);
-        int screenHeight = displayMetrics.heightPixels;
-        float mediumSizePx = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP,MEDIUM_SCALE_FACTOR_DIP,getResources().getDisplayMetrics());
-        boolean shouldScaleSmaller = screenHeight < mediumSizePx;
-
-        binding.include.welcomeIcon.setVisibility(shouldScaleSmaller ? View.GONE : View.VISIBLE);
-    }
-
    private void toggleSelection(int inputPosition) {
        mAdapter.toggleSelection(inputPosition);
        int count = mAdapter.getSelectedItemCount();
@@ -877,46 +705,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);
            }
@@ -925,7 +717,6 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
        }
    }

-
    @Override
    public void onRowClicked(int inputPosition) {
        if (mAdapter.getSelectedItemCount() > 0) {
@@ -947,22 +738,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);
        }
    }
 }
--- a/app/src/main/java/protect/card_locker/ManageGroupActivity.java
+++ b/app/src/main/java/protect/card_locker/ManageGroupActivity.java
@@ -1,19 +1,17 @@
 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;
 import android.widget.Toast;

-import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;

 import java.util.ArrayList;
@@ -26,11 +24,8 @@ import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.widget.Toolbar;
 import androidx.recyclerview.widget.RecyclerView;

-import protect.card_locker.databinding.ActivityManageGroupBinding;
-
 public class ManageGroupActivity extends CatimaAppCompatActivity implements ManageGroupCursorAdapter.CardAdapterListener {

-    private ActivityManageGroupBinding binding;
    private SQLiteDatabase mDatabase;
    private ManageGroupCursorAdapter mAdapter;

@@ -39,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;
@@ -47,18 +42,17 @@ public class ManageGroupActivity extends CatimaAppCompatActivity implements Mana
    @Override
    protected void onCreate(Bundle inputSavedInstanceState) {
        super.onCreate(inputSavedInstanceState);
-        binding = ActivityManageGroupBinding.inflate(getLayoutInflater());
-        setContentView(binding.getRoot());
-        Toolbar toolbar = binding.toolbar;
+        setContentView(R.layout.activity_manage_group);
+        Toolbar toolbar = findViewById(R.id.toolbar);
        setSupportActionBar(toolbar);

        mDatabase = new DBHelper(this).getWritableDatabase();

-        noGroupCardsText = binding.include.noGroupCardsText;
-        mCardList = binding.include.list;
-        FloatingActionButton saveButton = binding.fabSave;
+        mHelpText = findViewById(R.id.helpText);
+        mCardList = findViewById(R.id.list);
+        FloatingActionButton saveButton = findViewById(R.id.fabSave);

-        mGroupNameText = binding.editTextGroupName;
+        mGroupNameText = findViewById(R.id.editTextGroupName);

        mGroupNameText.addTextChangedListener(new TextWatcher() {
            @Override
@@ -110,7 +104,12 @@ public class ManageGroupActivity extends CatimaAppCompatActivity implements Mana
            mGroupNameText.setText(inputSavedInstanceState.getString(SAVE_INSTANCE_CURRENT_GROUP_NAME));
        }

-        enableToolbarBackButton();
+        ActionBar actionBar = getSupportActionBar();
+        if (actionBar == null) {
+            throw (new RuntimeException("mActionBar is not expected to be null here"));
+        }
+        actionBar.setDisplayHomeAsUpEnabled(true);
+        actionBar.setDisplayShowHomeEnabled(true);

        saveButton.setOnClickListener(v -> {
            String currentGroupName = mGroupNameText.getText().toString().trim();
@@ -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,16 +170,16 @@ 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);
        }
    }

    private void leaveWithoutSaving() {
        if (hasChanged()) {
-            AlertDialog.Builder builder = new MaterialAlertDialogBuilder(ManageGroupActivity.this);
+            AlertDialog.Builder builder = new AlertDialog.Builder(ManageGroupActivity.this);
            builder.setTitle(R.string.leaveWithoutSaveTitle);
            builder.setMessage(R.string.leaveWithoutSaveConfirmation);
            builder.setPositiveButton(R.string.confirm, (dialog, which) -> finish());
--- a/app/src/main/java/protect/card_locker/ManageGroupCursorAdapter.java
+++ b/app/src/main/java/protect/card_locker/ManageGroupCursorAdapter.java
@@ -8,6 +8,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;

+import androidx.recyclerview.widget.RecyclerView;
+
 public class ManageGroupCursorAdapter extends LoyaltyCardCursorAdapter {
    private HashMap<Integer, Integer> mIndexCardMap;
    private HashMap<Integer, Boolean> mInGroupOverlay;
--- a/app/src/main/java/protect/card_locker/ManageGroupsActivity.java
+++ b/app/src/main/java/protect/card_locker/ManageGroupsActivity.java
@@ -8,15 +8,12 @@ import android.os.Bundle;
 import android.text.InputType;
 import android.view.MenuItem;
 import android.view.View;
-import android.view.ViewGroup;
 import android.view.WindowManager;
 import android.widget.EditText;
-import android.widget.FrameLayout;
 import android.widget.TextView;
 import android.widget.Toast;

-import com.google.android.material.dialog.MaterialAlertDialogBuilder;
-import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton;

 import java.util.List;

@@ -27,10 +24,7 @@ import androidx.recyclerview.widget.DefaultItemAnimator;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;

-import protect.card_locker.databinding.ManageGroupsActivityBinding;
-
 public class ManageGroupsActivity extends CatimaAppCompatActivity implements GroupCursorAdapter.GroupAdapterListener {
-    private ManageGroupsActivityBinding binding;
    private static final String TAG = "Catima";

    private SQLiteDatabase mDatabase;
@@ -41,12 +35,14 @@ public class ManageGroupsActivity extends CatimaAppCompatActivity implements Gro
    @Override
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
-        binding = ManageGroupsActivityBinding.inflate(getLayoutInflater());
        setTitle(R.string.groups);
-        setContentView(binding.getRoot());
-        Toolbar toolbar = binding.toolbar;
+        setContentView(R.layout.manage_groups_activity);
+        Toolbar toolbar = findViewById(R.id.toolbar);
        setSupportActionBar(toolbar);
-        enableToolbarBackButton();
+        ActionBar actionBar = getSupportActionBar();
+        if (actionBar != null) {
+            actionBar.setDisplayHomeAsUpEnabled(true);
+        }

        mDatabase = new DBHelper(this).getWritableDatabase();
    }
@@ -55,12 +51,12 @@ public class ManageGroupsActivity extends CatimaAppCompatActivity implements Gro
    protected void onResume() {
        super.onResume();

-        FloatingActionButton addButton = binding.fabAdd;
+        ExtendedFloatingActionButton addButton = findViewById(R.id.fabAdd);
        addButton.setOnClickListener(v -> createGroup());
        addButton.bringToFront();

-        mGroupList = binding.include.list;
-        mHelpText = binding.include.helpText;
+        mGroupList = findViewById(R.id.list);
+        mHelpText = findViewById(R.id.helpText);

        // Init group list
        RecyclerView.LayoutManager mLayoutManager = new LinearLayoutManager(getApplicationContext());
@@ -112,60 +108,24 @@ public class ManageGroupsActivity extends CatimaAppCompatActivity implements Gro
        return super.onOptionsItemSelected(item);
    }

-    private void setGroupNameError(EditText input) {
-        String string = sanitizeAddGroupNameField(input.getText());
-
-        if (string.length() == 0) {
-            input.setError(getString(R.string.group_name_is_empty));
-            return;
-        }
-
-        if (DBHelper.getGroup(mDatabase, string) != null) {
-            input.setError(getString(R.string.group_name_already_in_use));
-            return;
-        }
-
-        input.setError(null);
-    }
-
-    private String sanitizeAddGroupNameField(CharSequence s) {
-        return s.toString().trim();
-    }
-
    private void createGroup() {
-        AlertDialog.Builder builder = new MaterialAlertDialogBuilder(this);
+        AlertDialog.Builder builder = new AlertDialog.Builder(this);
        builder.setTitle(R.string.enter_group_name);
        final EditText input = new EditText(this);
        input.setInputType(InputType.TYPE_CLASS_TEXT);
-        input.addTextChangedListener(new SimpleTextWatcher() {
-            public void onTextChanged(CharSequence s, int start, int before, int count) {
-                setGroupNameError(input);
-            }
-        });
-        setGroupNameError(input);
-
-        // Add spacing to EditText
-        FrameLayout container = new FrameLayout(this);
-        FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(
-                ViewGroup.LayoutParams.MATCH_PARENT,
-                ViewGroup.LayoutParams.WRAP_CONTENT
-        );
-        params.leftMargin = 50;
-        params.rightMargin = 50;
-        input.setLayoutParams(params);
-        container.addView(input);
-
-        builder.setView(container);
+        builder.setView(input);

        builder.setPositiveButton(getString(R.string.ok), (dialog, which) -> {
-            CharSequence error = input.getError();
-
-            if (error != null) {
-                Toast.makeText(getApplicationContext(), error.toString(), Toast.LENGTH_SHORT).show();
+            String inputString = input.getText().toString().trim();
+            if (inputString.length() == 0) {
+                Toast.makeText(getApplicationContext(), R.string.group_name_is_empty, Toast.LENGTH_SHORT).show();
                return;
            }
-
-            DBHelper.insertGroup(mDatabase, sanitizeAddGroupNameField(input.getText()));
+            if (DBHelper.getGroup(mDatabase, inputString) != null) {
+                Toast.makeText(getApplicationContext(), R.string.group_name_already_in_use, Toast.LENGTH_SHORT).show();
+                return;
+            }
+            DBHelper.insertGroup(mDatabase, inputString);
            updateGroupList();
        });
        builder.setNegativeButton(getString(R.string.cancel), (dialog, which) -> dialog.cancel());
@@ -233,7 +193,7 @@ public class ManageGroupsActivity extends CatimaAppCompatActivity implements Gro
    public void onDeleteButtonClicked(View view) {
        final String groupName = getGroupName(view);

-        AlertDialog.Builder builder = new MaterialAlertDialogBuilder(this);
+        AlertDialog.Builder builder = new AlertDialog.Builder(this);
        builder.setTitle(R.string.deleteConfirmationGroup);
        builder.setMessage(groupName);

--- a/app/src/main/java/protect/card_locker/OpenWebLinkHandler.java
+++ b/app/src/main/java/protect/card_locker/OpenWebLinkHandler.java
@@ -1,29 +0,0 @@
-package protect.card_locker;
-
-import android.content.ActivityNotFoundException;
-import android.content.Intent;
-import android.net.Uri;
-import android.util.Log;
-import android.widget.Toast;
-
-import androidx.appcompat.app.AppCompatActivity;
-
-public class OpenWebLinkHandler {
-
-    private static final String TAG = "Catima";
-
-    public void openBrowser(AppCompatActivity activity, String url) {
-        if (url == null) {
-            return;
-        }
-
-        Intent intent = new Intent(Intent.ACTION_VIEW);
-        intent.setData(Uri.parse(url));
-        try {
-            activity.startActivity(intent);
-        } catch (ActivityNotFoundException e) {
-            Toast.makeText(activity, R.string.failedToOpenUrl, Toast.LENGTH_LONG).show();
-            Log.e(TAG, "No activity found to handle intent", e);
-        }
-    }
-}
--- a/app/src/main/java/protect/card_locker/PermissionUtils.java
+++ b/app/src/main/java/protect/card_locker/PermissionUtils.java
@@ -1,94 +0,0 @@
-package protect.card_locker;
-
-import android.Manifest;
-import android.app.Activity;
-import android.content.pm.PackageManager;
-import android.os.Build;
-
-import androidx.core.app.ActivityCompat;
-import androidx.core.content.ContextCompat;
-
-public class PermissionUtils {
-    /**
-     * Check if storage read permission is needed.
-     *
-     * This is only necessary on Android 6.0 (Marshmallow) and below. See
-     * https://github.com/CatimaLoyalty/Android/issues/979 for more info.
-     *
-     * @param activity
-     * @return
-     */
-    private static boolean needsStorageReadPermission(Activity activity) {
-        // Testing showed this permission wasn't needed for anything Catima did past Marshmallow
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-            return false;
-        }
-
-        return ContextCompat.checkSelfPermission(activity, android.Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED;
-    }
-
-    /**
-     * Check if camera permission is needed.
-     *
-     * @param activity
-     * @return
-     */
-    public static boolean needsCameraPermission(Activity activity) {
-        // Android only introduced the runtime permission system in Marshmallow (Android 6.0)
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
-            return false;
-        }
-
-        return ContextCompat.checkSelfPermission(activity, android.Manifest.permission.CAMERA) != PackageManager.PERMISSION_GRANTED;
-    }
-
-    /**
-     * Call onRequestPermissionsResult after storage read permission was granted.
-     * Mocks a successful grant if a grant is not necessary.
-     *
-     * @param activity
-     * @param requestCode
-     */
-    public static void requestStorageReadPermission(CatimaAppCompatActivity activity, int requestCode) {
-        String[] permissions = new String[]{ android.Manifest.permission.READ_EXTERNAL_STORAGE };
-        int[] mockedResults = new int[]{ PackageManager.PERMISSION_GRANTED };
-
-        if (needsStorageReadPermission(activity)) {
-            ActivityCompat.requestPermissions(activity, permissions, requestCode);
-        } else {
-            // FIXME: This points to onMockedRequestPermissionResult instead of to
-            // onRequestPermissionResult because onRequestPermissionResult was only introduced in
-            // Android 6.0 (SDK 23) and we and to support Android 5.0 (SDK 21) too.
-            //
-            // When minSdk becomes 23, this should point to onRequestPermissionResult directly and
-            // the activity input variable should be changed from CatimaAppCompatActivity to
-            // Activity.
-            activity.onMockedRequestPermissionsResult(requestCode, permissions, mockedResults);
-        }
-    }
-
-    /**
-     * Call onRequestPermissionsResult after camera permission was granted.
-     * Mocks a successful grant if a grant is not necessary.
-     *
-     * @param activity
-     * @param requestCode
-     */
-    public static void requestCameraPermission(CatimaAppCompatActivity activity, int requestCode) {
-        String[] permissions = new String[]{ Manifest.permission.CAMERA };
-        int[] mockedResults = new int[]{ PackageManager.PERMISSION_GRANTED };
-
-        if (needsCameraPermission(activity)) {
-            ActivityCompat.requestPermissions(activity, permissions, requestCode);
-        } else {
-            // FIXME: This points to onMockedRequestPermissionResult instead of to
-            // onRequestPermissionResult because onRequestPermissionResult was only introduced in
-            // Android 6.0 (SDK 23) and we and to support Android 5.0 (SDK 21) too.
-            //
-            // When minSdk becomes 23, this should point to onRequestPermissionResult directly and
-            // the activity input variable should be changed from CatimaAppCompatActivity to
-            // Activity.
-            activity.onMockedRequestPermissionsResult(requestCode, permissions, mockedResults);
-        }
-    }
-}
--- a/app/src/main/java/protect/card_locker/ScanActivity.java
+++ b/app/src/main/java/protect/card_locker/ScanActivity.java
@@ -1,31 +1,16 @@
 package protect.card_locker;

-import android.Manifest;
 import android.app.Activity;
-import android.content.ActivityNotFoundException;
 import android.content.Intent;
 import android.content.pm.PackageManager;
-import android.graphics.Color;
-import android.net.Uri;
 import android.os.Bundle;
-import android.provider.Settings;
-import android.util.DisplayMetrics;
 import android.util.Log;
-import android.util.TypedValue;
 import android.view.KeyEvent;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.Toast;

-import androidx.activity.result.ActivityResultLauncher;
-import androidx.activity.result.contract.ActivityResultContracts;
-import androidx.annotation.NonNull;
-import androidx.appcompat.app.ActionBar;
-import androidx.appcompat.widget.Toolbar;
-
-import androidx.core.content.ContextCompat;
-
 import com.google.zxing.ResultPoint;
 import com.google.zxing.client.android.Intents;
 import com.journeyapps.barcodescanner.BarcodeCallback;
@@ -35,8 +20,10 @@ import com.journeyapps.barcodescanner.DecoratedBarcodeView;

 import java.util.List;

-import protect.card_locker.databinding.CustomBarcodeScannerBinding;
-import protect.card_locker.databinding.ScanActivityBinding;
+import androidx.activity.result.ActivityResultLauncher;
+import androidx.activity.result.contract.ActivityResultContracts;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.widget.Toolbar;

 /**
 * Custom Scannner Activity extending from Activity to display a custom layout form scanner view.
@@ -45,16 +32,8 @@ import protect.card_locker.databinding.ScanActivityBinding;
 * originally licensed under Apache 2.0
 */
 public class ScanActivity extends CatimaAppCompatActivity {
-
-    private ScanActivityBinding binding;
-    private CustomBarcodeScannerBinding customBarcodeScannerBinding;
    private static final String TAG = "Catima";

-    private static final int MEDIUM_SCALE_FACTOR_DIP = 460;
-    private static final int COMPAT_SCALE_FACTOR_DIP = 320;
-
-    private static final int PERMISSION_SCAN_ADD_FROM_IMAGE = 100;
-
    private CaptureManager capture;
    private DecoratedBarcodeView barcodeScannerView;

@@ -76,22 +55,23 @@ public class ScanActivity extends CatimaAppCompatActivity {
    @Override
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
-        binding = ScanActivityBinding.inflate(getLayoutInflater());
-        customBarcodeScannerBinding = CustomBarcodeScannerBinding.bind(binding.zxingBarcodeScanner);
        setTitle(R.string.scanCardBarcode);
-        setContentView(binding.getRoot());
-        Toolbar toolbar = binding.toolbar;
+        setContentView(R.layout.scan_activity);
+        Toolbar toolbar = findViewById(R.id.toolbar);
        setSupportActionBar(toolbar);
-        enableToolbarBackButton();
+        ActionBar actionBar = getSupportActionBar();
+        if (actionBar != null) {
+            actionBar.setDisplayHomeAsUpEnabled(true);
+        }

        extractIntentFields(getIntent());

        manualAddLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), result -> handleActivityResult(Utils.SELECT_BARCODE_REQUEST, result.getResultCode(), result.getData()));
        photoPickerLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), result -> handleActivityResult(Utils.BARCODE_IMPORT_FROM_IMAGE_FILE, result.getResultCode(), result.getData()));
-        customBarcodeScannerBinding.addFromImage.setOnClickListener(this::addFromImage);
-        customBarcodeScannerBinding.addManually.setOnClickListener(this::addManually);
+        findViewById(R.id.add_from_image).setOnClickListener(this::addFromImage);
+        findViewById(R.id.add_manually).setOnClickListener(this::addManually);

-        barcodeScannerView = binding.zxingBarcodeScanner;
+        barcodeScannerView = findViewById(R.id.zxing_barcode_scanner);

        // Even though we do the actual decoding with the barcodeScannerView
        // CaptureManager needs to be running to show the camera and scanning bar
@@ -128,10 +108,6 @@ public class ScanActivity extends CatimaAppCompatActivity {
    protected void onResume() {
        super.onResume();
        capture.onResume();
-        if (ContextCompat.checkSelfPermission(this, Manifest.permission.CAMERA) == PackageManager.PERMISSION_GRANTED) {
-            showCameraPermissionMissingText(false);
-        }
-        scaleScreen();
    }

    @Override
@@ -194,22 +170,27 @@ public class ScanActivity extends CatimaAppCompatActivity {
    private void handleActivityResult(int requestCode, int resultCode, Intent intent) {
        super.onActivityResult(requestCode, resultCode, intent);

-        BarcodeValues barcodeValues = Utils.parseSetBarcodeActivityResult(requestCode, resultCode, intent, this);
+        BarcodeValues barcodeValues;

-        if (barcodeValues.isEmpty()) {
+        try {
+            barcodeValues = Utils.parseSetBarcodeActivityResult(requestCode, resultCode, intent, this);
+        } catch (NullPointerException e) {
+            Toast.makeText(this, R.string.errorReadingImage, Toast.LENGTH_LONG).show();
            return;
        }

-        Intent manualResult = new Intent();
-        Bundle manualResultBundle = new Bundle();
-        manualResultBundle.putString(BarcodeSelectorActivity.BARCODE_CONTENTS, barcodeValues.content());
-        manualResultBundle.putString(BarcodeSelectorActivity.BARCODE_FORMAT, barcodeValues.format());
-        if (addGroup != null) {
-            manualResultBundle.putString(LoyaltyCardEditActivity.BUNDLE_ADDGROUP, addGroup);
+        if (!barcodeValues.isEmpty()) {
+            Intent manualResult = new Intent();
+            Bundle manualResultBundle = new Bundle();
+            manualResultBundle.putString(BarcodeSelectorActivity.BARCODE_CONTENTS, barcodeValues.content());
+            manualResultBundle.putString(BarcodeSelectorActivity.BARCODE_FORMAT, barcodeValues.format());
+            if (addGroup != null) {
+                manualResultBundle.putString(LoyaltyCardEditActivity.BUNDLE_ADDGROUP, addGroup);
+            }
+            manualResult.putExtras(manualResultBundle);
+            ScanActivity.this.setResult(RESULT_OK, manualResult);
+            finish();
        }
-        manualResult.putExtras(manualResultBundle);
-        ScanActivity.this.setResult(RESULT_OK, manualResult);
-        finish();
    }

    public void addManually(View view) {
@@ -223,74 +204,8 @@ public class ScanActivity extends CatimaAppCompatActivity {
    }

    public void addFromImage(View view) {
-        PermissionUtils.requestStorageReadPermission(this, PERMISSION_SCAN_ADD_FROM_IMAGE);
-    }
-
-    private void addFromImageAfterPermission() {
        Intent photoPickerIntent = new Intent(Intent.ACTION_PICK);
        photoPickerIntent.setType("image/*");
-        Intent contentIntent = new Intent(Intent.ACTION_GET_CONTENT);
-        contentIntent.setType("image/*");
-
-        Intent chooserIntent = Intent.createChooser(photoPickerIntent, getString(R.string.addFromImage));
-        chooserIntent.putExtra(Intent.EXTRA_INITIAL_INTENTS, new Intent[] { contentIntent });
-        try {
-            photoPickerLauncher.launch(chooserIntent);
-        } catch (ActivityNotFoundException e) {
-            Toast.makeText(getApplicationContext(), R.string.failedLaunchingPhotoPicker, Toast.LENGTH_LONG).show();
-            Log.e(TAG, "No activity found to handle intent", e);
-        }
-    }
-
-    private void showCameraPermissionMissingText(boolean show) {
-        customBarcodeScannerBinding.cameraPermissionDeniedLayout.cameraPermissionDeniedClickableArea.setOnClickListener(show ? v -> {
-            navigateToSystemPermissionSetting();
-        } : null);
-        customBarcodeScannerBinding.cardInputContainer.setBackgroundColor(show ? obtainThemeAttribute(R.attr.colorSurface) : Color.TRANSPARENT);
-        customBarcodeScannerBinding.cameraPermissionDeniedLayout.getRoot().setVisibility(show ? View.VISIBLE : View.GONE);
-    }
-
-    private void scaleScreen() {
-        DisplayMetrics displayMetrics = new DisplayMetrics();
-        getWindowManager().getDefaultDisplay().getMetrics(displayMetrics);
-        int screenHeight = displayMetrics.heightPixels;
-        float mediumSizePx = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP,MEDIUM_SCALE_FACTOR_DIP,getResources().getDisplayMetrics());
-        boolean shouldScaleSmaller = screenHeight < mediumSizePx;
-
-        customBarcodeScannerBinding.cameraPermissionDeniedLayout.cameraPermissionDeniedIcon.setVisibility(shouldScaleSmaller ? View.GONE : View.VISIBLE);
-        customBarcodeScannerBinding.cameraPermissionDeniedLayout.cameraPermissionDeniedTitle.setVisibility(shouldScaleSmaller ? View.GONE : View.VISIBLE);
-    }
-
-    private int obtainThemeAttribute(int attribute) {
-        TypedValue typedValue = new TypedValue();
-        getTheme().resolveAttribute(attribute, typedValue, true);
-        return typedValue.data;
-    }
-
-    private void navigateToSystemPermissionSetting() {
-        Intent permissionIntent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS, Uri.fromParts("package", getPackageName(), null));
-        permissionIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        startActivity(permissionIntent);
-    }
-
-    @Override
-    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
-        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
-
-        onMockedRequestPermissionsResult(requestCode, permissions, grantResults);
-    }
-
-    public void onMockedRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
-        boolean granted = grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED;
-
-        if (requestCode == CaptureManager.getCameraPermissionReqCode()) {
-            showCameraPermissionMissingText(!granted);
-        } else if (requestCode == PERMISSION_SCAN_ADD_FROM_IMAGE) {
-            if (granted) {
-                addFromImageAfterPermission();
-            } else {
-                Toast.makeText(this, R.string.storageReadPermissionRequired, Toast.LENGTH_LONG).show();
-            }
-        }
+        photoPickerLauncher.launch(photoPickerIntent);
    }
 }
--- a/app/src/main/java/protect/card_locker/ThirdPartyInfo.java
+++ b/app/src/main/java/protect/card_locker/ThirdPartyInfo.java
@@ -22,8 +22,4 @@ public class ThirdPartyInfo {
    public String license() {
        return mLicense;
    }
-
-    public String toHtml() {
-        return String.format("<a href=\"%s\">%s</a> (%s)", url(), name(), license());
-    }
 }
--- a/app/src/main/java/protect/card_locker/UCropWrapper.java
+++ b/app/src/main/java/protect/card_locker/UCropWrapper.java
@@ -1,82 +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;
-import androidx.core.view.WindowInsetsControllerCompat;
-
-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) {
-            View decorView = getWindow().getDecorView();
-            WindowInsetsControllerCompat wic = new WindowInsetsControllerCompat(getWindow(), decorView);
-            wic.setAppearanceLightStatusBars(!darkMode);
-        } else {
-            // icons are always white back then
-            if (!darkMode) {
-                getWindow().setStatusBarColor(ColorUtils.compositeColors(Color.argb(127, 0, 0, 0), getWindow().getStatusBarColor()));
-            }
-        }
-
-        // find and check views that we wish to color modify
-        // for when we update ucrop or switch to another cropper
-        View check = findViewById(com.yalantis.ucrop.R.id.wrapper_controls);
-        if (check instanceof FrameLayout) {
-            FrameLayout controls = (FrameLayout) check;
-            check = findViewById(com.yalantis.ucrop.R.id.wrapper_states);
-            if (check instanceof LinearLayout) {
-                LinearLayout states = (LinearLayout) check;
-                for (int i = 0; i < controls.getChildCount(); i++) {
-                    check = controls.getChildAt(i);
-                    if (check instanceof AppCompatImageView) {
-                        AppCompatImageView controlsBackgroundImage = (AppCompatImageView) check;
-                        // everything gathered and are as expected, now perform color patching
-                        Utils.patchColors(this);
-                        int colorSurface = MaterialColors.getColor(this, R.attr.colorSurface, ContextCompat.getColor(this, R.color.md_theme_light_surface));
-                        int colorOnSurface = MaterialColors.getColor(this, R.attr.colorOnSurface, ContextCompat.getColor(this, R.color.md_theme_light_onSurface));
-
-                        Drawable controlsBackgroundImageDrawable = controlsBackgroundImage.getBackground();
-                        controlsBackgroundImageDrawable.mutate();
-                        controlsBackgroundImageDrawable.setTint(darkMode ? colorOnSurface : colorSurface);
-                        controlsBackgroundImage.setBackgroundDrawable(controlsBackgroundImageDrawable);
-
-                        states.setBackgroundColor(darkMode ? colorSurface : colorOnSurface);
-                        break;
-                    }
-                }
-            }
-        }
-
-        // change toolbar font
-        check = findViewById(com.yalantis.ucrop.R.id.toolbar_title);
-        if (check instanceof MaterialTextView) {
-            MaterialTextView toolbarTextview = (MaterialTextView) check;
-            Intent intent = getIntent();
-            int style = intent.getIntExtra(UCROP_TOOLBAR_TYPEFACE_STYLE, -1);
-            if (style != -1) {
-                toolbarTextview.setTypeface(Typeface.defaultFromStyle(style));
-            }
-        }
-    }
-}
--- a/app/src/main/java/protect/card_locker/Utils.java
+++ b/app/src/main/java/protect/card_locker/Utils.java
@@ -5,30 +5,18 @@ 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;
 import android.graphics.ImageDecoder;
 import android.graphics.Matrix;
-import android.net.Uri;
 import android.os.Build;
 import android.os.LocaleList;
 import android.provider.MediaStore;
-import android.text.format.DateUtils;
 import android.util.Log;
 import android.util.TypedValue;
-import android.view.MenuItem;
 import android.widget.Toast;

-import androidx.annotation.RawRes;
-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 com.google.android.material.color.DynamicColors;
 import com.google.zxing.BinaryBitmap;
 import com.google.zxing.LuminanceSource;
 import com.google.zxing.MultiFormatReader;
@@ -37,20 +25,14 @@ import com.google.zxing.RGBLuminanceSource;
 import com.google.zxing.Result;
 import com.google.zxing.common.HybridBinarizer;

-import java.io.BufferedReader;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.StringWriter;
 import java.math.BigDecimal;
-import java.nio.charset.StandardCharsets;
 import java.text.NumberFormat;
-import java.text.ParseException;
 import java.util.Calendar;
 import java.util.Currency;
 import java.util.Date;
@@ -58,6 +40,11 @@ import java.util.GregorianCalendar;
 import java.util.Locale;
 import java.util.Map;

+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatDelegate;
+import androidx.core.graphics.ColorUtils;
+import androidx.exifinterface.media.ExifInterface;
+
 import protect.card_locker.preferences.Settings;

 public class Utils {
@@ -114,17 +101,6 @@ public class Utils {
        return ColorUtils.calculateLuminance(backgroundColor) > LUMINANCE_MIDPOINT;
    }

-    /**
-     * Returns the Barcode format and content based on the result of an activity.
-     * It shows toasts to notify the end-user as needed itself and will return an empty
-     * BarcodeValues object if the activity was cancelled or nothing could be found.
-     *
-     * @param requestCode
-     * @param resultCode
-     * @param intent
-     * @param context
-     * @return BarcodeValues
-     */
    static public BarcodeValues parseSetBarcodeActivityResult(int requestCode, int resultCode, Intent intent, Context context) {
        String contents;
        String format;
@@ -136,16 +112,14 @@ public class Utils {
        if (requestCode == Utils.BARCODE_IMPORT_FROM_IMAGE_FILE) {
            Log.i(TAG, "Received image file with possible barcode");

-            Uri data = intent.getData();
-            if (data == null) {
-                Log.e(TAG, "Intent did not contain any data");
-                Toast.makeText(context, R.string.errorReadingImage, Toast.LENGTH_LONG).show();
-                return new BarcodeValues(null, null);
-            }
-
            Bitmap bitmap;
            try {
-                bitmap = retrieveImageFromUri(context, data);
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+                    ImageDecoder.Source image_source = ImageDecoder.createSource(context.getContentResolver(), intent.getData());
+                    bitmap = ImageDecoder.decodeBitmap(image_source, (decoder, info, source) -> decoder.setMutableRequired(true));
+                } else {
+                    bitmap = MediaStore.Images.Media.getBitmap(context.getContentResolver(), intent.getData());
+                }
            } catch (IOException e) {
                Log.e(TAG, "Error getting data from image file");
                e.printStackTrace();
@@ -185,20 +159,6 @@ public class Utils {
        throw new UnsupportedOperationException("Unknown request code for parseSetBarcodeActivityResult");
    }

-    static public Bitmap retrieveImageFromUri(Context context, Uri data) throws IOException {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-            ImageDecoder.Source image_source = ImageDecoder.createSource(context.getContentResolver(), data);
-            return ImageDecoder.decodeBitmap(image_source, (decoder, info, source) -> decoder.setMutableRequired(true));
-        } else {
-            return getBitmapSdkLessThan29(data, context);
-        }
-    }
-
-    @SuppressWarnings("deprecation")
-    private static Bitmap getBitmapSdkLessThan29(Uri data, Context context) throws IOException {
-        return MediaStore.Images.Media.getBitmap(context.getContentResolver(), data);
-    }
-
    static public BarcodeValues getBarcodeFromBitmap(Bitmap bitmap) {
        // This function is vulnerable to OOM, so we try again with a smaller bitmap is we get OOM
        for (int i = 0; i < 10; i++) {
@@ -232,21 +192,7 @@ public class Utils {
        }
    }

-    static public Boolean isNotYetValid(Date validFromDate) {
-        // The note in `hasExpired` does not apply here, since the bug was fixed before this feature was added.
-        return validFromDate.after(getStartOfToday().getTime());
-    }
-
    static public Boolean hasExpired(Date expiryDate) {
-        // Note: In #1083 it was discovered that `DatePickerFragment` may sometimes store the expiryDate
-        // at 12:00 PM instead of 12:00 AM in the DB. While this has been fixed and the 12-hour difference
-        // is not a problem for the way the comparison currently works, it's good to keep in mind such
-        // dates may exist in the DB in case the comparison changes in the future and the new one relies
-        // on both dates being set at 12:00 AM.
-        return expiryDate.before(getStartOfToday().getTime());
-    }
-
-    static private Calendar getStartOfToday() {
        // today
        Calendar date = new GregorianCalendar();
        // reset hour, minutes, seconds and millis
@@ -254,7 +200,8 @@ public class Utils {
        date.set(Calendar.MINUTE, 0);
        date.set(Calendar.SECOND, 0);
        date.set(Calendar.MILLISECOND, 0);
-        return date;
+
+        return expiryDate.before(date.getTime());
    }

    static public String formatBalance(Context context, BigDecimal value, Currency currency) {
@@ -287,19 +234,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) {
@@ -394,14 +354,6 @@ public class Utils {
        saveCardImage(context, bitmap, getCardImageFileName(loyaltyCardId, type));
    }

-    public static File retrieveCardImageAsFile(Context context, String fileName) {
-        return context.getFileStreamPath(fileName);
-    }
-
-    public static File retrieveCardImageAsFile(Context context, int loyaltyCardId, ImageLocationType type) {
-        return retrieveCardImageAsFile(context, getCardImageFileName(loyaltyCardId, type));
-    }
-
    static public Bitmap retrieveCardImage(Context context, String fileName) {
        FileInputStream in;
        try {
@@ -445,7 +397,8 @@ public class Utils {
        Resources res = context.getResources();
        Configuration configuration = res.getConfiguration();
        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) {
-            setLocalesSdkLessThan24(chosenLocale, configuration, res);
+            configuration.locale = chosenLocale != null ? chosenLocale : Locale.getDefault();
+            res.updateConfiguration(configuration, res.getDisplayMetrics());
            return context;
        }

@@ -455,12 +408,6 @@ public class Utils {
        return context.createConfigurationContext(configuration);
    }

-    @SuppressWarnings("deprecation")
-    private static void setLocalesSdkLessThan24(Locale chosenLocale, Configuration configuration, Resources res) {
-        configuration.locale = chosenLocale != null ? chosenLocale : Locale.getDefault();
-        res.updateConfiguration(configuration, res.getDisplayMetrics());
-    }
-
    static public long getUnixTime() {
        return System.currentTimeMillis() / 1000;
    }
@@ -517,88 +464,21 @@ public class Utils {
    }

    // 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.applyToActivityIfAvailable(activity);
-        }
-
-        if (isDarkModeEnabled(activity) && settings.getOledDark()) {
-            theme.applyStyle(R.style.DarkBackground, true);
+    // use before views are inflated, after dynamic color
+    public static void patchOledDarkTheme(AppCompatActivity activity) {
+        if (isDarkModeEnabled(activity) && new Settings(activity).getOledDark()) {
+            activity.getTheme().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 void postPatchOledDarkTheme(AppCompatActivity activity) {
+        if (isDarkModeEnabled(activity) && new Settings(activity).getOledDark()) {
+            TypedValue typedValue = new TypedValue();
+            activity.getTheme().resolveAttribute(android.R.attr.colorBackground, typedValue, true);
+            activity.findViewById(android.R.id.content).setBackgroundColor(typedValue.data);
        }
    }
-
-    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);
-    }
-
-    public static String readTextFile(Context context, @RawRes int resourceId) throws IOException {
-        InputStream input = context.getResources().openRawResource(resourceId);
-        BufferedReader reader = new BufferedReader(new InputStreamReader(input, StandardCharsets.UTF_8));
-        StringBuilder result = new StringBuilder();
-        while (true) {
-            String nextLine = reader.readLine();
-
-            if (nextLine == null || nextLine.isEmpty()) {
-                reader.close();
-                break;
-            }
-
-            result.append("\n");
-            result.append(nextLine);
-        }
-
-        return result.toString();
-    }
 }
--- a/app/src/main/java/protect/card_locker/ZipUtils.java
+++ b/app/src/main/java/protect/card_locker/ZipUtils.java
@@ -15,15 +15,7 @@ import java.io.Reader;
 import java.nio.charset.StandardCharsets;

 public class ZipUtils {
-    public static Bitmap readImage(ZipInputStream zipInputStream) {
-        return BitmapFactory.decodeStream(zipInputStream);
-    }
-
-    public static JSONObject readJSON(ZipInputStream zipInputStream) throws IOException, JSONException {
-        return new JSONObject(read(zipInputStream));
-    }
-
-    private static String read(ZipInputStream zipInputStream) throws IOException {
+    static public String read(ZipInputStream zipInputStream) throws IOException {
        StringBuilder stringBuilder = new StringBuilder();
        Reader reader = new BufferedReader(new InputStreamReader(zipInputStream, StandardCharsets.UTF_8));
        int c;
@@ -32,4 +24,12 @@ public class ZipUtils {
        }
        return stringBuilder.toString();
    }
+
+    static public Bitmap readImage(ZipInputStream zipInputStream) {
+        return BitmapFactory.decodeStream(zipInputStream);
+    }
+
+    static public JSONObject readJSON(ZipInputStream zipInputStream) throws IOException, JSONException {
+        return new JSONObject(read(zipInputStream));
+    }
 }
--- a/app/src/main/java/protect/card_locker/importexport/CSVHelpers.java
+++ b/app/src/main/java/protect/card_locker/importexport/CSVHelpers.java
@@ -8,14 +8,22 @@ public class CSVHelpers {
    /**
     * Extract a string from the items array. The index into the array
     * is determined by looking up the index in the fields map using the
-     * "key" as the key. If no such key exists, defaultValue is returned.
+     * "key" as the key. If no such key exists, defaultValue is returned
+     * if it is not null. Otherwise, a FormatException is thrown.
     */
-    static String extractString(String key, CSVRecord record, String defaultValue) {
+    static String extractString(String key, CSVRecord record, String defaultValue)
+            throws FormatException {
+        String toReturn = defaultValue;
+
        if (record.isMapped(key)) {
-            return record.get(key);
+            toReturn = record.get(key);
+        } else {
+            if (defaultValue == null) {
+                throw new FormatException("Field not used but expected: " + key);
+            }
        }

-        return defaultValue;
+        return toReturn;
    }

    /**
@@ -24,15 +32,15 @@ public class CSVHelpers {
     * "key" as the key. If no such key exists, or the data is not a valid
     * int, a FormatException is thrown.
     */
-    static Integer extractInt(String key, CSVRecord record)
+    static Integer extractInt(String key, CSVRecord record, boolean nullIsOk)
            throws FormatException {
-        if (!record.isMapped(key)) {
+        if (record.isMapped(key) == false) {
            throw new FormatException("Field not used but expected: " + key);
        }

        String value = record.get(key);
-        if (value.isEmpty()) {
-            throw new FormatException("Field is empty: " + key);
+        if (value.isEmpty() && nullIsOk) {
+            return null;
        }

        try {
@@ -48,15 +56,15 @@ public class CSVHelpers {
     * "key" as the key. If no such key exists, or the data is not a valid
     * int, a FormatException is thrown.
     */
-    static Long extractLong(String key, CSVRecord record)
+    static Long extractLong(String key, CSVRecord record, boolean nullIsOk)
            throws FormatException {
-        if (!record.isMapped(key)) {
+        if (record.isMapped(key) == false) {
            throw new FormatException("Field not used but expected: " + key);
        }

        String value = record.get(key);
-        if (value.isEmpty()) {
-            throw new FormatException("Field is empty: " + key);
+        if (value.isEmpty() && nullIsOk) {
+            return null;
        }

        try {
--- a/app/src/main/java/protect/card_locker/importexport/CatimaExporter.java
+++ b/app/src/main/java/protect/card_locker/importexport/CatimaExporter.java
@@ -127,7 +127,6 @@ public class CatimaExporter implements Exporter {
        printer.printRecord(DBHelper.LoyaltyCardDbIds.ID,
                DBHelper.LoyaltyCardDbIds.STORE,
                DBHelper.LoyaltyCardDbIds.NOTE,
-                DBHelper.LoyaltyCardDbIds.VALID_FROM,
                DBHelper.LoyaltyCardDbIds.EXPIRY,
                DBHelper.LoyaltyCardDbIds.BALANCE,
                DBHelper.LoyaltyCardDbIds.BALANCE_TYPE,
@@ -136,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);

@@ -147,7 +145,6 @@ public class CatimaExporter implements Exporter {
            printer.printRecord(card.id,
                    card.store,
                    card.note,
-                    card.validFrom != null ? card.validFrom.getTime() : "",
                    card.expiry != null ? card.expiry.getTime() : "",
                    card.balance,
                    card.balanceType,
@@ -156,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();
--- a/app/src/main/java/protect/card_locker/importexport/CatimaImporter.java
+++ b/app/src/main/java/protect/card_locker/importexport/CatimaImporter.java
@@ -13,6 +13,7 @@ import org.apache.commons.csv.CSVRecord;

 import java.io.BufferedInputStream;
 import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -54,7 +55,7 @@ public class CatimaImporter implements Importer {

            String fileName = Uri.parse(localFileHeader.getFileName()).getLastPathSegment();
            if (fileName.equals("catima.csv")) {
-                importCSV(context, database, zipInputStream);
+                importCSV(context, database, new ByteArrayInputStream(ZipUtils.read(zipInputStream).getBytes(StandardCharsets.UTF_8)));
            } else if (fileName.endsWith(".png")) {
                Utils.saveCardImage(context, ZipUtils.readImage(zipInputStream), fileName);
            } else {
@@ -67,17 +68,26 @@ public class CatimaImporter implements Importer {
            bufferedInputStream.reset();
            importCSV(context, database, bufferedInputStream);
        }
-
-        input.close();
    }

    public void importCSV(Context context, SQLiteDatabase database, InputStream input) throws IOException, FormatException, InterruptedException {
        BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(input, StandardCharsets.UTF_8));

-        int version = parseVersion(bufferedReader);
+        bufferedReader.mark(100);
+
+        Integer version = 1;
+
+        try {
+            version = Integer.parseInt(bufferedReader.readLine());
+        } catch (NumberFormatException _e) {
+            // Assume version 1
+        }
+
+        bufferedReader.reset();
+
        switch (version) {
            case 1:
-                parseV1(database, bufferedReader);
+                parseV1(context, database, bufferedReader);
                break;
            case 2:
                parseV2(context, database, bufferedReader);
@@ -85,14 +95,16 @@ public class CatimaImporter implements Importer {
            default:
                throw new FormatException(String.format("No code to parse version %s", version));
        }
+
+        bufferedReader.close();
    }

-    public void parseV1(SQLiteDatabase database, BufferedReader input) throws IOException, FormatException, InterruptedException {
+    public void parseV1(Context context, SQLiteDatabase database, BufferedReader input) throws IOException, FormatException, InterruptedException {
        final CSVParser parser = new CSVParser(input, CSVFormat.RFC4180.builder().setHeader().build());

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

                if (Thread.currentThread().isInterrupted()) {
                    throw new InterruptedException();
@@ -106,8 +118,8 @@ public class CatimaImporter implements Importer {
    }

    public void parseV2(Context context, SQLiteDatabase database, BufferedReader input) throws IOException, FormatException, InterruptedException {
-        int part = 0;
-        StringBuilder stringPart = new StringBuilder();
+        Integer part = 0;
+        String stringPart = "";

        try {
            while (true) {
@@ -123,7 +135,7 @@ public class CatimaImporter implements Importer {
                            break;
                        case 1:
                            try {
-                                parseV2Groups(database, stringPart.toString());
+                                parseV2Groups(database, stringPart);
                                sectionParsed = true;
                            } catch (FormatException e) {
                                // We may have a multiline field, try again
@@ -131,7 +143,7 @@ public class CatimaImporter implements Importer {
                            break;
                        case 2:
                            try {
-                                parseV2Cards(context, database, stringPart.toString());
+                                parseV2Cards(context, database, stringPart);
                                sectionParsed = true;
                            } catch (FormatException e) {
                                // We may have a multiline field, try again
@@ -139,7 +151,7 @@ public class CatimaImporter implements Importer {
                            break;
                        case 3:
                            try {
-                                parseV2CardGroups(database, stringPart.toString());
+                                parseV2CardGroups(database, stringPart);
                                sectionParsed = true;
                            } catch (FormatException e) {
                                // We may have a multiline field, try again
@@ -155,12 +167,12 @@ public class CatimaImporter implements Importer {

                    if (sectionParsed) {
                        part += 1;
-                        stringPart = new StringBuilder();
+                        stringPart = "";
                    } else {
-                        stringPart.append(tmp).append('\n');
+                        stringPart += tmp + "\n";
                    }
                } else {
-                    stringPart.append(tmp).append('\n');
+                    stringPart += tmp + "\n";
                }
            }
        } catch (FormatException e) {
@@ -214,7 +226,7 @@ public class CatimaImporter implements Importer {
        }

        for (CSVRecord record : records) {
-            importLoyaltyCard(database, record);
+            importLoyaltyCard(context, database, record);
        }
    }

@@ -243,42 +255,13 @@ public class CatimaImporter implements Importer {
        }
    }

-    /**
-     * Parse the version number of the import file
-     *
-     * @param reader the reader containing the import file
-     * @return the parsed version number, defaulting to 1 if none is found
-     * @throws IOException there was a problem reading the file
-     */
-    private int parseVersion(BufferedReader reader) throws IOException {
-        reader.mark(10); // slightly over the search limit just to be sure
-        StringBuilder sb = new StringBuilder();
-        int searchLimit = 5; // gives you version numbers up to 99999
-        int codePoint;
-        // search until the next whitespace, indicating the end of the version
-        while (!Character.isWhitespace(codePoint = reader.read())) {
-            // we found something that isn't a digit, or we ran out of chars
-            if (!Character.isDigit(codePoint) || searchLimit <= 0) {
-                reader.reset();
-                return 1; // default value
-            }
-            sb.append((char) codePoint);
-            searchLimit--;
-        }
-        reader.reset();
-        if (sb.length() == 0) {
-            return 1;
-        }
-        return Integer.parseInt(sb.toString());
-    }
-
    /**
     * Import a single loyalty card into the database using the given
     * session.
     */
-    private void importLoyaltyCard(SQLiteDatabase database, CSVRecord record)
-            throws FormatException {
-        int id = CSVHelpers.extractInt(DBHelper.LoyaltyCardDbIds.ID, record);
+    private void importLoyaltyCard(Context context, SQLiteDatabase database, CSVRecord record)
+            throws IOException, FormatException {
+        int id = CSVHelpers.extractInt(DBHelper.LoyaltyCardDbIds.ID, record, false);

        String store = CSVHelpers.extractString(DBHelper.LoyaltyCardDbIds.STORE, record, "");
        if (store.isEmpty()) {
@@ -286,38 +269,19 @@ public class CatimaImporter implements Importer {
        }

        String note = CSVHelpers.extractString(DBHelper.LoyaltyCardDbIds.NOTE, record, "");
-
-        Date validFrom = null;
-        Long validFromLong;
-        try {
-            validFromLong = CSVHelpers.extractLong(DBHelper.LoyaltyCardDbIds.VALID_FROM, record);
-        } catch (FormatException ignored) {
-            validFromLong = null;
-        }
-        if (validFromLong != null) {
-            validFrom = new Date(validFromLong);
-        }
-
        Date expiry = null;
-        Long expiryLong;
        try {
-            expiryLong = CSVHelpers.extractLong(DBHelper.LoyaltyCardDbIds.EXPIRY, record);
-        } catch (FormatException ignored) {
-            expiryLong = null;
-        }
-        if (expiryLong != null) {
-            expiry = new Date(expiryLong);
+            expiry = new Date(CSVHelpers.extractLong(DBHelper.LoyaltyCardDbIds.EXPIRY, record, true));
+        } catch (NullPointerException | FormatException e) {
        }

-        // These fields did not exist in versions 1.8.1 and before
-        // We default to 0 so we can still import old backups
-        BigDecimal balance = new BigDecimal("0");
-        String balanceString = CSVHelpers.extractString(DBHelper.LoyaltyCardDbIds.BALANCE, record, null);
-        if (balanceString != null) {
-            try {
-                balance = new BigDecimal(CSVHelpers.extractString(DBHelper.LoyaltyCardDbIds.BALANCE, record, null));
-            } catch (NumberFormatException ignored) {
-            }
+        BigDecimal balance;
+        try {
+            balance = new BigDecimal(CSVHelpers.extractString(DBHelper.LoyaltyCardDbIds.BALANCE, record, null));
+        } catch (FormatException _e) {
+            // These fields did not exist in versions 1.8.1 and before
+            // We catch this exception so we can still import old backups
+            balance = new BigDecimal("0");
        }

        Currency balanceType = null;
@@ -343,38 +307,29 @@ public class CatimaImporter implements Importer {
        }

        Integer headerColor = null;
-        try {
-            headerColor = CSVHelpers.extractInt(DBHelper.LoyaltyCardDbIds.HEADER_COLOR, record);
-        } catch (FormatException ignored) {
+
+        if (record.isMapped(DBHelper.LoyaltyCardDbIds.HEADER_COLOR)) {
+            headerColor = CSVHelpers.extractInt(DBHelper.LoyaltyCardDbIds.HEADER_COLOR, record, true);
        }

        int starStatus = 0;
        try {
-            starStatus = CSVHelpers.extractInt(DBHelper.LoyaltyCardDbIds.STAR_STATUS, record);
+            starStatus = CSVHelpers.extractInt(DBHelper.LoyaltyCardDbIds.STAR_STATUS, record, false);
        } catch (FormatException _e) {
            // This field did not exist in versions 0.28 and before
            // We catch this exception so we can still import old backups
        }
        if (starStatus != 1) starStatus = 0;

-        int archiveStatus = 0;
-        try {
-            archiveStatus = CSVHelpers.extractInt(DBHelper.LoyaltyCardDbIds.ARCHIVE_STATUS, record);
-        } 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);
+            lastUsed = CSVHelpers.extractLong(DBHelper.LoyaltyCardDbIds.LAST_USED, record, false);
        } catch (FormatException _e) {
            // This field did not exist in versions 2.5.0 and before
            // We catch this exception so we can still import old backups
        }

-        DBHelper.insertLoyaltyCard(database, id, store, note, validFrom, 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);
    }

    /**
@@ -384,10 +339,6 @@ public class CatimaImporter implements Importer {
    private void importGroup(SQLiteDatabase database, CSVRecord record) throws FormatException {
        String id = CSVHelpers.extractString(DBHelper.LoyaltyCardDbGroups.ID, record, null);

-        if (id == null) {
-            throw new FormatException("Group has no ID: " + record);
-        }
-
        DBHelper.insertGroup(database, id);
    }

@@ -396,15 +347,11 @@ public class CatimaImporter implements Importer {
     * session.
     */
    private void importCardGroupMapping(SQLiteDatabase database, CSVRecord record) throws FormatException {
-        int cardId = CSVHelpers.extractInt(DBHelper.LoyaltyCardDbIdsGroups.cardID, record);
+        Integer cardId = CSVHelpers.extractInt(DBHelper.LoyaltyCardDbIdsGroups.cardID, record, false);
        String groupId = CSVHelpers.extractString(DBHelper.LoyaltyCardDbIdsGroups.groupID, record, null);

-        if (groupId == null) {
-            throw new FormatException("Group has no ID: " + record);
-        }
-
        List<Group> cardGroups = DBHelper.getLoyaltyCardGroups(database, cardId);
        cardGroups.add(DBHelper.getGroup(database, groupId));
        DBHelper.setLoyaltyCardGroups(database, cardId, cardGroups);
    }
-}
+}
--- a/app/src/main/java/protect/card_locker/importexport/FidmeImporter.java
+++ b/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, 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);
    }
 }
--- a/app/src/main/java/protect/card_locker/importexport/ImportExportResult.java
+++ b/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;
 }
--- a/app/src/main/java/protect/card_locker/importexport/ImportExportResultType.java
+++ b/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;
-}
--- a/app/src/main/java/protect/card_locker/importexport/MultiFormatExporter.java
+++ b/app/src/main/java/protect/card_locker/importexport/MultiFormatExporter.java
@@ -4,6 +4,7 @@ import android.content.Context;
 import android.database.sqlite.SQLiteDatabase;
 import android.util.Log;

+import java.io.IOException;
 import java.io.OutputStream;

 public class MultiFormatExporter {
@@ -31,20 +32,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;
+        }
    }
 }
--- a/app/src/main/java/protect/card_locker/importexport/MultiFormatImporter.java
+++ b/app/src/main/java/protect/card_locker/importexport/MultiFormatImporter.java
@@ -6,7 +6,13 @@ 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.FormatException;

 public class MultiFormatImporter {
    private static final String TAG = "Catima";
@@ -40,31 +46,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;
    }
 }
--- a/app/src/main/java/protect/card_locker/importexport/StocardImporter.java
+++ b/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;
@@ -74,102 +69,62 @@ public class StocardImporter implements Importer {
            String fileName = localFileHeader.getFileName();
            String[] nameParts = fileName.split("/");

-            if (nameParts.length < 2) {
-                continue;
-            }
-
            if (providersFileName == null) {
                providersFileName = new String[]{
-                        "extracts",
-                        nameParts[1],
+                        nameParts[0],
+                        "sync",
+                        "data",
                        "users",
-                        nameParts[1],
-                        "analytics-properties",
-                        "content.json"
-                };
-                customProvidersBaseName = new String[]{
-                        "extracts",
-                        nameParts[1],
-                        "users",
-                        nameParts[1],
-                        "loyalty-card-custom-providers"
+                        nameParts[0],
+                        "analytics-properties.json"
                };
                cardBaseName = new String[]{
-                        "extracts",
-                        nameParts[1],
+                        nameParts[0],
+                        "sync",
+                        "data",
                        "users",
-                        nameParts[1],
+                        nameParts[0],
                        "loyalty-cards"
                };
            }

-            if (startsWith(nameParts, customProvidersBaseName, 1)) {
-                // Extract providerId
-                customProviderId = nameParts[customProvidersBaseName.length].split("\\.", 2)[0];
-
-                // Name file
-                if (fileName.endsWith(customProviderId + "/content.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];

                // This is the card itself
-                if (fileName.endsWith(cardName + "/content.json")) {
-                    JSONObject jsonObject = ZipUtils.readJSON(zipInputStream);
+                if (nameParts.length == cardBaseName.length + 1) {
+                    // Ignore the .txt file
+                    if (fileName.endsWith(".json")) {
+                        JSONObject jsonObject = ZipUtils.readJSON(zipInputStream);

-                    loyaltyCardHashMap = appendToHashMap(
-                            loyaltyCardHashMap,
-                            cardName,
-                            "cardId",
-                            jsonObject.getString("input_id")
-                    );
-
-                    // Provider ID can be either custom or not, extract whatever version is relevant
-                    String customProviderPrefix = "/users/" + nameParts[1] + "/loyalty-card-custom-providers/";
-                    String providerId = jsonObject
-                            .getJSONObject("input_provider_reference")
-                            .getString("identifier");
-                    if (providerId.startsWith(customProviderPrefix)) {
-                        providerId = providerId.substring(customProviderPrefix.length());
-                    } else {
-                        providerId = providerId.substring("/loyalty-card-providers/".length());
-                    }
-
-                    loyaltyCardHashMap = appendToHashMap(
-                            loyaltyCardHashMap,
-                            cardName,
-                            "_providerId",
-                            providerId
-                    );
-
-                    if (jsonObject.has("input_barcode_format")) {
-                        loyaltyCardHashMap = appendToHashMap(
+                        loyaltyCardHashMap = appendToLoyaltyCardHashMap(
                                loyaltyCardHashMap,
                                cardName,
-                                "barcodeType",
-                                jsonObject.getString("input_barcode_format")
+                                "cardId",
+                                jsonObject.getString("input_id")
                        );
+                        loyaltyCardHashMap = appendToLoyaltyCardHashMap(
+                                loyaltyCardHashMap,
+                                cardName,
+                                "_providerId",
+                                jsonObject
+                                        .getJSONObject("input_provider_reference")
+                                        .getString("identifier")
+                                        .substring("/loyalty-card-providers/".length())
+                        );
+
+                        if (jsonObject.has("input_barcode_format")) {
+                            loyaltyCardHashMap = appendToLoyaltyCardHashMap(
+                                    loyaltyCardHashMap,
+                                    cardName,
+                                    "barcodeType",
+                                    jsonObject.getString("input_barcode_format")
+                            );
+                        }
                    }
-                } else if (fileName.endsWith("notes/default/content.json")) {
-                    loyaltyCardHashMap = appendToHashMap(
+                } else if (fileName.endsWith("notes/default.json")) {
+                    loyaltyCardHashMap = appendToLoyaltyCardHashMap(
                            loyaltyCardHashMap,
                            cardName,
                            "note",
@@ -177,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",
@@ -200,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, 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);
@@ -261,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<>();
--- a/app/src/main/java/protect/card_locker/importexport/VoucherVaultImporter.java
+++ b/app/src/main/java/protect/card_locker/importexport/VoucherVaultImporter.java
@@ -126,7 +126,7 @@ public class VoucherVaultImporter implements Importer {
                    throw new FormatException("Unknown colour type found: " + colorFromJSON);
            }

-            DBHelper.insertLoyaltyCard(database, store, "", null, 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();
--- a/app/src/main/java/protect/card_locker/preferences/Settings.java
+++ b/app/src/main/java/protect/card_locker/preferences/Settings.java
@@ -9,6 +9,7 @@ import androidx.annotation.IntegerRes;
 import androidx.annotation.StringRes;
 import androidx.appcompat.app.AppCompatDelegate;
 import androidx.preference.PreferenceManager;
+
 import protect.card_locker.R;
 import protect.card_locker.Utils;

@@ -91,8 +92,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() {
@@ -106,8 +107,4 @@ public class Settings {
    public boolean getOledDark() {
        return getBoolean(R.string.settings_key_oled_dark, false);
    }
-
-    public String getColor() {
-        return getString(R.string.setting_key_theme_color, mContext.getResources().getString(R.string.settings_key_system_theme));
-    }
 }
--- a/app/src/main/java/protect/card_locker/preferences/SettingsActivity.java
+++ b/app/src/main/java/protect/card_locker/preferences/SettingsActivity.java
@@ -6,8 +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;
@@ -17,35 +15,33 @@ import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AppCompatDelegate;
 import androidx.appcompat.widget.Toolbar;
 import androidx.fragment.app.DialogFragment;
-import androidx.fragment.app.FragmentResultListener;
 import androidx.preference.ListPreference;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceFragmentCompat;

-import kotlin.Suppress;
 import nl.invissvenska.numberpickerpreference.NumberDialogPreference;
 import nl.invissvenska.numberpickerpreference.NumberPickerPreferenceDialogFragment;
 import protect.card_locker.CatimaAppCompatActivity;
 import protect.card_locker.MainActivity;
 import protect.card_locker.R;
 import protect.card_locker.Utils;
-import protect.card_locker.databinding.SettingsActivityBinding;

 public class SettingsActivity extends CatimaAppCompatActivity {

-    private SettingsActivityBinding binding;
    private final static String RELOAD_MAIN_STATE = "mReloadMain";
    private SettingsFragment fragment;

    @Override
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
-        binding = SettingsActivityBinding.inflate(getLayoutInflater());
        setTitle(R.string.settings);
-        setContentView(binding.getRoot());
-        Toolbar toolbar = binding.toolbar;
+        setContentView(R.layout.settings_activity);
+        Toolbar toolbar = findViewById(R.id.toolbar);
        setSupportActionBar(toolbar);
-        enableToolbarBackButton();
+        ActionBar actionBar = getSupportActionBar();
+        if (actionBar != null) {
+            actionBar.setDisplayHomeAsUpEnabled(true);
+        }

        // Display the fragment as the main content.
        fragment = new SettingsFragment();
@@ -144,17 +140,6 @@ public class SettingsActivity extends CatimaAppCompatActivity {
                refreshActivity(true);
                return true;
            });
-
-            ListPreference colorPreference = findPreference(getResources().getString(R.string.setting_key_theme_color));
-            assert colorPreference != null;
-            colorPreference.setOnPreferenceChangeListener((preference, o) -> {
-                refreshActivity(true);
-                return true;
-            });
-            if (!DynamicColors.isDynamicColorAvailable()) {
-                colorPreference.setEntryValues(R.array.color_values_no_dynamic);
-                colorPreference.setEntries(R.array.color_value_strings_no_dynamic);
-            }
        }

        private void refreshActivity(boolean reloadMain) {
@@ -166,11 +151,6 @@ public class SettingsActivity extends CatimaAppCompatActivity {
        }

        @Override
-        @SuppressWarnings("deprecation") // setTargetFragment
-        // androidx.preference.PreferenceDialogFragmentCompat uses the deprecated method
-        // `getTargetFragment()`, which throws if `setTargetFragment()` isn't used before.
-        // While this isn't fixed on upstream, suppress the deprecation warning
-        // https://issuetracker.google.com/issues/181793702
        public void onDisplayPreferenceDialog(Preference preference) {
            if (preference instanceof NumberDialogPreference) {
                NumberDialogPreference dialogPreference = (NumberDialogPreference) preference;
--- a/app/src/main/res/anim/slide_in_left.xml
+++ b/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>
--- a/app/src/main/res/anim/slide_in_right.xml
+++ b/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>
--- a/app/src/main/res/anim/slide_out_left.xml
+++ b/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>
--- a/app/src/main/res/anim/slide_out_right.xml
+++ b/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>
--- a/app/src/main/res/drawable/camera_permission_denied.xml
+++ b/app/src/main/res/drawable/camera_permission_denied.xml
@@ -1,5 +0,0 @@
-<vector android:height="24dp" android:tint="#BD0000"
-    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.94,8.12L7.48,4.66L9,3h6l1.83,2H20c1.1,0 2,0.9 2,2v12c0,0.05 -0.01,0.1 -0.02,0.16l-5.1,-5.1C16.96,13.71 17,13.36 17,13c0,-2.76 -2.24,-5 -5,-5C11.64,8 11.29,8.04 10.94,8.12zM20.49,23.31L18.17,21H4c-1.1,0 -2,-0.9 -2,-2V7c0,-0.59 0.27,-1.12 0.68,-1.49l-2,-2L2.1,2.1l19.8,19.8L20.49,23.31zM14.49,17.32l-1.5,-1.5C12.67,15.92 12.35,16 12,16c-1.66,0 -3,-1.34 -3,-3c0,-0.35 0.08,-0.67 0.19,-0.98l-1.5,-1.5C7.25,11.24 7,12.09 7,13c0,2.76 2.24,5 5,5C12.91,18 13.76,17.75 14.49,17.32z"/>
-</vector>
--- a/app/src/main/res/drawable/home_arrow_back_white.xml
+++ b/app/src/main/res/drawable/home_arrow_back_white.xml
@@ -1,4 +1,4 @@
-<vector android:autoMirrored="true" android:height="24dp" android:tint="?attr/colorControlNormal"
+<vector android:height="24dp" android:tint="?attr/colorControlNormal"
    android:viewportHeight="24" android:viewportWidth="24"
    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
    <path android:fillColor="@android:color/white" android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z"/>
--- a/app/src/main/res/drawable/ic_baseline_archive_24.xml
+++ b/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>
--- a/app/src/main/res/drawable/ic_baseline_archive_24_black.xml
+++ b/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>
--- a/app/src/main/res/drawable/ic_baseline_chevron_left_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_chevron_left_24.xml
@@ -1,5 +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>
--- a/app/src/main/res/drawable/ic_baseline_chevron_right_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_chevron_right_24.xml
@@ -1,5 +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="M10,6L8.59,7.41 13.17,12l-4.58,4.59L10,18l6,-6z"/>
-</vector>
--- a/app/src/main/res/drawable/ic_baseline_info_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_info_24.xml
@@ -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="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,17h-2v-6h2v6zM13,9h-2L11,7h2v2z"/>
-</vector>
--- a/app/src/main/res/drawable/ic_baseline_shopping_cart_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_shopping_cart_24.xml
@@ -1,5 +0,0 @@
-<vector android:height="24dp" android:tint="?attr/colorControlNormal"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="M7,18c-1.1,0 -1.99,0.9 -1.99,2S5.9,22 7,22s2,-0.9 2,-2 -0.9,-2 -2,-2zM1,2v2h2l3.6,7.59 -1.35,2.45c-0.16,0.28 -0.25,0.61 -0.25,0.96 0,1.1 0.9,2 2,2h12v-2L7.42,15c-0.14,0 -0.25,-0.11 -0.25,-0.25l0.03,-0.12 0.9,-1.63h7.45c0.75,0 1.41,-0.41 1.75,-1.03l3.58,-6.49c0.08,-0.14 0.12,-0.31 0.12,-0.48 0,-0.55 -0.45,-1 -1,-1L5.21,4l-0.94,-2L1,2zM17,18c-1.1,0 -1.99,0.9 -1.99,2s0.89,2 1.99,2 2,-0.9 2,-2 -0.9,-2 -2,-2z"/>
-</vector>
--- a/app/src/main/res/drawable/ic_done.xml
+++ b/app/src/main/res/drawable/ic_done.xml
@@ -2,7 +2,8 @@
    android:width="24dp"
    android:height="24dp"
    android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
  <path
      android:fillColor="#FFFFFF"
      android:pathData="M9,16.2L4.8,12l-1.4,1.4L9,19 21,7l-1.4,-1.4L9,16.2z"/>
--- a/app/src/main/res/drawable/ic_launcher_monochrome.xml
+++ b/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>
--- a/app/src/main/res/drawable/ic_overflow_menu.xml
+++ b/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>
--- a/app/src/main/res/drawable/ic_valid_from_24dp.xml
+++ b/app/src/main/res/drawable/ic_valid_from_24dp.xml
@@ -1,16 +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.5,7H11v6l5.25,3.15 0.75,-1.23 -4.5,-2.67z" />
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M18,15.782V22l4.886,-3.109z" />
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M11.99,2C6.47,2 2,6.48 2,12C2,17.52 6.47,22 11.99,22C13.417,22 14.772,21.699 16,21.162L16,18.928C14.823,19.608 13.458,20 12,20C7.58,20 4,16.42 4,12C4,7.58 7.58,4 12,4C16.42,4 20,7.58 20,12C20,13.061 19.791,14.073 19.416,15L21.541,15C21.839,14.053 22,13.045 22,12C22,6.48 17.52,2 11.99,2zM11,7L11,13L16,16L16,15L16.951,15L17,14.92L12.5,12.25L12.5,7L11,7z" />
-</vector>
--- a/app/src/main/res/drawable/round_outline.xml
+++ b/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>
--- a/app/src/main/res/drawable/save_24dp.xml
+++ b/app/src/main/res/drawable/save_24dp.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="?attr/colorControlNormal"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M17,3L5,3c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2L21,7l-4,-4zM12,19c-1.66,0 -3,-1.34 -3,-3s1.34,-3 3,-3 3,1.34 3,3 -1.34,3 -3,3zM15,9L5,9L5,5h10v4z"/>
+</vector>
--- a/app/src/main/res/layout/activity_manage_group.xml
+++ b/app/src/main/res/layout/activity_manage_group.xml
@@ -7,15 +7,15 @@
    android:layout_height="match_parent"
    android:fitsSystemWindows="true"
    tools:context="protect.card_locker.ManageGroupActivity">
-
-    <com.google.android.material.floatingactionbutton.FloatingActionButton
+    <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
        android:id="@+id/fabSave"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_gravity="end|bottom"
-        android:layout_margin="16dp"
-        android:contentDescription="@string/save"
-        app:srcCompat="@drawable/ic_done" />
+        app:icon="@drawable/save_24dp"
+        android:text="@string/save"
+        android:layout_margin="16dp" />
+
    <LinearLayout
        android:layout_width="match_parent"
        android:layout_height="match_parent"
--- a/app/src/main/res/layout/archive_activity.xml
+++ b/app/src/main/res/layout/archive_activity.xml
@@ -1,34 +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
-        android:id="@+id/include"
-        layout="@layout/content_main" />
-
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
--- a/app/src/main/res/layout/barcode_layout.xml
+++ b/app/src/main/res/layout/barcode_layout.xml
@@ -5,7 +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"
--- a/app/src/main/res/layout/barcode_selector_activity.xml
+++ b/app/src/main/res/layout/barcode_selector_activity.xml
@@ -74,6 +74,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"
--- a/app/src/main/res/layout/camera_permission_failed_layout.xml
+++ b/app/src/main/res/layout/camera_permission_failed_layout.xml
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout 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"
-    app:layout_behavior="@string/appbar_scrolling_view_behavior"
-    tools:context="protect.card_locker.MainActivity"
-    tools:showIn="@layout/custom_barcode_scanner">
-
-    <LinearLayout
-        android:id="@+id/camera_permission_denied_clickable_area"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
-
-        <ImageView
-            android:id="@+id/camera_permission_denied_icon"
-            android:layout_width="match_parent"
-            android:layout_height="84dp"
-            android:scaleType="fitCenter"
-            android:src="@drawable/camera_permission_denied" />
-
-        <TextView
-            android:id="@+id/camera_permission_denied_title"
-            style="@style/TextAppearance.Material3.HeadlineLarge"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:text="@string/cameraPermissionDeniedTitle" />
-
-        <TextView
-            android:id="@+id/camera_permission_denied_message"
-            style="@style/AppTheme.TextView.NoData"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:text="@string/noCameraPermissionDirectToSystemSetting" />
-    </LinearLayout>
-
-</RelativeLayout>
--- a/app/src/main/res/layout/content_main.xml
+++ b/app/src/main/res/layout/content_main.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout
+    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"
@@ -8,63 +9,42 @@
    tools:context="protect.card_locker.MainActivity"
    tools:showIn="@layout/main_activity">

-    <LinearLayout
-        android:visibility="gone"
-        android:id="@+id/helpSection"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
-
-        <ImageView
-            android:id="@+id/welcome_icon"
-            android:layout_width="match_parent"
-            android:layout_height="184dp"
-            android:scaleType="fitCenter"
-            android:src="@drawable/ic_launcher_foreground" />
-
-        <TextView
-            android:id="@+id/welcome_text"
-            style="@style/TextAppearance.Material3.HeadlineLarge"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:text="@string/welcome" />
-
-        <TextView
-            android:id="@+id/add_card_instruction"
-            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
-        android:id="@+id/noMatchingCardsText"
        style="@style/AppTheme.TextView.NoData"
+        android:id="@+id/noMatchingCardsText"
        android:layout_width="wrap_content"
        android:layout_height="match_parent"
        android:gravity="center"
        android:text="@string/noMatchingGiftCards"
-        android:visibility="gone" />
-
+        android:visibility="gone"/>
+    
    <TextView
-        android:id="@+id/noGroupCardsText"
        style="@style/AppTheme.TextView.NoData"
+        android:id="@+id/noGroupCardsText"
        android:layout_width="wrap_content"
        android:layout_height="match_parent"
        android:gravity="center"
        android:text="@string/noGroupCards"
-        android:visibility="gone" />
+        android:visibility="gone"/>

    <androidx.recyclerview.widget.RecyclerView
        android:id="@+id/list"
+        app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
+        app:spanCount="@integer/main_view_card_columns"
        android:layout_width="match_parent"
        android:layout_height="match_parent"
-        android:clipToPadding="false"
        android:paddingBottom="80dp"
+        android:clipToPadding="false"
        android:scrollbars="vertical"
-        android:visibility="gone"
-        app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
-        app:spanCount="@integer/main_view_card_columns" />
+        android:visibility="gone"/>
+
 </RelativeLayout>
--- a/app/src/main/res/layout/custom_barcode_scanner.xml
+++ b/app/src/main/res/layout/custom_barcode_scanner.xml
@@ -1,57 +1,41 @@
-<?xml version="1.0" encoding="utf-8"?><!-- Based on https://github.com/journeyapps/zxing-android-embedded/blob/0fdfbce9fb3285e985bad9971c5f7c0a7a334e7b/sample/src/main/res/layout/custom_barcode_scanner.xml originally released under Apache 2.0 -->
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Based on https://github.com/journeyapps/zxing-android-embedded/blob/0fdfbce9fb3285e985bad9971c5f7c0a7a334e7b/sample/src/main/res/layout/custom_barcode_scanner.xml originally released under Apache 2.0 -->
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto">

    <com.journeyapps.barcodescanner.BarcodeView
-        android:id="@+id/zxing_barcode_surface"
        android:layout_width="match_parent"
        android:layout_height="match_parent"
-        app:zxing_framing_rect_height="250dp"
-        app:zxing_framing_rect_width="250dp" />
+        android:id="@+id/zxing_barcode_surface"
+        app:zxing_framing_rect_width="250dp"
+        app:zxing_framing_rect_height="250dp"/>

    <com.journeyapps.barcodescanner.ViewfinderView
-        android:id="@+id/zxing_viewfinder_view"
        android:layout_width="match_parent"
        android:layout_height="match_parent"
+        android:id="@+id/zxing_viewfinder_view"
        app:zxing_possible_result_points="@color/zxing_custom_possible_result_points"
        app:zxing_result_view="@color/zxing_custom_result_view"
        app:zxing_viewfinder_laser="@color/zxing_custom_viewfinder_laser"
-        app:zxing_viewfinder_mask="@color/zxing_custom_viewfinder_mask" />
+        app:zxing_viewfinder_mask="@color/zxing_custom_viewfinder_mask"/>

-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/card_input_container"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:padding="@dimen/activity_scanner_padding">
-
-        <include
-            android:id="@+id/camera_permission_denied_layout"
-            layout="@layout/camera_permission_failed_layout"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:visibility="gone"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom|center_horizontal"
+        android:gravity="center_horizontal"
+        android:orientation="vertical">

        <Button
            android:id="@+id/add_from_image"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
-            android:text="@string/addFromImage"
-            app:layout_constraintBottom_toTopOf="@+id/add_manually"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/camera_permission_denied_layout"
-            app:layout_constraintVertical_bias="1.0" />
+            android:text="@string/addFromImage" />

        <Button
            android:id="@+id/add_manually"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
-            android:text="@string/addManually"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent" />
-    </androidx.constraintlayout.widget.ConstraintLayout>
+            android:text="@string/addManually" />
+    </LinearLayout>
 </merge>
--- a/app/src/main/res/layout/group_main.xml
+++ b/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>
--- a/app/src/main/res/layout/loyalty_card_edit_activity.xml
+++ b/app/src/main/res/layout/loyalty_card_edit_activity.xml
@@ -7,14 +7,14 @@
    android:layout_height="match_parent"
    android:fitsSystemWindows="true">

-    <com.google.android.material.floatingactionbutton.FloatingActionButton
+    <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
        android:id="@+id/fabSave"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_gravity="end|bottom"
-        android:layout_margin="16dp"
-        android:contentDescription="@string/save"
-        app:srcCompat="@drawable/ic_done" />
+        app:icon="@drawable/save_24dp"
+        android:text="@string/save"
+        android:layout_margin="16dp" />

    <com.google.android.material.appbar.AppBarLayout
        android:layout_width="match_parent"
@@ -73,7 +73,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 +83,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
@@ -190,18 +180,17 @@

                <!-- Barcode -->
                <LinearLayout android:orientation="horizontal"
-                    android:layout_marginTop="10.0dp"
-                    android:layout_marginStart="10.0dp"
-                    android:layout_marginEnd="10.0dp"
+                    android:padding="10.0dip"
                    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:padding="10.0dp"
+                        android:background="#ffffff"
                        android:id="@+id/barcode"
                        android:layout_weight="1.0"/>
                </LinearLayout>
@@ -288,7 +277,7 @@
                            android:layout_width="match_parent"
                            android:layout_height="wrap_content"
                            android:inputType="numberDecimal"
-                            android:digits="0123456789,." />
+                            android:digits="0123456789.,$" />

                    </com.google.android.material.textfield.TextInputLayout>

@@ -311,32 +300,6 @@
                    </com.google.android.material.textfield.TextInputLayout>
                </LinearLayout>

-                <!-- Valid from -->
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:paddingHorizontal="@dimen/inputPadding"
-                    android:paddingTop="@dimen/inputPadding"
-                    android:orientation="horizontal">
-
-                    <!-- Valid from -->
-                    <com.google.android.material.textfield.TextInputLayout
-                        android:id="@+id/validFromView"
-                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1.0"
-                        android:hint="@string/validFromDate"
-                        android:labelFor="@+id/validFromField">
-
-                        <AutoCompleteTextView
-                            android:id="@+id/validFromField"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:inputType="none"/>
-                    </com.google.android.material.textfield.TextInputLayout>
-                </LinearLayout>
-
                <!-- Expiration -->
                <LinearLayout
                    android:layout_width="match_parent"
--- a/app/src/main/res/layout/loyalty_card_layout.xml
+++ b/app/src/main/res/layout/loyalty_card_layout.xml
@@ -47,15 +47,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"
@@ -88,33 +86,6 @@

            </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
@@ -176,30 +147,11 @@
            android:drawablePadding="4dp"
            android:visibility="gone"
            app:layout_constraintTop_toBottomOf="@+id/info_divider"
-            app:layout_constraintBottom_toTopOf="@+id/validFrom"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            tools:visibility="visible"
-            tools:text="525 points"/>
-
-        <TextView
-            android:id="@+id/validFrom"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
-            android:layout_marginEnd="8dp"
-            android:layout_marginBottom="4dp"
-            android:textAppearance="?attr/textAppearanceBody2"
-            android:textColor="?android:attr/textColorSecondary"
-            app:drawableLeftCompat="@drawable/ic_valid_from_24dp"
-            android:drawablePadding="4dp"
-            android:visibility="gone"
-            app:layout_constraintTop_toBottomOf="@+id/balance"
            app:layout_constraintBottom_toTopOf="@+id/expiry"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toStartOf="parent"
            tools:visibility="visible"
-            tools:text="Today"/>
+            tools:text="525 points"/>

        <TextView
            android:id="@+id/expiry"
@@ -213,12 +165,11 @@
            app:drawableLeftCompat="@drawable/ic_baseline_access_time_24"
            android:drawablePadding="4dp"
            android:visibility="gone"
-            app:layout_constraintTop_toBottomOf="@+id/validFrom"
+            app:layout_constraintTop_toBottomOf="@+id/balance"
            app:layout_constraintBottom_toBottomOf="parent"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toStartOf="parent"
            tools:visibility="visible"
            tools:text="Tomorrow"/>
-
    </androidx.constraintlayout.widget.ConstraintLayout>
-</com.google.android.material.card.MaterialCardView>
+</com.google.android.material.card.MaterialCardView>
--- a/app/src/main/res/layout/loyalty_card_view_layout.xml
+++ b/app/src/main/res/layout/loyalty_card_view_layout.xml
@@ -8,6 +8,238 @@
    android:layout_height="fill_parent"
    android:fitsSystemWindows="true">

+    <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
+        android:id="@+id/fabEdit"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="end|bottom"
+        app:icon="@drawable/ic_mode_edit_white_24dp"
+        android:text="@string/edit_card"
+        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: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: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="?attr/colorOnPrimary"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintBottom_toTopOf="@+id/mainImage"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                android:background="?attr/colorPrimary" />
+
+            <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="?attr/colorOnPrimary"
+                app:layout_constraintTop_toBottomOf="@+id/mainImage"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                android:background="?attr/colorPrimary" />
+
+            <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:contentDescription="@string/set_scale"
+                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="?android:colorBackground"
+        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/showMoreInfo"
+            android:scaleType="fitCenter"
+            app:srcCompat="@drawable/ic_baseline_arrow_drop_up_24"
+            app:tint="?attr/colorOnPrimary"
+            android:background="?attr/colorPrimary" />
+
+        <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"
@@ -17,7 +249,8 @@
        android:clipChildren="false"
        android:clipToPadding="false"
        android:fitsSystemWindows="true"
-        android:weightSum="1.0">
+        android:weightSum="1.0"
+        >

        <com.google.android.material.appbar.MaterialToolbar
            android:id="@+id/toolbar_landscape"
@@ -77,214 +310,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" />
-
-        <ImageButton
-            android:id="@+id/button_update_balance"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_gravity="end"
-            android:background="@android:color/transparent"
-            android:paddingStart="12dp"
-            android:paddingEnd="12dp"
-            android:src="@drawable/ic_baseline_shopping_cart_24"
-            android:tooltipText="@string/updateBalance"
-            android:visibility="gone" />
-
-    </com.google.android.material.bottomappbar.BottomAppBar>
-
-    <com.google.android.material.floatingactionbutton.FloatingActionButton
-        android:id="@+id/fabEdit"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:srcCompat="@drawable/ic_mode_edit_white_24dp"
-        android:contentDescription="@string/edit"
-        app:layout_anchor="@id/bottom_app_bar" />

 </androidx.coordinatorlayout.widget.CoordinatorLayout>
--- a/app/src/main/res/layout/main_activity.xml
+++ b/app/src/main/res/layout/main_activity.xml
@@ -8,13 +8,13 @@
    android:fitsSystemWindows="true"
    tools:context="protect.card_locker.MainActivity">

-    <com.google.android.material.floatingactionbutton.FloatingActionButton
+    <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
        android:id="@+id/fabAdd"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_gravity="end|bottom"
-        app:srcCompat="@drawable/ic_add_white_24dp"
-        android:contentDescription="@string/action_add"
+        app:icon="@drawable/ic_add_white_24dp"
+        android:text="@string/action_add"
        android:layout_margin="16dp" />

    <com.google.android.material.appbar.AppBarLayout
@@ -36,8 +36,6 @@

    </com.google.android.material.appbar.AppBarLayout>

-    <include
-        android:id="@+id/include"
-        layout="@layout/content_main" />
+    <include layout="@layout/content_main"/>

 </androidx.coordinatorlayout.widget.CoordinatorLayout>
--- a/app/src/main/res/layout/manage_groups_activity.xml
+++ b/app/src/main/res/layout/manage_groups_activity.xml
@@ -8,13 +8,13 @@
    android:fitsSystemWindows="true"
    tools:context="protect.card_locker.ManageGroupsActivity">

-    <com.google.android.material.floatingactionbutton.FloatingActionButton
+    <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
        android:id="@+id/fabAdd"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_gravity="end|bottom"
-        app:srcCompat="@drawable/ic_add_white_24dp"
-        android:contentDescription="@string/action_add"
+        app:icon="@drawable/ic_add_white_24dp"
+        android:text="@string/action_add"
        android:layout_margin="16dp" />

    <com.google.android.material.appbar.AppBarLayout
@@ -29,8 +29,6 @@

    </com.google.android.material.appbar.AppBarLayout>

-    <include
-        android:id="@+id/include"
-        layout="@layout/group_main" />
+    <include layout="@layout/group_main"/>

 </androidx.coordinatorlayout.widget.CoordinatorLayout>
--- a/app/src/main/res/layout/settings_activity.xml
+++ b/app/src/main/res/layout/settings_activity.xml
@@ -1,11 +1,9 @@
 <?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"
@@ -13,16 +11,15 @@

        <com.google.android.material.appbar.MaterialToolbar
            android:id="@+id/toolbar"
-            style="?attr/toolbarStyle"
            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize" />
+            android:layout_height="?attr/actionBarSize"
+            style="?attr/toolbarStyle" />

    </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>
--- a/app/src/main/res/layout/simple_toolbar_list_activity.xml
+++ b/app/src/main/res/layout/simple_toolbar_list_activity.xml
@@ -3,8 +3,7 @@
    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"
--- a/app/src/main/res/menu/archive_menu.xml
+++ b/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>
--- a/app/src/main/res/menu/card_details_menu.xml
+++ b/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>
--- a/app/src/main/res/menu/card_longclick_menu.xml
+++ b/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>
--- a/app/src/main/res/menu/card_view_menu.xml
+++ b/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>
--- a/app/src/main/res/menu/main_menu.xml
+++ b/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"
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/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>
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/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>
--- a/app/src/main/res/raw/contributors.txt
+++ b/app/src/main/res/raw/contributors.txt
@@ -2,207 +2,92 @@ 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
-StoyanDimitrov
-Altonss
-SlavekB
-Michael Moroni
-Gediminas Murauskas
 Petr Novák
-Joel A
+Altonss
 Taco
-pfaffenrodt
-laralem
+Joel A
+Gediminas Murauskas
+StoyanDimitrov
 Nyatsuki
-gallegonovato
-HudobniVolk
 Samantaz Fox
 arno-github
 Ankit Tiwari
 Sergio Paredes
-Aayush Gupta
-huuhaa
-Quentin PAGÈS
-Alexander Ivanov
+Michael Moroni
+laralem
 arshbeerSingh
-Denis Shilin
-Freddo espresso
-Silvério Santos
+huuhaa
 Miha Frangež
-Arnis Jaundžeikars
-Kefir2105
 sr093906
-Giovanni Donisi
 mdvhimself
-Katarzyna
-echo r"0xX4H" | rev
-Magnitudee
+Maciej Błędkowski
 Olivia (Zoe)
+Quentin PAGÈS
 betsythefc
 waffshappen
-Robin
-Eric
 ati3
-(Cliff Heraldo)
-Evgeniy Khramov
-Jane Kong
-Jiri Grönroos
 K. Herbert
-Lisa A.
-Mawuena M. KODZO A.
-Max
-Still Hsu
 String E. Fighter
-Tapu
 Yurical
-Eryk Michalak
+Silvério Santos
 rr-vesp
-alajemba-vik
 /usr/local/ΕΨΗΕΛΩΝ
 Adolfo Jayme-Barrientos
 Alessandro Mandelli
 KovalevArtem
-Artem M.
-Astrohops1
-BMN
-BootVirtual
 Clonewayx
 D. Domig
 Diego
-Fede Pujol
-francescbassas
-Jean-Luc Tibaux
-Jesse Davids
+Jane Kong
 Lukas Grassauer
-bittin
 Marnick L'Eau
 Michalis
-Michał
-Mohamed A. Salah
-the7thNightmare
-Rishi Agarwal
 Rosdyana Kusuma
-umoenks
-Simon Rusinov
-Siriusmart
-Mritunjay
-Tarik Dzambic
+schirinowski
 Thomas Bertels
-Thomas Cruveilher
-Tian Jiale
-Tong Liu
-Wanath
-Runner
-ce i moa
 inesre
 lgasp
 phlostically
-sal0max
-Ágata Leuck
-BmBKun
 Aditya Das
 Kevin Sicong Jiang
-Tomer Ben-Rachel
-Tom Sawyer
-tfuxu
-Ahmed Saleh
 Airat
-Alexander
-sNiXx
-Angela Enogieru
-AnimeshChatterjee1
-Ashish Yadav
-Asier
-Aya Elsaadany
+Andreas Blaser
+BMN
 Biren
-Booc Sylvan
-Brage Nesteby Reitan
-CherryMonster222
-Colgrave
-Csaba
 Mylou53
-danieluhrinyi
 Kasina Dheeraj
-Donno
+Eric
 Flav
 Franciszek Stefan
-Grzegorz
-gneiss15
-Hamustra Scans
-HowITsDone
 Izzy
-Jacek
-Jacopo Gennaro Esposito
-Jasielprogramador
-Jean Mareilles
-Jean-Baptiste
-Kung-chih
-Karvjorm
 krkk
-Laura Ferraz 
-Lucas da Costa
-Manan Jhaveri
+bittin
 Marco
-BRBsoup
 Mattia
-Md. Al-Amin
 Michael Gangolf
-3DN1M
-Moi Toi
-DivideEtImpera
-Nicolas
-Nosnahc
-pa4k
 pbeckmann
 Peer Beckmann
-Piotr Strebski
-Piotr Zet
 Quang Nguyen
-Ratnesh
 Reza
 Rohan Babbar 
 Ronak Upadhyay
 Rose Liverman
-SKULD
-Salem Malus
-Samarth Asthan
-Shailendra Maurya
 Simone Dotto
+Still Hsu
 Subhashish Anand
-SziaTomi
-TenTraicion
-Titas Pažereckas
-atakujonc
-Tony C
 Tymofii Lytvynenko
-Vancha March
+Tjipke van der Heide
 Yevgeny M
-Yusril A
-ahmed-awad26
-Avik Kundu
-diksha-2911
-gbonaspetti
-gittyboy-cell
-huang ivan
-lucafont2
-mtrmirez
+avikkundu
 opsik
-polarhun
-pooyanazari
 psa-jforestier
+Robin
 sergio
-080502
 Marcus
 techwebpd
-Truestorybaby 
-tygyh
-unstartdev
-wmilan 17
-luoyang3
-JaeBeom An
-JungHee Lee
--- a/Show More
+++ b/Show More