Add page number to barcode selector for PDF scan results

Update Gradle to 8.7

.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,20 +9,30 @@ 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
+    - uses: gradle/wrapper-validation-action@v2
     - name: set up OpenJDK 17
       run: |
         sudo apt-get update
@@ -38,7 +48,7 @@ jobs:
       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,22 +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-close: 90
-          stale-issue-message: ""
-          stale-pr-message: ""
-          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'
-          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.2
       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.2
       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.2
+      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.2
+      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.2
+      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/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,5 +1,32 @@
 # Changelog
 
+## Unreleased - 134
+
+- Support for scanning PDF files for barcodes
+- Support for image files with multiple barcodes
+
+## 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

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.4)
+    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.793.0)
-    aws-sdk-core (3.180.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.71.0)
-      aws-sdk-core (~> 3, >= 3.177.0)
+    aws-sdk-kms (1.77.0)
+      aws-sdk-core (~> 3, >= 3.191.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.132.0)
-      aws-sdk-core (~> 3, >= 3.179.0)
+    aws-sdk-s3 (1.143.0)
+      aws-sdk-core (~> 3, >= 3.191.0)
       aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.6)
-    aws-sigv4 (1.6.0)
+      aws-sigv4 (~> 1.8)
+    aws-sigv4 (1.8.0)
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.4)
     claide (1.1.0)
@@ -32,11 +32,10 @@ GEM
     declarative (0.0.20)
     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.100.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.7)
-    fastlane (2.214.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, < 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.46.0)
+    google-apis-androidpublisher_v3 (0.54.0)
       google-apis-core (>= 0.11.0, < 2.a)
-    google-apis-core (0.11.1)
+    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.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.19.0)
-      google-apis-core (>= 0.9.0, < 2.a)
-    google-cloud-core (1.6.0)
-      google-cloud-env (~> 1.0)
+    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.1)
-    google-cloud-storage (1.44.0)
+    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.7.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,20 +148,19 @@ GEM
       domain_name (~> 0.5)
     httpclient (2.8.3)
     jmespath (1.6.2)
-    json (2.6.3)
+    json (2.7.1)
     jwt (2.7.1)
-    memoist (0.16.2)
     mini_magick (4.12.0)
-    mini_mime (1.1.2)
+    mini_mime (1.1.5)
     multi_json (1.15.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.7.0)
-    public_suffix (5.0.3)
-    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)
@@ -173,7 +171,7 @@ GEM
     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.

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 130
-        versionName "2.25.3"
-
-        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
-    }
-
-
-    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
-        }
-    }
-    lint {
-        lintConfig file('lint.xml')
-    }
-    namespace 'protect.card_locker'
-}
-
-dependencies {
-// AndroidX
-    implementation 'androidx.appcompat:appcompat:1.6.1'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    implementation 'androidx.exifinterface:exifinterface:1.3.6'
-    implementation 'androidx.palette:palette:1.0.0'
-    implementation 'androidx.preference:preference:1.2.0'
-    implementation 'com.google.android.material:material:1.9.0'
-    implementation 'com.github.yalantis:ucrop:2.2.8'
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.3'
-
-// Splash Screen
-    implementation 'androidx.core:core-splashscreen:1.0.1'
-
-// Third-party
-    implementation 'com.journeyapps:zxing-android-embedded:4.3.0@aar'
-    implementation 'com.google.zxing:core:3.5.2'
-    implementation 'org.apache.commons:commons-csv:1.9.0'
-    implementation 'com.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.10.3'
-}
-
-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-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

@@ -24,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" />
@@ -43,6 +44,7 @@
 
                 <category android:name="android.intent.category.DEFAULT" />
                 <data android:mimeType="image/*" />
+                <data android:mimeType="application/pdf" />
             </intent-filter>
         </activity>
         <activity
@@ -110,10 +112,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 -->
@@ -184,4 +188,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,7 +43,7 @@ public class AboutActivity extends CatimaAppCompatActivity {
         binding.privacy.setTag("https://catima.app/privacy-policy/");
         binding.reportError.setTag("https://github.com/CatimaLoyalty/Android/issues");
         binding.rate.setTag("https://play.google.com/store/apps/details?id=me.hackerchick.catima");
-        binding.donate.setTag("https://catima.app/contribute/#donating");
+        binding.donate.setTag("https://catima.app/donate");
 
         boolean installedFromGooglePlay = Utils.installedFromGooglePlay(this);
         // Hide Google Play rate button if not on Google Play
@@ -68,20 +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.donate.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());
     }
@@ -100,10 +98,50 @@ public class AboutActivity extends CatimaAppCompatActivity {
     }
 
     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,19 +129,31 @@ public class AboutContent {
         return result.toString();
     }
 
-    public String getContributorInfo() {
+    public Spanned getContributorInfo() {
         StringBuilder contributorInfo = new StringBuilder();
         contributorInfo.append(getCopyright());
-        contributorInfo.append("\n\n");
+        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_contributors), getContributors()), HtmlCompat.FROM_HTML_MODE_COMPACT));
-        contributorInfo.append("\n\n");
-        contributorInfo.append(HtmlCompat.fromHtml(String.format(context.getString(R.string.app_libraries), getThirdPartyLibraries()), HtmlCompat.FROM_HTML_MODE_COMPACT));
-        contributorInfo.append("\n\n");
-        contributorInfo.append(HtmlCompat.fromHtml(String.format(context.getString(R.string.app_resources), getUsedThirdPartyAssets()), HtmlCompat.FROM_HTML_MODE_COMPACT));
+        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/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/BarcodeValues.java

@@ -3,12 +3,17 @@ package protect.card_locker;
 public class BarcodeValues {
     private final String mFormat;
     private final String mContent;
+    private String mNote;
 
     public BarcodeValues(String format, String content) {
         mFormat = format;
         mContent = content;
     }
 
+    public void setNote(String note) {
+        mNote = note;
+    }
+
     public String format() {
         return mFormat;
     }
@@ -17,7 +22,5 @@ public class BarcodeValues {
         return mContent;
     }
 
-    public boolean isEmpty() {
-        return mFormat == null && mContent == null;
-    }
-}
+    public String note() { return mNote; }
+}

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

@@ -0,0 +1,6 @@
+package protect.card_locker;
+
+public interface BarcodeValuesListDisambiguatorCallback {
+    void onUserChoseBarcode(BarcodeValues barcodeValues);
+    void onUserDismissedSelector();
+}

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);
 
@@ -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_shown_details) {
-            mAdapter.showSelectDetailDisplayDialog();
+        if (id == R.id.action_display_options) {
+            mAdapter.showDisplayOptionsDialog();
             invalidateOptionsMenu();
 
             return true;

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

@@ -15,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 {
 

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/GroupCursorAdapter.java

@@ -8,14 +8,12 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
-import android.widget.ImageButton;
 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> {
     public final Context mContext;

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/LoyaltyCard.java

@@ -4,13 +4,13 @@ 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.NonNull;
-import androidx.annotation.Nullable;
-
 public class LoyaltyCard implements Parcelable {
     public final int id;
     public final String store;

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,22 +15,20 @@ 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 com.google.android.material.dialog.MaterialAlertDialogBuilder;
-
-import java.math.BigDecimal;
-import java.text.DateFormat;
-import java.util.ArrayList;
-
 import androidx.annotation.NonNull;
-import androidx.appcompat.app.AlertDialog;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.core.content.ContextCompat;
 import androidx.core.graphics.BlendModeColorFilterCompat;
 import androidx.core.graphics.BlendModeCompat;
 import androidx.recyclerview.widget.RecyclerView;
 
+import com.google.android.material.card.MaterialCardView;
+import com.google.android.material.color.MaterialColors;
+
+import java.math.BigDecimal;
+import java.text.DateFormat;
+import java.util.ArrayList;
+
 import protect.card_locker.databinding.LoyaltyCardLayoutBinding;
 
 public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCursorAdapter.LoyaltyCardListItemViewHolder> {
@@ -39,123 +36,34 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
     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 mShowNameBelowThumbnail;
-    private boolean mShowNote;
-    private boolean mShowBalance;
-    private boolean mShowValidity;
 
-    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);
         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);
     }
 
-    private void saveDetailState(int stateId, boolean value) {
-        SharedPreferences cardDetailsPref = mContext.getSharedPreferences(
-                mContext.getString(R.string.sharedpreference_card_details),
-                Context.MODE_PRIVATE);
-        SharedPreferences.Editor cardDetailsPrefEditor = cardDetailsPref.edit();
-        cardDetailsPrefEditor.putBoolean(mContext.getString(stateId), value);
-        cardDetailsPrefEditor.apply();
+    public void showDisplayOptionsDialog() {
+        mLoyaltyCardListDisplayOptions.showDisplayOptionsDialog();
     }
 
-    public void refreshState() {
-        // Retrieve user details preference
-        SharedPreferences cardDetailsPref = mContext.getSharedPreferences(
-                mContext.getString(R.string.sharedpreference_card_details),
-                Context.MODE_PRIVATE);
-        mShowNameBelowThumbnail = cardDetailsPref.getBoolean(mContext.getString(R.string.sharedpreference_card_details_show_name_below_thumbnail), false);
-        mShowNote = cardDetailsPref.getBoolean(mContext.getString(R.string.sharedpreference_card_details_show_note), true);
-        mShowBalance = cardDetailsPref.getBoolean(mContext.getString(R.string.sharedpreference_card_details_show_balance), true);
-        mShowValidity = cardDetailsPref.getBoolean(mContext.getString(R.string.sharedpreference_card_details_show_validity), true);
-    }
-
-    public void showNameBelowThumbnail(boolean show) {
-        mShowNameBelowThumbnail = show;
-        notifyDataSetChanged();
-
-        saveDetailState(R.string.sharedpreference_card_details_show_name_below_thumbnail, show);
-    }
-
-    public boolean showingNameBelowThumbnail() {
-        return mShowNameBelowThumbnail;
-    }
-
-    public void showNote(boolean show) {
-        mShowNote = show;
-        notifyDataSetChanged();
-
-        saveDetailState(R.string.sharedpreference_card_details_show_note, show);
-    }
-
-    public boolean showingNote() {
-        return mShowNote;
-    }
-
-    public void showBalance(boolean show) {
-        mShowBalance = show;
-        notifyDataSetChanged();
-
-        saveDetailState(R.string.sharedpreference_card_details_show_balance, show);
-    }
-
-    public boolean showingBalance() {
-        return mShowBalance;
-    }
-
-    public void showValidity(boolean show) {
-        mShowValidity = show;
-        notifyDataSetChanged();
-
-        saveDetailState(R.string.sharedpreference_card_details_show_validity, show);
-    }
-
-    public boolean showingValidity() {
-        return mShowValidity;
-    }
-
-    public void showSelectDetailDisplayDialog() {
-        AlertDialog.Builder builder = new MaterialAlertDialogBuilder(mContext);
-        builder.setTitle(R.string.action_show_details);
-        builder.setMultiChoiceItems(
-                new String[]{
-                        mContext.getString(R.string.show_name_below_image_thumbnail),
-                        mContext.getString(R.string.show_note),
-                        mContext.getString(R.string.show_balance),
-                        mContext.getString(R.string.show_validity)
-                },
-                new boolean[]{
-                        showingNameBelowThumbnail(),
-                        showingNote(),
-                        showingBalance(),
-                        showingValidity()
-                },
-                (dialogInterface, i, b) -> {
-                    switch (i) {
-                        case 0: showNameBelowThumbnail(b); break;
-                        case 1: showNote(b); break;
-                        case 2: showBalance(b); break;
-                        case 3: showValidity(b); break;
-                        default: throw new IndexOutOfBoundsException("No such index exists in LoyaltyCardCursorAdapter show details view");
-                    }
-                }
-        );
-        builder.setPositiveButton(R.string.ok, (dialog, i) -> dialog.dismiss());
-
-        AlertDialog dialog = builder.create();
-        dialog.show();
+    public boolean showingArchivedCards() {
+        return mLoyaltyCardListDisplayOptions.showingArchivedCards();
     }
 
     @NonNull
@@ -182,41 +90,40 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
         LoyaltyCard loyaltyCard = LoyaltyCard.toLoyaltyCard(inputCursor);
         Bitmap icon = Utils.retrieveCardImage(mContext, loyaltyCard.id, ImageLocationType.icon);
 
-        if (mShowNameBelowThumbnail && icon != null) {
+        if (mLoyaltyCardListDisplayOptions.showingNameBelowThumbnail() && icon != null) {
             showDivider = true;
             inputHolder.setStoreField(loyaltyCard.store);
         } else {
             inputHolder.setStoreField(null);
         }
 
-        if (mShowNote && !loyaltyCard.note.isEmpty()) {
+        if (mLoyaltyCardListDisplayOptions.showingNote() && !loyaltyCard.note.isEmpty()) {
             showDivider = true;
             inputHolder.setNoteField(loyaltyCard.note);
         } else {
             inputHolder.setNoteField(null);
         }
 
-        if (mShowBalance && !loyaltyCard.balance.equals(new BigDecimal("0"))) {
+        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, false);
         }
 
-        if (mShowValidity && loyaltyCard.validFrom != 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, false);
         }
 
-        if (mShowValidity && loyaltyCard.expiry != 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, false);
         }
 
         inputHolder.mCardIcon.setContentDescription(loyaltyCard.store);
-        Utils.setIconOrTextWithBackground(mContext, loyaltyCard, icon, inputHolder.mCardIcon, inputHolder.mCardText);
-        inputHolder.setIconBackgroundColor(Utils.getHeaderColor(mContext, loyaltyCard));
+        inputHolder.mIconBackgroundColor = Utils.setIconOrTextWithBackground(mContext, loyaltyCard, icon, inputHolder.mCardIcon, inputHolder.mCardText);
 
         inputHolder.toggleCardStateIcon(loyaltyCard.starStatus != 0, loyaltyCard.archiveStatus != 0, itemSelected(inputCursor.getPosition()));
 
@@ -431,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

@@ -2,8 +2,6 @@ package protect.card_locker;
 
 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;
@@ -29,33 +27,34 @@ 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.app.AppCompatActivity;
 import androidx.appcompat.widget.AppCompatTextView;
 import androidx.appcompat.widget.Toolbar;
 import androidx.core.content.ContextCompat;
 import androidx.core.content.FileProvider;
 import androidx.exifinterface.media.ExifInterface;
-import androidx.fragment.app.DialogFragment;
 
 import com.google.android.material.chip.Chip;
 import com.google.android.material.chip.ChipGroup;
 import com.google.android.material.color.MaterialColors;
+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;
@@ -74,7 +73,6 @@ 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;
@@ -94,6 +92,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
 
     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";
@@ -105,6 +104,9 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
     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";
     private final Bitmap.CompressFormat TEMP_CROP_IMAGE_FORMAT = Bitmap.CompressFormat.PNG;
@@ -182,6 +184,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
     HashMap<String, String> currencySymbols = new HashMap<>();
 
     LoyaltyCard tempLoyaltyCard;
+    LoyaltyCardField tempLoyaltyCardField;
 
     ActivityResultLauncher<Uri> mPhotoTakerLauncher;
     ActivityResultLauncher<Intent> mPhotoPickerLauncher;
@@ -261,13 +264,13 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
                 + ", 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();
@@ -303,6 +306,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
     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)));
@@ -365,8 +369,15 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
         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);
+                }
             }
         });
 
@@ -381,23 +392,14 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
 
         addDateFieldTextChangedListener(expiryField, R.string.never, R.string.chooseExpiryDate, LoyaltyCardField.expiry);
 
-        DatePickerFragment.registerDatePickListener(this, (textFieldToEdit, newDate) -> {
-            switch (textFieldToEdit) {
-                case validFrom:
-                    formatDateField(this, validFromField, newDate);
-                    updateTempState(LoyaltyCardField.validFrom, newDate);
-                    break;
-                case expiry:
-                    formatDateField(this, expiryField, newDate);
-                    updateTempState(LoyaltyCardField.expiry, newDate);
-                    break;
-                default:
-                    throw new AssertionError("Unexpected field: " + textFieldToEdit);
-            }
-        });
+        setMaterialDatePickerResultListener();
 
         balanceField.setOnFocusChangeListener((v, hasFocus) -> {
             if (!hasFocus && !onResuming && !onRestoring) {
+                if (balanceField.getText().toString().isEmpty()) {
+                    updateTempState(LoyaltyCardField.balance, BigDecimal.valueOf(0));
+                }
+
                 balanceField.setText(Utils.formatBalanceWithoutCurrencySymbol(tempLoyaltyCard.balance, tempLoyaltyCard.balanceType));
             }
         });
@@ -409,10 +411,12 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
                 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;
                 }
             }
         });
@@ -488,6 +492,12 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
             @Override
             public void onTextChanged(CharSequence s, int start, int before, int count) {
                 updateTempState(LoyaltyCardField.cardId, s.toString());
+
+                if (s.length() == 0) {
+                    cardIdFieldView.setError(getString(R.string.field_must_not_be_empty));
+                } else {
+                    cardIdFieldView.setError(null);
+                }
             }
         });
 
@@ -636,11 +646,22 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
                     Log.d("barcode card id editor", "barcode and card id editor picker returned without an intent");
                     return;
                 }
-                BarcodeValues barcodeValues = Utils.parseSetBarcodeActivityResult(Utils.BARCODE_SCAN, result.getResultCode(), intent, getApplicationContext());
 
-                cardId = barcodeValues.content();
-                barcodeType = barcodeValues.format();
-                barcodeId = "";
+                List<BarcodeValues> barcodeValuesList = Utils.parseSetBarcodeActivityResult(Utils.BARCODE_SCAN, result.getResultCode(), intent, getApplicationContext());
+
+                Utils.makeUserChooseBarcodeFromList(this, barcodeValuesList, new BarcodeValuesListDisambiguatorCallback() {
+                    @Override
+                    public void onUserChoseBarcode(BarcodeValues barcodeValues) {
+                        cardId = barcodeValues.content();
+                        barcodeType = barcodeValues.format();
+                        barcodeId = "";
+                    }
+
+                    @Override
+                    public void onUserDismissedSelector() {
+
+                    }
+                });
             }
         });
 
@@ -687,6 +708,13 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
         });
 
         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
@@ -760,7 +788,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
 
     @SuppressLint("DefaultLocale")
     @Override
-    public void onResume() {
+    protected void onResume() {
         super.onResume();
 
         Log.i(TAG, "To view card: " + loyaltyCardId);
@@ -933,7 +961,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
         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
@@ -998,14 +1026,14 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
                     if (!lastValue.toString().equals(getString(chooseDateOptionStringId))) {
                         dateField.setText(lastValue);
                     }
-                    DialogFragment datePickerFragment = DatePickerFragment.newInstance(
+                    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
+                    );
                 }
             }
 
@@ -1046,11 +1074,6 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
         }
     }
 
-    @Override
-    public void onBackPressed() {
-        askBeforeQuitIfChanged();
-    }
-
     @Override
     public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
         super.onRequestPermissionsResult(requestCode, permissions, grantResults);
@@ -1352,7 +1375,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
         thumbnailEditIcon.setBackgroundColor(Utils.needsDarkForeground(color) ? Color.BLACK : Color.WHITE);
         thumbnailEditIcon.setColorFilter(Utils.needsDarkForeground(color) ? Color.WHITE : Color.BLACK);
 
-        generateIcon(storeFieldEdit.getText().toString());
+        generateIcon(storeFieldEdit.getText().toString().trim());
     }
 
     // ColorPickerDialogListener callback
@@ -1361,103 +1384,106 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
         // Nothing to do, no change made
     }
 
-    public static class DatePickerFragment extends DialogFragment
-            implements DatePickerDialog.OnDateSetListener {
+    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();
 
-        public interface OnDatePickListener {
-            void onDatePicked(@NonNull LoyaltyCardField textFieldToEdit, @NonNull Date newDate);
+        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);
         }
 
-        private static final String TEXT_FIELD_TO_EDIT_ARGUMENT_KEY = "text_field_to_edit";
-        private static final String CURRENT_DATE_ARGUMENT_KEY = "current_date";
-        private static final String MIN_DATE_ARGUMENT_KEY = "min_date";
-        private static final String MAX_DATE_ARGUMENT_KEY = "max_date";
-        private static final String PICK_DATE_REQUEST_KEY = "pick_date_request";
-        private static final String NEWLY_PICKED_DATE_ARGUMENT_KEY = "newly_picked_date";
+        CalendarConstraints calendarConstraints = new CalendarConstraints.Builder()
+                .setValidator(dateValidator)
+                .setStart(startDate)
+                .setEnd(endDate)
+                .build();
 
-        LoyaltyCardField textFieldEdit;
-        @Nullable
-        Date minDate;
-        @Nullable
-        Date maxDate;
-
-        public static DatePickerFragment newInstance(@NonNull LoyaltyCardField textField, @Nullable Date currentDate, @Nullable Date minDate, @Nullable Date maxDate) {
-            Bundle args = new Bundle();
-            args.putSerializable(TEXT_FIELD_TO_EDIT_ARGUMENT_KEY, textField);
-            args.putSerializable(CURRENT_DATE_ARGUMENT_KEY, currentDate);
-            args.putSerializable(MIN_DATE_ARGUMENT_KEY, minDate);
-            args.putSerializable(MAX_DATE_ARGUMENT_KEY, maxDate);
-            DatePickerFragment fragment = new DatePickerFragment();
-            fragment.setArguments(args);
-            return fragment;
+        // Use the selected date as the default date in the picker
+        final Calendar calendar = Calendar.getInstance();
+        if (selectedDate != null) {
+            calendar.setTime(selectedDate);
         }
 
-        public static void registerDatePickListener(@NonNull AppCompatActivity activity, @NonNull OnDatePickListener listener) {
-            activity.getSupportFragmentManager().setFragmentResultListener(
-                    PICK_DATE_REQUEST_KEY,
-                    activity,
-                    (requestKey, result) -> listener.onDatePicked(
-                            (LoyaltyCardField) Objects.requireNonNull(result.getSerializable(TEXT_FIELD_TO_EDIT_ARGUMENT_KEY)),
-                            (Date) Objects.requireNonNull(result.getSerializable(NEWLY_PICKED_DATE_ARGUMENT_KEY))));
-        }
+        MaterialDatePicker<Long> materialDatePicker = MaterialDatePicker.Builder.datePicker()
+                .setSelection(calendar.getTimeInMillis())
+                .setCalendarConstraints(calendarConstraints)
+                .build();
 
-        @NonNull
-        @Override
-        public Dialog onCreateDialog(Bundle savedInstanceState) {
-            Bundle args = requireArguments();
-            textFieldEdit = (LoyaltyCardField) args.getSerializable(TEXT_FIELD_TO_EDIT_ARGUMENT_KEY);
-            minDate = (Date) args.getSerializable(MIN_DATE_ARGUMENT_KEY);
-            maxDate = (Date) args.getSerializable(MAX_DATE_ARGUMENT_KEY);
-            // Use the current date as the default date in the picker
-            final Calendar c = Calendar.getInstance();
-
-            Date date = (Date) args.getSerializable(CURRENT_DATE_ARGUMENT_KEY);
-            if (date != null) {
-                c.setTime(date);
+        // 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);
-
-            Bundle result = new Bundle();
-            result.putSerializable(TEXT_FIELD_TO_EDIT_ARGUMENT_KEY, textFieldEdit);
-            result.putSerializable(NEWLY_PICKED_DATE_ARGUMENT_KEY, date);
-            getParentFragmentManager().setFragmentResult(PICK_DATE_REQUEST_KEY, result);
-        }
+    private long getDefaultMaxDateOfDatePicker() {
+        Calendar maxDateCalendar = Calendar.getInstance();
+        maxDateCalendar.set(2100, 11, 31);
+        return maxDateCalendar.getTimeInMillis();
     }
 
     private void doSave() {
@@ -1471,18 +1497,41 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
             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;
         }
 
@@ -1618,7 +1667,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
         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;
         }

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/LoyaltyCardViewActivity.java

@@ -20,7 +20,6 @@ import android.text.method.DigitsKeyListener;
 import android.text.style.ForegroundColorSpan;
 import android.text.util.Linkify;
 import android.util.Log;
-import android.util.TypedValue;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
@@ -30,6 +29,7 @@ import android.view.Window;
 import android.view.WindowInsets;
 import android.view.WindowInsetsController;
 import android.view.WindowManager;
+import android.widget.EditText;
 import android.widget.FrameLayout;
 import android.widget.ImageButton;
 import android.widget.ImageView;
@@ -38,19 +38,17 @@ import android.widget.SeekBar;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import androidx.activity.OnBackPressedCallback;
 import androidx.annotation.StringRes;
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AlertDialog;
-import androidx.appcompat.content.res.AppCompatResources;
 import androidx.appcompat.widget.Toolbar;
 import androidx.core.content.FileProvider;
 import androidx.core.graphics.BlendModeColorFilterCompat;
 import androidx.core.graphics.BlendModeCompat;
 import androidx.core.graphics.ColorUtils;
-import androidx.core.graphics.drawable.DrawableCompat;
 import androidx.core.view.ViewCompat;
 import androidx.core.view.accessibility.AccessibilityNodeInfoCompat;
-import androidx.core.widget.TextViewCompat;
 
 import com.google.android.material.color.MaterialColors;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
@@ -98,7 +96,6 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
     ImageView barcodeRenderTarget;
     int mainImageIndex = 0;
     List<ImageType> imageTypes;
-    boolean isBarcodeSupported = true;
 
     static final String STATE_IMAGEINDEX = "imageIndex";
     static final String STATE_FULLSCREEN = "isFullscreen";
@@ -113,22 +110,25 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
             return;
         }
 
+        ImageType imageType = imageTypes.get(mainImageIndex);
+
         // If the barcode is shown, switch to fullscreen layout
-        if (imageTypes.get(mainImageIndex) == ImageType.BARCODE) {
+        if (imageType == ImageType.BARCODE) {
             setFullscreen(true);
             return;
         }
 
         // If this is an image, open it in the gallery.
-        openCurrentMainImageInGallery();
+        openImageInGallery(imageType);
     }
 
-    private void openCurrentMainImageInGallery() {
-        ImageType wantedImageType = imageTypes.get(mainImageIndex);
-
+    private void openImageInGallery(ImageType imageType) {
         File file = null;
 
-        switch (wantedImageType) {
+        switch (imageType) {
+            case ICON:
+                file = Utils.retrieveCardImageAsFile(this, loyaltyCardId, ImageLocationType.icon);
+                break;
             case IMAGE_FRONT:
                 file = Utils.retrieveCardImageAsFile(this, loyaltyCardId, ImageLocationType.front);
                 break;
@@ -176,6 +176,7 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
 
     enum ImageType {
         NONE,
+        ICON,
         BARCODE,
         IMAGE_FRONT,
         IMAGE_BACK
@@ -229,7 +230,9 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
         settings = new Settings(this);
 
         String cardOrientation = settings.getCardViewOrientation();
-        if (cardOrientation.equals(getString(R.string.settings_key_lock_on_opening_orientation))) {
+        if (cardOrientation.equals(getString(R.string.settings_key_follow_sensor_orientation))) {
+            setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_SENSOR);
+        } else if (cardOrientation.equals(getString(R.string.settings_key_lock_on_opening_orientation))) {
             setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LOCKED);
         } else if (cardOrientation.equals(getString(R.string.settings_key_portrait_orientation))) {
             setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
@@ -293,7 +296,6 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
             bundle.putBoolean(LoyaltyCardEditActivity.BUNDLE_UPDATE, true);
             intent.putExtras(bundle);
             startActivity(intent);
-            finish();
         });
         binding.fabEdit.bringToFront();
 
@@ -302,7 +304,13 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
         binding.bottomAppBarNextButton.setOnClickListener(view -> prevNextCard(true));
         binding.bottomAppBarUpdateBalanceButton.setOnClickListener(view -> showBalanceUpdateDialog());
 
-        binding.iconContainer.setOnClickListener(view -> Toast.makeText(LoyaltyCardViewActivity.this, R.string.icon_header_click_text, Toast.LENGTH_LONG).show());
+        binding.iconContainer.setOnClickListener(view -> {
+            if (Utils.retrieveCardImage(this, loyaltyCard.id, ImageLocationType.icon) != null) {
+                openImageInGallery(ImageType.ICON);
+            } else {
+                Toast.makeText(LoyaltyCardViewActivity.this, R.string.icon_header_click_text, Toast.LENGTH_LONG).show();
+            }
+        });
         binding.iconContainer.setOnLongClickListener(view -> {
             Intent intent = new Intent(getApplicationContext(), LoyaltyCardEditActivity.class);
             Bundle bundle = new Bundle();
@@ -324,6 +332,17 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
             return true;
         });
         binding.fullscreenImage.setOnClickListener(view -> onMainImageTap());
+
+        getOnBackPressedDispatcher().addCallback(this, new OnBackPressedCallback(true) {
+            @Override
+            public void handleOnBackPressed() {
+                if (isFullscreen) {
+                    setFullscreen(false);
+                } else {
+                    finish();
+                }
+            }
+        });
     }
 
     private SpannableStringBuilder padSpannableString(SpannableStringBuilder spannableStringBuilder) {
@@ -402,7 +421,11 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
 
     private void showBalanceUpdateDialog() {
         AlertDialog.Builder builder = new MaterialAlertDialogBuilder(this);
+
+        // Header
         builder.setTitle(R.string.updateBalanceTitle);
+
+        // Layout
         FrameLayout container = new FrameLayout(this);
         FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(
                 ViewGroup.LayoutParams.MATCH_PARENT,
@@ -420,61 +443,91 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
         currentTextview.setText(getString(R.string.currentBalanceSentence, Utils.formatBalance(this, loyaltyCard.balance, loyaltyCard.balanceType)));
         layout.addView(currentTextview);
 
-        TextView updateTextView = new TextView(this);
-        updateTextView.setText(getString(R.string.newBalanceSentence, Utils.formatBalance(this, loyaltyCard.balance, loyaltyCard.balanceType)));
-        layout.addView(updateTextView);
-
         final TextInputEditText input = new TextInputEditText(this);
-        Context dialogContext = this;
         input.setInputType(InputType.TYPE_CLASS_NUMBER);
         input.setKeyListener(DigitsKeyListener.getInstance("0123456789,."));
         input.setHint(R.string.updateBalanceHint);
-        input.addTextChangedListener(new SimpleTextWatcher() {
-            @Override
-            public void onTextChanged(CharSequence s, int start, int before, int count) {
-                BigDecimal newBalance;
-                try {
-                    newBalance = calculateNewBalance(loyaltyCard.balance, loyaltyCard.balanceType, s.toString());
-                } catch (ParseException e) {
-                    input.setTag(null);
-                    updateTextView.setText(getString(R.string.newBalanceSentence, Utils.formatBalance(dialogContext, loyaltyCard.balance, loyaltyCard.balanceType)));
-                    return;
-                }
 
-                // Save new balance into this element
-                input.setTag(newBalance);
-                updateTextView.setText(getString(R.string.newBalanceSentence, Utils.formatBalance(dialogContext, newBalance, loyaltyCard.balanceType)));
-            }
-        });
         layout.addView(input);
         layout.setLayoutParams(params);
         container.addView(layout);
 
+        // Set layout
         builder.setView(container);
-        builder.setPositiveButton(R.string.ok, (dialogInterface, i) -> {
-            // Grab calculated balance from input field
-            BigDecimal newBalance = (BigDecimal) input.getTag();
-            if (newBalance == null) {
-                return;
+
+        // Buttons
+        builder.setPositiveButton(R.string.spend, (dialogInterface, i) -> {
+            // Calculate and update balance
+            try {
+                BigDecimal balanceChange = Utils.parseBalance(input.getText().toString(), loyaltyCard.balanceType);
+                BigDecimal newBalance = loyaltyCard.balance.subtract(balanceChange).max(new BigDecimal(0));
+                DBHelper.updateLoyaltyCardBalance(database, loyaltyCardId, newBalance);
+            } catch (ParseException e) {
+                Toast.makeText(getApplicationContext(), R.string.amountParsingFailed, Toast.LENGTH_LONG).show();
             }
 
-            // Actually update balance
-            DBHelper.updateLoyaltyCardBalance(database, loyaltyCardId, newBalance);
-            // Reload UI
+            // Reload state
             this.onResume();
+
+            // Show new balance
+            Toast.makeText(getApplicationContext(), getString(R.string.newBalanceSentence, Utils.formatBalance(this, loyaltyCard.balance, loyaltyCard.balanceType)), Toast.LENGTH_LONG).show();
         });
-        builder.setNegativeButton(getString(R.string.cancel), (dialog, which) -> dialog.cancel());
+        builder.setNegativeButton(R.string.receive, (dialogInterface, i) -> {
+            // Calculate and update balance
+            try {
+                BigDecimal balanceChange = Utils.parseBalance(input.getText().toString(), loyaltyCard.balanceType);
+                BigDecimal newBalance = loyaltyCard.balance.add(balanceChange);
+                DBHelper.updateLoyaltyCardBalance(database, loyaltyCardId, newBalance);
+            } catch (ParseException e) {
+                Toast.makeText(getApplicationContext(), R.string.amountParsingFailed, Toast.LENGTH_LONG).show();
+            }
+
+            // Reload state
+            this.onResume();
+
+            // Show new balance
+            Toast.makeText(getApplicationContext(), getString(R.string.newBalanceSentence, Utils.formatBalance(this, loyaltyCard.balance, loyaltyCard.balanceType)), Toast.LENGTH_LONG).show();
+        });
+        builder.setNeutralButton(getString(R.string.cancel), (dialog, which) -> dialog.cancel());
         AlertDialog dialog = builder.create();
+
+        // Now that the dialog exists, we can bind something that affects the buttons
+        input.addTextChangedListener(new SimpleTextWatcher() {
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+                BigDecimal balanceChange;
+
+                try {
+                    balanceChange = Utils.parseBalance(s.toString(), loyaltyCard.balanceType);
+                } catch (ParseException e) {
+                    input.setError(getString(R.string.amountParsingFailed));
+                    dialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(false);
+                    dialog.getButton(AlertDialog.BUTTON_NEGATIVE).setEnabled(false);
+                    return;
+                }
+
+                input.setError(null);
+                if (balanceChange.equals(new BigDecimal(0))) {
+                    dialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(false);
+                    dialog.getButton(AlertDialog.BUTTON_NEGATIVE).setEnabled(false);
+                } else {
+                    dialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(true);
+                    dialog.getButton(AlertDialog.BUTTON_NEGATIVE).setEnabled(true);
+                }
+            }
+        });
+
         dialog.show();
+
+        // Disable buttons (must be done **after** dialog is shown to prevent crash
+        dialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(false);
+        dialog.getButton(AlertDialog.BUTTON_NEGATIVE).setEnabled(false);
+
+        // Set focus on input field
         dialog.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE);
         input.requestFocus();
     }
 
-    private BigDecimal calculateNewBalance(BigDecimal currentBalance, Currency currency, String unparsedSubtraction) throws ParseException {
-        BigDecimal subtraction = Utils.parseBalance(unparsedSubtraction, currency);
-        return currentBalance.subtract(subtraction).max(new BigDecimal(0));
-    }
-
     private void setBottomAppBarButtonState() {
         if (!loyaltyCard.note.isEmpty() || !loyaltyCardGroups.isEmpty() || hasBalance(loyaltyCard) || loyaltyCard.validFrom != null || loyaltyCard.expiry != null) {
             binding.bottomAppBarInfoButton.setVisibility(View.VISIBLE);
@@ -546,18 +599,24 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
 
 
     @Override
-    public void onResume() {
+    protected void onResume() {
+        activityOverridesNavBarColor = true;
         super.onResume();
 
         Log.i(TAG, "To view card: " + loyaltyCardId);
 
-        // The brightness value is on a scale from [0, ..., 1], where
-        // '1' is the brightest. We attempt to maximize the brightness
-        // to help barcode readers scan the barcode.
         Window window = getWindow();
         if (window != null) {
+            // Hide the keyboard if still shown (could be the case when returning from edit activity
+            window.setSoftInputMode(
+                    WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN
+            );
+
             WindowManager.LayoutParams attributes = window.getAttributes();
 
+            // The brightness value is on a scale from [0, ..., 1], where
+            // '1' is the brightest. We attempt to maximize the brightness
+            // to help barcode readers scan the barcode.
             if (settings.useMaxBrightnessDisplayingBarcode()) {
                 attributes.screenBrightness = 1F;
             }
@@ -619,7 +678,11 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
         int darkenedColor = ColorUtils.blendARGB(backgroundHeaderColor, Color.BLACK, 0.1f);
         binding.barcodeScaler.setProgressTintList(ColorStateList.valueOf(darkenedColor));
         binding.barcodeScaler.setThumbTintList(ColorStateList.valueOf(darkenedColor));
+
+        // Set bottomAppBar and system navigation bar color
         binding.bottomAppBar.setBackgroundColor(darkenedColor);
+        Utils.setNavigationBarColor(null, window, darkenedColor, Utils.needsDarkForeground(darkenedColor));
+
         int complementaryColor = Utils.getComplementaryColor(darkenedColor);
         binding.fabEdit.setBackgroundTintList(ColorStateList.valueOf(complementaryColor));
         Drawable editButtonIcon = binding.fabEdit.getDrawable();
@@ -639,12 +702,15 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
         fixBottomAppBarImageButtonColor(binding.bottomAppBarUpdateBalanceButton);
         setBottomAppBarButtonState();
 
+        boolean isBarcodeSupported;
         if (format != null && !format.isSupported()) {
             isBarcodeSupported = false;
 
             Toast.makeText(this, getString(R.string.unsupportedBarcodeType), Toast.LENGTH_LONG).show();
         } else if (format == null) {
             isBarcodeSupported = false;
+        } else {
+            isBarcodeSupported = true;
         }
 
         imageTypes = new ArrayList<>();
@@ -670,6 +736,8 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
         DBHelper.updateLoyaltyCardLastUsed(database, loyaltyCard.id);
 
         invalidateOptionsMenu();
+
+        ShortcutHelper.updateShortcuts(this, loyaltyCard);
     }
 
     private void setStateBasedOnImageTypes() {
@@ -698,16 +766,6 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
         imageButton.setColorFilter(BlendModeColorFilterCompat.createBlendModeColorFilterCompat(backgroundNeedsDarkIcons ? Color.BLACK : Color.WHITE, BlendModeCompat.SRC_ATOP));
     }
 
-    @Override
-    public void onBackPressed() {
-        if (isFullscreen) {
-            setFullscreen(false);
-            return;
-        }
-
-        super.onBackPressed();
-    }
-
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         getMenuInflater().inflate(R.menu.card_view_menu, menu);
@@ -779,6 +837,8 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
             DBHelper.updateLoyaltyCardArchiveStatus(database, loyaltyCardId, 1);
             Toast.makeText(LoyaltyCardViewActivity.this, R.string.archived, Toast.LENGTH_LONG).show();
 
+            ShortcutHelper.removeShortcut(LoyaltyCardViewActivity.this, loyaltyCardId);
+
             // Re-init loyaltyCard with new data from DB
             onResume();
             invalidateOptionsMenu();
@@ -1049,10 +1109,14 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
 
             // Set Android to fullscreen mode
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-                getWindow().setDecorFitsSystemWindows(false);
-                if (getWindow().getInsetsController() != null) {
-                    getWindow().getInsetsController().hide(WindowInsets.Type.statusBars() | WindowInsets.Type.navigationBars());
-                    getWindow().getInsetsController().setSystemBarsBehavior(WindowInsetsController.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE);
+                Window window = getWindow();
+                if (window != null) {
+                    window.setDecorFitsSystemWindows(false);
+                    WindowInsetsController wic = window.getInsetsController();
+                    if (wic != null) {
+                        wic.hide(WindowInsets.Type.statusBars() | WindowInsets.Type.navigationBars());
+                        wic.setSystemBarsBehavior(WindowInsetsController.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE);
+                    }
                 }
             } else {
                 setFullscreenModeSdkLessThan30();
@@ -1079,10 +1143,14 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
 
             // Unset fullscreen mode
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-                getWindow().setDecorFitsSystemWindows(true);
-                if (getWindow().getInsetsController() != null) {
-                    getWindow().getInsetsController().show(WindowInsets.Type.statusBars() | WindowInsets.Type.navigationBars());
-                    getWindow().getInsetsController().setSystemBarsBehavior(WindowInsetsController.BEHAVIOR_DEFAULT);
+                Window window = getWindow();
+                if (window != null) {
+                    window.setDecorFitsSystemWindows(true);
+                    WindowInsetsController wic = window.getInsetsController();
+                    if (wic != null) {
+                        wic.show(WindowInsets.Type.statusBars() | WindowInsets.Type.navigationBars());
+                        wic.setSystemBarsBehavior(WindowInsetsController.BEHAVIOR_DEFAULT);
+                    }
                 }
             } else {
                 unsetFullscreenModeSdkLessThan30();
@@ -1094,19 +1162,25 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
 
     @SuppressWarnings("deprecation")
     private void unsetFullscreenModeSdkLessThan30() {
-        getWindow().getDecorView().setSystemUiVisibility(
-                getWindow().getDecorView().getSystemUiVisibility()
-                        & ~View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY
-                        & ~View.SYSTEM_UI_FLAG_FULLSCREEN
-        );
+        Window window = getWindow();
+        if (window != null) {
+            window.getDecorView().setSystemUiVisibility(
+                    window.getDecorView().getSystemUiVisibility()
+                            & ~View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY
+                            & ~View.SYSTEM_UI_FLAG_FULLSCREEN
+            );
+        }
     }
 
     @SuppressWarnings("deprecation")
     private void setFullscreenModeSdkLessThan30() {
-        getWindow().getDecorView().setSystemUiVisibility(
-                getWindow().getDecorView().getSystemUiVisibility()
-                        | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY
-                        | View.SYSTEM_UI_FLAG_FULLSCREEN
-        );
+        Window window = getWindow();
+        if (window != null) {
+            window.getDecorView().setSystemUiVisibility(
+                    window.getDecorView().getSystemUiVisibility()
+                            | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY
+                            | View.SYSTEM_UI_FLAG_FULLSCREEN
+            );
+        }
     }
 }

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

@@ -2,15 +2,11 @@ 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;
 import android.database.CursorIndexOutOfBoundsException;
 import android.database.sqlite.SQLiteDatabase;
-import android.graphics.Bitmap;
-import android.net.Uri;
 import android.os.Bundle;
 import android.util.DisplayMetrics;
 import android.util.Log;
@@ -22,6 +18,7 @@ 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.AlertDialog;
@@ -34,14 +31,12 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.google.android.material.tabs.TabLayout;
 
-import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import protect.card_locker.databinding.ArchiveActivityBinding;
 import protect.card_locker.databinding.ContentMainBinding;
 import protect.card_locker.databinding.MainActivityBinding;
 import protect.card_locker.databinding.SortingOptionBinding;
@@ -49,7 +44,6 @@ import protect.card_locker.preferences.SettingsActivity;
 
 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";
@@ -72,8 +66,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;
@@ -92,35 +85,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());
@@ -182,6 +147,7 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
                 for (LoyaltyCard loyaltyCard : mAdapter.getSelectedItems()) {
                     Log.d(TAG, "Archiving card: " + loyaltyCard.id);
                     DBHelper.updateLoyaltyCardArchiveStatus(mDatabase, loyaltyCard.id, 1);
+                    ShortcutHelper.removeShortcut(MainActivity.this, loyaltyCard.id);
                     updateLoyaltyCardList(false);
                     inputMode.finish();
                     invalidateOptionsMenu();
@@ -226,31 +192,24 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
 
     @Override
     protected void onCreate(Bundle inputSavedInstanceState) {
-        extractIntentFields(getIntent());
         SplashScreen.installSplashScreen(this);
         super.onCreate(inputSavedInstanceState);
-        if (!mArchiveMode) {
-            binding = MainActivityBinding.inflate(getLayoutInflater());
-            setTitle(R.string.app_name);
-            setContentView(binding.getRoot());
-            setSupportActionBar(binding.toolbar);
-            groupsTabLayout = binding.groups;
-            contentMainBinding = ContentMainBinding.bind(binding.include.getRoot());
-        } else {
-            archiveActivityBinding = ArchiveActivityBinding.inflate(getLayoutInflater());
-            setTitle(R.string.archiveList);
-            setContentView(archiveActivityBinding.getRoot());
-            setSupportActionBar(archiveActivityBinding.toolbar);
-            groupsTabLayout = archiveActivityBinding.groups;
-            contentMainBinding = ContentMainBinding.bind(archiveActivityBinding.include.getRoot());
-        }
 
-        if(mArchiveMode) {
-            enableToolbarBackButton();
-        }
+        // We should extract the share intent after we called the super.onCreate as it may need to spawn a dialog window and the app needs to be initialized to not crash
+        extractIntentFields(getIntent());
+
+        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) {
@@ -283,7 +242,7 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
         mNoGroupCardsText = contentMainBinding.noGroupCardsText;
         mCardList = contentMainBinding.list;
 
-        mAdapter = new LoyaltyCardCursorAdapter(this, null, this);
+        mAdapter = new LoyaltyCardCursorAdapter(this, null, this, mUpdateLoyaltyCardListRunnable);
         mCardList.setAdapter(mAdapter);
         registerForContextMenu(mCardList);
 
@@ -328,11 +287,11 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
             }
 
             Intent intent = result.getData();
-            BarcodeValues barcodeValues = Utils.parseSetBarcodeActivityResult(Utils.BARCODE_SCAN, result.getResultCode(), intent, this);
+            List<BarcodeValues> barcodeValuesList = Utils.parseSetBarcodeActivityResult(Utils.BARCODE_SCAN, result.getResultCode(), intent, this);
 
             Bundle inputBundle = intent.getExtras();
             String group = inputBundle != null ? inputBundle.getString(LoyaltyCardEditActivity.BUNDLE_ADDGROUP) : null;
-            processBarcodeValues(barcodeValues, group);
+            processBarcodeValuesList(barcodeValuesList, group, false);
         });
 
         mSettingsLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), result -> {
@@ -343,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();
@@ -398,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_shown_details, 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);
         }
     }
@@ -447,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();
@@ -478,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);
 
@@ -496,69 +446,61 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
         }
     }
 
-    private void processBarcodeValues(BarcodeValues barcodeValues, String group) {
-        if (barcodeValues.isEmpty()) {
+    private void processBarcodeValuesList(List<BarcodeValues> barcodeValuesList, String group, boolean closeAppOnNoBarcode) {
+        if (barcodeValuesList.isEmpty()) {
             throw new IllegalArgumentException("barcodesValues may not be empty");
         }
 
-        Intent newIntent = new Intent(getApplicationContext(), LoyaltyCardEditActivity.class);
-        Bundle newBundle = new Bundle();
-        newBundle.putString(LoyaltyCardEditActivity.BUNDLE_BARCODETYPE, barcodeValues.format());
-        newBundle.putString(LoyaltyCardEditActivity.BUNDLE_CARDID, barcodeValues.content());
-        if (group != null) {
-            newBundle.putString(LoyaltyCardEditActivity.BUNDLE_ADDGROUP, group);
-        }
-        newIntent.putExtras(newBundle);
-        startActivity(newIntent);
+        Utils.makeUserChooseBarcodeFromList(MainActivity.this, barcodeValuesList, new BarcodeValuesListDisambiguatorCallback() {
+            @Override
+            public void onUserChoseBarcode(BarcodeValues barcodeValues) {
+                Intent newIntent = new Intent(getApplicationContext(), LoyaltyCardEditActivity.class);
+                Bundle newBundle = new Bundle();
+                newBundle.putString(LoyaltyCardEditActivity.BUNDLE_BARCODETYPE, barcodeValues.format());
+                newBundle.putString(LoyaltyCardEditActivity.BUNDLE_CARDID, barcodeValues.content());
+                if (group != null) {
+                    newBundle.putString(LoyaltyCardEditActivity.BUNDLE_ADDGROUP, group);
+                }
+                newIntent.putExtras(newBundle);
+                startActivity(newIntent);
+            }
+
+            @Override
+            public void onUserDismissedSelector() {
+                if (closeAppOnNoBarcode) {
+                    finish();
+                }
+            }
+        });
     }
 
     private void onSharedIntent(Intent intent) {
         String receivedAction = intent.getAction();
         String receivedType = intent.getType();
 
-        // Check if an image was shared to us
+        // Check if an image or file was shared to us
         if (Intent.ACTION_SEND.equals(receivedAction)) {
-            if (!receivedType.startsWith("image/")) {
+            List<BarcodeValues> barcodeValuesList;
+
+            if (receivedType.startsWith("image/")) {
+                barcodeValuesList = Utils.retrieveBarcodesFromImage(this, intent.getParcelableExtra(Intent.EXTRA_STREAM));
+            } else if (receivedType.equals("application/pdf")) {
+                barcodeValuesList = Utils.retrieveBarcodesFromPdf(this, intent.getParcelableExtra(Intent.EXTRA_STREAM));
+            } else {
                 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();
+            if (barcodeValuesList.isEmpty()) {
                 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);
+            processBarcodeValuesList(barcodeValuesList, null, true);
         }
     }
 
     private void extractIntentFields(Intent intent) {
-        final Bundle b = intent.getExtras();
-        mArchiveMode = b != null && b.getBoolean(BUNDLE_ARCHIVE_MODE, false);
         onSharedIntent(intent);
     }
 
@@ -591,11 +533,7 @@ 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);
 
         displayCardSetupOptions(inputMenu, mLoyaltyCardCount > 0);
 
@@ -630,14 +568,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 +576,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_shown_details) {
-            mAdapter.showSelectDetailDisplayDialog();
+        if (id == R.id.action_display_options) {
+            mAdapter.showDisplayOptionsDialog();
             invalidateOptionsMenu();
 
             return true;
@@ -706,15 +636,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);
@@ -794,30 +715,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);
@@ -870,8 +792,6 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
             b.putIntegerArrayList("cardList", cardList);
             intent.putExtras(b);
 
-            ShortcutHelper.updateShortcuts(MainActivity.this, loyaltyCard);
-
             startActivity(intent);
         }
     }

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,15 +26,9 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
 
-import androidx.annotation.NonNull;
-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;
@@ -100,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);
 
@@ -134,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) {
@@ -167,8 +174,8 @@ public class ManageGroupActivity extends CatimaAppCompatActivity implements Mana
     public boolean onOptionsItemSelected(MenuItem inputItem) {
         int id = inputItem.getItemId();
 
-        if (id == R.id.action_shown_details) {
-            mAdapter.showSelectDetailDisplayDialog();
+        if (id == R.id.action_display_options) {
+            mAdapter.showDisplayOptionsDialog();
             invalidateOptionsMenu();
 
             return true;
@@ -211,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,41 +105,16 @@ 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
         );
@@ -154,25 +122,51 @@ public class ManageGroupsActivity extends CatimaAppCompatActivity implements Gro
         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();
     }
@@ -249,4 +243,4 @@ public class ManageGroupsActivity extends CatimaAppCompatActivity implements Gro
         AlertDialog dialog = builder.create();
         dialog.show();
     }
-}
+}

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

@@ -1,5 +1,8 @@
 package protect.card_locker;
 
+import static protect.card_locker.BarcodeSelectorActivity.BARCODE_CONTENTS;
+import static protect.card_locker.BarcodeSelectorActivity.BARCODE_FORMAT;
+
 import android.Manifest;
 import android.app.Activity;
 import android.content.ActivityNotFoundException;
@@ -9,6 +12,7 @@ import android.graphics.Color;
 import android.net.Uri;
 import android.os.Bundle;
 import android.provider.Settings;
+import android.text.InputType;
 import android.util.DisplayMetrics;
 import android.util.Log;
 import android.util.TypedValue;
@@ -16,15 +20,21 @@ import android.view.KeyEvent;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
+import android.view.ViewGroup;
+import android.view.WindowManager;
+import android.widget.EditText;
+import android.widget.LinearLayout;
+import android.widget.TextView;
 import android.widget.Toast;
 
 import androidx.activity.result.ActivityResultLauncher;
 import androidx.activity.result.contract.ActivityResultContracts;
 import androidx.annotation.NonNull;
+import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.widget.Toolbar;
-
 import androidx.core.content.ContextCompat;
 
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.google.zxing.ResultPoint;
 import com.google.zxing.client.android.Intents;
 import com.journeyapps.barcodescanner.BarcodeCallback;
@@ -44,7 +54,6 @@ import protect.card_locker.databinding.ScanActivityBinding;
  * originally licensed under Apache 2.0
  */
 public class ScanActivity extends CatimaAppCompatActivity {
-
     private ScanActivityBinding binding;
     private CustomBarcodeScannerBinding customBarcodeScannerBinding;
     private static final String TAG = "Catima";
@@ -53,6 +62,7 @@ public class ScanActivity extends CatimaAppCompatActivity {
     private static final int COMPAT_SCALE_FACTOR_DIP = 320;
 
     private static final int PERMISSION_SCAN_ADD_FROM_IMAGE = 100;
+    private static final int PERMISSION_SCAN_ADD_FROM_PDF = 101;
 
     private CaptureManager capture;
     private DecoratedBarcodeView barcodeScannerView;
@@ -64,6 +74,10 @@ public class ScanActivity extends CatimaAppCompatActivity {
     private ActivityResultLauncher<Intent> manualAddLauncher;
     // can't use the pre-made contract because that launches the file manager for image type instead of gallery
     private ActivityResultLauncher<Intent> photoPickerLauncher;
+    private ActivityResultLauncher<Intent> pdfPickerLauncher;
+
+    static final String STATE_SCANNER_ACTIVE = "scannerActive";
+    private boolean mScannerActive = true;
 
     private void extractIntentFields(Intent intent) {
         final Bundle b = intent.getExtras();
@@ -87,8 +101,41 @@ public class ScanActivity extends CatimaAppCompatActivity {
 
         manualAddLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), result -> handleActivityResult(Utils.SELECT_BARCODE_REQUEST, result.getResultCode(), result.getData()));
         photoPickerLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), result -> handleActivityResult(Utils.BARCODE_IMPORT_FROM_IMAGE_FILE, result.getResultCode(), result.getData()));
-        customBarcodeScannerBinding.addFromImage.setOnClickListener(this::addFromImage);
-        customBarcodeScannerBinding.addManually.setOnClickListener(this::addManually);
+        pdfPickerLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), result -> handleActivityResult(Utils.BARCODE_IMPORT_FROM_PDF_FILE, result.getResultCode(), result.getData()));
+        customBarcodeScannerBinding.fabOtherOptions.setOnClickListener(view -> {
+            setScannerActive(false);
+
+            MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(ScanActivity.this);
+            builder.setTitle(getString(R.string.add_a_card_in_a_different_way));
+            builder.setItems(
+                    new CharSequence[]{
+                            getString(R.string.addWithoutBarcode),
+                            getString(R.string.addManually),
+                            getString(R.string.addFromImage),
+                            getString(R.string.addFromPdfFile)
+                    },
+                    (dialogInterface, i) -> {
+                        switch (i) {
+                            case 0:
+                                addWithoutBarcode();
+                                break;
+                            case 1:
+                                addManually();
+                                break;
+                            case 2:
+                                addFromImage();
+                                break;
+                            case 3:
+                                addFromPdfFile();
+                                break;
+                            default:
+                                throw new IllegalArgumentException("Unknown 'Add a card in a different way' dialog option");
+                        }
+                    }
+            );
+            builder.setOnCancelListener(dialogInterface -> setScannerActive(true));
+            builder.show();
+        });
 
         barcodeScannerView = binding.zxingBarcodeScanner;
 
@@ -106,8 +153,8 @@ public class ScanActivity extends CatimaAppCompatActivity {
             public void barcodeResult(BarcodeResult result) {
                 Intent scanResult = new Intent();
                 Bundle scanResultBundle = new Bundle();
-                scanResultBundle.putString(BarcodeSelectorActivity.BARCODE_CONTENTS, result.getText());
-                scanResultBundle.putString(BarcodeSelectorActivity.BARCODE_FORMAT, result.getBarcodeFormat().name());
+                scanResultBundle.putString(BARCODE_CONTENTS, result.getText());
+                scanResultBundle.putString(BARCODE_FORMAT, result.getBarcodeFormat().name());
                 if (addGroup != null) {
                     scanResultBundle.putString(LoyaltyCardEditActivity.BUNDLE_ADDGROUP, addGroup);
                 }
@@ -126,7 +173,11 @@ public class ScanActivity extends CatimaAppCompatActivity {
     @Override
     protected void onResume() {
         super.onResume();
-        capture.onResume();
+
+        if (mScannerActive) {
+            capture.onResume();
+        }
+
         if (ContextCompat.checkSelfPermission(this, Manifest.permission.CAMERA) == PackageManager.PERMISSION_GRANTED) {
             showCameraPermissionMissingText(false);
         }
@@ -146,9 +197,18 @@ public class ScanActivity extends CatimaAppCompatActivity {
     }
 
     @Override
-    protected void onSaveInstanceState(Bundle outState) {
-        super.onSaveInstanceState(outState);
-        capture.onSaveInstanceState(outState);
+    protected void onSaveInstanceState(Bundle savedInstanceState) {
+        super.onSaveInstanceState(savedInstanceState);
+        capture.onSaveInstanceState(savedInstanceState);
+
+        savedInstanceState.putBoolean(STATE_SCANNER_ACTIVE, mScannerActive);
+    }
+
+    @Override
+    public void onRestoreInstanceState(@NonNull Bundle savedInstanceState) {
+        super.onRestoreInstanceState(savedInstanceState);
+
+        mScannerActive = savedInstanceState.getBoolean(STATE_SCANNER_ACTIVE);
     }
 
     @Override
@@ -190,19 +250,20 @@ public class ScanActivity extends CatimaAppCompatActivity {
         return super.onOptionsItemSelected(item);
     }
 
-    private void handleActivityResult(int requestCode, int resultCode, Intent intent) {
-        super.onActivityResult(requestCode, resultCode, intent);
-
-        BarcodeValues barcodeValues = Utils.parseSetBarcodeActivityResult(requestCode, resultCode, intent, this);
-
-        if (barcodeValues.isEmpty()) {
-            return;
+    private void setScannerActive(boolean isActive) {
+        if (isActive) {
+            barcodeScannerView.resume();
+        } else {
+            barcodeScannerView.pause();
         }
+        mScannerActive = isActive;
+    }
 
+    private void returnResult(String barcodeContents, String barcodeFormat) {
         Intent manualResult = new Intent();
         Bundle manualResultBundle = new Bundle();
-        manualResultBundle.putString(BarcodeSelectorActivity.BARCODE_CONTENTS, barcodeValues.content());
-        manualResultBundle.putString(BarcodeSelectorActivity.BARCODE_FORMAT, barcodeValues.format());
+        manualResultBundle.putString(BARCODE_CONTENTS, barcodeContents);
+        manualResultBundle.putString(BARCODE_FORMAT, barcodeFormat);
         if (addGroup != null) {
             manualResultBundle.putString(LoyaltyCardEditActivity.BUNDLE_ADDGROUP, addGroup);
         }
@@ -211,32 +272,132 @@ public class ScanActivity extends CatimaAppCompatActivity {
         finish();
     }
 
-    public void addManually(View view) {
-        Intent i = new Intent(getApplicationContext(), BarcodeSelectorActivity.class);
-        if (cardId != null) {
-            final Bundle b = new Bundle();
-            b.putString("initialCardId", cardId);
-            i.putExtras(b);
+    private void handleActivityResult(int requestCode, int resultCode, Intent intent) {
+        super.onActivityResult(requestCode, resultCode, intent);
+
+        List<BarcodeValues> barcodeValuesList = Utils.parseSetBarcodeActivityResult(requestCode, resultCode, intent, this);
+
+        if (barcodeValuesList.isEmpty()) {
+            setScannerActive(true);
+            return;
         }
-        manualAddLauncher.launch(i);
+
+        Utils.makeUserChooseBarcodeFromList(this, barcodeValuesList, new BarcodeValuesListDisambiguatorCallback() {
+            @Override
+            public void onUserChoseBarcode(BarcodeValues barcodeValues) {
+                returnResult(barcodeValues.content(), barcodeValues.format());
+            }
+
+            @Override
+            public void onUserDismissedSelector() {
+                setScannerActive(true);
+            }
+        });
     }
 
-    public void addFromImage(View view) {
+    private void addWithoutBarcode() {
+        AlertDialog.Builder builder = new MaterialAlertDialogBuilder(this);
+
+        builder.setOnCancelListener(dialogInterface -> setScannerActive(true));
+
+        // Header
+        builder.setTitle(R.string.addWithoutBarcode);
+
+        // Layout
+        LinearLayout layout = new LinearLayout(this);
+        layout.setOrientation(LinearLayout.VERTICAL);
+        LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(
+                ViewGroup.LayoutParams.MATCH_PARENT,
+                ViewGroup.LayoutParams.WRAP_CONTENT
+        );
+        int contentPadding = getResources().getDimensionPixelSize(R.dimen.alert_dialog_content_padding);
+        params.leftMargin = contentPadding;
+        params.topMargin = contentPadding / 2;
+        params.rightMargin = contentPadding;
+
+        // Description
+        TextView currentTextview = new TextView(this);
+        currentTextview.setText(getString(R.string.enter_card_id));
+        currentTextview.setLayoutParams(params);
+        layout.addView(currentTextview);
+
+        // EditText with spacing
+        final EditText input = new EditText(this);
+        input.setInputType(InputType.TYPE_CLASS_TEXT);
+        input.setLayoutParams(params);
+        layout.addView(input);
+
+        // Set layout
+        builder.setView(layout);
+
+        // Buttons
+        builder.setPositiveButton(getString(R.string.ok), (dialog, which) -> {
+            returnResult(input.getText().toString(), "");
+        });
+        builder.setNegativeButton(getString(R.string.cancel), (dialog, which) -> dialog.cancel());
+        AlertDialog dialog = builder.create();
+
+        // Now that the dialog exists, we can bind something that affects the OK button
+        input.addTextChangedListener(new SimpleTextWatcher() {
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+                if (s.length() == 0) {
+                    input.setError(getString(R.string.card_id_must_not_be_empty));
+                    dialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(false);
+                } else {
+                    input.setError(null);
+                    dialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(true);
+                }
+            }
+        });
+
+        dialog.show();
+
+        // Disable button (must be done **after** dialog is shown to prevent crash
+        dialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(false);
+        // Set focus on input field
+        dialog.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE);
+        input.requestFocus();
+    }
+
+    public void addManually() {
+        MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(ScanActivity.this);
+        builder.setTitle(R.string.add_manually_warning_title);
+        builder.setMessage(R.string.add_manually_warning_message);
+        builder.setPositiveButton(R.string.continue_, (dialog, which) -> {
+            Intent i = new Intent(getApplicationContext(), BarcodeSelectorActivity.class);
+            if (cardId != null) {
+                final Bundle b = new Bundle();
+                b.putString("initialCardId", cardId);
+                i.putExtras(b);
+            }
+            manualAddLauncher.launch(i);
+        });
+        builder.setNegativeButton(R.string.cancel, (dialog, which) -> setScannerActive(true));
+        builder.setOnCancelListener(dialog -> setScannerActive(true));
+        builder.show();
+    }
+
+    public void addFromImage() {
         PermissionUtils.requestStorageReadPermission(this, PERMISSION_SCAN_ADD_FROM_IMAGE);
     }
 
-    private void addFromImageAfterPermission() {
-        Intent photoPickerIntent = new Intent(Intent.ACTION_PICK);
-        photoPickerIntent.setType("image/*");
-        Intent contentIntent = new Intent(Intent.ACTION_GET_CONTENT);
-        contentIntent.setType("image/*");
+    public void addFromPdfFile() {
+        PermissionUtils.requestStorageReadPermission(this, PERMISSION_SCAN_ADD_FROM_PDF);
+    }
 
-        Intent chooserIntent = Intent.createChooser(photoPickerIntent, getString(R.string.addFromImage));
+    private void addFromImageOrFileAfterPermission(String mimeType, ActivityResultLauncher<Intent> launcher, int chooserText, int errorMessage) {
+        Intent photoPickerIntent = new Intent(Intent.ACTION_PICK);
+        photoPickerIntent.setType(mimeType);
+        Intent contentIntent = new Intent(Intent.ACTION_GET_CONTENT);
+        contentIntent.setType(mimeType);
+
+        Intent chooserIntent = Intent.createChooser(photoPickerIntent, getString(chooserText));
         chooserIntent.putExtra(Intent.EXTRA_INITIAL_INTENTS, new Intent[] { contentIntent });
         try {
-            photoPickerLauncher.launch(chooserIntent);
+            launcher.launch(chooserIntent);
         } catch (ActivityNotFoundException e) {
-            Toast.makeText(getApplicationContext(), R.string.failedLaunchingPhotoPicker, Toast.LENGTH_LONG).show();
+            setScannerActive(true);
+            Toast.makeText(getApplicationContext(), errorMessage, Toast.LENGTH_LONG).show();
             Log.e(TAG, "No activity found to handle intent", e);
         }
     }
@@ -284,10 +445,15 @@ public class ScanActivity extends CatimaAppCompatActivity {
 
         if (requestCode == CaptureManager.getCameraPermissionReqCode()) {
             showCameraPermissionMissingText(!granted);
-        } else if (requestCode == PERMISSION_SCAN_ADD_FROM_IMAGE) {
+        } else if (requestCode == PERMISSION_SCAN_ADD_FROM_IMAGE || requestCode == PERMISSION_SCAN_ADD_FROM_PDF) {
             if (granted) {
-                addFromImageAfterPermission();
+                if (requestCode == PERMISSION_SCAN_ADD_FROM_IMAGE) {
+                    addFromImageOrFileAfterPermission("image/*", photoPickerLauncher, R.string.addFromImage, R.string.failedLaunchingPhotoPicker);
+                } else {
+                    addFromImageOrFileAfterPermission("application/pdf", pdfPickerLauncher, R.string.addFromPdfFile, R.string.failedLaunchingFileManager);
+                }
             } else {
+                setScannerActive(true);
                 Toast.makeText(this, R.string.storageReadPermissionRequired, Toast.LENGTH_LONG).show();
             }
         }

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

@@ -8,6 +8,11 @@ import android.graphics.Canvas;
 import android.graphics.Color;
 import android.os.Bundle;
 
+import androidx.core.content.pm.ShortcutInfoCompat;
+import androidx.core.content.pm.ShortcutManagerCompat;
+import androidx.core.graphics.ColorUtils;
+import androidx.core.graphics.drawable.IconCompat;
+
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Collections;
@@ -15,11 +20,6 @@ import java.util.Comparator;
 import java.util.LinkedList;
 import java.util.List;
 
-import androidx.core.content.pm.ShortcutInfoCompat;
-import androidx.core.content.pm.ShortcutManagerCompat;
-import androidx.core.graphics.ColorUtils;
-import androidx.core.graphics.drawable.IconCompat;
-
 class ShortcutHelper {
     // Android documentation says that no more than 5 shortcuts
     // are supported. However, that may be too many, as not all
@@ -43,6 +43,11 @@ class ShortcutHelper {
      * used card shortcut is discarded.
      */
     static void updateShortcuts(Context context, LoyaltyCard card) {
+        if (card.archiveStatus == 1) {
+            // Don't add archived card to menu
+            return;
+        }
+
         LinkedList<ShortcutInfoCompat> list = new LinkedList<>(ShortcutManagerCompat.getDynamicShortcuts(context));
 
         SQLiteDatabase database = new DBHelper(context).getReadableDatabase();
@@ -108,18 +113,7 @@ class ShortcutHelper {
      * shortcut exists.
      */
     static void removeShortcut(Context context, int cardId) {
-        List<ShortcutInfoCompat> list = ShortcutManagerCompat.getDynamicShortcuts(context);
-
-        String shortcutId = Integer.toString(cardId);
-
-        for (int index = 0; index < list.size(); index++) {
-            if (list.get(index).getId().equals(shortcutId)) {
-                list.remove(index);
-                break;
-            }
-        }
-
-        ShortcutManagerCompat.setDynamicShortcuts(context, list);
+        ShortcutManagerCompat.removeDynamicShortcuts(context, Collections.singletonList(Integer.toString(cardId)));
     }
 
     static @NotNull

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

@@ -7,19 +7,20 @@ import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.os.Bundle;
 import android.view.View;
+import android.view.Window;
 import android.widget.FrameLayout;
 import android.widget.LinearLayout;
 
-import com.google.android.material.color.MaterialColors;
-import com.google.android.material.textview.MaterialTextView;
-import com.yalantis.ucrop.UCropActivity;
-
 import androidx.annotation.Nullable;
 import androidx.appcompat.widget.AppCompatImageView;
 import androidx.core.content.ContextCompat;
 import androidx.core.graphics.ColorUtils;
 import androidx.core.view.WindowInsetsControllerCompat;
 
+import com.google.android.material.color.MaterialColors;
+import com.google.android.material.textview.MaterialTextView;
+import com.yalantis.ucrop.UCropActivity;
+
 public class UCropWrapper extends UCropActivity {
     public static final String UCROP_TOOLBAR_TYPEFACE_STYLE = "ucop_toolbar_typeface_style";
 
@@ -27,15 +28,18 @@ public class UCropWrapper extends UCropActivity {
     protected void onPostCreate(@Nullable Bundle savedInstanceState) {
         super.onPostCreate(savedInstanceState);
         boolean darkMode = Utils.isDarkModeEnabled(this);
+        Window window = getWindow();
         // setup status bar to look like the rest of the app
         if (Build.VERSION.SDK_INT >= 23) {
-            View decorView = getWindow().getDecorView();
-            WindowInsetsControllerCompat wic = new WindowInsetsControllerCompat(getWindow(), decorView);
-            wic.setAppearanceLightStatusBars(!darkMode);
+            if (window != null) {
+                View decorView = window.getDecorView();
+                WindowInsetsControllerCompat wic = new WindowInsetsControllerCompat(window, decorView);
+                wic.setAppearanceLightStatusBars(!darkMode);
+            }
         } else {
             // icons are always white back then
-            if (!darkMode) {
-                getWindow().setStatusBarColor(ColorUtils.compositeColors(Color.argb(127, 0, 0, 0), getWindow().getStatusBarColor()));
+            if (window != null && !darkMode) {
+                window.setStatusBarColor(ColorUtils.compositeColors(Color.argb(127, 0, 0, 0), window.getStatusBarColor()));
             }
         }
 

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

@@ -1,5 +1,6 @@
 package protect.card_locker;
 
+import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
@@ -11,26 +12,36 @@ import android.graphics.BitmapFactory;
 import android.graphics.Color;
 import android.graphics.ImageDecoder;
 import android.graphics.Matrix;
+import android.graphics.pdf.PdfRenderer;
 import android.net.Uri;
 import android.os.Build;
-import android.os.LocaleList;
+import android.os.ParcelFileDescriptor;
 import android.provider.MediaStore;
+import android.text.Layout;
+import android.text.Spanned;
+import android.text.style.ClickableSpan;
 import android.util.Log;
 import android.util.TypedValue;
-import android.view.MenuItem;
+import android.view.MotionEvent;
 import android.view.View;
+import android.view.Window;
 import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.annotation.RawRes;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.app.AppCompatDelegate;
 import androidx.core.graphics.ColorUtils;
+import androidx.core.os.LocaleListCompat;
+import androidx.core.view.WindowInsetsControllerCompat;
 import androidx.exifinterface.media.ExifInterface;
 import androidx.palette.graphics.Palette;
 
 import com.google.android.material.color.DynamicColors;
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.google.zxing.BinaryBitmap;
 import com.google.zxing.LuminanceSource;
 import com.google.zxing.MultiFormatReader;
@@ -38,6 +49,8 @@ import com.google.zxing.NotFoundException;
 import com.google.zxing.RGBLuminanceSource;
 import com.google.zxing.Result;
 import com.google.zxing.common.HybridBinarizer;
+import com.google.zxing.multi.GenericMultipleBarcodeReader;
+import com.google.zxing.multi.MultipleBarcodeReader;
 
 import java.io.BufferedReader;
 import java.io.ByteArrayOutputStream;
@@ -54,10 +67,13 @@ import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.text.NumberFormat;
 import java.text.ParseException;
+import java.util.ArrayList;
 import java.util.Calendar;
+import java.util.Collections;
 import java.util.Currency;
 import java.util.Date;
 import java.util.GregorianCalendar;
+import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.regex.Matcher;
@@ -73,12 +89,13 @@ public class Utils {
     public static final int SELECT_BARCODE_REQUEST = 2;
     public static final int BARCODE_SCAN = 3;
     public static final int BARCODE_IMPORT_FROM_IMAGE_FILE = 4;
-    public static final int CARD_IMAGE_FROM_CAMERA_FRONT = 5;
-    public static final int CARD_IMAGE_FROM_CAMERA_BACK = 6;
-    public static final int CARD_IMAGE_FROM_CAMERA_ICON = 7;
-    public static final int CARD_IMAGE_FROM_FILE_FRONT = 8;
-    public static final int CARD_IMAGE_FROM_FILE_BACK = 9;
-    public static final int CARD_IMAGE_FROM_FILE_ICON = 10;
+    public static final int BARCODE_IMPORT_FROM_PDF_FILE = 5;
+    public static final int CARD_IMAGE_FROM_CAMERA_FRONT = 6;
+    public static final int CARD_IMAGE_FROM_CAMERA_BACK = 7;
+    public static final int CARD_IMAGE_FROM_CAMERA_ICON = 8;
+    public static final int CARD_IMAGE_FROM_FILE_FRONT = 9;
+    public static final int CARD_IMAGE_FROM_FILE_BACK = 10;
+    public static final int CARD_IMAGE_FROM_FILE_ICON = 11;
 
     public static final String CARD_IMAGE_FILENAME_REGEX = "^(card_)(\\d+)(_(?:front|back|icon)\\.png)$";
 
@@ -121,6 +138,80 @@ public class Utils {
         return ColorUtils.calculateLuminance(backgroundColor) > LUMINANCE_MIDPOINT;
     }
 
+    static public List<BarcodeValues> retrieveBarcodesFromImage(Context context, Uri uri) {
+        Log.i(TAG, "Received image file with possible barcode");
+
+        if (uri == null) {
+            Log.e(TAG, "Uri did not contain any data");
+            Toast.makeText(context, R.string.errorReadingImage, Toast.LENGTH_LONG).show();
+            return new ArrayList<>();
+        }
+
+        Bitmap bitmap;
+        try {
+            bitmap = retrieveImageFromUri(context, uri);
+        } catch (IOException e) {
+            Log.e(TAG, "Error getting data from image file");
+            e.printStackTrace();
+            Toast.makeText(context, R.string.errorReadingImage, Toast.LENGTH_LONG).show();
+            return new ArrayList<>();
+        }
+
+        List<BarcodeValues> barcodesFromBitmap = getBarcodesFromBitmap(bitmap);
+
+        if (barcodesFromBitmap.isEmpty()) {
+            Log.i(TAG, "No barcode found in image file");
+            Toast.makeText(context, R.string.noBarcodeFound, Toast.LENGTH_LONG).show();
+        }
+
+        return barcodesFromBitmap;
+    }
+
+    static public List<BarcodeValues> retrieveBarcodesFromPdf(Context context, Uri uri) {
+        Log.i(TAG, "Received PDF file with possible barcode");
+
+        if (uri == null) {
+            Log.e(TAG, "Uri did not contain any data");
+            Toast.makeText(context, R.string.errorReadingFile, Toast.LENGTH_LONG).show();
+            return new ArrayList<>();
+        }
+
+        ParcelFileDescriptor parcelFileDescriptor;
+        PdfRenderer renderer;
+        try {
+            parcelFileDescriptor = context.getContentResolver().openFileDescriptor(uri, "r");
+            renderer = new PdfRenderer(parcelFileDescriptor);
+        } catch (IOException e) {
+            Log.e(TAG, "Could not read file in uri");
+            Toast.makeText(context, R.string.errorReadingFile, Toast.LENGTH_LONG).show();
+            return new ArrayList<>();
+        }
+
+        // Loop over all pages to find barcodes
+        List<BarcodeValues> barcodesFromPdfPages = new ArrayList<>();
+        Bitmap renderedPage;
+        for (int i = 0; i < renderer.getPageCount(); i++) {
+            PdfRenderer.Page page = renderer.openPage(i);
+            renderedPage = Bitmap.createBitmap(page.getWidth(), page.getHeight(), Bitmap.Config.ARGB_8888);
+            page.render(renderedPage, null, null, PdfRenderer.Page.RENDER_MODE_FOR_DISPLAY);
+            page.close();
+
+            List<BarcodeValues> barcodesFromPage = getBarcodesFromBitmap(renderedPage);
+            for (BarcodeValues barcodeValues : barcodesFromPage) {
+                barcodeValues.setNote(String.format(context.getString(R.string.pageWithNumber), i+1));
+                barcodesFromPdfPages.add(barcodeValues);
+            }
+        }
+        renderer.close();
+
+        if (barcodesFromPdfPages.isEmpty()) {
+            Log.i(TAG, "No barcode found in pdf file");
+            Toast.makeText(context, R.string.noBarcodeFound, Toast.LENGTH_LONG).show();
+        }
+
+        return barcodesFromPdfPages;
+    }
+
     /**
      * Returns the Barcode format and content based on the result of an activity.
      * It shows toasts to notify the end-user as needed itself and will return an empty
@@ -132,45 +223,20 @@ public class Utils {
      * @param context
      * @return BarcodeValues
      */
-    static public BarcodeValues parseSetBarcodeActivityResult(int requestCode, int resultCode, Intent intent, Context context) {
+    static public List<BarcodeValues> parseSetBarcodeActivityResult(int requestCode, int resultCode, Intent intent, Context context) {
         String contents;
         String format;
 
         if (resultCode != Activity.RESULT_OK) {
-            return new BarcodeValues(null, null);
+            return new ArrayList<>();
         }
 
         if (requestCode == Utils.BARCODE_IMPORT_FROM_IMAGE_FILE) {
-            Log.i(TAG, "Received image file with possible barcode");
+            return retrieveBarcodesFromImage(context, intent.getData());
+        }
 
-            Uri data = intent.getData();
-            if (data == null) {
-                Log.e(TAG, "Intent did not contain any data");
-                Toast.makeText(context, R.string.errorReadingImage, Toast.LENGTH_LONG).show();
-                return new BarcodeValues(null, null);
-            }
-
-            Bitmap bitmap;
-            try {
-                bitmap = retrieveImageFromUri(context, data);
-            } catch (IOException e) {
-                Log.e(TAG, "Error getting data from image file");
-                e.printStackTrace();
-                Toast.makeText(context, R.string.errorReadingImage, Toast.LENGTH_LONG).show();
-                return new BarcodeValues(null, null);
-            }
-
-            BarcodeValues barcodeFromBitmap = getBarcodeFromBitmap(bitmap);
-
-            if (barcodeFromBitmap.isEmpty()) {
-                Log.i(TAG, "No barcode found in image file");
-                Toast.makeText(context, R.string.noBarcodeFound, Toast.LENGTH_LONG).show();
-            }
-
-            Log.i(TAG, "Read barcode id: " + barcodeFromBitmap.content());
-            Log.i(TAG, "Read format: " + barcodeFromBitmap.format());
-
-            return barcodeFromBitmap;
+        if (requestCode == Utils.BARCODE_IMPORT_FROM_PDF_FILE) {
+            return retrieveBarcodesFromPdf(context, intent.getData());
         }
 
         if (requestCode == Utils.BARCODE_SCAN || requestCode == Utils.SELECT_BARCODE_REQUEST) {
@@ -186,7 +252,7 @@ public class Utils {
             Log.i(TAG, "Read barcode id: " + contents);
             Log.i(TAG, "Read format: " + format);
 
-            return new BarcodeValues(format, contents);
+            return Collections.singletonList(new BarcodeValues(format, contents));
         }
 
         throw new UnsupportedOperationException("Unknown request code for parseSetBarcodeActivityResult");
@@ -206,22 +272,22 @@ public class Utils {
         return MediaStore.Images.Media.getBitmap(context.getContentResolver(), data);
     }
 
-    static public BarcodeValues getBarcodeFromBitmap(Bitmap bitmap) {
+    static public List<BarcodeValues> getBarcodesFromBitmap(Bitmap bitmap) {
         // This function is vulnerable to OOM, so we try again with a smaller bitmap is we get OOM
         for (int i = 0; i < 10; i++) {
             try {
-                return Utils.getBarcodeFromBitmapReal(bitmap);
+                return Utils.getBarcodesFromBitmapReal(bitmap);
             } catch (OutOfMemoryError e) {
-                Log.w(TAG, "Ran OOM in getBarcodeFromBitmap! Trying again with smaller picture! Retry " + i + " of 10.");
+                Log.w(TAG, "Ran OOM in getBarcodesFromBitmap! Trying again with smaller picture! Retry " + i + " of 10.");
                 bitmap = Bitmap.createScaledBitmap(bitmap, (int) Math.round(0.75 * bitmap.getWidth()), (int) Math.round(0.75 * bitmap.getHeight()), false);
             }
         }
 
         // Give up
-        return new BarcodeValues(null, null);
+        return new ArrayList<>();
     }
 
-    static private BarcodeValues getBarcodeFromBitmapReal(Bitmap bitmap) {
+    static private List<BarcodeValues> getBarcodesFromBitmapReal(Bitmap bitmap) {
         // In order to decode it, the Bitmap must first be converted into a pixel array...
         int[] intArray = new int[bitmap.getWidth() * bitmap.getHeight()];
         bitmap.getPixels(intArray, 0, bitmap.getWidth(), 0, 0, bitmap.getWidth(), bitmap.getHeight());
@@ -230,15 +296,63 @@ public class Utils {
         LuminanceSource source = new RGBLuminanceSource(bitmap.getWidth(), bitmap.getHeight(), intArray);
         BinaryBitmap binaryBitmap = new BinaryBitmap(new HybridBinarizer(source));
 
+        List<BarcodeValues> barcodeValuesList = new ArrayList<>();
         try {
-            Result barcodeResult = new MultiFormatReader().decode(binaryBitmap);
+            MultiFormatReader multiFormatReader = new MultiFormatReader();
+            MultipleBarcodeReader multipleBarcodeReader = new GenericMultipleBarcodeReader(multiFormatReader);
 
-            return new BarcodeValues(barcodeResult.getBarcodeFormat().name(), barcodeResult.getText());
+            Result[] barcodeResults = multipleBarcodeReader.decodeMultiple(binaryBitmap);
+
+            for (Result barcodeResult : barcodeResults) {
+                Log.i(TAG, "Read barcode id: " + barcodeResult.getText());
+                Log.i(TAG, "Read format: " + barcodeResult.getBarcodeFormat().name());
+
+                barcodeValuesList.add(new BarcodeValues(barcodeResult.getBarcodeFormat().name(), barcodeResult.getText()));
+            }
+
+            return barcodeValuesList;
         } catch (NotFoundException e) {
-            return new BarcodeValues(null, null);
+            return barcodeValuesList;
         }
     }
 
+    static public void makeUserChooseBarcodeFromList(Context context, List<BarcodeValues> barcodeValuesList, BarcodeValuesListDisambiguatorCallback callback) {
+        // If there is only one choice, consider it chosen
+        if (barcodeValuesList.size() == 1) {
+            callback.onUserChoseBarcode(barcodeValuesList.get(0));
+            return;
+        }
+
+        // Ask user to choose a barcode
+        // TODO: This should contain an image of the barcode in question to help users understand the choice they're making
+        CharSequence[] barcodeDescriptions = new CharSequence[barcodeValuesList.size()];
+        for (int i = 0; i < barcodeValuesList.size(); i++) {
+            BarcodeValues barcodeValues = barcodeValuesList.get(i);
+            CatimaBarcode catimaBarcode = CatimaBarcode.fromName(barcodeValues.format());
+
+            String barcodeContent = barcodeValues.content();
+            // Shorten overly long barcodes
+            if (barcodeContent.length() > 22) {
+                barcodeContent = barcodeContent.substring(0, 20) + "…";
+            }
+
+            if (barcodeValues.note() != null) {
+                barcodeDescriptions[i] = String.format("%s: %s (%s)", barcodeValues.note(), catimaBarcode.prettyName(), barcodeContent);
+            } else {
+                barcodeDescriptions[i] = String.format("%s (%s)", catimaBarcode.prettyName(), barcodeContent);
+            }
+        }
+
+        MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(context);
+        builder.setTitle(context.getString(R.string.multipleBarcodesFoundPleaseChooseOne));
+        builder.setItems(
+                barcodeDescriptions,
+                (dialogInterface, i) -> callback.onUserChoseBarcode(barcodeValuesList.get(i))
+        );
+        builder.setOnCancelListener(dialogInterface -> callback.onUserDismissedSelector());
+        builder.show();
+    }
+
     static public Boolean isNotYetValid(Date validFromDate) {
         // The note in `hasExpired` does not apply here, since the bug was fixed before this feature was added.
         return validFromDate.after(getStartOfToday().getTime());
@@ -474,17 +588,30 @@ public class Utils {
 
         Locale chosenLocale = settings.getLocale();
 
-        Resources res = context.getResources();
-        Configuration configuration = res.getConfiguration();
+        // New API is broken on Android 6 and lower when selecting locales with both language and country, so still keeping this
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) {
+            Resources res = context.getResources();
+            Configuration configuration = res.getConfiguration();
             setLocalesSdkLessThan24(chosenLocale, configuration, res);
             return context;
         }
 
-        LocaleList localeList = chosenLocale != null ? new LocaleList(chosenLocale) : LocaleList.getDefault();
-        LocaleList.setDefault(localeList);
-        configuration.setLocales(localeList);
-        return context.createConfigurationContext(configuration);
+        /* Documentation at https://developer.android.com/reference/androidx/appcompat/app/AppCompatDelegate#setApplicationLocales(androidx.core.os.LocaleListCompat)
+        For API levels below that, the developer has two options:
+        - They can opt-in to automatic storage handled through the library...
+        - The second option is that they can choose to handle storage themselves.
+        In order to do so they must use this API to initialize locales during app-start up and provide their stored locales.
+        In this case, API should be called before Activity.onCreate() in the activity lifecycle, e.g. in attachBaseContext().
+        Note: Developers should gate this to API versions <33.
+
+        We are handling storage ourselves (courtesy of the in-app language picker), so we take the second approach.
+        So according to docs, we should have the API < 33 check.
+        */
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
+            AppCompatDelegate.setApplicationLocales(chosenLocale != null ? LocaleListCompat.create(chosenLocale) : LocaleListCompat.getEmptyLocaleList());
+        }
+
+        return context;
     }
 
     @SuppressWarnings("deprecation")
@@ -493,6 +620,55 @@ public class Utils {
         res.updateConfiguration(configuration, res.getDisplayMetrics());
     }
 
+    /**
+     * Android 13 settings seems to "force" the user to select country of locale, but many app-supported locales either only have language, not country
+     * or have a country the user doesn't want, which creates a mismatch between the app's supported locales and the system locale.
+     * <br>
+     * Example: The user chooses Espanol (Espana) in system settings, but the app only supports Espanol (Argentina) and the "plain" Espanol.
+     * <br>
+     * This method returns the app-supported locale that is most similar to the system one.
+     * @param appLocales Locales supported by the app
+     * @param sysLocale Per-app locale in system settings
+     * @return The app-supported locale that best matches the system per-app locale
+     */
+    @NonNull
+    public static Locale getBestMatchLocale(@NonNull List<Locale> appLocales, @NonNull Locale sysLocale) {
+        int highestMatchMagnitude = appLocales.stream()
+                .mapToInt(appLocale -> calculateMatchMagnitudeOfTwoLocales(appLocale, sysLocale))
+                .max()
+                .orElseThrow(() -> new IllegalArgumentException("appLocales is empty"));
+        for (int i = 0; i < appLocales.size(); i++) {
+            Locale appLocale = appLocales.get(i);
+            if (calculateMatchMagnitudeOfTwoLocales(appLocale, sysLocale) == highestMatchMagnitude) {
+                return appLocale;
+            }
+        }
+        throw new AssertionError("This is not possible; there must be a locale whose match magnitude == " + highestMatchMagnitude + " with " + sysLocale.toLanguageTag());
+    }
+
+    private static int calculateMatchMagnitudeOfTwoLocales(@NonNull Locale appLocale, @NonNull Locale sysLocale) {
+        List<String> appLocaleAdjusted = new ArrayList<>();
+        List<String> sysLocaleAdjusted = new ArrayList<>();
+        appLocaleAdjusted.add(appLocale.getLanguage());
+        sysLocaleAdjusted.add(sysLocale.getLanguage());
+        if (!appLocale.getCountry().isEmpty() && !sysLocale.getCountry().isEmpty()) {
+            appLocaleAdjusted.add(appLocale.getCountry());
+            sysLocaleAdjusted.add(sysLocale.getCountry());
+        }
+        if (!appLocale.getVariant().isEmpty() && !sysLocale.getVariant().isEmpty()) {
+            appLocaleAdjusted.add(appLocale.getVariant());
+            sysLocaleAdjusted.add(sysLocale.getVariant());
+        }
+        if (!appLocale.getScript().isEmpty() && !sysLocale.getScript().isEmpty()) {
+            appLocaleAdjusted.add(appLocale.getScript());
+            sysLocaleAdjusted.add(sysLocale.getScript());
+        }
+        if (appLocaleAdjusted.equals(sysLocaleAdjusted)) {
+            return appLocaleAdjusted.size();
+        }
+        return 0;
+    }
+
     static public long getUnixTime() {
         return System.currentTimeMillis() / 1000;
     }
@@ -594,13 +770,31 @@ public class Utils {
         }
     }
 
-    // XXX android 9 and below has issues with patched theme where the background becomes a
-    // rendering mess
-    // use after views are inflated
+    // Force correct color
+    // Fixes OLED dark mode in MainActivity
     public static void postPatchColors(AppCompatActivity activity) {
+        activity.findViewById(android.R.id.content).setBackgroundColor(resolveBackgroundColor(activity));
+    }
+
+    // Either pass an Activity on which to call getWindow() or an existing Window (may be null) returned by that function.
+    public static void setNavigationBarColor(@Nullable AppCompatActivity activity, @Nullable Window window, int color, boolean useLightBars) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1) {
+            if (window == null && activity != null) {
+                window = activity.getWindow();
+            }
+            if (window != null) {
+                View decorView = window.getDecorView();
+                WindowInsetsControllerCompat wic = new WindowInsetsControllerCompat(window, decorView);
+                wic.setAppearanceLightNavigationBars(useLightBars);
+                window.setNavigationBarColor(color);
+            }
+        }
+    }
+
+    public static int resolveBackgroundColor(AppCompatActivity activity) {
         TypedValue typedValue = new TypedValue();
         activity.getTheme().resolveAttribute(android.R.attr.colorBackground, typedValue, true);
-        activity.findViewById(android.R.id.content).setBackgroundColor(typedValue.data);
+        return typedValue.data;
     }
 
     public static int getHeaderColorFromImage(Bitmap image, int fallback) {
@@ -624,7 +818,7 @@ public class Utils {
         while (true) {
             String nextLine = reader.readLine();
 
-            if (nextLine == null || nextLine.isEmpty()) {
+            if (nextLine == null) {
                 reader.close();
                 break;
             }
@@ -636,23 +830,52 @@ public class Utils {
         return result.toString();
     }
 
-    public static void setIconOrTextWithBackground(Context context, LoyaltyCard loyaltyCard, Bitmap icon, ImageView backgroundOrIcon, TextView textWhenNoImage) {
-        if (icon != null) {
-            Log.d("onResume", "setting icon image");
-            textWhenNoImage.setVisibility(View.GONE);
+    // Very crude Markdown to HTML conversion.
+    // Only supports what's currently being used in CHANGELOG.md and PRIVACY.md.
+    // May break easily.
+    public static String basicMDToHTML(final String input) {
+        return input
+                .replaceAll("(?m)^#\\s+(.*)", "<h1>$1</h1>")
+                .replaceAll("(?m)^##\\s+(.*)", "<h2>$1</h2>")
+                .replaceAll("\\[([^]]+)\\]\\((https?://[\\w@#%&+=:?/.-]+)\\)", "<a href=\"$2\">$1</a>")
+                .replaceAll("\\*\\*([^*]+)\\*\\*", "<b>$1</b>")
+                .replaceAll("(?m)^-\\s+(.*)", "<ul><li>&nbsp;$1</li></ul>")
+                .replace("</ul>\n<ul>", "");
+    }
 
-            backgroundOrIcon.setImageBitmap(icon);
-            backgroundOrIcon.setBackgroundColor(Color.TRANSPARENT);
+    // Very crude autolinking.
+    // Only supports what's currently being used in CHANGELOG.md and PRIVACY.md.
+    // May break easily.
+    public static String linkify(final String input) {
+        return input
+                .replaceAll("([\\w.-]+@[\\w-]+(\\.[\\w-]+)+)", "<a href=\"mailto:$1\">$1</a>")
+                .replaceAll("(?<!href=\")\\b(https?://[\\w@#%&+=:?/.-]*[\\w@#%&+=:?/-])", "<a href=\"$1\">$1</a>");
+    }
+
+    /**
+     * Sets an icon or text with background on the given ImageView and/or TextView, including background colour.
+     *
+     * @param context Android context
+     * @param loyaltyCard Loyalty Card
+     * @param icon Bitmap of the icon to set, or null
+     * @param backgroundOrIcon ImageView to draw the icon and background on to
+     * @param textWhenNoImage TextView to write the loyalty card name into if icon is null
+     * @return background colour
+     */
+    public static int setIconOrTextWithBackground(Context context, LoyaltyCard loyaltyCard, Bitmap icon, ImageView backgroundOrIcon, TextView textWhenNoImage) {
+        int headerColor = getHeaderColor(context, loyaltyCard);
+        backgroundOrIcon.setImageBitmap(icon);
+        backgroundOrIcon.setBackgroundColor(headerColor);
+
+        if (icon != null) {
+            textWhenNoImage.setVisibility(View.GONE);
         } else {
             textWhenNoImage.setVisibility(View.VISIBLE);
-
-            int headerColor = getHeaderColor(context, loyaltyCard);
-
-            backgroundOrIcon.setImageBitmap(null);
-            backgroundOrIcon.setBackgroundColor(headerColor);
             textWhenNoImage.setText(loyaltyCard.store);
             textWhenNoImage.setTextColor(Utils.needsDarkForeground(headerColor) ? Color.BLACK : Color.WHITE);
         }
+
+        return headerColor;
     }
 
     public static boolean installedFromGooglePlay(Context context) {
@@ -700,4 +923,27 @@ public class Utils {
         }
         return a.equals(b);
     }
+
+    @SuppressLint("ClickableViewAccessibility")
+    public static void makeTextViewLinksClickable(final TextView textView, final Spanned text) {
+        textView.setOnTouchListener((v, event) -> {
+            int action = event.getAction();
+            if (action == MotionEvent.ACTION_UP || action == MotionEvent.ACTION_DOWN) {
+                int x = (int) event.getX() - textView.getTotalPaddingLeft() + textView.getScrollX();
+                int y = (int) event.getY() - textView.getTotalPaddingTop() + textView.getScrollY();
+                Layout layout = textView.getLayout();
+                int line = layout.getLineForVertical(y);
+                int off = layout.getOffsetForHorizontal(line, x);
+                ClickableSpan[] links = text.getSpans(off, off, ClickableSpan.class);
+                if (links.length != 0) {
+                    ClickableSpan link = links[0];
+                    if (action == MotionEvent.ACTION_UP) {
+                        link.onClick(textView);
+                    }
+                    return true;
+                }
+            }
+            return false;
+        });
+    }
 }

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

@@ -3,12 +3,13 @@ package protect.card_locker.preferences;
 import android.content.Context;
 import android.content.SharedPreferences;
 
-import java.util.Locale;
-
 import androidx.annotation.IntegerRes;
 import androidx.annotation.StringRes;
 import androidx.appcompat.app.AppCompatDelegate;
 import androidx.preference.PreferenceManager;
+
+import java.util.Locale;
+
 import protect.card_locker.R;
 import protect.card_locker.Utils;