Catch new UncheckedIOException

Bump org.apache.commons:commons-csv from 1.9.0 to 1.10.0
Bumps [org.apache.commons:commons-csv](https://github.com/apache/commons-csv) from 1.9.0 to 1.10.0. - [Release notes](https://github.com/apache/commons-csv/releases) - [Changelog](https://github.com/apache/commons-csv/blob/master/RELEASE-NOTES.txt) - [Commits](https://github.com/apache/commons-csv/compare/rel/commons-csv-1.9.0...rel/commons-csv-1.10.0) --- updated-dependencies: - dependency-name: org.apache.commons:commons-csv dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
2025-12-24 15:47:53 -05:00 · 2023-04-18 19:58:40 +02:00 · 2023-04-18 16:58:12 +00:00
757 changed files with 10583 additions and 15488 deletions
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -1,10 +1,11 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
 version: 2
 updates:
-  - package-ecosystem: "gradle"
-    directory: "/"
+  - package-ecosystem: "gradle" # See documentation for possible values
+    directory: "/" # Location of package manifests
    schedule:
      interval: "daily"
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    schedule:
-      interval: "weekly"
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -1,6 +1,6 @@
 name: Android CI
+
 on:
-  workflow_dispatch:
  push:
    branches:
      - main
@@ -9,46 +9,33 @@ on:
  pull_request:
    branches:
      - main
-permissions:
-  actions: none
-  checks: none
-  contents: read
-  deployments: none
-  discussions: none
-  id-token: none
-  issues: none
-  packages: none
-  pages: none
-  pull-requests: none
-  repository-projects: none
-  security-events: none
-  statuses: none
-env:
-  JAVA_HOME: /usr/lib/jvm/java-17-openjdk-amd64
+
 jobs:
  build:
+
    runs-on: ubuntu-latest
+
    steps:
-    - uses: actions/checkout@v4.0.0
+    - uses: actions/checkout@v2
    - name: Fail on bad translations
      run: if grep -ri "&lt;xliff" app/src/main/res/values*/strings.xml; then echo "Invalidly escaped translations found"; exit 1; fi
    - uses: gradle/wrapper-validation-action@v1
-    - name: set up OpenJDK 17
-      run: |
-        sudo apt-get update
-        sudo apt-get install -y openjdk-17-jdk-headless
-        sudo update-alternatives --auto java
+    - name: set up JDK 17
+      uses: actions/setup-java@v2
+      with:
+        distribution: 'temurin'
+        java-version: '17'
    - name: Build
      run: ./gradlew assembleRelease
    - name: Check lint
      run: ./gradlew lintRelease
    - name: Run unit tests
-      run: timeout 5m ./gradlew testReleaseUnitTest || { ./gradlew --stop && timeout 5m ./gradlew testReleaseUnitTest; }
+      run: ./gradlew testReleaseUnitTest || ./gradlew testReleaseUnitTest
    - name: SpotBugs
      run: ./gradlew spotbugsRelease
    - name: Archive test results
      if: always()
-      uses: actions/upload-artifact@v3.1.3
+      uses: actions/upload-artifact@v2
      with:
        name: test-results
        path: app/build/reports
--- a/.github/workflows/autoclose-needs-info.yml
+++ b/.github/workflows/autoclose-needs-info.yml
@@ -0,0 +1,24 @@
+name: 'Close issues and PRs needing info for too long'
+on:
+  schedule:
+    - cron: '30 1 * * *'
+
+permissions:
+  issues: write
+  pull-requests: write
+
+jobs:
+  stale:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/stale@v4
+        with:
+          days-before-stale: -1
+          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'
+          remove-stale-when-updated: false
+          enable-statistics: true
--- a/.github/workflows/calibreapp-image-actions.yml
+++ b/.github/workflows/calibreapp-image-actions.yml
@@ -0,0 +1,34 @@
+name: Compress Images on Push to Main
+on:
+  push:
+    branches:
+      - main
+    paths:
+      - '**.jpg'
+      - '**.jpeg'
+      - '**.png'
+      - '**.webp'
+jobs:
+  build:
+    # Only run on Pull Requests within the same repository, and not from forks.
+    if: github.event.pull_request.head.repo.full_name == github.repository
+    name: calibreapp/image-actions
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Repo
+        uses: actions/checkout@v2
+      - name: Compress Images
+        id: calibre
+        uses: calibreapp/image-actions@1.1.0
+        with:
+          githubToken: ${{ secrets.GITHUB_TOKEN }}
+          ignorePaths: 'app/src/test'
+          compressOnly: true
+      - name: Create New Pull Request If Needed
+        if: steps.calibre.outputs.markdown != ''
+        uses: peter-evans/create-pull-request@v3
+        with:
+          title: Compressed Images
+          branch-suffix: timestamp
+          commit-message: Compressed Images
+          body: ${{ steps.calibre.outputs.markdown }}
--- a/.github/workflows/changelog-to-fastlane.yml
+++ b/.github/workflows/changelog-to-fastlane.yml
@@ -1,25 +1,9 @@
 name: Convert CHANGELOG to Fastlane
 on:
-  workflow_dispatch:
  push:
    branches:
      - main
-    paths:
-      - 'CHANGELOG.md'
-permissions:
-  actions: none
-  checks: none
-  contents: write
-  deployments: none
-  discussions: none
-  id-token: none
-  issues: none
-  packages: none
-  pages: none
-  pull-requests: write
-  repository-projects: none
-  security-events: none
-  statuses: none
+
 jobs:
  convert_changelog_to_fastlane:
    runs-on: ubuntu-latest
@@ -27,15 +11,15 @@ jobs:
    steps:
    - name: Checkout repo
      id: checkout
-      uses: actions/checkout@v4.0.0
+      uses: actions/checkout@v2
    - name: Setup Python
-      uses: actions/setup-python@v4.7.0
+      uses: actions/setup-python@v2
      with:
        python-version: '3.x'
    - name: Run converter script
      run: python .scripts/changelog_to_fastlane.py
    - name: Create Pull Request
-      uses: peter-evans/create-pull-request@v5.0.2
+      uses: peter-evans/create-pull-request@v3
      with:
        title: "Update Fastlane changelogs"
        commit-message: "Update Fastlane changelogs"
--- a/.github/workflows/contributors-to-file.yml
+++ b/.github/workflows/contributors-to-file.yml
@@ -1,22 +1,8 @@
 name: Write contributors to file
 on:
-  workflow_dispatch:
  schedule:
    - cron: '3 4 * * 0'
-permissions:
-  actions: none
-  checks: none
-  contents: write
-  deployments: none
-  discussions: none
-  id-token: none
-  issues: none
-  packages: none
-  pages: none
-  pull-requests: write
-  repository-projects: none
-  security-events: none
-  statuses: none
+
 jobs:
  contributors_to_file:
    runs-on: ubuntu-latest
@@ -25,14 +11,14 @@ jobs:
    steps:
    - name: Checkout repo
      id: checkout
-      uses: actions/checkout@v4.0.0
+      uses: actions/checkout@v2
    - name: Update contributors
      id: update_contributors
-      uses: TheLastProject/contributors-to-file-action@v3.0.1
+      uses: TheLastProject/contributors-to-file-action@v2
      with:
        file_in_repo: app/src/main/res/raw/contributors.txt
    - name: Create Pull Request
-      uses: peter-evans/create-pull-request@v5.0.2
+      uses: peter-evans/create-pull-request@v3
      with:
        title: "Update contributors"
        commit-message: "Update contributors"
--- a/.github/workflows/generate-feature-graphic.yml
+++ b/.github/workflows/generate-feature-graphic.yml
@@ -1,77 +0,0 @@
-name: Generate feature graphic
-on:
-  workflow_dispatch:
-  push:
-    branches:
-      - main
-    paths:
-      - 'fastlane/**/title.txt'
-permissions:
-  actions: none
-  checks: none
-  contents: write
-  deployments: none
-  discussions: none
-  id-token: none
-  issues: none
-  packages: none
-  pages: none
-  pull-requests: write
-  repository-projects: none
-  security-events: none
-  statuses: none
-jobs:
-  generate-feature-graphic:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v4.0.0
-    - name: Install requirements
-      run: |
-        sudo apt-get update
-        sudo apt-get install optipng mat2
-        # Install 200 weight versions of relevant Noto (to use for languages not supported by Lexend Deca)
-        sudo apt-get install fonts-noto-extra fonts-noto-cjk-extra
-        # Custom fonts
-        mkdir "$HOME/.fonts"
-        find .scripts/generate_feature_graphic/fonts -name '*.ttf' -exec cp {} "$HOME/.fonts" \;
-        fc-cache
-    - name: Generate featureGraphic.png for each language
-      run: |
-        for lang in fastlane/metadata/android/*; do
-          pushd "$lang"
-          # Place temporary copy for editing if needed
-          cp ../../../../.scripts/generate_feature_graphic/featureGraphic.svg featureGraphic.svg
-          # Extract text after 'Catima - '
-          export subtext="$(grep -oP '(?<=Catima \S ).*' title.txt || true)"
-          # If there is subtext, change the .svg accordingly
-          if [ -n "$subtext" ]; then
-            perl -pi -e 's/Loyalty Card Wallet/$ENV{subtext}/' featureGraphic.svg
-            # Set correct font for language if needed (Lexend Deca has limited support)
-            # We specifically need the Serif version because of the 200 weight
-            case "$(basename "$lang")" in
-              bg|el-GR|ru-RU|uk) sed -i "s/Lexend Deca/Noto Serif/" featureGraphic.svg ;;
-              ja-JP) sed -i "s/Lexend Deca/Noto Serif CJK JP/" featureGraphic.svg ;;
-              ko) sed -i "s/Lexend Deca/Noto Serif CJK KR/" featureGraphic.svg ;;
-              zh-CN) sed -i "s/Lexend Deca/Noto Serif CJK SC/" featureGraphic.svg ;;
-              zh-TW) sed -i "s/Lexend Deca/Noto Serif CJK TC/" featureGraphic.svg ;;
-              *) ;;
-            esac
-          fi
-          # Ensure images directory exists
-          mkdir -p images
-          # Generate .png
-          convert featureGraphic.svg images/featureGraphic.png
-          # Optimize .png
-          optipng images/featureGraphic.png
-          # Remove metadata (timestamps) from .png
-          mat2 --inplace images/featureGraphic.png
-          # Remove temporary .svg
-          rm featureGraphic.svg
-          popd
-        done
-    - name: Create Pull Request
-      uses: peter-evans/create-pull-request@v5.0.2
-      with:
-        title: "Update feature graphic"
-        commit-message: "Update feature graphic"
-        branch-suffix: timestamp
--- a/.github/workflows/gradle-wrapper-validation.yml
+++ b/.github/workflows/gradle-wrapper-validation.yml
@@ -0,0 +1,10 @@
+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/.github/workflows/update-locales.yml
+++ b/.github/workflows/update-locales.yml
@@ -1,35 +0,0 @@
-name: Update locales
-on:
-  workflow_dispatch:
-  push:
-    branches:
-      - main
-    paths:
-      - app/src/main/res/values/settings.xml
-permissions:
-  actions: none
-  checks: none
-  contents: write
-  deployments: none
-  discussions: none
-  id-token: none
-  issues: none
-  packages: none
-  pages: none
-  pull-requests: write
-  repository-projects: none
-  security-events: none
-  statuses: none
-jobs:
-  update-locales:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v4.0.0
-    - name: Update locales
-      run: .scripts/locales.py
-    - name: Create Pull Request
-      uses: peter-evans/create-pull-request@v5.0.2
-      with:
-        title: "Update locales"
-        commit-message: "Update locales"
-        branch-suffix: timestamp
--- a/.scripts/dump_stocard_stores.py
+++ b/.scripts/dump_stocard_stores.py
@@ -1,44 +0,0 @@
-#!/usr/bin/python3
-
-import csv
-import json
-import msgpack
-
-MSGPACK = "bootstrapdata.msgpack"
-OUTFILE = "stocard_stores.csv"
-
-
-def load(fh):
-    data = []
-    for r in msgpack.Unpacker(fh, raw=False):
-        if r["collection"] == "/loyalty-card-providers/":
-            d = json.loads(r["data"])
-            data.append([r["resource_id"], d["name"], d["default_barcode_format"]])
-    return data
-
-
-def save(data, output_file=OUTFILE):
-    with open(output_file, "w") as fh:
-        writer = csv.writer(fh, lineterminator="\n")
-        writer.writerow(["_id", "name", "barcodeFormat"])
-        for row in data:
-            writer.writerow(row)
-
-
-if __name__ == "__main__":
-    import argparse
-    parser = argparse.ArgumentParser(
-        epilog=f"INPUT_FILE must be a .msgpack or .apk and defaults to {MSGPACK}; "
-               f"OUTPUT_FILE defaults to {OUTFILE}")
-    parser.add_argument("input_file", metavar="INPUT_FILE", nargs="?", default=MSGPACK)
-    parser.add_argument("output_file", metavar="OUTPUT_FILE", nargs="?", default=OUTFILE)
-    args = parser.parse_args()
-    if args.input_file.lower().endswith(".apk"):
-        import zipfile
-        with zipfile.ZipFile(args.input_file) as zf:
-            with zf.open(f"assets/{MSGPACK}") as fh:
-                data = load(fh)
-    else:
-        with open(args.input_file, "rb") as fh:
-            data = load(fh)
-    save(data, args.output_file)
--- a/.scripts/generate_feature_graphic/featureGraphic.svg
+++ b/.scripts/generate_feature_graphic/featureGraphic.svg
@@ -1,15 +0,0 @@
-<svg width="1024" height="500" viewBox="0 0 1024 500" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect width="1024" height="500" fill="#223355"/>
-<text fill="white" xml:space="preserve" style="" font-family="Yesteryear" font-size="150" letter-spacing="0em"><tspan x="470.082" y="285.511">Catima
-</tspan></text>
-<path d="M381.046 147.001L236.3 211.446L276.524 301.79L421.27 237.345L381.046 147.001Z" fill="#F0F0F0" stroke="#C80000" stroke-width="2"/>
-<path d="M402.077 219.13L240.07 147L191.984 255.004L353.99 327.135L402.077 219.13Z" fill="#F0F0F0" stroke="#C80000" stroke-width="2"/>
-<path d="M437.17 236.241L251.831 183.096L220.071 293.855L405.41 347L437.17 236.241Z" fill="#C80000" stroke="#C80000" stroke-width="6" stroke-linejoin="round"/>
-<path d="M412.879 178.633H220.071V293.855H412.879V178.633Z" fill="#FF0000" stroke="#FF0000" stroke-width="6" stroke-linejoin="round"/>
-<path d="M221.482 296.217C238.316 296.217 251.963 269.366 251.963 236.244C251.963 203.121 238.316 176.27 221.482 176.27C204.647 176.27 191 203.121 191 236.244C191 269.366 204.647 296.217 221.482 296.217Z" fill="#FF0000" stroke="#FF0000" stroke-width="3.44232" stroke-linejoin="round"/>
-<path d="M307.256 250.444C307.256 253.187 306.289 255.842 304.526 257.944C302.763 260.045 300.316 261.458 297.614 261.934C294.913 262.41 292.13 261.92 289.755 260.548C287.379 259.177 285.563 257.012 284.625 254.435" stroke="#F0F0F0" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M330.301 254.298C329.363 256.875 327.547 259.04 325.171 260.411C322.796 261.783 320.013 262.273 317.312 261.797C314.61 261.321 312.163 259.908 310.4 257.807C308.637 255.706 307.671 253.05 307.671 250.307" stroke="#F0F0F0" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M248.345 225.937L266.818 207.465L285.29 225.937" stroke="#F0F0F0" stroke-width="2"/>
-<path d="M329.625 225.937L348.098 207.465L366.571 225.937" stroke="#F0F0F0" stroke-width="2"/>
-<text fill="white" xml:space="preserve" style="" font-family="Lexend Deca" font-size="35" font-weight="200" letter-spacing="0em"><tspan x="466" y="340">Loyalty Card Wallet</tspan></text>
-</svg>
--- a/.scripts/generate_feature_graphic/fonts/Lexend_Deca/LexendDeca-ExtraLight.ttf
+++ b/.scripts/generate_feature_graphic/fonts/Lexend_Deca/LexendDeca-ExtraLight.ttf
--- a/.scripts/generate_feature_graphic/fonts/Lexend_Deca/OFL.txt
+++ b/.scripts/generate_feature_graphic/fonts/Lexend_Deca/OFL.txt
@@ -1,93 +0,0 @@
-Copyright 2018 The Lexend Project Authors (https://github.com/googlefonts/lexend), with Reserved Font Name “RevReading Lexend”.
-
-This Font Software is licensed under the SIL Open Font License, Version 1.1.
-This license is copied below, and is also available with a FAQ at:
-http://scripts.sil.org/OFL
-
-
-----------------------------------------------------------
-SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
-----------------------------------------------------------
-
-PREAMBLE
-The goals of the Open Font License (OFL) are to stimulate worldwide
-development of collaborative font projects, to support the font creation
-efforts of academic and linguistic communities, and to provide a free and
-open framework in which fonts may be shared and improved in partnership
-with others.
-
-The OFL allows the licensed fonts to be used, studied, modified and
-redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded, 
-redistributed and/or sold with any software provided that any reserved
-names are not used by derivative works. The fonts and derivatives,
-however, cannot be released under any other type of license. The
-requirement for fonts to remain under this license does not apply
-to any document created using the fonts or their derivatives.
-
-DEFINITIONS
-"Font Software" refers to the set of files released by the Copyright
-Holder(s) under this license and clearly marked as such. This may
-include source files, build scripts and documentation.
-
-"Reserved Font Name" refers to any names specified as such after the
-copyright statement(s).
-
-"Original Version" refers to the collection of Font Software components as
-distributed by the Copyright Holder(s).
-
-"Modified Version" refers to any derivative made by adding to, deleting,
-or substituting -- in part or in whole -- any of the components of the
-Original Version, by changing formats or by porting the Font Software to a
-new environment.
-
-"Author" refers to any designer, engineer, programmer, technical
-writer or other person who contributed to the Font Software.
-
-PERMISSION & CONDITIONS
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Font Software, to use, study, copy, merge, embed, modify,
-redistribute, and sell modified and unmodified copies of the Font
-Software, subject to the following conditions:
-
-1) Neither the Font Software nor any of its individual components,
-in Original or Modified Versions, may be sold by itself.
-
-2) Original or Modified Versions of the Font Software may be bundled,
-redistributed and/or sold with any software, provided that each copy
-contains the above copyright notice and this license. These can be
-included either as stand-alone text files, human-readable headers or
-in the appropriate machine-readable metadata fields within text or
-binary files as long as those fields can be easily viewed by the user.
-
-3) No Modified Version of the Font Software may use the Reserved Font
-Name(s) unless explicit written permission is granted by the corresponding
-Copyright Holder. This restriction only applies to the primary font name as
-presented to the users.
-
-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
-Software shall not be used to promote, endorse or advertise any
-Modified Version, except to acknowledge the contribution(s) of the
-Copyright Holder(s) and the Author(s) or with their explicit written
-permission.
-
-5) The Font Software, modified or unmodified, in part or in whole,
-must be distributed entirely under this license, and must not be
-distributed under any other license. The requirement for fonts to
-remain under this license does not apply to any document created
-using the Font Software.
-
-TERMINATION
-This license becomes null and void if any of the above conditions are
-not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.
--- a/.scripts/generate_feature_graphic/fonts/Yesteryear/OFL.txt
+++ b/.scripts/generate_feature_graphic/fonts/Yesteryear/OFL.txt
@@ -1,94 +0,0 @@
-Copyright (c) 2011 by Brian J. Bonislawsky DBA Astigmatic (AOETI)
-(astigma@astigmatic.com), with Reserved Font Names "Yesteryear"
-
-This Font Software is licensed under the SIL Open Font License, Version 1.1.
-This license is copied below, and is also available with a FAQ at:
-http://scripts.sil.org/OFL
-
-
-----------------------------------------------------------
-SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
-----------------------------------------------------------
-
-PREAMBLE
-The goals of the Open Font License (OFL) are to stimulate worldwide
-development of collaborative font projects, to support the font creation
-efforts of academic and linguistic communities, and to provide a free and
-open framework in which fonts may be shared and improved in partnership
-with others.
-
-The OFL allows the licensed fonts to be used, studied, modified and
-redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded, 
-redistributed and/or sold with any software provided that any reserved
-names are not used by derivative works. The fonts and derivatives,
-however, cannot be released under any other type of license. The
-requirement for fonts to remain under this license does not apply
-to any document created using the fonts or their derivatives.
-
-DEFINITIONS
-"Font Software" refers to the set of files released by the Copyright
-Holder(s) under this license and clearly marked as such. This may
-include source files, build scripts and documentation.
-
-"Reserved Font Name" refers to any names specified as such after the
-copyright statement(s).
-
-"Original Version" refers to the collection of Font Software components as
-distributed by the Copyright Holder(s).
-
-"Modified Version" refers to any derivative made by adding to, deleting,
-or substituting -- in part or in whole -- any of the components of the
-Original Version, by changing formats or by porting the Font Software to a
-new environment.
-
-"Author" refers to any designer, engineer, programmer, technical
-writer or other person who contributed to the Font Software.
-
-PERMISSION & CONDITIONS
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Font Software, to use, study, copy, merge, embed, modify,
-redistribute, and sell modified and unmodified copies of the Font
-Software, subject to the following conditions:
-
-1) Neither the Font Software nor any of its individual components,
-in Original or Modified Versions, may be sold by itself.
-
-2) Original or Modified Versions of the Font Software may be bundled,
-redistributed and/or sold with any software, provided that each copy
-contains the above copyright notice and this license. These can be
-included either as stand-alone text files, human-readable headers or
-in the appropriate machine-readable metadata fields within text or
-binary files as long as those fields can be easily viewed by the user.
-
-3) No Modified Version of the Font Software may use the Reserved Font
-Name(s) unless explicit written permission is granted by the corresponding
-Copyright Holder. This restriction only applies to the primary font name as
-presented to the users.
-
-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
-Software shall not be used to promote, endorse or advertise any
-Modified Version, except to acknowledge the contribution(s) of the
-Copyright Holder(s) and the Author(s) or with their explicit written
-permission.
-
-5) The Font Software, modified or unmodified, in part or in whole,
-must be distributed entirely under this license, and must not be
-distributed under any other license. The requirement for fonts to
-remain under this license does not apply to any document created
-using the Font Software.
-
-TERMINATION
-This license becomes null and void if any of the above conditions are
-not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.
--- a/.scripts/generate_feature_graphic/fonts/Yesteryear/Yesteryear-Regular.ttf
+++ b/.scripts/generate_feature_graphic/fonts/Yesteryear/Yesteryear-Regular.ttf
--- a/.scripts/locales.py
+++ b/.scripts/locales.py
@@ -1,36 +0,0 @@
-#!/usr/bin/python3
-
-import subprocess
-import xml.etree.ElementTree as ET
-
-root = ET.parse("app/src/main/res/values/settings.xml").getroot()
-for e in root.findall("string-array"):
-    if e.get("name") == "locale_values":
-        locales = [x.text for x in e if x.text]
-        break
-
-locales = [
-    # e.g. de or es-rAR (not es-AR)
-    loc.replace("-", "-r") if "-" in loc and loc[loc.index("-") + 1] != "r" else loc
-    for loc in locales
-]
-
-res = ", ".join(f'"{loc}"' for loc in locales)
-sed = [
-    "sed",
-    "-i",
-    f"s/resourceConfigurations .*/resourceConfigurations += [{res}]/",
-    "app/build.gradle"
-]
-subprocess.run(sed, check=True)
-
-with open("app/src/main/res/xml/locales_config.xml", "w") as fh:
-    fh.write('<?xml version="1.0" encoding="utf-8"?>\n')
-    fh.write('<locale-config xmlns:android="http://schemas.android.com/apk/res/android">\n')
-    fh.write('    <locale android:name="en-US" />\n')
-    for loc in locales:
-        if loc != "en":
-            # e.g. de or en-AR (not es-rAR)
-            loc = loc.replace("-r", "-")
-            fh.write(f'    <locale android:name="{loc}" />\n')
-    fh.write('</locale-config>\n')
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,116 +1,48 @@
 # Changelog

-## Unreleased - 132
-
- Refine "Add card" workflow
- Validation flow improvements
-
-## v2.26.0 - 131 (2023-09-14)
-
- Move "Archive mode" into "Display options" (previously "Show details") menu
- Android 13 per-app language support
- Embed privacy policy, changelog and license in the app
-
-## v2.25.3 - 130 (2023-08-25)
-
- Minor UI fixes
- Fix valid from and expiry dates being reset when rotating the card editing screen
- Fix crash when rotating screen while the color picker is shown
- Stocard import fixes
-
-## v2.25.2 - 129 (2023-07-27)
-
- Improved Catima importer (fixes cards missing when importing)
- Fix crash when rotating screen while setting valid from/expiry date
- Minor UI tweaks
-
-## v2.25.1 - 128 (2023-07-17)
-
- Fix rare crash
-
-## v2.25.0 - 127 (2023-07-09)
-
- Barcode rendering improvements
- Basic interoperability with external apps (Android 6.0+)
- Reorganized settings screen
- Fix importing from some browsers that add a trailing / to the share URL
-
-## v2.24.2 - 126 (2023-06-18)
-
- Various RTL fixes
-
-## v2.24.1 - 125 (2023-06-11)
-
- Deal more gracefully with missing header colours
-
-## v2.24.0 - 124 (2023-06-10)
-
- Support selecting exactly which details to view in card overview
-
-## v2.23.3 - 123 (2023-06-03)
-
- Minor UI improvements
- Fix new design not being usable on devices with square screens
-
-## v2.23.2 - 122 (2023-05-30)
-
- Long-press card icon in view activity to change it
- Improve button styling in Groups screen
- Fix long barcode values causing barcode to scale down to nothing
-
-## v2.23.1 - 121 (2023-05-27)
-
- Update used libraries
-
-## v2.23.0 - 120 (2023-05-25)
-
- Complete redesign of main and loyalty card view screens
- Material You design for the settings screen
- Fix crash when using "Take a photo" with disabled camera app
-
-## v2.22.1 - 119 (2023-04-14)
+## v2.22.1 - 119

 - Use Material You colours on more devices (Google library update)

-## v2.22.0 - 118 (2023-03-18)
+## v2.22.0 - 118

 - Support setting start of card validity
 - Fix Stocard import (Stocard's export format changed)

-## v2.21.2 - 117 (2023-01-27)
+## v2.21.2 - 117

 - Remove unnecessary permissions
 - Target Android 13

-## v2.21.1 - 116 (2022-12-06)
+## v2.21.1 - 116

 - Fix quick spend dialog not allowing , separator
 - Support loading image from file manager

-## v2.21.0 - 115 (2022-11-06)
+## 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 (2022-09-21)
+## v2.20.0 - 114

 - Add Monochrome icon for Android 13
 - Improve first launch screen
 - Fidme import fixes

-## v2.19.0 - 113 (2022-08-14)
+## 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 (2022-07-29)
+## v2.18.2 - 112

 - Make the possibility to set a custom header more visible

-## v2.18.1 - 111 (2022-07-24)
+## v2.18.1 - 111

 - Arabic language support
 - Display archived card count in group overview
@@ -120,11 +52,11 @@
 - 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 (2022-06-28)
+## v2.17.1 - 109

 - Fix incorrect text colour on "No barcode" button

-## v2.17.0 - 108 (2022-06-24)
+## v2.17.0 - 108

 - Add card duplication feature
 - Don't allow choosing expiry before 1970 (they never worked anyway)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -3,25 +3,25 @@ GEM
  specs:
    CFPropertyList (3.0.6)
      rexml
-    addressable (2.8.5)
+    addressable (2.8.1)
      public_suffix (>= 2.0.2, < 6.0)
    artifactory (3.0.15)
    atomos (0.1.3)
    aws-eventstream (1.2.0)
-    aws-partitions (1.824.0)
-    aws-sdk-core (3.181.1)
+    aws-partitions (1.701.0)
+    aws-sdk-core (3.170.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.71.0)
-      aws-sdk-core (~> 3, >= 3.177.0)
+    aws-sdk-kms (1.62.0)
+      aws-sdk-core (~> 3, >= 3.165.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.134.0)
-      aws-sdk-core (~> 3, >= 3.181.0)
+    aws-sdk-s3 (1.119.0)
+      aws-sdk-core (~> 3, >= 3.165.0)
      aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.6)
-    aws-sigv4 (1.6.0)
+      aws-sigv4 (~> 1.4)
+    aws-sigv4 (1.5.2)
      aws-eventstream (~> 1, >= 1.0.2)
    babosa (1.0.4)
    claide (1.1.0)
@@ -30,13 +30,13 @@ GEM
    commander (4.6.0)
      highline (~> 2.0.0)
    declarative (0.0.20)
-    digest-crc (0.6.5)
+    digest-crc (0.6.4)
      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.103.0)
+    excon (0.98.0)
    faraday (1.10.3)
      faraday-em_http (~> 1.0)
      faraday-em_synchrony (~> 1.0)
@@ -65,8 +65,8 @@ GEM
    faraday-retry (1.0.3)
    faraday_middleware (1.2.0)
      faraday (~> 1.0)
-    fastimage (2.2.7)
-    fastlane (2.215.1)
+    fastimage (2.2.6)
+    fastlane (2.211.0)
      CFPropertyList (>= 2.3, < 4.0.0)
      addressable (>= 2.8, < 3.0.0)
      artifactory (~> 3.0)
@@ -87,11 +87,10 @@ GEM
      google-apis-playcustomapp_v1 (~> 0.1)
      google-cloud-storage (~> 1.31)
      highline (~> 2.0)
-      http-cookie (~> 1.0.5)
      json (< 3.0.0)
      jwt (>= 2.1.0, < 3)
      mini_magick (>= 4.9.4, < 5.0.0)
-      multipart-post (>= 2.0.0, < 3.0.0)
+      multipart-post (~> 2.0.0)
      naturally (~> 2.2)
      optparse (~> 0.1.1)
      plist (>= 3.1.0, < 4.0.0)
@@ -99,7 +98,7 @@ GEM
      security (= 0.1.3)
      simctl (~> 1.6.3)
      terminal-notifier (>= 2.0.0, < 3.0.0)
-      terminal-table (~> 3)
+      terminal-table (>= 1.4.5, < 2.0.0)
      tty-screen (>= 0.6.3, < 1.0.0)
      tty-spinner (>= 0.8.0, < 1.0.0)
      word_wrap (~> 1.0.0)
@@ -107,9 +106,9 @@ GEM
      xcpretty (~> 0.3.0)
      xcpretty-travis-formatter (>= 0.0.3)
    gh_inspector (1.1.3)
-    google-apis-androidpublisher_v3 (0.49.0)
-      google-apis-core (>= 0.11.0, < 2.a)
-    google-apis-core (0.11.1)
+    google-apis-androidpublisher_v3 (0.32.0)
+      google-apis-core (>= 0.9.1, < 2.a)
+    google-apis-core (0.10.0)
      addressable (~> 2.5, >= 2.5.1)
      googleauth (>= 0.16.2, < 2.a)
      httpclient (>= 2.8.1, < 3.a)
@@ -118,10 +117,10 @@ GEM
      retriable (>= 2.0, < 4.a)
      rexml
      webrick
-    google-apis-iamcredentials_v1 (0.17.0)
-      google-apis-core (>= 0.11.0, < 2.a)
-    google-apis-playcustomapp_v1 (0.13.0)
-      google-apis-core (>= 0.11.0, < 2.a)
+    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-cloud-core (1.6.0)
@@ -129,7 +128,7 @@ GEM
      google-cloud-errors (~> 1.0)
    google-cloud-env (1.6.0)
      faraday (>= 0.17.3, < 3.0)
-    google-cloud-errors (1.3.1)
+    google-cloud-errors (1.3.0)
    google-cloud-storage (1.44.0)
      addressable (~> 2.8)
      digest-crc (~> 0.4)
@@ -138,9 +137,10 @@ GEM
      google-cloud-core (~> 1.6)
      googleauth (>= 0.16.2, < 2.a)
      mini_mime (~> 1.0)
-    googleauth (1.8.0)
+    googleauth (1.3.0)
      faraday (>= 0.17.3, < 3.a)
      jwt (>= 1.4, < 3.0)
+      memoist (~> 0.16)
      multi_json (~> 1.11)
      os (>= 0.9, < 2.0)
      signet (>= 0.16, < 2.a)
@@ -150,29 +150,30 @@ GEM
    httpclient (2.8.3)
    jmespath (1.6.2)
    json (2.6.3)
-    jwt (2.7.1)
+    jwt (2.6.0)
+    memoist (0.16.2)
    mini_magick (4.12.0)
-    mini_mime (1.1.5)
+    mini_mime (1.1.2)
    multi_json (1.15.0)
-    multipart-post (2.3.0)
+    multipart-post (2.0.0)
    nanaimo (0.3.0)
    naturally (2.2.1)
    optparse (0.1.1)
    os (1.1.4)
-    plist (3.7.0)
-    public_suffix (5.0.3)
+    plist (3.6.0)
+    public_suffix (5.0.1)
    rake (13.0.6)
    representable (3.2.0)
      declarative (< 0.1.0)
      trailblazer-option (>= 0.1.1, < 0.2.0)
      uber (< 0.2.0)
    retriable (3.1.2)
-    rexml (3.2.6)
+    rexml (3.2.5)
    rouge (2.0.7)
    ruby2_keywords (0.0.5)
    rubyzip (2.3.2)
    security (0.1.3)
-    signet (0.18.0)
+    signet (0.17.0)
      addressable (~> 2.8)
      faraday (>= 0.17.5, < 3.a)
      jwt (>= 1.5, < 3.0)
@@ -181,8 +182,8 @@ GEM
      CFPropertyList
      naturally
    terminal-notifier (2.0.0)
-    terminal-table (3.0.2)
-      unicode-display_width (>= 1.1.1, < 3)
+    terminal-table (1.8.0)
+      unicode-display_width (~> 1.1, >= 1.1.1)
    trailblazer-option (0.1.2)
    tty-cursor (0.7.1)
    tty-screen (0.8.1)
@@ -192,7 +193,7 @@ GEM
    unf (0.1.4)
      unf_ext
    unf_ext (0.0.8.2)
-    unicode-display_width (2.4.2)
+    unicode-display_width (1.8.0)
    webrick (1.8.1)
    word_wrap (1.0.0)
    xcodeproj (1.22.0)
--- a/PRIVACY.md
+++ b/PRIVACY.md
@@ -1,18 +0,0 @@
-**Last updated**  
-August 30 2023
-
-# Privacy Policy
-Catima does not collect or transmit any personal information.
-
-To ensure correct app functionality, we require access to the following:
-
- Camera: We need access to your camera to be able to scan barcodes. The app can still be used when camera access is denied, but you will have to manually type the barcode information.
- Storage (Android 5 and 6 only): We need access to your device storage to create or import backups. The app can still be used when storage access is denied, but you will not be able to create or import backups.
-
-Catima offers a feature to share cards with other users. All the relevant data is in the generated shareable URLs and never transmitted to our servers. When viewed through catima.app, the data in the URL is rendered using client-side Javascript to further ensure no data is ever transmitted to us.
-
-# Changes
-This Privacy Policy may be updated from time to time for any reason. We will notify you of any changes to our Privacy Policy by posting the new Privacy Policy to https://catima.app/privacy-policy/. A snapshot of the Privacy Policy is available within the Catima app, though it may be outdated. When the Privacy Policy on the website and in the app differ, the website should be considered leading. You are advised to consult the Privacy Policy regularly for any changes, as continued use is deemed approval of all changes.
-
-# Contact us
-If you have any questions regarding privacy while using the Application, or have questions about our practices, please contact us via email at catima.g9ex3@hackerchick.me.
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -1,13 +0,0 @@
-# Security Policy
-
-Catima is designed to use as little permissions as possible to limit both the attack surface as well as the damage that can be done when abusing a security flaw.
-
-## Supported Versions
-
-Only the most recent stable release is supported.
-
-## Reporting a Vulnerability
-
-Security vulnerabilities can be reported through [GitHub Security Advisories](https://github.com/CatimaLoyalty/Android/security/advisories) or [the contact info written on my personal website](https://sylviavanos.nl/#contact). Currently, Matrix is the only end-to-end encrypted option.
-
-Please note that only security vulnerabilities in Catima should be reported as stated above. For other issues, including antivirus false positives and malicious applications trying to trick people into granting them Catima's "Read Cards" permission, please use [regular issues](https://github.com/CatimaLoyalty/Android/issues).
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -19,26 +19,11 @@ android {
        applicationId "me.hackerchick.catima"
        minSdk 21
        targetSdk 33
-        versionCode 131
-        versionName "2.26.0"
+        versionCode 119
+        versionName "2.22.1"

        vectorDrawables.useSupportLibrary true
        multiDexEnabled true
-
-        resourceConfigurations += ["ar", "bg", "bn", "bn-rIN", "bs", "cs", "da", "de", "el-rGR", "en", "eo", "es", "es-rAR", "fi", "fr", "he-rIL", "hi", "hr", "hu", "in-rID", "is", "it", "ja", "ko", "lt", "lv", "nb-rNO", "nl", "oc", "pl", "pt", "ro-rRO", "ru", "sk", "sl", "sv", "tr", "uk", "zh-rTW", "zh-rCN"]
-
-        //testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-    }
-
-    flavorDimensions "version"
-    productFlavors {
-        fdroid {
-            dimension "version"
-        }
-        screengrab {
-            dimension "version"
-            applicationIdSuffix = ".screengrab"
-        }
    }

    buildTypes {
@@ -105,18 +90,19 @@ dependencies {
    implementation 'androidx.exifinterface:exifinterface:1.3.6'
    implementation 'androidx.palette:palette:1.0.0'
    implementation 'androidx.preference:preference:1.2.0'
-    implementation 'com.google.android.material:material:1.9.0'
+    implementation 'com.google.android.material:material:1.8.0'
    implementation 'com.github.yalantis:ucrop:2.2.8'
    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.3'

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

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

 // SpotBugs
@@ -125,13 +111,7 @@ dependencies {
 // Testing
    testImplementation 'androidx.test:core:1.5.0'
    testImplementation 'junit:junit:4.13.2'
-    testImplementation 'org.robolectric:robolectric:4.10.3'
-
-    // Screenshots
-    testImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
-    testImplementation 'com.android.support.test:rules:1.0.2'
-    testImplementation 'com.android.support.test:runner:1.0.2'
-    testImplementation 'tools.fastlane:screengrab:2.1.1'
+    testImplementation 'org.robolectric:robolectric:4.10'
 }

 tasks.withType(SpotBugsTask) {
@@ -148,18 +128,3 @@ tasks.withType(SpotBugsTask) {
        html.enabled = true
    }
 }
-
-tasks.register('copyRawResFiles', Copy) {
-    from layout.projectDirectory.file("../CHANGELOG.md"),
-         layout.projectDirectory.file("../PRIVACY.md")
-    into layout.projectDirectory.dir("src/main/res/raw")
-    rename { String fileName -> fileName.toLowerCase() }
-}
-
-project.afterEvaluate {
-    tasks.each { task ->
-        if (task != copyRawResFiles) {
-            task.dependsOn(copyRawResFiles)
-        }
-    }
-}
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -2,13 +2,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:tools="http://schemas.android.com/tools">

-    <permission
-        android:description="@string/permissionReadCardsDescription"
-        android:icon="@drawable/ic_launcher_foreground"
-        android:label="@string/permissionReadCardsLabel"
-        android:name="${applicationId}.READ_CARDS"
-        android:protectionLevel="dangerous" />
-
    <uses-sdk tools:overrideLibrary="com.google.zxing.client.android" />

    <uses-permission android:name="android.permission.CAMERA" />
@@ -27,8 +20,7 @@
        android:icon="@mipmap/ic_launcher"
        android:label="@string/app_name"
        android:supportsRtl="true"
-        android:theme="@style/AppTheme"
-        android:localeConfig="@xml/locales_config">
+        android:theme="@style/AppTheme">
        <activity
            android:name=".MainActivity"
            android:exported="true"
@@ -163,12 +155,6 @@
            android:name=".UCropWrapper"
            android:theme="@style/AppTheme.NoActionBar" />

-        <provider
-            android:name=".contentprovider.CardsContentProvider"
-            android:authorities="${applicationId}.contentprovider.cards"
-            android:exported="true"
-            android:readPermission="${applicationId}.READ_CARDS"/>
-
        <provider
            android:name="androidx.core.content.FileProvider"
            android:authorities="${applicationId}"
@@ -185,4 +171,4 @@
            </intent-filter>
        </service>
    </application>
-</manifest>
+</manifest>
--- a/app/src/main/java/protect/card_locker/AboutActivity.java
+++ b/app/src/main/java/protect/card_locker/AboutActivity.java
@@ -1,14 +1,10 @@
 package protect.card_locker;

 import android.os.Bundle;
-import android.text.Spanned;
 import android.view.MenuItem;
 import android.view.View;
-import android.widget.ScrollView;
 import android.widget.TextView;

-import androidx.annotation.StringRes;
-
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;


@@ -32,7 +28,7 @@ public class AboutActivity extends CatimaAppCompatActivity {
        enableToolbarBackButton();

        TextView copyright = binding.creditsSub;
-        copyright.setText(content.getCopyrightShort());
+        copyright.setText(content.getCopyright());
        TextView versionHistory = binding.versionHistorySub;
        versionHistory.setText(content.getVersionHistory());

@@ -43,13 +39,6 @@ public class AboutActivity extends CatimaAppCompatActivity {
        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");
-        binding.donate.setTag("https://catima.app/contribute/#donating");
-
-        boolean installedFromGooglePlay = Utils.installedFromGooglePlay(this);
-        // Hide Google Play rate button if not on Google Play
-        binding.rate.setVisibility(installedFromGooglePlay ? View.VISIBLE : View.GONE);
-        // Hide donate button on Google Play (Google Play doesn't allow donation links)
-        binding.donate.setVisibility(installedFromGooglePlay ? View.GONE : View.VISIBLE);

        bindClickListeners();
    }
@@ -72,14 +61,19 @@ public class AboutActivity extends CatimaAppCompatActivity {
    }

    private void bindClickListeners() {
-        binding.versionHistory.setOnClickListener(this::showHistory);
-        binding.translate.setOnClickListener(this::openExternalBrowser);
-        binding.license.setOnClickListener(this::showLicense);
-        binding.repo.setOnClickListener(this::openExternalBrowser);
-        binding.privacy.setOnClickListener(this::showPrivacy);
-        binding.reportError.setOnClickListener(this::openExternalBrowser);
-        binding.rate.setOnClickListener(this::openExternalBrowser);
-        binding.donate.setOnClickListener(this::openExternalBrowser);
+        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());
    }
@@ -92,8 +86,6 @@ public class AboutActivity extends CatimaAppCompatActivity {
        binding.privacy.setOnClickListener(null);
        binding.reportError.setOnClickListener(null);
        binding.rate.setOnClickListener(null);
-        binding.donate.setOnClickListener(null);
-
        binding.credits.setOnClickListener(null);
    }

@@ -104,39 +96,4 @@ public class AboutActivity extends CatimaAppCompatActivity {
                .setPositiveButton(R.string.ok, null)
                .show();
    }
-
-    private void showHistory(View view) {
-        showHTML(R.string.version_history, content.getHistoryInfo(), view);
-    }
-
-    private void showLicense(View view) {
-        showHTML(R.string.license, content.getLicenseInfo(), view);
-    }
-
-    private void showPrivacy(View view) {
-        showHTML(R.string.privacy_policy, content.getPrivacyInfo(), view);
-    }
-
-    private void showHTML(@StringRes int title, final Spanned text, View view) {
-        int dialogContentPadding = getResources().getDimensionPixelSize(R.dimen.alert_dialog_content_padding);
-        TextView textView = new TextView(this);
-        textView.setText(text);
-        Utils.makeTextViewLinksClickable(textView, text);
-        ScrollView scrollView = new ScrollView(this);
-        scrollView.addView(textView);
-        scrollView.setPadding(dialogContentPadding, dialogContentPadding / 2, dialogContentPadding, 0);
-        new MaterialAlertDialogBuilder(this)
-                .setTitle(title)
-                .setView(scrollView)
-                .setPositiveButton(R.string.ok, null)
-                .setNeutralButton(R.string.view_online, (dialog, which) -> openExternalBrowser(view))
-                .show();
-    }
-
-    private void openExternalBrowser(View view) {
-        Object tag = view.getTag();
-        if (tag instanceof String && ((String) tag).startsWith("https://")) {
-            (new OpenWebLinkHandler()).openBrowser(this, (String) tag);
-        }
-    }
 }
--- a/app/src/main/java/protect/card_locker/AboutContent.java
+++ b/app/src/main/java/protect/card_locker/AboutContent.java
@@ -3,7 +3,6 @@ package protect.card_locker;
 import android.content.Context;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
-import android.text.Spanned;
 import android.util.Log;

 import androidx.core.text.HtmlCompat;
@@ -51,10 +50,6 @@ public class AboutContent {
        return String.format(context.getString(R.string.app_copyright_fmt), getCurrentYear());
    }

-    public String getCopyrightShort() {
-        return context.getString(R.string.app_copyright_short);
-    }
-
    public String getContributors() {
        String contributors;
        try {
@@ -65,38 +60,6 @@ public class AboutContent {
        return contributors.replace("\n", "<br />");
    }

-    public String getHistory() {
-        String versionHistory;
-        try {
-            versionHistory = Utils.readTextFile(context, R.raw.changelog)
-                    .replace("# Changelog\n\n", "");
-        }  catch (IOException ignored) {
-            return "";
-        }
-        return Utils.linkify(Utils.basicMDToHTML(versionHistory))
-                .replace("\n", "<br />");
-    }
-
-    public String getLicense() {
-        try {
-            return Utils.readTextFile(context, R.raw.license);
-        }  catch (IOException ignored) {
-            return "";
-        }
-    }
-
-    public String getPrivacy() {
-        String privacyPolicy;
-        try {
-            privacyPolicy = Utils.readTextFile(context, R.raw.privacy)
-                    .replace("# Privacy Policy\n", "");
-        }  catch (IOException ignored) {
-            return "";
-        }
-        return Utils.linkify(Utils.basicMDToHTML(privacyPolicy))
-                .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"));
@@ -131,12 +94,10 @@ public class AboutContent {

    public String getContributorInfo() {
        StringBuilder contributorInfo = new StringBuilder();
-        contributorInfo.append(getCopyright());
+        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_contributors), getContributors()), HtmlCompat.FROM_HTML_MODE_COMPACT));
-        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));
@@ -144,18 +105,6 @@ public class AboutContent {
        return contributorInfo.toString();
    }

-    public Spanned getHistoryInfo() {
-        return HtmlCompat.fromHtml(getHistory(), HtmlCompat.FROM_HTML_MODE_COMPACT);
-    }
-
-    public Spanned getLicenseInfo() {
-        return HtmlCompat.fromHtml(getLicense(), HtmlCompat.FROM_HTML_MODE_LEGACY);
-    }
-
-    public Spanned getPrivacyInfo() {
-        return HtmlCompat.fromHtml(getPrivacy(), HtmlCompat.FROM_HTML_MODE_COMPACT);
-    }
-
    public String getVersionHistory() {
        return String.format(context.getString(R.string.debug_version_fmt), getAppVersion());
    }
--- a/app/src/main/java/protect/card_locker/BarcodeImageWriterResultCallback.java
+++ b/app/src/main/java/protect/card_locker/BarcodeImageWriterResultCallback.java
@@ -1,5 +0,0 @@
-package protect.card_locker;
-
-public interface BarcodeImageWriterResultCallback {
-    void onBarcodeImageWriterResult(boolean success);
-}
--- a/app/src/main/java/protect/card_locker/BarcodeImageWriterTask.java
+++ b/app/src/main/java/protect/card_locker/BarcodeImageWriterTask.java
@@ -41,15 +41,13 @@ public class BarcodeImageWriterTask implements CompatCallable<Bitmap> {
    private final CatimaBarcode format;
    private final int imageHeight;
    private final int imageWidth;
-    private final int imagePadding;
-    private final boolean widthPadding;
    private final boolean showFallback;
-    private final BarcodeImageWriterResultCallback callback;
+    private final Runnable callback;

    BarcodeImageWriterTask(
            Context context, ImageView imageView, String cardIdString,
            CatimaBarcode barcodeFormat, TextView textView,
-            boolean showFallback, BarcodeImageWriterResultCallback callback, boolean roundCornerPadding
+            boolean showFallback, Runnable callback, boolean roundCornerPadding
    ) {
        mContext = context;

@@ -63,39 +61,32 @@ public class BarcodeImageWriterTask implements CompatCallable<Bitmap> {
        cardId = cardIdString;
        format = barcodeFormat;

-        int imageViewHeight = imageView.getHeight();
-        int imageViewWidth = imageView.getWidth();
-
+        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()) {
-            imagePadding = Math.round(TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 10, context.getResources().getDisplayMetrics()));
-        } else {
-            imagePadding = 0;
-        }
-
-        if (format.isSquare() && imageViewWidth > imageViewHeight) {
-            imageViewWidth -= imagePadding;
-            widthPadding = true;
-        } else {
-            imageViewHeight -= imagePadding;
-            widthPadding = false;
+            padding = Math.round(TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 10, context.getResources().getDisplayMetrics()));
        }

        final int MAX_WIDTH = getMaxWidth(format);

-        if (format.isSquare()) {
-            imageHeight = imageWidth = Math.min(imageViewHeight, Math.min(MAX_WIDTH, imageViewWidth));
-        } else if (imageView.getWidth() < MAX_WIDTH) {
-            imageHeight = imageViewHeight;
-            imageWidth = imageViewWidth;
+        int tempImageHeight;
+        int tempImageWidth;
+
+        if (imageView.getWidth() < MAX_WIDTH) {
+            tempImageHeight = imageView.getHeight();
+            tempImageWidth = imageView.getWidth();
        } else {
            // Scale down the image to reduce the memory needed to produce it
-            imageWidth = MAX_WIDTH;
-            double ratio = (double) MAX_WIDTH / (double) imageViewWidth;
-            imageHeight = (int) (imageViewHeight * ratio);
+            tempImageWidth = MAX_WIDTH;
+            double ratio = (double) MAX_WIDTH / (double) imageView.getWidth();
+            tempImageHeight = (int) (imageView.getHeight() * ratio);
        }

+        // Ensure space for padding if wanted
+        imageWidth = tempImageWidth;
+        imageHeight = tempImageHeight - padding;
+
        this.showFallback = showFallback;
    }

@@ -103,15 +94,12 @@ public class BarcodeImageWriterTask implements CompatCallable<Bitmap> {
        switch (format.format()) {
            // 2D barcodes
            case AZTEC:
+            case DATA_MATRIX:
            case MAXICODE:
            case PDF_417:
            case QR_CODE:
                return MAX_WIDTH_2D;

-            // 2D but rectangular versions get blurry otherwise
-            case DATA_MATRIX:
-                return MAX_WIDTH_1D;
-
            // 1D barcodes:
            case CODABAR:
            case CODE_39:
@@ -273,11 +261,6 @@ public class BarcodeImageWriterTask implements CompatCallable<Bitmap> {

        if (result != null) {
            Log.i(TAG, "Displaying barcode");
-            if (widthPadding) {
-                imageView.setPadding(imagePadding / 2, 0, imagePadding / 2, 0);
-            } else {
-                imageView.setPadding(0, imagePadding / 2, 0, imagePadding / 2);
-            }
            imageView.setVisibility(View.VISIBLE);

            if (isSuccesful) {
@@ -299,7 +282,7 @@ public class BarcodeImageWriterTask implements CompatCallable<Bitmap> {
        }

        if (callback != null) {
-            callback.onBarcodeImageWriterResult(isSuccesful);
+            callback.run();
        }
    }

--- a/app/src/main/java/protect/card_locker/BarcodeSelectorActivity.java
+++ b/app/src/main/java/protect/card_locker/BarcodeSelectorActivity.java
@@ -16,6 +16,7 @@ import com.google.zxing.BarcodeFormat;

 import java.util.ArrayList;

+import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.widget.Toolbar;

 import protect.card_locker.databinding.BarcodeSelectorActivityBinding;
@@ -65,6 +66,10 @@ public class BarcodeSelectorActivity extends CatimaAppCompatActivity implements

                    runOnUiThread(() -> {
                        generateBarcodes(s.toString());
+
+                        View noBarcodeButtonView = binding.noBarcode;
+                        setButtonListener(noBarcodeButtonView, s.toString());
+                        noBarcodeButtonView.setEnabled(s.length() > 0);
                    });
                }, INPUT_DELAY);
            }
@@ -90,6 +95,17 @@ public class BarcodeSelectorActivity extends CatimaAppCompatActivity implements
        mAdapter.setBarcodes(barcodes);
    }

+    private void setButtonListener(final View button, final String cardId) {
+        button.setOnClickListener(view -> {
+            Log.d(TAG, "Selected no barcode");
+            Intent result = new Intent();
+            result.putExtra(BARCODE_FORMAT, "");
+            result.putExtra(BARCODE_CONTENTS, cardId);
+            BarcodeSelectorActivity.this.setResult(RESULT_OK, result);
+            finish();
+        });
+    }
+
    @Override
    public boolean onOptionsItemSelected(MenuItem item) {
        if (item.getItemId() == android.R.id.home) {
--- a/app/src/main/java/protect/card_locker/CardShortcutConfigure.java
+++ b/app/src/main/java/protect/card_locker/CardShortcutConfigure.java
@@ -47,19 +47,25 @@ public class CardShortcutConfigure extends CatimaAppCompatActivity implements Lo
            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;
        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.All);
-        mAdapter = new LoyaltyCardCursorAdapter(this, cardCursor, this, null);
+        Cursor cardCursor = DBHelper.getLoyaltyCardCursor(mDatabase, DBHelper.LoyaltyCardArchiveFilter.Unarchived);
+        mAdapter = new LoyaltyCardCursorAdapter(this, cardCursor, this);
        cardList.setAdapter(mAdapter);
    }

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

@@ -75,7 +81,7 @@ public class CardShortcutConfigure extends CatimaAppCompatActivity implements Lo
    @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);
    }

@@ -83,8 +89,8 @@ public class CardShortcutConfigure extends CatimaAppCompatActivity implements Lo
    public boolean onOptionsItemSelected(MenuItem inputItem) {
        int id = inputItem.getItemId();

-        if (id == R.id.action_display_options) {
-            mAdapter.showDisplayOptionsDialog();
+        if (id == R.id.action_unfold) {
+            mAdapter.showDetails(!mAdapter.showingDetails());
            invalidateOptionsMenu();

            return true;
--- a/app/src/main/java/protect/card_locker/CatimaBarcode.java
+++ b/app/src/main/java/protect/card_locker/CatimaBarcode.java
@@ -67,6 +67,7 @@ public class CatimaBarcode {

    public boolean isSquare() {
        return mBarcodeFormat == BarcodeFormat.AZTEC
+                || mBarcodeFormat == BarcodeFormat.DATA_MATRIX
                || mBarcodeFormat == BarcodeFormat.MAXICODE
                || mBarcodeFormat == BarcodeFormat.QR_CODE;
    }
--- a/app/src/main/java/protect/card_locker/DBHelper.java
+++ b/app/src/main/java/protect/card_locker/DBHelper.java
@@ -16,18 +16,13 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Currency;
 import java.util.Date;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Set;

 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;

-    // NB: changing this value requires a migration
-    public static final int DEFAULT_ZOOM_LEVEL = 100;
-
    public static class LoyaltyCardDbGroups {
        public static final String TABLE = "groups";
        public static final String ID = "_id";
@@ -111,7 +106,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 '" + DEFAULT_ZOOM_LEVEL + "', " +
+                LoyaltyCardDbIds.ZOOM_LEVEL + " INTEGER DEFAULT '100', " +
                LoyaltyCardDbIds.ARCHIVE_STATUS + " INTEGER DEFAULT '0' )");

        // create associative table for cards in groups
@@ -328,21 +323,6 @@ public class DBHelper extends SQLiteOpenHelper {
        }
    }

-    public static Set<String> imageFiles(Context context, final SQLiteDatabase database) {
-        Set<String> files = new HashSet<>();
-        Cursor cardCursor = getLoyaltyCardCursor(database);
-        while (cardCursor.moveToNext()) {
-            LoyaltyCard card = LoyaltyCard.toLoyaltyCard(cardCursor);
-            for (ImageLocationType imageLocationType : ImageLocationType.values()) {
-                String name = Utils.getCardImageFileName(card.id, imageLocationType);
-                if (Utils.retrieveCardImageAsFile(context, name).exists()) {
-                    files.add(name);
-                }
-            }
-        }
-        return files;
-    }
-
    private static ContentValues generateFTSContentValues(final int id, final String store, final String note) {
        // FTS on Android is severely limited and can only search for word starting with a certain string
        // So for each word, we grab every single substring
--- a/app/src/main/java/protect/card_locker/GroupCursorAdapter.java
+++ b/app/src/main/java/protect/card_locker/GroupCursorAdapter.java
@@ -7,7 +7,6 @@ import android.database.sqlite.SQLiteDatabase;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.Button;
 import android.widget.ImageButton;
 import android.widget.TextView;

@@ -18,6 +17,7 @@ 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 GroupAdapterListener mListener;
    SQLiteDatabase mDatabase;
@@ -25,6 +25,7 @@ public class GroupCursorAdapter extends BaseCursorAdapter<GroupCursorAdapter.Gro
    public GroupCursorAdapter(Context inputContext, Cursor inputCursor, GroupAdapterListener inputListener) {
        super(inputCursor, DBHelper.LoyaltyCardDbGroups.ORDER);
        setHasStableIds(true);
+        mSettings = new Settings(inputContext);
        mContext = inputContext;
        mListener = inputListener;
        mDatabase = new DBHelper(inputContext).getReadableDatabase();
@@ -62,6 +63,8 @@ public class GroupCursorAdapter extends BaseCursorAdapter<GroupCursorAdapter.Gro
        }

        inputHolder.mCardCount.setText(cardCountText);
+        inputHolder.mName.setTextSize(mSettings.getFontSizeMax(mSettings.getMediumFont()));
+        inputHolder.mCardCount.setTextSize(mSettings.getFontSizeMax(mSettings.getSmallFont()));

        applyClickEvents(inputHolder);
    }
@@ -85,7 +88,7 @@ public class GroupCursorAdapter extends BaseCursorAdapter<GroupCursorAdapter.Gro

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

        public GroupListItemViewHolder(GroupLayoutBinding groupLayoutBinding) {
            super(groupLayoutBinding.getRoot());
--- a/app/src/main/java/protect/card_locker/ImportURIHelper.java
+++ b/app/src/main/java/protect/card_locker/ImportURIHelper.java
@@ -46,11 +46,8 @@ public class ImportURIHelper {
    }

    private boolean isImportUri(Uri uri) {
-        // Remove trailing slash added by some browsers (if it exists)
-        final String uriPath = uri.getPath().replaceAll("/$", "");
-
        for (int i = 0; i < hosts.length; i++) {
-            if (uri.getHost().equals(hosts[i]) && uriPath.equals(paths[i])) {
+            if (uri.getHost().equals(hosts[i]) && uri.getPath().equals(paths[i])) {
                return true;
            }
        }
--- a/app/src/main/java/protect/card_locker/LoyaltyCard.java
+++ b/app/src/main/java/protect/card_locker/LoyaltyCard.java
@@ -8,35 +8,36 @@ import java.math.BigDecimal;
 import java.util.Currency;
 import java.util.Date;

-import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;

 public class LoyaltyCard implements Parcelable {
    public final int id;
    public final String store;
    public final String note;
-    @Nullable
    public final Date validFrom;
-    @Nullable
    public final Date expiry;
    public final BigDecimal balance;
-    @Nullable
    public final Currency balanceType;
    public final String cardId;
+
    @Nullable
    public final String barcodeId;
+
    @Nullable
    public final CatimaBarcode barcodeType;
+
    @Nullable
    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, @Nullable final Date validFrom,
-                       @Nullable final Date expiry, final BigDecimal balance, @Nullable final Currency balanceType,
-                       final String cardId, @Nullable final String barcodeId, @Nullable final CatimaBarcode barcodeType,
+    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) {
        this.id = id;
@@ -144,54 +145,11 @@ public class LoyaltyCard implements Parcelable {
        return new LoyaltyCard(id, store, note, validFrom, expiry, balance, balanceType, cardId, barcodeId, barcodeType, headerColor, starred, lastUsed, zoomLevel, archived);
    }

-    public static boolean isDuplicate(final LoyaltyCard a, final LoyaltyCard b) {
-        // Skip lastUsed & zoomLevel
-        return a.id == b.id && // non-nullable int
-                a.store.equals(b.store) && // non-nullable String
-                a.note.equals(b.note) && // non-nullable String
-                Utils.equals(a.validFrom, b.validFrom) && // nullable Date
-                Utils.equals(a.expiry, b.expiry) && // nullable Date
-                a.balance.equals(b.balance) && // non-nullable BigDecimal
-                Utils.equals(a.balanceType, b.balanceType) && // nullable Currency
-                a.cardId.equals(b.cardId) && // non-nullable String
-                Utils.equals(a.barcodeId, b.barcodeId) && // nullable String
-                Utils.equals(a.barcodeType == null ? null : a.barcodeType.format(),
-                        b.barcodeType == null ? null : b.barcodeType.format()) && // nullable CatimaBarcode with no overridden .equals(), so we need to check .format()
-                Utils.equals(a.headerColor, b.headerColor) && // nullable Integer
-                a.starStatus == b.starStatus && // non-nullable int
-                a.archiveStatus == b.archiveStatus; // non-nullable int
-    }
-
    @Override
    public int describeContents() {
        return id;
    }

-    @NonNull
-    @Override
-    public String toString() {
-        return String.format(
-                "LoyaltyCard{%n  id=%s,%n  store=%s,%n  note=%s,%n  validFrom=%s,%n  expiry=%s,%n"
-                        + "  balance=%s,%n  balanceType=%s,%n  cardId=%s,%n  barcodeId=%s,%n  barcodeType=%s,%n"
-                        + "  headerColor=%s,%n  starStatus=%s,%n  lastUsed=%s,%n  zoomLevel=%s,%n  archiveStatus=%s%n}",
-                this.id,
-                this.store,
-                this.note,
-                this.validFrom,
-                this.expiry,
-                this.balance,
-                this.balanceType,
-                this.cardId,
-                this.barcodeId,
-                this.barcodeType != null ? this.barcodeType.format() : null,
-                this.headerColor,
-                this.starStatus,
-                this.lastUsed,
-                this.zoomLevel,
-                this.archiveStatus
-        );
-    }
-
    public static final Creator<LoyaltyCard> CREATOR = new Creator<LoyaltyCard>() {
        @Override
        public LoyaltyCard createFromParcel(Parcel in) {
--- a/app/src/main/java/protect/card_locker/LoyaltyCardCursorAdapter.java
+++ b/app/src/main/java/protect/card_locker/LoyaltyCardCursorAdapter.java
@@ -1,6 +1,7 @@
 package protect.card_locker;

 import android.content.Context;
+import android.content.SharedPreferences;
 import android.content.res.Resources;
 import android.database.Cursor;
 import android.graphics.Bitmap;
@@ -30,40 +31,58 @@ import androidx.core.graphics.BlendModeCompat;
 import androidx.recyclerview.widget.RecyclerView;

 import protect.card_locker.databinding.LoyaltyCardLayoutBinding;
+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 CardAdapterListener mListener;
-    private final LoyaltyCardListDisplayOptionsManager mLoyaltyCardListDisplayOptions;
    protected SparseBooleanArray mSelectedItems;
    protected SparseBooleanArray mAnimationItemsIndex;
    private boolean mReverseAllAnimations = false;
+    private boolean mShowDetails;

-    public LoyaltyCardCursorAdapter(Context inputContext, Cursor inputCursor, CardAdapterListener inputListener, Runnable inputSwapCursorCallback) {
+    public LoyaltyCardCursorAdapter(Context inputContext, Cursor inputCursor, CardAdapterListener inputListener) {
        super(inputCursor, DBHelper.LoyaltyCardDbIds.ID);
        setHasStableIds(true);
+        mSettings = new Settings(inputContext);
        mContext = inputContext;
        mListener = inputListener;
-
-        Runnable refreshCardsCallback = () -> notifyDataSetChanged();
-
-        mLoyaltyCardListDisplayOptions = new LoyaltyCardListDisplayOptionsManager(mContext, refreshCardsCallback, inputSwapCursorCallback);
        mSelectedItems = new SparseBooleanArray();
        mAnimationItemsIndex = new SparseBooleanArray();

        mDarkModeEnabled = Utils.isDarkModeEnabled(inputContext);

+        refreshState();
+
        swapCursor(inputCursor);
    }

-    public void showDisplayOptionsDialog() {
-        mLoyaltyCardListDisplayOptions.showDisplayOptionsDialog();
+    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 boolean showingArchivedCards() {
-        return mLoyaltyCardListDisplayOptions.showingArchivedCards();
+    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
@@ -84,47 +103,45 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso

    public void onBindViewHolder(LoyaltyCardListItemViewHolder inputHolder, Cursor inputCursor) {
        // Invisible until we want to show something more
-        boolean showDivider = false;
        inputHolder.mDivider.setVisibility(View.GONE);

        LoyaltyCard loyaltyCard = LoyaltyCard.toLoyaltyCard(inputCursor);
-        Bitmap icon = Utils.retrieveCardImage(mContext, loyaltyCard.id, ImageLocationType.icon);

-        if (mLoyaltyCardListDisplayOptions.showingNameBelowThumbnail() && icon != null) {
-            showDivider = true;
-            inputHolder.setStoreField(loyaltyCard.store);
-        } else {
-            inputHolder.setStoreField(null);
-        }
-
-        if (mLoyaltyCardListDisplayOptions.showingNote() && !loyaltyCard.note.isEmpty()) {
-            showDivider = true;
+        inputHolder.setStoreField(loyaltyCard.store);
+        if (mShowDetails && !loyaltyCard.note.isEmpty()) {
            inputHolder.setNoteField(loyaltyCard.note);
        } else {
            inputHolder.setNoteField(null);
        }

-        if (mLoyaltyCardListDisplayOptions.showingBalance() && !loyaltyCard.balance.equals(new BigDecimal("0"))) {
-            inputHolder.setExtraField(inputHolder.mBalanceField, Utils.formatBalance(mContext, loyaltyCard.balance, loyaltyCard.balanceType), null, showDivider);
+        if (mShowDetails && !loyaltyCard.balance.equals(new BigDecimal("0"))) {
+            inputHolder.setExtraField(inputHolder.mBalanceField, Utils.formatBalance(mContext, loyaltyCard.balance, loyaltyCard.balanceType), null);
        } else {
-            inputHolder.setExtraField(inputHolder.mBalanceField, null, null, false);
+            inputHolder.setExtraField(inputHolder.mBalanceField, null, null);
        }

-        if (mLoyaltyCardListDisplayOptions.showingValidity() && loyaltyCard.validFrom != null) {
-            inputHolder.setExtraField(inputHolder.mValidFromField, DateFormat.getDateInstance(DateFormat.LONG).format(loyaltyCard.validFrom), Utils.isNotYetValid(loyaltyCard.validFrom) ? Color.RED : null, showDivider);
+        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, false);
+            inputHolder.setExtraField(inputHolder.mValidFromField, null, null);
        }

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

-        inputHolder.mCardIcon.setContentDescription(loyaltyCard.store);
-        Utils.setIconOrTextWithBackground(mContext, loyaltyCard, icon, inputHolder.mCardIcon, inputHolder.mCardText);
-        inputHolder.setIconBackgroundColor(Utils.getHeaderColor(mContext, loyaltyCard));
+        setHeaderHeight(inputHolder, mShowDetails);
+        Bitmap cardIcon = Utils.retrieveCardImage(mContext, loyaltyCard.id, ImageLocationType.icon);
+        if (cardIcon != null) {
+            inputHolder.mCardIcon.setImageBitmap(cardIcon);
+            inputHolder.mCardIcon.setScaleType(ImageView.ScaleType.CENTER_CROP);
+        } else {
+            inputHolder.mCardIcon.setImageBitmap(Utils.generateIcon(mContext, loyaltyCard.store, loyaltyCard.headerColor).getLetterTile());
+            inputHolder.mCardIcon.setScaleType(ImageView.ScaleType.FIT_CENTER);
+        }
+        inputHolder.setIconBackgroundColor(loyaltyCard.headerColor != null ? loyaltyCard.headerColor : androidx.appcompat.R.attr.colorPrimary);

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

@@ -136,6 +153,19 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
        inputHolder.mRow.requestLayout();
    }

+    private void setHeaderHeight(LoyaltyCardListItemViewHolder inputHolder, boolean expanded) {
+        int iconHeight;
+        if (expanded) {
+            iconHeight = ViewGroup.LayoutParams.MATCH_PARENT;
+        } else {
+            iconHeight = (int) mContext.getResources().getDimension(R.dimen.cardThumbnailSize);
+        }
+
+        inputHolder.mIconLayout.getLayoutParams().height = expanded ? 0 : iconHeight;
+        inputHolder.mCardIcon.getLayoutParams().height = iconHeight;
+        inputHolder.mTickIcon.getLayoutParams().height = iconHeight;
+    }
+
    private void applyClickEvents(LoyaltyCardListItemViewHolder inputHolder, final int inputPosition) {
        inputHolder.mRow.setOnClickListener(inputView -> mListener.onRowClicked(inputPosition));

@@ -211,14 +241,16 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso

    public class LoyaltyCardListItemViewHolder extends RecyclerView.ViewHolder {

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

        private int mIconBackgroundColor;

+
+
        protected LoyaltyCardListItemViewHolder(LoyaltyCardLayoutBinding loyaltyCardLayoutBinding, CardAdapterListener inputListener) {
            super(loyaltyCardLayoutBinding.getRoot());
            View inputView = loyaltyCardLayoutBinding.getRoot();
@@ -229,8 +261,8 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
            mBalanceField = loyaltyCardLayoutBinding.balance;
            mValidFromField = loyaltyCardLayoutBinding.validFrom;
            mExpiryField = loyaltyCardLayoutBinding.expiry;
+            mIconLayout = loyaltyCardLayoutBinding.iconLayout;
            mCardIcon = loyaltyCardLayoutBinding.thumbnail;
-            mCardText = loyaltyCardLayoutBinding.thumbnailText;
            mStar = loyaltyCardLayoutBinding.star;
            mStarBackground = loyaltyCardLayoutBinding.starBackground;
            mStarBorder = loyaltyCardLayoutBinding.starBorder;
@@ -244,7 +276,7 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
            });
        }

-        private void setExtraField(TextView field, String text, Integer color, boolean showDivider) {
+        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) {
@@ -253,18 +285,20 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
                return;
            }

-            // Shown when there is a name and/or note and at least 1 extra field
-            if (showDivider) {
-                mDivider.setVisibility(View.VISIBLE);
-            }
+            int size = mSettings.getFontSizeMax(mSettings.getSmallFont());

-            field.setText(text);
-            field.setTextColor(color != null ? color : MaterialColors.getColor(mContext, com.google.android.material.R.attr.colorSecondary, ContextCompat.getColor(mContext, mDarkModeEnabled ? R.color.md_theme_dark_secondary : R.color.md_theme_light_secondary)));
            field.setVisibility(View.VISIBLE);
+            field.setText(text);
+            field.setTextSize(size);
+            field.setTextColor(color != null ? color : MaterialColors.getColor(mContext, com.google.android.material.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) {
@@ -278,12 +312,8 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
        }

        public void setStoreField(String text) {
-            if (text == null) {
-                mStoreField.setVisibility(View.GONE);
-            } else {
-                mStoreField.setVisibility(View.VISIBLE);
-                mStoreField.setText(text);
-            }
+            mStoreField.setText(text);
+            mStoreField.setTextSize(mSettings.getFontSizeMax(mSettings.getMediumFont()));
            mStoreField.requestLayout();
        }

@@ -293,6 +323,7 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
            } else {
                mNoteField.setVisibility(View.VISIBLE);
                mNoteField.setText(text);
+                mNoteField.setTextSize(mSettings.getFontSizeMax(mSettings.getSmallFont()));
            }
            mNoteField.requestLayout();
        }
--- a/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java
+++ b/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java
@@ -23,7 +23,6 @@ import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
-import android.view.ViewGroup;
 import android.view.ViewTreeObserver;
 import android.view.WindowManager;
 import android.widget.ArrayAdapter;
@@ -31,25 +30,10 @@ import android.widget.AutoCompleteTextView;
 import android.widget.Button;
 import android.widget.DatePicker;
 import android.widget.EditText;
-import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;

-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.AlertDialog;
-import androidx.appcompat.app.AppCompatActivity;
-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 com.google.android.material.chip.Chip;
 import com.google.android.material.chip.ChipGroup;
 import com.google.android.material.color.MaterialColors;
@@ -81,14 +65,25 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.NoSuchElementException;
-import java.util.Objects;
 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.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 protect.card_locker.async.TaskHandler;
 import protect.card_locker.databinding.LayoutChipChoiceBinding;
 import protect.card_locker.databinding.LoyaltyCardEditActivityBinding;

-public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements BarcodeImageWriterResultCallback, ColorPickerDialogListener {
+public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
    private LoyaltyCardEditActivityBinding binding;
    private static final String TAG = "Catima";

@@ -103,7 +98,6 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
    private final String STATE_FRONT_IMAGE_REMOVED = "frontImageRemoved";
    private final String STATE_BACK_IMAGE_REMOVED = "backImageRemoved";
    private final String STATE_ICON_REMOVED = "iconRemoved";
-    private final String STATE_OPEN_SET_ICON_MENU = "openSetIconMenu";

    private final String TEMP_CAMERA_IMAGE_NAME = LoyaltyCardEditActivity.class.getSimpleName() + "_camera_image.jpg";
    private final String TEMP_CROP_IMAGE_NAME = LoyaltyCardEditActivity.class.getSimpleName() + "_crop_image.png";
@@ -124,7 +118,6 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
    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_OPEN_SET_ICON_MENU = "openSetIconMenu";
    public static final String BUNDLE_CARDID = "cardId";
    public static final String BUNDLE_BARCODEID = "barcodeId";
    public static final String BUNDLE_BARCODETYPE = "barcodeType";
@@ -159,7 +152,6 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
    int loyaltyCardId;
    boolean updateLoyaltyCard;
    boolean duplicateFromLoyaltyCardId;
-    boolean openSetIconMenu;
    String cardId;
    String barcodeId;
    String barcodeType;
@@ -174,12 +166,12 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
    String tempStoredOldBarcodeValue = null;
    boolean initDone = false;
    boolean onResuming = false;
-    boolean onRestoring = false;
    AlertDialog confirmExitDialog = null;

    boolean validBalance = true;
+    Runnable barcodeImageGenerationFinishedCallback;
+
    HashMap<String, Currency> currencies = new HashMap<>();
-    HashMap<String, String> currencySymbols = new HashMap<>();

    LoyaltyCard tempLoyaltyCard;

@@ -232,7 +224,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
        );
    }

-    protected void updateTempState(LoyaltyCardField fieldName, Object value) {
+    private void updateTempState(LoyaltyCardField fieldName, Object value) {
        tempLoyaltyCard = updateTempState(tempLoyaltyCard, fieldName, value);

        if (initDone && (fieldName == LoyaltyCardField.cardId || fieldName == LoyaltyCardField.barcodeId || fieldName == LoyaltyCardField.barcodeType)) {
@@ -248,8 +240,6 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
        updateLoyaltyCard = b != null && b.getBoolean(BUNDLE_UPDATE, false);
        duplicateFromLoyaltyCardId = b != null && b.getBoolean(BUNDLE_DUPLICATE_ID, false);

-        openSetIconMenu = b != null && b.getBoolean(BUNDLE_OPEN_SET_ICON_MENU, false);
-
        cardId = b != null ? b.getString(BUNDLE_CARDID) : null;
        barcodeId = b != null ? b.getString(BUNDLE_BARCODEID) : null;
        barcodeType = b != null ? b.getString(BUNDLE_BARCODETYPE) : null;
@@ -261,6 +251,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
                + ", updateLoyaltyCard=" + updateLoyaltyCard);
    }

+
    @Override
    public void onSaveInstanceState(@NonNull Bundle savedInstanceState) {
        super.onSaveInstanceState(savedInstanceState);
@@ -295,12 +286,10 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
        savedInstanceState.putInt(STATE_FRONT_IMAGE_REMOVED, mFrontImageRemoved ? 1 : 0);
        savedInstanceState.putInt(STATE_BACK_IMAGE_REMOVED, mBackImageRemoved ? 1 : 0);
        savedInstanceState.putInt(STATE_ICON_REMOVED, mIconRemoved ? 1 : 0);
-        savedInstanceState.putInt(STATE_OPEN_SET_ICON_MENU, openSetIconMenu ? 1 : 0);
    }

    @Override
    public void onRestoreInstanceState(@NonNull Bundle savedInstanceState) {
-        onRestoring = true;
        tempLoyaltyCard = savedInstanceState.getParcelable(STATE_TEMP_CARD);
        super.onRestoreInstanceState(savedInstanceState);
        tabs = binding.tabs;
@@ -314,7 +303,6 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
        mFrontImageRemoved = savedInstanceState.getInt(STATE_FRONT_IMAGE_REMOVED) == 1;
        mBackImageRemoved = savedInstanceState.getInt(STATE_BACK_IMAGE_REMOVED) == 1;
        mIconRemoved = savedInstanceState.getInt(STATE_ICON_REMOVED) == 1;
-        openSetIconMenu = savedInstanceState.getInt(STATE_OPEN_SET_ICON_MENU) == 1;
    }

    @Override
@@ -334,7 +322,6 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements

        for (Currency currency : Currency.getAvailableCurrencies()) {
            currencies.put(currency.getSymbol(), currency);
-            currencySymbols.put(currency.getCurrencyCode(), currency.getSymbol());
        }

        tabs = binding.tabs;
@@ -361,18 +348,18 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements

        enterButton = binding.enterButton;

+        barcodeImageGenerationFinishedCallback = () -> {
+            if (!(boolean) barcodeImage.getTag()) {
+                barcodeImageLayout.setVisibility(View.GONE);
+                Toast.makeText(LoyaltyCardEditActivity.this, getString(R.string.wrongValueForBarcodeType), Toast.LENGTH_LONG).show();
+            }
+        };
+
        storeFieldEdit.addTextChangedListener(new SimpleTextWatcher() {
            @Override
            public void onTextChanged(CharSequence s, int start, int before, int count) {
-                String storeName = s.toString().trim();
-                updateTempState(LoyaltyCardField.store, storeName);
-                generateIcon(storeName);
-
-                if (storeName.length() == 0) {
-                    storeFieldEdit.setError(getString(R.string.field_must_not_be_empty));
-                } else {
-                    storeFieldEdit.setError(null);
-                }
+                updateTempState(LoyaltyCardField.store, s.toString());
+                generateIcon(s.toString());
            }
        });

@@ -387,27 +374,8 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements

        addDateFieldTextChangedListener(expiryField, R.string.never, R.string.chooseExpiryDate, LoyaltyCardField.expiry);

-        DatePickerFragment.registerDatePickListener(this, (textFieldToEdit, newDate) -> {
-            switch (textFieldToEdit) {
-                case validFrom:
-                    formatDateField(this, validFromField, newDate);
-                    updateTempState(LoyaltyCardField.validFrom, newDate);
-                    break;
-                case expiry:
-                    formatDateField(this, expiryField, newDate);
-                    updateTempState(LoyaltyCardField.expiry, newDate);
-                    break;
-                default:
-                    throw new AssertionError("Unexpected field: " + textFieldToEdit);
-            }
-        });
-
        balanceField.setOnFocusChangeListener((v, hasFocus) -> {
-            if (!hasFocus && !onResuming && !onRestoring) {
-                if (balanceField.getText().toString().isEmpty()) {
-                    updateTempState(LoyaltyCardField.balance, BigDecimal.valueOf(0));
-                }
-
+            if (!hasFocus) {
                balanceField.setText(Utils.formatBalanceWithoutCurrencySymbol(tempLoyaltyCard.balance, tempLoyaltyCard.balanceType));
            }
        });
@@ -415,16 +383,13 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
        balanceField.addTextChangedListener(new SimpleTextWatcher() {
            @Override
            public void onTextChanged(CharSequence s, int start, int before, int count) {
-                if (onResuming || onRestoring) return;
                try {
                    BigDecimal balance = Utils.parseBalance(s.toString(), tempLoyaltyCard.balanceType);
                    updateTempState(LoyaltyCardField.balance, balance);
-                    balanceField.setError(null);
                    validBalance = true;
                } catch (ParseException e) {
-                    e.printStackTrace();
-                    balanceField.setError(getString(R.string.balanceParsingFailed));
                    validBalance = false;
+                    e.printStackTrace();
                }
            }
        });
@@ -442,7 +407,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements

                updateTempState(LoyaltyCardField.balanceType, currency);

-                if (tempLoyaltyCard.balance != null && !onResuming && !onRestoring) {
+                if (tempLoyaltyCard.balance != null) {
                    balanceField.setText(Utils.formatBalanceWithoutCurrencySymbol(tempLoyaltyCard.balance, currency));
                }
            }
@@ -500,12 +465,6 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
            @Override
            public void onTextChanged(CharSequence s, int start, int before, int count) {
                updateTempState(LoyaltyCardField.cardId, s.toString());
-
-                if (s.length() == 0) {
-                    cardIdFieldView.setError(getString(R.string.field_must_not_be_empty));
-                } else {
-                    cardIdFieldView.setError(null);
-                }
            }
        });

@@ -534,20 +493,10 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
                    builder.setTitle(R.string.setBarcodeId);
                    final EditText input = new EditText(LoyaltyCardEditActivity.this);
                    input.setInputType(InputType.TYPE_CLASS_TEXT);
-
-                    FrameLayout container = new FrameLayout(LoyaltyCardEditActivity.this);
-                    FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
-                    int contentPadding = getResources().getDimensionPixelSize(R.dimen.alert_dialog_content_padding);
-                    params.leftMargin = contentPadding;
-                    params.topMargin = contentPadding / 2;
-                    params.rightMargin = contentPadding;
-
-                    input.setLayoutParams(params);
-                    container.addView(input);
                    if (tempLoyaltyCard.barcodeId != null) {
                        input.setText(tempLoyaltyCard.barcodeId);
                    }
-                    builder.setView(container);
+                    builder.setView(input);

                    builder.setPositiveButton(getString(R.string.ok), (dialog, which) -> {
                        // If the user manually changes the barcode again make sure we disable the
@@ -849,19 +798,11 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
        noteFieldEdit.setText(tempLoyaltyCard.note);
        formatDateField(this, validFromField, tempLoyaltyCard.validFrom);
        formatDateField(this, expiryField, tempLoyaltyCard.expiry);
+        formatBalanceCurrencyField(tempLoyaltyCard.balanceType);
        cardIdFieldView.setText(tempLoyaltyCard.cardId);
        barcodeIdField.setText(tempLoyaltyCard.barcodeId != null ? tempLoyaltyCard.barcodeId : getString(R.string.sameAsCardId));
        barcodeTypeField.setText(tempLoyaltyCard.barcodeType != null ? tempLoyaltyCard.barcodeType.prettyName() : getString(R.string.noBarcode));

-        // We set the balance here (with onResuming/onRestoring == true) to prevent formatBalanceCurrencyField() from setting it (via onTextChanged),
-        // which can cause issues when switching locale because it parses the balance and e.g. the decimal separator may have changed.
-        formatBalanceCurrencyField(tempLoyaltyCard.balanceType);
-        BigDecimal balance = tempLoyaltyCard.balance == null ? new BigDecimal("0") : tempLoyaltyCard.balance;
-        tempLoyaltyCard = updateTempState(tempLoyaltyCard, LoyaltyCardField.balance, balance);
-        balanceField.setText(Utils.formatBalanceWithoutCurrencySymbol(tempLoyaltyCard.balance, tempLoyaltyCard.balanceType));
-        validBalance = true;
-        Log.d(TAG, "Setting balance to " + balance);
-
        if (groupsChips.getChildCount() == 0) {
            List<Group> existingGroups = DBHelper.getGroups(mDatabase);

@@ -902,9 +843,10 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
            }
        }

+        // Generate random header color
        if (tempLoyaltyCard.headerColor == null) {
-            // If name is set, pick colour relevant for name. Otherwise pick randomly
-            updateTempState(LoyaltyCardField.headerColor, tempLoyaltyCard.store.isEmpty() ? Utils.getRandomHeaderColor(this) : Utils.getHeaderColor(this, tempLoyaltyCard));
+            // Select a random color to start out with.
+            updateTempState(LoyaltyCardField.headerColor, Utils.getRandomHeaderColor(this));
        }

        // Update from intent
@@ -951,7 +893,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
        saveButton.setOnClickListener(v -> doSave());
        saveButton.bringToFront();

-        generateIcon(storeFieldEdit.getText().toString().trim());
+        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
@@ -964,20 +906,12 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
        }

        onResuming = false;
-        onRestoring = false;
-
-        // Fake click on the edit icon to cause the set icon option to pop up if the icon was
-        // long-pressed in the view activity
-        if (openSetIconMenu) {
-            openSetIconMenu = false;
-            thumbnail.callOnClick();
-        }
    }

    protected void setColorFromIcon() {
        Object icon = thumbnail.getTag();
        if (icon != null && (icon instanceof Bitmap)) {
-            int headerColor = Utils.getHeaderColorFromImage((Bitmap) icon, Utils.getHeaderColor(this, tempLoyaltyCard));
+            int headerColor = Utils.getHeaderColorFromImage((Bitmap) icon, tempLoyaltyCard.headerColor != null ? tempLoyaltyCard.headerColor : androidx.appcompat.R.attr.colorPrimary);

            updateTempState(LoyaltyCardField.headerColor, headerColor);

@@ -1011,20 +945,21 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
            public void onTextChanged(CharSequence s, int start, int before, int count) {
                if (s.toString().equals(getString(defaultOptionStringId))) {
                    dateField.setTag(null);
-                    updateTempState(loyaltyCardField, null);
                } else if (s.toString().equals(getString(chooseDateOptionStringId))) {
                    if (!lastValue.toString().equals(getString(chooseDateOptionStringId))) {
                        dateField.setText(lastValue);
                    }
-                    DialogFragment datePickerFragment = DatePickerFragment.newInstance(
-                            loyaltyCardField,
-                            (Date) dateField.getTag(),
+                    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
@@ -1060,7 +995,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
        if (balanceType == null) {
            balanceCurrencyField.setText(getString(R.string.points));
        } else {
-            balanceCurrencyField.setText(getCurrencySymbol(balanceType));
+            balanceCurrencyField.setText(balanceType.getSymbol());
        }
    }

@@ -1194,12 +1129,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
        Uri photoURI = FileProvider.getUriForFile(LoyaltyCardEditActivity.this, BuildConfig.APPLICATION_ID, Utils.createTempFile(this, TEMP_CAMERA_IMAGE_NAME));
        mRequestedImage = type;

-        try {
-            mPhotoTakerLauncher.launch(photoURI);
-        } catch (ActivityNotFoundException e) {
-            Toast.makeText(getApplicationContext(), R.string.cameraPermissionDeniedTitle, Toast.LENGTH_LONG).show();
-            Log.e(TAG, "No activity found to handle intent", e);
-        }
+        mPhotoTakerLauncher.launch(photoURI);
    }

    private void selectImageFromGallery(int type) {
@@ -1220,14 +1150,6 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
        }
    }

-    @Override
-    public void onBarcodeImageWriterResult(boolean success) {
-        if (!success) {
-            barcodeImageLayout.setVisibility(View.GONE);
-            Toast.makeText(LoyaltyCardEditActivity.this, getString(R.string.wrongValueForBarcodeType), Toast.LENGTH_LONG).show();
-        }
-    }
-
    class EditCardIdAndBarcode implements View.OnClickListener {
        @Override
        public void onClick(View v) {
@@ -1279,7 +1201,31 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
                    }

                    ColorPickerDialog dialog = dialogBuilder.create();
+                    dialog.setColorPickerDialogListener(new ColorPickerDialogListener() {
+                        @Override
+                        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);
+
+                            generateIcon(storeFieldEdit.getText().toString());
+                        }
+
+                        @Override
+                        public void onDialogDismissed(int dialogId) {
+                            // Nothing to do, no change made
+                        }
+                    });
                    dialog.show(getSupportFragmentManager(), "color-picker-dialog");
+
+                    setCardImage(targetView, null, false);
+                    mIconRemoved = true;
+                    mIconUnsaved = false;
+
                    return null;
                });
            }
@@ -1356,80 +1302,30 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
        }
    }

-    // ColorPickerDialogListener callback used by the ColorPickerDialog created in ChooseCardImage to set the thumbnail color
-    // We don't need to set or check the dialogId since it's only used for that single dialog
-    @Override
-    public void onColorSelected(int dialogId, int color) {
-        // Unset image if set
-        setCardImage(thumbnail, null, false);
-        mIconRemoved = true;
-        mIconUnsaved = false;
-
-        updateTempState(LoyaltyCardField.headerColor, color);
-
-        thumbnailEditIcon.setBackgroundColor(Utils.needsDarkForeground(color) ? Color.BLACK : Color.WHITE);
-        thumbnailEditIcon.setColorFilter(Utils.needsDarkForeground(color) ? Color.WHITE : Color.BLACK);
-
-        generateIcon(storeFieldEdit.getText().toString().trim());
-    }
-
-    // ColorPickerDialogListener callback
-    @Override
-    public void onDialogDismissed(int dialogId) {
-        // Nothing to do, no change made
-    }
-
    public static class DatePickerFragment extends DialogFragment
            implements DatePickerDialog.OnDateSetListener {

-        public interface OnDatePickListener {
-            void onDatePicked(@NonNull LoyaltyCardField textFieldToEdit, @NonNull Date newDate);
-        }
-
-        private static final String TEXT_FIELD_TO_EDIT_ARGUMENT_KEY = "text_field_to_edit";
-        private static final String CURRENT_DATE_ARGUMENT_KEY = "current_date";
-        private static final String MIN_DATE_ARGUMENT_KEY = "min_date";
-        private static final String MAX_DATE_ARGUMENT_KEY = "max_date";
-        private static final String PICK_DATE_REQUEST_KEY = "pick_date_request";
-        private static final String NEWLY_PICKED_DATE_ARGUMENT_KEY = "newly_picked_date";
-
-        LoyaltyCardField textFieldEdit;
+        final Context context;
+        final EditText textFieldEdit;
        @Nullable
-        Date minDate;
+        final Date minDate;
        @Nullable
-        Date maxDate;
+        final Date maxDate;

-        public static DatePickerFragment newInstance(@NonNull LoyaltyCardField textField, @Nullable Date currentDate, @Nullable Date minDate, @Nullable Date maxDate) {
-            Bundle args = new Bundle();
-            args.putSerializable(TEXT_FIELD_TO_EDIT_ARGUMENT_KEY, textField);
-            args.putSerializable(CURRENT_DATE_ARGUMENT_KEY, currentDate);
-            args.putSerializable(MIN_DATE_ARGUMENT_KEY, minDate);
-            args.putSerializable(MAX_DATE_ARGUMENT_KEY, maxDate);
-            DatePickerFragment fragment = new DatePickerFragment();
-            fragment.setArguments(args);
-            return fragment;
-        }
-
-        public static void registerDatePickListener(@NonNull AppCompatActivity activity, @NonNull OnDatePickListener listener) {
-            activity.getSupportFragmentManager().setFragmentResultListener(
-                    PICK_DATE_REQUEST_KEY,
-                    activity,
-                    (requestKey, result) -> listener.onDatePicked(
-                            (LoyaltyCardField) Objects.requireNonNull(result.getSerializable(TEXT_FIELD_TO_EDIT_ARGUMENT_KEY)),
-                            (Date) Objects.requireNonNull(result.getSerializable(NEWLY_PICKED_DATE_ARGUMENT_KEY))));
+        DatePickerFragment(Context context, EditText textFieldEdit, @Nullable Date minDate, @Nullable Date maxDate) {
+            this.context = context;
+            this.textFieldEdit = textFieldEdit;
+            this.minDate = minDate;
+            this.maxDate = maxDate;
        }

        @NonNull
        @Override
        public Dialog onCreateDialog(Bundle savedInstanceState) {
-            Bundle args = requireArguments();
-            textFieldEdit = (LoyaltyCardField) args.getSerializable(TEXT_FIELD_TO_EDIT_ARGUMENT_KEY);
-            minDate = (Date) args.getSerializable(MIN_DATE_ARGUMENT_KEY);
-            maxDate = (Date) args.getSerializable(MAX_DATE_ARGUMENT_KEY);
            // Use the current date as the default date in the picker
            final Calendar c = Calendar.getInstance();

-            Date date = (Date) args.getSerializable(CURRENT_DATE_ARGUMENT_KEY);
+            Date date = (Date) textFieldEdit.getTag();
            if (date != null) {
                c.setTime(date);
            }
@@ -1471,10 +1367,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements

            Date date = new Date(unixTime);

-            Bundle result = new Bundle();
-            result.putSerializable(TEXT_FIELD_TO_EDIT_ARGUMENT_KEY, textFieldEdit);
-            result.putSerializable(NEWLY_PICKED_DATE_ARGUMENT_KEY, date);
-            getParentFragmentManager().setFragmentResult(PICK_DATE_REQUEST_KEY, result);
+            formatDateField(context, textFieldEdit, date);
        }
    }

@@ -1489,41 +1382,18 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
            return;
        }

-        boolean hasError = false;
-
        if (tempLoyaltyCard.store.isEmpty()) {
-            storeFieldEdit.setError(getString(R.string.field_must_not_be_empty));
-
-            // Focus element
-            tabs.selectTab(tabs.getTabAt(0));
-            storeFieldEdit.requestFocus();
-
-            hasError = true;
+            Snackbar.make(storeFieldEdit, R.string.noStoreError, Snackbar.LENGTH_LONG).show();
+            return;
        }

        if (tempLoyaltyCard.cardId.isEmpty()) {
-            cardIdFieldView.setError(getString(R.string.field_must_not_be_empty));
-
-            // Focus element if first error element
-            if (!hasError) {
-                tabs.selectTab(tabs.getTabAt(0));
-                cardIdFieldView.requestFocus();
-                hasError = true;
-            }
+            Snackbar.make(cardIdFieldView, R.string.noCardIdError, Snackbar.LENGTH_LONG).show();
+            return;
        }

        if (!validBalance) {
-            balanceField.setError(getString(R.string.balanceParsingFailed));
-
-            // Focus element if first error element
-            if (!hasError) {
-                tabs.selectTab(tabs.getTabAt(1));
-                balanceField.requestFocus();
-                hasError = true;
-            }
-        }
-
-        if (hasError) {
+            Snackbar.make(balanceField, getString(R.string.parsingBalanceFailed, balanceField.getText().toString()), Snackbar.LENGTH_LONG).show();
            return;
        }

@@ -1659,7 +1529,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
        String cardIdString = tempLoyaltyCard.barcodeId != null ? tempLoyaltyCard.barcodeId : tempLoyaltyCard.cardId;
        CatimaBarcode barcodeFormat = tempLoyaltyCard.barcodeType;

-        if (cardIdString == null || cardIdString.isEmpty() || barcodeFormat == null) {
+        if (cardIdString == null || barcodeFormat == null) {
            barcodeImageLayout.setVisibility(View.GONE);
            return;
        }
@@ -1677,13 +1547,13 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
                            barcodeImage.getViewTreeObserver().removeOnGlobalLayoutListener(this);

                            Log.d(TAG, "ImageView size now known");
-                            BarcodeImageWriterTask barcodeWriter = new BarcodeImageWriterTask(getApplicationContext(), barcodeImage, cardIdString, barcodeFormat, null, false, LoyaltyCardEditActivity.this, true);
+                            BarcodeImageWriterTask barcodeWriter = new BarcodeImageWriterTask(getApplicationContext(), barcodeImage, cardIdString, barcodeFormat, null, false, barcodeImageGenerationFinishedCallback, true);
                            mTasks.executeTask(TaskHandler.TYPE.BARCODE, barcodeWriter);
                        }
                    });
        } else {
            Log.d(TAG, "ImageView size known known, creating barcode");
-            BarcodeImageWriterTask barcodeWriter = new BarcodeImageWriterTask(getApplicationContext(), barcodeImage, cardIdString, barcodeFormat, null, false, this, true);
+            BarcodeImageWriterTask barcodeWriter = new BarcodeImageWriterTask(getApplicationContext(), barcodeImage, cardIdString, barcodeFormat, null, false, barcodeImageGenerationFinishedCallback, true);
            mTasks.executeTask(TaskHandler.TYPE.BARCODE, barcodeWriter);
        }
    }
@@ -1740,16 +1610,11 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements

    private void currencyPrioritizeLocaleSymbols(ArrayList<String> currencyList, Locale locale) {
        try {
-            String currencySymbol = getCurrencySymbol(Currency.getInstance(locale));
+            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);
        }
    }
-
-    private String getCurrencySymbol(final Currency currency) {
-        // Workaround for Android bug where the output of Currency.getSymbol() changes.
-        return currencySymbols.get(currency.getCurrencyCode());
-    }
 }
--- a/app/src/main/java/protect/card_locker/LoyaltyCardListDisplayOptionsManager.java
+++ b/app/src/main/java/protect/card_locker/LoyaltyCardListDisplayOptionsManager.java
@@ -1,176 +0,0 @@
-package protect.card_locker;
-
-import android.content.Context;
-import android.content.SharedPreferences;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.appcompat.app.AlertDialog;
-
-import com.google.android.material.dialog.MaterialAlertDialogBuilder;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.function.Consumer;
-
-public class LoyaltyCardListDisplayOptionsManager {
-    public static class LoyaltyCardDisplayOption {
-        public String name;
-        public boolean value;
-        public Consumer<Boolean> callback;
-
-        LoyaltyCardDisplayOption(String name, boolean value, Consumer<Boolean> callback) {
-            this.name = name;
-            this.value = value;
-            this.callback = callback;
-        }
-    }
-
-    public final Context mContext;
-
-    private final Runnable mRefreshCardsCallback;
-    private final Runnable mSwapCursorCallback;
-
-    protected SharedPreferences mCardDetailsPref;
-
-    private boolean mShowNameBelowThumbnail;
-    private boolean mShowNote;
-    private boolean mShowBalance;
-    private boolean mShowValidity;
-    private boolean mShowArchivedCards;
-
-    public LoyaltyCardListDisplayOptionsManager(Context context, @NonNull Runnable refreshCardsCallback, @Nullable Runnable swapCursorCallback) {
-        mContext = context;
-        mRefreshCardsCallback = refreshCardsCallback;
-        mSwapCursorCallback = swapCursorCallback;
-
-        // Retrieve user details preference
-        mCardDetailsPref = mContext.getSharedPreferences(
-                mContext.getString(R.string.sharedpreference_card_details),
-                Context.MODE_PRIVATE);
-        mShowNameBelowThumbnail = mCardDetailsPref.getBoolean(mContext.getString(R.string.sharedpreference_card_details_show_name_below_thumbnail), false);
-        mShowNote = mCardDetailsPref.getBoolean(mContext.getString(R.string.sharedpreference_card_details_show_note), true);
-        mShowBalance = mCardDetailsPref.getBoolean(mContext.getString(R.string.sharedpreference_card_details_show_balance), true);
-        mShowValidity = mCardDetailsPref.getBoolean(mContext.getString(R.string.sharedpreference_card_details_show_validity), true);
-        mShowArchivedCards = mCardDetailsPref.getBoolean(mContext.getString(R.string.sharedpreference_card_details_show_archived_cards), true);
-    }
-
-    void saveDetailState(int stateId, boolean value) {
-        SharedPreferences.Editor cardDetailsPrefEditor = mCardDetailsPref.edit();
-        cardDetailsPrefEditor.putBoolean(mContext.getString(stateId), value);
-        cardDetailsPrefEditor.apply();
-    }
-
-    public void showNameBelowThumbnail(boolean show) {
-        mShowNameBelowThumbnail = show;
-        mRefreshCardsCallback.run();
-
-        saveDetailState(R.string.sharedpreference_card_details_show_name_below_thumbnail, show);
-    }
-
-    public boolean showingNameBelowThumbnail() {
-        return mShowNameBelowThumbnail;
-    }
-
-    public void showNote(boolean show) {
-        mShowNote = show;
-        mRefreshCardsCallback.run();
-
-        saveDetailState(R.string.sharedpreference_card_details_show_note, show);
-    }
-
-    public boolean showingNote() {
-        return mShowNote;
-    }
-
-    public void showBalance(boolean show) {
-        mShowBalance = show;
-        mRefreshCardsCallback.run();
-
-        saveDetailState(R.string.sharedpreference_card_details_show_balance, show);
-    }
-
-    public boolean showingBalance() {
-        return mShowBalance;
-    }
-
-    public void showValidity(boolean show) {
-        mShowValidity = show;
-        mRefreshCardsCallback.run();
-
-        saveDetailState(R.string.sharedpreference_card_details_show_validity, show);
-    }
-
-    public boolean showingValidity() {
-        return mShowValidity;
-    }
-
-    public void showArchivedCards(boolean show) {
-        if (mSwapCursorCallback == null) {
-            throw new IllegalStateException("No swap cursor callback is available, can not manage archive state");
-        }
-
-        mShowArchivedCards = show;
-        mSwapCursorCallback.run();
-
-        saveDetailState(R.string.sharedpreference_card_details_show_archived_cards, show);
-    }
-
-    public boolean showingArchivedCards() {
-        if (mSwapCursorCallback == null) {
-            throw new IllegalStateException("No swap cursor callback is available, can not manage archive state");
-        }
-
-        return mShowArchivedCards;
-    }
-
-    public void showDisplayOptionsDialog() {
-        List<LoyaltyCardDisplayOption> displayOptions = new ArrayList<>();
-
-        displayOptions.add(new LoyaltyCardDisplayOption(
-                mContext.getString(R.string.show_name_below_image_thumbnail),
-                showingNameBelowThumbnail(),
-                this::showNameBelowThumbnail
-        ));
-        displayOptions.add(new LoyaltyCardDisplayOption(
-                mContext.getString(R.string.show_note),
-                showingNote(),
-                this::showNote
-        ));
-        displayOptions.add(new LoyaltyCardDisplayOption(
-                mContext.getString(R.string.show_balance),
-                showingBalance(),
-                this::showBalance
-        ));
-        displayOptions.add(new LoyaltyCardDisplayOption(
-                mContext.getString(R.string.show_validity),
-                showingValidity(),
-                this::showValidity
-        ));
-
-        // Hide "Show archived cards" option unless the callback exists
-        if (mSwapCursorCallback != null) {
-            displayOptions.add(new LoyaltyCardDisplayOption(
-                    mContext.getString(R.string.show_archived_cards),
-                    showingArchivedCards(),
-                    this::showArchivedCards
-            ));
-        }
-
-        // We need to convert Boolean[] to boolean[]
-        boolean[] values = new boolean[displayOptions.size()];
-        for (int i = 0; i < values.length; i++) values[i] = displayOptions.get(i).value;
-
-        AlertDialog.Builder builder = new MaterialAlertDialogBuilder(mContext);
-        builder.setTitle(R.string.action_display_options);
-        builder.setMultiChoiceItems(
-                displayOptions.stream().map(x -> x.name).toArray(String[]::new),
-                values,
-                (dialogInterface, i, b) -> displayOptions.get(i).callback.accept(b)
-        );
-        builder.setPositiveButton(R.string.ok, (dialog, i) -> dialog.dismiss());
-
-        AlertDialog dialog = builder.create();
-        dialog.show();
-    }
-}
--- 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
@@ -15,15 +15,18 @@ 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;
 import android.view.View;
 import android.widget.CheckBox;
 import android.widget.Toast;

 import androidx.activity.result.ActivityResultLauncher;
 import androidx.activity.result.contract.ActivityResultContracts;
+import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.view.ActionMode;
 import androidx.appcompat.widget.SearchView;
@@ -41,13 +44,15 @@ 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 {
+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";
@@ -58,6 +63,7 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
    private LoyaltyCardCursorAdapter mAdapter;
    private ActionMode mCurrentActionMode;
    private SearchView mSearchView;
+    private GestureDetector mGestureDetector;
    private int mLoyaltyCardCount = 0;
    protected String mFilter = "";
    protected Object mGroup = null;
@@ -70,7 +76,8 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
    private View mNoGroupCardsText;
    private TabLayout groupsTabLayout;

-    private Runnable mSwapLoyaltyCardListCursor;
+    private boolean mArchiveMode;
+    public static final String BUNDLE_ARCHIVE_MODE = "archiveMode";

    private ActivityResultLauncher<Intent> mBarcodeScannerLauncher;
    private ActivityResultLauncher<Intent> mSettingsLauncher;
@@ -226,25 +233,28 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
        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());
+        }

-        binding = MainActivityBinding.inflate(getLayoutInflater());
-        setTitle(R.string.app_name);
-        setContentView(binding.getRoot());
-        setSupportActionBar(binding.toolbar);
-        groupsTabLayout = binding.groups;
-        contentMainBinding = ContentMainBinding.bind(binding.include.getRoot());
+        if(mArchiveMode) {
+            enableToolbarBackButton();
+        }

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

-        mSwapLoyaltyCardListCursor = () -> {
-            Group group = null;
-            if (mGroup != null) {
-                group = (Group) mGroup;
-            }
-
-            mAdapter.swapCursor(DBHelper.getLoyaltyCardCursor(mDatabase, mFilter, group, mOrder, mOrderDirection, mAdapter.showingArchivedCards() ? DBHelper.LoyaltyCardArchiveFilter.All : DBHelper.LoyaltyCardArchiveFilter.Unarchived));
-        };
-
        groupsTabLayout.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
            @Override
            public void onTabSelected(TabLayout.Tab tab) {
@@ -272,12 +282,20 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
            }
        });

+        mGestureDetector = new GestureDetector(this, this);
+
+        View.OnTouchListener gestureTouchListener = (v, event) -> mGestureDetector.onTouchEvent(event);
+
        mHelpSection = contentMainBinding.helpSection;
        mNoMatchingCardsText = contentMainBinding.noMatchingCardsText;
        mNoGroupCardsText = contentMainBinding.noGroupCardsText;
        mCardList = contentMainBinding.list;

-        mAdapter = new LoyaltyCardCursorAdapter(this, null, this, mSwapLoyaltyCardListCursor);
+        mNoMatchingCardsText.setOnTouchListener(gestureTouchListener);
+        mCardList.setOnTouchListener(gestureTouchListener);
+        mNoGroupCardsText.setOnTouchListener(gestureTouchListener);
+
+        mAdapter = new LoyaltyCardCursorAdapter(this, null, this);
        mCardList.setAdapter(mAdapter);
        registerForContextMenu(mCardList);

@@ -343,6 +361,8 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
    protected void onResume() {
        super.onResume();

+        mAdapter.refreshState();
+
        if (mCurrentActionMode != null) {
            mAdapter.clearSelections();
            mCurrentActionMode.finish();
@@ -390,25 +410,27 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
            groupsTabLayout.selectTab(tab);
            assert tab != null;
            mGroup = tab.getTag();
-        } else {
+        } else if (!mArchiveMode) {
            scaleScreen();
        }

        updateLoyaltyCardList(true);
        // End of active tab logic

-        FloatingActionButton addButton = binding.fabAdd;
+        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();
+            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
@@ -422,7 +444,7 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
    }

    private void displayCardSetupOptions(Menu menu, boolean shouldShow) {
-        for (int id : new int[]{R.id.action_search, R.id.action_display_options, R.id.action_sort}) {
+        for (int id : new int[]{R.id.action_search, R.id.action_unfold, R.id.action_sort}) {
            menu.findItem(id).setVisible(shouldShow);
        }
    }
@@ -432,7 +454,12 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
    }

    private void updateLoyaltyCardList(boolean updateCount) {
-        mSwapLoyaltyCardListCursor.run();
+        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));

        if (updateCount) {
            updateLoyaltyCardCount();
@@ -463,6 +490,12 @@ 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);

@@ -536,6 +569,8 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
    }

    private void extractIntentFields(Intent intent) {
+        final Bundle b = intent.getExtras();
+        mArchiveMode = b != null && b.getBoolean(BUNDLE_ARCHIVE_MODE, false);
        onSharedIntent(intent);
    }

@@ -568,8 +603,13 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard

    @Override
    public boolean onCreateOptionsMenu(Menu inputMenu) {
-        getMenuInflater().inflate(R.menu.main_menu, inputMenu);
+        if (!mArchiveMode) {
+            getMenuInflater().inflate(R.menu.main_menu, inputMenu);
+        } else {
+            getMenuInflater().inflate(R.menu.archive_menu, inputMenu);
+        }

+        Utils.updateMenuCardDetailsButtonState(inputMenu.findItem(R.id.action_unfold), mAdapter.showingDetails());
        displayCardSetupOptions(inputMenu, mLoyaltyCardCount > 0);

        SearchManager searchManager = (SearchManager) getSystemService(Context.SEARCH_SERVICE);
@@ -603,6 +643,14 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
            });
        }

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

@@ -614,8 +662,8 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
            onBackPressed();
        }

-        if (id == R.id.action_display_options) {
-            mAdapter.showDisplayOptionsDialog();
+        if (id == R.id.action_unfold) {
+            mAdapter.showDetails(!mAdapter.showingDetails());
            invalidateOptionsMenu();

            return true;
@@ -671,6 +719,15 @@ 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);
@@ -711,6 +768,83 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
        updateLoyaltyCardList(false);
    }

+    @Override
+    public boolean onDown(MotionEvent e) {
+        return false;
+    }
+
+    @Override
+    public void onShowPress(MotionEvent e) {
+
+    }
+
+    @Override
+    public boolean onSingleTapUp(MotionEvent e) {
+        return false;
+    }
+
+    @Override
+    public boolean onScroll(MotionEvent e1, MotionEvent e2, float distanceX, float distanceY) {
+        return false;
+    }
+
+    @Override
+    public void onLongPress(MotionEvent e) {
+
+    }
+
+    @Override
+    public boolean dispatchTouchEvent(MotionEvent ev) {
+        mGestureDetector.onTouchEvent(ev);
+        return super.dispatchTouchEvent(ev);
+    }
+
+    @Override
+    public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX, float velocityY) {
+        Log.d(TAG, "On fling");
+
+        // Don't swipe if we have too much vertical movement
+        if (Math.abs(velocityY) > (0.75 * Math.abs(velocityX))) {
+            return false;
+        }
+
+        if (groupsTabLayout.getTabCount() < 2) {
+            return false;
+        }
+
+        Integer currentTab = groupsTabLayout.getSelectedTabPosition();
+        Log.d("onFling", "Current Tab " + currentTab);
+        // Swipe right
+        if (velocityX < -150) {
+            Log.d("onFling", "Right Swipe detected " + velocityX);
+            Integer nextTab = currentTab + 1;
+
+            if (nextTab == groupsTabLayout.getTabCount()) {
+                groupsTabLayout.selectTab(groupsTabLayout.getTabAt(0));
+            } else {
+                groupsTabLayout.selectTab(groupsTabLayout.getTabAt(nextTab));
+            }
+
+            return true;
+        }
+
+        // Swipe left
+        if (velocityX > 150) {
+            Log.d("onFling", "Left Swipe detected " + velocityX);
+            Integer nextTab = currentTab - 1;
+
+            if (nextTab < 0) {
+                groupsTabLayout.selectTab(groupsTabLayout.getTabAt(groupsTabLayout.getTabCount() - 1));
+            } else {
+                groupsTabLayout.selectTab(groupsTabLayout.getTabAt(nextTab));
+            }
+
+            return true;
+        }
+
+        return false;
+    }
+
    @Override
    public void onRowLongClicked(int inputPosition) {
        enableActionMode(inputPosition);
@@ -750,31 +884,30 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard

            boolean hasStarred = false;
            boolean hasUnstarred = false;
-            boolean hasArchived = false;
-            boolean hasUnarchived = 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 (loyaltyCard.archiveStatus == 1) {
-                    hasArchived = true;
-                } else {
-                    hasUnarchived = true;
-                }
-
-                // We have all types, no need to keep checking
-                if (hasStarred && hasUnstarred && hasArchived && hasUnarchived) {
+                if (hasStarred && hasUnstarred) {
+                    hasStarred = true;
+                    hasUnstarred = true;
                    break;
                }
            }

-            unarchiveItem.setVisible(hasArchived);
-            archiveItem.setVisible(hasUnarchived);
-
            if (count == 1) {
                starItem.setVisible(!hasStarred);
                unstarItem.setVisible(!hasUnstarred);
--- a/app/src/main/java/protect/card_locker/ManageGroupActivity.java
+++ b/app/src/main/java/protect/card_locker/ManageGroupActivity.java
@@ -21,6 +21,7 @@ import java.util.HashMap;
 import java.util.Map;

 import androidx.annotation.NonNull;
+import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.widget.Toolbar;
 import androidx.recyclerview.widget.RecyclerView;
@@ -28,6 +29,7 @@ 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;
@@ -99,7 +101,7 @@ public class ManageGroupActivity extends CatimaAppCompatActivity implements Mana
        }
        mGroupNameText.setText(mGroup._id);
        setTitle(getString(R.string.editGroup, mGroup._id));
-        mAdapter = new ManageGroupCursorAdapter(this, null, this, mGroup, null);
+        mAdapter = new ManageGroupCursorAdapter(this, null, this, mGroup);
        mCardList.setAdapter(mAdapter);
        registerForContextMenu(mCardList);

@@ -158,7 +160,7 @@ public class ManageGroupActivity extends CatimaAppCompatActivity implements Mana
    @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);
    }

@@ -166,8 +168,8 @@ public class ManageGroupActivity extends CatimaAppCompatActivity implements Mana
    public boolean onOptionsItemSelected(MenuItem inputItem) {
        int id = inputItem.getItemId();

-        if (id == R.id.action_display_options) {
-            mAdapter.showDisplayOptionsDialog();
+        if (id == R.id.action_unfold) {
+            mAdapter.showDetails(!mAdapter.showingDetails());
            invalidateOptionsMenu();

            return true;
--- a/app/src/main/java/protect/card_locker/ManageGroupCursorAdapter.java
+++ b/app/src/main/java/protect/card_locker/ManageGroupCursorAdapter.java
@@ -16,8 +16,8 @@ public class ManageGroupCursorAdapter extends LoyaltyCardCursorAdapter {
    final private Group mGroup;
    final private SQLiteDatabase mDatabase;

-    public ManageGroupCursorAdapter(Context inputContext, Cursor inputCursor, CardAdapterListener inputListener, Group group, Runnable inputSwapCursorCallback) {
-        super(inputContext, inputCursor, inputListener, inputSwapCursorCallback);
+    public ManageGroupCursorAdapter(Context inputContext, Cursor inputCursor, CardAdapterListener inputListener, Group group) {
+        super(inputContext, inputCursor, inputListener);
        mGroup = new Group(group._id, group.order);
        mInGroupOverlay = new HashMap<>();
        mDatabase = new DBHelper(inputContext).getWritableDatabase();
--- a/app/src/main/java/protect/card_locker/ManageGroupsActivity.java
+++ b/app/src/main/java/protect/card_locker/ManageGroupsActivity.java
@@ -11,14 +11,16 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowManager;
 import android.widget.EditText;
-import android.widget.LinearLayout;
+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 java.util.List;

+import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.widget.Toolbar;
 import androidx.recyclerview.widget.DefaultItemAnimator;
@@ -110,68 +112,65 @@ 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);
-
-        // Header
        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);

-        // Layout
-        LinearLayout layout = new LinearLayout(this);
-        layout.setOrientation(LinearLayout.VERTICAL);
-        LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(
+        // Add spacing to EditText
+        FrameLayout container = new FrameLayout(this);
+        FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(
                ViewGroup.LayoutParams.MATCH_PARENT,
                ViewGroup.LayoutParams.WRAP_CONTENT
        );
-        int contentPadding = getResources().getDimensionPixelSize(R.dimen.alert_dialog_content_padding);
-        params.leftMargin = contentPadding;
-        params.topMargin = contentPadding / 2;
-        params.rightMargin = contentPadding;
-
-        // EditText with spacing
-        final EditText input = new EditText(this);
-        input.setInputType(InputType.TYPE_CLASS_TEXT);
+        params.leftMargin = 50;
+        params.rightMargin = 50;
        input.setLayoutParams(params);
-        layout.addView(input);
+        container.addView(input);

-        // Set layout
-        builder.setView(layout);
+        builder.setView(container);

-        // Buttons
        builder.setPositiveButton(getString(R.string.ok), (dialog, which) -> {
-            DBHelper.insertGroup(mDatabase, input.getText().toString().trim());
+            CharSequence error = input.getError();
+
+            if (error != null) {
+                Toast.makeText(getApplicationContext(), error.toString(), Toast.LENGTH_SHORT).show();
+                return;
+            }
+
+            DBHelper.insertGroup(mDatabase, sanitizeAddGroupNameField(input.getText()));
            updateGroupList();
        });
        builder.setNegativeButton(getString(R.string.cancel), (dialog, which) -> dialog.cancel());
        AlertDialog dialog = builder.create();
-
-        // Now that the dialog exists, we can bind something that affects the OK button
-        input.addTextChangedListener(new SimpleTextWatcher() {
-            public void onTextChanged(CharSequence s, int start, int before, int count) {
-                String groupName = s.toString().trim();
-
-                if (groupName.length() == 0) {
-                    input.setError(getString(R.string.group_name_is_empty));
-                    dialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(false);
-                    return;
-                }
-
-                if (DBHelper.getGroup(mDatabase, groupName) != null) {
-                    input.setError(getString(R.string.group_name_already_in_use));
-                    dialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(false);
-                    return;
-                }
-
-                input.setError(null);
-                dialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(true);
-            }
-        });
-
        dialog.show();
-
-        // Disable button (must be done **after** dialog is shown to prevent crash
-        dialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(false);
-        // Set focus on input field
        dialog.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE);
        input.requestFocus();
    }
--- a/app/src/main/java/protect/card_locker/ScanActivity.java
+++ b/app/src/main/java/protect/card_locker/ScanActivity.java
@@ -1,8 +1,5 @@
 package protect.card_locker;

-import static protect.card_locker.BarcodeSelectorActivity.BARCODE_CONTENTS;
-import static protect.card_locker.BarcodeSelectorActivity.BARCODE_FORMAT;
-
 import android.Manifest;
 import android.app.Activity;
 import android.content.ActivityNotFoundException;
@@ -12,7 +9,6 @@ import android.graphics.Color;
 import android.net.Uri;
 import android.os.Bundle;
 import android.provider.Settings;
-import android.text.InputType;
 import android.util.DisplayMetrics;
 import android.util.Log;
 import android.util.TypedValue;
@@ -20,22 +16,15 @@ import android.view.KeyEvent;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
-import android.view.ViewGroup;
-import android.view.WindowManager;
-import android.widget.EditText;
-import android.widget.LinearLayout;
-import android.widget.TextView;
 import android.widget.Toast;

 import androidx.activity.result.ActivityResultLauncher;
 import androidx.activity.result.contract.ActivityResultContracts;
 import androidx.annotation.NonNull;
-import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.widget.Toolbar;

 import androidx.core.content.ContextCompat;

-import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.google.zxing.ResultPoint;
 import com.google.zxing.client.android.Intents;
 import com.journeyapps.barcodescanner.BarcodeCallback;
@@ -55,6 +44,7 @@ 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";
@@ -75,9 +65,6 @@ public class ScanActivity extends CatimaAppCompatActivity {
    // can't use the pre-made contract because that launches the file manager for image type instead of gallery
    private ActivityResultLauncher<Intent> photoPickerLauncher;

-    static final String STATE_SCANNER_ACTIVE = "scannerActive";
-    private boolean mScannerActive = true;
-
    private void extractIntentFields(Intent intent) {
        final Bundle b = intent.getExtras();
        cardId = b != null ? b.getString(LoyaltyCardEditActivity.BUNDLE_CARDID) : null;
@@ -100,36 +87,8 @@ public class ScanActivity extends CatimaAppCompatActivity {

        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.fabOtherOptions.setOnClickListener(view -> {
-            setScannerActive(false);
-
-            MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(ScanActivity.this);
-            builder.setTitle(getString(R.string.add_a_card_in_a_different_way));
-            builder.setItems(
-                    new CharSequence[]{
-                            getString(R.string.addWithoutBarcode),
-                            getString(R.string.addManually),
-                            getString(R.string.addFromImage)
-                    },
-                    (dialogInterface, i) -> {
-                        switch (i) {
-                            case 0:
-                                addWithoutBarcode();
-                                break;
-                            case 1:
-                                addManually();
-                                break;
-                            case 2:
-                                addFromImage();
-                                break;
-                            default:
-                                throw new IllegalArgumentException("Unknown 'Add a card in a different way' dialog option");
-                        }
-                    }
-            );
-            builder.setOnCancelListener(dialogInterface -> setScannerActive(true));
-            builder.show();
-        });
+        customBarcodeScannerBinding.addFromImage.setOnClickListener(this::addFromImage);
+        customBarcodeScannerBinding.addManually.setOnClickListener(this::addManually);

        barcodeScannerView = binding.zxingBarcodeScanner;

@@ -147,8 +106,8 @@ public class ScanActivity extends CatimaAppCompatActivity {
            public void barcodeResult(BarcodeResult result) {
                Intent scanResult = new Intent();
                Bundle scanResultBundle = new Bundle();
-                scanResultBundle.putString(BARCODE_CONTENTS, result.getText());
-                scanResultBundle.putString(BARCODE_FORMAT, result.getBarcodeFormat().name());
+                scanResultBundle.putString(BarcodeSelectorActivity.BARCODE_CONTENTS, result.getText());
+                scanResultBundle.putString(BarcodeSelectorActivity.BARCODE_FORMAT, result.getBarcodeFormat().name());
                if (addGroup != null) {
                    scanResultBundle.putString(LoyaltyCardEditActivity.BUNDLE_ADDGROUP, addGroup);
                }
@@ -167,11 +126,7 @@ public class ScanActivity extends CatimaAppCompatActivity {
    @Override
    protected void onResume() {
        super.onResume();
-
-        if (mScannerActive) {
-            capture.onResume();
-        }
-
+        capture.onResume();
        if (ContextCompat.checkSelfPermission(this, Manifest.permission.CAMERA) == PackageManager.PERMISSION_GRANTED) {
            showCameraPermissionMissingText(false);
        }
@@ -191,18 +146,9 @@ public class ScanActivity extends CatimaAppCompatActivity {
    }

    @Override
-    protected void onSaveInstanceState(Bundle savedInstanceState) {
-        super.onSaveInstanceState(savedInstanceState);
-        capture.onSaveInstanceState(savedInstanceState);
-
-        savedInstanceState.putBoolean(STATE_SCANNER_ACTIVE, mScannerActive);
-    }
-
-    @Override
-    public void onRestoreInstanceState(@NonNull Bundle savedInstanceState) {
-        super.onRestoreInstanceState(savedInstanceState);
-
-        mScannerActive = savedInstanceState.getBoolean(STATE_SCANNER_ACTIVE);
+    protected void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+        capture.onSaveInstanceState(outState);
    }

    @Override
@@ -244,20 +190,19 @@ public class ScanActivity extends CatimaAppCompatActivity {
        return super.onOptionsItemSelected(item);
    }

-    private void setScannerActive(boolean isActive) {
-        if (isActive) {
-            barcodeScannerView.resume();
-        } else {
-            barcodeScannerView.pause();
-        }
-        mScannerActive = isActive;
-    }
+    private void handleActivityResult(int requestCode, int resultCode, Intent intent) {
+        super.onActivityResult(requestCode, resultCode, intent);
+
+        BarcodeValues barcodeValues = Utils.parseSetBarcodeActivityResult(requestCode, resultCode, intent, this);
+
+        if (barcodeValues.isEmpty()) {
+            return;
+        }

-    private void returnResult(String barcodeContents, String barcodeFormat) {
        Intent manualResult = new Intent();
        Bundle manualResultBundle = new Bundle();
-        manualResultBundle.putString(BARCODE_CONTENTS, barcodeContents);
-        manualResultBundle.putString(BARCODE_FORMAT, barcodeFormat);
+        manualResultBundle.putString(BarcodeSelectorActivity.BARCODE_CONTENTS, barcodeValues.content());
+        manualResultBundle.putString(BarcodeSelectorActivity.BARCODE_FORMAT, barcodeValues.format());
        if (addGroup != null) {
            manualResultBundle.putString(LoyaltyCardEditActivity.BUNDLE_ADDGROUP, addGroup);
        }
@@ -266,84 +211,7 @@ public class ScanActivity extends CatimaAppCompatActivity {
        finish();
    }

-    private void handleActivityResult(int requestCode, int resultCode, Intent intent) {
-        super.onActivityResult(requestCode, resultCode, intent);
-
-        BarcodeValues barcodeValues = Utils.parseSetBarcodeActivityResult(requestCode, resultCode, intent, this);
-
-        if (barcodeValues.isEmpty()) {
-            setScannerActive(true);
-            return;
-        }
-
-        returnResult(barcodeValues.content(), barcodeValues.format());
-    }
-
-    private void addWithoutBarcode() {
-        AlertDialog.Builder builder = new MaterialAlertDialogBuilder(this);
-
-        builder.setOnCancelListener(dialogInterface -> setScannerActive(true));
-
-        // Header
-        builder.setTitle(R.string.addWithoutBarcode);
-
-        // Layout
-        LinearLayout layout = new LinearLayout(this);
-        layout.setOrientation(LinearLayout.VERTICAL);
-        LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(
-                ViewGroup.LayoutParams.MATCH_PARENT,
-                ViewGroup.LayoutParams.WRAP_CONTENT
-        );
-        int contentPadding = getResources().getDimensionPixelSize(R.dimen.alert_dialog_content_padding);
-        params.leftMargin = contentPadding;
-        params.topMargin = contentPadding / 2;
-        params.rightMargin = contentPadding;
-
-        // Description
-        TextView currentTextview = new TextView(this);
-        currentTextview.setText(getString(R.string.enter_card_id));
-        currentTextview.setLayoutParams(params);
-        layout.addView(currentTextview);
-
-        // EditText with spacing
-        final EditText input = new EditText(this);
-        input.setInputType(InputType.TYPE_CLASS_TEXT);
-        input.setLayoutParams(params);
-        layout.addView(input);
-
-        // Set layout
-        builder.setView(layout);
-
-        // Buttons
-        builder.setPositiveButton(getString(R.string.ok), (dialog, which) -> {
-            returnResult(input.getText().toString(), "");
-        });
-        builder.setNegativeButton(getString(R.string.cancel), (dialog, which) -> dialog.cancel());
-        AlertDialog dialog = builder.create();
-
-        // Now that the dialog exists, we can bind something that affects the OK button
-        input.addTextChangedListener(new SimpleTextWatcher() {
-            public void onTextChanged(CharSequence s, int start, int before, int count) {
-                if (s.length() == 0) {
-                    input.setError(getString(R.string.card_id_must_not_be_empty));
-                    dialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(false);
-                } else {
-                    input.setError(null);
-                    dialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(true);
-                }
-            }
-        });
-
-        dialog.show();
-
-        // Disable button (must be done **after** dialog is shown to prevent crash
-        dialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(false);
-        // Set focus on input field
-        dialog.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE);
-        input.requestFocus();
-    }
-
-    public void addManually() {
+    public void addManually(View view) {
        Intent i = new Intent(getApplicationContext(), BarcodeSelectorActivity.class);
        if (cardId != null) {
            final Bundle b = new Bundle();
@@ -353,7 +221,7 @@ public class ScanActivity extends CatimaAppCompatActivity {
        manualAddLauncher.launch(i);
    }

-    public void addFromImage() {
+    public void addFromImage(View view) {
        PermissionUtils.requestStorageReadPermission(this, PERMISSION_SCAN_ADD_FROM_IMAGE);
    }

@@ -368,7 +236,6 @@ public class ScanActivity extends CatimaAppCompatActivity {
        try {
            photoPickerLauncher.launch(chooserIntent);
        } catch (ActivityNotFoundException e) {
-            setScannerActive(true);
            Toast.makeText(getApplicationContext(), R.string.failedLaunchingPhotoPicker, Toast.LENGTH_LONG).show();
            Log.e(TAG, "No activity found to handle intent", e);
        }
@@ -421,7 +288,6 @@ public class ScanActivity extends CatimaAppCompatActivity {
            if (granted) {
                addFromImageAfterPermission();
            } else {
-                setScannerActive(true);
                Toast.makeText(this, R.string.storageReadPermissionRequired, Toast.LENGTH_LONG).show();
            }
        }
--- a/app/src/main/java/protect/card_locker/ShortcutHelper.java
+++ b/app/src/main/java/protect/card_locker/ShortcutHelper.java
@@ -33,6 +33,7 @@ class ShortcutHelper {
    private static final int ADAPTIVE_BITMAP_SIZE = 108 * ADAPTIVE_BITMAP_SCALE;
    private static final int ADAPTIVE_BITMAP_VISIBLE_SIZE = 72 * ADAPTIVE_BITMAP_SCALE;
    private static final int ADAPTIVE_BITMAP_IMAGE_SIZE = ADAPTIVE_BITMAP_VISIBLE_SIZE + 5 * ADAPTIVE_BITMAP_SCALE;
+    private static final int PADDING_COLOR = Color.argb(255, 255, 255, 255);
    private static final int PADDING_COLOR_OVERLAY = Color.argb(127, 0, 0, 0);

    /**
@@ -70,13 +71,19 @@ class ShortcutHelper {
            ShortcutInfoCompat found = list.remove(foundIndex.intValue());
            list.addFirst(found);
        } else {
-            // The item is new to the list. We add it and trim the list later.
+            // The item is new to the list. First, we need to trim the list
+            // until it is able to accept a new item, then the item is
+            // inserted.
+            while (list.size() >= MAX_SHORTCUTS) {
+                list.pollLast();
+            }
+
            ShortcutInfoCompat shortcut = createShortcutBuilder(context, card).build();
+
            list.addFirst(shortcut);
        }

        LinkedList<ShortcutInfoCompat> finalList = new LinkedList<>();
-        int rank = 0;

        // The ranks are now updated; the order in the list is the rank.
        for (int index = 0; index < list.size(); index++) {
@@ -84,20 +91,11 @@ class ShortcutHelper {

            LoyaltyCard loyaltyCard = DBHelper.getLoyaltyCard(database, Integer.parseInt(prevShortcut.getId()));

-            // skip outdated cards that no longer exist
-            if (loyaltyCard != null) {
-                ShortcutInfoCompat updatedShortcut = createShortcutBuilder(context, loyaltyCard)
-                        .setRank(rank)
-                        .build();
+            ShortcutInfoCompat updatedShortcut = createShortcutBuilder(context, loyaltyCard)
+                    .setRank(index)
+                    .build();

-                finalList.addLast(updatedShortcut);
-                rank++;
-
-                // trim the list
-                if (rank >= MAX_SHORTCUTS) {
-                    break;
-                }
-            }
+            finalList.addLast(updatedShortcut);
        }

        ShortcutManagerCompat.setDynamicShortcuts(context, finalList);
@@ -147,7 +145,7 @@ class ShortcutHelper {
        if (iconBitmap == null) {
            iconBitmap = Utils.generateIcon(context, loyaltyCard, true).getLetterTile();
        } else {
-            iconBitmap = createAdaptiveBitmap(iconBitmap, Utils.getHeaderColor(context, loyaltyCard));
+            iconBitmap = createAdaptiveBitmap(iconBitmap, loyaltyCard.headerColor == null ? PADDING_COLOR : loyaltyCard.headerColor);
        }

        IconCompat icon = IconCompat.createWithAdaptiveBitmap(iconBitmap);
--- a/app/src/main/java/protect/card_locker/Utils.java
+++ b/app/src/main/java/protect/card_locker/Utils.java
@@ -1,6 +1,5 @@
 package protect.card_locker;

-import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
@@ -14,24 +13,17 @@ 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.Layout;
-import android.text.Spanned;
-import android.text.style.ClickableSpan;
 import android.util.Log;
 import android.util.TypedValue;
-import android.view.MotionEvent;
-import android.view.View;
-import android.widget.ImageView;
-import android.widget.TextView;
+import android.view.MenuItem;
 import android.widget.Toast;

-import androidx.annotation.NonNull;
 import androidx.annotation.RawRes;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.app.AppCompatDelegate;
 import androidx.core.graphics.ColorUtils;
-import androidx.core.os.LocaleListCompat;
 import androidx.exifinterface.media.ExifInterface;
 import androidx.palette.graphics.Palette;

@@ -55,20 +47,14 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.math.BigDecimal;
 import java.nio.charset.StandardCharsets;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
 import java.text.NumberFormat;
 import java.text.ParseException;
-import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Currency;
 import java.util.Date;
 import java.util.GregorianCalendar;
-import java.util.List;
 import java.util.Locale;
 import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;

 import protect.card_locker.preferences.Settings;

@@ -87,8 +73,6 @@ public class Utils {
    public static final int CARD_IMAGE_FROM_FILE_BACK = 9;
    public static final int CARD_IMAGE_FROM_FILE_ICON = 10;

-    public static final String CARD_IMAGE_FILENAME_REGEX = "^(card_)(\\d+)(_(?:front|back|icon)\\.png)$";
-
    static final double LUMINANCE_MIDPOINT = 0.5;

    static final int BITMAP_SIZE_SMALL = 512;
@@ -393,31 +377,6 @@ public class Utils {
        return cardImageFileNameBuilder.toString();
    }

-    /**
-     * Returns a card image filename (string) with the ID replaced according to the map if the input is a valid card image filename (string), otherwise null.
-     *
-     * @param fileName e.g. "card_1_front.png"
-     * @param idMap e.g. Map.of(1, 2)
-     * @return String e.g. "card_2_front.png"
-     */
-    static public String getRenamedCardImageFileName(final String fileName, final Map<Integer, Integer> idMap) {
-        Pattern pattern = Pattern.compile(CARD_IMAGE_FILENAME_REGEX);
-        Matcher matcher = pattern.matcher(fileName);
-        if (matcher.matches()) {
-            StringBuilder cardImageFileNameBuilder = new StringBuilder();
-            cardImageFileNameBuilder.append(matcher.group(1));
-            try {
-                int id = Integer.parseInt(matcher.group(2));
-                cardImageFileNameBuilder.append(idMap.getOrDefault(id, id));
-            } catch (NumberFormatException _e) {
-                return null;
-            }
-            cardImageFileNameBuilder.append(matcher.group(3));
-            return cardImageFileNameBuilder.toString();
-        }
-        return null;
-    }
-
    static public void saveCardImage(Context context, Bitmap bitmap, String fileName) throws FileNotFoundException {
        if (bitmap == null) {
            context.deleteFile(fileName);
@@ -481,30 +440,17 @@ public class Utils {

        Locale chosenLocale = settings.getLocale();

-        // New API is broken on Android 6 and lower when selecting locales with both language and country, so still keeping this
+        Resources res = context.getResources();
+        Configuration configuration = res.getConfiguration();
        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) {
-            Resources res = context.getResources();
-            Configuration configuration = res.getConfiguration();
            setLocalesSdkLessThan24(chosenLocale, configuration, res);
            return context;
        }

-        /* Documentation at https://developer.android.com/reference/androidx/appcompat/app/AppCompatDelegate#setApplicationLocales(androidx.core.os.LocaleListCompat)
-        For API levels below that, the developer has two options:
-        - They can opt-in to automatic storage handled through the library...
-        - The second option is that they can choose to handle storage themselves.
-        In order to do so they must use this API to initialize locales during app-start up and provide their stored locales.
-        In this case, API should be called before Activity.onCreate() in the activity lifecycle, e.g. in attachBaseContext().
-        Note: Developers should gate this to API versions <33.
-
-        We are handling storage ourselves (courtesy of the in-app language picker), so we take the second approach.
-        So according to docs, we should have the API < 33 check.
-        */
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
-            AppCompatDelegate.setApplicationLocales(chosenLocale != null ? LocaleListCompat.create(chosenLocale) : LocaleListCompat.getEmptyLocaleList());
-        }
-
-        return context;
+        LocaleList localeList = chosenLocale != null ? new LocaleList(chosenLocale) : LocaleList.getDefault();
+        LocaleList.setDefault(localeList);
+        configuration.setLocales(localeList);
+        return context.createConfigurationContext(configuration);
    }

    @SuppressWarnings("deprecation")
@@ -513,55 +459,6 @@ public class Utils {
        res.updateConfiguration(configuration, res.getDisplayMetrics());
    }

-    /**
-     * Android 13 settings seems to "force" the user to select country of locale, but many app-supported locales either only have language, not country
-     * or have a country the user doesn't want, which creates a mismatch between the app's supported locales and the system locale.
-     * <br>
-     * Example: The user chooses Espanol (Espana) in system settings, but the app only supports Espanol (Argentina) and the "plain" Espanol.
-     * <br>
-     * This method returns the app-supported locale that is most similar to the system one.
-     * @param appLocales Locales supported by the app
-     * @param sysLocale Per-app locale in system settings
-     * @return The app-supported locale that best matches the system per-app locale
-     */
-    @NonNull
-    public static Locale getBestMatchLocale(@NonNull List<Locale> appLocales, @NonNull Locale sysLocale) {
-        int highestMatchMagnitude = appLocales.stream()
-                .mapToInt(appLocale -> calculateMatchMagnitudeOfTwoLocales(appLocale, sysLocale))
-                .max()
-                .orElseThrow(() -> new IllegalArgumentException("appLocales is empty"));
-        for (int i = 0; i < appLocales.size(); i++) {
-            Locale appLocale = appLocales.get(i);
-            if (calculateMatchMagnitudeOfTwoLocales(appLocale, sysLocale) == highestMatchMagnitude) {
-                return appLocale;
-            }
-        }
-        throw new AssertionError("This is not possible; there must be a locale whose match magnitude == " + highestMatchMagnitude + " with " + sysLocale.toLanguageTag());
-    }
-
-    private static int calculateMatchMagnitudeOfTwoLocales(@NonNull Locale appLocale, @NonNull Locale sysLocale) {
-        List<String> appLocaleAdjusted = new ArrayList<>();
-        List<String> sysLocaleAdjusted = new ArrayList<>();
-        appLocaleAdjusted.add(appLocale.getLanguage());
-        sysLocaleAdjusted.add(sysLocale.getLanguage());
-        if (!appLocale.getCountry().isEmpty() && !sysLocale.getCountry().isEmpty()) {
-            appLocaleAdjusted.add(appLocale.getCountry());
-            sysLocaleAdjusted.add(sysLocale.getCountry());
-        }
-        if (!appLocale.getVariant().isEmpty() && !sysLocale.getVariant().isEmpty()) {
-            appLocaleAdjusted.add(appLocale.getVariant());
-            sysLocaleAdjusted.add(sysLocale.getVariant());
-        }
-        if (!appLocale.getScript().isEmpty() && !sysLocale.getScript().isEmpty()) {
-            appLocaleAdjusted.add(appLocale.getScript());
-            sysLocaleAdjusted.add(sysLocale.getScript());
-        }
-        if (appLocaleAdjusted.equals(sysLocaleAdjusted)) {
-            return appLocaleAdjusted.size();
-        }
-        return 0;
-    }
-
    static public long getUnixTime() {
        return System.currentTimeMillis() / 1000;
    }
@@ -581,18 +478,6 @@ public class Utils {
        return new File(context.getCacheDir() + "/" + name);
    }

-    public static File copyToTempFile(Context context, InputStream input, String name) throws IOException {
-        File file = createTempFile(context, name);
-        try (input; FileOutputStream out = new FileOutputStream(file)) {
-            byte[] buf = new byte[4096];
-            int len;
-            while ((len = input.read(buf)) != -1) {
-                out.write(buf, 0, len);
-            }
-            return file;
-        }
-    }
-
    public static String saveTempImage(Context context, Bitmap in, String name, Bitmap.CompressFormat format) {
        File image = createTempFile(context, name);
        try (FileOutputStream out = new FileOutputStream(image)) {
@@ -672,6 +557,16 @@ public class Utils {
        activity.findViewById(android.R.id.content).setBackgroundColor(typedValue.data);
    }

+    public static void updateMenuCardDetailsButtonState(MenuItem item, boolean currentlyExpanded) {
+        if (currentlyExpanded) {
+            item.setIcon(R.drawable.ic_baseline_unfold_less_24);
+            item.setTitle(R.string.action_hide_details);
+        } else {
+            item.setIcon(R.drawable.ic_baseline_unfold_more_24);
+            item.setTitle(R.string.action_show_details);
+        }
+    }
+
    public static int getHeaderColorFromImage(Bitmap image, int fallback) {
        if (image == null) {
            return fallback;
@@ -693,7 +588,7 @@ public class Utils {
        while (true) {
            String nextLine = reader.readLine();

-            if (nextLine == null) {
+            if (nextLine == null || nextLine.isEmpty()) {
                reader.close();
                break;
            }
@@ -704,114 +599,4 @@ public class Utils {

        return result.toString();
    }
-
-    // Very crude Markdown to HTML conversion.
-    // Only supports what's currently being used in CHANGELOG.md and PRIVACY.md.
-    // May break easily.
-    public static String basicMDToHTML(final String input) {
-        return input
-                .replaceAll("(?m)^#\\s+(.*)", "<h1>$1</h1>")
-                .replaceAll("(?m)^##\\s+(.*)", "<h2>$1</h2>")
-                .replaceAll("\\[([^]]+)\\]\\((https?://[\\w@#%&+=:?/.-]+)\\)", "<a href=\"$2\">$1</a>")
-                .replaceAll("\\*\\*([^*]+)\\*\\*", "<b>$1</b>")
-                .replaceAll("(?m)^-\\s+(.*)", "<ul><li>&nbsp;$1</li></ul>")
-                .replace("</ul>\n<ul>", "");
-    }
-
-    // Very crude autolinking.
-    // Only supports what's currently being used in CHANGELOG.md and PRIVACY.md.
-    // May break easily.
-    public static String linkify(final String input) {
-        return input
-                .replaceAll("([\\w.-]+@[\\w-]+(\\.[\\w-]+)+)", "<a href=\"mailto:$1\">$1</a>")
-                .replaceAll("(?<!href=\")\\b(https?://[\\w@#%&+=:?/.-]*[\\w@#%&+=:?/-])", "<a href=\"$1\">$1</a>");
-    }
-
-    public static void setIconOrTextWithBackground(Context context, LoyaltyCard loyaltyCard, Bitmap icon, ImageView backgroundOrIcon, TextView textWhenNoImage) {
-        if (icon != null) {
-            Log.d("onResume", "setting icon image");
-            textWhenNoImage.setVisibility(View.GONE);
-
-            backgroundOrIcon.setImageBitmap(icon);
-            backgroundOrIcon.setBackgroundColor(Color.TRANSPARENT);
-        } else {
-            textWhenNoImage.setVisibility(View.VISIBLE);
-
-            int headerColor = getHeaderColor(context, loyaltyCard);
-
-            backgroundOrIcon.setImageBitmap(null);
-            backgroundOrIcon.setBackgroundColor(headerColor);
-            textWhenNoImage.setText(loyaltyCard.store);
-            textWhenNoImage.setTextColor(Utils.needsDarkForeground(headerColor) ? Color.BLACK : Color.WHITE);
-        }
-    }
-
-    public static boolean installedFromGooglePlay(Context context) {
-        try {
-            String packageName = context.getPackageName();
-            String installer;
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-                installer = context.getPackageManager().getInstallSourceInfo(packageName).getInstallingPackageName();
-            } else {
-                installer = context.getPackageManager().getInstallerPackageName(packageName);
-            }
-            return installer.equals("com.android.vending");
-        } catch (Throwable ignored) {
-            return false;
-        }
-    }
-
-    public static int getHeaderColor(Context context, LoyaltyCard loyaltyCard) {
-        return loyaltyCard.headerColor != null ? loyaltyCard.headerColor : LetterBitmap.getDefaultColor(context, loyaltyCard.store);
-    }
-
-    public static String checksum(InputStream input) throws IOException {
-        try {
-            MessageDigest md = MessageDigest.getInstance("SHA-1");
-            byte[] buf = new byte[4096];
-            int len;
-            while ((len = input.read(buf)) != -1) {
-                md.update(buf, 0, len);
-            }
-            StringBuilder sb = new StringBuilder();
-            for (byte b : md.digest()) {
-                sb.append(String.format("%02x", b));
-            }
-            return sb.toString();
-        } catch (NoSuchAlgorithmException _e) {
-            return null;
-        }
-    }
-
-    public static boolean equals(final Object a, final Object b) {
-        if (a == null && b == null) {
-            return true;
-        } else if (a == null || b == null) {
-            return false;
-        }
-        return a.equals(b);
-    }
-
-    @SuppressLint("ClickableViewAccessibility")
-    public static void makeTextViewLinksClickable(final TextView textView, final Spanned text) {
-        textView.setOnTouchListener((v, event) -> {
-            int action = event.getAction();
-            if (action == MotionEvent.ACTION_UP || action == MotionEvent.ACTION_DOWN) {
-                int x = (int) event.getX() - textView.getTotalPaddingLeft() + textView.getScrollX();
-                int y = (int) event.getY() - textView.getTotalPaddingTop() + textView.getScrollY();
-                Layout layout = textView.getLayout();
-                int line = layout.getLineForVertical(y);
-                int off = layout.getOffsetForHorizontal(line, x);
-                ClickableSpan[] links = text.getSpans(off, off, ClickableSpan.class);
-                if (links.length != 0) {
-                    ClickableSpan link = links[0];
-                    if (action == MotionEvent.ACTION_UP) {
-                        link.onClick(textView);
-                    }
-                    return true;
-                }
-            }
-            return false;
-        });
-    }
 }
--- a/app/src/main/java/protect/card_locker/contentprovider/CardsContentProvider.java
+++ b/app/src/main/java/protect/card_locker/contentprovider/CardsContentProvider.java
@@ -1,172 +0,0 @@
-package protect.card_locker.contentprovider;
-
-import static protect.card_locker.DBHelper.LoyaltyCardDbIds;
-
-import android.content.ContentProvider;
-import android.content.ContentValues;
-import android.content.UriMatcher;
-import android.database.Cursor;
-import android.database.MatrixCursor;
-import android.database.sqlite.SQLiteDatabase;
-import android.net.Uri;
-import android.os.Build;
-import android.util.Log;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
-
-import protect.card_locker.BuildConfig;
-import protect.card_locker.DBHelper;
-import protect.card_locker.preferences.Settings;
-
-public class CardsContentProvider extends ContentProvider {
-    private static final String TAG = "Catima";
-
-    public static final String AUTHORITY = BuildConfig.APPLICATION_ID + ".contentprovider.cards";
-
-    public static class Version {
-        public static final String MAJOR_COLUMN = "major";
-        public static final String MINOR_COLUMN = "minor";
-        public static final int MAJOR = 1;
-        public static final int MINOR = 0;
-    }
-
-    private static final int URI_VERSION = 0;
-    private static final int URI_CARDS = 1;
-    private static final int URI_GROUPS = 2;
-    private static final int URI_CARD_GROUPS = 3;
-
-    private static final String[] CARDS_DEFAULT_PROJECTION = new String[]{
-            LoyaltyCardDbIds.ID,
-            LoyaltyCardDbIds.STORE,
-            LoyaltyCardDbIds.VALID_FROM,
-            LoyaltyCardDbIds.EXPIRY,
-            LoyaltyCardDbIds.BALANCE,
-            LoyaltyCardDbIds.BALANCE_TYPE,
-            LoyaltyCardDbIds.NOTE,
-            LoyaltyCardDbIds.HEADER_COLOR,
-            LoyaltyCardDbIds.CARD_ID,
-            LoyaltyCardDbIds.BARCODE_ID,
-            LoyaltyCardDbIds.BARCODE_TYPE,
-            LoyaltyCardDbIds.STAR_STATUS,
-            LoyaltyCardDbIds.LAST_USED,
-            LoyaltyCardDbIds.ARCHIVE_STATUS,
-    };
-
-    private static final UriMatcher uriMatcher = new UriMatcher(UriMatcher.NO_MATCH) {{
-        addURI(AUTHORITY, "version", URI_VERSION);
-        addURI(AUTHORITY, "cards", URI_CARDS);
-        addURI(AUTHORITY, "groups", URI_GROUPS);
-        addURI(AUTHORITY, "card_groups", URI_CARD_GROUPS);
-    }};
-
-    @Override
-    public boolean onCreate() {
-        return true;
-    }
-
-    @Nullable
-    @Override
-    public Cursor query(@NonNull final Uri uri,
-                        @Nullable final String[] projection,
-                        @Nullable final String selection,
-                        @Nullable final String[] selectionArgs,
-                        @Nullable final String sortOrder) {
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
-            // Disable the content provider on SDK < 23 since it grants dangerous
-            // permissions at install-time
-            Log.w(TAG, "Content provider read is only available for SDK >= 23");
-            return null;
-        }
-
-        final Settings settings = new Settings(getContext());
-        if (!settings.getAllowContentProviderRead()) {
-            Log.w(TAG, "Content provider read is disabled");
-            return null;
-        }
-
-        final String table;
-        String[] updatedProjection = projection;
-
-        switch (uriMatcher.match(uri)) {
-            case URI_VERSION:
-                return queryVersion();
-            case URI_CARDS:
-                table = DBHelper.LoyaltyCardDbIds.TABLE;
-                // Restrict columns to the default projection (omit internal columns such as zoom level)
-                if (projection == null) {
-                    updatedProjection = CARDS_DEFAULT_PROJECTION;
-                } else {
-                    final Set<String> defaultProjection = new HashSet<>(Arrays.asList(CARDS_DEFAULT_PROJECTION));
-                    updatedProjection = Arrays.stream(projection).filter(defaultProjection::contains).toArray(String[]::new);
-                }
-                break;
-            case URI_GROUPS:
-                table = DBHelper.LoyaltyCardDbGroups.TABLE;
-                break;
-            case URI_CARD_GROUPS:
-                table = DBHelper.LoyaltyCardDbIdsGroups.TABLE;
-                break;
-            default:
-                Log.w(TAG, "Unrecognized URI " + uri);
-                return null;
-        }
-
-        final DBHelper dbHelper = new DBHelper(getContext());
-        final SQLiteDatabase database = dbHelper.getReadableDatabase();
-
-        return database.query(
-                table,
-                updatedProjection,
-                selection,
-                selectionArgs,
-                null,
-                null,
-                sortOrder
-        );
-    }
-
-    private Cursor queryVersion() {
-        final String[] columns = new String[]{Version.MAJOR_COLUMN, Version.MINOR_COLUMN};
-        final MatrixCursor matrixCursor = new MatrixCursor(columns);
-        matrixCursor.addRow(new Object[]{Version.MAJOR, Version.MINOR});
-
-        return matrixCursor;
-    }
-
-    @Nullable
-    @Override
-    public String getType(@NonNull final Uri uri) {
-        // MIME types are not relevant (for now at least)
-        return null;
-    }
-
-    @Nullable
-    @Override
-    public Uri insert(@NonNull final Uri uri,
-                      @Nullable final ContentValues values) {
-        // This content provider is read-only for now, so we always return null
-        return null;
-    }
-
-    @Override
-    public int delete(@NonNull final Uri uri,
-                      @Nullable final String selection,
-                      @Nullable final String[] selectionArgs) {
-        // This content provider is read-only for now, so we always return 0
-        return 0;
-    }
-
-    @Override
-    public int update(@NonNull final Uri uri,
-                      @Nullable final ContentValues values,
-                      @Nullable final String selection,
-                      @Nullable final String[] selectionArgs) {
-        // This content provider is read-only for now, so we always return 0
-        return 0;
-    }
-}
--- a/app/src/main/java/protect/card_locker/importexport/CatimaImporter.java
+++ b/app/src/main/java/protect/card_locker/importexport/CatimaImporter.java
@@ -13,28 +13,22 @@ import org.apache.commons.csv.CSVRecord;

 import java.io.BufferedInputStream;
 import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.StringReader;
+import java.io.UncheckedIOException;
 import java.math.BigDecimal;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Currency;
 import java.util.Date;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
-import java.util.Set;

 import protect.card_locker.CatimaBarcode;
 import protect.card_locker.DBHelper;
 import protect.card_locker.FormatException;
 import protect.card_locker.Group;
-import protect.card_locker.ImageLocationType;
-import protect.card_locker.LoyaltyCard;
 import protect.card_locker.Utils;
 import protect.card_locker.ZipUtils;

@@ -46,42 +40,24 @@ import protect.card_locker.ZipUtils;
 * A header is expected for the each table showing the names of the columns.
 */
 public class CatimaImporter implements Importer {
-    public static class ImportedData {
-        public final List<LoyaltyCard> cards;
-        public final List<String> groups;
-        public final List<Map.Entry<Integer, String>> cardGroups;
-
-        ImportedData(final List<LoyaltyCard> cards, final List<String> groups, final List<Map.Entry<Integer, String>> cardGroups) {
-            this.cards = cards;
-            this.groups = groups;
-            this.cardGroups = cardGroups;
-        }
-    }
-
-    public void importData(Context context, SQLiteDatabase database, File inputFile, char[] password) throws IOException, FormatException, InterruptedException {
-        // Pass #1: get hashes and parse CSV
-        InputStream input1 = new FileInputStream(inputFile);
-        InputStream bufferedInputStream1 = new BufferedInputStream(input1);
-        bufferedInputStream1.mark(100);
-        ZipInputStream zipInputStream1 = new ZipInputStream(bufferedInputStream1, password);
+    public void importData(Context context, SQLiteDatabase database, InputStream input, char[] password) throws IOException, FormatException, InterruptedException {
+        InputStream bufferedInputStream = new BufferedInputStream(input);
+        bufferedInputStream.mark(100);

        // First, check if this is a zip file
-        boolean isZipFile = false;
-        LocalFileHeader localFileHeader;
-        Map<String, String> imageChecksums = new HashMap<>();
-        ImportedData importedData = null;
+        ZipInputStream zipInputStream = new ZipInputStream(bufferedInputStream, password);

-        while ((localFileHeader = zipInputStream1.getNextEntry()) != null) {
+        boolean isZipFile = false;
+
+        LocalFileHeader localFileHeader;
+        while ((localFileHeader = zipInputStream.getNextEntry()) != null) {
            isZipFile = true;

            String fileName = Uri.parse(localFileHeader.getFileName()).getLastPathSegment();
            if (fileName.equals("catima.csv")) {
-                importedData = importCSV(zipInputStream1);
+                importCSV(context, database, zipInputStream);
            } else if (fileName.endsWith(".png")) {
-                if (!fileName.matches(Utils.CARD_IMAGE_FILENAME_REGEX)) {
-                    throw new FormatException("Unexpected PNG file in import: " + fileName);
-                }
-                imageChecksums.put(fileName, Utils.checksum(zipInputStream1));
+                Utils.saveCardImage(context, ZipUtils.readImage(zipInputStream), fileName);
            } else {
                throw new FormatException("Unexpected file in import: " + fileName);
            }
@@ -89,110 +65,35 @@ public class CatimaImporter implements Importer {

        if (!isZipFile) {
            // This is not a zip file, try importing as bare CSV
-            bufferedInputStream1.reset();
-            importedData = importCSV(bufferedInputStream1);
+            bufferedInputStream.reset();
+            importCSV(context, database, bufferedInputStream);
        }

-        input1.close();
-
-        if (importedData == null) {
-            throw new FormatException("No imported data");
-        }
-
-        Map<Integer, Integer> idMap = saveAndDeduplicate(context, database, importedData, imageChecksums);
-
-        if (isZipFile) {
-            // Pass #2: save images
-            InputStream input2 = new FileInputStream(inputFile);
-            InputStream bufferedInputStream2 = new BufferedInputStream(input2);
-            ZipInputStream zipInputStream2 = new ZipInputStream(bufferedInputStream2, password);
-
-            while ((localFileHeader = zipInputStream2.getNextEntry()) != null) {
-                String fileName = Uri.parse(localFileHeader.getFileName()).getLastPathSegment();
-                if (fileName.endsWith(".png")) {
-                    String newFileName = Utils.getRenamedCardImageFileName(fileName, idMap);
-                    Utils.saveCardImage(context, ZipUtils.readImage(zipInputStream2), newFileName);
-                }
-            }
-
-            input2.close();
-        }
+        input.close();
    }

-    public Map<Integer, Integer> saveAndDeduplicate(Context context, SQLiteDatabase database, final ImportedData data, final Map<String, String> imageChecksums) throws IOException {
-        Map<Integer, Integer> idMap = new HashMap<>();
-        Set<String> existingImages = DBHelper.imageFiles(context, database);
-
-        for (LoyaltyCard card : data.cards) {
-            LoyaltyCard existing = DBHelper.getLoyaltyCard(database, card.id);
-            if (existing == null) {
-                DBHelper.insertLoyaltyCard(database, card.id, card.store, card.note, card.validFrom, card.expiry, card.balance, card.balanceType,
-                        card.cardId, card.barcodeId, card.barcodeType, card.headerColor, card.starStatus, card.lastUsed, card.archiveStatus);
-            } else if (!isDuplicate(context, existing, card, existingImages, imageChecksums)) {
-                long newId = DBHelper.insertLoyaltyCard(database, card.store, card.note, card.validFrom, card.expiry, card.balance, card.balanceType,
-                        card.cardId, card.barcodeId, card.barcodeType, card.headerColor, card.starStatus, card.lastUsed, card.archiveStatus);
-                idMap.put(card.id, (int) newId);
-            }
-        }
-
-        for (String group : data.groups) {
-            DBHelper.insertGroup(database, group);
-        }
-
-        for (Map.Entry<Integer, String> entry : data.cardGroups) {
-            int cardId = idMap.getOrDefault(entry.getKey(), entry.getKey());
-            String groupId = entry.getValue();
-            // For existing & newly imported cards, add the groups from the import to the internal state
-            List<Group> cardGroups = DBHelper.getLoyaltyCardGroups(database, cardId);
-            cardGroups.add(DBHelper.getGroup(database, groupId));
-            DBHelper.setLoyaltyCardGroups(database, cardId, cardGroups);
-        }
-
-        return idMap;
-    }
-
-    public boolean isDuplicate(Context context, final LoyaltyCard existing, final LoyaltyCard card, final Set<String> existingImages, final Map<String, String> imageChecksums) throws IOException {
-        if (!LoyaltyCard.isDuplicate(existing, card)) {
-            return false;
-        }
-        for (ImageLocationType imageLocationType : ImageLocationType.values()) {
-            String name = Utils.getCardImageFileName(existing.id, imageLocationType);
-            boolean exists = existingImages.contains(name);
-            if (exists != imageChecksums.containsKey(name)) {
-                return false;
-            }
-            if (exists) {
-                File file = Utils.retrieveCardImageAsFile(context, name);
-                if (!imageChecksums.get(name).equals(Utils.checksum(new FileInputStream(file)))) {
-                    return false;
-                }
-            }
-        }
-        return true;
-    }
-
-    public ImportedData importCSV(InputStream input) throws IOException, FormatException, InterruptedException {
+    public void importCSV(Context context, SQLiteDatabase database, InputStream input) throws IOException, FormatException, InterruptedException {
        BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(input, StandardCharsets.UTF_8));

        int version = parseVersion(bufferedReader);
        switch (version) {
            case 1:
-                return parseV1(bufferedReader);
+                parseV1(database, bufferedReader);
+                break;
            case 2:
-                return parseV2(bufferedReader);
+                parseV2(context, database, bufferedReader);
+                break;
            default:
                throw new FormatException(String.format("No code to parse version %s", version));
        }
    }

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

        try {
            for (CSVRecord record : parser) {
-                LoyaltyCard card = importLoyaltyCard(record);
-                data.cards.add(card);
+                importLoyaltyCard(database, record);

                if (Thread.currentThread().isInterrupted()) {
                    throw new InterruptedException();
@@ -200,18 +101,12 @@ public class CatimaImporter implements Importer {
            }

            parser.close();
-        } catch (IllegalArgumentException | IllegalStateException e) {
+        } catch (UncheckedIOException e) {
            throw new FormatException("Issue parsing CSV data", e);
        }
-
-        return data;
    }

-    public ImportedData parseV2(BufferedReader input) throws IOException, FormatException, InterruptedException {
-        List<LoyaltyCard> cards = new ArrayList<>();
-        List<String> groups = new ArrayList<>();
-        List<Map.Entry<Integer, String>> cardGroups = new ArrayList<>();
-
+    public void parseV2(Context context, SQLiteDatabase database, BufferedReader input) throws IOException, FormatException, InterruptedException {
        int part = 0;
        StringBuilder stringPart = new StringBuilder();

@@ -229,7 +124,7 @@ public class CatimaImporter implements Importer {
                            break;
                        case 1:
                            try {
-                                groups = parseV2Groups(stringPart.toString());
+                                parseV2Groups(database, stringPart.toString());
                                sectionParsed = true;
                            } catch (FormatException e) {
                                // We may have a multiline field, try again
@@ -237,7 +132,7 @@ public class CatimaImporter implements Importer {
                            break;
                        case 2:
                            try {
-                                cards = parseV2Cards(stringPart.toString());
+                                parseV2Cards(context, database, stringPart.toString());
                                sectionParsed = true;
                            } catch (FormatException e) {
                                // We may have a multiline field, try again
@@ -245,7 +140,7 @@ public class CatimaImporter implements Importer {
                            break;
                        case 3:
                            try {
-                                cardGroups = parseV2CardGroups(stringPart.toString());
+                                parseV2CardGroups(database, stringPart.toString());
                                sectionParsed = true;
                            } catch (FormatException e) {
                                // We may have a multiline field, try again
@@ -272,11 +167,9 @@ public class CatimaImporter implements Importer {
        } catch (FormatException e) {
            throw new FormatException("Issue parsing CSV data", e);
        }
-
-        return new ImportedData(cards, groups, cardGroups);
    }

-    public List<String> parseV2Groups(String data) throws IOException, FormatException, InterruptedException {
+    public void parseV2Groups(SQLiteDatabase database, String data) throws IOException, FormatException, InterruptedException {
        // Parse groups
        final CSVParser groupParser = new CSVParser(new StringReader(data), CSVFormat.RFC4180.builder().setHeader().build());

@@ -290,21 +183,18 @@ public class CatimaImporter implements Importer {
                    throw new InterruptedException();
                }
            }
-        } catch (IllegalArgumentException | IllegalStateException e) {
+        } catch (UncheckedIOException e) {
            throw new FormatException("Issue parsing CSV data", e);
        } finally {
            groupParser.close();
        }

-        List<String> groups = new ArrayList<>();
        for (CSVRecord record : records) {
-            String group = importGroup(record);
-            groups.add(group);
+            importGroup(database, record);
        }
-        return groups;
    }

-    public List<LoyaltyCard> parseV2Cards(String data) throws IOException, FormatException, InterruptedException {
+    public void parseV2Cards(Context context, SQLiteDatabase database, String data) throws IOException, FormatException, InterruptedException {
        // Parse cards
        final CSVParser cardParser = new CSVParser(new StringReader(data), CSVFormat.RFC4180.builder().setHeader().build());

@@ -318,21 +208,18 @@ public class CatimaImporter implements Importer {
                    throw new InterruptedException();
                }
            }
-        } catch (IllegalArgumentException | IllegalStateException e) {
+        } catch (UncheckedIOException e) {
            throw new FormatException("Issue parsing CSV data", e);
        } finally {
            cardParser.close();
        }

-        List<LoyaltyCard> cards = new ArrayList<>();
        for (CSVRecord record : records) {
-            LoyaltyCard card = importLoyaltyCard(record);
-            cards.add(card);
+            importLoyaltyCard(database, record);
        }
-        return cards;
    }

-    public List<Map.Entry<Integer, String>> parseV2CardGroups(String data) throws IOException, FormatException, InterruptedException {
+    public void parseV2CardGroups(SQLiteDatabase database, String data) throws IOException, FormatException, InterruptedException {
        // Parse card group mappings
        final CSVParser cardGroupParser = new CSVParser(new StringReader(data), CSVFormat.RFC4180.builder().setHeader().build());

@@ -346,18 +233,15 @@ public class CatimaImporter implements Importer {
                    throw new InterruptedException();
                }
            }
-        } catch (IllegalArgumentException | IllegalStateException e) {
+        } catch (UncheckedIOException e) {
            throw new FormatException("Issue parsing CSV data", e);
        } finally {
            cardGroupParser.close();
        }

-        List<Map.Entry<Integer, String>> cardGroups = new ArrayList<>();
        for (CSVRecord record : records) {
-            Map.Entry<Integer, String> entry = importCardGroupMapping(record);
-            cardGroups.add(entry);
+            importCardGroupMapping(database, record);
        }
-        return cardGroups;
    }

    /**
@@ -393,7 +277,8 @@ public class CatimaImporter implements Importer {
     * Import a single loyalty card into the database using the given
     * session.
     */
-    private LoyaltyCard importLoyaltyCard(CSVRecord record) throws FormatException {
+    private void importLoyaltyCard(SQLiteDatabase database, CSVRecord record)
+            throws FormatException {
        int id = CSVHelpers.extractInt(DBHelper.LoyaltyCardDbIds.ID, record);

        String store = CSVHelpers.extractString(DBHelper.LoyaltyCardDbIds.STORE, record, "");
@@ -490,28 +375,28 @@ public class CatimaImporter implements Importer {
            // We catch this exception so we can still import old backups
        }

-        return new LoyaltyCard(id, store, note, validFrom, expiry, balance, balanceType, cardId, barcodeId, barcodeType, headerColor, starStatus, lastUsed, DBHelper.DEFAULT_ZOOM_LEVEL, archiveStatus);
+        DBHelper.insertLoyaltyCard(database, id, store, note, validFrom, expiry, balance, balanceType, cardId, barcodeId, barcodeType, headerColor, starStatus, lastUsed, archiveStatus);
    }

    /**
     * Import a single group into the database using the given
     * session.
     */
-    private String importGroup(CSVRecord record) throws FormatException {
+    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);
        }

-        return id;
+        DBHelper.insertGroup(database, id);
    }

    /**
     * Import a single card to group mapping into the database using the given
     * session.
     */
-    private Map.Entry<Integer, String> importCardGroupMapping(CSVRecord record) throws FormatException {
+    private void importCardGroupMapping(SQLiteDatabase database, CSVRecord record) throws FormatException {
        int cardId = CSVHelpers.extractInt(DBHelper.LoyaltyCardDbIdsGroups.cardID, record);
        String groupId = CSVHelpers.extractString(DBHelper.LoyaltyCardDbIdsGroups.groupID, record, null);

@@ -519,6 +404,8 @@ public class CatimaImporter implements Importer {
            throw new FormatException("Group has no ID: " + record);
        }

-        return Map.entry(cardId, groupId);
+        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
@@ -11,21 +11,16 @@ import org.apache.commons.csv.CSVParser;
 import org.apache.commons.csv.CSVRecord;
 import org.json.JSONException;

-import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.StringReader;
 import java.math.BigDecimal;
 import java.nio.charset.StandardCharsets;
 import java.text.ParseException;
-import java.util.ArrayList;
-import java.util.List;

 import protect.card_locker.CatimaBarcode;
 import protect.card_locker.DBHelper;
 import protect.card_locker.FormatException;
-import protect.card_locker.LoyaltyCard;
 import protect.card_locker.Utils;

 /**
@@ -36,16 +31,7 @@ import protect.card_locker.Utils;
 * A header is expected for the each table showing the names of the columns.
 */
 public class FidmeImporter implements Importer {
-    public static class ImportedData {
-        public final List<LoyaltyCard> cards;
-
-        ImportedData(final List<LoyaltyCard> cards) {
-            this.cards = cards;
-        }
-    }
-
-    public void importData(Context context, SQLiteDatabase database, File inputFile, char[] password) throws IOException, FormatException, JSONException, ParseException {
-        InputStream input = new FileInputStream(inputFile);
+    public void importData(Context context, SQLiteDatabase database, InputStream input, char[] password) throws IOException, FormatException, JSONException, ParseException {
        // We actually retrieve a .zip file
        ZipInputStream zipInputStream = new ZipInputStream(input, password);

@@ -68,14 +54,10 @@ public class FidmeImporter implements Importer {
        }

        final CSVParser fidmeParser = new CSVParser(new StringReader(loyaltyCards.toString()), CSVFormat.RFC4180.builder().setDelimiter(';').setHeader().build());
-        ImportedData importedData = new ImportedData(new ArrayList<>());

        try {
            for (CSVRecord record : fidmeParser) {
-                LoyaltyCard card = importLoyaltyCard(context, record);
-                if (card != null) {
-                    importedData.cards.add(card);
-                }
+                importLoyaltyCard(context, database, record);

                if (Thread.currentThread().isInterrupted()) {
                    throw new InterruptedException();
@@ -88,16 +70,14 @@ public class FidmeImporter implements Importer {
        }

        zipInputStream.close();
-        input.close();
-
-        saveAndDeduplicate(database, importedData);
    }

    /**
     * Import a single loyalty card into the database using the given
     * session.
     */
-    private LoyaltyCard importLoyaltyCard(Context context, CSVRecord record) throws FormatException {
+    private void importLoyaltyCard(Context context, SQLiteDatabase database, CSVRecord record)
+            throws FormatException {
        // A loyalty card export from Fidme contains the following fields:
        // Retailer (store name)
        // Program (program name)
@@ -133,7 +113,7 @@ public class FidmeImporter implements Importer {
            // 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 null;
+            return;
        }

        // Sadly, Fidme exports don't contain the card type
@@ -148,17 +128,6 @@ public class FidmeImporter implements Importer {

        // TODO: Front and back image

-        // use -1 for the ID, it will be ignored when inserting the card into the DB
-        return new LoyaltyCard(-1, store, note, null, null, BigDecimal.valueOf(0), null, cardId, null, barcodeType, headerColor, starStatus, Utils.getUnixTime(), DBHelper.DEFAULT_ZOOM_LEVEL, archiveStatus);
-    }
-
-    public void saveAndDeduplicate(SQLiteDatabase database, final ImportedData data) {
-        // This format does not have IDs that can cause conflicts
-        // Proper deduplication for all formats will be implemented later
-        for (LoyaltyCard card : data.cards) {
-            // Do not use card.id which is set to -1
-            DBHelper.insertLoyaltyCard(database, card.store, card.note, card.validFrom, card.expiry, card.balance, card.balanceType,
-                    card.cardId, card.barcodeId, card.barcodeType, card.headerColor, card.starStatus, card.lastUsed, card.archiveStatus);
-        }
+        DBHelper.insertLoyaltyCard(database, store, note, null, null, BigDecimal.valueOf(0), null, cardId, null, barcodeType, headerColor, starStatus, null,archiveStatus);
    }
 }
--- a/app/src/main/java/protect/card_locker/importexport/Importer.java
+++ b/app/src/main/java/protect/card_locker/importexport/Importer.java
@@ -5,8 +5,8 @@ import android.database.sqlite.SQLiteDatabase;

 import org.json.JSONException;

-import java.io.File;
 import java.io.IOException;
+import java.io.InputStream;
 import java.text.ParseException;

 import protect.card_locker.FormatException;
@@ -23,5 +23,5 @@ public interface Importer {
     * @throws IOException
     * @throws FormatException
     */
-    void importData(Context context, SQLiteDatabase database, File inputFile, char[] password) throws IOException, FormatException, InterruptedException, JSONException, ParseException;
+    void importData(Context context, SQLiteDatabase database, InputStream input, char[] password) throws IOException, FormatException, InterruptedException, JSONException, ParseException;
 }
--- a/app/src/main/java/protect/card_locker/importexport/MultiFormatImporter.java
+++ b/app/src/main/java/protect/card_locker/importexport/MultiFormatImporter.java
@@ -6,15 +6,10 @@ import android.util.Log;

 import net.lingala.zip4j.exception.ZipException;

-import java.io.File;
-import java.io.IOException;
 import java.io.InputStream;

-import protect.card_locker.Utils;
-
 public class MultiFormatImporter {
    private static final String TAG = "Catima";
-    private static final String TEMP_ZIP_NAME = MultiFormatImporter.class.getSimpleName() + ".zip";

    /**
     * Attempts to import data from the input stream of the
@@ -47,33 +42,23 @@ public class MultiFormatImporter {

        String error = null;
        if (importer != null) {
-            File inputFile;
+            database.beginTransaction();
            try {
-                inputFile = Utils.copyToTempFile(context, input, TEMP_ZIP_NAME);
-                database.beginTransaction();
-                try {
-                    importer.importData(context, database, inputFile, password);
-                    database.setTransactionSuccessful();
-                    return new ImportExportResult(ImportExportResultType.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) {
+                importer.importData(context, database, input, password);
+                database.setTransactionSuccessful();
+                return new ImportExportResult(ImportExportResultType.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();
-                } finally {
-                    database.endTransaction();
-                    if (!inputFile.delete()) {
-                        Log.w(TAG, "Failed to delete temporary ZIP file (should not be a problem) " + inputFile);
-                    }
                }
-            } catch (IOException e) {
-                Log.e(TAG, "Failed to copy ZIP file", e);
+            } catch (Exception e) {
+                Log.e(TAG, "Failed to import data", e);
                error = e.toString();
+            } finally {
+                database.endTransaction();
            }
        } else {
            error = "Unsupported data format imported: " + format.name();
--- a/app/src/main/java/protect/card_locker/importexport/StocardImporter.java
+++ b/app/src/main/java/protect/card_locker/importexport/StocardImporter.java
@@ -5,8 +5,6 @@ import android.database.sqlite.SQLiteDatabase;
 import android.graphics.Bitmap;
 import android.util.Log;

-import androidx.annotation.NonNull;
-
 import com.google.zxing.BarcodeFormat;

 import net.lingala.zip4j.io.inputstream.ZipInputStream;
@@ -15,30 +13,21 @@ import net.lingala.zip4j.model.LocalFileHeader;
 import org.apache.commons.csv.CSVFormat;
 import org.apache.commons.csv.CSVParser;
 import org.apache.commons.csv.CSVRecord;
-import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;

-import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.math.BigDecimal;
 import java.nio.charset.StandardCharsets;
 import java.text.ParseException;
-import java.time.Instant;
-import java.util.ArrayList;
-import java.util.Collections;
 import java.util.HashMap;
-import java.util.List;
-import java.util.Map;

 import protect.card_locker.CatimaBarcode;
 import protect.card_locker.DBHelper;
 import protect.card_locker.FormatException;
 import protect.card_locker.ImageLocationType;
-import protect.card_locker.LoyaltyCard;
 import protect.card_locker.R;
 import protect.card_locker.Utils;
 import protect.card_locker.ZipUtils;
@@ -51,78 +40,21 @@ import protect.card_locker.ZipUtils;
 * A header is expected for the each table showing the names of the columns.
 */
 public class StocardImporter implements Importer {
-    public static class StocardProvider {
-        public String name = null;
-        public String barcodeFormat = null;
-        public Bitmap logo = null;
-    }
-
-    public static class StocardRecord {
-        public String providerId = null;
-        public String store = null;
-        public String label = null;
-        public String note = null;
-        public String cardId = null;
-        public String barcodeType = null;
-        public Long lastUsed = null;
-        public Bitmap frontImage = null;
-        public Bitmap backImage = null;
-
-        @NonNull
-        @Override
-        public String toString() {
-            return String.format(
-                    "StocardRecord{%n  providerId=%s,%n  store=%s,%n  label=%s,%n  note=%s,%n  cardId=%s,%n"
-                            + "  barcodeType=%s,%n  lastUsed=%s,%n  frontImage=%s,%n  backImage=%s%n}",
-                    this.providerId,
-                    this.store,
-                    this.label,
-                    this.note,
-                    this.cardId,
-                    this.barcodeType,
-                    this.lastUsed,
-                    this.frontImage,
-                    this.backImage
-            );
-        }
-    }
-
-    public static class ZIPData {
-        public final Map<String, StocardRecord> cards;
-        public final Map<String, StocardProvider> providers;
-
-        ZIPData(final Map<String, StocardRecord> cards, final Map<String, StocardProvider> providers) {
-            this.cards = cards;
-            this.providers = providers;
-        }
-    }
-
-    public static class ImportedData {
-        public final List<LoyaltyCard> cards;
-        public final Map<Integer, Map<ImageLocationType, Bitmap>> images;
-
-        ImportedData(final List<LoyaltyCard> cards, final Map<Integer, Map<ImageLocationType, Bitmap>> images) {
-            this.cards = cards;
-            this.images = images;
-        }
-    }
-
-    public static final String PROVIDER_PREFIX = "/loyalty-card-providers/";
-
    private static final String TAG = "Catima";

-    public void importData(Context context, SQLiteDatabase database, File inputFile, char[] password) throws IOException, FormatException, JSONException, ParseException {
-        ZIPData zipData = new ZIPData(new HashMap<>(), new HashMap<>());
+    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<>();

        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) {
-                StocardProvider provider = new StocardProvider();
-                provider.name = record.get("name").trim();
-                provider.barcodeFormat = record.get("barcodeFormat").trim();
+                HashMap<String, Object> recordData = new HashMap<>();
+                recordData.put("name", record.get("name"));
+                recordData.put("barcodeFormat", record.get("barcodeFormat"));

-                zipData.providers.put(record.get("_id").trim(), provider);
+                providers.put(record.get("_id"), recordData);
            }

            parser.close();
@@ -130,27 +62,12 @@ public class StocardImporter implements Importer {
            throw new FormatException("Issue parsing CSV data", e);
        }

-        InputStream input = new FileInputStream(inputFile);
        ZipInputStream zipInputStream = new ZipInputStream(input, password);
-        zipData = importZIP(zipInputStream, zipData);
-        zipInputStream.close();
-        input.close();
-
-        if (zipData.cards.keySet().size() == 0) {
-            throw new FormatException("Couldn't find any loyalty cards in this Stocard export.");
-        }
-
-        ImportedData importedData = importLoyaltyCardHashMap(context, zipData);
-        saveAndDeduplicate(context, database, importedData);
-    }
-
-    public ZIPData importZIP(ZipInputStream zipInputStream, final ZIPData zipData) throws IOException, FormatException, JSONException {
-        Map<String, StocardRecord> cards = zipData.cards;
-        Map<String, StocardProvider> providers = zipData.providers;

+        String[] providersFileName = null;
        String[] customProvidersBaseName = null;
-        String[] cardBaseName = null;
        String customProviderId = "";
+        String[] cardBaseName = null;
        String cardName = "";
        LocalFileHeader localFileHeader;
        while ((localFileHeader = zipInputStream.getNextEntry()) != null) {
@@ -161,182 +78,140 @@ public class StocardImporter implements Importer {
                continue;
            }

-            String userId = nameParts[1];
-
-            if (customProvidersBaseName == null) {
-                // FIXME: can we use the points-account/statement/content.json balance info somehow?
-                /*
-                  Known files:
-                    extracts/<user-UUID>/users/<user-UUID>/
-                      analytics-properties/content.json
-                      devices/<device-UUID>/
-                        analytics-properties/content.json
-                        content.json
-                        ip-location-wifi/content.json
-                      enabled-regions/<UUID>/content.json
-                      loyalty-card-custom-providers/<provider-UUID>/content.json - custom providers
-                      loyalty-cards/<card-UUID>/
-                        card-linked-coupons/accounts/default/
-                          content.json
-                          user-coupons/<UUID>/content.json
-                        content.json - card itself
-                        images/back.png - back image (legacy)
-                        images/back/back.jpg - back image
-                        images/back/content.json
-                        images/front.png - front image (legacy)
-                        images/front/content.json
-                        images/front/front.jpg - front image
-                        notes/default/content.json - note
-                        points-account/
-                          content.json
-                          statement/content.json
-                        usages/<UUID>/content.json - timestamps
-                        usage-statistics/content.json - timestamps
-                      reward-program-balances/<UUID>/content.json
-                */
+            if (providersFileName == null) {
+                providersFileName = new String[]{
+                        "extracts",
+                        nameParts[1],
+                        "users",
+                        nameParts[1],
+                        "analytics-properties",
+                        "content.json"
+                };
                customProvidersBaseName = new String[]{
                        "extracts",
-                        userId,
+                        nameParts[1],
                        "users",
-                        userId,
+                        nameParts[1],
                        "loyalty-card-custom-providers"
                };
                cardBaseName = new String[]{
                        "extracts",
-                        userId,
+                        nameParts[1],
                        "users",
-                        userId,
+                        nameParts[1],
                        "loyalty-cards"
                };
            }

            if (startsWith(nameParts, customProvidersBaseName, 1)) {
                // Extract providerId
-                customProviderId = nameParts[customProvidersBaseName.length];
-
-                StocardProvider provider = providers.get(customProviderId);
-                if (provider == null) {
-                    provider = new StocardProvider();
-                    providers.put(customProviderId, provider);
-                }
+                customProviderId = nameParts[customProvidersBaseName.length].split("\\.", 2)[0];

                // Name file
                if (fileName.endsWith(customProviderId + "/content.json")) {
                    JSONObject jsonObject = ZipUtils.readJSON(zipInputStream);
-                    provider.name = jsonObject.getString("name");
-                } else if (fileName.endsWith("logo.png")) {
-                    provider.logo = ZipUtils.readImage(zipInputStream);
-                } else if (!fileName.endsWith("/")) {
-                    Log.d(TAG, "Unknown or unused loyalty-card-custom-providers file " + fileName + ", skipping...");
-                }
-            } else if (startsWith(nameParts, cardBaseName, 1)) {
-                // Extract cardName
-                cardName = nameParts[cardBaseName.length];

-                StocardRecord record = cards.get(cardName);
-                if (record == null) {
-                    record = new StocardRecord();
-                    cards.put(cardName, record);
+                    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);
-                    record.cardId = jsonObject.getString("input_id");

-                    if (jsonObject.has("input_provider_name")) {
-                        record.store = jsonObject.getString("input_provider_name");
-                    }
-
-                    if (jsonObject.has("label")) {
-                        String label = jsonObject.getString("label");
-                        if (!label.isBlank()) {
-                            record.label = label;
-                        }
-                    }
+                    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/" + userId + "/loyalty-card-custom-providers/";
+                    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 if (providerId.startsWith(PROVIDER_PREFIX)) {
-                        providerId = providerId.substring(PROVIDER_PREFIX.length());
                    } else {
-                        throw new FormatException("Unsupported provider ID format: " + providerId);
+                        providerId = providerId.substring("/loyalty-card-providers/".length());
                    }

-                    record.providerId = providerId;
+                    loyaltyCardHashMap = appendToHashMap(
+                            loyaltyCardHashMap,
+                            cardName,
+                            "_providerId",
+                            providerId
+                    );

                    if (jsonObject.has("input_barcode_format")) {
-                        record.barcodeType = jsonObject.getString("input_barcode_format");
+                        loyaltyCardHashMap = appendToHashMap(
+                                loyaltyCardHashMap,
+                                cardName,
+                                "barcodeType",
+                                jsonObject.getString("input_barcode_format")
+                        );
                    }
                } else if (fileName.endsWith("notes/default/content.json")) {
-                    record.note = ZipUtils.readJSON(zipInputStream).getString("content");
-                } else if (fileName.endsWith("usage-statistics/content.json")) {
-                    JSONArray usages = ZipUtils.readJSON(zipInputStream).getJSONArray("usages");
-                    for (int i = 0; i < usages.length(); i++) {
-                        JSONObject lastUsedObject = usages.getJSONObject(i);
-                        String lastUsedString = lastUsedObject.getJSONObject("time").getString("value");
-                        long timeStamp = Instant.parse(lastUsedString).getEpochSecond();
-                        if (record.lastUsed == null || timeStamp > record.lastUsed) {
-                            record.lastUsed = timeStamp;
-                        }
-                    }
-                } else if (fileName.matches(".*/usages/[^/]+/content.json")) {
-                    JSONObject lastUsedObject = ZipUtils.readJSON(zipInputStream);
-                    String lastUsedString = lastUsedObject.getJSONObject("time").getString("value");
-                    long timeStamp = Instant.parse(lastUsedString).getEpochSecond();
-                    if (record.lastUsed == null || timeStamp > record.lastUsed) {
-                        record.lastUsed = timeStamp;
-                    }
-                } else if (fileName.endsWith("/images/front.png") || fileName.endsWith("/images/front/front.jpg")) {
-                    record.frontImage = ZipUtils.readImage(zipInputStream);
-                } else if (fileName.endsWith("/images/back.png") || fileName.endsWith("/images/back/back.jpg")) {
-                    record.backImage = ZipUtils.readImage(zipInputStream);
-                } else if (!fileName.endsWith("/")) {
-                    Log.d(TAG, "Unknown or unused loyalty-cards file " + fileName + ", skipping...");
+                    loyaltyCardHashMap = appendToHashMap(
+                            loyaltyCardHashMap,
+                            cardName,
+                            "note",
+                            ZipUtils.readJSON(zipInputStream)
+                                    .getString("content")
+                    );
+                } else if (fileName.endsWith("/images/front.png")) {
+                    loyaltyCardHashMap = appendToHashMap(
+                            loyaltyCardHashMap,
+                            cardName,
+                            "frontImage",
+                            ZipUtils.readImage(zipInputStream)
+                    );
+                } else if (fileName.endsWith("/images/back.png")) {
+                    loyaltyCardHashMap = appendToHashMap(
+                            loyaltyCardHashMap,
+                            cardName,
+                            "backImage",
+                            ZipUtils.readImage(zipInputStream)
+                    );
                }
-            } else if (!fileName.endsWith("/")) {
-                Log.d(TAG, "Unknown or unused file " + fileName + ", skipping...");
            }
        }

-        return new ZIPData(cards, providers);
-    }
+        if (loyaltyCardHashMap.keySet().size() == 0) {
+            throw new FormatException("Couldn't find any loyalty cards in this Stocard export.");
+        }

-    public ImportedData importLoyaltyCardHashMap(Context context, final ZIPData zipData) throws FormatException {
-        ImportedData importedData = new ImportedData(new ArrayList<>(), new HashMap<>());
-        int tempID = 0;
+        for (HashMap<String, Object> loyaltyCardData : loyaltyCardHashMap.values()) {
+            String providerId = (String) loyaltyCardData.get("_providerId");

-        List<String> cardKeys = new ArrayList<>(zipData.cards.keySet());
-        Collections.sort(cardKeys);
-
-        for (String key : cardKeys) {
-            StocardRecord record = zipData.cards.get(key);
-
-            if (record.providerId == null) {
-                Log.d(TAG, "Missing providerId for card " + record + ", ignoring...");
+            if (providerId == null) {
+                Log.d(TAG, "Missing providerId for card " + loyaltyCardData + ", ignoring...");
                continue;
            }

-            if (record.cardId == null) {
-                throw new FormatException("No card ID listed, but is required");
-            }
-
-            StocardProvider provider = zipData.providers.get(record.providerId);
-
-            // Read store from card, if not available (old export), fall back to providerData
-            String store = record.store != null ? record.store : provider != null ? provider.name : record.providerId;
-            String note = record.note != null ? record.note : "";
-            String barcodeTypeString = record.barcodeType != null ? record.barcodeType : provider != null ? provider.barcodeFormat : null;
-
-            if (record.label != null && !record.label.equals(store) && !record.label.equals(note)) {
-                note = note.isEmpty() ? record.label : note + "\n" + record.label;
-            }
+            HashMap<String, Object> providerData = providers.get(providerId);

+            String store = providerData != null ? providerData.get("name").toString() : providerId;
+            String note = (String) Utils.mapGetOrDefault(loyaltyCardData, "note", "");
+            String cardId = (String) loyaltyCardData.get("cardId");
+            String barcodeTypeString = (String) Utils.mapGetOrDefault(loyaltyCardData, "barcodeType", providerData != null ? providerData.get("barcodeFormat") : null);
            CatimaBarcode barcodeType = null;
            if (barcodeTypeString != null && !barcodeTypeString.isEmpty()) {
                if (barcodeTypeString.equals("RSS_DATABAR_EXPANDED")) {
@@ -349,45 +224,27 @@ public class StocardImporter implements Importer {
            }

            int headerColor = Utils.getRandomHeaderColor(context);
-            if (provider != null && provider.logo != null) {
-                headerColor = Utils.getHeaderColorFromImage(provider.logo, headerColor);
+            Bitmap cardIcon = null;
+            if (providerData != null && providerData.containsKey("logo")) {
+                cardIcon = (Bitmap) providerData.get("logo");
+                headerColor = Utils.getHeaderColorFromImage(cardIcon, headerColor);
            }

-            long lastUsed = record.lastUsed != null ? record.lastUsed : Utils.getUnixTime();
+            long loyaltyCardInternalId = DBHelper.insertLoyaltyCard(database, store, note, null, null, BigDecimal.valueOf(0), null, cardId, null, barcodeType, headerColor, 0, null,0);

-            LoyaltyCard card = new LoyaltyCard(tempID, store, note, null, null, BigDecimal.valueOf(0), null, record.cardId, null, barcodeType, headerColor, 0, lastUsed, DBHelper.DEFAULT_ZOOM_LEVEL, 0);
-            importedData.cards.add(card);
-
-            Map<ImageLocationType, Bitmap> images = new HashMap<>();
-
-            if (provider != null && provider.logo != null) {
-                images.put(ImageLocationType.icon, provider.logo);
-            }
-            if (record.frontImage != null) {
-                images.put(ImageLocationType.front, record.frontImage);
-            }
-            if (record.backImage != null) {
-                images.put(ImageLocationType.back, record.backImage);
+            if (cardIcon != null) {
+                Utils.saveCardImage(context, cardIcon, (int) loyaltyCardInternalId, ImageLocationType.icon);
            }

-            importedData.images.put(tempID, images);
-            tempID++;
-        }
-
-        return importedData;
-    }
-
-    public void saveAndDeduplicate(Context context, SQLiteDatabase database, final ImportedData data) throws IOException {
-        // This format does not have IDs that can cause conflicts
-        // Proper deduplication for all formats will be implemented later
-        for (LoyaltyCard card : data.cards) {
-            // card.id is temporary and only used to index the images Map
-            long id = DBHelper.insertLoyaltyCard(database, card.store, card.note, card.validFrom, card.expiry, card.balance, card.balanceType,
-                    card.cardId, card.barcodeId, card.barcodeType, card.headerColor, card.starStatus, card.lastUsed, card.archiveStatus);
-            for (Map.Entry<ImageLocationType, Bitmap> entry : data.images.get(card.id).entrySet()) {
-                Utils.saveCardImage(context, entry.getValue(), (int) id, entry.getKey());
+            if (loyaltyCardData.containsKey("frontImage")) {
+                Utils.saveCardImage(context, (Bitmap) loyaltyCardData.get("frontImage"), (int) loyaltyCardInternalId, ImageLocationType.front);
+            }
+            if (loyaltyCardData.containsKey("backImage")) {
+                Utils.saveCardImage(context, (Bitmap) loyaltyCardData.get("backImage"), (int) loyaltyCardInternalId, ImageLocationType.back);
            }
        }
+
+        zipInputStream.close();
    }

    private boolean startsWith(String[] full, String[] start, int minExtraLength) {
@@ -403,4 +260,16 @@ 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) {
+        HashMap<String, Object> loyaltyCardData = loyaltyCardHashMap.get(cardID);
+        if (loyaltyCardData == null) {
+            loyaltyCardData = new HashMap<>();
+        }
+
+        loyaltyCardData.put(key, value);
+        loyaltyCardHashMap.put(cardID, loyaltyCardData);
+
+        return loyaltyCardHashMap;
+    }
+}
--- a/app/src/main/java/protect/card_locker/importexport/VoucherVaultImporter.java
+++ b/app/src/main/java/protect/card_locker/importexport/VoucherVaultImporter.java
@@ -12,8 +12,6 @@ import org.json.JSONException;
 import org.json.JSONObject;

 import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -21,16 +19,13 @@ import java.math.BigDecimal;
 import java.nio.charset.StandardCharsets;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
 import java.util.Currency;
 import java.util.Date;
-import java.util.List;
 import java.util.TimeZone;

 import protect.card_locker.CatimaBarcode;
 import protect.card_locker.DBHelper;
 import protect.card_locker.FormatException;
-import protect.card_locker.LoyaltyCard;
 import protect.card_locker.Utils;

 /**
@@ -41,16 +36,7 @@ import protect.card_locker.Utils;
 * A header is expected for the each table showing the names of the columns.
 */
 public class VoucherVaultImporter implements Importer {
-    public static class ImportedData {
-        public final List<LoyaltyCard> cards;
-
-        ImportedData(final List<LoyaltyCard> cards) {
-            this.cards = cards;
-        }
-    }
-
-    public void importData(Context context, SQLiteDatabase database, File inputFile, char[] password) throws IOException, FormatException, JSONException, ParseException {
-        InputStream input = new FileInputStream(inputFile);
+    public void importData(Context context, SQLiteDatabase database, InputStream input, char[] password) throws IOException, FormatException, JSONException, ParseException {
        BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(input, StandardCharsets.UTF_8));

        StringBuilder sb = new StringBuilder();
@@ -60,16 +46,6 @@ public class VoucherVaultImporter implements Importer {
        }
        JSONArray jsonArray = new JSONArray(sb.toString());

-        bufferedReader.close();
-        input.close();
-
-        ImportedData importedData = importJSON(jsonArray);
-        saveAndDeduplicate(database, importedData);
-    }
-
-    public ImportedData importJSON(JSONArray jsonArray) throws FormatException, JSONException, ParseException {
-        ImportedData importedData = new ImportedData(new ArrayList<>());
-
        // See https://github.com/tim-smart/vouchervault/issues/4#issuecomment-788226503 for more info
        for (int i = 0; i < jsonArray.length(); i++) {
            JSONObject jsonCard = jsonArray.getJSONObject(i);
@@ -150,20 +126,9 @@ public class VoucherVaultImporter implements Importer {
                    throw new FormatException("Unknown colour type found: " + colorFromJSON);
            }

-            // use -1 for the ID, it will be ignored when inserting the card into the DB
-            importedData.cards.add(new LoyaltyCard(-1, store, "", null, expiry, balance, balanceType, cardId, null, barcodeType, headerColor, 0, Utils.getUnixTime(), DBHelper.DEFAULT_ZOOM_LEVEL, 0));
+            DBHelper.insertLoyaltyCard(database, store, "", null, expiry, balance, balanceType, cardId, null, barcodeType, headerColor, 0, Utils.getUnixTime(),0);
        }

-        return importedData;
-    }
-
-    public void saveAndDeduplicate(SQLiteDatabase database, final ImportedData data) {
-        // This format does not have IDs that can cause conflicts
-        // Proper deduplication for all formats will be implemented later
-        for (LoyaltyCard card : data.cards) {
-            // Do not use card.id which is set to -1
-            DBHelper.insertLoyaltyCard(database, card.store, card.note, card.validFrom, card.expiry, card.balance, card.balanceType,
-                    card.cardId, card.barcodeId, card.barcodeType, card.headerColor, card.starStatus, card.lastUsed, card.archiveStatus);
-        }
+        bufferedReader.close();
    }
 }
--- a/app/src/main/java/protect/card_locker/preferences/Settings.java
+++ b/app/src/main/java/protect/card_locker/preferences/Settings.java
@@ -63,6 +63,30 @@ public class Settings {
        return AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM;
    }

+    public double getFontSizeScale() {
+        return getInt(R.string.settings_key_max_font_size_scale, R.integer.settings_max_font_size_scale_pct) / 100.0;
+    }
+
+    public int getSmallFont() {
+        return 14;
+    }
+
+    public int getMediumFont() {
+        return 28;
+    }
+
+    public int getLargeFont() {
+        return 40;
+    }
+
+    public int getFontSizeMin(int fontSize) {
+        return (int) (Math.round(fontSize / 2.0) - 1);
+    }
+
+    public int getFontSizeMax(int fontSize) {
+        return (int) Math.round(fontSize * getFontSizeScale());
+    }
+
    public boolean useMaxBrightnessDisplayingBarcode() {
        return getBoolean(R.string.settings_key_display_barcode_max_brightness, true);
    }
@@ -79,10 +103,6 @@ public class Settings {
        return getBoolean(R.string.settings_key_disable_lockscreen_while_viewing_card, true);
    }

-    public boolean getAllowContentProviderRead() {
-        return getBoolean(R.string.settings_key_allow_content_provider_read, true);
-    }
-
    public boolean getOledDark() {
        return getBoolean(R.string.settings_key_oled_dark, false);
    }
--- a/app/src/main/java/protect/card_locker/preferences/SettingsActivity.java
+++ b/app/src/main/java/protect/card_locker/preferences/SettingsActivity.java
@@ -3,27 +3,28 @@ package protect.card_locker.preferences;

 import android.app.Activity;
 import android.content.Intent;
-import android.os.Build;
 import android.os.Bundle;
 import android.view.MenuItem;

-import androidx.annotation.NonNull;
-import androidx.appcompat.app.AppCompatDelegate;
-import androidx.appcompat.widget.Toolbar;
-import androidx.core.os.LocaleListCompat;
-import androidx.preference.ListPreference;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceFragmentCompat;
-
 import com.google.android.material.color.DynamicColors;

 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Locale;
-import java.util.Objects;
-import java.util.stream.Collectors;

+import androidx.annotation.NonNull;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AppCompatDelegate;
+import androidx.appcompat.widget.Toolbar;
+import androidx.fragment.app.DialogFragment;
+import androidx.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;
@@ -102,8 +103,23 @@ public class SettingsActivity extends CatimaAppCompatActivity {
            // Load the preferences from an XML resource
            addPreferencesFromResource(R.xml.preferences);

-            // Show pretty names and summaries
-            ListPreference themePreference = findPreference(getResources().getString(R.string.settings_key_theme));
+            // Show pretty names
+            ListPreference localePreference = findPreference(getResources().getString(R.string.settings_key_locale));
+            assert localePreference != null;
+            CharSequence[] entryValues = localePreference.getEntryValues();
+            List<CharSequence> entries = new ArrayList<>();
+            for (CharSequence entry : entryValues) {
+                if (entry.length() == 0) {
+                    entries.add(getResources().getString(R.string.settings_system_locale));
+                } else {
+                    Locale entryLocale = Utils.stringToLocale(entry.toString());
+                    entries.add(entryLocale.getDisplayName(entryLocale));
+                }
+            }
+
+            localePreference.setEntries(entries.toArray(new CharSequence[entryValues.length]));
+
+            Preference themePreference = findPreference(getResources().getString(R.string.settings_key_theme));
            assert themePreference != null;
            themePreference.setOnPreferenceChangeListener((preference, o) -> {
                if (o.toString().equals(getResources().getString(R.string.settings_key_light_theme))) {
@@ -117,16 +133,10 @@ public class SettingsActivity extends CatimaAppCompatActivity {
                return true;
            });

-            ListPreference themeColorPreference = findPreference(getResources().getString(R.string.setting_key_theme_color));
-            assert themeColorPreference != null;
-            themeColorPreference.setOnPreferenceChangeListener((preference, o) -> {
+            localePreference.setOnPreferenceChangeListener((preference, newValue) -> {
                refreshActivity(true);
                return true;
            });
-            if (!DynamicColors.isDynamicColorAvailable()) {
-                themeColorPreference.setEntryValues(R.array.color_values_no_dynamic);
-                themeColorPreference.setEntries(R.array.color_value_strings_no_dynamic);
-            }

            Preference oledDarkPreference = findPreference(getResources().getString(R.string.settings_key_oled_dark));
            assert oledDarkPreference != null;
@@ -135,61 +145,16 @@ public class SettingsActivity extends CatimaAppCompatActivity {
                return true;
            });

-            ListPreference localePreference = findPreference(getResources().getString(R.string.settings_key_locale));
-            assert localePreference != null;
-            CharSequence[] entryValues = localePreference.getEntryValues();
-            List<CharSequence> entries = new ArrayList<>();
-            for (CharSequence entry : entryValues) {
-                if (entry.length() == 0) {
-                    entries.add(getResources().getString(R.string.settings_system_locale));
-                } else {
-                    Locale entryLocale = Utils.stringToLocale(entry.toString());
-                    entries.add(entryLocale.getDisplayName(entryLocale));
-                }
-            }
-            localePreference.setEntries(entries.toArray(new CharSequence[entryValues.length]));
-            // Make locale picker preference in sync with system settings
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-                Locale sysLocale = AppCompatDelegate.getApplicationLocales().get(0);
-                if (sysLocale == null) {
-                    // Corresponds to "System"
-                    localePreference.setValue("");
-                } else {
-                    // Need to set preference's value to one of localePreference.getEntryValues() to match the locale.
-                    // Locale.toLanguageTag() theoretically should be one of the values in localePreference.getEntryValues()...
-                    // But it doesn't work for some locales. so trying something more heavyweight.
-
-                    // Obtain all locales supported by the app.
-                    List<Locale> appLocales = Arrays.stream(localePreference.getEntryValues())
-                            .map(Objects::toString)
-                            .map(Utils::stringToLocale)
-                            .collect(Collectors.toList());
-                    // Get the app locale that best matches the system one
-                    Locale bestMatchLocale = Utils.getBestMatchLocale(appLocales, sysLocale);
-                    // Get its index in supported locales
-                    int index = appLocales.indexOf(bestMatchLocale);
-                    // Set preference value to entry value at that index
-                    localePreference.setValue(localePreference.getEntryValues()[index].toString());
-                }
-            }
-
-            localePreference.setOnPreferenceChangeListener((preference, newValue) -> {
-                // See corresponding comment in Utils.updateBaseContextLocale for Android 6- notes
-                if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) {
-                    refreshActivity(true);
-                    return true;
-                }
-                String newLocale = (String) newValue;
-                // If newLocale is empty, that means "System" was selected
-                AppCompatDelegate.setApplicationLocales(newLocale.isEmpty() ? LocaleListCompat.getEmptyLocaleList() : LocaleListCompat.create(Utils.stringToLocale(newLocale)));
+            ListPreference colorPreference = findPreference(getResources().getString(R.string.setting_key_theme_color));
+            assert colorPreference != null;
+            colorPreference.setOnPreferenceChangeListener((preference, o) -> {
+                refreshActivity(true);
                return true;
            });
-
-            // Disable content provider on SDK < 23 since dangerous permissions
-            // are granted at install-time
-            Preference contentProviderReadPreference = findPreference(getResources().getString(R.string.settings_key_allow_content_provider_read));
-            assert contentProviderReadPreference != null;
-            contentProviderReadPreference.setVisible(Build.VERSION.SDK_INT >= Build.VERSION_CODES.M);
+            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) {
@@ -199,5 +164,30 @@ public class SettingsActivity extends CatimaAppCompatActivity {
                activity.recreate();
            }
        }
+
+        @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;
+                DialogFragment dialogFragment = NumberPickerPreferenceDialogFragment
+                        .newInstance(
+                                dialogPreference.getKey(),
+                                dialogPreference.getMinValue(),
+                                dialogPreference.getMaxValue(),
+                                dialogPreference.getStepValue(),
+                                dialogPreference.getUnitText()
+                        );
+                dialogFragment.setTargetFragment(this, 0);
+                dialogFragment.show(getParentFragmentManager(), DIALOG_FRAGMENT_TAG);
+            } else {
+                super.onDisplayPreferenceDialog(preference);
+            }
+        }
    }
 }
+
--- a/app/src/main/res/drawable/active_dot.xml
+++ b/app/src/main/res/drawable/active_dot.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval" android:useLevel="true"
+    android:dither="true">
+
+    <size android:height="12dip" android:width="12dip"/>
+
+    <solid android:color="@android:color/white"/>
+</shape>
--- a/app/src/main/res/drawable/dialog_bg_monet.xml
+++ b/app/src/main/res/drawable/dialog_bg_monet.xml
@@ -1,24 +0,0 @@
-<layer-list xmlns:tools="http://schemas.android.com/tools"
-    xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape>
-            <solid android:color="?attr/colorSurface" />
-            <corners
-                android:bottomLeftRadius="28dp"
-                android:bottomRightRadius="28dp"
-                android:topLeftRadius="28dp"
-                android:topRightRadius="28dp" />
-        </shape>
-    </item>
-    <item>
-        <shape>
-            <solid android:color="@color/m3_popupmenu_overlay_color"
-                tools:ignore="PrivateResource" />
-            <corners
-                android:bottomLeftRadius="28dp"
-                android:bottomRightRadius="28dp"
-                android:topLeftRadius="28dp"
-                android:topRightRadius="28dp" />
-        </shape>
-    </item>
-</layer-list>
--- a/app/src/main/res/drawable/home_arrow_back_white.xml
+++ b/app/src/main/res/drawable/home_arrow_back_white.xml
@@ -1,5 +1,5 @@
-<vector android:height="24dp" android:tint="?attr/colorControlNormal"
+<vector android:autoMirrored="true" android:height="24dp" android:tint="?attr/colorControlNormal"
    android:viewportHeight="24" android:viewportWidth="24"
    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="M12,17.27L18.18,21l-1.64,-7.03L22,9.24l-7.19,-0.61L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21z"/>
+    <path android:fillColor="@android:color/white" android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z"/>
 </vector>
--- a/app/src/main/res/drawable/ic_baseline_keyboard_arrow_up_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_keyboard_arrow_up_24.xml
@@ -1,5 +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="M7.41,15.41L12,10.83l4.59,4.58L18,14l-6,-6 -6,6z"/>
+    <path android:fillColor="@android:color/white" android:pathData="M7,10l5,5 5,-5z"/>
 </vector>
--- a/app/src/main/res/drawable/ic_baseline_keyboard_arrow_down_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_keyboard_arrow_down_24.xml
@@ -1,5 +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="M7.41,8.59L12,13.17l4.59,-4.58L18,10l-6,6 -6,-6 1.41,-1.41z"/>
+    <path android:fillColor="@android:color/white" android:pathData="M7,14l5,-5 5,5z"/>
 </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,4 +1,4 @@
-<vector android:height="24dp" android:tint="?attr/colorControlNormal"
+<vector android:height="24dp" android:tint="#FFFFFF"
    android:viewportHeight="24" android:viewportWidth="24"
    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
    <path android:fillColor="@android:color/white" android:pathData="M15.41,7.41L14,6l-6,6 6,6 1.41,-1.41L10.83,12z"/>
--- 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,4 +1,4 @@
-<vector android:height="24dp" android:tint="?attr/colorControlNormal"
+<vector android:height="24dp" android:tint="#FFFFFF"
    android:viewportHeight="24" android:viewportWidth="24"
    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
    <path android:fillColor="@android:color/white" android:pathData="M10,6L8.59,7.41 13.17,12l-4.58,4.59L10,18l6,-6z"/>
--- a/app/src/main/res/drawable/ic_baseline_expand_more_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_expand_more_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="?attr/colorControlNormal">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M16.59,8.59L12,13.17 7.41,8.59 6,10l6,6 6,-6z"/>
-</vector>
--- a/app/src/main/res/drawable/ic_close.xml
+++ b/app/src/main/res/drawable/ic_close.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FFFFFFFF"
+      android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
+</vector>
--- a/app/src/main/res/drawable/ic_lock_open_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_lock_open_white_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="M12,17c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6h1.9c0,-1.71 1.39,-3.1 3.1,-3.1 1.71,0 3.1,1.39 3.1,3.1v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM18,20L6,20L6,10h12v10z"/>
+</vector>
--- a/app/src/main/res/drawable/ic_lock_outline_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_lock_outline_white_24dp.xml
@@ -1,5 +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="M12,4.5C7,4.5 2.73,7.61 1,12c1.73,4.39 6,7.5 11,7.5s9.27,-3.11 11,-7.5c-1.73,-4.39 -6,-7.5 -11,-7.5zM12,17c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5 -2.24,5 -5,5zM12,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3 3,-1.34 3,-3 -1.34,-3 -3,-3z"/>
+    <path android:fillColor="@android:color/white" android:pathData="M18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM12,17c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2zM15.1,8L8.9,8L8.9,6c0,-1.71 1.39,-3.1 3.1,-3.1 1.71,0 3.1,1.39 3.1,3.1v2z"/>
 </vector>
--- a/app/src/main/res/drawable/ic_share_white.xml
+++ b/app/src/main/res/drawable/ic_share_white.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M18,16.08c-0.76,0 -1.44,0.3 -1.96,0.77L8.91,12.7c0.05,-0.23 0.09,-0.46 0.09,-0.7s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81 1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.81C7.5,9.31 6.79,9 6,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.79,0 1.5,-0.31 2.04,-0.81l7.12,4.16c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92 1.61,0 2.92,-1.31 2.92,-2.92s-1.31,-2.92 -2.92,-2.92z"/>
+</vector>
--- a/app/src/main/res/drawable/ic_unstarred.xml
+++ b/app/src/main/res/drawable/ic_unstarred.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="M22,9.24l-7.19,-0.62L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21 12,17.27 18.18,21l-1.63,-7.03L22,9.24zM12,15.4l-3.76,2.27 1,-4.28 -3.32,-2.88 4.38,-0.38L12,6.1l1.71,4.04 4.38,0.38 -3.32,2.88 1,4.28L12,15.4z"/>
-</vector>
--- a/app/src/main/res/drawable/inactive_dot.xml
+++ b/app/src/main/res/drawable/inactive_dot.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval" android:useLevel="true"
+    android:dither="true">
+
+    <size android:height="8dip" android:width="8dip"/>
+
+    <solid android:color="@android:color/white"/>
+</shape>
--- a/app/src/main/res/layout/about_activity.xml
+++ b/app/src/main/res/layout/about_activity.xml
@@ -128,10 +128,11 @@

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

                <TextView
                    android:id="@+id/license_sub"
-                    android:layout_width="wrap_content"
+                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
                    android:padding="2dp"
                    android:text="@string/app_license"
+                    android:layout_marginEnd="20dp"
                    android:textSize="16sp"
                    app:layout_constraintStart_toStartOf="parent"
                    app:layout_constraintTop_toBottomOf="@id/license_main"/>
@@ -269,36 +271,6 @@
                    app:layout_constraintTop_toTopOf="parent" />
            </androidx.constraintlayout.widget.ConstraintLayout>

-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/donate"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:padding="8dp">
-
-                <TextView
-                    android:id="@+id/donate_main"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:fontFamily="sans-serif-medium"
-                    android:padding="2dp"
-                    android:text="@string/donate"
-                    android:textSize="18sp"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
-
-                <TextView
-                    android:importantForAccessibility="no"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_margin="8dp"
-                    android:fontFamily="sans-serif-medium"
-                    android:text="@string/arrow"
-                    android:textSize="20sp"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
-            </androidx.constraintlayout.widget.ConstraintLayout>
-
            <androidx.constraintlayout.widget.ConstraintLayout
                android:id="@+id/rate"
                android:layout_width="match_parent"
--- a/app/src/main/res/layout/archive_activity.xml
+++ b/app/src/main/res/layout/archive_activity.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.coordinatorlayout.widget.CoordinatorLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    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_selector_activity.xml
+++ b/app/src/main/res/layout/barcode_selector_activity.xml
@@ -34,7 +34,7 @@
            app:layout_constraintBottom_toTopOf="@+id/barcodeIdLayout"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toStartOf="parent"
-            android:text="@string/manually_enter_barcode_instructions" />
+            android:text="@string/enterBarcodeInstructions" />
        <LinearLayout
            android:id="@+id/barcodeIdLayout"
            android:orientation="horizontal"
@@ -42,7 +42,7 @@
            android:layout_width="fill_parent"
            android:layout_height="wrap_content"
            app:layout_constraintTop_toBottomOf="@+id/explanationText"
-            app:layout_constraintBottom_toTopOf="@+id/barcodes"
+            app:layout_constraintBottom_toTopOf="@+id/noBarcode"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toStartOf="parent">
            <TextView android:textSize="16.0sp"
@@ -65,11 +65,21 @@
                android:minHeight="48dp"
                tools:ignore="ContentDescription" />
        </LinearLayout>
+        <Button
+            android:id="@+id/noBarcode"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:layout_constraintTop_toBottomOf="@+id/barcodeIdLayout"
+            app:layout_constraintBottom_toTopOf="@+id/barcodes"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            android:text="@string/barcodeNoBarcode"
+            android:enabled="false" />
        <ListView
            android:id="@+id/barcodes"
            android:layout_width="match_parent"
            android:layout_height="fill_parent"
-            app:layout_constraintTop_toBottomOf="@+id/barcodeIdLayout"
+            app:layout_constraintTop_toBottomOf="@+id/noBarcode"
            app:layout_constraintBottom_toBottomOf="parent"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toStartOf="parent"
--- a/app/src/main/res/layout/custom_barcode_scanner.xml
+++ b/app/src/main/res/layout/custom_barcode_scanner.xml
@@ -2,15 +2,6 @@
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto">

-    <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
-        android:id="@+id/fabOtherOptions"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="end|bottom"
-        app:icon="@drawable/ic_baseline_unfold_more_24"
-        android:text="@string/action_more_options"
-        android:layout_margin="16dp" />
-
    <com.journeyapps.barcodescanner.BarcodeView
        android:id="@+id/zxing_barcode_surface"
        android:layout_width="match_parent"
@@ -42,5 +33,25 @@
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintTop_toTopOf="parent" />
+
+        <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" />
+
+        <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>
 </merge>
--- a/app/src/main/res/layout/group_layout.xml
+++ b/app/src/main/res/layout/group_layout.xml
@@ -37,48 +37,36 @@
        android:layout_width="match_parent"
        android:layout_height="wrap_content">

-        <Button
+        <ImageButton
            android:id="@+id/moveUp"
-            style="?attr/materialIconButtonFilledStyle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="@dimen/cardThumbnailSize"
+            android:layout_height="@dimen/cardThumbnailSize"
            android:layout_weight="1"
-            app:icon="@drawable/ic_baseline_keyboard_arrow_up_24"
-            app:iconGravity="textStart"
-            app:tint="?attr/colorOnPrimary"
+            app:srcCompat="@drawable/ic_baseline_arrow_drop_up_24"
            android:contentDescription="@string/moveUp"/>

-        <Button
+        <ImageButton
            android:id="@+id/moveDown"
-            style="?attr/materialIconButtonFilledStyle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="@dimen/cardThumbnailSize"
+            android:layout_height="@dimen/cardThumbnailSize"
            android:layout_weight="1"
-            app:icon="@drawable/ic_baseline_keyboard_arrow_down_24"
-            app:iconGravity="textStart"
-            app:tint="?attr/colorOnPrimary"
+            app:srcCompat="@drawable/ic_baseline_arrow_drop_down_24"
            android:contentDescription="@string/moveDown"/>

-        <Button
+        <ImageButton
            android:id="@+id/edit"
-            style="?attr/materialIconButtonFilledStyle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="@dimen/cardThumbnailSize"
+            android:layout_height="@dimen/cardThumbnailSize"
            android:layout_weight="1"
-            app:icon="@drawable/ic_mode_edit_white_24dp"
-            app:iconGravity="textStart"
-            app:tint="?attr/colorOnPrimary"
+            app:srcCompat="@drawable/ic_mode_edit_white_24dp"
            android:contentDescription="@string/edit"/>

-        <Button
+        <ImageButton
            android:id="@+id/delete"
-            style="?attr/materialIconButtonFilledStyle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="@dimen/cardThumbnailSize"
+            android:layout_height="@dimen/cardThumbnailSize"
            android:layout_weight="1"
-            app:icon="@drawable/ic_delete_white_24dp"
-            app:iconGravity="textStart"
-            app:tint="?attr/colorOnPrimary"
+            app:srcCompat="@drawable/ic_delete_white_24dp"
            android:contentDescription="@string/delete"/>

    </LinearLayout>
--- a/app/src/main/res/layout/loyalty_card_layout.xml
+++ b/app/src/main/res/layout/loyalty_card_layout.xml
@@ -2,15 +2,15 @@
 <com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    xmlns:tools="http://schemas.android.com/tools"
-    style="?attr/materialCardViewElevatedStyle"
    android:id="@+id/row"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
-    android:layout_margin="5dp">
+    android:layout_margin="8dp">

    <androidx.constraintlayout.widget.ConstraintLayout
        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="4dp">

        <com.google.android.material.card.MaterialCardView
            android:id="@+id/icon_layout"
@@ -24,6 +24,7 @@
            app:layout_constraintTop_toTopOf="parent">

            <ImageView
+                android:importantForAccessibility="no"
                android:id="@+id/thumbnail"
                android:layout_width="match_parent"
                android:layout_height="match_parent"
@@ -35,20 +36,6 @@
                app:layout_constraintStart_toStartOf="parent"
                app:layout_constraintTop_toTopOf="parent" />

-            <TextView
-                android:id="@+id/thumbnail_text"
-                android:importantForAccessibility="no"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:textStyle="bold"
-                app:autoSizeTextType="uniform"
-                app:autoSizeMinTextSize="12sp"
-                app:autoSizeMaxTextSize="100sp"
-                app:autoSizeStepGranularity="2sp"
-                android:gravity="center"
-                android:maxLines="1"
-                android:layout_margin="20dp" />
-
            <ImageView
                android:importantForAccessibility="no"
                android:id="@+id/selected_thumbnail"
@@ -137,9 +124,7 @@
            android:layout_marginStart="8dp"
            android:layout_marginEnd="8dp"
            android:layout_marginBottom="4dp"
-            android:textAppearance="?attr/textAppearanceHeadlineSmall"
-            android:visibility="gone"
-            tools:visibility="visible"
+            android:textAppearance="?attr/textAppearanceHeadline1"
            app:layout_constraintTop_toBottomOf="@+id/icon_layout"
            app:layout_constraintBottom_toTopOf="@+id/note"
            app:layout_constraintEnd_toEndOf="parent"
@@ -154,6 +139,7 @@
            android:layout_marginEnd="8dp"
            android:layout_marginBottom="4dp"
            android:textAppearance="?attr/textAppearanceBody2"
+            android:textColor="?android:attr/textColorSecondary"
            android:visibility="gone"
            tools:visibility="visible"
            app:layout_constraintTop_toBottomOf="@+id/store"
@@ -181,11 +167,11 @@
            android:id="@+id/balance"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
-            android:gravity="center_vertical"
            android:layout_marginStart="8dp"
            android:layout_marginEnd="8dp"
            android:layout_marginBottom="4dp"
            android:textAppearance="?attr/textAppearanceBody2"
+            android:textColor="?android:attr/textColorSecondary"
            app:drawableLeftCompat="@drawable/ic_baseline_payments_24"
            android:drawablePadding="4dp"
            android:visibility="gone"
@@ -200,11 +186,11 @@
            android:id="@+id/validFrom"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
-            android:gravity="center_vertical"
            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"
@@ -219,11 +205,11 @@
            android:id="@+id/expiry"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
-            android:gravity="center_vertical"
            android:layout_marginStart="8dp"
            android:layout_marginEnd="8dp"
            android:layout_marginBottom="4dp"
            android:textAppearance="?attr/textAppearanceBody2"
+            android:textColor="?android:attr/textColorSecondary"
            app:drawableLeftCompat="@drawable/ic_baseline_access_time_24"
            android:drawablePadding="4dp"
            android:visibility="gone"
--- a/app/src/main/res/layout/loyalty_card_view_layout.xml
+++ b/app/src/main/res/layout/loyalty_card_view_layout.xml
@@ -6,200 +6,215 @@
    android:id="@+id/coordinator_layout"
    android:layout_width="fill_parent"
    android:layout_height="fill_parent"
-    android:fitsSystemWindows="false">
+    android:fitsSystemWindows="true">
+

    <com.google.android.material.appbar.AppBarLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:id="@+id/app_bar_layout"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:background="@android:color/transparent"
+        android:clipChildren="false"
+        android:clipToPadding="false"
+        android:fitsSystemWindows="true"
+        android:weightSum="1.0">

        <com.google.android.material.appbar.MaterialToolbar
-            android:id="@+id/toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            style="?attr/toolbarStyle" />
-    </com.google.android.material.appbar.AppBarLayout>
+            android:id="@+id/toolbar_landscape"
+            android:layout_width="fill_parent"
+            android:layout_height="?actionBarSize"
+            android:background="@android:color/transparent"
+            android:fitsSystemWindows="false"
+            android:paddingTop="0dp"
+            android:visibility="gone"
+            app:contentInsetStart="72.0dip"
+            app:layout_collapseMode="pin" />

-    <LinearLayout
-        android:id="@+id/container"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_marginTop="?attr/actionBarSize"
-        android:layout_marginBottom="100dp"
-        android:orientation="vertical"
-        android:layout_marginStart="0dp"
-        android:layout_marginEnd="0dp">
-
-        <LinearLayout
-            android:id="@+id/icon_container"
-            android:layout_width="match_parent"
+        <com.google.android.material.appbar.CollapsingToolbarLayout
+            android:id="@+id/collapsingToolbarLayout"
+            android:layout_width="fill_parent"
            android:layout_height="wrap_content"
-            android:layout_marginBottom="20dp">
+            android:clipChildren="false"
+            android:clipToPadding="false"
+            android:minHeight="56.0dip"
+            app:contentScrim="?colorPrimary"
+            app:expandedTitleGravity="top"
+            app:expandedTitleMarginEnd="64dp"
+            app:expandedTitleMarginStart="48dp">

-            <Space
-                android:layout_width="50dp"
-                android:layout_height="0dp"/>
-
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1">
-
-                <com.google.android.material.card.MaterialCardView
-                    android:id="@+id/icon_holder"
-                    android:layout_width="match_parent"
-                    android:layout_height="0dp"
-                    app:cardCornerRadius="8dp"
-                    android:layout_margin="10dp"
-                    app:layout_constraintTop_toTopOf="parent"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintDimensionRatio="85.6f:53.98f">
-
-                    <ImageView
-                        android:id="@+id/icon_image"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"/>
-
-                    <TextView
-                        android:id="@+id/icon_text"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:textStyle="bold"
-                        app:autoSizeTextType="uniform"
-                        app:autoSizeMinTextSize="12sp"
-                        app:autoSizeMaxTextSize="100sp"
-                        app:autoSizeStepGranularity="2sp"
-                        android:gravity="center"
-                        android:maxLines="1"
-                        android:layout_margin="20dp" />
-                </com.google.android.material.card.MaterialCardView>
-            </androidx.constraintlayout.widget.ConstraintLayout>
-
-            <Space
-                android:layout_width="50dp"
-                android:layout_height="0dp"/>
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_marginStart="0dp"
-            android:layout_marginEnd="0dp"
-            android:layoutDirection="ltr">
-
-            <!-- We don't use these buttons for Talkback -->
-            <ImageButton
-                android:importantForAccessibility="no"
-                android:id="@+id/main_left_button"
-                android:layout_width="50dp"
-                android:layout_height="match_parent"
-                app:srcCompat="@drawable/ic_baseline_chevron_left_24"
-                android:background="@android:color/transparent"/>
-
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/card_holder"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1">
-
-                <com.google.android.material.card.MaterialCardView
-                    android:id="@+id/main_card_view"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    app:cardCornerRadius="8dp"
-                    android:layout_margin="10dp"
-                    app:layout_constraintTop_toTopOf="parent"
-                    app:layout_constraintBottom_toBottomOf="parent">
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:layout_margin="4dp"
-                        android:orientation="vertical">
-
-                            <ImageView
-                                android:id="@+id/main_image"
-                                android:layout_width="match_parent"
-                                android:layout_height="0dp"
-                                android:layout_weight="1"/>
-
-                            <TextView
-                                android:id="@+id/card_id_view"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:textSize="@dimen/text_size_large"
-                                android:ellipsize="end"
-                                android:singleLine="true"
-                                android:gravity="center"/>
-                    </LinearLayout>
-                </com.google.android.material.card.MaterialCardView>
-            </androidx.constraintlayout.widget.ConstraintLayout>
-
-            <!-- We don't use these buttons for Talkback -->
-            <ImageButton
-                android:importantForAccessibility="no"
-                android:id="@+id/main_right_button"
-                android:layout_width="50dp"
-                android:layout_height="match_parent"
-                app:srcCompat="@drawable/ic_baseline_chevron_right_24"
-                android:background="@android:color/transparent"/>
-        </LinearLayout>
-    </LinearLayout>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/fullscreen_layout"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
-
-        <ImageView
-            android:importantForAccessibility="no"
-            android:id="@+id/fullscreen_image"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toTopOf="@+id/scaler_guideline"/>
-
-        <androidx.constraintlayout.widget.Guideline
-            android:id="@+id/scaler_guideline"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            app:layout_constraintGuide_percent="0.5"/>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:layout_constraintBottom_toTopOf="@+id/fullscreen_button_minimize"
-            android:layout_marginBottom="25dp"
-            android:layout_marginStart="15.0dip"
-            android:layout_marginEnd="15.0dip">
-
-            <TextView
-                android:importantForAccessibility="no"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:text="@string/height"/>
-
-            <SeekBar
-                android:id="@+id/barcode_scaler"
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/storeName"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:layout_gravity="center"
-                android:contentDescription="@string/setBarcodeHeight"
-                android:max="100" />
-        </LinearLayout>
+                android:layout_marginTop="?actionBarSize"
+                android:layout_marginBottom="?actionBarSize"
+                android:ellipsize="end"
+                android:maxLines="1"
+                android:textAlignment="center"
+                android:textColor="@android:color/white"
+                android:textSize="40sp"
+                app:layout_collapseMode="parallax" />

-        <ImageButton
-            android:id="@+id/fullscreen_button_minimize"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:src="@drawable/ic_baseline_expand_more_24"
-            android:tooltipText="@string/moveDown"
-            app:layout_constraintBottom_toBottomOf="parent"
-            android:layout_marginBottom="25dp"
-            android:background="@android:color/transparent"/>
-    </androidx.constraintlayout.widget.ConstraintLayout>
+            <androidx.appcompat.widget.Toolbar
+                android:id="@id/toolbar"
+                android:layout_width="fill_parent"
+                android:layout_height="?actionBarSize"
+                android:background="@android:color/transparent"
+                app:contentInsetStart="72.0dip"
+                app:layout_collapseMode="pin" />
+
+        </com.google.android.material.appbar.CollapsingToolbarLayout>
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <ImageView
+        android:id="@+id/icon_image"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_alignParentTop="true"
+        android:fitsSystemWindows="true"
+        android:scaleType="centerCrop"
+        app:srcCompat="@drawable/ic_launcher_foreground"
+        tools:ignore="ContentDescription" />
+
+    <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"
@@ -214,70 +229,53 @@
        app:contentInsetEnd="0dp"
        app:fabAlignmentMode="center">

-        <LinearLayout
-            android:layout_width="match_parent"
+        <ImageButton
+            android:id="@+id/button_previous"
+            android:layout_width="wrap_content"
            android:layout_height="match_parent"
-            android:layoutDirection="ltr">
+            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/bottom_app_bar_previous_button"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                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" />

-            <LinearLayout
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:orientation="horizontal"
-                android:layoutDirection="locale">
+        <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/bottom_app_bar_info_button"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    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" />
-
-                <Space
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1" />
-
-                <ImageButton
-                    android:id="@+id/bottom_app_bar_update_balance_button"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:paddingStart="12dp"
-                    android:paddingEnd="12dp"
-                    android:background="@android:color/transparent"
-                    android:src="@drawable/ic_baseline_shopping_cart_24"
-                    android:tooltipText="@string/updateBalance"
-                    android:visibility="gone" />
-
-            </LinearLayout>
-
-            <ImageButton
-                android:id="@+id/bottom_app_bar_next_button"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                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" />
-
-        </LinearLayout>
+        <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>

--- a/app/src/main/res/layout/preference_material_switch.xml
+++ b/app/src/main/res/layout/preference_material_switch.xml
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.materialswitch.MaterialSwitch xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/switchWidget"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:background="@null"
-    android:clickable="false"
-    android:focusable="false" />
--- a/app/src/main/res/layout/sorting_option.xml
+++ b/app/src/main/res/layout/sorting_option.xml
@@ -10,13 +10,12 @@

        <CheckBox
            android:id="@+id/checkBox_reverse"
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
            android:layout_height="wrap_content"
-            android:layout_marginStart="20dp"
-            android:paddingStart="20dp"
+            android:layout_marginLeft="20dp"
+            android:paddingLeft="20dp"
            android:text="@string/reverse"
-            android:textSize="16sp"
-            android:textColor="?attr/colorOnSurfaceVariant"/>
+            android:textSize="19sp"/>

    </LinearLayout>
-</androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
--- a/app/src/main/res/menu/archive_menu.xml
+++ b/app/src/main/res/menu/archive_menu.xml
@@ -0,0 +1,24 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:context="protect.card_locker.MainActivity">
+    <item
+        android:id="@+id/action_search"
+        android:title="@string/action_search"
+        android:icon="@drawable/ic_search_white"
+        app:actionViewClass="androidx.appcompat.widget.SearchView"
+        app:showAsAction="always|collapseActionView"
+        android:visible="false"/>
+    <item
+        android:id="@+id/action_unfold"
+        android:title="@string/action_hide_details"
+        android:icon="@drawable/ic_baseline_unfold_less_24"
+        app:showAsAction="always"
+        android:visible="false"/>
+    <item
+        android:id="@+id/action_sort"
+        android:title="@string/sort"
+        android:icon="@drawable/ic_baseline_sort_24"
+        app:showAsAction="always"
+        android:visible="false"/>
+</menu>
--- a/app/src/main/res/menu/card_details_menu.xml
+++ b/app/src/main/res/menu/card_details_menu.xml
@@ -1,9 +1,9 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
      xmlns:app="http://schemas.android.com/apk/res-auto">
    <item
-        android:id="@+id/action_display_options"
-        android:title="@string/action_display_options"
-        android:icon="@drawable/baseline_visibility_24"
+        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_update_menu.xml
+++ b/app/src/main/res/menu/card_update_menu.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+      xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/action_delete"
+        android:icon="@drawable/ic_delete_white_24dp"
+        android:title="@string/delete"
+        app:showAsAction="always"/>
+</menu>
--- a/app/src/main/res/menu/card_view_menu.xml
+++ b/app/src/main/res/menu/card_view_menu.xml
@@ -4,13 +4,13 @@

    <item
        android:id="@+id/action_share"
-        android:icon="@drawable/ic_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"
+        android:icon="@drawable/ic_unstarred_white"
        android:title="@string/star"
        app:showAsAction="always" />

--- a/app/src/main/res/menu/main_menu.xml
+++ b/app/src/main/res/menu/main_menu.xml
@@ -10,9 +10,9 @@
        app:showAsAction="always|collapseActionView"
        android:visible="false"/>
    <item
-        android:id="@+id/action_display_options"
-        android:title="@string/action_display_options"
-        android:icon="@drawable/baseline_visibility_24"
+        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
@@ -26,6 +26,10 @@
        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"/>
    <item
        android:id="@+id/action_import_export"
        android:icon="@drawable/ic_import_export_white_24dp"
--- a/app/src/main/res/raw/.gitignore
+++ b/app/src/main/res/raw/.gitignore
@@ -1,2 +0,0 @@
-changelog.md
-privacy.md
--- a/app/src/main/res/raw/contributors.txt
+++ b/app/src/main/res/raw/contributors.txt
@@ -5,73 +5,64 @@ Allan Nordhøy
 solokot
 Heimen Stoffels
 Oğuz Ersen
-FC (Fay) Stegerman
 Katharine Chui
-SlavekB
 mondstern
-StoyanDimitrov
 IllusiveMan196
+StoyanDimitrov
 Altonss
+SlavekB
 Michael Moroni
 Gediminas Murauskas
 Petr Novák
 Joel A
-laralem
 Taco
+laralem
 pfaffenrodt
-Eric
 Nyatsuki
+gallegonovato
 HudobniVolk
 Samantaz Fox
 arno-github
 Ankit Tiwari
 Sergio Paredes
-Clxff H3r4ld0
 Aayush Gupta
-Balázs Meskó
 huuhaa
-Projjal Moitra
 Quentin PAGÈS
-Giovanni Donisi
 Alexander Ivanov
 arshbeerSingh
 Denis Shilin
 Freddo espresso
-Ziad OUALHADJ
 Silvério Santos
 Miha Frangež
-Eryk Michalak
 Arnis Jaundžeikars
-Dan
+Kefir2105
 sr093906
+Giovanni Donisi
 mdvhimself
-Jiri Grönroos
 Katarzyna
 echo r"0xX4H" | rev
 Magnitudee
 Olivia (Zoe)
+Projjal Moitra
 betsythefc
 waffshappen
 Robin
+Eric
 ati3
-enolp
+(Cliff Heraldo)
 Evgeniy Khramov
 Jane Kong
-Jean Mareilles
-Jean-Luc Tibaux
-José Rebelo
+Jiri Grönroos
 K. Herbert
 Lisa A.
 Mawuena M. KODZO A.
-rudy3
-Reza
-Still / Azaka
+Max
+Still Hsu
 String E. Fighter
 Tapu
 Yurical
+Eryk Michalak
 rr-vesp
-yangyangdaji
-丛林意志
 alajemba-vik
 /usr/local/ΕΨΗΕΛΩΝ
 Adolfo Jayme-Barrientos
@@ -80,35 +71,23 @@ KovalevArtem
 Artem M.
 Astrohops1
 BMN
-balaraz
 BootVirtual
-Bottan Hermawan
-zChiip
 Clonewayx
 D. Domig
-Danylo Lystopadov
 Diego
-Eudes-alencar
 Fede Pujol
-FineFindus
 francescbassas
-Jason Li
+Jean-Luc Tibaux
 Jesse Davids
-Kamborio
-Kis Dominik
 Lukas Grassauer
-Luna Jernberg
+bittin
 Marnick L'Eau
 Michalis
 Michał
-Milo Ivir
 Mohamed A. Salah
-Yatoku
 the7thNightmare
-Quang Trung
 Rishi Agarwal
 Rosdyana Kusuma
-Sabri Ünal
 umoenks
 Simon Rusinov
 Siriusmart
@@ -118,166 +97,115 @@ Thomas Bertels
 Thomas Cruveilher
 Tian Jiale
 Tong Liu
-Tymofii Lytvynenko
 Wanath
-Younes Bouhouche
 Runner
 ce i moa
-enescan201
-Frablock
 inesre
 lgasp
-notlin4
 phlostically
-pokeghost
 sal0max
 Ágata Leuck
 BmBKun
-NamHyeonjeong
 Aditya Das
-asier123123131
 Kevin Sicong Jiang
 Tomer Ben-Rachel
 Tom Sawyer
 tfuxu
 Ahmed Saleh
 Airat
-Tapwaterisokey
-Alexandra-Ioana Moroz
+Alexander
 sNiXx
 Angela Enogieru
-Animesh Chatterjee
-Artūras Kalenda
+AnimeshChatterjee1
 Ashish Yadav
+Asier
 Aya Elsaadany
-Aya
 Biren
 Booc Sylvan
 Brage Nesteby Reitan
-Cap Amr Karam
-Carlo Maria Cuoghi Barbagli
-ChaoticNeutralCzech
-ChengCheng
 CherryMonster222
 Colgrave
-djcand
+Csaba
 Mylou53
-Daniel Sych
 danieluhrinyi
-Daniele Tricoli
 Kasina Dheeraj
 Donno
-Reihan
-Erik Spjelkavik
 Flav
 Franciszek Stefan
-Gael Caraballo
-Giacomo Alessandroni
-Govind S Nair
 Grzegorz
 gneiss15
 Hamustra Scans
-helzubair
 HowITsDone
-Hubert Maciejewicz
 Izzy
 Jacek
 Jacopo Gennaro Esposito
+Jasielprogramador
+Jean Mareilles
 Jean-Baptiste
 Kung-chih
 Karvjorm
-polar
 krkk
-Kristoffer Grundström
 Laura Ferraz 
-Lionel HANNEQUIN
 Lucas da Costa
-almir992
 Manan Jhaveri
 Marco
 BRBsoup
-Mateo Gomez
 Mattia
 Md. Al-Amin
 Michael Gangolf
-Milan Šalka
 3DN1M
-Minecraft boom
 Mobashir Raihan
 Moi Toi
-DiCeYMaYo
 DivideEtImpera
 Nicolas
 Nosnahc
-osamaqw
 pa4k
 pbeckmann
 Peer Beckmann
-vandman
 Piotr Strebski
 Piotr Zet
-Poorva Patidar
 Quang Nguyen
 Ratnesh
+Reza
 Rohan Babbar 
 Ronak Upadhyay
 Rose Liverman
 SKULD
-Sabrina
 Salem Malus
 Samarth Asthan
-tatyhub
 Shailendra Maurya
-SilverFS
 Simone Dotto
 Subhashish Anand
-Subhradeep Bera
-Swayam Khare
 SziaTomi
 Mehedi Hasan
-Tim Trek
 Titas Pažereckas
 atakujonc
-tkraljevic
 Tony C
+Tymofii Lytvynenko
 Vancha March
-tyap-lyap-ivprod
-Waldemar Stoczkowski
-Wiktor Kwapisiewicz
 Yevgeny M
 Yusril A
 ahmed-awad26
 Avik Kundu
-ayuyydev
 diksha-2911
-essys
 gbonaspetti
 gittyboy-cell
 huang ivan
-lassr8
-liva
 lucafont2
 mtrmirez
-michaelpratana
 opsik
-pesta007
 polarhun
 pooyanazari
 psa-jforestier
-z369369
 sergio
-skauVictor
 080502
 Marcus
 techwebpd
-tjw123hh
 Truestorybaby 
 tygyh
 unstartdev
 wmilan 17
-MeH762
 يوسف لطفي
-しいたけ
-元气
+luoyang3
 JaeBeom An
 JungHee Lee
--- a/app/src/main/res/raw/license.html
+++ b/app/src/main/res/raw/license.html
@@ -1,696 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <title>GNU General Public License v3.0 - GNU Project - Free Software Foundation (FSF)</title>
- <link rel="alternate" type="application/rdf+xml"
-       href="http://www.gnu.org/licenses/gpl-3.0.rdf" /> 
-</head>
-<body>
-<h3 style="text-align: center;">GNU GENERAL PUBLIC LICENSE</h3>
-<p style="text-align: center;">Version 3, 29 June 2007</p>
-
-<p>Copyright &copy; 2007 Free Software Foundation, Inc.
- &lt;<a href="https://fsf.org/">https://fsf.org/</a>&gt;</p><p>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.</p>
-
-<h4 id="preamble">Preamble</h4>
-
-<p>The GNU General Public License is a free, copyleft license for
-software and other kinds of works.</p>
-
-<p>The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.</p>
-
-<p>When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.</p>
-
-<p>To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.</p>
-
-<p>For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.</p>
-
-<p>Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.</p>
-
-<p>For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.</p>
-
-<p>Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.</p>
-
-<p>Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.</p>
-
-<p>The precise terms and conditions for copying, distribution and
-modification follow.</p>
-
-<h4 id="terms">TERMS AND CONDITIONS</h4>
-
-<h5 id="section0">0. Definitions.</h5>
-
-<p>&ldquo;This License&rdquo; refers to version 3 of the GNU General Public License.</p>
-
-<p>&ldquo;Copyright&rdquo; also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.</p>
- 
-<p>&ldquo;The Program&rdquo; refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as &ldquo;you&rdquo;.  &ldquo;Licensees&rdquo; and
-&ldquo;recipients&rdquo; may be individuals or organizations.</p>
-
-<p>To &ldquo;modify&rdquo; a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a &ldquo;modified version&rdquo; of the
-earlier work or a work &ldquo;based on&rdquo; the earlier work.</p>
-
-<p>A &ldquo;covered work&rdquo; means either the unmodified Program or a work based
-on the Program.</p>
-
-<p>To &ldquo;propagate&rdquo; a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.</p>
-
-<p>To &ldquo;convey&rdquo; a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.</p>
-
-<p>An interactive user interface displays &ldquo;Appropriate Legal Notices&rdquo;
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.</p>
-
-<h5 id="section1">1. Source Code.</h5>
-
-<p>The &ldquo;source code&rdquo; for a work means the preferred form of the work
-for making modifications to it.  &ldquo;Object code&rdquo; means any non-source
-form of a work.</p>
-
-<p>A &ldquo;Standard Interface&rdquo; means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.</p>
-
-<p>The &ldquo;System Libraries&rdquo; of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-&ldquo;Major Component&rdquo;, in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.</p>
-
-<p>The &ldquo;Corresponding Source&rdquo; for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.</p>
-
-<p>The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.</p>
-
-<p>The Corresponding Source for a work in source code form is that
-same work.</p>
-
-<h5 id="section2">2. Basic Permissions.</h5>
-
-<p>All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.</p>
-
-<p>You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.</p>
-
-<p>Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.</p>
-
-<h5 id="section3">3. Protecting Users' Legal Rights From Anti-Circumvention Law.</h5>
-
-<p>No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.</p>
-
-<p>When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.</p>
-
-<h5 id="section4">4. Conveying Verbatim Copies.</h5>
-
-<p>You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.</p>
-
-<p>You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.</p>
-
-<h5 id="section5">5. Conveying Modified Source Versions.</h5>
-
-<p>You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:</p>
-
-<ul>
-<li>a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.</li>
-
-<li>b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    &ldquo;keep intact all notices&rdquo;.</li>
-
-<li>c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.</li>
-
-<li>d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.</li>
-</ul>
-
-<p>A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-&ldquo;aggregate&rdquo; if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.</p>
-
-<h5 id="section6">6. Conveying Non-Source Forms.</h5>
-
-<p>You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:</p>
-
-<ul>
-<li>a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.</li>
-
-<li>b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.</li>
-
-<li>c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.</li>
-
-<li>d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.</li>
-
-<li>e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.</li>
-</ul>
-
-<p>A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.</p>
-
-<p>A &ldquo;User Product&rdquo; is either (1) a &ldquo;consumer product&rdquo;, which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, &ldquo;normally used&rdquo; refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.</p>
-
-<p>&ldquo;Installation Information&rdquo; for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.</p>
-
-<p>If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).</p>
-
-<p>The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.</p>
-
-<p>Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.</p>
-
-<h5 id="section7">7. Additional Terms.</h5>
-
-<p>&ldquo;Additional permissions&rdquo; are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.</p>
-
-<p>When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.</p>
-
-<p>Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:</p>
-
-<ul>
-<li>a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or</li>
-
-<li>b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or</li>
-
-<li>c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or</li>
-
-<li>d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or</li>
-
-<li>e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or</li>
-
-<li>f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.</li>
-</ul>
-
-<p>All other non-permissive additional terms are considered &ldquo;further
-restrictions&rdquo; within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.</p>
-
-<p>If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.</p>
-
-<p>Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.</p>
-
-<h5 id="section8">8. Termination.</h5>
-
-<p>You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).</p>
-
-<p>However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.</p>
-
-<p>Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.</p>
-
-<p>Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.</p>
-
-<h5 id="section9">9. Acceptance Not Required for Having Copies.</h5>
-
-<p>You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.</p>
-
-<h5 id="section10">10. Automatic Licensing of Downstream Recipients.</h5>
-
-<p>Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.</p>
-
-<p>An &ldquo;entity transaction&rdquo; is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.</p>
-
-<p>You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.</p>
-
-<h5 id="section11">11. Patents.</h5>
-
-<p>A &ldquo;contributor&rdquo; is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's &ldquo;contributor version&rdquo;.</p>
-
-<p>A contributor's &ldquo;essential patent claims&rdquo; are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, &ldquo;control&rdquo; includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.</p>
-
-<p>Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.</p>
-
-<p>In the following three paragraphs, a &ldquo;patent license&rdquo; is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To &ldquo;grant&rdquo; such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.</p>
-
-<p>If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  &ldquo;Knowingly relying&rdquo; means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.</p>
-  
-<p>If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.</p>
-
-<p>A patent license is &ldquo;discriminatory&rdquo; if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.</p>
-
-<p>Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.</p>
-
-<h5 id="section12">12. No Surrender of Others' Freedom.</h5>
-
-<p>If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.</p>
-
-<h5 id="section13">13. Use with the GNU Affero General Public License.</h5>
-
-<p>Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.</p>
-
-<h5 id="section14">14. Revised Versions of this License.</h5>
-
-<p>The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.</p>
-
-<p>Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License &ldquo;or any later version&rdquo; applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.</p>
-
-<p>If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.</p>
-
-<p>Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.</p>
-
-<h5 id="section15">15. Disclaimer of Warranty.</h5>
-
-<p>THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM &ldquo;AS IS&rdquo; WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.</p>
-
-<h5 id="section16">16. Limitation of Liability.</h5>
-
-<p>IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.</p>
-
-<h5 id="section17">17. Interpretation of Sections 15 and 16.</h5>
-
-<p>If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.</p>
-
-<p>END OF TERMS AND CONDITIONS</p>
-
-<h4 id="howto">How to Apply These Terms to Your New Programs</h4>
-
-<p>If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.</p>
-
-<p>To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the &ldquo;copyright&rdquo; line and a pointer to where the full notice is found.</p>
-
-<pre>    &lt;one line to give the program's name and a brief idea of what it does.&gt;
-    Copyright (C) &lt;year&gt;  &lt;name of author&gt;
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see &lt;https://www.gnu.org/licenses/&gt;.
-</pre>
-
-<p>Also add information on how to contact you by electronic and paper mail.</p>
-
-<p>If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:</p>
-
-<pre>    &lt;program&gt;  Copyright (C) &lt;year&gt;  &lt;name of author&gt;
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-</pre>
-
-<p>The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an &ldquo;about box&rdquo;.</p>
-
-<p>You should also get your employer (if you work as a programmer) or school,
-if any, to sign a &ldquo;copyright disclaimer&rdquo; for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-&lt;<a href="https://www.gnu.org/licenses/">https://www.gnu.org/licenses/</a>&gt;.</p>
-
-<p>The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-&lt;<a href="https://www.gnu.org/licenses/why-not-lgpl.html">https://www.gnu.org/licenses/why-not-lgpl.html</a>&gt;.</p>
-
-</body></html>
--- a/app/src/main/res/raw/readme.md
+++ b/app/src/main/res/raw/readme.md
@@ -0,0 +1,19 @@
+# stocard_stores.csv
+
+stocard_stores.csv was created by extracting /data/data/de.stocard/de.stocard.stocard/databases/stores on a rooted devices and running the following command over it:
+
+```
+sqlite3 -header -csv sync_db "select id,content from synced_resources where collection = '/loyalty-card-providers/'" > stocard_providers.csv
+while IFS= read -r line; do
+  if [ "$line" = "id,content" ]; then
+    echo "_id,name,barcodeFormat" > stocard_stores.csv
+  else
+    id="$(echo "$line" | cut -d ',' -f1)"
+    name="$(echo "$line" | cut -d ',' -f2- | sed 's/""/"/g' | sed 's/^"//g' | sed 's/"$//g' | jq -r .name)"
+    barcodeFormat="$(echo "$line" | cut -d ',' -f2- | sed 's/""/"/g' | sed 's/^"//g' | sed 's/"$//g' | jq -r .default_barcode_format)"
+    echo "$id,\"$name\",$barcodeFormat" >> stocard_stores.csv
+  fi
+done < stocard_providers.csv
+```
+
+Only used for data portability reasons (ensuring importing works). Do NOT copy this anywhere else or use it for any purpose other than ensuring we can import a GDPR-provided export. We want to make sure this stays under fair use.
--- a/app/src/main/res/raw/stocard_stores.csv
+++ b/app/src/main/res/raw/stocard_stores.csv
--- a/app/src/main/res/resources.properties
+++ b/app/src/main/res/resources.properties
@@ -1 +0,0 @@
-unqualifiedResLocale=en-US
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" xmlns:tools="http://schemas.android.com/tools">
    <string name="action_search">بحث</string>
-    <string name="action_add">أضف</string>
-    <string name="noGiftCards">اضغط على + زر الإضافة لاضافة بطاقة، او استورد من ⋮ القائمة.</string>
+    <string name="action_add">اضف</string>
+    <string name="noGiftCards">اضغط على + الزر الإضافي لاضافة بطاقة, او استورد من ⋮ القائمة.</string>
    <string name="noMatchingGiftCards">لا نتائج. حاول تغيير كلمات البحث.</string>
    <string name="storeName">اسم</string>
    <string name="note">مذكرة</string>
-    <string name="cardId">معرّف البطاقة</string>
+    <string name="cardId">بطاقة شخصية</string>
    <string name="barcodeType">نوع الباركود</string>
+    <string name="barcodeNoBarcode">لا يوجد باركود</string>
    <string name="noBarcode">لا يوجد باركود</string>
-    <string name="star">أضف الي المفضلة</string>
+    <string name="star">اضف الي المفضلة</string>
    <string name="unstar">حذف من المفضلة</string>
    <string name="cancel">إلغاء</string>
    <string name="save">حفظ</string>
@@ -28,6 +29,8 @@
    <string name="noCardsMessage">اضف بطاقة أولا</string>
    <string name="card_ids_copied">البطاقة(ات) الشخصية المنسوخة</string>
    <string name="barcodeImageDescriptionWithType">صورة <xliff:g>%s</xliff:g> باركود</string>
+    <string name="noStoreError">لا يوجد اسم مدخل</string>
+    <string name="noCardIdError">لا يوجد بطاقة شخصية مدخلة</string>
    <string name="noCardExistsError">لا يمكن العثور على هذه البطاقة</string>
    <string name="failedParsingImportUriError">لا يمكن تحليل الرابط المستورد</string>
    <string name="importExport">استيراد/تصدير</string>
@@ -45,18 +48,22 @@
    <string name="app_copyright_old">بناء على Loyalty Card Keychain
 \nحقوق النشر © 2016-2020 Branden Archer</string>
    <string name="app_license">البرمجيات الحرة متروكة الحقوق, ترخيص +GPLv3</string>
+    <string name="app_revision_fmt">معلومات المراجعة: <xliff:g id="app_revision_url">%s</xliff:g></string>
    <string name="app_libraries">مكتبات الطرف الثالث الحرة: <xliff:g id="app_libraries_list">%s</xliff:g></string>
    <string name="selectBarcodeTitle">اختار الباركود</string>
+    <string name="enterBarcodeInstructions">أدخل بطاقة هوية ، واختر نوع الباركود أدناه ، أو \"لا يوجد باركود\".</string>
    <string name="copy_to_clipboard_toast">تم نسخ بطاقة الهوية إلى الحافظة</string>
    <string name="thumbnailDescription">صورة مصغرة</string>
    <string name="starImage">نجم مفضل</string>
    <string name="settings">اعدادات</string>
+    <string name="settings_category_title_ui">واجهة المستخدم</string>
    <string name="settings_light_theme">فاتح</string>
    <string name="settings_dark_theme">داكن</string>
    <string name="settings_card_orientation">اتجاه الباركود</string>
    <string name="settings_portrait_orientation">الوضع الرأسي</string>
    <string name="settings_landscape_orientation">الوضع الأفقي</string>
    <string name="settings_theme">مظهر</string>
+    <string name="settings_max_font_size_scale">اقصي. حجم الخط</string>
    <string name="settings_display_barcode_max_brightness">عرض مشرق علي الباركود</string>
    <string name="importSuccessful">تم استيراد البيانات</string>
    <string name="exportSuccessful">تم تصدير البيانات</string>
@@ -75,6 +82,7 @@
    <string name="balance">الرصيد</string>
    <string name="currency">العملة</string>
    <string name="points">نقاط</string>
+    <string name="parsingBalanceFailed"><xliff:g>%s</xliff:g> لا يبدو أنه رصيد صالح.</string>
    <string name="chooseImportType">استيراد البيانات من</string>
    <string name="app_loyalty_card_keychain">سلسلة مفاتيح بطاقة الولاء</string>
    <string name="privacy_policy">سياسة الخصوصية</string>
@@ -115,7 +123,7 @@
    <string name="turn_flashlight_off">أطفئ المصباح</string>
    <string name="settings_locale">لغة</string>
    <string name="settings_system_locale">النظام</string>
-    <string name="setIcon">تعيين الصورة المصغرة</string>
+    <string name="setIcon">تعيين رمز</string>
    <string name="settings_catima_theme">Catima</string>
    <string name="settings_pink_theme">زهري</string>
    <string name="settings_magenta_theme">أرجواني</string>
@@ -128,6 +136,9 @@
    <string name="app_contributors">أصبح ممكنًا بواسطة: <xliff:g id="app_contributors">%s</xliff:g></string>
    <string name="sort">فرز</string>
    <string name="showMoreInfo">اظهر المعلومات</string>
+    <string name="hideMoreInfo">إخفاء المعلومات</string>
+    <string name="swipeToSwitchImages">امسح لتبديل الصور, اضغط لفترة طويلة لفتح الصورة في تطبيق المعرض</string>
+    <string name="sort_by_balance">الرصيد</string>
    <string name="reverse">... بترتيب معكوس</string>
    <string name="sort_by">صنف حسب</string>
    <string name="settings_oled_dark">خلفية سوداء نقية لمظهر داكن</string>
@@ -139,14 +150,16 @@
    <string name="shortcutSelectCard">اختر بطاقة</string>
    <string name="options">خيارات</string>
    <string name="starred">مميز بنجمة</string>
+    <string name="set_scale">ضبط النطاق</string>
    <string name="include_if_asking_support">إذا كنت ترغب في طلب الدعم ، فقم بتضمين المعلومات التالية:</string>
    <string name="duplicateCard">كرر</string>
    <string name="archive">ضع الي الأرشيف</string>
    <string name="unarchive">أخرج من الأرشيف</string>
    <string name="archived">تمت أرشفة البطاقة</string>
    <string name="unarchived">البطاقة غير مؤرشفة</string>
+    <string name="archiveList">أرشيف</string>
    <string name="failedLaunchingPhotoPicker">تعذر العثور على تطبيق معرض مدعوم</string>
-    <string name="noGiftCardsGroup">انشئ بعضا من البطاقات, ثم عيينهم لهذه المجموعة.</string>
+    <string name="noGiftCardsGroup">انشئ بعض من البطاقات, و عيينهم لهذه المجموعة.</string>
    <string name="deleteTitle">مسح بطاقة</string>
    <plurals name="selectedCardCount">
        <item quantity="zero"><xliff:g>%d</xliff:g> محدد</item>
@@ -165,6 +178,7 @@
    <string name="license">رخصة</string>
    <string name="sort_by_name">اسم</string>
    <string name="version_history">تاريخ النسخة</string>
+    <string name="action_hide_details">أخف التفاصيل</string>
    <plurals name="groupCardCountWithArchived">
        <item quantity="zero"><xliff:g>%1$d</xliff:g> بطاقة ( <xliff:g id="archivedCount">%2$d</xliff:g> مؤرشفة)</item>
        <item quantity="one"><xliff:g>%1$d</xliff:g> بطاقة ( <xliff:g id="archivedCount">%2$d</xliff:g> مؤرشفة)</item>
@@ -198,6 +212,7 @@
    <string name="app_resources">موارد الطرف الثالث الحرة: <xliff:g id="app_resources_list">%s</xliff:g></string>
    <string name="settings_follow_system_orientation">نظام المتابعة</string>
    <string name="groups">مجموعات</string>
+    <string name="barcode">باركود</string>
    <string name="settings_keep_screen_on">حافظ على الشاشة قيد التشغيل</string>
    <string name="intent_import_card_from_url_share_text">اريد مشاركة بطاقة معك</string>
    <string name="groupsList">مجموعات: <xliff:g>%s</xliff:g></string>
@@ -219,6 +234,7 @@
    <string name="balanceSentence">الرصيد: <xliff:g>%s</xliff:g></string>
    <string name="expiryStateSentence">تنتهي: <xliff:g>%s</xliff:g></string>
    <string name="expiryStateSentenceExpired">منتهي الصلاحية: <xliff:g>%s</xliff:g></string>
+    <string name="moveBarcodeToCenterOfScreen">قم بتوسيط الرمز الشريطي على الشاشة</string>
    <plurals name="balancePoints">
        <item quantity="zero"><xliff:g>%s</xliff:g> نقطة</item>
        <item quantity="one"><xliff:g>%s</xliff:g> نقطة</item>
@@ -238,7 +254,9 @@
    <string name="on_github">على GitHub</string>
    <string name="report_error">الإبلاغ عن خطأ</string>
    <string name="sort_by_expiry">انقضاء</string>
+    <string name="noUnarchivedCardsMessage">لا توجد بطاقات غير مؤرشفة موجودة</string>
    <string name="importLoyaltyCardKeychain">الاستيراد من Loyalty Card Keychain</string>
+    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Copyright © 2019–<xliff:g>%d</xliff:g> Sylvia van Os</string>
    <string name="importLoyaltyCardKeychainMessage">حدد ملفك <i>LoyaltyCardKeychain.csv</i> التصدير من Loyalty Card Keychain للاستيراد.
 \nقم بإنشائه من قائمة الاستيراد / التصدير في Loyalty Card Keychain بالضغط على تصدير هناك أولاً.</string>
    <string name="importStocard">الاستيراد من Stocard</string>
@@ -247,6 +265,7 @@
 \nلا يتم جمع أي بيانات على الإطلاق ، والتي يمكن لأي شخص تأكيدها لأن تطبيقنا هو برنامج حر.</string>
    <string name="failedGeneratingShareURL">تعذر إنشاء عنوان URL قابل للمشاركة. الرجاء الإبلاغ عن هذا.</string>
    <string name="help_translate_this_app">ساعد في ترجمة هذا التطبيق</string>
+    <string name="action_show_details">اظهر التفاصيل</string>
    <string name="on_google_play">على Google Play</string>
    <string name="settings_theme_color">لون المظهر</string>
    <string name="previousCard">السابق</string>
@@ -273,37 +292,4 @@
    <string name="updateBalanceHint">أدخل المبلغ</string>
    <string name="storageReadPermissionRequired">الصلاحيه للوصل للتخزين مطلوبة لهذا الاجراء</string>
    <string name="validFromDate">عربيه</string>
-    <string name="cameraPermissionRequired">إذن للوصول إلى الكاميرا اللازمة لهذا الإجراء…</string>
-    <string name="anyDate">أي تاريخ</string>
-    <string name="chooseValidFromDate">اختر صالح من التاريخ</string>
-    <string name="validFromSentence">صالح من:<xliff:g>%s</xliff:g></string>
-    <string name="height">الطول:</string>
-    <string name="permissionReadCardsDescription">اقرأ بطاقتك مع جميع التفاصيل، بما فيه الملاحضات والصور</string>
-    <string name="settings_display_barcode_max_brightness_summary">ظروري لعمل بعض الماسحات الضوئية</string>
-    <string name="permissionReadCardsLabel">اقرأ بطاقات كاتيما</string>
-    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">حقوق النشر © 2019–<xliff:g>%d</xliff:g> Sylvia van Os والمساهمون</string>
-    <string name="app_copyright_short">حقوق النشر © Sylvia van Os والمساهمون</string>
-    <string name="openFrontImageInGalleryApp">افتح الصورة الأمامية في تطبيق المعرض</string>
-    <string name="show_name_below_image_thumbnail">إظهار الاسم أسفل الصورة المصغرة</string>
-    <string name="show_validity">إظهار الصلاحية</string>
-    <string name="view_online">مشاهدة حية</string>
-    <string name="settings_category_title_general">عام</string>
-    <string name="switchToBarcode">التبديل إلى الباركود</string>
-    <string name="settings_disable_lockscreen_while_viewing_card_summary">تعطيل قفل الشاشة أثناء عرض البطاقة</string>
-    <string name="action_display_options">خيارات العرض</string>
-    <string name="settings_oled_dark_summary">يقلل من استخدام البطارية على شاشات OLED</string>
-    <string name="icon_header_click_text">اضغط لفترة طويلة لتحرير الصورة المصغرة</string>
-    <string name="settings_category_title_cards">البطاقات</string>
-    <string name="show_note">إظهار الملاحظة</string>
-    <string name="switchToBackImage">التبديل إلى الصورة الخلفية</string>
-    <string name="switchToFrontImage">التبديل إلى الصورة الأمامية</string>
-    <string name="settings_allow_content_provider_read_summary">سيظل يتعين على التطبيقات طلب الإذن لمنحها حق الوصول</string>
-    <string name="setBarcodeHeight">ضبط ارتفاع الباركود</string>
-    <string name="openBackImageInGalleryApp">فتح الصورة الخلفية في تطبيق المعرض</string>
-    <string name="settings_allow_content_provider_read_title">السماح للتطبيقات الأخرى بالوصول إلى بياناتي</string>
-    <string name="donate">يتبرع</string>
-    <string name="show_archived_cards">عرض البطاقات المؤرشفة</string>
-    <string name="settings_category_title_privacy">خصوصية</string>
-    <string name="show_balance">إظهار التوازن</string>
-    <string name="settings_keep_screen_on_summary">تعطيل مهلة الشاشة أثناء عرض البطاقة</string>
 </resources>
--- a/app/src/main/res/values-ars/strings.xml
+++ b/app/src/main/res/values-ars/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
--- a/app/src/main/res/values-ast/strings.xml
+++ b/app/src/main/res/values-ast/strings.xml
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" xmlns:tools="http://schemas.android.com/tools">
-    <string name="storeName">Nome</string>
-    <string name="note">Nota</string>
-    <string name="noMatchingGiftCards">Nun hai nengún resultáu. Prueba a camudar la busca.</string>
-    <string name="barcodeType">Tipu de códigu de barres</string>
-    <string name="noBarcode">Ensin códigu de barres</string>
-    <string name="star">Meter en Favoritos</string>
-    <string name="confirm">Confirmar</string>
-    <string name="deleteConfirmation">¿Quies desaniciar esta tarxeta permanentemente\?</string>
-    <string name="importExport">Importar/Esportar</string>
-    <string name="exportFailed">Num se pudo facer la esportación</string>
-    <string name="importFailedTitle">La importación falló</string>
-    <string name="exportOptionExplanation">Los datos escríbense nel llugar qu\'escueyas.</string>
-    <string name="app_license">Software llibre llicenciao cola GPLv3+</string>
-    <string name="action_search">Buscar</string>
-    <string name="action_add">Amestar</string>
-    <plurals name="selectedCardCount">
-        <item quantity="one"><xliff:g>%d</xliff:g> na seleición</item>
-        <item quantity="other"><xliff:g>%d</xliff:g> na seleición</item>
-    </plurals>
-    <string name="noGiftCards">Calca\'l botón «+» p\'amestar una tarxeta o impórtales dende\'l menú «⋮».</string>
-    <string name="cardId">ID</string>
-    <string name="save">Guardar</string>
-    <string name="edit">Editar</string>
-    <string name="delete">Desaniciar</string>
-    <plurals name="deleteCardsTitle">
-        <item quantity="one"></item>
-        <item quantity="other"></item>
-    </plurals>
-    <string name="unstar">Quitar de Favoritos</string>
-    <string name="cancel">Encaboxar</string>
-    <string name="importFailed">Nun se pudo facer la importación</string>
-    <string name="noCardExistsError">Nun se pudo atopar esa tarxeta</string>
-    <string name="all">Too</string>
-    <string name="sendLabel">Unviar…</string>
-    <string name="editCardTitle">Editar la tarxeta</string>
-    <string name="ok">D\'acuerdu</string>
-    <string name="exportFailedTitle">La esportación falló</string>
-    <string name="noCameraPermissionDirectToSystemSetting">Pa escaniar códigos de barres, Catima tien d\'acceder a la cámara. Toca equí pa camudar la configuración de los permisos.</string>
-    <string name="debug_version_fmt">Versión: <xliff:g id="version">%s</xliff:g></string>
-    <string name="importing">Importando…</string>
-    <string name="exporting">Esportando…</string>
-    <string name="storageReadPermissionRequired">Esta aición precisa\'l permisu pa lleer l\'almacenamientu…</string>
-    <string name="cameraPermissionRequired">Esta aición precisa l\'accesu a la cámara…</string>
-    <string name="cameraPermissionDeniedTitle">Nun se pudo acceder a la cámara</string>
-    <string name="app_copyright_old">Básase en Loyalty Card Keychain
-\ncopyright © 2016–2020 Branden Archer</string>
-    <string name="thumbnailDescription">Miniatura</string>
-    <string name="settings">Configuración</string>
-    <string name="settings_theme">Estilu</string>
-</resources>
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -11,8 +11,9 @@
    <string name="unstar">Премахва от любими</string>
    <string name="star">Добавя към любими</string>
    <string name="noBarcode">Липсва щрихкод</string>
-    <string name="barcodeType">Вид на щрихкода</string>
-    <string name="cardId">Номер на карта</string>
+    <string name="barcodeNoBarcode">Липсва щрихкод</string>
+    <string name="barcodeType">Вид на щрихкод</string>
+    <string name="cardId">Идентификатор на карта</string>
    <string name="note">Бележка</string>
    <string name="storeName">Наименование</string>
    <string name="noMatchingGiftCards">Няма резултати. Променете критериите за търсене.</string>
@@ -26,6 +27,7 @@
    <string name="app_license">Свободен софтуер с авторски права, лицензиран под GPLv3+</string>
    <string name="frontImageDescription">Снимка на предната страна</string>
    <string name="backImageDescription">Снимка на задната страна</string>
+    <string name="parsingBalanceFailed"><xliff:g>%s</xliff:g> не изглежда истинска наличност.</string>
    <string name="no">Не</string>
    <string name="yes">Да</string>
    <string name="setBackImage">Снимка на задната страна</string>
@@ -33,18 +35,19 @@
    <string name="photos">Снимки</string>
    <string name="importOptionApplicationExplanation">Изберете файл на друго приложение.</string>
    <string name="noCardExistsError">Картата не е намерена</string>
-    <string name="updateBarcodeQuestionText">Номерът е променен. Желаете ли същата стойност да бъде приложена и към щрихкода\?</string>
+    <string name="updateBarcodeQuestionText">Идентификаторът е променен. Желаете ли с неговата стойност да бъде променен и щрихкодът\?</string>
    <string name="updateBarcodeQuestionTitle">Обновяване на щрихкода\?</string>
+    <string name="noCardIdError">Не е въведен идентификатор</string>
    <string name="noCardsMessage">Добавете карта</string>
    <string name="cardShortcut">Пряк път до карта</string>
    <string name="addCardTitle">Добавяне на карта</string>
    <string name="removeImage">Премахване на изображение</string>
    <string name="takePhoto">Снимане</string>
-    <string name="copy_to_clipboard_multiple_toast">Номерата са копирани в междинната памет</string>
+    <string name="copy_to_clipboard_multiple_toast">Идентификаторите са копирани в междинната памет</string>
    <string name="intent_import_card_from_url_share_multiple_text">Искам да споделя тези карти с вас</string>
-    <string name="wrongValueForBarcodeType">Неприемлива стойност за избрания вид щрихкод</string>
+    <string name="wrongValueForBarcodeType">Стойността е невалидна за избрания вид щрихкод</string>
    <string name="setBarcodeId">Задаване на стойност</string>
-    <string name="sameAsCardId">Като номера</string>
+    <string name="sameAsCardId">Същата като идентификатора</string>
    <string name="barcodeId">Стойност на щрихкода</string>
    <string name="importLoyaltyCardKeychain">Внасяне от Loyalty Card Keychain</string>
    <string name="importFidmeMessage">Изберете файла <i>fidme-export-request-xxxxxx.zip</i>, предварително изнесен от FidMe и ръчно изберете вида на щрихкодовете.
@@ -60,36 +63,42 @@
    <string name="turn_flashlight_off">Изключва светкавицата</string>
    <string name="turn_flashlight_on">Включва светкавицата</string>
    <string name="passwordRequired">Въведете паролата</string>
-    <string name="points">точки</string>
+    <string name="points">Точки</string>
    <string name="currency">Валута</string>
    <string name="balance">Наличност</string>
    <string name="errorReadingImage">Изображението е нечетимо</string>
    <string name="noBarcodeFound">Не е намерен щрихкод</string>
+    <string name="moveBarcodeToCenterOfScreen">Премества щрихкода в центъра на екрана</string>
    <string name="moveBarcodeToTopOfScreen">Премества щрихкода най-горе на екрана</string>
    <string name="never">Не изтича</string>
    <string name="chooseExpiryDate">Определена дата</string>
-    <string name="expiryDate">Валидност до</string>
+    <string name="expiryDate">Валидна до</string>
    <string name="editBarcode">Редактиране на щрихкод</string>
+    <string name="barcode">Щрихкод</string>
    <string name="card">Карта</string>
    <string name="groupsList">Списъци: <xliff:g>%s</xliff:g></string>
-    <string name="expiryStateSentence">Валидност до: <xliff:g>%s</xliff:g></string>
+    <string name="expiryStateSentence">Валидна до: <xliff:g>%s</xliff:g></string>
    <string name="expiryStateSentenceExpired">Изтекла: <xliff:g>%s</xliff:g></string>
    <string name="balanceSentence">Наличност: <xliff:g>%s</xliff:g></string>
    <string name="noGroups">Докоснете бутона +, за да добавите списък.</string>
+    <string name="noStoreError">Не е въведено наименование</string>
    <string name="groups">Списъци</string>
    <string name="enter_group_name">Въведете име на списъка</string>
    <string name="intent_import_card_from_url_share_text">Искам да споделя тази карта с вас</string>
-    <string name="settings_display_barcode_max_brightness">Максимална яркост при видим щрихкод</string>
-    <string name="settings_keep_screen_on">Без изключване на екрана</string>
-    <string name="settings_disable_lockscreen_while_viewing_card">Без заключване на екрана</string>
+    <string name="settings_display_barcode_max_brightness">Увеличаване на яркостта при видим щрихкод</string>
+    <string name="settings_keep_screen_on">Поддържане на екрана включен</string>
+    <string name="settings_disable_lockscreen_while_viewing_card">Предотвратяване на заключване на екрана</string>
+    <string name="settings_max_font_size_scale">Максимален размер на шрифта</string>
    <string name="settings_dark_theme">Тъмна</string>
    <string name="settings_light_theme">Светла</string>
    <string name="settings_system_theme">Системна</string>
    <string name="settings_theme">Тема</string>
+    <string name="settings_category_title_ui">Потребителски интерфейс</string>
    <string name="settings">Настройки</string>
    <string name="starImage">Звезда за любимо</string>
    <string name="thumbnailDescription">Миниатюра</string>
-    <string name="copy_to_clipboard_toast">Номерът е копиран в междинната памет</string>
+    <string name="copy_to_clipboard_toast">Идентификаторът е копиран в междинната памет</string>
+    <string name="enterBarcodeInstructions">Въведете идентификатор и или изберете вида на щрихкода, или докоснете бутона „Липсва щрихкод“.</string>
    <string name="selectBarcodeTitle">Избиране на щрихкод</string>
    <string name="importOptionApplicationButton">Избиране чрез приложение</string>
    <string name="importing">Внасяне…</string>
@@ -107,7 +116,7 @@
    <string name="scanCardBarcode">Снемане на щрихкод</string>
    <string name="editCardTitle">Редактиране на карта</string>
    <string name="share">Споделя</string>
-    <string name="copy_to_clipboard">Копира номера в междинната памет</string>
+    <string name="copy_to_clipboard">Копира идентификатора в междинната памет</string>
    <string name="ok">Добре</string>
    <string name="importSuccessful">Данните са внесени</string>
    <string name="chooseImportType">Внасяне на данни на</string>
@@ -118,11 +127,12 @@
    <string name="importOptionFilesystemExplanation">Изберете определен файл от файловата система.</string>
    <string name="app_resources">Свободни ресурси: <xliff:g id="app_resources_list">%s</xliff:g></string>
    <string name="app_libraries">Свободни библиотеки: <xliff:g id="app_libraries_list">%s</xliff:g></string>
+    <string name="app_revision_fmt">Компилация: <xliff:g id="app_revision_url">%s</xliff:g></string>
    <string name="debug_version_fmt">Издание: <xliff:g id="version">%s</xliff:g></string>
    <string name="about_title_fmt">Относно <xliff:g id="app_name">%s</xliff:g></string>
-    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Всички права запазени © 2019–<xliff:g>%d</xliff:g> Силвия ван Ос и сътрудници</string>
+    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Всички права запазени © 2019–<xliff:g>%d</xliff:g> Sylvia van Os</string>
    <string name="app_copyright_old">На основата на Loyalty Card Keychain
-\nвсички права запазени © 2016–2020 Бранден Арчър</string>
+\nвсички права запазени © 2016–2020 Branden Archer</string>
    <string name="about">Относно</string>
    <string name="importOptionFilesystemTitle">Внасяне от файловата система</string>
    <string name="importCatima">Внасяне от Catima</string>
@@ -173,8 +183,10 @@
    <string name="settings_locale">Език</string>
    <string name="noGroupCards">Групата е празна</string>
    <string name="barcodeImageDescriptionWithType">Изображение на щрихкод от вид <xliff:g>%s</xliff:g></string>
+    <string name="swipeToSwitchImages">За да размените изображенията - плъзнете, а за да ги отворите в галерията - задръжте</string>
    <string name="sort_by">Сортиране по</string>
    <string name="reverse">…в обратен ред</string>
+    <string name="sort_by_balance">Наличност</string>
    <string name="sort_by_expiry">Валидност</string>
    <string name="sort_by_most_recently_used">Последно използване</string>
    <string name="sort_by_name">Наименование</string>
@@ -190,37 +202,43 @@
    <string name="and_data_usage">и използване на данни</string>
    <string name="help_translate_this_app">Помогнете за превода на приложението</string>
    <string name="exportPasswordHint">Въведете парола</string>
-    <string name="exportPassword">Защитете архива с парола (по желание)</string>
-    <string name="setIcon">Задаване на миниатюра</string>
+    <string name="exportPassword">Задаване на парола за защита на изнесеното (по избор)</string>
+    <string name="setIcon">Задаване на пиктограма</string>
    <string name="editGroup">Променяне на списъка: <xliff:g>%s</xliff:g></string>
    <string name="group_name_already_in_use">Има списък с това име</string>
    <string name="group_updated">Промените са запазени</string>
    <string name="selectColor">Избиране на цвят</string>
    <string name="group_name_is_empty">Името на списъка не може да е празно</string>
    <string name="group_edit">Редактиране на списък</string>
+    <string name="action_show_details">Повече детайли</string>
+    <string name="action_hide_details">По-малко детайли</string>
    <string name="noGiftCardsGroup">Създайте карти и ги зачислите към списък от тук.</string>
    <string name="translate_platform">в Weblate</string>
    <string name="shortcutSelectCard">Избор на карта</string>
    <string name="starred">Със звезда</string>
+    <string name="set_scale">Мащаб</string>
    <string name="showMoreInfo">Показване на информация</string>
+    <string name="hideMoreInfo">Скриване на информация</string>
    <string name="options">Настройки</string>
-    <string name="card_ids_copied">Номерата са копирани</string>
+    <string name="card_ids_copied">Идентификаторите са копирани</string>
    <plurals name="balancePoints">
        <item quantity="one"><xliff:g>%s</xliff:g> точка</item>
        <item quantity="other"><xliff:g>%s</xliff:g> точки</item>
    </plurals>
-    <string name="settings_oled_dark">Черен фон за тъмната тема</string>
+    <string name="settings_oled_dark">Чисто черен фон за тъмната тема</string>
    <string name="include_if_asking_support">Ако искате да потърсите поддръжка, включете следната информация:</string>
-    <string name="settings_card_orientation">Завъртане на щрихкода</string>
+    <string name="settings_card_orientation">Положение на щрихкода</string>
    <string name="settings_follow_system_orientation">Според системата</string>
-    <string name="settings_portrait_orientation">Портрет</string>
-    <string name="settings_landscape_orientation">Пейзаж</string>
-    <string name="settings_lock_on_opening_orientation">Като при отваряне на картата</string>
+    <string name="settings_portrait_orientation">Портретно</string>
+    <string name="settings_landscape_orientation">Пейзажно</string>
+    <string name="settings_lock_on_opening_orientation">Използване на положението, използвано при отваряне на картата</string>
    <string name="duplicateCard">Дублиране</string>
    <string name="archive">Архивиране</string>
    <string name="unarchive">Изваждане от архива</string>
    <string name="archived">Картата е архивирана</string>
    <string name="unarchived">Карта е извадена от архива</string>
+    <string name="archiveList">Архив</string>
+    <string name="noUnarchivedCardsMessage">Няма карти извън архива</string>
    <string name="failedLaunchingPhotoPicker">Не е намерено поддържано приложение за галерия</string>
    <plurals name="groupCardCountWithArchived">
        <item quantity="one"><xliff:g>%1$d</xliff:g> карта (<xliff:g id="archivedCount">%2$d</xliff:g> архивирана)</item>
@@ -246,36 +264,8 @@
    <string name="importCards">Внасяне на карти</string>
    <string name="storageReadPermissionRequired">За това действие е необходимо разрешение за четене на хранилището…</string>
    <string name="cameraPermissionRequired">За това действие е необходимо разрешение за достъп до камерата…</string>
-    <string name="validFromDate">Валидност от</string>
+    <string name="validFromDate">Валидна от</string>
    <string name="anyDate">Без значение от датата</string>
-    <string name="validFromSentence">Валидност от: <xliff:g>%s</xliff:g></string>
+    <string name="validFromSentence">Валидна от: <xliff:g>%s</xliff:g></string>
    <string name="chooseValidFromDate">Определена дата</string>
-    <string name="height">Височина:</string>
-    <string name="switchToFrontImage">Показване на предната страна</string>
-    <string name="switchToBackImage">Показване на задната страна</string>
-    <string name="switchToBarcode">Показване на щрихкода</string>
-    <string name="openFrontImageInGalleryApp">Отваряне на изображението на предната страна в приложението галерия</string>
-    <string name="openBackImageInGalleryApp">Отваряне на изображението на задната страна в приложението галерия</string>
-    <string name="setBarcodeHeight">Задаване на височина на щрихкода</string>
-    <string name="donate">Даряване</string>
-    <string name="icon_header_click_text">Задръжте, за да промените миниатюрата</string>
-    <string name="show_note">Бележка</string>
-    <string name="show_balance">Баланс</string>
-    <string name="show_validity">Валидност</string>
-    <string name="show_name_below_image_thumbnail">Наименование</string>
-    <string name="permissionReadCardsLabel">Четене на карти на Catima</string>
-    <string name="permissionReadCardsDescription">четене на картите на Catima с всички подробности, включително бележки и изображения</string>
-    <string name="settings_allow_content_provider_read_title">Разрешаване на достъп на други приложения до данните</string>
-    <string name="settings_display_barcode_max_brightness_summary">Необходимо за работата на някои скенери</string>
-    <string name="settings_disable_lockscreen_while_viewing_card_summary">Без заключване на екрана при преглед на карта</string>
-    <string name="settings_allow_content_provider_read_summary">Приложенията ще искат разрешение, за да получат достъп</string>
-    <string name="settings_oled_dark_summary">Намалява разхода на батерия от OLED дисплеи</string>
-    <string name="settings_category_title_cards">Карти</string>
-    <string name="settings_category_title_general">Общи</string>
-    <string name="settings_category_title_privacy">Поверителност</string>
-    <string name="settings_keep_screen_on_summary">Спира автоматичното заключване на екрана при преглед на карти</string>
-    <string name="action_display_options">Настройки на списъка</string>
-    <string name="show_archived_cards">Архивирани карти</string>
-    <string name="view_online">Преглед</string>
-    <string name="app_copyright_short">Всички права запазени © Силвия ван Ос и сътрудници</string>
 </resources>
--- a/app/src/main/res/values-bn-rIN/strings.xml
+++ b/app/src/main/res/values-bn-rIN/strings.xml
@@ -4,6 +4,7 @@
    <string name="cancel">বাতিল</string>
    <string name="unstar">তারা মুক্ত</string>
    <string name="star">তারা</string>
+    <string name="barcodeNoBarcode">কোনো বারকোড নেই</string>
    <string name="barcodeType">বারকোড ধরন</string>
    <string name="note">বিঃদ্রঃ</string>
    <string name="storeName">দোকানের নাম</string>
@@ -20,9 +21,11 @@
    <string name="intent_import_card_from_url_share_text">url শেয়ার টেক্সট থেকে ইন্টেন্ট ইম্পোর্ট কার্ড</string>
    <string name="settings_disable_lockscreen_while_viewing_card">স্ক্রীন লক হতে দেবেন না</string>
    <string name="settings_keep_screen_on">সেটিংস পর্দা খোলা রাখুন</string>
+    <string name="settings_max_font_size_scale">সর্বোচ্চ হরফ আকার</string>
    <string name="settings_light_theme">সাদাটে থিম</string>
    <string name="settings_system_theme">যন্ত্রর থিম</string>
    <string name="settings_theme">থিম</string>
+    <string name="settings_category_title_ui">বিভাগ শিরোনাম</string>
    <string name="starImage">তারা ছবি</string>
    <string name="importCatima">ক্যাতিনা আগম</string>
    <string name="importLoyaltyCardKeychain">আমদানি লয়্যালটি কার্ড কীচেন</string>
@@ -62,12 +65,14 @@
    <string name="settings_green_theme">সবুজ থিম</string>
    <string name="settings_brown_theme">বাদামী থিম</string>
    <string name="sort">সাজান</string>
+    <string name="swipeToSwitchImages">ছবি পাল্টানোর জন্য সোয়াইপ করুন, ছবিটি গ্যালারি অ্যাপে খোলার জন্য টিপে ধড়ে থাকুন</string>
    <string name="sort_by_name">নামের দ্বারা সাজান</string>
    <string name="sort_by_most_recently_used">সর্বাধিক সম্প্রতি ব্যবহৃত দ্বারা সাজান</string>
    <string name="sort_by_expiry">মেয়াদ শেষ করে সাজান</string>
    <string name="reverse">...উল্টো ক্রমে</string>
    <string name="sort_by">ক্রমানুসার</string>
-    <string name="noCardExistsError">কার্ডটি খুঁজে পাওয়া গেল না</string>
+    <string name="noCardExistsError">কার্ডটি পাওয়া যায়নি</string>
+    <string name="noStoreError">স্টোরেজ ত্রুটি নেই</string>
    <string name="card_ids_copied">আইডি কপি করা হয়েছে</string>
    <string name="noCardsMessage">কোন কার্ড বার্তা নেই</string>
    <string name="addCardTitle">কার্ডের শিরোনাম যোগ করুন</string>
@@ -91,13 +96,15 @@
    <string name="importOptionApplicationButton">অন্য অ্যাপ ব্যাবহার করুন</string>
    <string name="moveUp">উপরে উঠান</string>
    <string name="moveDown">নিচে নামান</string>
+    <string name="barcode">বারকোড</string>
    <string name="expiryDate">মেয়াদোত্তীর্ণ তারিখ</string>
    <string name="noBarcodeFound">কোনো বারকোড পাওয়া যায়নি</string>
    <string name="cameraPermissionRequired">এই কাজটির জন্য ক্যামেরা ব্যবহার করার অনুমতি লাগবে…</string>
-    <string name="noCameraPermissionDirectToSystemSetting">বারকোড স্ক্যান করার জন্য, Catima কে ক্যামেরাটি ব্যবহার করার অনুমতি দিতে হবে। এইখানে টাচ করে আপনার অনুমতি সেটিংস পালটে নিন।</string>
-    <string name="importOptionApplicationExplanation">একটি ফাইল খোলার জন্য যেকোনো অ্যাপ বা আপনার প্রিয় ফাইল ম্যানেজারটি ব্যবহার করুন।</string>
-    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">মেধাস্বত্ব © 2019–<xliff:g>%d</xliff:g> Sylvia van Os</string>
-    <string name="app_license">কপিলেফট দ্বারা রক্ষা করা মুক্ত সফটওয়্যার, লাইসেন্স করা GPLv3+ এর অধীনে</string>
+    <string name="noCameraPermissionDirectToSystemSetting">বারকোড স্ক্যান করার জন্য, কাটিমাকে ফোনের ক্যামেরা ব্যবহার করার অনুমতি দিতে হবে। এইখানে টাচ করে আপনার অনুমতি সেটিংস পালটে নিন।</string>
+    <string name="importOptionApplicationExplanation">আপনার প্রিয় ফাইল ম্যানেজার বা আর যেকোনো অ্যাপ দিয়ে একটি ফাইল খুলুন।</string>
+    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">মেধাস্বত্ব © ২০১৯-<xliff:g>%d</xliff:g> সিলভিয়া ভান অস</string>
+    <string name="app_license">কপিলেফ্ট করা মুক্ত সফটওয়্যার, জিপিএলের ৩য় এবং তার অধিক সংস্করণে লাইসেন্স করা</string>
+    <string name="enterBarcodeInstructions">আইডিটি লিখুন আর নয় নিচ থেকে একটি বারকোডের প্রকার বা \"কোনো বারকোড নেই\", নির্বাচন করুন।</string>
    <plurals name="deleteCardsConfirmation">
        <item quantity="one">এই <xliff:g>%d</xliff:g>টি কার্ড কি চিরকালের জন্য মুছে দেবো\?</item>
        <item quantity="other">এই <xliff:g>%d</xliff:g>টি কার্ড কি চিরকালের জন্য মুছে দেবো\?</item>
@@ -110,10 +117,11 @@
        <item quantity="one"><xliff:g>%d</xliff:g>টি কার্ড মুছে ফেলুন</item>
        <item quantity="other"><xliff:g>%d</xliff:g>টি কার্ড মুছে ফেলুন</item>
    </plurals>
-    <string name="cameraPermissionDeniedTitle">ক্যামেরাটি ব্যবহার করা যাচ্ছে না</string>
-    <string name="importOptionFilesystemExplanation">স্টোরেজ থেকে নির্দিষ্ট একটি ফাইল বাছুন।</string>
+    <string name="cameraPermissionDeniedTitle">ফোনের ক্যামেরা ব্যবহার করা যাচ্ছে না</string>
+    <string name="importOptionFilesystemExplanation">ফোনের স্টোরেজ থেকে নির্দিষ্ট একটি ফাইল আনুন।</string>
    <string name="app_libraries">মুক্ত লাইব্রেরি যেগুলি আমার নয়: <xliff:g id="app_libraries_list">%s</xliff:g></string>
-    <string name="about_title_fmt"><xliff:g id="app_name">%s</xliff:g>টির সম্পর্কে</string>
+    <string name="about_title_fmt"><xliff:g id="app_name">%s</xliff:g>টির ব্যাপারে</string>
+    <string name="app_revision_fmt">সংশোধন তথ্য: <xliff:g id="app_revision_url">%s</xliff:g></string>
    <string name="app_resources">মুক্ত সম্পদ যেগুলি আমার নয়: <xliff:g id="app_resources_list">%s</xliff:g></string>
    <string name="thumbnailDescription">থাম্বনেইল</string>
    <string name="settings_card_orientation">বারকোড অভিমুখ</string>
@@ -121,28 +129,29 @@
    <string name="settings_portrait_orientation">প্রতিকৃতি</string>
    <string name="barcodeImageDescriptionWithType">ছবি <xliff:g>%s</xliff:g> বারকোড</string>
    <string name="exportName">রপ্তানি</string>
-    <string name="failedParsingImportUriError">আমদানির URI-টি বোঝা যাচ্ছে না</string>
+    <string name="failedParsingImportUriError">আমদানির ইউআরআই বোঝা যাচ্ছে না</string>
    <string name="importExport">আমদানি/রপ্তানি</string>
    <string name="cardShortcut">কার্ড শর্টকাট</string>
-    <string name="exportFailed">রপ্তানি করা যাচ্ছে না</string>
+    <string name="exportFailed">বার করা যাচ্ছে না</string>
    <string name="copy_to_clipboard_toast">আইডি ক্লিপবোর্ডে নকল করা হল</string>
-    <string name="importExportHelp">নিজের ডেটা অন্য কোথাও সংরক্ষণ করে রাখলে পরে সেটা অন্য ডিভাইসে সরিয়ে নিতে পারবেন।</string>
-    <string name="importFailed">আমদানি করা গেল না</string>
+    <string name="noCardIdError">কোনো আইডি দওয়া হয়নি</string>
+    <string name="importExportHelp">নিজের তথ্য অন্য কোথাও সংরক্ষণ করে রাখলে পরে সেটা অন্য ফোনে আবার নিয়ে নাওয়া যাই।</string>
+    <string name="importFailed">আনা যাচ্ছে না</string>
    <string name="noGiftCardsGroup">কিছু কার্ড বানান আর এই গ্রুপে স্থির করুন।</string>
    <string name="scanCardBarcode">বারকোড স্ক্যান করুন</string>
-    <string name="importSuccessfulTitle">আমদানি শেষ</string>
-    <string name="importFailedTitle">আমদানি ব্যর্থ</string>
-    <string name="exportSuccessfulTitle">রপ্তানি শেষ</string>
-    <string name="exportFailedTitle">রপ্তানি ব্যর্থ</string>
-    <string name="importing">আমদানি করা হচ্ছে…</string>
-    <string name="exporting">রপ্তানি করা হচ্ছে…</string>
+    <string name="importSuccessfulTitle">আনা শেষ</string>
+    <string name="importFailedTitle">আনা ব্যর্থ</string>
+    <string name="exportSuccessfulTitle">বার করা শেষ</string>
+    <string name="exportFailedTitle">বার করা ব্যর্থ</string>
+    <string name="importing">আনা হচ্ছে…</string>
+    <string name="exporting">বার করা হচ্ছে…</string>
    <string name="storageReadPermissionRequired">এই কাজটির জন্য ফোনের স্টোরেজ দেখার অনুমতি লাগবে…</string>
-    <string name="exportOptionExplanation">ডেটাটি আপনার পছন্দের জায়গায় রাখা হবে।</string>
-    <string name="importOptionFilesystemTitle">স্টোরেজ থেকে আমদানি করুন</string>
-    <string name="importOptionFilesystemButton">স্টোরেজ থেকে</string>
+    <string name="exportOptionExplanation">তথ্যটি আপনার পছন্দের জায়গায় রাখা হবে।</string>
+    <string name="importOptionFilesystemTitle">ফোনের স্টোরেজ থেকে আনুন</string>
+    <string name="importOptionFilesystemButton">ফোনের স্টোরেজ থেকে</string>
    <string name="importOptionApplicationTitle">অন্য অ্যাপ ব্যবহার করুন</string>
-    <string name="app_copyright_old">Loyalty Card Keychain এর উপর ভিত্তি করে
-\nমেধাস্বত্ব © 2016–2020 Branden Archer</string>
+    <string name="app_copyright_old">লয়ালটি কার্ড কিচ্যেনের উপর ভিত্তি করে
+\nমেধাস্বত্ব © ২০১৬-২০২০ ব্রানডেন আর্চার</string>
    <string name="selectBarcodeTitle">বারকোড নির্বাচন করুন</string>
    <string name="settings">সেটিংস</string>
    <string name="settings_dark_theme">অন্ধকার</string>
@@ -176,91 +185,16 @@
    <string name="balanceSentence">ব্যালেন্স: <xliff:g>%s</xliff:g></string>
    <string name="chooseExpiryDate">মেয়াদ শেষ হওয়ার তারিখ মনোনীত করুন</string>
    <string name="moveBarcodeToTopOfScreen">বারকোডটি স্ক্রিনের উপরে উঠিয়ে দিন</string>
+    <string name="moveBarcodeToCenterOfScreen">বারকোডটি স্ক্রিনের কেন্দ্রে সরিয়ে দিন</string>
    <string name="errorReadingImage">ছবিটি স্ক্যান করা যাচ্ছে না</string>
    <string name="privacy_policy_popup_text">ব্যক্তিগত তথ্যের গোপনীয়তা নীতি নোটিশ (কিছু অ্যাপ স্টোরের এটি লাগে):
 \n
 \nকোন তথ্য একেবারেই সংগ্রহ করা হয় না, যা যে কেউ নিশ্চিত করতে পারবেন কারন আমাদের অ্যাপ মুক্ত সফটওয়্যার।</string>
    <string name="balance">ব্যালান্স</string>
    <string name="points">পয়েন্ট</string>
+    <string name="parsingBalanceFailed"><xliff:g>%s</xliff:g> কোনো বৈধ ব্যালান্স মনে হচ্ছে না।</string>
    <string name="chooseImportType">এখান থেকে তথ্য আমদানি করুন</string>
    <string name="app_loyalty_card_keychain">আনুগত্য কার্ড কীচেন</string>
    <string name="privacy_policy">ব্যক্তিগত তথ্যের গোপনীয়তা নীতি</string>
    <string name="accept">গ্রহণ</string>
-    <string name="failedToRetrieveImageFile">ছবি ফাইল পুনরুদ্ধার করতে ব্যর্থ হয়েছে</string>
-    <string name="on_github">GitHub -এ</string>
-    <string name="importLoyaltyCardKeychainMessage">আমদানি করতে লয়্যালটি কার্ড কীচেন থেকে আপনার <i>LoyaltyCardKeychain.csv</i> এক্সপোর্ট নির্বাচন করুন।
-\nলয়্যালটি কার্ড কীচেনের আমদানি/রপ্তানি মেনু থেকে প্রথমে সেখানে রপ্তানি টিপে এটি তৈরি করুন।</string>
-    <string name="selectColor">রঙ নির্বাচন করুন</string>
-    <string name="unarchived">কার্ড সংরক্ষণাগারমুক্ত করা হয়েছে</string>
-    <string name="report_error">ভুল প্রতিবেদন</string>
-    <string name="failedLaunchingPhotoPicker">একটি সমর্থিত গ্যালারি অ্যাপ খুঁজে পাওয়া যায়নি</string>
-    <plurals name="groupCardCountWithArchived">
-        <item quantity="one"><xliff:g>%1$d</xliff:g> card (<xliff:g id="archivedCount">%2$d</xliff:g> archived)</item>
-        <item quantity="other"><xliff:g>%1$d</xliff:g> cards (<xliff:g id="archivedCount">%2$d</xliff:g> archived)</item>
-    </plurals>
-    <string name="nextCard">পরবর্তী</string>
-    <plurals name="viewArchivedCardsWithCount">
-        <item quantity="one">সংরক্ষণাগার দেখুন (<xliff:g>%1$d</xliff:g> কার্ড)</item>
-        <item quantity="other">সংরক্ষণাগার দেখুন (<xliff:g>%1$d</xliff:g> কার্ডগুলি)</item>
-    </plurals>
-    <string name="failedToOpenUrl">প্রথমে একটি ওয়েব ব্রাউজার ইন্সটল করুন</string>
-    <string name="newBalanceSentence">নতুন ব্যালেন্স: <xliff:g>%s</xliff:g></string>
-    <string name="chooseValidFromDate">তারিখ থেকে বৈধ নির্বাচন করুন</string>
-    <string name="validFromSentence">এর থেকে বৈধ: <xliff:g>%s</xliff:g></string>
-    <string name="version_history">সংস্করণ ইতিহাস</string>
-    <string name="credits">ক্রেডিট</string>
-    <string name="help_translate_this_app">এই অ্যাপটি অনুবাদ করতে সাহায্য করুন</string>
-    <string name="showMoreInfo">তথ্য দেখান</string>
-    <string name="app_contributors">এর দ্বারা সম্ভব হয়েছে: <xliff:g id="app_contributors">%s</xliff:g></string>
-    <string name="importCards">কার্ড আমদানি করুন</string>
-    <string name="importFidmeMessage">FidMe থেকে আমদানি করতে আপনার <i>fidme-export-request-xxxxxx.zip</i> রপ্তানি নির্বাচন করুন এবং পরে বারকোডের ধরন ম্যানুয়ালি নির্বাচন করুন।
-\nআপনার FidMe প্রোফাইল থেকে ডেটা সুরক্ষা নির্বাচন করে এবং তারপর প্রথমে আমার ডেটা বের করুন টিপে এটি তৈরি করুন।</string>
-    <string name="importCatimaMessage">ক্যাটিমা থেকে আমদানি করতে আপনার <i>catima.zip</i> রপ্তানি নির্বাচন করুন।
-\nঅন্য Catima অ্যাপের আমদানি/রপ্তানি মেনু থেকে প্রথমে সেখানে রপ্তানি টিপে এটি তৈরি করুন।</string>
-    <string name="importStocardMessage">আমদানি করতে Stocard থেকে আপনার <i>***.zip</i> এক্সপোর্ট নির্বাচন করুন।
-\nআপনার ডেটা রপ্তানির জন্য জিজ্ঞাসা করে support@stocardapp.com ই-মেইল করে এটি পান।</string>
-    <string name="importVoucherVaultMessage">আমদানি করতে ভাউচার ভল্ট থেকে আপনার <i>vouchervault.json</i> এক্সপোর্ট নির্বাচন করুন।
-\nপ্রথমে ভাউচার ভল্টে এক্সপোর্ট টিপে এটি তৈরি করুন।</string>
-    <string name="settings_oled_dark">অন্ধকার থিমের জন্য খাঁটি কালো পটভূমি</string>
-    <string name="setIcon">আইকন সেট করুন</string>
-    <string name="settings_grey_theme">ধূসর</string>
-    <string name="updateBalance">ব্যালেন্স আপডেট করুন</string>
-    <string name="barcodeLongPressMessage">গ্যালারি অ্যাপে শুধুমাত্র ছবি খোলা যাবে</string>
-    <string name="translate_platform">Weblate-এ</string>
-    <string name="on_google_play">Google Play-তে</string>
-    <string name="shortcutSelectCard">একটি কার্ড নির্বাচন করুন</string>
-    <string name="options">অপশন</string>
-    <string name="starred">তারকাচিহ্নিত</string>
-    <string name="duplicateCard">নকল</string>
-    <string name="include_if_asking_support">আপনি যদি সমর্থনের জন্য অনুরোধ করতে চান তবে নিম্নলিখিত তথ্যগুলি অন্তর্ভুক্ত করুন:</string>
-    <string name="importFidme">FidMe থেকে আমদানি করুন</string>
-    <string name="validFromDate">বৈধ হবে</string>
-    <string name="anyDate">যেকোনো তারিখ</string>
-    <string name="previousCard">আগে</string>
-    <string name="exportPassword">আপনার রপ্তানি রক্ষা করার জন্য একটি পাসওয়ার্ড সেট করুন (ঐচ্ছিক)</string>
-    <string name="exportPasswordHint">পাসওয়ার্ড লিখুন</string>
-    <string name="license">লাইসেন্স</string>
-    <string name="source_repository">Source Repository</string>
-    <string name="and_data_usage">এবং ডেটা ব্যবহার</string>
-    <string name="rate_this_app">এই অ্যাপ্লিকেশন রেট করুন</string>
-    <string name="archive">সংরক্ষণ করুন</string>
-    <string name="unarchive">সংরক্ষণাগারমুক্ত করুন</string>
-    <string name="archived">কার্ড সংরক্ষণাগারভুক্ত</string>
-    <string name="welcome">Catima-তে স্বাগতম</string>
-    <string name="updateBalanceTitle">আপনি কত খরচ করেছেন\?</string>
-    <string name="updateBalanceHint">পরিমান লিখুন</string>
-    <string name="currentBalanceSentence">বর্তমান ব্যালেন্স: <xliff:g>%s</xliff:g></string>
-    <string name="show_name_below_image_thumbnail">ছবির থাম্বনেইল এর নিচে নামটি দেখান</string>
-    <string name="show_note">নোট দেখান</string>
-    <string name="show_validity">বৈধতা দেখান</string>
-    <string name="height">উচ্চতা:</string>
-    <string name="switchToBackImage">পিছনের ছবিটিতে সুইচ করুন</string>
-    <string name="switchToFrontImage">সামনের ছবিটিতে সুইচ করুন</string>
-    <string name="switchToBarcode">বারকোডে সুইচ করুন</string>
-    <string name="openFrontImageInGalleryApp">সামনের ছবিটি গ্যালারি অ্যাপে খুলুন</string>
-    <string name="openBackImageInGalleryApp">পিছনের ছবিটি গ্যালারি অ্যাপে খুলুন</string>
-    <string name="setBarcodeHeight">বারকোডের উচ্চতা সেট করুন</string>
-    <string name="icon_header_click_text">দীর্ঘক্ষন টাচ করে থাম্বনেইল এডিট করবেন</string>
-    <string name="show_balance">ব্যালান্স দেখান</string>
-    <string name="donate">দান করুন</string>
 </resources>
--- a/app/src/main/res/values-bn/strings.xml
+++ b/app/src/main/res/values-bn/strings.xml
@@ -18,6 +18,7 @@
    <string name="sort_by_name">নাম</string>
    <string name="previousCard">পূর্ববর্তী</string>
    <string name="all">সকল</string>
+    <string name="barcode">বারকোড</string>
    <string name="never">কখনো না</string>
    <string name="currency">মুদ্রা</string>
    <string name="settings_violet_theme">বেগুনি</string>
@@ -29,6 +30,7 @@
    <string name="storeName">নাম</string>
    <string name="note">বিঃদ্রঃ</string>
    <string name="star">ফেভারিটে যোগ করুন</string>
+    <string name="barcodeNoBarcode">কোন বারকোড নেই</string>
    <string name="noBarcode">বারকোড নেই</string>
    <string name="unstar">পছন্দের তালিকা থেকে অপসারণ</string>
    <string name="cancel">বাতিল করুন</string>
@@ -51,7 +53,4 @@
    </plurals>
    <string name="deleteTitle">কার্ড মুছুন</string>
    <string name="noGiftCards">একটি কার্ড যোগ করতে + প্লাস বোতামে ক্লিক করুন বা ⋮ মেনু থেকে আমদানি করুন।</string>
-    <string name="cardShortcut">কার্ড শর্টকাট</string>
-    <string name="noCardsMessage">প্রথমে একটি কার্ড যোগ করুন</string>
-    <string name="card_ids_copied">আইডি কপি করা হয়েছে</string>
 </resources>
--- a/app/src/main/res/values-bs/strings.xml
+++ b/app/src/main/res/values-bs/strings.xml
@@ -4,6 +4,7 @@
    <string name="cancel">Odustani</string>
    <string name="unstar">Ukloni sve omiljene</string>
    <string name="star">Omiljene</string>
+    <string name="barcodeNoBarcode">Ne postoji barkod</string>
    <string name="barcodeType">Barcode tip</string>
    <string name="note">Bilježnica</string>
    <string name="storeName">Ime</string>
@@ -20,9 +21,11 @@
    <string name="intent_import_card_from_url_share_text">Želim podijeliti čestitku s tobom</string>
    <string name="settings_disable_lockscreen_while_viewing_card">Spriječi zaključavanje ekrana</string>
    <string name="settings_keep_screen_on">Zadrži ekran</string>
+    <string name="settings_max_font_size_scale">Max. veliäťina fonta</string>
    <string name="settings_light_theme">Svjetlo</string>
    <string name="settings_system_theme">Sistem</string>
    <string name="settings_theme">Tema</string>
+    <string name="settings_category_title_ui">Korisničko okruženje</string>
    <string name="starImage">Omiljena zvijezda</string>
    <string name="importCatima">Uvezi iz Catima</string>
    <string name="importLoyaltyCardKeychain">Uvezi iz Loyalty Card Keychain</string>
@@ -62,12 +65,14 @@
    <string name="settings_green_theme">Zeleno</string>
    <string name="settings_brown_theme">Braun</string>
    <string name="sort">Poništi sortiranje</string>
+    <string name="swipeToSwitchImages">Swipe ili long press za prebacivanje slika</string>
    <string name="sort_by_name">Ime</string>
    <string name="sort_by_most_recently_used">Nedavno Korišten</string>
    <string name="sort_by_expiry">Sajam</string>
    <string name="reverse">Rikverc</string>
    <string name="sort_by">Sortiraj</string>
    <string name="noCardExistsError">Nisam mogao pronaći tu karticu</string>
+    <string name="noStoreError">Nije uneseno ime</string>
    <string name="card_ids_copied">Kopiran ID/ovi</string>
    <string name="noCardsMessage">Dodaj prvo kartu</string>
    <string name="addCardTitle">Dodaj Kartu</string>
@@ -91,6 +96,7 @@
    <string name="exportFailedTitle">Izvoz neuspješan</string>
    <string name="scanCardBarcode">Skeniraj barkod</string>
    <string name="cardShortcut">Prečica kartice</string>
+    <string name="noCardIdError">ID nije unesen</string>
    <string name="failedParsingImportUriError">Nisam uspio parsirati URI za uvoz</string>
    <string name="importExport">Uvoz/Izvoz</string>
    <string name="exportName">Izvoz</string>
@@ -107,4 +113,4 @@
    <string name="importOptionApplicationExplanation">Koristi bilo koju aplikaciju ili Vašu omiljenu aplikaciju da bi otvorili file.</string>
    <string name="importOptionApplicationButton">Koristi drugu aplikaciju</string>
    <string name="about">O</string>
-</resources>
+</resources>
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -13,5 +13,4 @@
    <string name="deleteTitle">Elimina la targeta</string>
    <string name="welcome">Benvingut a Catima</string>
    <string name="noGiftCards">Cliqueu el botó + més per afegir una targeta, o importeu-ne des del ⋮ menú.</string>
-    <string name="photos">Fotos</string>
 </resources>
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -1,21 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" xmlns:tools="http://schemas.android.com/tools">
    <string name="action_add">Přidat</string>
-    <string name="noGiftCards">Klepněte na tlačítko Plus (+) pro přidání karty nebo naimportujete karty z nabídky (⋮).</string>
+    <string name="noGiftCards">Klepněte na tlačítko + plus pro přidání karty nebo naimportujete karty z nabídky ⋮.</string>
    <string name="storeName">Název</string>
    <string name="note">Poznámka</string>
    <string name="cardId">ID karty</string>
    <string name="cancel">Zrušit</string>
    <string name="save">Uložit</string>
-    <string name="edit">Upravit</string>
+    <string name="edit">Editovat</string>
    <string name="delete">Smazat</string>
    <string name="confirm">Potvrdit</string>
-    <string name="ok">OK</string>
+    <string name="ok">Ano</string>
    <string name="copy_to_clipboard">Kopírovat ID do schránky</string>
    <string name="sendLabel">Odeslat…</string>
    <string name="editCardTitle">Editovat kartu</string>
    <string name="addCardTitle">Přidat kartu</string>
-    <string name="scanCardBarcode">Naskenovat čárový kód</string>
+    <string name="scanCardBarcode">Skenování čárového kódu</string>
+    <string name="noStoreError">Nezadáno žádné jméno</string>
+    <string name="noCardIdError">Nezadáno ID</string>
    <string name="importExport">Import/Export</string>
    <string name="exportName">Export</string>
    <string name="importExportHelp">Zálohování dat vám umožní přesunout je do jiného zařízení.</string>
@@ -27,41 +29,45 @@
    <string name="exportFailed">Export nelze provést</string>
    <string name="importing">Importuji…</string>
    <string name="exporting">Exportuji…</string>
-    <string name="importOptionFilesystemTitle">Import z úložiště</string>
+    <string name="importOptionFilesystemTitle">Import ze souborového systému</string>
    <string name="importOptionFilesystemExplanation">Vyberte konkrétní soubor v úložišti.</string>
-    <string name="importOptionFilesystemButton">Z úložiště</string>
-    <string name="importOptionApplicationTitle">Přes jinou aplikaci</string>
+    <string name="importOptionFilesystemButton">Ze souborového systému</string>
+    <string name="importOptionApplicationTitle">Použitím jiné aplikace</string>
    <string name="importOptionApplicationExplanation">K otevření souboru použijte libovolnou aplikaci nebo svého oblíbeného správce souborů.</string>
    <string name="importOptionApplicationButton">Použít jinou aplikaci</string>
    <string name="about">O aplikaci</string>
    <string name="app_license">Copyleftovaný svobodný software s licencí GPLv3+</string>
    <string name="about_title_fmt">O aplikaci <xliff:g id="app_name">%s</xliff:g></string>
    <string name="debug_version_fmt">Verze: <xliff:g id="version">%s</xliff:g></string>
+    <string name="app_revision_fmt">Informace o revizi: <xliff:g id="app_revision_url">%s</xliff:g></string>
    <string name="selectBarcodeTitle">Vyberte čárový kód</string>
    <string name="copy_to_clipboard_toast">ID zkopírováno do schránky</string>
    <string name="deleteTitle">Smazat kartu</string>
    <string name="deleteConfirmation">Opravdu chcete smazat tuto kartu\?</string>
+    <string name="moveBarcodeToCenterOfScreen">Vycentrovat čárový kód na obrazovce</string>
    <string name="moveBarcodeToTopOfScreen">Přesunout čárový kód do horní části obrazovky</string>
    <string name="chooseExpiryDate">Zvolte datum vypršení platnosti</string>
    <string name="never">Nikdy</string>
    <string name="expiryDate">Vypršení platnosti</string>
    <string name="editBarcode">Upravit čárový kód</string>
+    <string name="barcode">Kód</string>
    <string name="app_resources">Svobodné zdroje třetích stran: <xliff:g id="app_resources_list">%s</xliff:g></string>
    <string name="app_libraries">Svobodné knihovny třetích stran: <xliff:g id="app_libraries_list">%s</xliff:g></string>
    <string name="app_copyright_old">Založeno na Loyalty Card Keychain
 \ncopyright © 2016–2020 Branden Archer</string>
    <string name="exportOptionExplanation">Data budou zapsána na místo podle vašeho výběru.</string>
-    <string name="failedParsingImportUriError">Nelze zpracovat URI importu</string>
-    <string name="noCardExistsError">Tuto kartu nelze najít</string>
+    <string name="failedParsingImportUriError">Nelze analyzovat importovanou URI</string>
+    <string name="noCardExistsError">Takovou kartu nelze najít</string>
    <string name="noCardsMessage">Nejprve přidejte kartu</string>
    <string name="cardShortcut">Zástupce karty</string>
    <string name="share">Sdílet</string>
    <string name="unstar">Odebrat z oblíbených</string>
    <string name="star">Přidat do oblíbených</string>
    <string name="noBarcode">Žádný čárový kód</string>
+    <string name="barcodeNoBarcode">Tato karta nemá čárový kód</string>
    <string name="barcodeType">Typ čárového kódu</string>
-    <string name="noMatchingGiftCards">Nic nenalezeno. Zkuste zadat jiný výraz.</string>
-    <string name="action_search">Hledat</string>
+    <string name="noMatchingGiftCards">Nic nenalezeno. Zkuste změnit vyhledávání.</string>
+    <string name="action_search">Vyhledávání</string>
    <string name="thumbnailDescription">Miniatura</string>
    <string name="card_ids_copied">ID zkopírováno</string>
    <plurals name="deleteCardsConfirmation">
@@ -76,12 +82,14 @@
    </plurals>
    <string name="importSuccessful">Data importována</string>
    <string name="intent_import_card_from_url_share_text">Chci s Vámi sdílet kartu</string>
-    <string name="settings_disable_lockscreen_while_viewing_card">Nezamykat obrazovku</string>
-    <string name="settings_keep_screen_on">Nevypínat obrazovku</string>
+    <string name="settings_disable_lockscreen_while_viewing_card">Bránit uzamykání obrazovky</string>
+    <string name="settings_keep_screen_on">Udržovat obrazovku zapnutou</string>
+    <string name="settings_max_font_size_scale">Maximální velikost písma</string>
    <string name="settings_dark_theme">Tmavý</string>
    <string name="settings_light_theme">Světlý</string>
    <string name="settings_system_theme">Podle systému</string>
-    <string name="settings_theme">Motiv</string>
+    <string name="settings_theme">Vzhled</string>
+    <string name="settings_category_title_ui">Uživatelské rozhraní</string>
    <string name="settings">Nastavení</string>
    <string name="card">Karta</string>
    <string name="balanceSentence">Zůstatek: <xliff:g>%s</xliff:g></string>
@@ -89,6 +97,7 @@
    <string name="expiryStateSentence">Platí do: <xliff:g>%s</xliff:g></string>
    <string name="moveDown">Přesunout dolů</string>
    <string name="moveUp">Přesunout nahoru</string>
+    <string name="enterBarcodeInstructions">Zadejte ID a níže vyberte typ čárového kódu nebo „Tato karta nemá čárový kód“.</string>
    <string name="settings_brown_theme">Hnědá</string>
    <string name="settings_grey_theme">Šedá</string>
    <string name="settings_green_theme">Zelená</string>
@@ -145,6 +154,7 @@
    <string name="privacy_policy">Zásady soukromí</string>
    <string name="app_loyalty_card_keychain">Loyalty Card Keychain</string>
    <string name="chooseImportType">Importovat data z</string>
+    <string name="parsingBalanceFailed"><xliff:g>%s</xliff:g> se nezdá být platným zůstatkem.</string>
    <string name="points">Body</string>
    <string name="currency">Měna</string>
    <string name="balance">Zůstatek</string>
@@ -167,8 +177,9 @@
    <string name="groups">Skupiny</string>
    <string name="enter_group_name">Zadejte název skupiny</string>
    <string name="exportSuccessful">Data exportována</string>
-    <string name="settings_display_barcode_max_brightness">Vysoký jas při zobrazení čárového kódu</string>
-    <string name="starImage">Hvězdička u oblíbených</string>
+    <string name="settings_display_barcode_max_brightness">Rozjasněné zobrazení čárového kódu</string>
+    <string name="starImage">Oblíbená hvězda</string>
+    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Copyright © 2019–<xliff:g>%d</xliff:g> Sylvia van Os</string>
    <plurals name="selectedCardCount">
        <item quantity="one">Vybrána <xliff:g>%d</xliff:g> karta</item>
        <item quantity="few">Vybrány <xliff:g>%d</xliff:g> karty</item>
@@ -178,9 +189,11 @@
    <string name="noGroupCards">Tato skupina je prázdná</string>
    <string name="sort_by">Seřadit podle</string>
    <string name="reverse">…v obráceném pořadí</string>
+    <string name="sort_by_balance">Zůstatek</string>
    <string name="sort_by_expiry">Vypršení</string>
    <string name="sort_by_most_recently_used">Naposledy použité</string>
    <string name="sort_by_name">Název</string>
+    <string name="swipeToSwitchImages">Přejetím přepínáte obrázky, dlouhým stisknutím otevřete obrázek v aplikaci pro galerii</string>
    <string name="sort">Seřadit</string>
    <string name="barcodeImageDescriptionWithType">Obrázek čárového kódu <xliff:g>%s</xliff:g></string>
    <string name="version_history">Historie verzí</string>
@@ -196,7 +209,7 @@
    <string name="exportPassword">Nastavení hesla pro ochranu exportu (volitelné)</string>
    <string name="exportPasswordHint">Zadejte heslo</string>
    <string name="selectColor">Vybrat barvu</string>
-    <string name="setIcon">Nastavit miniaturu</string>
+    <string name="setIcon">Nastavit ikonu</string>
    <string name="group_edit">Upravit skupinu</string>
    <string name="group_name_already_in_use">Název skupiny je již použitý</string>
    <string name="group_name_is_empty">Název skupiny nemůže být prázdný</string>
@@ -204,9 +217,13 @@
    <string name="editGroup">Úprava skupiny: <xliff:g>%s</xliff:g></string>
    <string name="noGiftCardsGroup">Zatím nemáte žádné věrnostní karty. Jakmile nějaké přidáte, můžete je zde přiřadit do skupiny.</string>
    <string name="shortcutSelectCard">Vybrat kartu</string>
+    <string name="action_show_details">Zobrazit detaily</string>
+    <string name="action_hide_details">Skrýt detaily</string>
    <string name="translate_platform">na Weblate</string>
    <string name="showMoreInfo">Zobrazit podrobnosti</string>
+    <string name="hideMoreInfo">Skrýt podrobnosti</string>
    <string name="starred">S hvězdičkou</string>
+    <string name="set_scale">Nastavení měřítka</string>
    <string name="options">Volby</string>
    <plurals name="balancePoints">
        <item quantity="one"><xliff:g>%s</xliff:g> bod</item>
@@ -215,11 +232,13 @@
    </plurals>
    <string name="settings_oled_dark">Čistě černé pozadí pro tmavý motiv</string>
    <string name="include_if_asking_support">Pokud chcete požádat o podporu, uveďte následující informace:</string>
-    <string name="settings_follow_system_orientation">Podle orientace systému</string>
+    <string name="settings_follow_system_orientation">Následovat systém</string>
    <string name="settings_portrait_orientation">Na výšku</string>
-    <string name="settings_lock_on_opening_orientation">Ponechat orientaci jako při otevření karty</string>
+    <string name="settings_lock_on_opening_orientation">Zamknout podle orientace použité při otevření karty</string>
    <string name="archive">Archivovat</string>
    <string name="unarchive">Vrátit z archivu</string>
+    <string name="archiveList">Archiv</string>
+    <string name="noUnarchivedCardsMessage">Nejsou žádné karty vrácené z archivu</string>
    <string name="unarchived">Karta vrácena z archivu</string>
    <string name="settings_card_orientation">Orientace čárového kódu</string>
    <string name="settings_landscape_orientation">Na šířku</string>
@@ -256,33 +275,4 @@
    <string name="anyDate">Jakékoliv datum</string>
    <string name="chooseValidFromDate">Vyberte datum počátku platnosti</string>
    <string name="validFromSentence">Platnost od: <xliff:g>%s</xliff:g></string>
-    <string name="height">Výška:</string>
-    <string name="switchToFrontImage">Přepnout na přední obrázek</string>
-    <string name="switchToBackImage">Přepnout na zadní obrázek</string>
-    <string name="switchToBarcode">Přepnout na čárový kód</string>
-    <string name="openFrontImageInGalleryApp">Otevřít přední obrázek v galerii</string>
-    <string name="openBackImageInGalleryApp">Otevřít zadní obrázek v galerii</string>
-    <string name="setBarcodeHeight">Nastavit výšku čárového kódu</string>
-    <string name="donate">Přispět</string>
-    <string name="icon_header_click_text">Dlouhým stisknutím miniaturu upravíte</string>
-    <string name="show_name_below_image_thumbnail">Zobrazit název pod obrázkem miniatury</string>
-    <string name="show_note">Zobrazit poznámku</string>
-    <string name="show_validity">Zobrazit platnost</string>
-    <string name="show_balance">Zobrazit zůstatek</string>
-    <string name="permissionReadCardsDescription">číst vaše karty Catima a všechny jejich podrobnosti, včetně poznámek a obrázků</string>
-    <string name="settings_allow_content_provider_read_summary">Aplikace budou i tak muset požádat o povolení k poskytnutí přístupu</string>
-    <string name="permissionReadCardsLabel">Číst karty Catima</string>
-    <string name="settings_allow_content_provider_read_title">Umožnit ostatním aplikacím přístup k mým datům</string>
-    <string name="settings_keep_screen_on_summary">Při prohlížení karty vypnout časovač zhasnutí obrazovky</string>
-    <string name="settings_oled_dark_summary">Snižuje používání baterie na displejích OLED</string>
-    <string name="settings_category_title_privacy">Soukromí</string>
-    <string name="settings_display_barcode_max_brightness_summary">U některých čteček je to potřeba</string>
-    <string name="settings_disable_lockscreen_while_viewing_card_summary">Při prohlížení karty zabránit zamčení obrazovky</string>
-    <string name="settings_category_title_cards">Karty</string>
-    <string name="settings_category_title_general">Obecné</string>
-    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Copyright © 2019–<xliff:g>%d</xliff:g> Sylvia van Os a přispěvatelé</string>
-    <string name="app_copyright_short">Copyright © Sylvia van Os a přispěvatelé</string>
-    <string name="action_display_options">Možnosti zobrazení</string>
-    <string name="show_archived_cards">Zobrazovat archivované karty</string>
-    <string name="view_online">Zobrazovat online</string>
 </resources>
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -21,6 +21,7 @@
    <string name="unstar">Fjern fra favoritter</string>
    <string name="star">Føj til favoritter</string>
    <string name="noBarcode">Ingen stregkode</string>
+    <string name="barcodeNoBarcode">Dette kort har ingen stregkode</string>
    <string name="barcodeType">Stregkode type</string>
    <string name="cardId">Kort ID</string>
    <string name="note">Bemærk</string>
@@ -47,10 +48,12 @@
    <string name="settings_dark_theme">Mørk</string>
    <string name="settings_light_theme">Lys</string>
    <string name="settings_theme">Tema</string>
+    <string name="settings_category_title_ui">Brugergrænseflade</string>
    <string name="settings">Indstillinger</string>
    <string name="starImage">Favorit stjerne</string>
    <string name="thumbnailDescription">Miniaturebillede til kort</string>
    <string name="copy_to_clipboard_toast">Kort-ID kopieret til udklipsholderen</string>
+    <string name="enterBarcodeInstructions">Indtast kortets ID, og vælg enten kortets stregkodetype nedenfor, eller \"Dette kort har ingen stregkode\".</string>
    <string name="selectBarcodeTitle">Vælg stregkode</string>
    <string name="app_copyright_old">Baseret på Loyalty Card Keychain
 \ncopyright © 2016-2020 Branden Archer.</string>
@@ -66,6 +69,8 @@
    <string name="exportOptionExplanation">Dataene skrives til en placering efter eget valg.</string>
    <string name="failedParsingImportUriError">Kunne ikke analysere import-URI\'en</string>
    <string name="noCardExistsError">Kunne ikke finde kort</string>
+    <string name="noCardIdError">Der er ikke angivet noget kort-ID</string>
+    <string name="noStoreError">Intet navn angivet</string>
    <string name="deleteConfirmationGroup">Slet gruppe\?</string>
    <string name="all">Alle</string>
    <string name="noGroupCards">Denne gruppe indeholder ikke nogen kort</string>
@@ -84,4 +89,4 @@
    <string name="moveDown">Bevæger sig nedad</string>
    <string name="leaveWithoutSaveTitle">Afslut</string>
    <string name="addManually">Indtast kort-ID manuelt</string>
-</resources>
+</resources>
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -22,6 +22,8 @@
    <string name="scanCardBarcode">Barcode scannen</string>
    <string name="cardShortcut">Shortcut zu einer Karte</string>
    <string name="noCardsMessage">Füge zuerst eine Karte hinzu</string>
+    <string name="noStoreError">Kein Name eingegeben</string>
+    <string name="noCardIdError">Keine ID eingegeben</string>
    <string name="noCardExistsError">Diese Karte konnte nicht gefunden werden</string>
    <string name="importExport">Import/Export</string>
    <string name="exportName">Export</string>
@@ -44,10 +46,12 @@
    <string name="app_license">Freie Software, lizensiert unter der GPLv3+</string>
    <string name="about_title_fmt">Über <xliff:g id="app_name">%s</xliff:g></string>
    <string name="debug_version_fmt">Version: <xliff:g id="version">%s</xliff:g></string>
+    <string name="app_revision_fmt">Revisionsinfo: <xliff:g id="app_revision_url">%s</xliff:g></string>
    <string name="selectBarcodeTitle">Barcode auswählen</string>
    <string name="copy_to_clipboard_toast">ID in die Zwischenablage kopiert</string>
    <string name="thumbnailDescription">Vorschaubild</string>
    <string name="settings">Einstellungen</string>
+    <string name="settings_category_title_ui">Benutzeroberfläche</string>
    <string name="settings_display_barcode_max_brightness">Displayhelligkeit in der Barcodeansicht erhöhen</string>
    <string name="exportSuccessful">Daten exportiert</string>
    <string name="importSuccessful">Daten importiert</string>
@@ -56,11 +60,13 @@
    <string name="settings_light_theme">Hell</string>
    <string name="settings_system_theme">System</string>
    <string name="settings_theme">Farbschema</string>
+    <string name="enterBarcodeInstructions">Gib die ID ein und wähle unten entweder einen Barcodetyp oder „Es gibt keinen Barcode“.</string>
    <string name="app_copyright_old">Basierend auf Loyalty Card Keychain
 \nCopyright © 2016-2020 Branden Archer</string>
    <string name="exportOptionExplanation">Die Daten werden an einen Ort deiner Wahl geschrieben.</string>
    <string name="failedParsingImportUriError">Die Import-URI konnte nicht verarbeitet werden</string>
    <string name="share">Teilen</string>
+    <string name="barcodeNoBarcode">Es gibt keinen Barcode</string>
    <string name="barcodeType">Barcodetyp</string>
    <string name="starImage">Favoritenstern</string>
    <string name="deleteConfirmationGroup">Gruppe löschen?</string>
@@ -83,14 +89,17 @@
    <string name="groupsList">Gruppen: <xliff:g>%s</xliff:g></string>
    <string name="app_loyalty_card_keychain">Loyalty Card Keychain</string>
    <string name="chooseImportType">Daten importieren aus</string>
+    <string name="parsingBalanceFailed"><xliff:g>%s</xliff:g> scheint kein gültiges Guthaben zu sein.</string>
    <string name="points">Punkte</string>
    <string name="currency">Währung</string>
    <string name="balance">Guthaben</string>
+    <string name="moveBarcodeToCenterOfScreen">Barcode auf dem Bildschirm zentrieren</string>
    <string name="moveBarcodeToTopOfScreen">Barcode auf dem Bildschirm oben fixieren</string>
    <string name="chooseExpiryDate">Ablaufdatum wählen</string>
    <string name="never">Nie</string>
    <string name="expiryDate">Ablaufdatum</string>
    <string name="editBarcode">Barcode ändern</string>
+    <string name="barcode">Strichcode</string>
    <string name="card">Karte</string>
    <string name="balanceSentence">Guthaben: <xliff:g>%s</xliff:g></string>
    <string name="expiryStateSentenceExpired">Abgelaufen: <xliff:g>%s</xliff:g></string>
@@ -120,10 +129,12 @@
    <string name="errorReadingImage">Bildverarbeitung fehlgeschlagen</string>
    <string name="noBarcodeFound">Kein Barcode erkannt</string>
    <string name="addFromImage">Bild aus der Galerie wählen</string>
+    <string name="settings_max_font_size_scale">Maximale Schriftgröße</string>
    <string name="unsupportedBarcodeType">Dieser Barcodetyp kann noch nicht angezeigt werden. Wir hoffen das Format in einer zukünftigen Version zu unterstützen.</string>
    <string name="wrongValueForBarcodeType">Der Wert ist für den gewählten Barcodetyp leider nicht gültig</string>
    <string name="app_resources">Freie Ressourcen von Drittanbietern: <xliff:g id="app_resources_list">%s</xliff:g></string>
    <string name="app_libraries">Freie Bibliotheken von Drittanbietern: <xliff:g id="app_libraries_list">%s</xliff:g></string>
+    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Copyright © 2019–<xliff:g>%d</xliff:g> Sylvia van Os</string>
    <string name="intent_import_card_from_url_share_multiple_text">Ich möchte diese Karten mit dir teilen</string>
    <string name="copy_to_clipboard_multiple_toast">Kartennummern in die Zwischenablage kopiert</string>
    <string name="card_ids_copied">ID(s) kopiert</string>
@@ -173,8 +184,10 @@
    <string name="settings_theme_color">Designfarbe</string>
    <string name="app_contributors">Ermöglicht durch: <xliff:g id="app_contributors">%s</xliff:g></string>
    <string name="barcodeImageDescriptionWithType">Bild <xliff:g>%s</xliff:g> Barcode</string>
+    <string name="swipeToSwitchImages">Wischen zum Wechseln der Bilder, Halten zum Öffnen des Bildes in der Galerie</string>
    <string name="sort_by">Sortieren nach</string>
-    <string name="sort_by_expiry">Ablauf</string>
+    <string name="sort_by_balance">Kontostand</string>
+    <string name="sort_by_expiry">Ablaufdatum</string>
    <string name="sort_by_most_recently_used">Zuletzt verwendet</string>
    <string name="sort_by_name">Name</string>
    <string name="sort">Sortieren</string>
@@ -197,11 +210,15 @@
    <string name="editGroup">Gruppe wird bearbeitet: <xliff:g>%s</xliff:g></string>
    <string name="group_edit">Gruppe bearbeiten</string>
    <string name="noGiftCardsGroup">Erstelle einige Karten und ordne sie dann hier der Gruppe zu.</string>
-    <string name="setIcon">Vorschau setzen</string>
+    <string name="setIcon">Symbol einstellen</string>
    <string name="selectColor">Farbe auswählen</string>
+    <string name="action_show_details">Details anzeigen</string>
+    <string name="action_hide_details">Details ausblenden</string>
    <string name="translate_platform">auf Weblate</string>
    <string name="shortcutSelectCard">Wählen Sie eine Karte</string>
    <string name="options">Optionen</string>
+    <string name="hideMoreInfo">Infos ausblenden</string>
+    <string name="set_scale">Größe festlegen</string>
    <string name="showMoreInfo">Infos anzeigen</string>
    <string name="starred">als Favorit</string>
    <plurals name="balancePoints">
@@ -212,6 +229,8 @@
    <string name="include_if_asking_support">Wenn Sie Unterstützung anfordern möchten, geben Sie bitte die folgenden Informationen an:</string>
    <string name="settings_follow_system_orientation">System folgen</string>
    <string name="settings_landscape_orientation">Landschaft</string>
+    <string name="archiveList">Archiv</string>
+    <string name="noUnarchivedCardsMessage">Es gibt keine nicht archivierten Karten</string>
    <string name="settings_portrait_orientation">Porträt</string>
    <string name="duplicateCard">Duplizieren</string>
    <string name="unarchive">Archivierung aufheben</string>
@@ -249,33 +268,4 @@
    <string name="validFromSentence">Gültig ab: <xliff:g>%s</xliff:g></string>
    <string name="chooseValidFromDate">Gültig-ab-Datum wählen</string>
    <string name="anyDate">Beliebiges Datum</string>
-    <string name="icon_header_click_text">Langes Drücken zum Bearbeiten der Vorschau</string>
-    <string name="switchToBarcode">Umschalten auf Barcode</string>
-    <string name="openFrontImageInGalleryApp">Vorderes Bild in der Galerie öffnen</string>
-    <string name="openBackImageInGalleryApp">Hinteres Bild in der Galerie öffnen</string>
-    <string name="height">Höhe:</string>
-    <string name="switchToFrontImage">Zum vorderen Bild wechseln</string>
-    <string name="switchToBackImage">Zum hinteren Bild wechseln</string>
-    <string name="setBarcodeHeight">Barcode-Höhe einstellen</string>
-    <string name="donate">Spenden</string>
-    <string name="show_note">Notiz anzeigen</string>
-    <string name="show_balance">Betrag anzeigen</string>
-    <string name="show_validity">Gültigkeitsdauer anzeigen</string>
-    <string name="show_name_below_image_thumbnail">Namen unter Bildvorschau anzeigen</string>
-    <string name="settings_allow_content_provider_read_title">Anderen Anwendungen den Zugriff auf meine Daten gestatten</string>
-    <string name="permissionReadCardsLabel">Catima-Karten lesen</string>
-    <string name="permissionReadCardsDescription">Lesen Sie Ihre Karten mit allen Details, einschließlich Notizen und Bildern</string>
-    <string name="settings_allow_content_provider_read_summary">Anwendungen müssen weiterhin eine Genehmigung beantragen, um Zugriff zu erhalten</string>
-    <string name="settings_display_barcode_max_brightness_summary">Erforderlich für das Funktionieren einiger Scanner</string>
-    <string name="settings_keep_screen_on_summary">Deaktiviert die Bildschirmzeitüberschreitung beim Anzeigen einer Karte</string>
-    <string name="settings_disable_lockscreen_while_viewing_card_summary">Deaktiviert die Bildschirmsperre während der Anzeige einer Karte</string>
-    <string name="settings_oled_dark_summary">Reduziert den Batterieverbrauch bei OLED-Displays</string>
-    <string name="settings_category_title_cards">Karten</string>
-    <string name="settings_category_title_privacy">Datenschutz</string>
-    <string name="settings_category_title_general">Allgemein</string>
-    <string name="view_online">Zeige online</string>
-    <string name="action_display_options">Anzeigeoptionen</string>
-    <string name="show_archived_cards">Zeige archivierte Karten</string>
-    <string name="app_copyright_short">Copyright © Sylvia van Os und Mitwirkende</string>
-    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Copyright © 2019–<xliff:g>%d</xliff:g> Sylvia van Os und Mitwirkende</string>
 </resources>
--- a/app/src/main/res/values-el-rGR/strings.xml
+++ b/app/src/main/res/values-el-rGR/strings.xml
@@ -18,6 +18,8 @@
    <string name="scanCardBarcode">Σαρώστε τον γραμμοκώδικα (bardcode)</string>
    <string name="cardShortcut">Συντόμευση Κάρτας</string>
    <string name="noCardsMessage">Προσθέστε μία κάρτα πρώτα</string>
+    <string name="noStoreError">Δεν έχει εισαχθεί όνομα</string>
+    <string name="noCardIdError">Δεν έχει εισαχθεί κωδικός</string>
    <string name="noCardExistsError">Δεν ήταν δυνατό να εντοπιστεί η κάρτα</string>
    <string name="importExport">Εισαγωγή/Εξαγωγή</string>
    <string name="exportName">Εξαγωγή</string>
@@ -40,13 +42,16 @@
    <string name="app_license">Άδεια χρήσης υπό GPLv3+</string>
    <string name="about_title_fmt">Σχετικά με <xliff:g id="app_name">%s</xliff:g></string>
    <string name="debug_version_fmt">Έκδοση: <xliff:g id="version">%s</xliff:g></string>
+    <string name="app_revision_fmt">Πληροφορίες Αναθεώρησης: <xliff:g id="app_revision_url">%s</xliff:g></string>
    <string name="selectBarcodeTitle">Επιλέξτε Barcode</string>
    <string name="copy_to_clipboard_toast">Ο κωδικός αντιγράφτηκε στο πρόχειρο</string>
    <string name="thumbnailDescription">Μικρογραφία</string>
    <string name="settings">Ρυθμίσεις</string>
+    <string name="settings_category_title_ui">Διεπαφή χρήστη</string>
    <string name="settings_dark_theme">Σκοτεινό</string>
    <string name="settings_light_theme">Φωτεινό</string>
    <string name="settings_system_theme">Σύστημα</string>
+    <string name="barcode">Γραμμικός κώδικας</string>
    <string name="deleteTitle">Διαγραφή Κάρτας</string>
    <string name="deleteConfirmation">Μόνιμη διαγραφή της κάρτας;</string>
    <string name="action_search">Αναζήτηση</string>
@@ -56,6 +61,7 @@
        <item quantity="other"><xliff:g>%d</xliff:g> επιλέγχθηκαν</item>
    </plurals>
    <string name="noGiftCardsGroup">Δημιούργησε κάρτες και βάλτες σε αυτή την ομάδα.</string>
+    <string name="barcodeNoBarcode">Δεν υπάρχει barcode</string>
    <string name="addManually">Χειροκίνητη εισαγωγή κωδικού</string>
    <string name="never">Ποτέ</string>
    <string name="share">Κοινοποίηση</string>
@@ -78,6 +84,8 @@
    <string name="expiryDate">Ημερομηνία λήξης</string>
    <string name="settings_keep_screen_on">Κράτα την οθόνη ανοιχτή</string>
    <string name="leaveWithoutSaveTitle">Έξοδος</string>
+    <string name="swipeToSwitchImages">Σύρετε για να αλλάξετε εικόνες, κρατήστε για να ανοίξετε μια εικόνα στην συλλογή</string>
+    <string name="sort_by_balance">Υπόλοιπο</string>
    <string name="reverse">... σε αντίθετη σειρά</string>
    <string name="version_history">Ιστορικό έκδοσης</string>
    <string name="sort_by">Ταξινόμηση κατά</string>
@@ -89,6 +97,7 @@
    <string name="report_error">Αναφορά Σφάλματος</string>
    <string name="starred">Αγαπημένα</string>
    <string name="translate_platform">στο Weblate</string>
+    <string name="set_scale">Ορίστε κλίμακα</string>
    <string name="importLoyaltyCardKeychain">Εισαγωγή από Loyalty Card Keychain</string>
    <string name="importLoyaltyCardKeychainMessage">Επιλέξτε την <i>LoyaltyCardKeychain.csv</i> εξαγωγή από το Loyalty Card Keychain για εισαγωγή.
 \nΔημιουργήστε το από το μενού Εισαγωγής/Εξαγωγής στο Loyalty Card Keychain επιλέγοντας Εξαγωγή.</string>
@@ -102,7 +111,9 @@
    <string name="removeImage">Αφαίρεση εικόνας</string>
    <string name="takePhoto">Τραβήξτε μια φωτογραφία</string>
    <string name="updateBarcodeQuestionText">Αλλάξατε τον κωδικό. Θέλετε να ενημερώσετε και τον γραμμοκώδικα στην ίδια τιμή;</string>
+    <string name="action_show_details">Εμφάνιση λεπτομερειών</string>
    <string name="options">Επιλογές</string>
+    <string name="hideMoreInfo">Απόκρυψη πληροφοριών</string>
    <string name="noGroupCards">Αυτή η ομάδα είναι άδεια</string>
    <string name="settings_display_barcode_max_brightness">Επιπλέον φωτισμός γραμμοκώδικα</string>
    <string name="group_name_is_empty">Το όνομα ομάδας δεν γίνεται να είναι κενό</string>
@@ -115,6 +126,7 @@
    </plurals>
    <string name="card_ids_copied">Αντιγραμμένη/ες ταυτότητα/ες</string>
    <string name="errorReadingImage">Δεν ήταν δυνατό να διαβαστεί η εικόνα</string>
+    <string name="parsingBalanceFailed"><xliff:g>%s</xliff:g> δεν φαίνεται να είναι έγκυρο το υπόλοιπο.</string>
    <string name="currency">Νόμισμα</string>
    <string name="privacy_policy">Πολιτική απορρήτου</string>
    <string name="chooseImportType">Εισαγωγή δεδομένων από</string>
@@ -147,6 +159,7 @@
    <string name="app_libraries">Ελεύθερες βιβλιοθήκες τρίτων: <xliff:g id="app_libraries_list">%s</xliff:g></string>
    <string name="license">Άδεια</string>
    <string name="include_if_asking_support">Αν θέλετε να ζητήσετε υποστήριξη, συμπεριλάβετε τις ακόλουθες πληροφορίες:</string>
+    <string name="action_hide_details">Απόκρυψη λεπτομερειών</string>
    <string name="importSuccessful">Δεδομένα εισήχθησαν</string>
    <string name="moveUp">Προχώρα πάνω</string>
    <string name="barcodeType">Τύπος γραμμοκώδικα</string>
@@ -176,12 +189,14 @@
    </plurals>
    <string name="app_copyright_old">Βασισμένο στο Loyalty Card Keychain
 \nπνευματικά δικαιώματα © 2016-2020 Branden Archer</string>
+    <string name="enterBarcodeInstructions">Εισάγετε τον κωδικό και διαλέξτε έναν είδος γραμμοκώδικα από κάτω ή \"Δεν υπάρχει γραμμοκώδικας\".</string>
    <string name="settings_follow_system_orientation">Ακολούθηση συστήματος</string>
    <string name="settings_card_orientation">Προσανατολισμός γραμμοκώδικα</string>
    <string name="settings_portrait_orientation">Πορτραίτο</string>
    <string name="settings_landscape_orientation">Οριζόντια</string>
    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Πνευματικά δικαιώματα © 2019-<xliff:g>%d</xliff:g> Sylvia van Os</string>
    <string name="settings_lock_on_opening_orientation">Κλείδωμα τωρινού προσανατολισμού όταν ανοίγει μία κάρτα</string>
+    <string name="settings_max_font_size_scale">Μέγιστο μέγεθος γραμματοσειράς</string>
    <string name="intent_import_card_from_url_share_text">Θέλω να μοιραστώ μία κάρτα μαζί σου</string>
    <string name="enter_group_name">Εισάγετε όνομα ομάδας</string>
    <string name="groups">Ομάδες</string>
@@ -196,6 +211,7 @@
    <string name="editBarcode">Επεξεργασία γραμμοκώδικα</string>
    <string name="chooseExpiryDate">Επιλέξτε ημερομηνία λήξης</string>
    <string name="moveBarcodeToTopOfScreen">Μετακίνηση του γραμμοκώδικα στο πάνω μέρος της οθόνης</string>
+    <string name="moveBarcodeToCenterOfScreen">Κεντράρισμα του γραμμοκώδικα στην οθόνη</string>
    <string name="noBarcodeFound">Δεν βρέθηκε γραμμοκώδικας</string>
    <string name="balance">Υπόλοιπο</string>
    <string name="importCatima">Εισαγωγή από Catima</string>
@@ -226,6 +242,8 @@
    <string name="archived">Η κάρτα αρχειοθετήθηκε</string>
    <string name="unarchived">Η κάρτα αφαιρέθηκε από το αρχείο</string>
    <string name="unarchive">Αφαίρεση από το αρχείο</string>
+    <string name="archiveList">Αρχείο</string>
+    <string name="noUnarchivedCardsMessage">Δεν υπάρχουν αρχειοθετημένες κάρτες</string>
    <string name="updateBalanceTitle">Πόσα ξοδέψατε;</string>
    <string name="cameraPermissionDeniedTitle">Αδύνατη η πρόσβαση στην κάμερα</string>
    <string name="failedToRetrieveImageFile">Αποτυχία ανάκτησης αρχείου εικόνας</string>
@@ -244,4 +262,4 @@
    <string name="newBalanceSentence">Νέο υπόλοιπο: <xliff:g>%s</xliff:g></string>
    <string name="failedToOpenUrl">Εγκαταστήστε έναν περιηγητή πρώτα</string>
    <string name="welcome">Καλώς ήρθατε στο Catima</string>
-</resources>
+</resources>
--- a/app/src/main/res/values-enm/strings.xml
+++ b/app/src/main/res/values-enm/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
--- a/Show More
+++ b/Show More