Release Catima v2.28.0

Translations update from Hosted Weblate

.github/dependabot.yml

@@ -1,11 +1,30 @@
-# 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" # See documentation for possible values
-    directory: "/" # Location of package manifests
+  - package-ecosystem: "gradle"
+    directory: "/"
+    registries:
+      - google
+      - gradlePluginPortal
+      - jitpack
+      - mavenCentral
     schedule:
       interval: "daily"
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+
+# Workaround for https://github.com/dependabot/dependabot-core/issues/6888
+registries:
+  google:
+    type: maven-repository
+    url: "https://dl.google.com/dl/android/maven2/"
+  gradlePluginPortal:
+    type: maven-repository
+    url: "https://plugins.gradle.org/m2/"
+  jitpack:
+    type: maven-repository
+    url: "https://jitpack.io/"
+  mavenCentral:
+    type: maven-repository
+    url: "https://repo1.maven.org/maven2/"

.github/workflows/android.yml

@@ -1,6 +1,6 @@
 name: Android CI
-
 on:
+  workflow_dispatch:
   push:
     branches:
       - main
@@ -9,33 +9,46 @@ 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@v2
+    - uses: actions/checkout@v4.1.1
     - name: Fail on bad translations
       run: if grep -ri "<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 JDK 11
-      uses: actions/setup-java@v2
-      with:
-        distribution: 'adopt'
-        java-version: '11'
+    - uses: gradle/wrapper-validation-action@v2
+    - 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: Build
       run: ./gradlew assembleRelease
     - name: Check lint
       run: ./gradlew lintRelease
     - name: Run unit tests
-      run: ./gradlew testReleaseUnitTest || ./gradlew testReleaseUnitTest
+      run: timeout 5m ./gradlew testReleaseUnitTest || { ./gradlew --stop && timeout 5m ./gradlew testReleaseUnitTest; }
     - name: SpotBugs
       run: ./gradlew spotbugsRelease
     - name: Archive test results
       if: always()
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4.3.1
       with:
         name: test-results
         path: app/build/reports

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

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

.github/workflows/calibreapp-image-actions.yml

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

.github/workflows/changelog-to-fastlane.yml

@@ -1,9 +1,25 @@
 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
@@ -11,15 +27,15 @@ jobs:
     steps:
     - name: Checkout repo
       id: checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4.1.1
     - name: Setup Python
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v5.0.0
       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@v3
+      uses: peter-evans/create-pull-request@v6.0.1
       with:
         title: "Update Fastlane changelogs"
         commit-message: "Update Fastlane changelogs"

.github/workflows/contributors-to-file.yml

@@ -1,8 +1,22 @@
 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
@@ -11,14 +25,15 @@ jobs:
     steps:
     - name: Checkout repo
       id: checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4.1.1
     - name: Update contributors
       id: update_contributors
-      uses: TheLastProject/contributors-to-file-action@v2
+      uses: TheLastProject/contributors-to-file-action@v3.2.0
       with:
         file_in_repo: app/src/main/res/raw/contributors.txt
+        min_commit_count: 5
     - name: Create Pull Request
-      uses: peter-evans/create-pull-request@v3
+      uses: peter-evans/create-pull-request@v6.0.1
       with:
         title: "Update contributors"
         commit-message: "Update contributors"

.github/workflows/generate-feature-graphic.yml

@@ -0,0 +1,45 @@
+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.1.1
+    - 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: .scripts/generate_feature_graphic/generate_feature_graphic.sh
+    - name: Create Pull Request
+      uses: peter-evans/create-pull-request@v6.0.1
+      with:
+        title: "Update feature graphic"
+        commit-message: "Update feature graphic"
+        branch-suffix: timestamp

.github/workflows/gradle-update.yml

@@ -0,0 +1,33 @@
+name: Gradle update
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: '3 6 * * *'
+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:
+  gradle-update:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4.1.1
+    - uses: obfusk/gradle-update-action@v2.0.0
+      id: gradle-update
+    - uses: gradle/wrapper-validation-action@v2
+    - name: Create Pull Request
+      uses: peter-evans/create-pull-request@v6.0.1
+      with:
+        title: "Update Gradle to ${{ steps.gradle-update.outputs.version }}"
+        commit-message: "Update Gradle to ${{ steps.gradle-update.outputs.version }}"
+        branch-suffix: timestamp

.github/workflows/gradle-wrapper-validation.yml

@@ -1,10 +0,0 @@
-name: "Validate Gradle Wrapper"
-on: [push, pull_request]
-
-jobs:
-  validation:
-    name: "Validation"
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - uses: gradle/wrapper-validation-action@v1

.github/workflows/update-locales.yml

@@ -0,0 +1,38 @@
+name: Update locales
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - main
+    paths:
+      - app/src/main/res/values-*/strings.xml
+      - 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.1.1
+    - name: Add new locales
+      run: .scripts/new-locales.py
+    - name: Update locales
+      run: .scripts/locales.py
+    - name: Create Pull Request
+      uses: peter-evans/create-pull-request@v6.0.1
+      with:
+        title: "Update locales"
+        commit-message: "Update locales"
+        branch-suffix: timestamp

.gitignore

@@ -1,13 +1,25 @@
+# Android Studio generated (superseded/unused rules commented out)
 *.iml
 .gradle
-local.properties
-.idea/
+/local.properties
+#/.idea/caches
+#/.idea/libraries
+#/.idea/modules.xml
+#/.idea/workspace.xml
+#/.idea/navEditor.xml
+#/.idea/assetWizardSettings.xml
 .DS_Store
-build/
-captures/
-**/release
-**/debug
-app/*.log
+/build
+/captures
+.externalNativeBuild
+.cxx
+#local.properties
+
+# Android extras
+/app/*.log
+/app/build
+/app/release
+/.idea
 
 # Bundle
 /.bundle/

.scripts/dump_stocard_stores.py

@@ -0,0 +1,44 @@
+#!/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)

.scripts/generate_feature_graphic/featureGraphic.svg

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

.scripts/generate_feature_graphic/fonts/Lexend_Deca/OFL.txt

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

.scripts/generate_feature_graphic/fonts/Yesteryear/OFL.txt

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

.scripts/generate_feature_graphic/generate_feature_graphic.sh

@@ -0,0 +1,55 @@
+#!/bin/bash
+set -euo pipefail
+
+script_location="$(dirname "$(readlink -f "$0")")"
+
+for lang in "$script_location/../../fastlane/metadata/android/"*; do
+  pushd "$lang"
+  # Place temporary copy for editing if needed
+  cp "$script_location/featureGraphic.svg" featureGraphic.svg
+  if grep -q — title.txt; then
+    # Try splitting title.txt on — (em dash)
+    IFS='—' read -r appname subtext < title.txt
+  elif grep -q – title.txt; then
+    # No result, try splitting title.txt on – (en dash)
+    IFS='–' read -r appname subtext < title.txt
+  elif grep -q - title.txt; then
+    # No result, try splitting on - (dash)
+    IFS='-' read -r appname subtext < title.txt
+  else
+    # No result, use the full title as app name and default subtext
+    appname=$(< title.txt)
+    subtext="Loyalty Card Wallet"
+  fi
+  export appname=${appname%% }
+  export subtext=${subtext## }
+  # If the appname isn't Catima or there is subtext, change the .svg accordingly
+  if [ "$appname" != "Catima" ] || [ -n "$subtext" ]; then
+    perl -pi -e 's/Catima/$ENV{appname}/' featureGraphic.svg
+    perl -pi -e 's/Loyalty Card Wallet/$ENV{subtext}/' featureGraphic.svg
+    # Set correct font or font size for language if needed
+    # (Lexend Deca has limited support and some characters are big)
+    # 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 ;;
+      hi-IN) sed -i -e "s/Yesteryear/Noto Serif Devanagari/" -e "s/Lexend Deca/Noto Serif Devanagari/" 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 ;;
+      kn-IN) sed -i -e 's/font-size="150"/font-size="100"/' -e 's/y="285.511"/y="235.511"/' 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

.scripts/locales.py

@@ -0,0 +1,36 @@
+#!/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 += listOf({res})/",
+    "app/build.gradle.kts"
+]
+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')

.scripts/new-locales.py

@@ -0,0 +1,120 @@
+#!/usr/bin/python3
+
+import glob
+import re
+
+from typing import Iterator, List, Tuple
+
+import requests
+
+MIN_PERCENT = 90
+NOT_LANGS = ("night", "w600dp")
+REPLACE_CODES = {
+    "el": "el-rGR",
+    "id": "in-rID",
+    "ro": "ro-rRO",
+    "zh_Hans": "zh-rCN",
+    "zh_Hant": "zh-rTW",
+}
+STATS_URL = "https://hosted.weblate.org/api/components/catima/catima/statistics/"
+
+
+def get_weblate_langs() -> List[Tuple[str, int]]:
+    r = requests.get(STATS_URL, timeout=5)
+    r.raise_for_status()
+    results = []
+    for lang in r.json()["results"]:
+        if lang["code"] != "en":
+            code = REPLACE_CODES.get(lang["code"], lang["code"]).replace("_", "-r")
+            results.append((code, round(lang["translated_percent"])))
+    return sorted(results)
+
+
+def get_dir_langs() -> List[str]:
+    results = []
+    for d in glob.glob("app/src/main/res/values-*"):
+        code = d.split("-", 1)[1]
+        if code not in NOT_LANGS:
+            results.append(code)
+    return sorted(results)
+
+
+def get_xml_langs() -> List[Tuple[str, bool]]:
+    results = []
+    in_section = False
+    with open("app/src/main/res/values/settings.xml") as fh:
+        for line in fh:
+            if not in_section and 'name="locale_values"' in line:
+                in_section = True
+            elif in_section:
+                if "string-array" in line:
+                    break
+                disabled = "<!--" in line
+                if m := re.search(r">(.*)<", line):
+                    if m[1] != "en":
+                        results.append((m[1], disabled))
+    return sorted(results)
+
+
+def update_xml_langs(langs: List[Tuple[str, bool]]) -> None:
+    lines: List[str] = []
+    in_section = False
+    with open("app/src/main/res/values/settings.xml") as fh:
+        for line in fh:
+            if not in_section and 'name="locale_values"' in line:
+                in_section = True
+            elif in_section:
+                if "string-array" in line:
+                    in_section = False
+                    lines.extend(_lang_lines(langs))
+                else:
+                    continue
+            lines.append(line)
+    with open("app/src/main/res/values/settings.xml", "w") as fh:
+        for line in lines:
+            fh.write(line)
+
+
+def _lang_lines(langs: List[Tuple[str, bool]]) -> Iterator[str]:
+    yield "        <item />\n"
+    for lang, disabled in sorted(langs + [("en", False)]):
+        if disabled:
+            yield f"        <!-- <item>{lang}</item> -->\n"
+        else:
+            yield f"        <item>{lang}</item>\n"
+
+
+def main() -> None:
+    web_langs = get_weblate_langs()
+    dir_langs = get_dir_langs()
+    xml_langs = get_xml_langs()
+
+    web_codes = set(code for code, _ in web_langs)
+    dir_codes = set(dir_langs)
+    xml_codes = set(code for code, _ in xml_langs)
+
+    if diff := web_codes - dir_codes:
+        print(f"WARNING: Weblate codes w/o dir: {diff}")
+    if diff := xml_codes - dir_codes:
+        print(f"WARNING: XML codes w/o dir: {diff}")
+
+    percentages = dict(web_langs)
+    all_langs = xml_langs[:]
+
+    # add new langs as disabled
+    for code in dir_codes - xml_codes:
+        all_langs.append((code, True))
+
+    # enable disabled langs if they are at least MIN_PERCENT translated now
+    updated_langs = sorted(
+        (code, percentages[code] < MIN_PERCENT if disabled else disabled)
+        for code, disabled in all_langs
+    )
+
+    if updated_langs != xml_langs:
+        print("Updating...")
+        update_xml_langs(updated_langs)
+
+
+if __name__ == "__main__":
+    main()

CHANGELOG.md

@@ -1,44 +1,127 @@
 # Changelog
 
-## v2.22.0 - 118
+## v2.28.0 - 133 (2024-03-08)
+
+- Target Android 14
+- Open card icon in gallery on touch
+- Improve design of Photos tab in edit view
+- Update spending screen to also support receiving
+
+## v2.27.0 - 132 (2024-01-30)
+
+- Refine "Add card" workflow
+- Validation flow improvements
+- Fix edge case causing invalid UI state when toggling showing archive
+- Use theme or card colour for navigation bar (Android 8.1+)
+- Updated validity and expiry date selector
+- Add option to always rotate (ignoring system settings)
+
+## 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)
+
+- Use Material You colours on more devices (Google library update)
+
+## v2.22.0 - 118 (2023-03-18)
 
 - Support setting start of card validity
 - Fix Stocard import (Stocard's export format changed)
 
-## v2.21.2 - 117
+## v2.21.2 - 117 (2023-01-27)
 
 - Remove unnecessary permissions
 - Target Android 13
 
-## v2.21.1 - 116
+## v2.21.1 - 116 (2022-12-06)
 
 - Fix quick spend dialog not allowing , separator
 - Support loading image from file manager
 
-## v2.21.0 - 115
+## v2.21.0 - 115 (2022-11-06)
 
 - 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
+## v2.20.0 - 114 (2022-09-21)
 
 - Add Monochrome icon for Android 13
 - Improve first launch screen
 - Fidme import fixes
 
-## v2.19.0 - 113
+## v2.19.0 - 113 (2022-08-14)
 
 - 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
+## v2.18.2 - 112 (2022-07-29)
 
 - Make the possibility to set a custom header more visible
 
-## v2.18.1 - 111
+## v2.18.1 - 111 (2022-07-24)
 
 - Arabic language support
 - Display archived card count in group overview
@@ -48,11 +131,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
+## v2.17.1 - 109 (2022-06-28)
 
 - Fix incorrect text colour on "No barcode" button
 
-## v2.17.0 - 108
+## v2.17.0 - 108 (2022-06-24)
 
 - Add card duplication feature
 - Don't allow choosing expiry before 1970 (they never worked anyway)

CONTRIBUTING.md

@@ -1,13 +1,15 @@
-How to Submit Patches to the Catima Project
-===============================================================================
-https://github.com/TheLastProject/Catima
+# How to Submit Patches to the Catima Project
 
 This document is intended to act as a guide to help you contribute to the
-Catima project.  It is not perfect, and there will always be exceptions
+Catima project. It is not perfect, and there will always be exceptions
 to the rules described here, but by following the instructions below you
 should have a much easier time getting your work merged with the upstream
 project.
 
+When contributing, you certify that you agree to and have the rights to submit
+your contribution under the project's license and understand that git will
+store your name and email address in project history indefinitely.
+
 ## Translation Changes
 
 Translation changes are managed through [Weblate](https://hosted.weblate.org/projects/catima/).
@@ -57,44 +59,6 @@ if you can describe/include a reproducer for the problem in the description as
 well as instructions on how to test for the bug and verify that it has been
 fixed.
 
-### Sign Your Work
-
-The sign-off is a simple line at the end of the patch description, which
-certifies that you wrote it or otherwise have the right to pass it on as an
-open-source patch.  The "Developer's Certificate of Origin" pledge is taken
-from the Linux Kernel and the rules are pretty simple:
-
-	Developer's Certificate of Origin 1.1
-
-	By making a contribution to this project, I certify that:
-
-	(a) The contribution was created in whole or in part by me and I
-	    have the right to submit it under the open source license
-	    indicated in the file; or
-
-	(b) The contribution is based upon previous work that, to the best
-	    of my knowledge, is covered under an appropriate open source
-	    license and I have the right under that license to submit that
-	    work with modifications, whether created in whole or in part
-	    by me, under the same open source license (unless I am
-	    permitted to submit under a different license), as indicated
-	    in the file; or
-
-	(c) The contribution was provided directly to me by some other
-	    person who certified (a), (b) or (c) and I have not modified
-	    it.
-
-	(d) I understand and agree that this project and the contribution
-	    are public and that a record of the contribution (including all
-	    personal information I submit with it, including my sign-off) is
-	    maintained indefinitely and may be redistributed consistent with
-	    this project or the open source license(s) involved.
-
-... then you just add a line to the bottom of your patch description, with
-your real name, saying:
-
-	Signed-off-by: Random J Developer <random@developer.example.org>
-
 ### Submit Patch(es) for Review
 
 Finally, you will need to submit your patches so that they can be reviewed

Gemfile.lock

@@ -3,25 +3,25 @@ GEM
   specs:
     CFPropertyList (3.0.6)
       rexml
-    addressable (2.8.1)
+    addressable (2.8.6)
       public_suffix (>= 2.0.2, < 6.0)
     artifactory (3.0.15)
     atomos (0.1.3)
-    aws-eventstream (1.2.0)
-    aws-partitions (1.701.0)
-    aws-sdk-core (3.170.0)
-      aws-eventstream (~> 1, >= 1.0.2)
+    aws-eventstream (1.3.0)
+    aws-partitions (1.884.0)
+    aws-sdk-core (3.191.0)
+      aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
-      aws-sigv4 (~> 1.5)
+      aws-sigv4 (~> 1.8)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.62.0)
-      aws-sdk-core (~> 3, >= 3.165.0)
+    aws-sdk-kms (1.77.0)
+      aws-sdk-core (~> 3, >= 3.191.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.119.0)
-      aws-sdk-core (~> 3, >= 3.165.0)
+    aws-sdk-s3 (1.143.0)
+      aws-sdk-core (~> 3, >= 3.191.0)
       aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.4)
-    aws-sigv4 (1.5.2)
+      aws-sigv4 (~> 1.8)
+    aws-sigv4 (1.8.0)
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.4)
     claide (1.1.0)
@@ -30,13 +30,12 @@ GEM
     commander (4.6.0)
       highline (~> 2.0.0)
     declarative (0.0.20)
-    digest-crc (0.6.4)
+    digest-crc (0.6.5)
       rake (>= 12.0.0, < 14.0.0)
-    domain_name (0.5.20190701)
-      unf (>= 0.0.5, < 1.0.0)
+    domain_name (0.6.20240107)
     dotenv (2.8.1)
     emoji_regex (3.2.3)
-    excon (0.98.0)
+    excon (0.109.0)
     faraday (1.10.3)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
@@ -65,8 +64,8 @@ GEM
     faraday-retry (1.0.3)
     faraday_middleware (1.2.0)
       faraday (~> 1.0)
-    fastimage (2.2.6)
-    fastlane (2.211.0)
+    fastimage (2.3.0)
+    fastlane (2.219.0)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.8, < 3.0.0)
       artifactory (~> 3.0)
@@ -85,20 +84,22 @@ GEM
       gh_inspector (>= 1.1.2, < 2.0.0)
       google-apis-androidpublisher_v3 (~> 0.3)
       google-apis-playcustomapp_v1 (~> 0.1)
+      google-cloud-env (>= 1.6.0, < 2.0.0)
       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)
+      multipart-post (>= 2.0.0, < 3.0.0)
       naturally (~> 2.2)
-      optparse (~> 0.1.1)
+      optparse (>= 0.1.1)
       plist (>= 3.1.0, < 4.0.0)
       rubyzip (>= 2.0.0, < 3.0.0)
       security (= 0.1.3)
       simctl (~> 1.6.3)
       terminal-notifier (>= 2.0.0, < 3.0.0)
-      terminal-table (>= 1.4.5, < 2.0.0)
+      terminal-table (~> 3)
       tty-screen (>= 0.6.3, < 1.0.0)
       tty-spinner (>= 0.8.0, < 1.0.0)
       word_wrap (~> 1.0.0)
@@ -106,9 +107,9 @@ GEM
       xcpretty (~> 0.3.0)
       xcpretty-travis-formatter (>= 0.0.3)
     gh_inspector (1.1.3)
-    google-apis-androidpublisher_v3 (0.32.0)
-      google-apis-core (>= 0.9.1, < 2.a)
-    google-apis-core (0.10.0)
+    google-apis-androidpublisher_v3 (0.54.0)
+      google-apis-core (>= 0.11.0, < 2.a)
+    google-apis-core (0.11.3)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (>= 0.16.2, < 2.a)
       httpclient (>= 2.8.1, < 3.a)
@@ -116,31 +117,29 @@ GEM
       representable (~> 3.0)
       retriable (>= 2.0, < 4.a)
       rexml
-      webrick
-    google-apis-iamcredentials_v1 (0.16.0)
-      google-apis-core (>= 0.9.1, < 2.a)
-    google-apis-playcustomapp_v1 (0.12.0)
-      google-apis-core (>= 0.9.1, < 2.a)
-    google-apis-storage_v1 (0.19.0)
-      google-apis-core (>= 0.9.0, < 2.a)
-    google-cloud-core (1.6.0)
-      google-cloud-env (~> 1.0)
+    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-storage_v1 (0.31.0)
+      google-apis-core (>= 0.11.0, < 2.a)
+    google-cloud-core (1.6.1)
+      google-cloud-env (>= 1.0, < 3.a)
       google-cloud-errors (~> 1.0)
     google-cloud-env (1.6.0)
       faraday (>= 0.17.3, < 3.0)
-    google-cloud-errors (1.3.0)
-    google-cloud-storage (1.44.0)
+    google-cloud-errors (1.3.1)
+    google-cloud-storage (1.47.0)
       addressable (~> 2.8)
       digest-crc (~> 0.4)
       google-apis-iamcredentials_v1 (~> 0.1)
-      google-apis-storage_v1 (~> 0.19.0)
+      google-apis-storage_v1 (~> 0.31.0)
       google-cloud-core (~> 1.6)
       googleauth (>= 0.16.2, < 2.a)
       mini_mime (~> 1.0)
-    googleauth (1.3.0)
+    googleauth (1.8.1)
       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)
@@ -149,31 +148,30 @@ GEM
       domain_name (~> 0.5)
     httpclient (2.8.3)
     jmespath (1.6.2)
-    json (2.6.3)
-    jwt (2.6.0)
-    memoist (0.16.2)
+    json (2.7.1)
+    jwt (2.7.1)
     mini_magick (4.12.0)
-    mini_mime (1.1.2)
+    mini_mime (1.1.5)
     multi_json (1.15.0)
-    multipart-post (2.0.0)
+    multipart-post (2.3.0)
     nanaimo (0.3.0)
     naturally (2.2.1)
-    optparse (0.1.1)
+    optparse (0.4.0)
     os (1.1.4)
-    plist (3.6.0)
-    public_suffix (5.0.1)
-    rake (13.0.6)
+    plist (3.7.1)
+    public_suffix (5.0.4)
+    rake (13.1.0)
     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.5)
+    rexml (3.2.6)
     rouge (2.0.7)
     ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
     security (0.1.3)
-    signet (0.17.0)
+    signet (0.18.0)
       addressable (~> 2.8)
       faraday (>= 0.17.5, < 3.a)
       jwt (>= 1.5, < 3.0)
@@ -182,21 +180,17 @@ GEM
       CFPropertyList
       naturally
     terminal-notifier (2.0.0)
-    terminal-table (1.8.0)
-      unicode-display_width (~> 1.1, >= 1.1.1)
+    terminal-table (3.0.2)
+      unicode-display_width (>= 1.1.1, < 3)
     trailblazer-option (0.1.2)
     tty-cursor (0.7.1)
-    tty-screen (0.8.1)
+    tty-screen (0.8.2)
     tty-spinner (0.9.3)
       tty-cursor (~> 0.7)
     uber (0.1.0)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.8.2)
-    unicode-display_width (1.8.0)
-    webrick (1.8.1)
+    unicode-display_width (2.5.0)
     word_wrap (1.0.0)
-    xcodeproj (1.22.0)
+    xcodeproj (1.24.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)

PRIVACY.md

@@ -0,0 +1,18 @@
+**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.

SECURITY.md

@@ -0,0 +1,13 @@
+# 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).

app/build.gradle

@@ -1,129 +0,0 @@
-import com.github.spotbugs.snom.SpotBugsTask
-
-plugins {
-    id 'com.android.application'
-    id 'com.github.spotbugs'
-}
-
-spotbugs {
-    ignoreFailures = false
-    effort = 'max'
-    excludeFilter = file("./config/spotbugs/exclude.xml")
-    reportsDir = file("$buildDir/reports/spotbugs/")
-}
-
-android {
-    compileSdk 33
-
-    defaultConfig {
-        applicationId "me.hackerchick.catima"
-        minSdk 21
-        targetSdk 33
-        versionCode 118
-        versionName "2.22.0"
-
-        vectorDrawables.useSupportLibrary true
-        multiDexEnabled true
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled true
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-            resValue "string", "app_name", "Catima"
-        }
-        debug {
-            applicationIdSuffix ".debug"
-            resValue "string", "app_name", "Catima Debug"
-        }
-    }
-
-    buildFeatures {
-        viewBinding true
-    }
-
-    bundle {
-        language {
-            enableSplit = false
-        }
-    }
-
-    compileOptions {
-        encoding "UTF-8"
-
-        // Flag to enable support for the new language APIs
-        coreLibraryDesugaringEnabled true
-
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
-    }
-
-    lintOptions {
-        lintConfig file("lint.xml")
-    }
-
-    sourceSets {
-        test {
-            resources.srcDirs += ['src/test/res']
-        }
-    }
-
-    // Starting with Android Studio 3 Robolectric is unable to find resources.
-    // The following allows it to find the resources.
-    testOptions {
-        unitTests {
-            all {
-                testLogging {
-                    events 'started', 'passed', 'skipped', 'failed'
-                }
-            }
-            includeAndroidResources true
-        }
-    }
-}
-
-dependencies {
-// AndroidX
-    implementation 'androidx.appcompat:appcompat:1.6.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    implementation 'androidx.exifinterface:exifinterface:1.3.5'
-    implementation 'androidx.palette:palette:1.0.0'
-    implementation 'androidx.preference:preference:1.2.0'
-    implementation 'com.google.android.material:material:1.6.1'
-    implementation 'com.github.yalantis:ucrop:2.2.8'
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.6'
-
-// Splash Screen
-    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.1'
-    implementation 'org.apache.commons:commons-csv:1.9.0'
-    implementation 'com.jaredrummler:colorpicker:1.1.0'
-    implementation 'com.github.invissvenska:NumberPickerPreference:1.0.4'
-    implementation 'net.lingala.zip4j:zip4j:2.11.5'
-
-// SpotBugs
-    implementation 'io.wcm.tooling.spotbugs:io.wcm.tooling.spotbugs.annotations:1.0.0'
-
-// Testing
-    testImplementation 'androidx.test:core:1.5.0'
-    testImplementation 'junit:junit:4.13.2'
-    testImplementation 'org.robolectric:robolectric:4.9.2'
-}
-
-tasks.withType(SpotBugsTask) {
-
-    description 'Run spotbugs'
-    group 'verification'
-
-    //classes = fileTree('build/intermediates/javac/debug/compileDebugJavaWithJavac/classes')
-    //source = fileTree('src/main/java')
-    //classpath = files()
-
-    reports {
-        xml.enabled = false
-        html.enabled = true
-    }
-}

app/build.gradle.kts

@@ -0,0 +1,145 @@
+import com.android.build.gradle.internal.tasks.factory.dependsOn
+import com.github.spotbugs.snom.SpotBugsTask
+
+plugins {
+    id("com.android.application")
+    id("com.github.spotbugs")
+}
+
+spotbugs {
+    ignoreFailures.set(false)
+    setEffort("max")
+    excludeFilter.set(file("./config/spotbugs/exclude.xml"))
+    reportsDir.set(layout.buildDirectory.file("reports/spotbugs/").get().asFile)
+}
+
+android {
+    namespace = "protect.card_locker"
+    compileSdk = 34
+
+    defaultConfig {
+        applicationId = "me.hackerchick.catima"
+        minSdk = 21
+        targetSdk = 34
+        versionCode = 133
+        versionName = "2.28.0"
+
+        vectorDrawables.useSupportLibrary = true
+        multiDexEnabled = true
+
+        resourceConfigurations += listOf("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-rPT", "ro-rRO", "ru", "sk", "sl", "sv", "tr", "uk", "vi", "zh-rCN", "zh-rTW")
+    }
+
+    buildTypes {
+        release {
+            isMinifyEnabled = true
+            proguardFiles(
+                getDefaultProguardFile("proguard-android.txt"),
+                "proguard-rules.pro"
+            )
+        }
+        debug {
+            applicationIdSuffix = ".debug"
+        }
+    }
+
+    buildFeatures {
+        buildConfig = true
+        viewBinding = true
+    }
+
+    bundle {
+        language {
+            enableSplit = false
+        }
+    }
+
+    compileOptions {
+        encoding = "UTF-8"
+
+        // Flag to enable support for the new language APIs
+        isCoreLibraryDesugaringEnabled = true
+
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
+
+    sourceSets {
+        getByName("test") {
+            resources.srcDirs("src/test/res")
+        }
+    }
+
+    // Starting with Android Studio 3 Robolectric is unable to find resources.
+    // The following allows it to find the resources.
+    testOptions.unitTests.isIncludeAndroidResources = true
+    tasks.withType<Test>().configureEach {
+        testLogging {
+            events("started", "passed", "skipped", "failed")
+        }
+    }
+
+    lint {
+        lintConfig = file("lint.xml")
+    }
+}
+
+dependencies {
+
+    // AndroidX
+    implementation("androidx.appcompat:appcompat:1.6.1")
+    implementation("androidx.constraintlayout:constraintlayout:2.1.4")
+    implementation("androidx.exifinterface:exifinterface:1.3.7")
+    implementation("androidx.palette:palette:1.0.0")
+    implementation("androidx.preference:preference:1.2.1")
+    implementation("com.google.android.material:material:1.11.0")
+    implementation("com.github.yalantis:ucrop:2.2.8")
+    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.0.4")
+
+    // Splash Screen
+    implementation("androidx.core:core-splashscreen:1.0.1")
+
+    // Third-party
+    implementation("com.journeyapps:zxing-android-embedded:4.3.0@aar")
+    implementation("com.google.zxing:core:3.5.3")
+    implementation("org.apache.commons:commons-csv:1.9.0")
+    implementation("com.jaredrummler:colorpicker:1.1.0")
+    implementation("net.lingala.zip4j:zip4j:2.11.5")
+
+    // SpotBugs
+    implementation("io.wcm.tooling.spotbugs:io.wcm.tooling.spotbugs.annotations:1.0.0")
+
+    // Testing
+    testImplementation("androidx.test:core:1.5.0")
+    testImplementation("junit:junit:4.13.2")
+    testImplementation("org.robolectric:robolectric:4.11.1")
+}
+
+tasks.withType<SpotBugsTask>().configureEach {
+    description = "Run spotbugs"
+    group = "verification"
+
+    //classes = fileTree("build/intermediates/javac/debug/compileDebugJavaWithJavac/classes")
+    //source = fileTree("src/main/java")
+    //classpath = files()
+
+    reports.maybeCreate("xml").required.set(false)
+    reports.maybeCreate("html").required.set(true)
+}
+
+tasks.register("copyRawResFiles", Copy::class) {
+    from(
+        layout.projectDirectory.file("../CHANGELOG.md"),
+        layout.projectDirectory.file("../PRIVACY.md")
+    )
+    into(layout.projectDirectory.dir("src/main/res/raw"))
+    rename { it.lowercase() }
+}.also {
+    tasks.preBuild.dependsOn(it)
+    tasks.getByName<Delete>("clean") {
+        val filesNamesToDelete = listOf("CHANGELOG", "PRIVACY")
+        filesNamesToDelete.forEach { fileName ->
+            delete(layout.projectDirectory.file("src/main/res/raw/${fileName.lowercase()}.md"))
+        }
+    }
+}

app/proguard-rules.pro

@@ -2,7 +2,7 @@
 # By default, the flags in this file are appended to flags specified
 # in /Users/brarcher/Library/Android/sdk/tools/proguard/proguard-android.txt
 # You can edit the include path and order by changing the proguardFiles
-# directive in build.gradle.
+# directive in build.gradle.kts.
 #
 # For more details, see
 #   http://developer.android.com/guide/developing/tools/proguard.html

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

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>

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

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>

app/src/debug/res/values-bn/strings.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>

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

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>

app/src/debug/res/values-ca/strings.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>

app/src/debug/res/values-cs/strings.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Catima Debug</string>
+</resources>

app/src/debug/res/values-cy/strings.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>

app/src/debug/res/values-da/strings.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>

app/src/debug/res/values-de/strings.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Catima Debug</string>
+</resources>

app/src/debug/res/values-el/strings.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>

app/src/debug/res/values-eo/strings.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>

app/src/debug/res/values-es-rAR/strings.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>

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

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Depuración de Catima</string>
+</resources>

app/src/debug/res/values-fi/strings.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>

app/src/debug/res/values-fr/strings.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Débogage de Catima</string>
+</resources>

app/src/debug/res/values-he-rIL/strings.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>

app/src/debug/res/values-hi/strings.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">कैटिमा डीबग</string>
+</resources>

app/src/debug/res/values-hr/strings.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Catima Debug</string>
+</resources>

app/src/debug/res/values-hu/strings.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Catima Debug</string>
+</resources>

app/src/debug/res/values-in/strings.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Catima Debug</string>
+</resources>

app/src/debug/res/values-is/strings.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>

app/src/debug/res/values-it/strings.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Catima Debug</string>
+</resources>

app/src/debug/res/values-ja/strings.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>

app/src/debug/res/values-kn/strings.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">ಕ್ಯಾಟಿಮಾ ಡೀಬಗ್</string>
+</resources>

app/src/debug/res/values-ko/strings.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Catima 디버그</string>
+</resources>

app/src/debug/res/values-lb/strings.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>

app/src/debug/res/values-lt/strings.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>

app/src/debug/res/values-lv/strings.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>

app/src/debug/res/values-ml/strings.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>

app/src/debug/res/values-mr/strings.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>

app/src/debug/res/values-nb-rNO/strings.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Catima-avlusing</string>
+</resources>

app/src/debug/res/values-nl/strings.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Catima-foutopsporing</string>
+</resources>

app/src/debug/res/values-oc/strings.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>

app/src/debug/res/values-pl/strings.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Catima Debug</string>
+</resources>

app/src/debug/res/values-pt-rPT/strings.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Depuração Catima</string>
+</resources>

app/src/debug/res/values-ro/strings.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Depanare Catima</string>
+</resources>

app/src/debug/res/values-ru/strings.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Отладка Catima</string>
+</resources>

app/src/debug/res/values-sk/strings.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Catima Debug</string>
+</resources>

app/src/debug/res/values-sl/strings.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>

app/src/debug/res/values-sv/strings.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>

app/src/debug/res/values-tr/strings.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Catima Hata Ayaklama</string>
+</resources>

app/src/debug/res/values-uk/strings.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Catima Debug</string>
+</resources>

app/src/debug/res/values-vi/strings.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Gỡ lỗi Catima</string>
+</resources>

app/src/debug/res/values-zh-rCN/strings.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Catima 调试</string>
+</resources>

app/src/debug/res/values-zh-rTW/strings.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>

app/src/debug/res/values/strings.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name">Catima Debug</string>
+</resources>

app/src/main/AndroidManifest.xml

@@ -1,7 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="protect.card_locker">
+    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" />
 
@@ -18,14 +24,15 @@
     <application
         android:name=".LoyaltyCardLockerApplication"
         android:allowBackup="true"
+        android:enableOnBackInvokedCallback="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme">
+        android:theme="@style/AppTheme"
+        android:localeConfig="@xml/locales_config">
         <activity
             android:name=".MainActivity"
             android:exported="true"
-            android:label="@string/app_name"
             android:theme="@style/Theme.App.Starting">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -104,10 +111,12 @@
             android:name=".preferences.SettingsActivity"
             android:label="@string/settings"
             android:theme="@style/AppTheme.NoActionBar" />
+        <!-- FIXME: locked screenOrientation is a workaround for https://github.com/CatimaLoyalty/Android/issues/1715, remove when https://github.com/CatimaLoyalty/Android/issues/513 is fixed -->
         <activity
             android:name=".ImportExportActivity"
             android:label="@string/importExport"
             android:exported="true"
+            android:screenOrientation="locked"
             android:theme="@style/AppTheme.NoActionBar">
 
             <!-- ZIP Intent Filter -->
@@ -156,6 +165,12 @@
             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}"
@@ -172,4 +187,4 @@
             </intent-filter>
         </service>
     </application>
-</manifest>
+</manifest>

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

@@ -1,12 +1,16 @@
 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 com.google.android.material.dialog.MaterialAlertDialogBuilder;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
 
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 
 import protect.card_locker.databinding.AboutActivityBinding;
 
@@ -28,7 +32,7 @@ public class AboutActivity extends CatimaAppCompatActivity {
         enableToolbarBackButton();
 
         TextView copyright = binding.creditsSub;
-        copyright.setText(content.getCopyright());
+        copyright.setText(content.getCopyrightShort());
         TextView versionHistory = binding.versionHistorySub;
         versionHistory.setText(content.getVersionHistory());
 
@@ -39,6 +43,13 @@ 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/donate");
+
+        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();
     }
@@ -61,19 +72,14 @@ public class AboutActivity extends CatimaAppCompatActivity {
     }
 
     private void bindClickListeners() {
-        View.OnClickListener openExternalBrowser = view -> {
-            Object tag = view.getTag();
-            if (tag instanceof String && ((String) tag).startsWith("https://")) {
-                (new OpenWebLinkHandler()).openBrowser(this, (String) tag);
-            }
-        };
-        binding.versionHistory.setOnClickListener(openExternalBrowser);
-        binding.translate.setOnClickListener(openExternalBrowser);
-        binding.license.setOnClickListener(openExternalBrowser);
-        binding.repo.setOnClickListener(openExternalBrowser);
-        binding.privacy.setOnClickListener(openExternalBrowser);
-        binding.reportError.setOnClickListener(openExternalBrowser);
-        binding.rate.setOnClickListener(openExternalBrowser);
+        binding.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);
 
         binding.credits.setOnClickListener(view -> showCredits());
     }
@@ -86,14 +92,56 @@ 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);
     }
 
     private void showCredits() {
-        new MaterialAlertDialogBuilder(this)
-                .setTitle(R.string.credits)
-                .setMessage(content.getContributorInfo())
-                .setPositiveButton(R.string.ok, null)
-                .show();
+        showHTML(R.string.credits, content.getContributorInfo(), null);
+    }
+
+    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, @Nullable 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);
+
+        // Create dialog
+        MaterialAlertDialogBuilder materialAlertDialogBuilder = new MaterialAlertDialogBuilder(this);
+        materialAlertDialogBuilder
+                .setTitle(title)
+                .setView(scrollView)
+                .setPositiveButton(R.string.ok, null);
+
+        // Add View online button if an URL is linked to this view
+        if (view != null && view.getTag() != null) {
+            materialAlertDialogBuilder.setNeutralButton(R.string.view_online, (dialog, which) -> openExternalBrowser(view));
+        }
+
+        // Show dialog
+        materialAlertDialogBuilder.show();
+    }
+
+    private void openExternalBrowser(View view) {
+        Object tag = view.getTag();
+        if (tag instanceof String && ((String) tag).startsWith("https://")) {
+            (new OpenWebLinkHandler()).openBrowser(this, (String) tag);
+        }
     }
 }

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

@@ -3,6 +3,7 @@ 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;
@@ -50,6 +51,10 @@ 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 {
@@ -60,6 +65,38 @@ 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"));
@@ -92,17 +129,31 @@ public class AboutContent {
         return result.toString();
     }
 
-    public String getContributorInfo() {
+    public Spanned getContributorInfo() {
         StringBuilder contributorInfo = new StringBuilder();
-        contributorInfo.append(HtmlCompat.fromHtml(String.format(context.getString(R.string.app_contributors), getContributors()), HtmlCompat.FROM_HTML_MODE_COMPACT));
-        contributorInfo.append("\n\n");
+        contributorInfo.append(getCopyright());
+        contributorInfo.append("<br/><br/>");
         contributorInfo.append(context.getString(R.string.app_copyright_old));
-        contributorInfo.append("\n\n");
-        contributorInfo.append(HtmlCompat.fromHtml(String.format(context.getString(R.string.app_libraries), getThirdPartyLibraries()), HtmlCompat.FROM_HTML_MODE_COMPACT));
-        contributorInfo.append("\n\n");
-        contributorInfo.append(HtmlCompat.fromHtml(String.format(context.getString(R.string.app_resources), getUsedThirdPartyAssets()), HtmlCompat.FROM_HTML_MODE_COMPACT));
+        contributorInfo.append("<br/><br/>");
+        contributorInfo.append(String.format(context.getString(R.string.app_contributors), getContributors()));
+        contributorInfo.append("<br/><br/>");
+        contributorInfo.append(String.format(context.getString(R.string.app_libraries), getThirdPartyLibraries()));
+        contributorInfo.append("<br/><br/>");
+        contributorInfo.append(String.format(context.getString(R.string.app_resources), getUsedThirdPartyAssets()));
 
-        return contributorInfo.toString();
+        return HtmlCompat.fromHtml(contributorInfo.toString(), HtmlCompat.FROM_HTML_MODE_COMPACT);
+    }
+
+    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() {

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

@@ -0,0 +1,5 @@
+package protect.card_locker;
+
+public interface BarcodeImageWriterResultCallback {
+    void onBarcodeImageWriterResult(boolean success);
+}

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

@@ -41,13 +41,15 @@ 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 Runnable callback;
+    private final BarcodeImageWriterResultCallback callback;
 
     BarcodeImageWriterTask(
             Context context, ImageView imageView, String cardIdString,
             CatimaBarcode barcodeFormat, TextView textView,
-            boolean showFallback, Runnable callback, boolean roundCornerPadding
+            boolean showFallback, BarcodeImageWriterResultCallback callback, boolean roundCornerPadding
     ) {
         mContext = context;
 
@@ -61,32 +63,39 @@ public class BarcodeImageWriterTask implements CompatCallable<Bitmap> {
         cardId = cardIdString;
         format = barcodeFormat;
 
-        int padding = 0;
+        int imageViewHeight = imageView.getHeight();
+        int imageViewWidth = imageView.getWidth();
+
         // Some barcodes already have internal whitespace and shouldn't get extra padding
         // TODO: Get rid of this hack by somehow detecting this extra whitespace
         if (roundCornerPadding && !barcodeFormat.hasInternalPadding()) {
-            padding = Math.round(TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 10, context.getResources().getDisplayMetrics()));
+            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;
         }
 
         final int MAX_WIDTH = getMaxWidth(format);
 
-        int tempImageHeight;
-        int tempImageWidth;
-
-        if (imageView.getWidth() < MAX_WIDTH) {
-            tempImageHeight = imageView.getHeight();
-            tempImageWidth = imageView.getWidth();
+        if (format.isSquare()) {
+            imageHeight = imageWidth = Math.min(imageViewHeight, Math.min(MAX_WIDTH, imageViewWidth));
+        } else if (imageView.getWidth() < MAX_WIDTH) {
+            imageHeight = imageViewHeight;
+            imageWidth = imageViewWidth;
         } else {
             // Scale down the image to reduce the memory needed to produce it
-            tempImageWidth = MAX_WIDTH;
-            double ratio = (double) MAX_WIDTH / (double) imageView.getWidth();
-            tempImageHeight = (int) (imageView.getHeight() * ratio);
+            imageWidth = MAX_WIDTH;
+            double ratio = (double) MAX_WIDTH / (double) imageViewWidth;
+            imageHeight = (int) (imageViewHeight * ratio);
         }
 
-        // Ensure space for padding if wanted
-        imageWidth = tempImageWidth;
-        imageHeight = tempImageHeight - padding;
-
         this.showFallback = showFallback;
     }
 
@@ -94,12 +103,15 @@ 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:
@@ -261,6 +273,11 @@ 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) {
@@ -282,7 +299,7 @@ public class BarcodeImageWriterTask implements CompatCallable<Bitmap> {
         }
 
         if (callback != null) {
-            callback.run();
+            callback.onBarcodeImageWriterResult(isSuccesful);
         }
     }
 

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

@@ -12,13 +12,12 @@ import android.widget.EditText;
 import android.widget.ListView;
 import android.widget.Toast;
 
+import androidx.appcompat.widget.Toolbar;
+
 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;
 
 /**
@@ -66,10 +65,6 @@ 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);
             }
@@ -95,17 +90,6 @@ 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) {

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

@@ -47,25 +47,19 @@ 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.Unarchived);
-        mAdapter = new LoyaltyCardCursorAdapter(this, cardCursor, this);
+        Cursor cardCursor = DBHelper.getLoyaltyCardCursor(mDatabase, DBHelper.LoyaltyCardArchiveFilter.All);
+        mAdapter = new LoyaltyCardCursorAdapter(this, cardCursor, this, null);
         cardList.setAdapter(mAdapter);
     }
 
     private void onClickAction(int position) {
-        Cursor selected = DBHelper.getLoyaltyCardCursor(mDatabase, DBHelper.LoyaltyCardArchiveFilter.Unarchived);
+        Cursor selected = DBHelper.getLoyaltyCardCursor(mDatabase, DBHelper.LoyaltyCardArchiveFilter.All);
         selected.moveToPosition(position);
         LoyaltyCard loyaltyCard = LoyaltyCard.toLoyaltyCard(selected);
 
@@ -81,7 +75,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);
     }
 
@@ -89,8 +83,8 @@ public class CardShortcutConfigure extends CatimaAppCompatActivity implements Lo
     public boolean onOptionsItemSelected(MenuItem inputItem) {
         int id = inputItem.getItemId();
 
-        if (id == R.id.action_unfold) {
-            mAdapter.showDetails(!mAdapter.showingDetails());
+        if (id == R.id.action_display_options) {
+            mAdapter.showDisplayOptionsDialog();
             invalidateOptionsMenu();
 
             return true;

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

@@ -1,6 +1,5 @@
 package protect.card_locker;
 
-import android.annotation.SuppressLint;
 import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
@@ -16,13 +15,13 @@ import android.service.controls.actions.ControlAction;
 import android.service.controls.templates.StatelessTemplate;
 import android.util.Log;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.RequiresApi;
+
 import java.util.List;
 import java.util.concurrent.Flow;
 import java.util.function.Consumer;
 
-import androidx.annotation.NonNull;
-import androidx.annotation.RequiresApi;
-
 @RequiresApi(Build.VERSION_CODES.R)
 public class CardsOnPowerScreenService extends ControlsProviderService {
 
@@ -69,10 +68,9 @@ public class CardsOnPowerScreenService extends ControlsProviderService {
             subscriber.onSubscribe(new NoOpSubscription());
             for (String controlId : controlIds) {
                 Control control;
-
-                try {
-                    Integer cardId = this.controlIdToCardId(controlId);
-                    LoyaltyCard card = DBHelper.getLoyaltyCard(mDatabase, cardId);
+                Integer cardId = this.controlIdToCardId(controlId);
+                LoyaltyCard card = DBHelper.getLoyaltyCard(mDatabase, cardId);
+                if (card != null) {
                     Intent openIntent = new Intent(this, LoyaltyCardViewActivity.class)
                             .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
                             .putExtra("id", card.id);
@@ -85,7 +83,7 @@ public class CardsOnPowerScreenService extends ControlsProviderService {
                             .setControlTemplate(new StatelessTemplate(controlId))
                             .setCustomIcon(Icon.createWithBitmap(getIcon(this, card)))
                             .build();
-                } catch (NullPointerException ignored) {
+                } else {
                     Intent mainScreenIntent = new Intent(this, MainActivity.class)
                             .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
                     PendingIntent pendingIntent = PendingIntent.getActivity(getBaseContext(), -1, mainScreenIntent, PendingIntent.FLAG_IMMUTABLE);

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

@@ -5,6 +5,7 @@ import android.graphics.Color;
 import android.os.Build;
 import android.os.Bundle;
 import android.view.View;
+import android.view.Window;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -13,6 +14,8 @@ import androidx.appcompat.app.AppCompatActivity;
 import androidx.core.view.WindowInsetsControllerCompat;
 
 public class CatimaAppCompatActivity extends AppCompatActivity {
+    protected boolean activityOverridesNavBarColor = false;
+
     @Override
     protected void attachBaseContext(Context base) {
         // Apply chosen language
@@ -30,20 +33,31 @@ public class CatimaAppCompatActivity extends AppCompatActivity {
         super.onPostCreate(savedInstanceState);
         // material 3 designer does not consider status bar colors
         // XXX changing this in onCreate causes issues with the splash screen activity, so doing this here
-        boolean darkMode = Utils.isDarkModeEnabled(this);
-        if (Build.VERSION.SDK_INT >= 23) {
-            View decorView = getWindow().getDecorView();
-            WindowInsetsControllerCompat wic = new WindowInsetsControllerCompat(getWindow(), decorView);
-            wic.setAppearanceLightStatusBars(!darkMode);
-            getWindow().setStatusBarColor(Color.TRANSPARENT);
-        } else {
-            // icons are always white back then
-            getWindow().setStatusBarColor(darkMode ? Color.TRANSPARENT : Color.argb(127, 0, 0, 0));
+        Window window = getWindow();
+        if (window != null) {
+            boolean darkMode = Utils.isDarkModeEnabled(this);
+            if (Build.VERSION.SDK_INT >= 23) {
+                View decorView = window.getDecorView();
+                WindowInsetsControllerCompat wic = new WindowInsetsControllerCompat(window, decorView);
+                wic.setAppearanceLightStatusBars(!darkMode);
+                window.setStatusBarColor(Color.TRANSPARENT);
+            } else {
+                // icons are always white back then
+                window.setStatusBarColor(darkMode ? Color.TRANSPARENT : Color.argb(127, 0, 0, 0));
+            }
         }
         // XXX android 9 and below has a nasty rendering bug if the theme was patched earlier
         Utils.postPatchColors(this);
     }
 
+    @Override
+    protected void onResume() {
+        super.onResume();
+        if (!activityOverridesNavBarColor) {
+            Utils.setNavigationBarColor(this, null, Utils.resolveBackgroundColor(this), !Utils.isDarkModeEnabled(this));
+        }
+    }
+
     protected void enableToolbarBackButton() {
         ActionBar actionBar = getSupportActionBar();
         if (actionBar != null) {

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

@@ -67,7 +67,6 @@ public class CatimaBarcode {
 
     public boolean isSquare() {
         return mBarcodeFormat == BarcodeFormat.AZTEC
-                || mBarcodeFormat == BarcodeFormat.DATA_MATRIX
                 || mBarcodeFormat == BarcodeFormat.MAXICODE
                 || mBarcodeFormat == BarcodeFormat.QR_CODE;
     }

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

@@ -16,13 +16,18 @@ 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";
@@ -106,7 +111,7 @@ public class DBHelper extends SQLiteOpenHelper {
                 LoyaltyCardDbIds.BARCODE_TYPE + " TEXT," +
                 LoyaltyCardDbIds.STAR_STATUS + " INTEGER DEFAULT '0'," +
                 LoyaltyCardDbIds.LAST_USED + " INTEGER DEFAULT '0', " +
-                LoyaltyCardDbIds.ZOOM_LEVEL + " INTEGER DEFAULT '100', " +
+                LoyaltyCardDbIds.ZOOM_LEVEL + " INTEGER DEFAULT '" + DEFAULT_ZOOM_LEVEL + "', " +
                 LoyaltyCardDbIds.ARCHIVE_STATUS + " INTEGER DEFAULT '0' )");
 
         // create associative table for cards in groups
@@ -323,6 +328,21 @@ 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

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

@@ -7,17 +7,15 @@ import android.database.sqlite.SQLiteDatabase;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.ImageButton;
+import android.widget.Button;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 
 import protect.card_locker.databinding.GroupLayoutBinding;
-import protect.card_locker.preferences.Settings;
 
 public class GroupCursorAdapter extends BaseCursorAdapter<GroupCursorAdapter.GroupListItemViewHolder> {
-    Settings mSettings;
     public final Context mContext;
     private final GroupAdapterListener mListener;
     SQLiteDatabase mDatabase;
@@ -25,7 +23,6 @@ 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();
@@ -63,8 +60,6 @@ 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);
     }
@@ -88,7 +83,7 @@ public class GroupCursorAdapter extends BaseCursorAdapter<GroupCursorAdapter.Gro
 
     public static class GroupListItemViewHolder extends RecyclerView.ViewHolder {
         public TextView mName, mCardCount;
-        public ImageButton mMoveUp, mMoveDown, mEdit, mDelete;
+        public Button mMoveUp, mMoveDown, mEdit, mDelete;
 
         public GroupListItemViewHolder(GroupLayoutBinding groupLayoutBinding) {
             super(groupLayoutBinding.getRoot());

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

@@ -1,10 +1,8 @@
 package protect.card_locker;
 
-import android.Manifest;
 import android.content.ActivityNotFoundException;
 import android.content.DialogInterface;
 import android.content.Intent;
-import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.Bundle;
 import android.text.InputType;
@@ -14,25 +12,24 @@ import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.FrameLayout;
+import android.widget.LinearLayout;
 import android.widget.Toast;
 
+import androidx.activity.result.ActivityResultLauncher;
+import androidx.activity.result.contract.ActivityResultContracts;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.widget.Toolbar;
+
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+import com.google.android.material.textfield.TextInputLayout;
+
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.List;
 
-import androidx.activity.result.ActivityResultLauncher;
-import androidx.activity.result.contract.ActivityResultContracts;
-import androidx.annotation.Nullable;
-import androidx.appcompat.app.ActionBar;
-import androidx.appcompat.app.AlertDialog;
-import androidx.appcompat.widget.Toolbar;
-import androidx.core.app.ActivityCompat;
-import androidx.core.content.ContextCompat;
-
-import com.google.android.material.dialog.MaterialAlertDialogBuilder;
-
 import protect.card_locker.async.TaskHandler;
 import protect.card_locker.databinding.ImportExportActivityBinding;
 import protect.card_locker.importexport.DataFormat;
@@ -126,16 +123,19 @@ public class ImportExportActivity extends CatimaAppCompatActivity {
             builder.setTitle(R.string.exportPassword);
 
             FrameLayout container = new FrameLayout(ImportExportActivity.this);
-            FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
-            params.leftMargin = 50;
-            params.rightMargin = 50;
+
+            final TextInputLayout textInputLayout = new TextInputLayout(ImportExportActivity.this);
+            textInputLayout.setEndIconMode(TextInputLayout.END_ICON_PASSWORD_TOGGLE);
+            LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+            params.setMargins(50, 10, 50, 0);
+            textInputLayout.setLayoutParams(params);
 
             final EditText input = new EditText(ImportExportActivity.this);
             input.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD);
-            input.setLayoutParams(params);
             input.setHint(R.string.exportPasswordHint);
 
-            container.addView(input);
+            textInputLayout.addView(input);
+            container.addView(textInputLayout);
             builder.setView(container);
             builder.setPositiveButton(R.string.ok, (dialogInterface, i) -> {
                 exportPassword = input.getText().toString();
@@ -148,7 +148,6 @@ public class ImportExportActivity extends CatimaAppCompatActivity {
             });
             builder.setNegativeButton(R.string.cancel, (dialogInterface, i) -> dialogInterface.cancel());
             builder.show();
-
         });
 
         // Check that there is a file manager available
@@ -320,9 +319,21 @@ public class ImportExportActivity extends CatimaAppCompatActivity {
         AlertDialog.Builder builder = new MaterialAlertDialogBuilder(this);
         builder.setTitle(R.string.passwordRequired);
 
-        final EditText input = new EditText(this);
+        FrameLayout container = new FrameLayout(ImportExportActivity.this);
+
+        final TextInputLayout textInputLayout = new TextInputLayout(ImportExportActivity.this);
+        textInputLayout.setEndIconMode(TextInputLayout.END_ICON_PASSWORD_TOGGLE);
+        LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+        params.setMargins(50, 10, 50, 0);
+        textInputLayout.setLayoutParams(params);
+
+        final EditText input = new EditText(ImportExportActivity.this);
         input.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD);
-        builder.setView(input);
+        input.setHint(R.string.exportPasswordHint);
+
+        textInputLayout.addView(input);
+        container.addView(textInputLayout);
+        builder.setView(container);
 
         builder.setPositiveButton(R.string.ok, (dialogInterface, i) -> {
             openFileForImport(uri, input.getText().toString().toCharArray());

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

@@ -46,8 +46,11 @@ 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]) && uri.getPath().equals(paths[i])) {
+            if (uri.getHost().equals(hosts[i]) && uriPath.equals(paths[i])) {
                 return true;
             }
         }
@@ -123,7 +126,7 @@ public class ImportURIHelper {
             }
 
             return new LoyaltyCard(-1, store, note, validFrom, expiry, balance, balanceType, cardId, barcodeId, barcodeType, headerColor, 0, Utils.getUnixTime(), 100, 0);
-        } catch (NullPointerException | NumberFormatException | UnsupportedEncodingException | ArrayIndexOutOfBoundsException ex) {
+        } catch (NumberFormatException | UnsupportedEncodingException | ArrayIndexOutOfBoundsException ex) {
             throw new InvalidObjectException("Not a valid import URI");
         }
     }

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

@@ -4,40 +4,39 @@ import android.database.Cursor;
 import android.os.Parcel;
 import android.os.Parcelable;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import java.math.BigDecimal;
 import java.util.Currency;
 import java.util.Date;
 
-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, final Date validFrom,
-                       final Date expiry, final BigDecimal balance, 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, @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,
                        @Nullable final Integer headerColor, final int starStatus,
                        final long lastUsed, final int zoomLevel, final int archiveStatus) {
         this.id = id;
@@ -145,11 +144,54 @@ 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) {

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

@@ -1,7 +1,6 @@
 package protect.card_locker;
 
 import android.content.Context;
-import android.content.SharedPreferences;
 import android.content.res.Resources;
 import android.database.Cursor;
 import android.graphics.Bitmap;
@@ -16,13 +15,6 @@ import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.google.android.material.card.MaterialCardView;
-import com.google.android.material.color.MaterialColors;
-
-import java.math.BigDecimal;
-import java.text.DateFormat;
-import java.util.ArrayList;
-
 import androidx.annotation.NonNull;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.core.content.ContextCompat;
@@ -30,59 +22,48 @@ import androidx.core.graphics.BlendModeColorFilterCompat;
 import androidx.core.graphics.BlendModeCompat;
 import androidx.recyclerview.widget.RecyclerView;
 
+import com.google.android.material.card.MaterialCardView;
+import com.google.android.material.color.MaterialColors;
+
+import java.math.BigDecimal;
+import java.text.DateFormat;
+import java.util.ArrayList;
+
 import 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) {
+    public LoyaltyCardCursorAdapter(Context inputContext, Cursor inputCursor, CardAdapterListener inputListener, Runnable inputSwapCursorCallback) {
         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 refreshState() {
-        // Retrieve user details preference
-        SharedPreferences cardDetailsPref = mContext.getSharedPreferences(
-                mContext.getString(R.string.sharedpreference_card_details),
-                Context.MODE_PRIVATE);
-        mShowDetails = cardDetailsPref.getBoolean(mContext.getString(R.string.sharedpreference_card_details_show), true);
+    public void showDisplayOptionsDialog() {
+        mLoyaltyCardListDisplayOptions.showDisplayOptionsDialog();
     }
 
-    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;
+    public boolean showingArchivedCards() {
+        return mLoyaltyCardListDisplayOptions.showingArchivedCards();
     }
 
     @NonNull
@@ -103,45 +84,46 @@ 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);
 
-        inputHolder.setStoreField(loyaltyCard.store);
-        if (mShowDetails && !loyaltyCard.note.isEmpty()) {
+        if (mLoyaltyCardListDisplayOptions.showingNameBelowThumbnail() && icon != null) {
+            showDivider = true;
+            inputHolder.setStoreField(loyaltyCard.store);
+        } else {
+            inputHolder.setStoreField(null);
+        }
+
+        if (mLoyaltyCardListDisplayOptions.showingNote() && !loyaltyCard.note.isEmpty()) {
+            showDivider = true;
             inputHolder.setNoteField(loyaltyCard.note);
         } else {
             inputHolder.setNoteField(null);
         }
 
-        if (mShowDetails && !loyaltyCard.balance.equals(new BigDecimal("0"))) {
-            inputHolder.setExtraField(inputHolder.mBalanceField, Utils.formatBalance(mContext, loyaltyCard.balance, loyaltyCard.balanceType), null);
+        if (mLoyaltyCardListDisplayOptions.showingBalance() && !loyaltyCard.balance.equals(new BigDecimal("0"))) {
+            inputHolder.setExtraField(inputHolder.mBalanceField, Utils.formatBalance(mContext, loyaltyCard.balance, loyaltyCard.balanceType), null, showDivider);
         } else {
-            inputHolder.setExtraField(inputHolder.mBalanceField, null, null);
+            inputHolder.setExtraField(inputHolder.mBalanceField, null, null, false);
         }
 
-        if (mShowDetails && loyaltyCard.validFrom != null) {
-            inputHolder.setExtraField(inputHolder.mValidFromField, DateFormat.getDateInstance(DateFormat.LONG).format(loyaltyCard.validFrom), Utils.isNotYetValid(loyaltyCard.validFrom) ? Color.RED : 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);
         } else {
-            inputHolder.setExtraField(inputHolder.mValidFromField, null, null);
+            inputHolder.setExtraField(inputHolder.mValidFromField, null, null, false);
         }
 
-        if (mShowDetails && loyaltyCard.expiry != null) {
-            inputHolder.setExtraField(inputHolder.mExpiryField, DateFormat.getDateInstance(DateFormat.LONG).format(loyaltyCard.expiry), Utils.hasExpired(loyaltyCard.expiry) ? Color.RED : 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);
         } else {
-            inputHolder.setExtraField(inputHolder.mExpiryField, null, null);
+            inputHolder.setExtraField(inputHolder.mExpiryField, null, null, false);
         }
 
-        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 : R.attr.colorPrimary);
+        inputHolder.mCardIcon.setContentDescription(loyaltyCard.store);
+        inputHolder.mIconBackgroundColor = Utils.setIconOrTextWithBackground(mContext, loyaltyCard, icon, inputHolder.mCardIcon, inputHolder.mCardText);
 
         inputHolder.toggleCardStateIcon(loyaltyCard.starStatus != 0, loyaltyCard.archiveStatus != 0, itemSelected(inputCursor.getPosition()));
 
@@ -153,19 +135,6 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
         inputHolder.mRow.requestLayout();
     }
 
-    private void setHeaderHeight(LoyaltyCardListItemViewHolder inputHolder, boolean expanded) {
-        int iconHeight;
-        if (expanded) {
-            iconHeight = ViewGroup.LayoutParams.MATCH_PARENT;
-        } else {
-            iconHeight = (int) mContext.getResources().getDimension(R.dimen.cardThumbnailSize);
-        }
-
-        inputHolder.mIconLayout.getLayoutParams().height = expanded ? 0 : iconHeight;
-        inputHolder.mCardIcon.getLayoutParams().height = iconHeight;
-        inputHolder.mTickIcon.getLayoutParams().height = iconHeight;
-    }
-
     private void applyClickEvents(LoyaltyCardListItemViewHolder inputHolder, final int inputPosition) {
         inputHolder.mRow.setOnClickListener(inputView -> mListener.onRowClicked(inputPosition));
 
@@ -241,16 +210,14 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
 
     public class LoyaltyCardListItemViewHolder extends RecyclerView.ViewHolder {
 
-        public TextView mStoreField, mNoteField, mBalanceField, mValidFromField, mExpiryField;
+        public TextView mCardText, mStoreField, mNoteField, mBalanceField, mValidFromField, mExpiryField;
         public ImageView mCardIcon, mStarBackground, mStarBorder, mTickIcon, mArchivedBackground;
-        public MaterialCardView mRow, mIconLayout;
+        public MaterialCardView mRow;
         public ConstraintLayout mStar, mArchived;
         public View mDivider;
 
         private int mIconBackgroundColor;
 
-
-
         protected LoyaltyCardListItemViewHolder(LoyaltyCardLayoutBinding loyaltyCardLayoutBinding, CardAdapterListener inputListener) {
             super(loyaltyCardLayoutBinding.getRoot());
             View inputView = loyaltyCardLayoutBinding.getRoot();
@@ -261,8 +228,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;
@@ -276,7 +243,7 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
             });
         }
 
-        private void setExtraField(TextView field, String text, Integer color) {
+        private void setExtraField(TextView field, String text, Integer color, boolean showDivider) {
             // If text is null, hide the field
             // If iconColor is null, use the default text and icon color based on theme
             if (text == null) {
@@ -285,20 +252,18 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
                 return;
             }
 
-            int size = mSettings.getFontSizeMax(mSettings.getSmallFont());
+            // Shown when there is a name and/or note and at least 1 extra field
+            if (showDivider) {
+                mDivider.setVisibility(View.VISIBLE);
+            }
 
-            field.setVisibility(View.VISIBLE);
             field.setText(text);
-            field.setTextSize(size);
-            field.setTextColor(color != null ? color : MaterialColors.getColor(mContext, R.attr.colorSecondary, ContextCompat.getColor(mContext, mDarkModeEnabled ? R.color.md_theme_dark_secondary : R.color.md_theme_light_secondary)));
-
-            int drawableSize = dpToPx((size * 24) / 14, mContext);
-            mDivider.setVisibility(View.VISIBLE);
+            field.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);
+
             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) {
@@ -312,8 +277,12 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
         }
 
         public void setStoreField(String text) {
-            mStoreField.setText(text);
-            mStoreField.setTextSize(mSettings.getFontSizeMax(mSettings.getMediumFont()));
+            if (text == null) {
+                mStoreField.setVisibility(View.GONE);
+            } else {
+                mStoreField.setVisibility(View.VISIBLE);
+                mStoreField.setText(text);
+            }
             mStoreField.requestLayout();
         }
 
@@ -323,7 +292,6 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
             } else {
                 mNoteField.setVisibility(View.VISIBLE);
                 mNoteField.setText(text);
-                mNoteField.setTextSize(mSettings.getFontSizeMax(mSettings.getSmallFont()));
             }
             mNoteField.requestLayout();
         }
@@ -370,11 +338,6 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
             mArchivedBackground.invalidate();
 
         }
-
-        public void setIconBackgroundColor(int color) {
-            mIconBackgroundColor = color;
-            mCardIcon.setBackgroundColor(color);
-        }
     }
 
     public int dpToPx(int dp, Context mContext) {

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

@@ -1,10 +1,7 @@
 package protect.card_locker;
 
-import android.Manifest;
 import android.annotation.SuppressLint;
 import android.app.Activity;
-import android.app.DatePickerDialog;
-import android.app.Dialog;
 import android.content.ActivityNotFoundException;
 import android.content.Context;
 import android.content.Intent;
@@ -24,23 +21,40 @@ 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;
 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.OnBackPressedCallback;
+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 com.google.android.material.chip.Chip;
 import com.google.android.material.chip.ChipGroup;
 import com.google.android.material.color.MaterialColors;
+import com.google.android.material.datepicker.CalendarConstraints;
+import com.google.android.material.datepicker.DateValidatorPointBackward;
+import com.google.android.material.datepicker.DateValidatorPointForward;
+import com.google.android.material.datepicker.MaterialDatePicker;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
-import com.google.android.material.snackbar.Snackbar;
 import com.google.android.material.tabs.TabLayout;
 import com.jaredrummler.android.colorpicker.ColorPickerDialog;
 import com.jaredrummler.android.colorpicker.ColorPickerDialogListener;
@@ -59,38 +73,26 @@ import java.util.Calendar;
 import java.util.Collections;
 import java.util.Currency;
 import java.util.Date;
-import java.util.GregorianCalendar;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 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.ActionBar;
-import androidx.appcompat.app.AlertDialog;
-import androidx.appcompat.widget.AppCompatTextView;
-import androidx.appcompat.widget.Toolbar;
-import androidx.core.content.ContextCompat;
-import androidx.core.content.FileProvider;
-import androidx.exifinterface.media.ExifInterface;
-import androidx.fragment.app.DialogFragment;
 import protect.card_locker.async.TaskHandler;
 import protect.card_locker.databinding.LayoutChipChoiceBinding;
 import protect.card_locker.databinding.LoyaltyCardEditActivityBinding;
 
-public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
+public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements BarcodeImageWriterResultCallback, ColorPickerDialogListener {
     private LoyaltyCardEditActivityBinding binding;
     private static final String TAG = "Catima";
 
     private final String STATE_TAB_INDEX = "savedTab";
     private final String STATE_TEMP_CARD = "tempLoyaltyCard";
+    private final String STATE_TEMP_CARD_FIELD = "tempLoyaltyCardField";
     private final String STATE_REQUESTED_IMAGE = "requestedImage";
     private final String STATE_FRONT_IMAGE_UNSAVED = "frontImageUnsaved";
     private final String STATE_BACK_IMAGE_UNSAVED = "backImageUnsaved";
@@ -100,6 +102,10 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
     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 static final String PICK_DATE_REQUEST_KEY = "pick_date_request";
+    private static final String NEWLY_PICKED_DATE_ARGUMENT_KEY = "newly_picked_date";
 
     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";
@@ -120,6 +126,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
     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";
@@ -154,6 +161,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
     int loyaltyCardId;
     boolean updateLoyaltyCard;
     boolean duplicateFromLoyaltyCardId;
+    boolean openSetIconMenu;
     String cardId;
     String barcodeId;
     String barcodeType;
@@ -168,14 +176,15 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
     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;
+    LoyaltyCardField tempLoyaltyCardField;
 
     ActivityResultLauncher<Uri> mPhotoTakerLauncher;
     ActivityResultLauncher<Intent> mPhotoPickerLauncher;
@@ -226,7 +235,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
         );
     }
 
-    private void updateTempState(LoyaltyCardField fieldName, Object value) {
+    protected void updateTempState(LoyaltyCardField fieldName, Object value) {
         tempLoyaltyCard = updateTempState(tempLoyaltyCard, fieldName, value);
 
         if (initDone && (fieldName == LoyaltyCardField.cardId || fieldName == LoyaltyCardField.barcodeId || fieldName == LoyaltyCardField.barcodeType)) {
@@ -242,6 +251,8 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
         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;
@@ -253,13 +264,13 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
                 + ", updateLoyaltyCard=" + updateLoyaltyCard);
     }
 
-
     @Override
     public void onSaveInstanceState(@NonNull Bundle savedInstanceState) {
         super.onSaveInstanceState(savedInstanceState);
         tabs = binding.tabs;
         savedInstanceState.putInt(STATE_TAB_INDEX, tabs.getSelectedTabPosition());
         savedInstanceState.putParcelable(STATE_TEMP_CARD, tempLoyaltyCard);
+        savedInstanceState.putSerializable(STATE_TEMP_CARD_FIELD, tempLoyaltyCardField);
         savedInstanceState.putInt(STATE_REQUESTED_IMAGE, mRequestedImage);
 
         Object cardImageFrontObj = cardImageFront.getTag();
@@ -288,11 +299,14 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
         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);
+        tempLoyaltyCardField = (LoyaltyCardField) savedInstanceState.getSerializable(STATE_TEMP_CARD_FIELD);
         super.onRestoreInstanceState(savedInstanceState);
         tabs = binding.tabs;
         tabs.selectTab(tabs.getTabAt(savedInstanceState.getInt(STATE_TAB_INDEX)));
@@ -305,6 +319,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
         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
@@ -324,6 +339,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
 
         for (Currency currency : Currency.getAvailableCurrencies()) {
             currencies.put(currency.getSymbol(), currency);
+            currencySymbols.put(currency.getCurrencyCode(), currency.getSymbol());
         }
 
         tabs = binding.tabs;
@@ -350,18 +366,18 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
 
         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) {
-                updateTempState(LoyaltyCardField.store, s.toString());
-                generateIcon(s.toString());
+                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);
+                }
             }
         });
 
@@ -376,8 +392,14 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
 
         addDateFieldTextChangedListener(expiryField, R.string.never, R.string.chooseExpiryDate, LoyaltyCardField.expiry);
 
+        setMaterialDatePickerResultListener();
+
         balanceField.setOnFocusChangeListener((v, hasFocus) -> {
-            if (!hasFocus) {
+            if (!hasFocus && !onResuming && !onRestoring) {
+                if (balanceField.getText().toString().isEmpty()) {
+                    updateTempState(LoyaltyCardField.balance, BigDecimal.valueOf(0));
+                }
+
                 balanceField.setText(Utils.formatBalanceWithoutCurrencySymbol(tempLoyaltyCard.balance, tempLoyaltyCard.balanceType));
             }
         });
@@ -385,13 +407,16 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
         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) {
-                    validBalance = false;
                     e.printStackTrace();
+                    balanceField.setError(getString(R.string.balanceParsingFailed));
+                    validBalance = false;
                 }
             }
         });
@@ -409,7 +434,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
 
                 updateTempState(LoyaltyCardField.balanceType, currency);
 
-                if (tempLoyaltyCard.balance != null) {
+                if (tempLoyaltyCard.balance != null && !onResuming && !onRestoring) {
                     balanceField.setText(Utils.formatBalanceWithoutCurrencySymbol(tempLoyaltyCard.balance, currency));
                 }
             }
@@ -467,6 +492,12 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
             @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);
+                }
             }
         });
 
@@ -495,10 +526,20 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
                     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(input);
+                    builder.setView(container);
 
                     builder.setPositiveButton(getString(R.string.ok), (dialog, which) -> {
                         // If the user manually changes the barcode again make sure we disable the
@@ -656,6 +697,13 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
         });
 
         mCropperOptions = new UCrop.Options();
+
+        getOnBackPressedDispatcher().addCallback(this, new OnBackPressedCallback(true) {
+            @Override
+            public void handleOnBackPressed() {
+                askBeforeQuitIfChanged();
+            }
+        });
     }
 
     // ucrop 2.2.6 initial aspect ratio is glitched when 0x0 is used as the initial ratio option
@@ -672,16 +720,16 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
         }
         mCropperOptions.setAspectRatioOptions(selectedByDefault,
                 new AspectRatio(null, 1, 1),
-                new AspectRatio(getResources().getString(R.string.ucrop_label_original).toUpperCase(), sourceWidth, sourceHeight),
+                new AspectRatio(getResources().getString(com.yalantis.ucrop.R.string.ucrop_label_original).toUpperCase(), sourceWidth, sourceHeight),
                 new AspectRatio(getResources().getString(R.string.card).toUpperCase(), 85.6f, 53.98f)
         );
 
         // Fix theming
 
-        int colorPrimary = MaterialColors.getColor(this, R.attr.colorPrimary, ContextCompat.getColor(this, R.color.md_theme_light_primary));
-        int colorOnPrimary = MaterialColors.getColor(this, R.attr.colorOnPrimary, ContextCompat.getColor(this, R.color.md_theme_light_onPrimary));
-        int colorSurface = MaterialColors.getColor(this, R.attr.colorSurface, ContextCompat.getColor(this, R.color.md_theme_light_surface));
-        int colorOnSurface = MaterialColors.getColor(this, R.attr.colorOnSurface, ContextCompat.getColor(this, R.color.md_theme_light_onSurface));
+        int colorPrimary = MaterialColors.getColor(this, androidx.appcompat.R.attr.colorPrimary, ContextCompat.getColor(this, R.color.md_theme_light_primary));
+        int colorOnPrimary = MaterialColors.getColor(this, com.google.android.material.R.attr.colorOnPrimary, ContextCompat.getColor(this, R.color.md_theme_light_onPrimary));
+        int colorSurface = MaterialColors.getColor(this, com.google.android.material.R.attr.colorSurface, ContextCompat.getColor(this, R.color.md_theme_light_surface));
+        int colorOnSurface = MaterialColors.getColor(this, com.google.android.material.R.attr.colorOnSurface, ContextCompat.getColor(this, R.color.md_theme_light_onSurface));
         int colorBackground = MaterialColors.getColor(this, android.R.attr.colorBackground, ContextCompat.getColor(this, R.color.md_theme_light_onSurface));
         mCropperOptions.setToolbarColor(colorSurface);
         mCropperOptions.setStatusBarColor(colorSurface);
@@ -729,7 +777,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
 
     @SuppressLint("DefaultLocale")
     @Override
-    public void onResume() {
+    protected void onResume() {
         super.onResume();
 
         Log.i(TAG, "To view card: " + loyaltyCardId);
@@ -800,11 +848,19 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
         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);
 
@@ -845,10 +901,9 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
             }
         }
 
-        // Generate random header color
         if (tempLoyaltyCard.headerColor == null) {
-            // Select a random color to start out with.
-            updateTempState(LoyaltyCardField.headerColor, Utils.getRandomHeaderColor(this));
+            // 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));
         }
 
         // Update from intent
@@ -895,7 +950,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
         saveButton.setOnClickListener(v -> doSave());
         saveButton.bringToFront();
 
-        generateIcon(storeFieldEdit.getText().toString());
+        generateIcon(storeFieldEdit.getText().toString().trim());
 
         // 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
@@ -908,12 +963,20 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
         }
 
         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, tempLoyaltyCard.headerColor != null ? tempLoyaltyCard.headerColor : R.attr.colorPrimary);
+            int headerColor = Utils.getHeaderColorFromImage((Bitmap) icon, Utils.getHeaderColor(this, tempLoyaltyCard));
 
             updateTempState(LoyaltyCardField.headerColor, headerColor);
 
@@ -947,21 +1010,20 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
             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 = new DatePickerFragment(
-                            LoyaltyCardEditActivity.this,
-                            dateField,
+                    showDatePicker(
+                            loyaltyCardField,
+                            (Date) dateField.getTag(),
                             // 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");
+                            loyaltyCardField == LoyaltyCardField.validFrom ? (Date) expiryField.getTag() : null
+                    );
                 }
-
-                updateTempState(loyaltyCardField, dateField.getTag());
             }
 
             @Override
@@ -997,15 +1059,10 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
         if (balanceType == null) {
             balanceCurrencyField.setText(getString(R.string.points));
         } else {
-            balanceCurrencyField.setText(balanceType.getSymbol());
+            balanceCurrencyField.setText(getCurrencySymbol(balanceType));
         }
     }
 
-    @Override
-    public void onBackPressed() {
-        askBeforeQuitIfChanged();
-    }
-
     @Override
     public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
         super.onRequestPermissionsResult(requestCode, permissions, grantResults);
@@ -1131,7 +1188,12 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
         Uri photoURI = FileProvider.getUriForFile(LoyaltyCardEditActivity.this, BuildConfig.APPLICATION_ID, Utils.createTempFile(this, TEMP_CAMERA_IMAGE_NAME));
         mRequestedImage = type;
 
-        mPhotoTakerLauncher.launch(photoURI);
+        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);
+        }
     }
 
     private void selectImageFromGallery(int type) {
@@ -1152,6 +1214,14 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
         }
     }
 
+    @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) {
@@ -1203,31 +1273,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
                     }
 
                     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;
                 });
             }
@@ -1304,73 +1350,129 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
         }
     }
 
-    public static class DatePickerFragment extends DialogFragment
-            implements DatePickerDialog.OnDateSetListener {
+    // 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;
 
-        final Context context;
-        final EditText textFieldEdit;
-        @Nullable
-        final Date minDate;
-        @Nullable
-        final Date maxDate;
+        updateTempState(LoyaltyCardField.headerColor, color);
 
-        DatePickerFragment(Context context, EditText textFieldEdit, @Nullable Date minDate, @Nullable Date maxDate) {
-            this.context = context;
-            this.textFieldEdit = textFieldEdit;
-            this.minDate = minDate;
-            this.maxDate = maxDate;
+        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
+    }
+
+    private void showDatePicker(
+            LoyaltyCardField loyaltyCardField,
+            @Nullable Date selectedDate,
+            @Nullable Date minDate,
+            @Nullable Date maxDate
+    ) {
+        // Create a new instance of MaterialDatePicker and return it
+        long startDate = minDate != null ? minDate.getTime() : getDefaultMinDateOfDatePicker();
+        long endDate = maxDate != null ? maxDate.getTime() : getDefaultMaxDateOfDatePicker();
+
+        CalendarConstraints.DateValidator dateValidator;
+        switch (loyaltyCardField) {
+            case validFrom:
+                dateValidator = DateValidatorPointBackward.before(endDate);
+                break;
+            case expiry:
+                dateValidator = DateValidatorPointForward.from(startDate);
+                break;
+            default:
+                throw new AssertionError("Unexpected field: " + loyaltyCardField);
         }
 
-        @NonNull
-        @Override
-        public Dialog onCreateDialog(Bundle savedInstanceState) {
-            // Use the current date as the default date in the picker
-            final Calendar c = Calendar.getInstance();
+        CalendarConstraints calendarConstraints = new CalendarConstraints.Builder()
+                .setValidator(dateValidator)
+                .setStart(startDate)
+                .setEnd(endDate)
+                .build();
 
-            Date date = (Date) textFieldEdit.getTag();
-            if (date != null) {
-                c.setTime(date);
+        // Use the selected date as the default date in the picker
+        final Calendar calendar = Calendar.getInstance();
+        if (selectedDate != null) {
+            calendar.setTime(selectedDate);
+        }
+
+        MaterialDatePicker<Long> materialDatePicker = MaterialDatePicker.Builder.datePicker()
+                .setSelection(calendar.getTimeInMillis())
+                .setCalendarConstraints(calendarConstraints)
+                .build();
+
+        // Required to handle configuration changes
+        // See https://github.com/material-components/material-components-android/issues/1688
+        tempLoyaltyCardField = loyaltyCardField;
+        getSupportFragmentManager().addFragmentOnAttachListener((fragmentManager, fragment) -> {
+            if (fragment instanceof MaterialDatePicker && Objects.equals(fragment.getTag(), PICK_DATE_REQUEST_KEY)) {
+                ((MaterialDatePicker<Long>) fragment).addOnPositiveButtonClickListener(selection -> {
+                    Bundle args = new Bundle();
+                    args.putLong(NEWLY_PICKED_DATE_ARGUMENT_KEY, selection);
+                    getSupportFragmentManager().setFragmentResult(PICK_DATE_REQUEST_KEY, args);
+                });
             }
+        });
 
-            int year = c.get(Calendar.YEAR);
-            int month = c.get(Calendar.MONTH);
-            int day = c.get(Calendar.DAY_OF_MONTH);
+        materialDatePicker.show(getSupportFragmentManager(), PICK_DATE_REQUEST_KEY);
+    }
 
-            // Create a new instance of DatePickerDialog and return it
-            DatePickerDialog datePickerDialog = new DatePickerDialog(getActivity(), this, year, month, day);
-            datePickerDialog.getDatePicker().setMinDate(minDate != null ? minDate.getTime() : getDefaultMinDateOfDatePicker());
-            datePickerDialog.getDatePicker().setMaxDate(maxDate != null ? maxDate.getTime() : getDefaultMaxDateOfDatePicker());
-            return datePickerDialog;
+    // Required to handle configuration changes
+    // See https://github.com/material-components/material-components-android/issues/1688
+    private void setMaterialDatePickerResultListener() {
+        MaterialDatePicker<Long> fragment = (MaterialDatePicker<Long>) getSupportFragmentManager().findFragmentByTag(PICK_DATE_REQUEST_KEY);
+        if (fragment != null) {
+            fragment.addOnPositiveButtonClickListener(selection -> {
+                Bundle args = new Bundle();
+                args.putLong(NEWLY_PICKED_DATE_ARGUMENT_KEY, selection);
+                getSupportFragmentManager().setFragmentResult(PICK_DATE_REQUEST_KEY, args);
+            });
         }
 
-        private long getDefaultMinDateOfDatePicker() {
-            Calendar minDateCalendar = Calendar.getInstance();
-            minDateCalendar.set(1970, 0, 1);
-            return minDateCalendar.getTimeInMillis();
-        }
+        getSupportFragmentManager().setFragmentResultListener(
+                PICK_DATE_REQUEST_KEY,
+                this,
+                (requestKey, result) -> {
+                    long selection = result.getLong(NEWLY_PICKED_DATE_ARGUMENT_KEY);
 
-        private long getDefaultMaxDateOfDatePicker() {
-            Calendar maxDateCalendar = Calendar.getInstance();
-            maxDateCalendar.set(2100, 11, 31);
-            return maxDateCalendar.getTimeInMillis();
-        }
+                    Date newDate = new Date(selection);
+                    switch (tempLoyaltyCardField) {
+                        case validFrom:
+                            formatDateField(LoyaltyCardEditActivity.this, validFromField, newDate);
+                            updateTempState(LoyaltyCardField.validFrom, newDate);
+                            break;
+                        case expiry:
+                            formatDateField(LoyaltyCardEditActivity.this, expiryField, newDate);
+                            updateTempState(LoyaltyCardField.expiry, newDate);
+                            break;
+                        default:
+                            throw new AssertionError("Unexpected field: " + tempLoyaltyCardField);
+                    }
+                }
+        );
+    }
 
-        public void onDateSet(DatePicker view, int year, int month, int day) {
-            Calendar c = new GregorianCalendar();
-            c.set(Calendar.YEAR, year);
-            c.set(Calendar.MONTH, month);
-            c.set(Calendar.DAY_OF_MONTH, day);
-            c.set(Calendar.HOUR_OF_DAY, 0);
-            c.set(Calendar.MINUTE, 0);
-            c.set(Calendar.SECOND, 0);
-            c.set(Calendar.MILLISECOND, 0);
+    private long getDefaultMinDateOfDatePicker() {
+        Calendar minDateCalendar = Calendar.getInstance();
+        minDateCalendar.set(1970, 0, 1);
+        return minDateCalendar.getTimeInMillis();
+    }
 
-            long unixTime = c.getTimeInMillis();
-
-            Date date = new Date(unixTime);
-
-            formatDateField(context, textFieldEdit, date);
-        }
+    private long getDefaultMaxDateOfDatePicker() {
+        Calendar maxDateCalendar = Calendar.getInstance();
+        maxDateCalendar.set(2100, 11, 31);
+        return maxDateCalendar.getTimeInMillis();
     }
 
     private void doSave() {
@@ -1384,18 +1486,41 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
             return;
         }
 
+        boolean hasError = false;
+
         if (tempLoyaltyCard.store.isEmpty()) {
-            Snackbar.make(storeFieldEdit, R.string.noStoreError, Snackbar.LENGTH_LONG).show();
-            return;
+            storeFieldEdit.setError(getString(R.string.field_must_not_be_empty));
+
+            // Focus element
+            tabs.selectTab(tabs.getTabAt(0));
+            storeFieldEdit.requestFocus();
+
+            hasError = true;
         }
 
         if (tempLoyaltyCard.cardId.isEmpty()) {
-            Snackbar.make(cardIdFieldView, R.string.noCardIdError, Snackbar.LENGTH_LONG).show();
-            return;
+            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;
+            }
         }
 
         if (!validBalance) {
-            Snackbar.make(balanceField, getString(R.string.parsingBalanceFailed, balanceField.getText().toString()), Snackbar.LENGTH_LONG).show();
+            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) {
             return;
         }
 
@@ -1531,7 +1656,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
         String cardIdString = tempLoyaltyCard.barcodeId != null ? tempLoyaltyCard.barcodeId : tempLoyaltyCard.cardId;
         CatimaBarcode barcodeFormat = tempLoyaltyCard.barcodeType;
 
-        if (cardIdString == null || barcodeFormat == null) {
+        if (cardIdString == null || cardIdString.isEmpty() || barcodeFormat == null) {
             barcodeImageLayout.setVisibility(View.GONE);
             return;
         }
@@ -1549,13 +1674,13 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
                             barcodeImage.getViewTreeObserver().removeOnGlobalLayoutListener(this);
 
                             Log.d(TAG, "ImageView size now known");
-                            BarcodeImageWriterTask barcodeWriter = new BarcodeImageWriterTask(getApplicationContext(), barcodeImage, cardIdString, barcodeFormat, null, false, barcodeImageGenerationFinishedCallback, true);
+                            BarcodeImageWriterTask barcodeWriter = new BarcodeImageWriterTask(getApplicationContext(), barcodeImage, cardIdString, barcodeFormat, null, false, LoyaltyCardEditActivity.this, 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, barcodeImageGenerationFinishedCallback, true);
+            BarcodeImageWriterTask barcodeWriter = new BarcodeImageWriterTask(getApplicationContext(), barcodeImage, cardIdString, barcodeFormat, null, false, this, true);
             mTasks.executeTask(TaskHandler.TYPE.BARCODE, barcodeWriter);
         }
     }
@@ -1612,11 +1737,16 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
 
     private void currencyPrioritizeLocaleSymbols(ArrayList<String> currencyList, Locale locale) {
         try {
-            String currencySymbol = Currency.getInstance(locale).getSymbol();
+            String currencySymbol = getCurrencySymbol(Currency.getInstance(locale));
             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());
+    }
 }

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

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

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

@@ -3,6 +3,7 @@ package protect.card_locker;
 import android.app.Application;
 
 import androidx.appcompat.app.AppCompatDelegate;
+
 import protect.card_locker.preferences.Settings;
 
 public class LoyaltyCardLockerApplication extends Application {

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

@@ -2,8 +2,6 @@ package protect.card_locker;
 
 import android.app.Activity;
 import android.app.SearchManager;
-import android.content.ClipData;
-import android.content.ClipboardManager;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
@@ -15,18 +13,16 @@ 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.OnBackPressedCallback;
 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;
@@ -44,15 +40,13 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import protect.card_locker.databinding.ArchiveActivityBinding;
 import protect.card_locker.databinding.ContentMainBinding;
 import protect.card_locker.databinding.MainActivityBinding;
 import protect.card_locker.databinding.SortingOptionBinding;
 import protect.card_locker.preferences.SettingsActivity;
 
-public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCardCursorAdapter.CardAdapterListener, GestureDetector.OnGestureListener {
+public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCardCursorAdapter.CardAdapterListener {
     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";
@@ -63,7 +57,6 @@ 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;
@@ -76,8 +69,7 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
     private View mNoGroupCardsText;
     private TabLayout groupsTabLayout;
 
-    private boolean mArchiveMode;
-    public static final String BUNDLE_ARCHIVE_MODE = "archiveMode";
+    private Runnable mUpdateLoyaltyCardListRunnable;
 
     private ActivityResultLauncher<Intent> mBarcodeScannerLauncher;
     private ActivityResultLauncher<Intent> mSettingsLauncher;
@@ -96,35 +88,7 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
 
         @Override
         public boolean onActionItemClicked(ActionMode inputMode, MenuItem inputItem) {
-            if (inputItem.getItemId() == R.id.action_copy_to_clipboard) {
-                ClipboardManager clipboard = (ClipboardManager) getSystemService(CLIPBOARD_SERVICE);
-
-                String clipboardData;
-                int cardCount = mAdapter.getSelectedItemCount();
-
-                if (cardCount == 1) {
-                    clipboardData = mAdapter.getSelectedItems().get(0).cardId;
-                } else {
-                    StringBuilder cardIds = new StringBuilder();
-
-                    for (int i = 0; i < cardCount; i++) {
-                        LoyaltyCard loyaltyCard = mAdapter.getSelectedItems().get(i);
-
-                        cardIds.append(loyaltyCard.store + ": " + loyaltyCard.cardId);
-                        if (i < (cardCount - 1)) {
-                            cardIds.append("\n");
-                        }
-                    }
-
-                    clipboardData = cardIds.toString();
-                }
-
-                ClipData clip = ClipData.newPlainText(getString(R.string.card_ids_copied), clipboardData);
-                clipboard.setPrimaryClip(clip);
-                Toast.makeText(MainActivity.this, cardCount > 1 ? R.string.copy_to_clipboard_multiple_toast : R.string.copy_to_clipboard_toast, Toast.LENGTH_LONG).show();
-                inputMode.finish();
-                return true;
-            } else if (inputItem.getItemId() == R.id.action_share) {
+            if (inputItem.getItemId() == R.id.action_share) {
                 final ImportURIHelper importURIHelper = new ImportURIHelper(MainActivity.this);
                 try {
                     importURIHelper.startShareIntent(mAdapter.getSelectedItems());
@@ -233,28 +197,19 @@ 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());
-        }
 
-        if(mArchiveMode) {
-            enableToolbarBackButton();
-        }
+        binding = MainActivityBinding.inflate(getLayoutInflater());
+        setContentView(binding.getRoot());
+        setSupportActionBar(binding.toolbar);
+        groupsTabLayout = binding.groups;
+        contentMainBinding = ContentMainBinding.bind(binding.include.getRoot());
 
         mDatabase = new DBHelper(this).getWritableDatabase();
 
+        mUpdateLoyaltyCardListRunnable = () -> {
+            updateLoyaltyCardList(false);
+        };
+
         groupsTabLayout.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
             @Override
             public void onTabSelected(TabLayout.Tab tab) {
@@ -282,20 +237,12 @@ 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;
 
-        mNoMatchingCardsText.setOnTouchListener(gestureTouchListener);
-        mCardList.setOnTouchListener(gestureTouchListener);
-        mNoGroupCardsText.setOnTouchListener(gestureTouchListener);
-
-        mAdapter = new LoyaltyCardCursorAdapter(this, null, this);
+        mAdapter = new LoyaltyCardCursorAdapter(this, null, this, mUpdateLoyaltyCardListRunnable);
         mCardList.setAdapter(mAdapter);
         registerForContextMenu(mCardList);
 
@@ -355,14 +302,23 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
                 }
             }
         });
+
+        getOnBackPressedDispatcher().addCallback(this, new OnBackPressedCallback(true) {
+            @Override
+            public void handleOnBackPressed() {
+                if (mSearchView != null && !mSearchView.isIconified()) {
+                    mSearchView.setIconified(true);
+                } else {
+                    finish();
+                }
+            }
+        });
     }
 
     @Override
     protected void onResume() {
         super.onResume();
 
-        mAdapter.refreshState();
-
         if (mCurrentActionMode != null) {
             mAdapter.clearSelections();
             mCurrentActionMode.finish();
@@ -375,18 +331,28 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
         // Start of active tab logic
         updateTabGroups(groupsTabLayout);
 
-        // Restore settings from Shared Preference
+        // Restore selected tab from Shared Preference
         SharedPreferences activeTabPref = getApplicationContext().getSharedPreferences(
                 getString(R.string.sharedpreference_active_tab),
                 Context.MODE_PRIVATE);
         selectedTab = activeTabPref.getInt(getString(R.string.sharedpreference_active_tab), 0);
+
+        // Restore sort preferences from Shared Preferences
+        // If one of the sorting prefererences has never been set or is set to an invalid value,
+        // stick to the defaults.
         SharedPreferences sortPref = getApplicationContext().getSharedPreferences(
                 getString(R.string.sharedpreference_sort),
                 Context.MODE_PRIVATE);
-        try {
-            mOrder = DBHelper.LoyaltyCardOrder.valueOf(sortPref.getString(getString(R.string.sharedpreference_sort_order), null));
-            mOrderDirection = DBHelper.LoyaltyCardOrderDirection.valueOf(sortPref.getString(getString(R.string.sharedpreference_sort_direction), null));
-        } catch (IllegalArgumentException | NullPointerException ignored) {
+
+        String orderString = sortPref.getString(getString(R.string.sharedpreference_sort_order), null);
+        String orderDirectionString = sortPref.getString(getString(R.string.sharedpreference_sort_direction), null);
+
+        if (orderString != null && orderDirectionString != null) {
+            try {
+                mOrder = DBHelper.LoyaltyCardOrder.valueOf(orderString);
+                mOrderDirection = DBHelper.LoyaltyCardOrderDirection.valueOf(orderDirectionString);
+            } catch (IllegalArgumentException ignored) {
+            }
         }
 
         mGroup = null;
@@ -400,41 +366,29 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
             groupsTabLayout.selectTab(tab);
             assert tab != null;
             mGroup = tab.getTag();
-        } else if (!mArchiveMode) {
+        } else {
             scaleScreen();
         }
 
         updateLoyaltyCardList(true);
         // End of active tab logic
 
-        if (!mArchiveMode) {
-            FloatingActionButton addButton = binding.fabAdd;
+        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();
-        }
-    }
-
-    @Override
-    public void onBackPressed() {
-        if (mSearchView != null && !mSearchView.isIconified()) {
-            mSearchView.setIconified(true);
-            return;
-        }
-
-        super.onBackPressed();
+        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();
     }
 
     private void displayCardSetupOptions(Menu menu, boolean shouldShow) {
-        for (int id : new int[]{R.id.action_search, R.id.action_unfold, R.id.action_sort}) {
+        for (int id : new int[]{R.id.action_search, R.id.action_display_options, R.id.action_sort}) {
             menu.findItem(id).setVisible(shouldShow);
         }
     }
@@ -449,7 +403,7 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
             group = (Group) mGroup;
         }
 
-        mAdapter.swapCursor(DBHelper.getLoyaltyCardCursor(mDatabase, mFilter, group, mOrder, mOrderDirection, mArchiveMode ? DBHelper.LoyaltyCardArchiveFilter.Archived : DBHelper.LoyaltyCardArchiveFilter.Unarchived));
+        mAdapter.swapCursor(DBHelper.getLoyaltyCardCursor(mDatabase, mFilter, group, mOrder, mOrderDirection, mAdapter.showingArchivedCards() ? DBHelper.LoyaltyCardArchiveFilter.All : DBHelper.LoyaltyCardArchiveFilter.Unarchived));
 
         if (updateCount) {
             updateLoyaltyCardCount();
@@ -480,12 +434,6 @@ 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);
 
@@ -520,44 +468,45 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
 
         // Check if an image was shared to us
         if (Intent.ACTION_SEND.equals(receivedAction)) {
-            if (receivedType.startsWith("image/")) {
-                BarcodeValues barcodeValues;
-                try {
-                    Bitmap bitmap;
-                    try {
-                        Uri data = intent.getParcelableExtra(Intent.EXTRA_STREAM);
-                        bitmap = Utils.retrieveImageFromUri(this, data);
-                    } catch (IOException e) {
-                        Log.e(TAG, "Error getting data from image file");
-                        e.printStackTrace();
-                        Toast.makeText(this, R.string.errorReadingImage, Toast.LENGTH_LONG).show();
-                        finish();
-                        return;
-                    }
-
-                    barcodeValues = Utils.getBarcodeFromBitmap(bitmap);
-
-                    if (barcodeValues.isEmpty()) {
-                        Log.i(TAG, "No barcode found in image file");
-                        Toast.makeText(this, R.string.noBarcodeFound, Toast.LENGTH_LONG).show();
-                        finish();
-                        return;
-                    }
-                } catch (NullPointerException e) {
-                    Toast.makeText(this, R.string.errorReadingImage, Toast.LENGTH_LONG).show();
-                    finish();
-                    return;
-                }
-                processBarcodeValues(barcodeValues, null);
-            } else {
+            if (!receivedType.startsWith("image/")) {
                 Log.e(TAG, "Wrong mime-type");
+                return;
             }
+
+            BarcodeValues barcodeValues;
+            Bitmap bitmap;
+
+            Uri data = intent.getParcelableExtra(Intent.EXTRA_STREAM);
+            if (data == null) {
+                Toast.makeText(this, R.string.errorReadingImage, Toast.LENGTH_LONG).show();
+                finish();
+                return;
+            }
+
+            try {
+                bitmap = Utils.retrieveImageFromUri(this, data);
+            } catch (IOException e) {
+                Log.e(TAG, "Error getting data from image file");
+                e.printStackTrace();
+                Toast.makeText(this, R.string.errorReadingImage, Toast.LENGTH_LONG).show();
+                finish();
+                return;
+            }
+
+            barcodeValues = Utils.getBarcodeFromBitmap(bitmap);
+
+            if (barcodeValues.isEmpty()) {
+                Log.i(TAG, "No barcode found in image file");
+                Toast.makeText(this, R.string.noBarcodeFound, Toast.LENGTH_LONG).show();
+                finish();
+                return;
+            }
+
+            processBarcodeValues(barcodeValues, null);
         }
     }
 
     private void extractIntentFields(Intent intent) {
-        final Bundle b = intent.getExtras();
-        mArchiveMode = b != null && b.getBoolean(BUNDLE_ARCHIVE_MODE, false);
         onSharedIntent(intent);
     }
 
@@ -590,13 +539,8 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
 
     @Override
     public boolean onCreateOptionsMenu(Menu inputMenu) {
-        if (!mArchiveMode) {
-            getMenuInflater().inflate(R.menu.main_menu, inputMenu);
-        } else {
-            getMenuInflater().inflate(R.menu.archive_menu, inputMenu);
-        }
+        getMenuInflater().inflate(R.menu.main_menu, inputMenu);
 
-        Utils.updateMenuCardDetailsButtonState(inputMenu.findItem(R.id.action_unfold), mAdapter.showingDetails());
         displayCardSetupOptions(inputMenu, mLoyaltyCardCount > 0);
 
         SearchManager searchManager = (SearchManager) getSystemService(Context.SEARCH_SERVICE);
@@ -630,14 +574,6 @@ 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);
     }
 
@@ -646,11 +582,11 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
         int id = inputItem.getItemId();
 
         if (id == android.R.id.home) {
-            onBackPressed();
+            getOnBackPressedDispatcher().onBackPressed();
         }
 
-        if (id == R.id.action_unfold) {
-            mAdapter.showDetails(!mAdapter.showingDetails());
+        if (id == R.id.action_display_options) {
+            mAdapter.showDisplayOptionsDialog();
             invalidateOptionsMenu();
 
             return true;
@@ -706,15 +642,6 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
             return true;
         }
 
-        if (id == R.id.action_archived) {
-            Intent i = new Intent(getApplicationContext(), MainActivity.class);
-            Bundle bundle = new Bundle();
-            bundle.putBoolean("archiveMode", true);
-            i.putExtras(bundle);
-            startActivity(i);
-            return true;
-        }
-
         if (id == R.id.action_import_export) {
             Intent i = new Intent(getApplicationContext(), ImportExportActivity.class);
             startActivity(i);
@@ -755,83 +682,6 @@ 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);
@@ -871,30 +721,31 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
 
             boolean hasStarred = false;
             boolean hasUnstarred = false;
-
-            if (!mArchiveMode) {
-                unarchiveItem.setVisible(false);
-                archiveItem.setVisible(true);
-            } else {
-                unarchiveItem.setVisible(true);
-                archiveItem.setVisible(false);
-            }
+            boolean hasArchived = false;
+            boolean hasUnarchived = false;
 
             for (LoyaltyCard loyaltyCard : mAdapter.getSelectedItems()) {
-
                 if (loyaltyCard.starStatus == 1) {
                     hasStarred = true;
                 } else {
                     hasUnstarred = true;
                 }
 
-                if (hasStarred && hasUnstarred) {
-                    hasStarred = true;
-                    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) {
                     break;
                 }
             }
 
+            unarchiveItem.setVisible(hasArchived);
+            archiveItem.setVisible(hasUnarchived);
+
             if (count == 1) {
                 starItem.setVisible(!hasStarred);
                 unstarItem.setVisible(!hasUnstarred);

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

@@ -13,6 +13,12 @@ import android.widget.EditText;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import androidx.activity.OnBackPressedCallback;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.widget.Toolbar;
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 
@@ -20,16 +26,9 @@ import java.util.ArrayList;
 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;
-
 import protect.card_locker.databinding.ActivityManageGroupBinding;
 
 public class ManageGroupActivity extends CatimaAppCompatActivity implements ManageGroupCursorAdapter.CardAdapterListener {
-
     private ActivityManageGroupBinding binding;
     private SQLiteDatabase mDatabase;
     private ManageGroupCursorAdapter mAdapter;
@@ -101,7 +100,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);
+        mAdapter = new ManageGroupCursorAdapter(this, null, this, mGroup, null);
         mCardList.setAdapter(mAdapter);
         registerForContextMenu(mCardList);
 
@@ -135,6 +134,13 @@ public class ManageGroupActivity extends CatimaAppCompatActivity implements Mana
         // this setText is here because content_main.xml is reused from main activity
         noGroupCardsText.setText(getResources().getText(R.string.noGiftCardsGroup));
         updateLoyaltyCardList();
+
+        getOnBackPressedDispatcher().addCallback(this, new OnBackPressedCallback(true) {
+            @Override
+            public void handleOnBackPressed() {
+                leaveWithoutSaving();
+            }
+        });
     }
 
     private ArrayList<Integer> adapterStateToIntegerArray(HashMap<Integer, Boolean> adapterState) {
@@ -160,7 +166,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);
     }
 
@@ -168,8 +174,8 @@ public class ManageGroupActivity extends CatimaAppCompatActivity implements Mana
     public boolean onOptionsItemSelected(MenuItem inputItem) {
         int id = inputItem.getItemId();
 
-        if (id == R.id.action_unfold) {
-            mAdapter.showDetails(!mAdapter.showingDetails());
+        if (id == R.id.action_display_options) {
+            mAdapter.showDisplayOptionsDialog();
             invalidateOptionsMenu();
 
             return true;
@@ -212,14 +218,9 @@ public class ManageGroupActivity extends CatimaAppCompatActivity implements Mana
         }
     }
 
-    @Override
-    public void onBackPressed() {
-        leaveWithoutSaving();
-    }
-
     @Override
     public boolean onSupportNavigateUp() {
-        onBackPressed();
+        getOnBackPressedDispatcher().onBackPressed();
         return true;
     }
 

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) {
-        super(inputContext, inputCursor, inputListener);
+    public ManageGroupCursorAdapter(Context inputContext, Cursor inputCursor, CardAdapterListener inputListener, Group group, Runnable inputSwapCursorCallback) {
+        super(inputContext, inputCursor, inputListener, inputSwapCursorCallback);
         mGroup = new Group(group._id, group.order);
         mInGroupOverlay = new HashMap<>();
         mDatabase = new DBHelper(inputContext).getWritableDatabase();

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

@@ -11,22 +11,20 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowManager;
 import android.widget.EditText;
-import android.widget.FrameLayout;
+import android.widget.LinearLayout;
 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;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+
+import java.util.List;
+
 import protect.card_locker.databinding.ManageGroupsActivityBinding;
 
 public class ManageGroupsActivity extends CatimaAppCompatActivity implements GroupCursorAdapter.GroupAdapterListener {
@@ -73,11 +71,6 @@ public class ManageGroupsActivity extends CatimaAppCompatActivity implements Gro
         updateGroupList();
     }
 
-    @Override
-    public void onBackPressed() {
-        super.onBackPressed();
-    }
-
     private void updateGroupList() {
         mAdapter.swapCursor(DBHelper.getGroupCursor(mDatabase));
 
@@ -112,65 +105,68 @@ 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);
-        builder.setTitle(R.string.enter_group_name);
-        final EditText input = new EditText(this);
-        input.setInputType(InputType.TYPE_CLASS_TEXT);
-        input.addTextChangedListener(new SimpleTextWatcher() {
-            public void onTextChanged(CharSequence s, int start, int before, int count) {
-                setGroupNameError(input);
-            }
-        });
-        setGroupNameError(input);
 
-        // Add spacing to EditText
-        FrameLayout container = new FrameLayout(this);
-        FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(
+        // Header
+        builder.setTitle(R.string.enter_group_name);
+
+        // Layout
+        LinearLayout layout = new LinearLayout(this);
+        layout.setOrientation(LinearLayout.VERTICAL);
+        LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(
                 ViewGroup.LayoutParams.MATCH_PARENT,
                 ViewGroup.LayoutParams.WRAP_CONTENT
         );
-        params.leftMargin = 50;
-        params.rightMargin = 50;
+        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);
         input.setLayoutParams(params);
-        container.addView(input);
+        layout.addView(input);
 
-        builder.setView(container);
+        // Set layout
+        builder.setView(layout);
 
+        // Buttons
         builder.setPositiveButton(getString(R.string.ok), (dialog, which) -> {
-            CharSequence error = input.getError();
-
-            if (error != null) {
-                Toast.makeText(getApplicationContext(), error.toString(), Toast.LENGTH_SHORT).show();
-                return;
-            }
-
-            DBHelper.insertGroup(mDatabase, sanitizeAddGroupNameField(input.getText()));
+            DBHelper.insertGroup(mDatabase, input.getText().toString().trim());
             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();
     }
@@ -247,4 +243,4 @@ public class ManageGroupsActivity extends CatimaAppCompatActivity implements Gro
         AlertDialog dialog = builder.create();
         dialog.show();
     }
-}
+}