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

.github/dependabot.yml

@@ -1,30 +1,11 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
 version: 2
 updates:
-  - package-ecosystem: "gradle"
-    directory: "/"
-    registries:
-      - google
-      - gradlePluginPortal
-      - jitpack
-      - mavenCentral
+  - package-ecosystem: "gradle" # See documentation for possible values
+    directory: "/" # Location of package manifests
     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,68 +1,41 @@
 name: Android CI
+
 on:
-  workflow_dispatch:
   push:
     branches:
-      - main
+      - master
       - staging
       - trying
   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
+      - master
+
 jobs:
   build:
+
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        api-level: [ 21, 34 ]
+
     steps:
-    - uses: actions/checkout@v4.2.2
+    - uses: actions/checkout@v2
     - 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/actions/wrapper-validation@v4
-    - name: set up OpenJDK 17
-      run: |
-        sudo apt-get update
-        sudo apt-get install -y openjdk-17-jdk-headless
-        sudo update-alternatives --auto java
+    - uses: gradle/wrapper-validation-action@v1
+    - name: set up JDK 11
+      uses: actions/setup-java@v2
+      with:
+        distribution: 'adopt'
+        java-version: '11'
     - name: Build
       run: ./gradlew assembleRelease
     - name: Check lint
       run: ./gradlew lintRelease
     - name: Run unit tests
-      run: timeout 5m ./gradlew testReleaseUnitTest || { ./gradlew --stop && timeout 5m ./gradlew testReleaseUnitTest; }
-    - name: Enable KVM
-      run: |
-        echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
-        sudo udevadm control --reload-rules
-        sudo udevadm trigger --name-match=kvm
-    - name: Run instrumented tests
-      uses: ReactiveCircus/android-emulator-runner@v2
-      with:
-        api-level: ${{ matrix.api-level }}
-        arch: x86_64
-        script: ./gradlew connectedCheck
+      run: ./gradlew testReleaseUnitTest || ./gradlew testReleaseUnitTest
     - name: SpotBugs
       run: ./gradlew spotbugsRelease
     - name: Archive test results
       if: always()
-      uses: actions/upload-artifact@v4.4.3
+      uses: actions/upload-artifact@v2
       with:
-        name: test-results-api${{ matrix.api-level }}
+        name: test-results
         path: app/build/reports

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

@@ -0,0 +1,23 @@
+name: 'Close issues and PRs needing info for too long'
+on:
+  schedule:
+    - cron: '30 1 * * *'
+
+permissions:
+  issues: write
+  pull-requests: write
+
+jobs:
+  stale:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/stale@v4
+        with:
+          days-before-stale: -1
+          days-before-close: 90
+          close-issue-message: 'This issue is missing necessary information and cannot be worked on in its current state. It has therefore been closed to keep the issue tracker clean. If you have more information, feel free to reopen it.'
+          close-pr-message: 'This PR is missing necessary information and cannot be merged in its current state. It has therefore been closed to keep the issue tracker clean. If you have more information, feel free to reopen it.'
+          only-labels: 'needs info'
+          stale-issue-label: 'needs info'
+          stale-pr-label: 'needs info'
+          remove-stale-when-updated: false

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

@@ -0,0 +1,34 @@
+name: Compress Images on Push to Master
+on:
+  push:
+    branches:
+      - master
+    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,25 +1,9 @@
 name: Convert CHANGELOG to Fastlane
 on:
-  workflow_dispatch:
   push:
     branches:
-      - main
-    paths:
-      - 'CHANGELOG.md'
-permissions:
-  actions: none
-  checks: none
-  contents: write
-  deployments: none
-  discussions: none
-  id-token: none
-  issues: none
-  packages: none
-  pages: none
-  pull-requests: write
-  repository-projects: none
-  security-events: none
-  statuses: none
+      - master
+
 jobs:
   convert_changelog_to_fastlane:
     runs-on: ubuntu-latest
@@ -27,15 +11,15 @@ jobs:
     steps:
     - name: Checkout repo
       id: checkout
-      uses: actions/checkout@v4.2.2
+      uses: actions/checkout@v2
     - name: Setup Python
-      uses: actions/setup-python@v5.3.0
+      uses: actions/setup-python@v2
       with:
         python-version: '3.x'
     - name: Run converter script
       run: python .scripts/changelog_to_fastlane.py
     - name: Create Pull Request
-      uses: peter-evans/create-pull-request@v7.0.5
+      uses: peter-evans/create-pull-request@v3
       with:
         title: "Update Fastlane changelogs"
         commit-message: "Update Fastlane changelogs"

.github/workflows/codeql-analysis.yml

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

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

@@ -1,39 +1,24 @@
 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
-    if: github.ref == 'refs/heads/main'
+    if: github.ref == 'refs/heads/master'
     name: Write contributors to file
     steps:
     - name: Checkout repo
       id: checkout
-      uses: actions/checkout@v4.2.2
+      uses: actions/checkout@v2
     - name: Update contributors
       id: update_contributors
-      uses: TheLastProject/contributors-to-file-action@v3.2.0
+      uses: TheLastProject/contributors-to-file-action@v2
       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@v7.0.5
+      uses: peter-evans/create-pull-request@v3
       with:
         title: "Update contributors"
         commit-message: "Update contributors"

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

@@ -1,46 +0,0 @@
-name: Generate feature graphic
-on:
-  workflow_dispatch:
-  push:
-    branches:
-      - main
-    paths:
-      - 'fastlane/**/title.txt'
-      - '.scripts/generate_feature_graphic/**'
-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.2.2
-    - 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@v7.0.5
-      with:
-        title: "Update feature graphic"
-        commit-message: "Update feature graphic"
-        branch-suffix: timestamp

.github/workflows/gradle-update.yml

@@ -1,33 +0,0 @@
-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.2.2
-    - uses: obfusk/gradle-update-action@v3.0.0
-      id: gradle-update
-    - uses: gradle/actions/wrapper-validation@v4
-    - name: Create Pull Request
-      uses: peter-evans/create-pull-request@v7.0.5
-      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/update-locales.yml

@@ -1,38 +0,0 @@
-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.2.2
-    - 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@v7.0.5
-      with:
-        title: "Update locales"
-        commit-message: "Update locales"
-        branch-suffix: timestamp

.gitignore

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

.scripts/dump_stocard_stores.py

@@ -1,44 +0,0 @@
-#!/usr/bin/python3
-
-import csv
-import json
-import msgpack
-
-MSGPACK = "bootstrapdata.msgpack"
-OUTFILE = "stocard_stores.csv"
-
-
-def load(fh):
-    data = []
-    for r in msgpack.Unpacker(fh, raw=False):
-        if r["collection"] == "/loyalty-card-providers/":
-            d = json.loads(r["data"])
-            data.append([r["resource_id"], d["name"], d["default_barcode_format"]])
-    return data
-
-
-def save(data, output_file=OUTFILE):
-    with open(output_file, "w") as fh:
-        writer = csv.writer(fh, lineterminator="\n")
-        writer.writerow(["_id", "name", "barcodeFormat"])
-        for row in data:
-            writer.writerow(row)
-
-
-if __name__ == "__main__":
-    import argparse
-    parser = argparse.ArgumentParser(
-        epilog=f"INPUT_FILE must be a .msgpack or .apk and defaults to {MSGPACK}; "
-               f"OUTPUT_FILE defaults to {OUTFILE}")
-    parser.add_argument("input_file", metavar="INPUT_FILE", nargs="?", default=MSGPACK)
-    parser.add_argument("output_file", metavar="OUTPUT_FILE", nargs="?", default=OUTFILE)
-    args = parser.parse_args()
-    if args.input_file.lower().endswith(".apk"):
-        import zipfile
-        with zipfile.ZipFile(args.input_file) as zf:
-            with zf.open(f"assets/{MSGPACK}") as fh:
-                data = load(fh)
-    else:
-        with open(args.input_file, "rb") as fh:
-            data = load(fh)
-    save(data, args.output_file)

.scripts/generate_feature_graphic/featureGraphic.svg

@@ -1,15 +0,0 @@
-<svg width="1024" height="500" viewBox="0 0 1024 500" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect width="1024" height="500" fill="#223355"/>
-<text fill="white" xml:space="preserve" style="" font-family="Yesteryear" font-size="150" letter-spacing="0em"><tspan x="470.082" y="285.511">Catima
-</tspan></text>
-<path d="M381.046 147.001L236.3 211.446L276.524 301.79L421.27 237.345L381.046 147.001Z" fill="#F0F0F0" stroke="#C80000" stroke-width="2"/>
-<path d="M402.077 219.13L240.07 147L191.984 255.004L353.99 327.135L402.077 219.13Z" fill="#F0F0F0" stroke="#C80000" stroke-width="2"/>
-<path d="M437.17 236.241L251.831 183.096L220.071 293.855L405.41 347L437.17 236.241Z" fill="#C80000" stroke="#C80000" stroke-width="6" stroke-linejoin="round"/>
-<path d="M412.879 178.633H220.071V293.855H412.879V178.633Z" fill="#FF0000" stroke="#FF0000" stroke-width="6" stroke-linejoin="round"/>
-<path d="M221.482 296.217C238.316 296.217 251.963 269.366 251.963 236.244C251.963 203.121 238.316 176.27 221.482 176.27C204.647 176.27 191 203.121 191 236.244C191 269.366 204.647 296.217 221.482 296.217Z" fill="#FF0000" stroke="#FF0000" stroke-width="3.44232" stroke-linejoin="round"/>
-<path d="M307.256 250.444C307.256 253.187 306.289 255.842 304.526 257.944C302.763 260.045 300.316 261.458 297.614 261.934C294.913 262.41 292.13 261.92 289.755 260.548C287.379 259.177 285.563 257.012 284.625 254.435" stroke="#F0F0F0" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M330.301 254.298C329.363 256.875 327.547 259.04 325.171 260.411C322.796 261.783 320.013 262.273 317.312 261.797C314.61 261.321 312.163 259.908 310.4 257.807C308.637 255.706 307.671 253.05 307.671 250.307" stroke="#F0F0F0" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M248.345 225.937L266.818 207.465L285.29 225.937" stroke="#F0F0F0" stroke-width="2"/>
-<path d="M329.625 225.937L348.098 207.465L366.571 225.937" stroke="#F0F0F0" stroke-width="2"/>
-<text fill="white" xml:space="preserve" style="" font-family="Lexend Deca" font-size="35" font-weight="200" letter-spacing="0em"><tspan x="466" y="340">Loyalty Card Wallet</tspan></text>
-</svg>

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

@@ -1,93 +0,0 @@
-Copyright 2018 The Lexend Project Authors (https://github.com/googlefonts/lexend), with Reserved Font Name “RevReading Lexend”.
-
-This Font Software is licensed under the SIL Open Font License, Version 1.1.
-This license is copied below, and is also available with a FAQ at:
-http://scripts.sil.org/OFL
-
-
------------------------------------------------------------
-SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
------------------------------------------------------------
-
-PREAMBLE
-The goals of the Open Font License (OFL) are to stimulate worldwide
-development of collaborative font projects, to support the font creation
-efforts of academic and linguistic communities, and to provide a free and
-open framework in which fonts may be shared and improved in partnership
-with others.
-
-The OFL allows the licensed fonts to be used, studied, modified and
-redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded, 
-redistributed and/or sold with any software provided that any reserved
-names are not used by derivative works. The fonts and derivatives,
-however, cannot be released under any other type of license. The
-requirement for fonts to remain under this license does not apply
-to any document created using the fonts or their derivatives.
-
-DEFINITIONS
-"Font Software" refers to the set of files released by the Copyright
-Holder(s) under this license and clearly marked as such. This may
-include source files, build scripts and documentation.
-
-"Reserved Font Name" refers to any names specified as such after the
-copyright statement(s).
-
-"Original Version" refers to the collection of Font Software components as
-distributed by the Copyright Holder(s).
-
-"Modified Version" refers to any derivative made by adding to, deleting,
-or substituting -- in part or in whole -- any of the components of the
-Original Version, by changing formats or by porting the Font Software to a
-new environment.
-
-"Author" refers to any designer, engineer, programmer, technical
-writer or other person who contributed to the Font Software.
-
-PERMISSION & CONDITIONS
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Font Software, to use, study, copy, merge, embed, modify,
-redistribute, and sell modified and unmodified copies of the Font
-Software, subject to the following conditions:
-
-1) Neither the Font Software nor any of its individual components,
-in Original or Modified Versions, may be sold by itself.
-
-2) Original or Modified Versions of the Font Software may be bundled,
-redistributed and/or sold with any software, provided that each copy
-contains the above copyright notice and this license. These can be
-included either as stand-alone text files, human-readable headers or
-in the appropriate machine-readable metadata fields within text or
-binary files as long as those fields can be easily viewed by the user.
-
-3) No Modified Version of the Font Software may use the Reserved Font
-Name(s) unless explicit written permission is granted by the corresponding
-Copyright Holder. This restriction only applies to the primary font name as
-presented to the users.
-
-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
-Software shall not be used to promote, endorse or advertise any
-Modified Version, except to acknowledge the contribution(s) of the
-Copyright Holder(s) and the Author(s) or with their explicit written
-permission.
-
-5) The Font Software, modified or unmodified, in part or in whole,
-must be distributed entirely under this license, and must not be
-distributed under any other license. The requirement for fonts to
-remain under this license does not apply to any document created
-using the Font Software.
-
-TERMINATION
-This license becomes null and void if any of the above conditions are
-not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.

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

@@ -1,94 +0,0 @@
-Copyright (c) 2011 by Brian J. Bonislawsky DBA Astigmatic (AOETI)
-(astigma@astigmatic.com), with Reserved Font Names "Yesteryear"
-
-This Font Software is licensed under the SIL Open Font License, Version 1.1.
-This license is copied below, and is also available with a FAQ at:
-http://scripts.sil.org/OFL
-
-
------------------------------------------------------------
-SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
------------------------------------------------------------
-
-PREAMBLE
-The goals of the Open Font License (OFL) are to stimulate worldwide
-development of collaborative font projects, to support the font creation
-efforts of academic and linguistic communities, and to provide a free and
-open framework in which fonts may be shared and improved in partnership
-with others.
-
-The OFL allows the licensed fonts to be used, studied, modified and
-redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded, 
-redistributed and/or sold with any software provided that any reserved
-names are not used by derivative works. The fonts and derivatives,
-however, cannot be released under any other type of license. The
-requirement for fonts to remain under this license does not apply
-to any document created using the fonts or their derivatives.
-
-DEFINITIONS
-"Font Software" refers to the set of files released by the Copyright
-Holder(s) under this license and clearly marked as such. This may
-include source files, build scripts and documentation.
-
-"Reserved Font Name" refers to any names specified as such after the
-copyright statement(s).
-
-"Original Version" refers to the collection of Font Software components as
-distributed by the Copyright Holder(s).
-
-"Modified Version" refers to any derivative made by adding to, deleting,
-or substituting -- in part or in whole -- any of the components of the
-Original Version, by changing formats or by porting the Font Software to a
-new environment.
-
-"Author" refers to any designer, engineer, programmer, technical
-writer or other person who contributed to the Font Software.
-
-PERMISSION & CONDITIONS
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Font Software, to use, study, copy, merge, embed, modify,
-redistribute, and sell modified and unmodified copies of the Font
-Software, subject to the following conditions:
-
-1) Neither the Font Software nor any of its individual components,
-in Original or Modified Versions, may be sold by itself.
-
-2) Original or Modified Versions of the Font Software may be bundled,
-redistributed and/or sold with any software, provided that each copy
-contains the above copyright notice and this license. These can be
-included either as stand-alone text files, human-readable headers or
-in the appropriate machine-readable metadata fields within text or
-binary files as long as those fields can be easily viewed by the user.
-
-3) No Modified Version of the Font Software may use the Reserved Font
-Name(s) unless explicit written permission is granted by the corresponding
-Copyright Holder. This restriction only applies to the primary font name as
-presented to the users.
-
-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
-Software shall not be used to promote, endorse or advertise any
-Modified Version, except to acknowledge the contribution(s) of the
-Copyright Holder(s) and the Author(s) or with their explicit written
-permission.
-
-5) The Font Software, modified or unmodified, in part or in whole,
-must be distributed entirely under this license, and must not be
-distributed under any other license. The requirement for fonts to
-remain under this license does not apply to any document created
-using the Font Software.
-
-TERMINATION
-This license becomes null and void if any of the above conditions are
-not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.

.scripts/generate_feature_graphic/generate_feature_graphic.sh

@@ -1,60 +0,0 @@
-#!/bin/bash
-set -euo pipefail
-
-script_location="$(dirname "$(readlink -f "$0")")"
-
-for lang in "$script_location/../../fastlane/metadata/android/"*; do
-  # Skip languages without title.txt
-  if [ ! -f "$lang/title.txt" ]; then
-    continue
-  fi
-
-  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 Sans Devanagari/" -e "s/Lexend Deca/Noto Serif Devanagari/" featureGraphic.svg ;;
-      ja-JP) sed -i "s/Lexend Deca/Noto Serif CJK JP/" featureGraphic.svg ;;
-      kn-IN) sed -i -e 's/font-size="150"/font-size="100"/' -e "s/Yesteryear/Noto Serif Kannada/" featureGraphic.svg ;;
-      ko) sed -i "s/Lexend Deca/Noto Serif CJK KR/" featureGraphic.svg ;;
-      zh-CN) sed -i "s/Lexend Deca/Noto Serif CJK SC/" featureGraphic.svg ;;
-      zh-TW) sed -i -e "s/Yesteryear/Noto Sans CJK TC/" -e "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

@@ -1,36 +0,0 @@
-#!/usr/bin/python3
-
-import subprocess
-import xml.etree.ElementTree as ET
-
-root = ET.parse("app/src/main/res/values/settings.xml").getroot()
-for e in root.findall("string-array"):
-    if e.get("name") == "locale_values":
-        locales = [x.text for x in e if x.text]
-        break
-
-locales = [
-    # e.g. de or es-rAR (not es-AR)
-    loc.replace("-", "-r") if "-" in loc and loc[loc.index("-") + 1] != "r" else loc
-    for loc in locales
-]
-
-res = ", ".join(f'"{loc}"' for loc in locales)
-sed = [
-    "sed",
-    "-i",
-    f"s/resourceConfigurations .*/resourceConfigurations += listOf({res})/",
-    "app/build.gradle.kts"
-]
-subprocess.run(sed, check=True)
-
-with open("app/src/main/res/xml/locales_config.xml", "w", encoding="utf-8") 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

@@ -1,132 +0,0 @@
-#!/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/"
-
-
-class Error(Exception):
-    pass
-
-
-def get_weblate_langs() -> List[Tuple[str, int]]:
-    url = STATS_URL
-    results = []
-    for _ in range(16):     # avoid endless loops just in case
-        r = requests.get(url, timeout=5)
-        r.raise_for_status()
-        data = r.json()
-        for lang in data["results"]:
-            if lang["code"] != "en":
-                code = REPLACE_CODES.get(lang["code"], lang["code"]).replace("_", "-r")
-                results.append((code, round(lang["translated_percent"])))
-        url = data["next"]
-        if not url:
-            return sorted(results)
-        if not url.split("?")[0] == STATS_URL:
-            raise Error(f"Unexpected next URL: {url}")
-    raise Error("Too many pages")
-
-
-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", encoding="utf-8") 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", encoding="utf-8") 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", encoding="utf-8") 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,261 +1,8 @@
 # Changelog
 
-## v2.34.1 - 143 (2024-12-12)
-
-- Fix crash when opening invalid pkpass files
-
-## v2.34.0 - 142 (2024-12-10)
-
-- Add Passbook (.pkpass) support
-- Fix import of transparent PDF files
-- Improve display of transparent thumbnails
-
-## v2.33.0 - 141 (2024-11-19)
-
-- Change default column on wide screens to 4
-- Allow overriding column counts for portrait and landscape in settings
-- Keep main screen search filter when rotating screen or opening a card
-- Limit max length of note display on main screen
-
-## v2.32.1 - 140 (2024-10-29)
-
-- Fix text wrapping on add dialog
-
-## v2.32.0 - 139 (2024-10-28)
-
-- Option to navigate cards using the volume buttons
-- Fix Stocard import
-- Fix "Import cancelled" message appearing after successful import
-
-## v2.31.1 - 138 (2024-08-24)
-
-- Fix back gesture on main screen dismissing keyboard and search on Android 13+
-
-## v2.31.0 - 137 (2024-07-26)
-
-- Allow long store names in preview to split over multiple lines
-- Option to use front of back image in thumbnail menu
-- Minor import/export fixes
-- Minor UI fixes
-
-## v2.30.0 - 136 (2024-06-18)
-
-- Support for creating a card when sharing plain text
-- Display image type instead of barcode below images
-- Fix possible crash when trying to import a backup from the Nextcloud app
-- Improved support for devices without camera
-
-## v2.29.1 - 135 (2024-05-19)
-
-- Various fixes and improvements to balance handling
-
-## v2.29.0 - 134 (2024-04-19)
-
-- Support for scanning PDF files for barcodes
-- Support for image files with multiple barcodes
-- Minor UI fixes
-
-## v2.28.0 - 133 (2024-03-08)
-
-- Target Android 14
-- Open card icon in gallery on touch
-- Improve design of Photos tab in edit view
-- Update spending screen to also support receiving
-
-## v2.27.0 - 132 (2024-01-30)
-
-- Refine "Add card" workflow
-- Validation flow improvements
-- Fix edge case causing invalid UI state when toggling showing archive
-- Use theme or card colour for navigation bar (Android 8.1+)
-- Updated validity and expiry date selector
-- Add option to always rotate (ignoring system settings)
-
-## v2.26.0 - 131 (2023-09-14)
-
-- Move "Archive mode" into "Display options" (previously "Show details") menu
-- Android 13 per-app language support
-- Embed privacy policy, changelog and license in the app
-
-## v2.25.3 - 130 (2023-08-25)
-
-- Minor UI fixes
-- Fix valid from and expiry dates being reset when rotating the card editing screen
-- Fix crash when rotating screen while the color picker is shown
-- Stocard import fixes
-
-## v2.25.2 - 129 (2023-07-27)
-
-- Improved Catima importer (fixes cards missing when importing)
-- Fix crash when rotating screen while setting valid from/expiry date
-- Minor UI tweaks
-
-## v2.25.1 - 128 (2023-07-17)
-
-- Fix rare crash
-
-## v2.25.0 - 127 (2023-07-09)
-
-- Barcode rendering improvements
-- Basic interoperability with external apps (Android 6.0+)
-- Reorganized settings screen
-- Fix importing from some browsers that add a trailing / to the share URL
-
-## v2.24.2 - 126 (2023-06-18)
-
-- Various RTL fixes
-
-## v2.24.1 - 125 (2023-06-11)
-
-- Deal more gracefully with missing header colours
-
-## v2.24.0 - 124 (2023-06-10)
-
-- Support selecting exactly which details to view in card overview
-
-## v2.23.3 - 123 (2023-06-03)
-
-- Minor UI improvements
-- Fix new design not being usable on devices with square screens
-
-## v2.23.2 - 122 (2023-05-30)
-
-- Long-press card icon in view activity to change it
-- Improve button styling in Groups screen
-- Fix long barcode values causing barcode to scale down to nothing
-
-## v2.23.1 - 121 (2023-05-27)
-
-- Update used libraries
-
-## v2.23.0 - 120 (2023-05-25)
-
-- Complete redesign of main and loyalty card view screens
-- Material You design for the settings screen
-- Fix crash when using "Take a photo" with disabled camera app
-
-## v2.22.1 - 119 (2023-04-14)
-
-- Use Material You colours on more devices (Google library update)
-
-## v2.22.0 - 118 (2023-03-18)
-
-- Support setting start of card validity
-- Fix Stocard import (Stocard's export format changed)
-
-## v2.21.2 - 117 (2023-01-27)
-
-- Remove unnecessary permissions
-- Target Android 13
-
-## v2.21.1 - 116 (2022-12-06)
-
-- Fix quick spend dialog not allowing , separator
-- Support loading image from file manager
-
-## v2.21.0 - 115 (2022-11-06)
-
-- Open image in gallery on long-press
-- Apply Material style to dialogs
-- Support creating card by sharing an image to Catima
-- Add quick spend button to card screen
-
-## v2.20.0 - 114 (2022-09-21)
-
-- Add Monochrome icon for Android 13
-- Improve first launch screen
-- Fidme import fixes
-
-## v2.19.0 - 113 (2022-08-14)
-
-- Add previous and next buttons to the loyalty card view
-- Fix foreground colour on edit button
-- Replace floppy disk save icon with checkmark
-
-## v2.18.2 - 112 (2022-07-29)
-
-- Make the possibility to set a custom header more visible
-
-## v2.18.1 - 111 (2022-07-24)
-
-- Arabic language support
-- Display archived card count in group overview
-- Fix balance parsing bugs (made cards not savable in Arabic and other language with non-Western numbers)
-- Fix custom theme not applying to main screen correctly
-- Improve display of selected cards
-- Fix crash when leaving cardview in RTL layouts for cards with expiry or balance
-- Fix back arrow in card view pointing the wrong way in RTL layouts
-
-## v2.17.1 - 109 (2022-06-28)
-
-- Fix incorrect text colour on "No barcode" button
-
-## v2.17.0 - 108 (2022-06-24)
-
-- Add card duplication feature
-- Don't allow choosing expiry before 1970 (they never worked anyway)
-- Add support for archiving cards
-- Move delete from edit to view
-- Remove rotation lock icon in favour of a new rotation lock setting
-
-## v2.16.3 - 107 (2022-04-15)
-
-- Stocard import fixes
-
-## v2.16.2 - 106 (2022-03-31)
-
-- Fix some character sequences being shown as a single character
-
-## v2.16.1 - 105 (2022-03-25)
-
-- Fix gray block appearing on invalid value for barcode
-- Stocard import fixes
-
-## v2.16.0 - 104 (2022-03-09)
-
-- Save card detail expansion state
-- Minor UI fixes
-
-## v2.15.2 - 103 (2022-02-11)
-
-- Fix manual language selection not applying everywhere
-- Fix crash in edit view on regionless locale
-
-## v2.15.1 - 102 (2022-02-10)
-
-- Various minor fixes
-- Fix crash when using Norwegian translation
-
-## v2.15.0 - 101 (2022-02-06)
-
-- Fix cropper not using theme colour
-- Fix minor theming issues
-- Add pure black dark theme for OLED screens
-
-## v2.14.1 - 100 (2022-01-15)
-
-- Hide search, expand and sort icons until there is at least 1 card
-- Various theming fixes
-
-## v2.14.0 - 99 (2022-01-14)
-
-- Material You redesign
-
-## v2.13.1 - 98 (2022-01-09)
-
-- Fix various TalkBack-related bugs
-
-## v2.13.0 - 97 (2022-01-03)
-
-- Fixed pressing the save button multiple times creating multiple entries
-- Lower card header size when hiding details to fit even more cards
-- Restructure edit screen
-- Improve star icon contrast in main view
-
-## v2.12.0 - 96 (2021-12-23)
+## Unreleased - 96
 
 - Add CODE 93 support
-- Various minor bugfixes and improvements
 
 ## v2.11.2 - 95 (2021-12-04)
 
@@ -752,7 +499,7 @@ Additional features/improvements:
 ## v0.7 - 7 (2016-07-14)
 
 - Long-click of a card brings up option to copy card ID to the clipboard. ([pull #49](https://github.com/brarcher/loyalty-card-locker/issues/49))
-- Back button on Import/Export view now works, moving user to main view
+- Back button on Input/Export view now works, moving user to main view
 
 ## v0.6 - 6 (2016-05-23)
 

CONTRIBUTING.md

@@ -1,29 +1,14 @@
-# How to Submit Patches to the Catima Project
+How to Submit Patches to the Catima Project
+===============================================================================
+https://github.com/TheLastProject/Catima
 
 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/).
-Please do not supply translation updates directly through GitHub.
-
-Weblate requires an account to translate changes, so please log in before
-you start translating.
-
-While using Weblate, please do not ignore any of its warnings. They exist
-for good reason.
-
-## Code Changes
-
-### Test Your Code
+## Test Your Code
 
 There are four possible tests you can run to verify your code.  The first
 is unit tests, which check the basic functionality of the application, and
@@ -43,14 +28,14 @@ and SpotBugs, run using:
 The final check is by testing the application on a live device and verifying
 the basic functionality works as expected.
 
-### Make Sure Your Code is Tested
+## Make Sure Your Code is Tested
 
 The Catima code uses a fair number of unit tests to verify that
 the basic functionality is working. Submissions which add functionality
 or significantly change the existing code should include additional tests
 to verify the proper operation of the proposed changes.
 
-### Explain Your Work
+## Explain Your Work
 
 At the top of every patch you should include a description of the problem you
 are trying to solve, how you solved it, and why you chose the solution you
@@ -59,10 +44,48 @@ 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.
 
-### Submit Patch(es) for Review
+## 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
 and potentially merged into the main Catima repository. The preferred
 way to do this is to submit a Pull Request to the Catima project.
-Changes need to apply cleanly onto the main branch and pass all
+Changes need to apply cleanly onto the master branch and pass all
 unit tests and produce no errors during static analysis.

FUNDING.yml

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

Gemfile.lock

@@ -1,55 +1,51 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (3.0.7)
-      base64
-      nkf
-      rexml
-    addressable (2.8.7)
-      public_suffix (>= 2.0.2, < 7.0)
-    artifactory (3.0.17)
+    CFPropertyList (3.0.3)
+    addressable (2.8.0)
+      public_suffix (>= 2.0.2, < 5.0)
+    artifactory (3.0.15)
     atomos (0.1.3)
-    aws-eventstream (1.3.0)
-    aws-partitions (1.1020.0)
-    aws-sdk-core (3.214.0)
-      aws-eventstream (~> 1, >= 1.3.0)
-      aws-partitions (~> 1, >= 1.992.0)
-      aws-sigv4 (~> 1.9)
-      jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.96.0)
-      aws-sdk-core (~> 3, >= 3.210.0)
-      aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.176.0)
-      aws-sdk-core (~> 3, >= 3.210.0)
+    aws-eventstream (1.2.0)
+    aws-partitions (1.501.0)
+    aws-sdk-core (3.121.0)
+      aws-eventstream (~> 1, >= 1.0.2)
+      aws-partitions (~> 1, >= 1.239.0)
+      aws-sigv4 (~> 1.1)
+      jmespath (~> 1.0)
+    aws-sdk-kms (1.48.0)
+      aws-sdk-core (~> 3, >= 3.120.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-s3 (1.102.0)
+      aws-sdk-core (~> 3, >= 3.120.0)
       aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.5)
-    aws-sigv4 (1.10.1)
+      aws-sigv4 (~> 1.4)
+    aws-sigv4 (1.4.0)
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.4)
-    base64 (0.2.0)
-    claide (1.1.0)
+    claide (1.0.3)
     colored (1.2)
     colored2 (3.1.2)
     commander (4.6.0)
       highline (~> 2.0.0)
     declarative (0.0.20)
-    digest-crc (0.6.5)
+    digest-crc (0.6.4)
       rake (>= 12.0.0, < 14.0.0)
-    domain_name (0.6.20240107)
-    dotenv (2.8.1)
-    emoji_regex (3.2.3)
-    excon (0.112.0)
-    faraday (1.10.4)
+    domain_name (0.5.20190701)
+      unf (>= 0.0.5, < 1.0.0)
+    dotenv (2.7.6)
+    emoji_regex (3.2.2)
+    excon (0.85.0)
+    faraday (1.7.2)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
       faraday-excon (~> 1.1)
-      faraday-httpclient (~> 1.0)
-      faraday-multipart (~> 1.0)
+      faraday-httpclient (~> 1.0.1)
       faraday-net_http (~> 1.0)
-      faraday-net_http_persistent (~> 1.0)
+      faraday-net_http_persistent (~> 1.1)
       faraday-patron (~> 1.0)
       faraday-rack (~> 1.0)
-      faraday-retry (~> 1.0)
+      multipart-post (>= 1.2, < 3)
       ruby2_keywords (>= 0.0.4)
     faraday-cookie_jar (0.0.7)
       faraday (>= 0.8.0)
@@ -58,24 +54,21 @@ GEM
     faraday-em_synchrony (1.0.0)
     faraday-excon (1.1.0)
     faraday-httpclient (1.0.1)
-    faraday-multipart (1.0.4)
-      multipart-post (~> 2)
-    faraday-net_http (1.0.2)
+    faraday-net_http (1.0.1)
     faraday-net_http_persistent (1.2.0)
     faraday-patron (1.0.0)
     faraday-rack (1.0.0)
-    faraday-retry (1.0.3)
-    faraday_middleware (1.2.1)
+    faraday_middleware (1.1.0)
       faraday (~> 1.0)
-    fastimage (2.3.1)
-    fastlane (2.226.0)
+    fastimage (2.2.5)
+    fastlane (2.193.1)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.8, < 3.0.0)
       artifactory (~> 3.0)
       aws-sdk-s3 (~> 1.0)
       babosa (>= 1.0.3, < 2.0.0)
       bundler (>= 1.12.0, < 3.0.0)
-      colored (~> 1.2)
+      colored
       commander (~> 4.6)
       dotenv (>= 2.1.1, < 3.0.0)
       emoji_regex (>= 0.1, < 4.0)
@@ -84,38 +77,33 @@ GEM
       faraday-cookie_jar (~> 0.0.6)
       faraday_middleware (~> 1.0)
       fastimage (>= 2.1.0, < 3.0.0)
-      fastlane-sirp (>= 1.0.0)
       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)
+      multipart-post (~> 2.0.0)
       naturally (~> 2.2)
-      optparse (>= 0.1.1, < 1.0.0)
+      optparse (~> 0.1.1)
       plist (>= 3.1.0, < 4.0.0)
       rubyzip (>= 2.0.0, < 3.0.0)
-      security (= 0.1.5)
+      security (= 0.1.3)
       simctl (~> 1.6.3)
       terminal-notifier (>= 2.0.0, < 3.0.0)
-      terminal-table (~> 3)
+      terminal-table (>= 1.4.5, < 2.0.0)
       tty-screen (>= 0.6.3, < 1.0.0)
       tty-spinner (>= 0.8.0, < 1.0.0)
       word_wrap (~> 1.0.0)
       xcodeproj (>= 1.13.0, < 2.0.0)
-      xcpretty (~> 0.4.0)
-      xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
-    fastlane-sirp (1.0.0)
-      sysrandom (~> 1.0)
+      xcpretty (~> 0.3.0)
+      xcpretty-travis-formatter (>= 0.0.3)
     gh_inspector (1.1.3)
-    google-apis-androidpublisher_v3 (0.54.0)
-      google-apis-core (>= 0.11.0, < 2.a)
-    google-apis-core (0.11.3)
+    google-apis-androidpublisher_v3 (0.11.0)
+      google-apis-core (>= 0.4, < 2.a)
+    google-apis-core (0.4.1)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (>= 0.16.2, < 2.a)
       httpclient (>= 2.8.1, < 3.a)
@@ -123,91 +111,95 @@ GEM
       representable (~> 3.0)
       retriable (>= 2.0, < 4.a)
       rexml
-    google-apis-iamcredentials_v1 (0.17.0)
-      google-apis-core (>= 0.11.0, < 2.a)
-    google-apis-playcustomapp_v1 (0.13.0)
-      google-apis-core (>= 0.11.0, < 2.a)
-    google-apis-storage_v1 (0.31.0)
-      google-apis-core (>= 0.11.0, < 2.a)
-    google-cloud-core (1.7.1)
-      google-cloud-env (>= 1.0, < 3.a)
+      webrick
+    google-apis-iamcredentials_v1 (0.7.0)
+      google-apis-core (>= 0.4, < 2.a)
+    google-apis-playcustomapp_v1 (0.5.0)
+      google-apis-core (>= 0.4, < 2.a)
+    google-apis-storage_v1 (0.6.0)
+      google-apis-core (>= 0.4, < 2.a)
+    google-cloud-core (1.6.0)
+      google-cloud-env (~> 1.0)
       google-cloud-errors (~> 1.0)
-    google-cloud-env (1.6.0)
-      faraday (>= 0.17.3, < 3.0)
-    google-cloud-errors (1.4.0)
-    google-cloud-storage (1.47.0)
-      addressable (~> 2.8)
+    google-cloud-env (1.5.0)
+      faraday (>= 0.17.3, < 2.0)
+    google-cloud-errors (1.1.0)
+    google-cloud-storage (1.34.1)
+      addressable (~> 2.5)
       digest-crc (~> 0.4)
       google-apis-iamcredentials_v1 (~> 0.1)
-      google-apis-storage_v1 (~> 0.31.0)
+      google-apis-storage_v1 (~> 0.1)
       google-cloud-core (~> 1.6)
       googleauth (>= 0.16.2, < 2.a)
       mini_mime (~> 1.0)
-    googleauth (1.8.1)
-      faraday (>= 0.17.3, < 3.a)
+    googleauth (0.17.1)
+      faraday (>= 0.17.3, < 2.0)
       jwt (>= 1.4, < 3.0)
+      memoist (~> 0.16)
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
-      signet (>= 0.16, < 2.a)
+      signet (~> 0.15)
     highline (2.0.3)
-    http-cookie (1.0.8)
+    http-cookie (1.0.4)
       domain_name (~> 0.5)
     httpclient (2.8.3)
-    jmespath (1.6.2)
-    json (2.9.0)
-    jwt (2.9.3)
-      base64
-    mini_magick (4.13.2)
-    mini_mime (1.1.5)
+    jmespath (1.4.0)
+    json (2.5.1)
+    jwt (2.2.3)
+    memoist (0.16.2)
+    mini_magick (4.11.0)
+    mini_mime (1.1.1)
     multi_json (1.15.0)
-    multipart-post (2.4.1)
-    nanaimo (0.4.0)
+    multipart-post (2.0.0)
+    nanaimo (0.3.0)
     naturally (2.2.1)
-    nkf (0.2.0)
-    optparse (0.6.0)
-    os (1.1.4)
-    plist (3.7.1)
-    public_suffix (6.0.1)
-    rake (13.2.1)
-    representable (3.2.0)
+    optparse (0.1.1)
+    os (1.1.1)
+    plist (3.6.0)
+    public_suffix (4.0.6)
+    rake (13.0.6)
+    representable (3.1.1)
       declarative (< 0.1.0)
       trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
     retriable (3.1.2)
-    rexml (3.3.9)
-    rouge (3.28.0)
+    rexml (3.2.5)
+    rouge (2.0.7)
     ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
-    security (0.1.5)
-    signet (0.19.0)
+    security (0.1.3)
+    signet (0.16.0)
       addressable (~> 2.8)
-      faraday (>= 0.17.5, < 3.a)
+      faraday (>= 0.17.3, < 2.0)
       jwt (>= 1.5, < 3.0)
       multi_json (~> 1.10)
-    simctl (1.6.10)
+    simctl (1.6.8)
       CFPropertyList
       naturally
-    sysrandom (1.0.5)
     terminal-notifier (2.0.0)
-    terminal-table (3.0.2)
-      unicode-display_width (>= 1.1.1, < 3)
-    trailblazer-option (0.1.2)
+    terminal-table (1.8.0)
+      unicode-display_width (~> 1.1, >= 1.1.1)
+    trailblazer-option (0.1.1)
     tty-cursor (0.7.1)
-    tty-screen (0.8.2)
+    tty-screen (0.8.1)
     tty-spinner (0.9.3)
       tty-cursor (~> 0.7)
     uber (0.1.0)
-    unicode-display_width (2.6.0)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.8)
+    unicode-display_width (1.7.0)
+    webrick (1.7.0)
     word_wrap (1.0.0)
-    xcodeproj (1.27.0)
+    xcodeproj (1.21.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
       colored2 (~> 3.1)
-      nanaimo (~> 0.4.0)
-      rexml (>= 3.3.6, < 4.0)
-    xcpretty (0.4.0)
-      rouge (~> 3.28.0)
+      nanaimo (~> 0.3.0)
+      rexml (~> 3.2.4)
+    xcpretty (0.3.0)
+      rouge (~> 2.0.7)
     xcpretty-travis-formatter (1.0.1)
       xcpretty (~> 0.2, >= 0.0.7)
 
@@ -218,4 +210,4 @@ DEPENDENCIES
   fastlane
 
 BUNDLED WITH
-   2.5.22
+   2.1.4

PRIVACY.md

@@ -1,18 +0,0 @@
-**Last updated**  
-August 30 2023
-
-# Privacy Policy
-Catima does not collect or transmit any personal information.
-
-To ensure correct app functionality, we require access to the following:
-
-- Camera: We need access to your camera to be able to scan barcodes. The app can still be used when camera access is denied, but you will have to manually type the barcode information.
-- Storage (Android 5 and 6 only): We need access to your device storage to create or import backups. The app can still be used when storage access is denied, but you will not be able to create or import backups.
-
-Catima offers a feature to share cards with other users. All the relevant data is in the generated shareable URLs and never transmitted to our servers. When viewed through catima.app, the data in the URL is rendered using client-side Javascript to further ensure no data is ever transmitted to us.
-
-# Changes
-This Privacy Policy may be updated from time to time for any reason. We will notify you of any changes to our Privacy Policy by posting the new Privacy Policy to https://catima.app/privacy-policy/. A snapshot of the Privacy Policy is available within the Catima app, though it may be outdated. When the Privacy Policy on the website and in the app differ, the website should be considered leading. You are advised to consult the Privacy Policy regularly for any changes, as continued use is deemed approval of all changes.
-
-# Contact us
-If you have any questions regarding privacy while using the Application, or have questions about our practices, please contact us via email at catima.g9ex3@hackerchick.me.

SECURITY.md

@@ -1,13 +0,0 @@
-# Security Policy
-
-Catima is designed to use as little permissions as possible to limit both the attack surface as well as the damage that can be done when abusing a security flaw.
-
-## Supported Versions
-
-Only the most recent stable release is supported.
-
-## Reporting a Vulnerability
-
-Security vulnerabilities can be reported through [GitHub Security Advisories](https://github.com/CatimaLoyalty/Android/security/advisories) or [the contact info written on my personal website](https://sylviavanos.nl/#contact). Currently, Matrix is the only end-to-end encrypted option.
-
-Please note that only security vulnerabilities in Catima should be reported as stated above. For other issues, including antivirus false positives and malicious applications trying to trick people into granting them Catima's "Read Cards" permission, please use [regular issues](https://github.com/CatimaLoyalty/Android/issues).

app/build.gradle

@@ -0,0 +1,125 @@
+import com.github.spotbugs.snom.SpotBugsTask
+
+apply plugin: 'com.android.application'
+apply plugin: 'com.github.spotbugs'
+
+spotbugs {
+    ignoreFailures = false
+    effort = 'max'
+    excludeFilter = file("./config/spotbugs/exclude.xml")
+    reportsDir = file("$buildDir/reports/spotbugs/")
+}
+
+android {
+    compileSdkVersion 31
+    buildToolsVersion "31.0.0"
+
+    defaultConfig {
+        applicationId "me.hackerchick.catima"
+        minSdkVersion 21
+        targetSdkVersion 31
+        versionCode 95
+        versionName "2.11.2"
+
+        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"
+        }
+    }
+
+    bundle {
+        language {
+            enableSplit = false
+        }
+    }
+
+    compileOptions {
+        encoding "UTF-8"
+
+        // Flag to enable support for the new language APIs
+        coreLibraryDesugaringEnabled true
+
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
+    }
+
+    lintOptions {
+        disable "GoogleAppIndexingWarning", "ButtonStyle", "AlwaysShowAction",
+                "MissingTranslation", "MissingPrefix"
+    }
+
+    sourceSets {
+        test {
+            resources.srcDirs += ['src/test/res']
+        }
+    }
+
+    // Starting with Android Studio 3 Robolectric is unable to find resources.
+    // The following allows it to find the resources.
+    testOptions {
+        unitTests {
+            all {
+                testLogging {
+                    events 'started', 'passed', 'skipped', 'failed'
+                }
+            }
+            includeAndroidResources true
+        }
+    }
+}
+
+dependencies {
+// AndroidX
+    implementation 'androidx.appcompat:appcompat:1.4.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.2'
+    implementation 'androidx.exifinterface:exifinterface:1.3.3'
+    implementation 'androidx.palette:palette:1.0.0'
+    implementation 'androidx.preference:preference:1.1.1'
+    implementation 'com.google.android.material:material:1.4.0'
+    implementation 'com.github.yalantis:ucrop:2.2.7'
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
+
+// Splash Screen
+    implementation 'androidx.core:core-splashscreen:1.0.0-alpha02'
+
+// Third-party
+    implementation 'com.journeyapps:zxing-android-embedded:4.3.0@aar'
+    implementation 'com.google.zxing:core:3.4.1'
+    implementation 'org.apache.commons:commons-csv:1.9.0'
+    implementation 'com.jaredrummler:colorpicker:1.1.0'
+    implementation 'com.github.invissvenska:NumberPickerPreference:1.0.4'
+    implementation 'net.lingala.zip4j:zip4j:2.9.1'
+
+// SpotBugs
+    implementation 'io.wcm.tooling.spotbugs:io.wcm.tooling.spotbugs.annotations:1.0.0'
+
+// Testing
+    testImplementation 'androidx.test:core:1.4.0'
+    testImplementation 'junit:junit:4.13.2'
+    testImplementation 'org.robolectric:robolectric:4.7.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

@@ -1,158 +0,0 @@
-import com.android.build.gradle.internal.tasks.factory.dependsOn
-import com.github.spotbugs.snom.SpotBugsTask
-
-plugins {
-    id("com.android.application")
-    id("com.github.spotbugs")
-    id("org.jetbrains.kotlin.android")
-}
-
-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 = 143
-        versionName = "2.34.1"
-
-        vectorDrawables.useSupportLibrary = true
-        multiDexEnabled = true
-
-        resourceConfigurations += listOf("ar", "bg", "bn", "bn-rIN", "bs", "cs", "da", "de", "el-rGR", "en", "eo", "es", "es-rAR", "et", "fi", "fr", "gl", "he-rIL", "hi", "hr", "hu", "in-rID", "is", "it", "ja", "ko", "lt", "lv", "nb-rNO", "nl", "oc", "pl", "pt-rBR", "pt-rPT", "ro-rRO", "ru", "sk", "sl", "sr", "sv", "ta", "tr", "uk", "vi", "zh-rCN", "zh-rTW")
-
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-    }
-
-    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_17
-        targetCompatibility = JavaVersion.VERSION_17
-    }
-
-    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")
-    }
-    kotlinOptions {
-        jvmTarget = "17"
-    }
-}
-
-dependencies {
-    // AndroidX
-    implementation("androidx.appcompat:appcompat:1.7.0")
-    implementation("androidx.constraintlayout:constraintlayout:2.2.0")
-    implementation("androidx.core:core-ktx:1.13.1")
-    implementation("androidx.core:core-splashscreen:1.0.1")
-    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.12.0")
-    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.3")
-
-    // Third-party
-    implementation("com.journeyapps:zxing-android-embedded:4.3.0@aar")
-    implementation("com.github.yalantis:ucrop:2.2.10")
-    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
-    val androidXTestVersion = "1.6.1"
-    val junitVersion = "4.13.2"
-    testImplementation("androidx.test:core:$androidXTestVersion")
-    testImplementation("junit:junit:$junitVersion")
-    testImplementation("org.robolectric:robolectric:4.14.1")
-
-    androidTestImplementation("androidx.test:core:$androidXTestVersion")
-    androidTestImplementation("junit:junit:$junitVersion")
-    androidTestImplementation("androidx.test.ext:junit:1.2.1")
-    androidTestImplementation("androidx.test:runner:$androidXTestVersion")
-    androidTestImplementation("androidx.test.uiautomator:uiautomator:2.3.0")
-    androidTestImplementation("androidx.test.espresso:espresso-core:3.6.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/config/spotbugs/exclude.xml

@@ -6,8 +6,5 @@
     <Match>
         <Class name="~.*Manifest\$.*"/>
     </Match>
-    <Match>
-        <Class name="~.*Binding" />
-    </Match>
 
 </FindBugsFilter>

app/lint.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<lint>
-    <issue id="AlwaysShowAction" severity="ignore" />
-    <issue id="ButtonStyle" severity="ignore" />
-    <issue id="GoogleAppIndexingWarning" severity="ignore" />
-    <issue id="MissingTranslation" severity="ignore" />
-    <issue id="MissingPrefix" severity="ignore" />
-</lint>

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.kts.
+# directive in build.gradle.
 #
 # For more details, see
 #   http://developer.android.com/guide/developing/tools/proguard.html

app/src/androidTest/java/protect/card_locker/MainActivitySearchViewTest.java

@@ -1,67 +0,0 @@
-package protect.card_locker;
-
-import static androidx.test.espresso.Espresso.onView;
-import static androidx.test.espresso.action.ViewActions.click;
-import static androidx.test.espresso.action.ViewActions.typeText;
-import static androidx.test.espresso.assertion.ViewAssertions.matches;
-import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
-import static androidx.test.espresso.matcher.ViewMatchers.withChild;
-import static androidx.test.espresso.matcher.ViewMatchers.withId;
-import static androidx.test.espresso.matcher.ViewMatchers.withText;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.not;
-import static org.junit.Assert.assertEquals;
-
-import androidx.appcompat.widget.Toolbar;
-import androidx.test.core.app.ActivityScenario;
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-import androidx.test.platform.app.InstrumentationRegistry;
-import androidx.test.uiautomator.UiDevice;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-@RunWith(AndroidJUnit4.class)
-public class MainActivitySearchViewTest {
-
-    @Test
-    public void whenSearchViewIsExpandedAndBackIsPressedThenMenuItemShouldNotBeCollapsed() {
-        String query = "random arbitrary text";
-        try (ActivityScenario<MainActivity> mainActivityScenario = ActivityScenario.launch(MainActivity.class)) {
-            mainActivityScenario.onActivity(this::makeSearchMenuItemVisible);
-            onView(withId(R.id.action_search)).perform(click());
-            onView(withId(androidx.appcompat.R.id.search_src_text)).perform(typeText(query));
-
-            pressBack();
-
-            onView(withId(androidx.appcompat.R.id.search_src_text)).check(matches(withText(query)));
-            mainActivityScenario.onActivity(activity -> assertEquals(query, activity.mFilter));
-        }
-    }
-
-    @Test
-    public void whenSearchViewIsExpandedThenItShouldOnlyBeCollapsedWhenBackIsPressedTwice() {
-        try (ActivityScenario<MainActivity> mainActivityScenario = ActivityScenario.launch(MainActivity.class)) {
-            mainActivityScenario.onActivity(this::makeSearchMenuItemVisible);
-            onView(withId(R.id.action_search)).perform(click());
-
-            pressBack();
-
-            onView(withId(androidx.appcompat.R.id.search_src_text)).check(matches(isDisplayed()));
-
-            pressBack();
-
-            onView(withId(android.R.id.content)).check(matches(is(not(withChild(withId(androidx.appcompat.R.id.search_src_text))))));
-        }
-    }
-
-    private void makeSearchMenuItemVisible(MainActivity activity) {
-        Toolbar toolbar = activity.findViewById(R.id.toolbar);
-        toolbar.getMenu().findItem(R.id.action_search).setVisible(true);
-    }
-
-    private void pressBack() {
-        UiDevice.getInstance(InstrumentationRegistry.getInstrumentation()).pressBack();
-    }
-
-}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="app_name">Αποσφαλμάτωση Catima</string>
-</resources>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="app_name">Catima atkļūdošana</string>
-</resources>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

app/src/main/AndroidManifest.xml

@@ -1,22 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools">
-
-    <permission
-        android:description="@string/permissionReadCardsDescription"
-        android:icon="@drawable/ic_launcher_foreground"
-        android:label="@string/permissionReadCardsLabel"
-        android:name="${applicationId}.READ_CARDS"
-        android:protectionLevel="dangerous" />
+    xmlns:tools="http://schemas.android.com/tools"
+    package="protect.card_locker">
 
     <uses-sdk tools:overrideLibrary="com.google.zxing.client.android" />
 
     <uses-permission android:name="android.permission.CAMERA" />
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" android:maxSdkVersion="23" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
     <uses-feature
         android:name="android.hardware.camera"
-        android:required="false" />
+        android:required="true" />
     <uses-feature
         android:name="android.hardware.camera.autofocus"
         android:required="false" />
@@ -24,41 +19,20 @@
     <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:localeConfig="@xml/locales_config">
+        android:theme="@style/AppTheme">
         <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" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-
-                <data android:scheme="content"/>
-                <data android:host="*"/>
-                <data android:mimeType="image/*" />
-                <data android:mimeType="application/pdf" />
-                <data android:mimeType="application/vnd.apple.pkpass" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.SEND" />
-                <category android:name="android.intent.category.DEFAULT" />
-
-                <data android:mimeType="text/plain" />
-                <data android:mimeType="image/*" />
-                <data android:mimeType="application/pdf" />
-                <data android:mimeType="application/vnd.apple.pkpass" />
-            </intent-filter>
         </activity>
         <activity
             android:name=".AboutActivity"
@@ -125,44 +99,10 @@
             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 -->
-            <intent-filter
-                android:label="@string/importCards">
-                <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:mimeType="application/zip" />
-                <data android:scheme="content"/>
-                <data android:host="*"/>
-            </intent-filter>
-
-            <!-- JSON Intent Filter -->
-            <intent-filter
-                android:label="@string/importCards">
-                <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:mimeType="application/json" />
-                <data android:scheme="content"/>
-                <data android:host="*"/>
-            </intent-filter>
-
-            <!-- CSV Intent Filter -->
-            <intent-filter
-                android:label="@string/importCards">
-                <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:scheme="content"/>
-                <data android:host="*" />
-                <data android:mimeType="text/comma-separated-values" />
-            </intent-filter>
-        </activity>
+            android:theme="@style/AppTheme.NoActionBar" />
         <activity
             android:name=".CardShortcutConfigure"
             android:exported="true"
@@ -176,15 +116,9 @@
         </activity>
 
         <activity
-            android:name=".UCropWrapper"
+            android:name="com.yalantis.ucrop.UCropActivity"
             android:theme="@style/AppTheme.NoActionBar" />
 
-        <provider
-            android:name=".contentprovider.CardsContentProvider"
-            android:authorities="${applicationId}.contentprovider.cards"
-            android:exported="true"
-            android:readPermission="${applicationId}.READ_CARDS"/>
-
         <provider
             android:name="androidx.core.content.FileProvider"
             android:authorities="${applicationId}"
@@ -195,11 +129,12 @@
                 android:resource="@xml/file_provider_paths" />
         </provider>
         <service android:name=".CardsOnPowerScreenService" android:label="@string/app_name"
-            android:permission="android.permission.BIND_CONTROLS" android:exported="true"
-            tools:targetApi="r">
+            android:permission="android.permission.BIND_CONTROLS" android:exported="true">
             <intent-filter>
                 <action android:name="android.service.controls.ControlsProviderService" />
             </intent-filter>
         </service>
+
     </application>
-</manifest>
+
+</manifest>

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

@@ -1,57 +1,135 @@
 package protect.card_locker;
 
+import android.content.Intent;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.net.Uri;
 import android.os.Bundle;
-import android.text.Spanned;
+import android.util.Log;
 import android.view.MenuItem;
 import android.view.View;
-import android.widget.ScrollView;
 import android.widget.TextView;
 
-import androidx.annotation.Nullable;
-import androidx.annotation.StringRes;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.List;
 
-import com.google.android.material.dialog.MaterialAlertDialogBuilder;
-
-import protect.card_locker.databinding.AboutActivityBinding;
-
-public class AboutActivity extends CatimaAppCompatActivity {
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.widget.Toolbar;
+import androidx.constraintlayout.widget.ConstraintLayout;
+import androidx.core.text.HtmlCompat;
 
+public class AboutActivity extends CatimaAppCompatActivity implements View.OnClickListener {
     private static final String TAG = "Catima";
-
-    private AboutActivityBinding binding;
-    private AboutContent content;
+    ConstraintLayout version_history, translate, license, repo, privacy, error, credits, rate;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        binding = AboutActivityBinding.inflate(getLayoutInflater());
-        content = new AboutContent(this);
-        setTitle(content.getPageTitle());
-        setContentView(binding.getRoot());
-        setSupportActionBar(binding.toolbar);
-        enableToolbarBackButton();
+        setTitle(R.string.about);
+        setContentView(R.layout.about_activity);
+        Toolbar toolbar = findViewById(R.id.toolbar);
+        setSupportActionBar(toolbar);
+        ActionBar actionBar = getSupportActionBar();
+        if (actionBar != null) {
+            actionBar.setDisplayHomeAsUpEnabled(true);
+        }
 
-        TextView copyright = binding.creditsSub;
-        copyright.setText(content.getCopyrightShort());
-        TextView versionHistory = binding.versionHistorySub;
-        versionHistory.setText(content.getVersionHistory());
+        StringBuilder contributors = new StringBuilder().append("<br/>");
 
-        binding.versionHistory.setTag("https://catima.app/changelog/");
-        binding.translate.setTag("https://hosted.weblate.org/engage/catima/");
-        binding.license.setTag("https://github.com/CatimaLoyalty/Android/blob/main/LICENSE");
-        binding.repo.setTag("https://github.com/CatimaLoyalty/Android/");
-        binding.privacy.setTag("https://catima.app/privacy-policy/");
-        binding.reportError.setTag("https://github.com/CatimaLoyalty/Android/issues");
-        binding.rate.setTag("https://play.google.com/store/apps/details?id=me.hackerchick.catima");
-        binding.donate.setTag("https://catima.app/donate");
+        BufferedReader reader = new BufferedReader(new InputStreamReader(getResources().openRawResource(R.raw.contributors), StandardCharsets.UTF_8));
 
-        boolean installedFromGooglePlay = Utils.installedFromGooglePlay(this);
-        // Hide Google Play rate button if not on Google Play
-        binding.rate.setVisibility(installedFromGooglePlay ? View.VISIBLE : View.GONE);
-        // Hide donate button on Google Play (Google Play doesn't allow donation links)
-        binding.donate.setVisibility(installedFromGooglePlay ? View.GONE : View.VISIBLE);
+        try {
+            while (true) {
+                String tmp = reader.readLine();
 
-        bindClickListeners();
+                if (tmp == null || tmp.isEmpty()) {
+                    reader.close();
+                    break;
+                }
+
+                contributors.append("<br/>");
+                contributors.append(tmp);
+            }
+        } catch (IOException ignored) {
+        }
+
+        final List<ThirdPartyInfo> USED_LIBRARIES = new ArrayList<>();
+        USED_LIBRARIES.add(new ThirdPartyInfo("Color Picker", "https://github.com/jaredrummler/ColorPicker", "Apache 2.0"));
+        USED_LIBRARIES.add(new ThirdPartyInfo("Commons CSV", "https://commons.apache.org/proper/commons-csv/", "Apache 2.0"));
+        USED_LIBRARIES.add(new ThirdPartyInfo("NumberPickerPreference", "https://github.com/invissvenska/NumberPickerPreference", "GNU LGPL 3.0"));
+        USED_LIBRARIES.add(new ThirdPartyInfo("Zip4j", "https://github.com/srikanth-lingala/zip4j", "Apache 2.0"));
+        USED_LIBRARIES.add(new ThirdPartyInfo("ZXing", "https://github.com/zxing/zxing", "Apache 2.0"));
+        USED_LIBRARIES.add(new ThirdPartyInfo("ZXing Android Embedded", "https://github.com/journeyapps/zxing-android-embedded", "Apache 2.0"));
+
+        final List<ThirdPartyInfo> USED_ASSETS = new ArrayList<>();
+        USED_ASSETS.add(new ThirdPartyInfo("Android icons", "https://fonts.google.com/icons?selected=Material+Icons", "Apache 2.0"));
+
+        StringBuilder libs = new StringBuilder().append("<br/>");
+        for (ThirdPartyInfo entry : USED_LIBRARIES) {
+            libs.append("<br/><a href=\"").append(entry.url()).append("\">").append(entry.name()).append("</a> (").append(entry.license()).append(")");
+        }
+
+        StringBuilder resources = new StringBuilder().append("<br/>");
+        for (ThirdPartyInfo entry : USED_ASSETS) {
+            resources.append("<br/><a href=\"").append(entry.url()).append("\">").append(entry.name()).append("</a> (").append(entry.license()).append(")");
+        }
+
+        String appName = getString(R.string.app_name);
+        int year = Calendar.getInstance().get(Calendar.YEAR);
+
+        String version = "?";
+        try {
+            PackageInfo pi = getPackageManager().getPackageInfo(getPackageName(), 0);
+            version = pi.versionName;
+        } catch (PackageManager.NameNotFoundException e) {
+            Log.w(TAG, "Package name not found", e);
+        }
+
+        TextView copyright = findViewById(R.id.credits_sub);
+        copyright.setText(String.format(getString(R.string.app_copyright_fmt), year));
+        TextView vHistory = findViewById(R.id.version_history_sub);
+        vHistory.setText(String.format(getString(R.string.debug_version_fmt), version));
+
+        setTitle(String.format(getString(R.string.about_title_fmt), appName));
+
+        version_history = findViewById(R.id.version_history);
+        translate = findViewById(R.id.translate);
+        license = findViewById(R.id.license);
+        repo = findViewById(R.id.repo);
+        privacy = findViewById(R.id.privacy);
+        error = findViewById(R.id.report_error);
+        credits = findViewById(R.id.credits);
+        rate = findViewById(R.id.rate);
+
+        version_history.setOnClickListener(this);
+        translate.setOnClickListener(this);
+        license.setOnClickListener(this);
+        repo.setOnClickListener(this);
+        privacy.setOnClickListener(this);
+        error.setOnClickListener(this);
+        rate.setOnClickListener(this);
+
+        StringBuilder contributorInfo = new StringBuilder();
+        contributorInfo.append(HtmlCompat.fromHtml(String.format(getString(R.string.app_contributors), contributors.toString()), HtmlCompat.FROM_HTML_MODE_COMPACT));
+        contributorInfo.append("\n\n");
+        contributorInfo.append(getString(R.string.app_copyright_old));
+        contributorInfo.append("\n\n");
+        contributorInfo.append(HtmlCompat.fromHtml(String.format(getString(R.string.app_libraries), libs.toString()), HtmlCompat.FROM_HTML_MODE_COMPACT));
+        contributorInfo.append("\n\n");
+        contributorInfo.append(HtmlCompat.fromHtml(String.format(getString(R.string.app_resources), resources.toString()), HtmlCompat.FROM_HTML_MODE_COMPACT));
+
+        credits.setOnClickListener(view -> new AlertDialog.Builder(this)
+                .setTitle(R.string.credits)
+                .setMessage(contributorInfo.toString())
+                .setPositiveButton(R.string.ok, (dialogInterface, i) -> {
+                })
+                .show());
     }
 
     @Override
@@ -64,84 +142,31 @@ public class AboutActivity extends CatimaAppCompatActivity {
     }
 
     @Override
-    protected void onDestroy() {
-        super.onDestroy();
-        content.destroy();
-        clearClickListeners();
-        binding = null;
-    }
+    public void onClick(View view) {
+        int id = view.getId();
 
-    private void bindClickListeners() {
-        binding.versionHistory.setOnClickListener(this::showHistory);
-        binding.translate.setOnClickListener(this::openExternalBrowser);
-        binding.license.setOnClickListener(this::showLicense);
-        binding.repo.setOnClickListener(this::openExternalBrowser);
-        binding.privacy.setOnClickListener(this::showPrivacy);
-        binding.reportError.setOnClickListener(this::openExternalBrowser);
-        binding.rate.setOnClickListener(this::openExternalBrowser);
-        binding.donate.setOnClickListener(this::openExternalBrowser);
-
-        binding.credits.setOnClickListener(view -> showCredits());
-    }
-
-    private void clearClickListeners() {
-        binding.versionHistory.setOnClickListener(null);
-        binding.translate.setOnClickListener(null);
-        binding.license.setOnClickListener(null);
-        binding.repo.setOnClickListener(null);
-        binding.privacy.setOnClickListener(null);
-        binding.reportError.setOnClickListener(null);
-        binding.rate.setOnClickListener(null);
-        binding.donate.setOnClickListener(null);
-
-        binding.credits.setOnClickListener(null);
-    }
-
-    private void showCredits() {
-        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));
+        String url;
+        if (id == R.id.version_history) {
+            url = "https://catima.app/changelog/";
+        } else if (id == R.id.translate) {
+            url = "https://hosted.weblate.org/engage/catima/";
+        } else if (id == R.id.license) {
+            url = "https://github.com/TheLastProject/Catima/blob/master/LICENSE";
+        } else if (id == R.id.repo) {
+            url = "https://github.com/TheLastProject/Catima/";
+        } else if (id == R.id.privacy) {
+            url = "https://catima.app/privacy-policy/";
+        } else if (id == R.id.report_error) {
+            url = "https://github.com/TheLastProject/Catima/issues";
+        } else if (id == R.id.rate) {
+            url = "https://play.google.com/store/apps/details?id=me.hackerchick.catima";
+        } else {
+            return;
         }
 
-        // Show dialog
-        materialAlertDialogBuilder.show();
+        Intent intent = new Intent(Intent.ACTION_VIEW);
+        intent.setData(Uri.parse(url));
+        startActivity(intent);
     }
 
-    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

@@ -1,162 +0,0 @@
-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;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.List;
-
-public class AboutContent {
-
-    public static final String TAG = "Catima";
-
-    public Context context;
-
-    public AboutContent(Context context) {
-        this.context = context;
-    }
-
-    public void destroy() {
-        this.context = null;
-    }
-
-    public String getPageTitle() {
-        return String.format(context.getString(R.string.about_title_fmt), context.getString(R.string.app_name));
-    }
-
-    public String getAppVersion() {
-        String version = "?";
-        try {
-            PackageInfo pi = context.getPackageManager().getPackageInfo(context.getPackageName(), 0);
-            version = pi.versionName;
-        } catch (PackageManager.NameNotFoundException e) {
-            Log.w(TAG, "Package name not found", e);
-        }
-
-        return version;
-    }
-
-    public int getCurrentYear() {
-        return Calendar.getInstance().get(Calendar.YEAR);
-    }
-
-    public String getCopyright() {
-        return String.format(context.getString(R.string.app_copyright_fmt), getCurrentYear());
-    }
-
-    public String getCopyrightShort() {
-        return context.getString(R.string.app_copyright_short);
-    }
-
-    public String getContributors() {
-        String contributors;
-        try {
-            contributors = "<br/>" + Utils.readTextFile(context, R.raw.contributors);
-        }  catch (IOException ignored) {
-            return "";
-        }
-        return contributors.replace("\n", "<br />");
-    }
-
-    public String 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"));
-        usedLibraries.add(new ThirdPartyInfo("Commons CSV", "https://commons.apache.org/proper/commons-csv/", "Apache 2.0"));
-        usedLibraries.add(new ThirdPartyInfo("NumberPickerPreference", "https://github.com/invissvenska/NumberPickerPreference", "GNU LGPL 3.0"));
-        usedLibraries.add(new ThirdPartyInfo("uCrop", "https://github.com/Yalantis/uCrop", "Apache 2.0"));
-        usedLibraries.add(new ThirdPartyInfo("Zip4j", "https://github.com/srikanth-lingala/zip4j", "Apache 2.0"));
-        usedLibraries.add(new ThirdPartyInfo("ZXing", "https://github.com/zxing/zxing", "Apache 2.0"));
-        usedLibraries.add(new ThirdPartyInfo("ZXing Android Embedded", "https://github.com/journeyapps/zxing-android-embedded", "Apache 2.0"));
-
-        StringBuilder result = new StringBuilder("<br/>");
-        for (ThirdPartyInfo entry : usedLibraries) {
-            result.append("<br/>")
-                .append(entry.toHtml());
-        }
-
-        return result.toString();
-    }
-
-    public String getUsedThirdPartyAssets() {
-        final List<ThirdPartyInfo> usedAssets = new ArrayList<>();
-        usedAssets.add(new ThirdPartyInfo("Android icons", "https://fonts.google.com/icons?selected=Material+Icons", "Apache 2.0"));
-
-        StringBuilder result = new StringBuilder().append("<br/>");
-        for (ThirdPartyInfo entry : usedAssets) {
-            result.append("<br/>")
-                    .append(entry.toHtml());
-        }
-
-        return result.toString();
-    }
-
-    public Spanned getContributorInfo() {
-        StringBuilder contributorInfo = new StringBuilder();
-        contributorInfo.append(getCopyright());
-        contributorInfo.append("<br/><br/>");
-        contributorInfo.append(context.getString(R.string.app_copyright_old));
-        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 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() {
-        return String.format(context.getString(R.string.debug_version_fmt), getAppVersion());
-    }
-}

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

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

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

@@ -5,7 +5,6 @@ import android.graphics.Bitmap;
 import android.graphics.Color;
 import android.graphics.PorterDuff;
 import android.util.Log;
-import android.util.TypedValue;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
@@ -41,15 +40,13 @@ public class BarcodeImageWriterTask implements CompatCallable<Bitmap> {
     private final CatimaBarcode format;
     private final int imageHeight;
     private final int imageWidth;
-    private final int imagePadding;
-    private final boolean widthPadding;
     private final boolean showFallback;
-    private final BarcodeImageWriterResultCallback callback;
+    private final Runnable callback;
 
     BarcodeImageWriterTask(
             Context context, ImageView imageView, String cardIdString,
             CatimaBarcode barcodeFormat, TextView textView,
-            boolean showFallback, BarcodeImageWriterResultCallback callback, boolean roundCornerPadding
+            boolean showFallback, Runnable callback
     ) {
         mContext = context;
 
@@ -63,37 +60,16 @@ public class BarcodeImageWriterTask implements CompatCallable<Bitmap> {
         cardId = cardIdString;
         format = barcodeFormat;
 
-        int imageViewHeight = imageView.getHeight();
-        int imageViewWidth = imageView.getWidth();
-
-        // Some barcodes already have internal whitespace and shouldn't get extra padding
-        // TODO: Get rid of this hack by somehow detecting this extra whitespace
-        if (roundCornerPadding && !barcodeFormat.hasInternalPadding()) {
-            imagePadding = Math.round(TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 10, context.getResources().getDisplayMetrics()));
-        } else {
-            imagePadding = 0;
-        }
-
-        if (format.isSquare() && imageViewWidth > imageViewHeight) {
-            imageViewWidth -= imagePadding;
-            widthPadding = true;
-        } else {
-            imageViewHeight -= imagePadding;
-            widthPadding = false;
-        }
-
         final int MAX_WIDTH = getMaxWidth(format);
 
-        if (format.isSquare()) {
-            imageHeight = imageWidth = Math.min(imageViewHeight, Math.min(MAX_WIDTH, imageViewWidth));
-        } else if (imageView.getWidth() < MAX_WIDTH) {
-            imageHeight = imageViewHeight;
-            imageWidth = imageViewWidth;
+        if (imageView.getWidth() < MAX_WIDTH) {
+            imageHeight = imageView.getHeight();
+            imageWidth = imageView.getWidth();
         } else {
             // Scale down the image to reduce the memory needed to produce it
             imageWidth = MAX_WIDTH;
-            double ratio = (double) MAX_WIDTH / (double) imageViewWidth;
-            imageHeight = (int) (imageViewHeight * ratio);
+            double ratio = (double) MAX_WIDTH / (double) imageView.getWidth();
+            imageHeight = (int) (imageView.getHeight() * ratio);
         }
 
         this.showFallback = showFallback;
@@ -103,15 +79,12 @@ public class BarcodeImageWriterTask implements CompatCallable<Bitmap> {
         switch (format.format()) {
             // 2D barcodes
             case AZTEC:
+            case DATA_MATRIX:
             case MAXICODE:
             case PDF_417:
             case QR_CODE:
                 return MAX_WIDTH_2D;
 
-            // 2D but rectangular versions get blurry otherwise
-            case DATA_MATRIX:
-                return MAX_WIDTH_1D;
-
             // 1D barcodes:
             case CODABAR:
             case CODE_39:
@@ -273,11 +246,6 @@ public class BarcodeImageWriterTask implements CompatCallable<Bitmap> {
 
         if (result != null) {
             Log.i(TAG, "Displaying barcode");
-            if (widthPadding) {
-                imageView.setPadding(imagePadding / 2, 0, imagePadding / 2, 0);
-            } else {
-                imageView.setPadding(0, imagePadding / 2, 0, imagePadding / 2);
-            }
             imageView.setVisibility(View.VISIBLE);
 
             if (isSuccesful) {
@@ -299,7 +267,7 @@ public class BarcodeImageWriterTask implements CompatCallable<Bitmap> {
         }
 
         if (callback != null) {
-            callback.onBarcodeImageWriterResult(isSuccesful);
+            callback.run();
         }
     }
 

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 protect.card_locker.databinding.BarcodeSelectorActivityBinding;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.widget.Toolbar;
 
 /**
  * This activity is callable and will allow a user to enter
@@ -27,7 +26,6 @@ import protect.card_locker.databinding.BarcodeSelectorActivityBinding;
  * data and type will be returned to the caller.
  */
 public class BarcodeSelectorActivity extends CatimaAppCompatActivity implements BarcodeSelectorAdapter.BarcodeSelectorListener {
-    private BarcodeSelectorActivityBinding binding;
     private static final String TAG = "Catima";
 
     // Result this activity will return
@@ -42,15 +40,17 @@ public class BarcodeSelectorActivity extends CatimaAppCompatActivity implements
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        binding = BarcodeSelectorActivityBinding.inflate(getLayoutInflater());
         setTitle(R.string.selectBarcodeTitle);
-        setContentView(binding.getRoot());
-        Toolbar toolbar = binding.toolbar;
+        setContentView(R.layout.barcode_selector_activity);
+        Toolbar toolbar = findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
-        enableToolbarBackButton();
+        ActionBar actionBar = getSupportActionBar();
+        if (actionBar != null) {
+            actionBar.setDisplayHomeAsUpEnabled(true);
+        }
 
-        EditText cardId = binding.cardId;
-        ListView mBarcodeList = binding.barcodes;
+        EditText cardId = findViewById(R.id.cardId);
+        ListView mBarcodeList = findViewById(R.id.barcodes);
         mAdapter = new BarcodeSelectorAdapter(this, new ArrayList<>(), this);
         mBarcodeList.setAdapter(mAdapter);
 
@@ -65,13 +65,17 @@ public class BarcodeSelectorActivity extends CatimaAppCompatActivity implements
 
                     runOnUiThread(() -> {
                         generateBarcodes(s.toString());
+
+                        View noBarcodeButtonView = findViewById(R.id.noBarcode);
+                        setButtonListener(noBarcodeButtonView, s.toString());
+                        noBarcodeButtonView.setEnabled(s.length() > 0);
                     });
                 }, INPUT_DELAY);
             }
         });
 
         final Bundle b = getIntent().getExtras();
-        final String initialCardId = b != null ? b.getString(LoyaltyCard.BUNDLE_LOYALTY_CARD_CARD_ID) : null;
+        final String initialCardId = b != null ? b.getString("initialCardId") : null;
 
         if (initialCardId != null) {
             cardId.setText(initialCardId);
@@ -90,6 +94,17 @@ public class BarcodeSelectorActivity extends CatimaAppCompatActivity implements
         mAdapter.setBarcodes(barcodes);
     }
 
+    private void setButtonListener(final View button, final String cardId) {
+        button.setOnClickListener(view -> {
+            Log.d(TAG, "Selected no barcode");
+            Intent result = new Intent();
+            result.putExtra(BARCODE_FORMAT, "");
+            result.putExtra(BARCODE_CONTENTS, cardId);
+            BarcodeSelectorActivity.this.setResult(RESULT_OK, result);
+            finish();
+        });
+    }
+
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         if (item.getItemId() == android.R.id.home) {

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

@@ -13,7 +13,6 @@ import android.widget.TextView;
 import java.util.ArrayList;
 
 import protect.card_locker.async.TaskHandler;
-import protect.card_locker.databinding.BarcodeLayoutBinding;
 
 public class BarcodeSelectorAdapter extends ArrayAdapter<CatimaBarcodeWithValue> {
     private static final String TAG = "Catima";
@@ -52,10 +51,9 @@ public class BarcodeSelectorAdapter extends ArrayAdapter<CatimaBarcodeWithValue>
         if (convertView == null) {
             viewHolder = new ViewHolder();
             LayoutInflater inflater = LayoutInflater.from(getContext());
-            BarcodeLayoutBinding barcodeLayoutBinding = BarcodeLayoutBinding.inflate(inflater, parent, false);
-            convertView = barcodeLayoutBinding.getRoot();
-            viewHolder.image = barcodeLayoutBinding.barcodeImage;
-            viewHolder.text = barcodeLayoutBinding.barcodeName;
+            convertView = inflater.inflate(R.layout.barcode_layout, parent, false);
+            viewHolder.image = convertView.findViewById(R.id.barcodeImage);
+            viewHolder.text = convertView.findViewById(R.id.barcodeName);
             convertView.setTag(viewHolder);
         } else {
             viewHolder = (ViewHolder) convertView.getTag();
@@ -78,7 +76,6 @@ public class BarcodeSelectorAdapter extends ArrayAdapter<CatimaBarcodeWithValue>
         final CatimaBarcode format = CatimaBarcode.fromName(formatType);
 
         image.setImageBitmap(null);
-        image.setClipToOutline(true);
 
         if (image.getHeight() == 0) {
             // The size of the ImageView is not yet available as it has not
@@ -92,13 +89,13 @@ public class BarcodeSelectorAdapter extends ArrayAdapter<CatimaBarcodeWithValue>
 
                             Log.d(TAG, "Generating barcode for type " + formatType);
 
-                            BarcodeImageWriterTask barcodeWriter = new BarcodeImageWriterTask(getContext(), image, cardId, format, text, true, null, true);
+                            BarcodeImageWriterTask barcodeWriter = new BarcodeImageWriterTask(getContext(), image, cardId, format, text, true, null);
                             mTasks.executeTask(TaskHandler.TYPE.BARCODE, barcodeWriter);
                         }
                     });
         } else {
             Log.d(TAG, "Generating barcode for type " + formatType);
-            BarcodeImageWriterTask barcodeWriter = new BarcodeImageWriterTask(getContext(), image, cardId, format, text, true, null, true);
+            BarcodeImageWriterTask barcodeWriter = new BarcodeImageWriterTask(getContext(), image, cardId, format, text, true, null);
             mTasks.executeTask(TaskHandler.TYPE.BARCODE, barcodeWriter);
         }
     }

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

@@ -0,0 +1,23 @@
+package protect.card_locker;
+
+public class BarcodeValues {
+    private final String mFormat;
+    private final String mContent;
+
+    public BarcodeValues(String format, String content) {
+        mFormat = format;
+        mContent = content;
+    }
+
+    public String format() {
+        return mFormat;
+    }
+
+    public String content() {
+        return mContent;
+    }
+
+    public boolean isEmpty() {
+        return mFormat == null && mContent == null;
+    }
+}

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

@@ -4,69 +4,57 @@ import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.os.Bundle;
 import android.util.Log;
-import android.view.Menu;
-import android.view.MenuItem;
 import android.widget.Toast;
 
+import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
 import androidx.core.content.pm.ShortcutInfoCompat;
 import androidx.core.content.pm.ShortcutManagerCompat;
 import androidx.recyclerview.widget.GridLayoutManager;
-
-import protect.card_locker.databinding.CardShortcutConfigureActivityBinding;
-import protect.card_locker.preferences.Settings;
+import androidx.recyclerview.widget.RecyclerView;
 
 /**
  * The configuration screen for creating a shortcut.
  */
-public class CardShortcutConfigure extends CatimaAppCompatActivity implements LoyaltyCardCursorAdapter.CardAdapterListener {
-    private CardShortcutConfigureActivityBinding binding;
+public class CardShortcutConfigure extends AppCompatActivity implements LoyaltyCardCursorAdapter.CardAdapterListener {
     static final String TAG = "Catima";
     private SQLiteDatabase mDatabase;
-    private LoyaltyCardCursorAdapter mAdapter;
 
     @Override
     public void onCreate(Bundle bundle) {
         super.onCreate(bundle);
-        binding = CardShortcutConfigureActivityBinding.inflate(getLayoutInflater());
+
         mDatabase = new DBHelper(this).getReadableDatabase();
 
         // Set the result to CANCELED.  This will cause nothing to happen if the
         // aback button is pressed.
         setResult(RESULT_CANCELED);
 
-        setContentView(binding.getRoot());
-        Toolbar toolbar = binding.toolbar;
+        setContentView(R.layout.simple_toolbar_list_activity);
+        Toolbar toolbar = findViewById(R.id.toolbar);
         toolbar.setTitle(R.string.shortcutSelectCard);
-        setSupportActionBar(toolbar);
 
         // If there are no cards, bail
-        int cardCount = DBHelper.getLoyaltyCardCount(mDatabase);
-        if (cardCount == 0) {
+        if (DBHelper.getLoyaltyCardCount(mDatabase) == 0) {
             Toast.makeText(this, R.string.noCardsMessage, Toast.LENGTH_LONG).show();
             finish();
         }
 
-        Cursor cardCursor = DBHelper.getLoyaltyCardCursor(mDatabase, DBHelper.LoyaltyCardArchiveFilter.All);
-        mAdapter = new LoyaltyCardCursorAdapter(this, cardCursor, this, null);
-        binding.list.setAdapter(mAdapter);
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-
-        var layoutManager = (GridLayoutManager) binding.list.getLayoutManager();
+        final RecyclerView cardList = findViewById(R.id.list);
+        GridLayoutManager layoutManager = (GridLayoutManager) cardList.getLayoutManager();
         if (layoutManager != null) {
-            var settings = new Settings(this);
-            layoutManager.setSpanCount(settings.getPreferredColumnCount());
+            layoutManager.setSpanCount(getResources().getInteger(R.integer.main_view_card_columns));
         }
+
+        Cursor cardCursor = DBHelper.getLoyaltyCardCursor(mDatabase);
+        final LoyaltyCardCursorAdapter adapter = new LoyaltyCardCursorAdapter(this, cardCursor, this);
+        cardList.setAdapter(adapter);
     }
 
     private void onClickAction(int position) {
-        Cursor selected = DBHelper.getLoyaltyCardCursor(mDatabase, DBHelper.LoyaltyCardArchiveFilter.All);
+        Cursor selected = DBHelper.getLoyaltyCardCursor(mDatabase);
         selected.moveToPosition(position);
-        LoyaltyCard loyaltyCard = LoyaltyCard.fromCursor(CardShortcutConfigure.this, selected);
+        LoyaltyCard loyaltyCard = LoyaltyCard.toLoyaltyCard(selected);
 
         Log.d(TAG, "Creating shortcut for card " + loyaltyCard.store + "," + loyaltyCard.id);
 
@@ -77,26 +65,6 @@ public class CardShortcutConfigure extends CatimaAppCompatActivity implements Lo
         finish();
     }
 
-    @Override
-    public boolean onCreateOptionsMenu(Menu inputMenu) {
-        getMenuInflater().inflate(R.menu.card_details_menu, inputMenu);
-
-        return super.onCreateOptionsMenu(inputMenu);
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem inputItem) {
-        int id = inputItem.getItemId();
-
-        if (id == R.id.action_display_options) {
-            mAdapter.showDisplayOptionsDialog();
-            invalidateOptionsMenu();
-
-            return true;
-        }
-
-        return super.onOptionsItemSelected(inputItem);
-    }
 
     @Override
     public void onRowClicked(int inputPosition) {

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

@@ -1,5 +1,6 @@
 package protect.card_locker;
 
+import android.annotation.SuppressLint;
 import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
@@ -39,13 +40,13 @@ public class CardsOnPowerScreenService extends ControlsProviderService {
     @NonNull
     @Override
     public Flow.Publisher<Control> createPublisherForAllAvailable() {
-        Cursor loyaltyCardCursor = DBHelper.getLoyaltyCardCursor(mDatabase, DBHelper.LoyaltyCardArchiveFilter.Unarchived);
+        Cursor loyaltyCardCursor = DBHelper.getLoyaltyCardCursor(mDatabase);
         return subscriber -> {
             while (loyaltyCardCursor.moveToNext()) {
-                LoyaltyCard card = LoyaltyCard.fromCursor(this, loyaltyCardCursor);
+                LoyaltyCard card = LoyaltyCard.toLoyaltyCard(loyaltyCardCursor);
                 Intent openIntent = new Intent(this, LoyaltyCardViewActivity.class)
                         .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-                        .putExtra(LoyaltyCardViewActivity.BUNDLE_ID, card.id);
+                        .putExtra("id", card.id);
                 PendingIntent pendingIntent = PendingIntent.getActivity(getBaseContext(), card.id, openIntent, PendingIntent.FLAG_IMMUTABLE);
                 subscriber.onNext(
                         new Control.StatelessBuilder(PREFIX + card.id, pendingIntent)
@@ -68,12 +69,13 @@ public class CardsOnPowerScreenService extends ControlsProviderService {
             subscriber.onSubscribe(new NoOpSubscription());
             for (String controlId : controlIds) {
                 Control control;
-                Integer cardId = this.controlIdToCardId(controlId);
-                LoyaltyCard card = DBHelper.getLoyaltyCard(this, mDatabase, cardId);
-                if (card != null) {
+
+                try {
+                    Integer cardId = this.controlIdToCardId(controlId);
+                    LoyaltyCard card = DBHelper.getLoyaltyCard(mDatabase, cardId);
                     Intent openIntent = new Intent(this, LoyaltyCardViewActivity.class)
                             .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-                            .putExtra(LoyaltyCardViewActivity.BUNDLE_ID, card.id);
+                            .putExtra("id", card.id);
                     PendingIntent pendingIntent = PendingIntent.getActivity(getBaseContext(), card.id, openIntent, PendingIntent.FLAG_IMMUTABLE);
                     control = new Control.StatefulBuilder(controlId, pendingIntent)
                             .setTitle(card.store)
@@ -83,7 +85,7 @@ public class CardsOnPowerScreenService extends ControlsProviderService {
                             .setControlTemplate(new StatelessTemplate(controlId))
                             .setCustomIcon(Icon.createWithBitmap(getIcon(this, card)))
                             .build();
-                } else {
+                } catch (NullPointerException ignored) {
                     Intent mainScreenIntent = new Intent(this, MainActivity.class)
                             .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
                     PendingIntent pendingIntent = PendingIntent.getActivity(getBaseContext(), -1, mainScreenIntent, PendingIntent.FLAG_IMMUTABLE);
@@ -99,7 +101,7 @@ public class CardsOnPowerScreenService extends ControlsProviderService {
     }
 
     private Bitmap getIcon(Context context, LoyaltyCard loyaltyCard) {
-        Bitmap cardIcon = loyaltyCard.getImageThumbnail(context);
+        Bitmap cardIcon = Utils.retrieveCardImage(context, loyaltyCard.id, ImageLocationType.icon);
 
         if (cardIcon != null) {
             return cardIcon;
@@ -129,13 +131,13 @@ public class CardsOnPowerScreenService extends ControlsProviderService {
         consumer.accept(ControlAction.RESPONSE_OK);
         Intent openIntent = new Intent(this, LoyaltyCardViewActivity.class)
                 .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-                .putExtra(LoyaltyCardViewActivity.BUNDLE_ID, controlIdToCardId(controlId));
+                .putExtra("id", controlIdToCardId(controlId));
         startActivity(openIntent);
 
         closePowerScreenOnAndroid11();
     }
 
-    @SuppressWarnings({"MissingPermission", "deprecation"})
+    @SuppressLint({"MissingPermission", "deprecation"})
     private void closePowerScreenOnAndroid11() {
         // Android 12 will auto-close the power screen, but earlier versions won't
         // Lint complains about this but on Android 11 the permission is not needed

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

@@ -1,20 +1,19 @@
 package protect.card_locker;
 
 import android.content.Context;
-import android.graphics.Color;
-import android.os.Build;
-import android.os.Bundle;
-import android.view.View;
-import android.view.Window;
+import android.content.SharedPreferences;
+import android.content.res.Resources;
+import android.util.TypedValue;
 
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AppCompatActivity;
-import androidx.core.view.WindowInsetsControllerCompat;
+import androidx.preference.PreferenceManager;
+
+import java.util.HashMap;
 
 public class CatimaAppCompatActivity extends AppCompatActivity {
-    protected boolean activityOverridesNavBarColor = false;
+
+    SharedPreferences pref;
+    HashMap<String, Integer> supportedThemes;
 
     @Override
     protected void attachBaseContext(Context base) {
@@ -23,48 +22,32 @@ public class CatimaAppCompatActivity extends AppCompatActivity {
     }
 
     @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        Utils.patchColors(this);
-    }
-
-    @Override
-    protected void onPostCreate(@Nullable Bundle savedInstanceState) {
-        super.onPostCreate(savedInstanceState);
-        // material 3 designer does not consider status bar colors
-        // XXX changing this in onCreate causes issues with the splash screen activity, so doing this here
-        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));
-            }
+    public Resources.Theme getTheme() {
+        if (supportedThemes == null) {
+            supportedThemes = new HashMap<>();
+            supportedThemes.put(getString(R.string.settings_key_blue_theme), R.style.AppTheme_blue);
+            supportedThemes.put(getString(R.string.settings_key_brown_theme), R.style.AppTheme_brown);
+            supportedThemes.put(getString(R.string.settings_key_green_theme), R.style.AppTheme_green);
+            supportedThemes.put(getString(R.string.settings_key_grey_theme), R.style.AppTheme_grey);
+            supportedThemes.put(getString(R.string.settings_key_magenta_theme), R.style.AppTheme_magenta);
+            supportedThemes.put(getString(R.string.settings_key_pink_theme), R.style.AppTheme_pink);
+            supportedThemes.put(getString(R.string.settings_key_sky_blue_theme), R.style.AppTheme_sky_blue);
+            supportedThemes.put(getString(R.string.settings_key_violet_theme), R.style.AppTheme_violet);
         }
-        // XXX android 9 and below has a nasty rendering bug if the theme was patched earlier
-        Utils.postPatchColors(this);
+
+        Resources.Theme theme = super.getTheme();
+        pref = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
+        String themeName = pref.getString(getString(R.string.setting_key_theme_color), getString(R.string.settings_key_catima_theme));
+
+        theme.applyStyle(Utils.mapGetOrDefault(supportedThemes, themeName, R.style.AppTheme_NoActionBar), true);
+
+        return theme;
     }
 
-    @Override
-    protected void onResume() {
-        super.onResume();
-        if (!activityOverridesNavBarColor) {
-            Utils.setNavigationBarColor(this, null, Utils.resolveBackgroundColor(this), !Utils.isDarkModeEnabled(this));
-        }
-    }
-
-    protected void enableToolbarBackButton() {
-        ActionBar actionBar = getSupportActionBar();
-        if (actionBar != null) {
-            actionBar.setDisplayHomeAsUpEnabled(true);
-        }
-    }
-
-    public void onMockedRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+    public int getThemeColor() {
+        TypedValue typedValue = new TypedValue();
+        Resources.Theme theme = getTheme();
+        theme.resolveAttribute(R.attr.colorPrimary, typedValue, true);
+        return typedValue.data;
     }
 }

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

@@ -1,7 +1,5 @@
 package protect.card_locker;
 
-import androidx.annotation.NonNull;
-
 import com.google.zxing.BarcodeFormat;
 
 import java.util.Arrays;
@@ -47,15 +45,15 @@ public class CatimaBarcode {
         mBarcodeFormat = barcodeFormat;
     }
 
-    public static CatimaBarcode fromBarcode(@NonNull BarcodeFormat barcodeFormat) {
+    public static CatimaBarcode fromBarcode(BarcodeFormat barcodeFormat) {
         return new CatimaBarcode(barcodeFormat);
     }
 
-    public static CatimaBarcode fromName(@NonNull String name) {
+    public static CatimaBarcode fromName(String name) {
         return new CatimaBarcode(BarcodeFormat.valueOf(name));
     }
 
-    public static CatimaBarcode fromPrettyName(@NonNull String prettyName) {
+    public static CatimaBarcode fromPrettyName(String prettyName) {
         try {
             return new CatimaBarcode(barcodeFormats.get(barcodePrettyNames.indexOf(prettyName)));
         } catch (IndexOutOfBoundsException e) {
@@ -69,15 +67,11 @@ public class CatimaBarcode {
 
     public boolean isSquare() {
         return mBarcodeFormat == BarcodeFormat.AZTEC
+                || mBarcodeFormat == BarcodeFormat.DATA_MATRIX
                 || mBarcodeFormat == BarcodeFormat.MAXICODE
                 || mBarcodeFormat == BarcodeFormat.QR_CODE;
     }
 
-    public boolean hasInternalPadding() {
-        return mBarcodeFormat == BarcodeFormat.PDF_417
-                || mBarcodeFormat == BarcodeFormat.QR_CODE;
-    }
-
     public BarcodeFormat format() {
         return mBarcodeFormat;
     }

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

@@ -4,24 +4,22 @@ import android.app.Activity;
 import android.content.Context;
 import android.widget.Toast;
 
-import androidx.core.util.Consumer;
-
 import com.journeyapps.barcodescanner.CaptureManager;
 import com.journeyapps.barcodescanner.DecoratedBarcodeView;
 
 public class CatimaCaptureManager extends CaptureManager {
-    private final Consumer<String> mErrorCallback;
+    private final Context mContext;
 
-    public CatimaCaptureManager(Activity activity, DecoratedBarcodeView barcodeView, Consumer<String> errorCallback) {
+    public CatimaCaptureManager(Activity activity, DecoratedBarcodeView barcodeView) {
         super(activity, barcodeView);
 
-        mErrorCallback = errorCallback;
+        mContext = activity.getApplicationContext();
     }
 
     @Override
     protected void displayFrameworkBugMessageAndExit(String message) {
         // We don't want to exit, as we also have a enter from card image and add manually button here
-        // So, instead, we call our error callback
-        mErrorCallback.accept(message);
+        // So we show a toast instead
+        Toast.makeText(mContext, message, Toast.LENGTH_LONG).show();
     }
 }

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

@@ -16,17 +16,12 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Currency;
 import java.util.Date;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
 
 public class DBHelper extends SQLiteOpenHelper {
     public static final String DATABASE_NAME = "Catima.db";
     public static final int ORIGINAL_DATABASE_VERSION = 1;
-    public static final int DATABASE_VERSION = 16;
-
-    // NB: changing this value requires a migration
-    public static final int DEFAULT_ZOOM_LEVEL = 100;
+    public static final int DATABASE_VERSION = 14;
 
     public static class LoyaltyCardDbGroups {
         public static final String TABLE = "groups";
@@ -38,7 +33,6 @@ public class DBHelper extends SQLiteOpenHelper {
         public static final String TABLE = "cards";
         public static final String ID = "_id";
         public static final String STORE = "store";
-        public static final String VALID_FROM = "validfrom";
         public static final String EXPIRY = "expiry";
         public static final String BALANCE = "balance";
         public static final String BALANCE_TYPE = "balancetype";
@@ -51,7 +45,6 @@ public class DBHelper extends SQLiteOpenHelper {
         public static final String STAR_STATUS = "starstatus";
         public static final String LAST_USED = "lastused";
         public static final String ZOOM_LEVEL = "zoomlevel";
-        public static final String ARCHIVE_STATUS = "archive";
     }
 
     public static class LoyaltyCardDbIdsGroups {
@@ -78,12 +71,6 @@ public class DBHelper extends SQLiteOpenHelper {
         Descending
     }
 
-    public enum LoyaltyCardArchiveFilter {
-        All,
-        Archived,
-        Unarchived
-    }
-
     public DBHelper(Context context) {
         super(context, DATABASE_NAME, null, DATABASE_VERSION);
     }
@@ -101,7 +88,6 @@ public class DBHelper extends SQLiteOpenHelper {
                 LoyaltyCardDbIds.ID + " INTEGER primary key autoincrement," +
                 LoyaltyCardDbIds.STORE + " TEXT not null," +
                 LoyaltyCardDbIds.NOTE + " TEXT not null," +
-                LoyaltyCardDbIds.VALID_FROM + " INTEGER," +
                 LoyaltyCardDbIds.EXPIRY + " INTEGER," +
                 LoyaltyCardDbIds.BALANCE + " TEXT not null DEFAULT '0'," +
                 LoyaltyCardDbIds.BALANCE_TYPE + " TEXT," +
@@ -111,8 +97,7 @@ public class DBHelper extends SQLiteOpenHelper {
                 LoyaltyCardDbIds.BARCODE_TYPE + " TEXT," +
                 LoyaltyCardDbIds.STAR_STATUS + " INTEGER DEFAULT '0'," +
                 LoyaltyCardDbIds.LAST_USED + " INTEGER DEFAULT '0', " +
-                LoyaltyCardDbIds.ZOOM_LEVEL + " INTEGER DEFAULT '" + DEFAULT_ZOOM_LEVEL + "', " +
-                LoyaltyCardDbIds.ARCHIVE_STATUS + " INTEGER DEFAULT '0' )");
+                LoyaltyCardDbIds.ZOOM_LEVEL + " INTEGER DEFAULT '100' )");
 
         // create associative table for cards in groups
         db.execSQL("CREATE TABLE " + LoyaltyCardDbIdsGroups.TABLE + "(" +
@@ -317,30 +302,6 @@ public class DBHelper extends SQLiteOpenHelper {
             db.execSQL("ALTER TABLE " + LoyaltyCardDbIds.TABLE
                     + " ADD COLUMN " + LoyaltyCardDbIds.ZOOM_LEVEL + " INTEGER DEFAULT '100' ");
         }
-        if (oldVersion < 15 && newVersion >= 15) {
-            db.execSQL("ALTER TABLE " + LoyaltyCardDbIds.TABLE
-                    + " ADD COLUMN " + LoyaltyCardDbIds.ARCHIVE_STATUS + " INTEGER DEFAULT '0' ");
-        }
-
-        if (oldVersion < 16 && newVersion >= 16) {
-            db.execSQL("ALTER TABLE " + LoyaltyCardDbIds.TABLE
-                    + " ADD COLUMN " + LoyaltyCardDbIds.VALID_FROM + " INTEGER");
-        }
-    }
-
-    public static Set<String> imageFiles(Context context, final SQLiteDatabase database) {
-        Set<String> files = new HashSet<>();
-        Cursor cardCursor = getLoyaltyCardCursor(database);
-        while (cardCursor.moveToNext()) {
-            LoyaltyCard card = LoyaltyCard.fromCursor(context, cardCursor);
-            for (ImageLocationType imageLocationType : ImageLocationType.values()) {
-                String name = Utils.getCardImageFileName(card.id, imageLocationType);
-                if (card.getImageForImageLocationType(context, imageLocationType) != null) {
-                    files.add(name);
-                }
-            }
-        }
-        return files;
     }
 
     private static ContentValues generateFTSContentValues(final int id, final String store, final String note) {
@@ -385,17 +346,16 @@ public class DBHelper extends SQLiteOpenHelper {
     }
 
     public static long insertLoyaltyCard(
-            final SQLiteDatabase database, final String store, final String note, final Date validFrom,
-            final Date expiry, final BigDecimal balance, final Currency balanceType, final String cardId,
+            final SQLiteDatabase database, final String store, final String note, final Date expiry,
+            final BigDecimal balance, final Currency balanceType, final String cardId,
             final String barcodeId, final CatimaBarcode barcodeType, final Integer headerColor,
-            final int starStatus, final Long lastUsed, final int archiveStatus) {
+            final int starStatus, final Long lastUsed) {
         database.beginTransaction();
 
         // Card
         ContentValues contentValues = new ContentValues();
         contentValues.put(LoyaltyCardDbIds.STORE, store);
         contentValues.put(LoyaltyCardDbIds.NOTE, note);
-        contentValues.put(LoyaltyCardDbIds.VALID_FROM, validFrom != null ? validFrom.getTime() : null);
         contentValues.put(LoyaltyCardDbIds.EXPIRY, expiry != null ? expiry.getTime() : null);
         contentValues.put(LoyaltyCardDbIds.BALANCE, balance.toString());
         contentValues.put(LoyaltyCardDbIds.BALANCE_TYPE, balanceType != null ? balanceType.getCurrencyCode() : null);
@@ -405,7 +365,6 @@ public class DBHelper extends SQLiteOpenHelper {
         contentValues.put(LoyaltyCardDbIds.HEADER_COLOR, headerColor);
         contentValues.put(LoyaltyCardDbIds.STAR_STATUS, starStatus);
         contentValues.put(LoyaltyCardDbIds.LAST_USED, lastUsed != null ? lastUsed : Utils.getUnixTime());
-        contentValues.put(LoyaltyCardDbIds.ARCHIVE_STATUS, archiveStatus);
         long id = database.insert(LoyaltyCardDbIds.TABLE, null, contentValues);
 
         // FTS
@@ -419,10 +378,9 @@ public class DBHelper extends SQLiteOpenHelper {
 
     public static long insertLoyaltyCard(
             final SQLiteDatabase database, final int id, final String store, final String note,
-            final Date validFrom, final Date expiry, final BigDecimal balance,
-            final Currency balanceType, final String cardId, final String barcodeId,
-            final CatimaBarcode barcodeType, final Integer headerColor, final int starStatus,
-            final Long lastUsed, final int archiveStatus) {
+            final Date expiry, final BigDecimal balance, final Currency balanceType,
+            final String cardId, final String barcodeId, final CatimaBarcode barcodeType,
+            final Integer headerColor, final int starStatus, final Long lastUsed) {
         database.beginTransaction();
 
         // Card
@@ -430,7 +388,6 @@ public class DBHelper extends SQLiteOpenHelper {
         contentValues.put(LoyaltyCardDbIds.ID, id);
         contentValues.put(LoyaltyCardDbIds.STORE, store);
         contentValues.put(LoyaltyCardDbIds.NOTE, note);
-        contentValues.put(LoyaltyCardDbIds.VALID_FROM, validFrom != null ? validFrom.getTime() : null);
         contentValues.put(LoyaltyCardDbIds.EXPIRY, expiry != null ? expiry.getTime() : null);
         contentValues.put(LoyaltyCardDbIds.BALANCE, balance.toString());
         contentValues.put(LoyaltyCardDbIds.BALANCE_TYPE, balanceType != null ? balanceType.getCurrencyCode() : null);
@@ -440,7 +397,6 @@ public class DBHelper extends SQLiteOpenHelper {
         contentValues.put(LoyaltyCardDbIds.HEADER_COLOR, headerColor);
         contentValues.put(LoyaltyCardDbIds.STAR_STATUS, starStatus);
         contentValues.put(LoyaltyCardDbIds.LAST_USED, lastUsed != null ? lastUsed : Utils.getUnixTime());
-        contentValues.put(LoyaltyCardDbIds.ARCHIVE_STATUS, archiveStatus);
         database.insert(LoyaltyCardDbIds.TABLE, null, contentValues);
 
         // FTS
@@ -454,17 +410,15 @@ public class DBHelper extends SQLiteOpenHelper {
 
     public static boolean updateLoyaltyCard(
             SQLiteDatabase database, final int id, final String store, final String note,
-            final Date validFrom, final Date expiry, final BigDecimal balance,
-            final Currency balanceType, final String cardId, final String barcodeId,
-            final CatimaBarcode barcodeType, final Integer headerColor, final int starStatus,
-            final Long lastUsed, final int archiveStatus) {
+            final Date expiry, final BigDecimal balance, final Currency balanceType,
+            final String cardId, final String barcodeId, final CatimaBarcode barcodeType,
+            final Integer headerColor) {
         database.beginTransaction();
 
         // Card
         ContentValues contentValues = new ContentValues();
         contentValues.put(LoyaltyCardDbIds.STORE, store);
         contentValues.put(LoyaltyCardDbIds.NOTE, note);
-        contentValues.put(LoyaltyCardDbIds.VALID_FROM, validFrom != null ? validFrom.getTime() : null);
         contentValues.put(LoyaltyCardDbIds.EXPIRY, expiry != null ? expiry.getTime() : null);
         contentValues.put(LoyaltyCardDbIds.BALANCE, balance.toString());
         contentValues.put(LoyaltyCardDbIds.BALANCE_TYPE, balanceType != null ? balanceType.getCurrencyCode() : null);
@@ -472,10 +426,6 @@ public class DBHelper extends SQLiteOpenHelper {
         contentValues.put(LoyaltyCardDbIds.BARCODE_ID, barcodeId);
         contentValues.put(LoyaltyCardDbIds.BARCODE_TYPE, barcodeType != null ? barcodeType.name() : null);
         contentValues.put(LoyaltyCardDbIds.HEADER_COLOR, headerColor);
-        contentValues.put(LoyaltyCardDbIds.STAR_STATUS, starStatus);
-        contentValues.put(LoyaltyCardDbIds.LAST_USED, lastUsed != null ? lastUsed : Utils.getUnixTime());
-        contentValues.put(LoyaltyCardDbIds.ARCHIVE_STATUS, archiveStatus);
-
         int rowsUpdated = database.update(LoyaltyCardDbIds.TABLE, contentValues,
                 whereAttrs(LoyaltyCardDbIds.ID), withArgs(id));
 
@@ -488,15 +438,6 @@ public class DBHelper extends SQLiteOpenHelper {
         return (rowsUpdated == 1);
     }
 
-    public static boolean updateLoyaltyCardArchiveStatus(SQLiteDatabase database, final int id, final int archiveStatus) {
-        ContentValues contentValues = new ContentValues();
-        contentValues.put(LoyaltyCardDbIds.ARCHIVE_STATUS, archiveStatus);
-        int rowsUpdated = database.update(LoyaltyCardDbIds.TABLE, contentValues,
-                whereAttrs(LoyaltyCardDbIds.ID),
-                withArgs(id));
-        return (rowsUpdated == 1);
-    }
-
     public static boolean updateLoyaltyCardStarStatus(SQLiteDatabase database, final int id, final int starStatus) {
         ContentValues contentValues = new ContentValues();
         contentValues.put(LoyaltyCardDbIds.STAR_STATUS, starStatus);
@@ -526,23 +467,14 @@ public class DBHelper extends SQLiteOpenHelper {
         return (rowsUpdated == 1);
     }
 
-    public static boolean updateLoyaltyCardBalance(SQLiteDatabase database, final int id, final BigDecimal newBalance) {
-        ContentValues contentValues = new ContentValues();
-        contentValues.put(LoyaltyCardDbIds.BALANCE, newBalance.toString());
-        int rowsUpdated = database.update(LoyaltyCardDbIds.TABLE, contentValues,
-                whereAttrs(LoyaltyCardDbIds.ID),
-                withArgs(id));
-        return (rowsUpdated == 1);
-    }
-
-    public static LoyaltyCard getLoyaltyCard(Context context, SQLiteDatabase database, final int id) {
+    public static LoyaltyCard getLoyaltyCard(SQLiteDatabase database, final int id) {
         Cursor data = database.query(LoyaltyCardDbIds.TABLE, null, whereAttrs(LoyaltyCardDbIds.ID), withArgs(id), null, null, null);
 
         LoyaltyCard card = null;
 
         if (data.getCount() == 1) {
             data.moveToFirst();
-            card = LoyaltyCard.fromCursor(context, data);
+            card = LoyaltyCard.toLoyaltyCard(data);
         }
 
         data.close();
@@ -617,35 +549,9 @@ public class DBHelper extends SQLiteOpenHelper {
         return (rowsDeleted == 1);
     }
 
-    public static int getArchivedCardsCount(SQLiteDatabase database) {
-        return (int) DatabaseUtils.queryNumEntries(database, LoyaltyCardDbIds.TABLE,
-                whereAttrs(LoyaltyCardDbIds.ARCHIVE_STATUS), withArgs(1));
-    }
-
-    public static int getArchivedCardsCount(SQLiteDatabase database, final String groupName) {
-        Cursor data = database.rawQuery(
-                "select * from " + LoyaltyCardDbIds.TABLE + " c " +
-                        " LEFT JOIN " + LoyaltyCardDbIdsGroups.TABLE + " cg " +
-                        " ON c." + LoyaltyCardDbIds.ID + " = cg." + LoyaltyCardDbIdsGroups.cardID +
-                " where " + LoyaltyCardDbIds.ARCHIVE_STATUS + " = 1" +
-                " AND " + LoyaltyCardDbIdsGroups.groupID + "= ?",
-                withArgs(groupName)
-        );
-
-        int count = data.getCount();
-
-        data.close();
-        return count;
-    }
-
     public static Cursor getLoyaltyCardCursor(SQLiteDatabase database) {
         // An empty string will match everything
-        return getLoyaltyCardCursor(database, LoyaltyCardArchiveFilter.All);
-    }
-
-    public static Cursor getLoyaltyCardCursor(SQLiteDatabase database, LoyaltyCardArchiveFilter archiveFilter) {
-        // An empty string will match everything
-        return getLoyaltyCardCursor(database, "", archiveFilter);
+        return getLoyaltyCardCursor(database, "");
     }
 
     /**
@@ -654,8 +560,8 @@ public class DBHelper extends SQLiteOpenHelper {
      * @param filter
      * @return Cursor
      */
-    public static Cursor getLoyaltyCardCursor(SQLiteDatabase database, final String filter, LoyaltyCardArchiveFilter archiveFilter) {
-        return getLoyaltyCardCursor(database, filter, null, archiveFilter);
+    public static Cursor getLoyaltyCardCursor(SQLiteDatabase database, final String filter) {
+        return getLoyaltyCardCursor(database, filter, null);
     }
 
     /**
@@ -665,8 +571,8 @@ public class DBHelper extends SQLiteOpenHelper {
      * @param group
      * @return Cursor
      */
-    public static Cursor getLoyaltyCardCursor(SQLiteDatabase database, final String filter, Group group, LoyaltyCardArchiveFilter archiveFilter) {
-        return getLoyaltyCardCursor(database, filter, group, LoyaltyCardOrder.Alpha, LoyaltyCardOrderDirection.Ascending, archiveFilter);
+    public static Cursor getLoyaltyCardCursor(SQLiteDatabase database, final String filter, Group group) {
+        return getLoyaltyCardCursor(database, filter, group, LoyaltyCardOrder.Alpha, LoyaltyCardOrderDirection.Ascending);
     }
 
     /**
@@ -677,7 +583,7 @@ public class DBHelper extends SQLiteOpenHelper {
      * @param order
      * @return Cursor
      */
-    public static Cursor getLoyaltyCardCursor(SQLiteDatabase database, String filter, Group group, LoyaltyCardOrder order, LoyaltyCardOrderDirection direction, LoyaltyCardArchiveFilter archiveFilter) {
+    public static Cursor getLoyaltyCardCursor(SQLiteDatabase database, String filter, Group group, LoyaltyCardOrder order, LoyaltyCardOrderDirection direction) {
         StringBuilder groupFilter = new StringBuilder();
         String limitString = "";
 
@@ -700,11 +606,6 @@ public class DBHelper extends SQLiteOpenHelper {
             }
         }
 
-        String archiveFilterString = "";
-        if (archiveFilter != LoyaltyCardArchiveFilter.All) {
-            archiveFilterString = " AND " + LoyaltyCardDbIds.TABLE + "." + LoyaltyCardDbIds.ARCHIVE_STATUS + " = " + (archiveFilter.equals(LoyaltyCardArchiveFilter.Unarchived) ? 0 : 1);
-        }
-
         String orderField = getFieldForOrder(order);
 
         return database.rawQuery("SELECT " + LoyaltyCardDbIds.TABLE + ".* FROM " + LoyaltyCardDbIds.TABLE +
@@ -712,9 +613,7 @@ public class DBHelper extends SQLiteOpenHelper {
                 " ON " + LoyaltyCardDbFTS.TABLE + "." + LoyaltyCardDbFTS.ID + " = " + LoyaltyCardDbIds.TABLE + "." + LoyaltyCardDbIds.ID +
                 (filter.trim().isEmpty() ? " " : " AND " + LoyaltyCardDbFTS.TABLE + " MATCH ? ") +
                 groupFilter.toString() +
-                archiveFilterString +
-                " ORDER BY " + LoyaltyCardDbIds.TABLE + "." + LoyaltyCardDbIds.ARCHIVE_STATUS + " ASC, " +
-                LoyaltyCardDbIds.TABLE + "." + LoyaltyCardDbIds.STAR_STATUS + " DESC, " +
+                " ORDER BY " + LoyaltyCardDbIds.TABLE + "." + LoyaltyCardDbIds.STAR_STATUS + " DESC, " +
                 " (CASE WHEN " + LoyaltyCardDbIds.TABLE + "." + orderField + " IS NULL THEN 1 ELSE 0 END), " +
                 LoyaltyCardDbIds.TABLE + "." + orderField + " COLLATE NOCASE " + getDbDirection(order, direction) + ", " +
                 LoyaltyCardDbIds.TABLE + "." + LoyaltyCardDbIds.STORE + " COLLATE NOCASE ASC " +

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

@@ -1,29 +1,29 @@
 package protect.card_locker;
 
 import android.content.Context;
-import android.content.res.Resources;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.Button;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
+import androidx.appcompat.widget.AppCompatImageButton;
 import androidx.recyclerview.widget.RecyclerView;
-
-import protect.card_locker.databinding.GroupLayoutBinding;
+import protect.card_locker.preferences.Settings;
 
 public class GroupCursorAdapter extends BaseCursorAdapter<GroupCursorAdapter.GroupListItemViewHolder> {
-    public final Context mContext;
+    Settings mSettings;
+    private final Context mContext;
     private final GroupAdapterListener mListener;
     SQLiteDatabase mDatabase;
 
     public GroupCursorAdapter(Context inputContext, Cursor inputCursor, GroupAdapterListener inputListener) {
         super(inputCursor, DBHelper.LoyaltyCardDbGroups.ORDER);
         setHasStableIds(true);
-        mContext = inputContext;
+        mSettings = new Settings(inputContext);
+        mContext = inputContext.getApplicationContext();
         mListener = inputListener;
         mDatabase = new DBHelper(inputContext).getReadableDatabase();
 
@@ -32,14 +32,9 @@ public class GroupCursorAdapter extends BaseCursorAdapter<GroupCursorAdapter.Gro
 
     @NonNull
     @Override
-    public GroupCursorAdapter.GroupListItemViewHolder onCreateViewHolder(@NonNull ViewGroup inputParent, int inputViewType) {
-        return new GroupListItemViewHolder(
-                GroupLayoutBinding.inflate(
-                        LayoutInflater.from(inputParent.getContext()),
-                        inputParent,
-                        false
-                )
-        );
+    public GroupCursorAdapter.GroupListItemViewHolder onCreateViewHolder(ViewGroup inputParent, int inputViewType) {
+        View itemView = LayoutInflater.from(inputParent.getContext()).inflate(R.layout.group_layout, inputParent, false);
+        return new GroupListItemViewHolder(itemView);
     }
 
     public void onBindViewHolder(GroupListItemViewHolder inputHolder, Cursor inputCursor) {
@@ -48,18 +43,10 @@ public class GroupCursorAdapter extends BaseCursorAdapter<GroupCursorAdapter.Gro
         inputHolder.mName.setText(group._id);
 
         int groupCardCount = DBHelper.getGroupCardCount(mDatabase, group._id);
-        int archivedCardCount = DBHelper.getArchivedCardsCount(mDatabase, group._id);
+        inputHolder.mCardCount.setText(mContext.getResources().getQuantityString(R.plurals.groupCardCount, groupCardCount, groupCardCount));
 
-        Resources resources = mContext.getResources();
-
-        String cardCountText;
-        if (archivedCardCount > 0) {
-            cardCountText = resources.getQuantityString(R.plurals.groupCardCountWithArchived, groupCardCount, groupCardCount, archivedCardCount);
-        }  else {
-            cardCountText = resources.getQuantityString(R.plurals.groupCardCount, groupCardCount, groupCardCount);
-        }
-
-        inputHolder.mCardCount.setText(cardCountText);
+        inputHolder.mName.setTextSize(mSettings.getFontSizeMax(mSettings.getMediumFont()));
+        inputHolder.mCardCount.setTextSize(mSettings.getFontSizeMax(mSettings.getSmallFont()));
 
         applyClickEvents(inputHolder);
     }
@@ -83,16 +70,16 @@ public class GroupCursorAdapter extends BaseCursorAdapter<GroupCursorAdapter.Gro
 
     public static class GroupListItemViewHolder extends RecyclerView.ViewHolder {
         public TextView mName, mCardCount;
-        public Button mMoveUp, mMoveDown, mEdit, mDelete;
+        public AppCompatImageButton mMoveUp, mMoveDown, mEdit, mDelete;
 
-        public GroupListItemViewHolder(GroupLayoutBinding groupLayoutBinding) {
-            super(groupLayoutBinding.getRoot());
-            mName = groupLayoutBinding.name;
-            mCardCount = groupLayoutBinding.cardCount;
-            mMoveUp = groupLayoutBinding.moveUp;
-            mMoveDown = groupLayoutBinding.moveDown;
-            mEdit = groupLayoutBinding.edit;
-            mDelete = groupLayoutBinding.delete;
+        public GroupListItemViewHolder(View inputView) {
+            super(inputView);
+            mName = inputView.findViewById(R.id.name);
+            mCardCount = inputView.findViewById(R.id.cardCount);
+            mMoveUp = inputView.findViewById(R.id.moveUp);
+            mMoveDown = inputView.findViewById(R.id.moveDown);
+            mEdit = inputView.findViewById(R.id.edit);
+            mDelete = inputView.findViewById(R.id.delete);
         }
     }
 }

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

@@ -1,30 +1,35 @@
 package protect.card_locker;
 
+import android.Manifest;
+import android.app.NotificationManager;
+import android.app.PendingIntent;
 import android.content.ActivityNotFoundException;
+import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.Bundle;
 import android.text.InputType;
 import android.util.Log;
 import android.view.MenuItem;
 import android.view.ViewGroup;
-import android.view.WindowManager;
 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.ActionBar;
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.widget.Toolbar;
+import androidx.core.app.ActivityCompat;
+import androidx.core.app.NotificationCompat;
+import androidx.core.content.ContextCompat;
 
-import com.google.android.material.dialog.MaterialAlertDialogBuilder;
-import com.google.android.material.textfield.TextInputLayout;
-
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -32,15 +37,14 @@ import java.util.ArrayList;
 import java.util.List;
 
 import protect.card_locker.async.TaskHandler;
-import protect.card_locker.databinding.ImportExportActivityBinding;
 import protect.card_locker.importexport.DataFormat;
 import protect.card_locker.importexport.ImportExportResult;
-import protect.card_locker.importexport.ImportExportResultType;
 
 public class ImportExportActivity extends CatimaAppCompatActivity {
-    private ImportExportActivityBinding binding;
     private static final String TAG = "Catima";
 
+    private static final int PERMISSIONS_EXTERNAL_STORAGE = 1;
+
     private ImportExportTask importExporter;
 
     private String importAlertTitle;
@@ -54,19 +58,35 @@ public class ImportExportActivity extends CatimaAppCompatActivity {
 
     final private TaskHandler mTasks = new TaskHandler();
 
+    private NotificationManager mNotifyManager;
+    private NotificationCompat.Builder mBuilder;
+
+    private static final int NOTIFICATION_IMPORT = 1;
+    private static final int NOTIFICATION_EXPORT = 2;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        binding = ImportExportActivityBinding.inflate(getLayoutInflater());
         setTitle(R.string.importExport);
-        setContentView(binding.getRoot());
-        Toolbar toolbar = binding.toolbar;
+        setContentView(R.layout.import_export_activity);
+        Toolbar toolbar = findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
-        enableToolbarBackButton();
+        ActionBar actionBar = getSupportActionBar();
+        if (actionBar != null) {
+            actionBar.setDisplayHomeAsUpEnabled(true);
+        }
 
-        Intent fileIntent = getIntent();
-        if (fileIntent != null && fileIntent.getType() != null) {
-            chooseImportType(false, fileIntent.getData());
+        // If the application does not have permissions to external
+        // storage, ask for it now
+
+        if (ContextCompat.checkSelfPermission(ImportExportActivity.this,
+                Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED ||
+                ContextCompat.checkSelfPermission(ImportExportActivity.this,
+                        Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
+            ActivityCompat.requestPermissions(ImportExportActivity.this,
+                    new String[]{Manifest.permission.READ_EXTERNAL_STORAGE,
+                            Manifest.permission.WRITE_EXTERNAL_STORAGE},
+                    PERMISSIONS_EXTERNAL_STORAGE);
         }
 
         // would use ActivityResultContracts.CreateDocument() but mime type cannot be set
@@ -81,21 +101,15 @@ public class ImportExportActivity extends CatimaAppCompatActivity {
                 Log.e(TAG, "Activity returned NULL uri");
                 return;
             }
-            // Running this in a thread prevents Android from throwing a NetworkOnMainThreadException for large files
-            // FIXME: This is still suboptimal, because showing that the export started is delayed until the network request finishes
-            new Thread() {
-                @Override
-                public void run() {
-                    try {
-                        OutputStream writer = getContentResolver().openOutputStream(uri);
-                        Log.d(TAG, "Starting file export with: " + result);
-                        startExport(writer, uri, exportPassword.toCharArray(), true);
-                    } catch (IOException e) {
-                        Log.e(TAG, "Failed to export file: " + result, e);
-                        onExportComplete(new ImportExportResult(ImportExportResultType.GenericFailure, result.toString()), uri);
-                    }
-                }
-            }.start();
+            try {
+                OutputStream writer = getContentResolver().openOutputStream(uri);
+                Log.e(TAG, "Starting file export with: " + result.toString());
+                startExport(writer, uri, exportPassword != null ? exportPassword.toCharArray() : null, true);
+            } catch (IOException e) {
+                Log.e(TAG, "Failed to export file: " + result.toString(), e);
+                onExportComplete(ImportExportResult.GenericFailure, uri);
+            }
+
         });
         fileOpenLauncher = registerForActivityResult(new ActivityResultContracts.GetContent(), result -> {
             if (result == null) {
@@ -124,25 +138,22 @@ public class ImportExportActivity extends CatimaAppCompatActivity {
         intentCreateDocumentAction.setType("application/zip");
         intentCreateDocumentAction.putExtra(Intent.EXTRA_TITLE, "catima.zip");
 
-        Button exportButton = binding.exportButton;
+        Button exportButton = findViewById(R.id.exportButton);
         exportButton.setOnClickListener(v -> {
-            AlertDialog.Builder builder = new MaterialAlertDialogBuilder(ImportExportActivity.this);
+            AlertDialog.Builder builder = new AlertDialog.Builder(ImportExportActivity.this);
             builder.setTitle(R.string.exportPassword);
 
             FrameLayout container = new FrameLayout(ImportExportActivity.this);
-
-            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);
+            FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+            params.leftMargin = 50;
+            params.rightMargin = 50;
 
             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);
 
-            textInputLayout.addView(input);
-            container.addView(textInputLayout);
+            container.addView(input);
             builder.setView(container);
             builder.setPositiveButton(R.string.ok, (dialogInterface, i) -> {
                 exportPassword = input.getText().toString();
@@ -155,42 +166,30 @@ public class ImportExportActivity extends CatimaAppCompatActivity {
             });
             builder.setNegativeButton(R.string.cancel, (dialogInterface, i) -> dialogInterface.cancel());
             builder.show();
+
         });
 
         // Check that there is a file manager available
-        Button importFilesystem = binding.importOptionFilesystemButton;
-        importFilesystem.setOnClickListener(v -> chooseImportType(false, null));
+        Button importFilesystem = findViewById(R.id.importOptionFilesystemButton);
+        importFilesystem.setOnClickListener(v -> chooseImportType(false));
 
         // Check that there is an app that data can be imported from
-        Button importApplication = binding.importOptionApplicationButton;
-        importApplication.setOnClickListener(v -> chooseImportType(true, null));
-
-        // FIXME: The importer/exporter is currently quite broken
-        // To prevent the screen from turning off during import/export and some devices killing Catima as it's no longer foregrounded, force the screen to stay on here
-        getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
+        Button importApplication = findViewById(R.id.importOptionApplicationButton);
+        importApplication.setOnClickListener(v -> chooseImportType(true));
     }
 
     private void openFileForImport(Uri uri, char[] password) {
-        // Running this in a thread prevents Android from throwing a NetworkOnMainThreadException for large files
-        // FIXME: This is still suboptimal, because showing that the import started is delayed until the network request finishes
-        new Thread() {
-            @Override
-            public void run() {
-                try {
-                    InputStream reader = getContentResolver().openInputStream(uri);
-                    Log.d(TAG, "Starting file import with: " + uri);
-                    startImport(reader, uri, importDataFormat, password, true);
-                } catch (IOException e) {
-                    Log.e(TAG, "Failed to import file: " + uri, e);
-                    onImportComplete(new ImportExportResult(ImportExportResultType.GenericFailure, e.toString()), uri, importDataFormat);
-                }
-            }
-        }.start();
+        try {
+            InputStream reader = getContentResolver().openInputStream(uri);
+            Log.e(TAG, "Starting file import with: " + uri.toString());
+            startImport(reader, uri, importDataFormat, password, true);
+        } catch (IOException e) {
+            Log.e(TAG, "Failed to import file: " + uri.toString(), e);
+            onImportComplete(ImportExportResult.GenericFailure, uri, importDataFormat);
+        }
     }
 
-    private void chooseImportType(boolean choosePicker,
-                                  @Nullable Uri fileData) {
-
+    private void chooseImportType(boolean choosePicker) {
         List<CharSequence> betaImportOptions = new ArrayList<>();
         betaImportOptions.add("Fidme");
         betaImportOptions.add("Stocard");
@@ -204,7 +203,7 @@ public class ImportExportActivity extends CatimaAppCompatActivity {
             importOptions.add(importOption);
         }
 
-        AlertDialog.Builder builder = new MaterialAlertDialogBuilder(this);
+        AlertDialog.Builder builder = new AlertDialog.Builder(this);
         builder.setTitle(R.string.chooseImportType)
                 .setItems(importOptions.toArray(new CharSequence[importOptions.size()]), (dialog, which) -> {
                     switch (which) {
@@ -242,12 +241,7 @@ public class ImportExportActivity extends CatimaAppCompatActivity {
                             throw new IllegalArgumentException("Unknown DataFormat");
                     }
 
-                    if (fileData != null) {
-                        openFileForImport(fileData, null);
-                        return;
-                    }
-
-                    new MaterialAlertDialogBuilder(this)
+                    new AlertDialog.Builder(this)
                             .setTitle(importAlertTitle)
                             .setMessage(importAlertMessage)
                             .setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
@@ -272,22 +266,59 @@ public class ImportExportActivity extends CatimaAppCompatActivity {
         builder.show();
     }
 
+    private void startProgressNotification(boolean importing) {
+        mNotifyManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
+        mBuilder = new NotificationCompat.Builder(this, NotificationType.getImportExportChannel(this));
+        mBuilder.setContentTitle(getString(importing ? R.string.importing : R.string.exporting))
+                .setContentText(null)
+                .setSmallIcon(R.drawable.ic_import_export_white_24dp)
+                .setColor(getThemeColor())
+                .setProgress(0, 0, true);
+        mNotifyManager.notify(importing ? NOTIFICATION_IMPORT : NOTIFICATION_EXPORT, mBuilder.build());
+    }
+
+    private void endProgressNotification(boolean importing, ImportExportResult result, PendingIntent sendIntent) {
+        String notificationTitle;
+        String notificationMessage;
+
+        if (result.equals(ImportExportResult.Success)) {
+            notificationTitle = getString(importing ? R.string.importSuccessfulTitle : R.string.exportSuccessfulTitle);
+            notificationMessage = getString(importing ? R.string.importSuccessful : R.string.exportSuccessful);
+        } else {
+            int reason = R.string.unknown_failure;
+            if (result.equals(ImportExportResult.BadPassword)) {
+                reason = R.string.incorrect_password;
+            }
+
+            notificationTitle = getString(importing ? R.string.importFailedTitle : R.string.exportFailedTitle);
+            notificationMessage = String.format(getString(importing ? R.string.importFailed : R.string.exportFailed), getString(reason));
+        }
+
+        mBuilder.setContentTitle(notificationTitle)
+                .setContentText(notificationMessage)
+                .setProgress(0,0, false);
+
+        if (sendIntent != null) {
+            mBuilder.addAction(R.drawable.ic_share, getString(R.string.sendLabel), sendIntent);
+        }
+
+        mNotifyManager.notify(importing ? NOTIFICATION_IMPORT : NOTIFICATION_EXPORT, mBuilder.build());
+    }
+
     private void startImport(final InputStream target, final Uri targetUri, final DataFormat dataFormat, final char[] password, final boolean closeWhenDone) {
         mTasks.flushTaskList(TaskHandler.TYPE.IMPORT, true, false, false);
-        ImportExportTask.TaskCompleteListener listener = new ImportExportTask.TaskCompleteListener() {
-            @Override
-            public void onTaskComplete(ImportExportResult result, DataFormat dataFormat) {
-                onImportComplete(result, targetUri, dataFormat);
-                if (closeWhenDone) {
-                    try {
-                        target.close();
-                    } catch (IOException ioException) {
-                        ioException.printStackTrace();
-                    }
+        ImportExportTask.TaskCompleteListener listener = (result, dataFormat1) -> {
+            onImportComplete(result, targetUri, dataFormat1);
+            if (closeWhenDone) {
+                try {
+                    target.close();
+                } catch (IOException ioException) {
+                    ioException.printStackTrace();
                 }
             }
         };
 
+        startProgressNotification(true);
         importExporter = new ImportExportTask(ImportExportActivity.this,
                 dataFormat, target, password, listener);
         mTasks.executeTask(TaskHandler.TYPE.IMPORT, importExporter);
@@ -295,25 +326,47 @@ public class ImportExportActivity extends CatimaAppCompatActivity {
 
     private void startExport(final OutputStream target, final Uri targetUri, char[] password, final boolean closeWhenDone) {
         mTasks.flushTaskList(TaskHandler.TYPE.EXPORT, true, false, false);
-        ImportExportTask.TaskCompleteListener listener = new ImportExportTask.TaskCompleteListener() {
-            @Override
-            public void onTaskComplete(ImportExportResult result, DataFormat dataFormat) {
-                onExportComplete(result, targetUri);
-                if (closeWhenDone) {
-                    try {
-                        target.close();
-                    } catch (IOException ioException) {
-                        ioException.printStackTrace();
-                    }
+        ImportExportTask.TaskCompleteListener listener = (result, dataFormat) -> {
+            onExportComplete(result, targetUri);
+            if (closeWhenDone) {
+                try {
+                    target.close();
+                } catch (IOException ioException) {
+                    ioException.printStackTrace();
                 }
             }
         };
 
+        startProgressNotification(false);
         importExporter = new ImportExportTask(ImportExportActivity.this,
                 DataFormat.Catima, target, password, listener);
         mTasks.executeTask(TaskHandler.TYPE.EXPORT, importExporter);
     }
 
+    @Override
+    public void onRequestPermissionsResult(int requestCode, String permissions[], int[] grantResults) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+
+        if (requestCode == PERMISSIONS_EXTERNAL_STORAGE) {
+            // If request is cancelled, the result arrays are empty.
+            boolean success = grantResults.length > 0;
+
+            for (int grant : grantResults) {
+                if (grant != PackageManager.PERMISSION_GRANTED) {
+                    success = false;
+                }
+            }
+
+            if (!success) {
+                // External storage permission rejected, inform user that
+                // import/export is prevented
+                Toast.makeText(getApplicationContext(), R.string.noExternalStoragePermissionError,
+                        Toast.LENGTH_LONG).show();
+            }
+
+        }
+    }
+
     @Override
     protected void onDestroy() {
         mTasks.flushTaskList(TaskHandler.TYPE.IMPORT, true, false, false);
@@ -334,24 +387,12 @@ public class ImportExportActivity extends CatimaAppCompatActivity {
     }
 
     private void retryWithPassword(DataFormat dataFormat, Uri uri) {
-        AlertDialog.Builder builder = new MaterialAlertDialogBuilder(this);
+        AlertDialog.Builder builder = new AlertDialog.Builder(this);
         builder.setTitle(R.string.passwordRequired);
 
-        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);
+        final EditText input = new EditText(this);
         input.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD);
-        input.setHint(R.string.exportPasswordHint);
-
-        textInputLayout.addView(input);
-        container.addView(textInputLayout);
-        builder.setView(container);
+        builder.setView(input);
 
         builder.setPositiveButton(R.string.ok, (dialogInterface, i) -> {
             openFileForImport(uri, input.getText().toString().toCharArray());
@@ -361,68 +402,28 @@ public class ImportExportActivity extends CatimaAppCompatActivity {
         builder.show();
     }
 
-    private String buildResultDialogMessage(ImportExportResult result, boolean isImport) {
-        int messageId;
-
-        if (result.resultType() == ImportExportResultType.Success) {
-            messageId = isImport ? R.string.importSuccessful : R.string.exportSuccessful;
-        } else {
-            messageId = isImport ? R.string.importFailed : R.string.exportFailed;
-        }
-
-        StringBuilder messageBuilder = new StringBuilder(getResources().getString(messageId));
-        if (result.developerDetails() != null) {
-            messageBuilder.append("\n\n");
-            messageBuilder.append(getResources().getString(R.string.include_if_asking_support));
-            messageBuilder.append("\n\n");
-            messageBuilder.append(result.developerDetails());
-        }
-
-        return messageBuilder.toString();
-    }
-
     private void onImportComplete(ImportExportResult result, Uri path, DataFormat dataFormat) {
-        ImportExportResultType resultType = result.resultType();
+        endProgressNotification(true, result, null);
 
-        if (resultType == ImportExportResultType.BadPassword) {
+        if (result == ImportExportResult.BadPassword) {
             retryWithPassword(dataFormat, path);
-            return;
         }
-
-        AlertDialog.Builder builder = new MaterialAlertDialogBuilder(this);
-        builder.setTitle(resultType == ImportExportResultType.Success ? R.string.importSuccessfulTitle : R.string.importFailedTitle);
-        builder.setMessage(buildResultDialogMessage(result, true));
-        builder.setNeutralButton(R.string.ok, (dialog, which) -> dialog.dismiss());
-
-        builder.create().show();
     }
 
     private void onExportComplete(ImportExportResult result, final Uri path) {
-        ImportExportResultType resultType = result.resultType();
+        PendingIntent pendingIntent = null;
 
-        AlertDialog.Builder builder = new MaterialAlertDialogBuilder(this);
-        builder.setTitle(resultType == ImportExportResultType.Success ? R.string.exportSuccessfulTitle : R.string.exportFailedTitle);
-        builder.setMessage(buildResultDialogMessage(result, false));
-        builder.setNeutralButton(R.string.ok, (dialog, which) -> dialog.dismiss());
+        if (result == ImportExportResult.Success) {
+            Intent sendIntent = new Intent(Intent.ACTION_SEND);
+            sendIntent.putExtra(Intent.EXTRA_STREAM, path);
+            sendIntent.setType("text/csv");
 
-        if (resultType == ImportExportResultType.Success) {
-            final CharSequence sendLabel = ImportExportActivity.this.getResources().getText(R.string.sendLabel);
+            // set flag to give temporary permission to external app to use the FileProvider
+            sendIntent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
 
-            builder.setPositiveButton(sendLabel, (dialog, which) -> {
-                Intent sendIntent = new Intent(Intent.ACTION_SEND);
-                sendIntent.putExtra(Intent.EXTRA_STREAM, path);
-                sendIntent.setType("text/csv");
-
-                // set flag to give temporary permission to external app to use the FileProvider
-                sendIntent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
-
-                ImportExportActivity.this.startActivity(Intent.createChooser(sendIntent,
-                        sendLabel));
-
-                dialog.dismiss();
-            });
+            pendingIntent = PendingIntent.getActivity(this, NOTIFICATION_EXPORT, sendIntent, PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_IMMUTABLE);
         }
 
-        builder.create().show();
+        endProgressNotification(false, result, pendingIntent);
     }
 }

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

@@ -1,12 +1,11 @@
 package protect.card_locker;
 
 import android.app.Activity;
-import android.app.ProgressDialog;
+import android.app.NotificationManager;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.database.sqlite.SQLiteDatabase;
 import android.util.Log;
-import android.widget.Toast;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -14,25 +13,23 @@ import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.nio.charset.StandardCharsets;
 
+import androidx.core.app.NotificationCompat;
 import protect.card_locker.async.CompatCallable;
 import protect.card_locker.importexport.DataFormat;
 import protect.card_locker.importexport.ImportExportResult;
-import protect.card_locker.importexport.ImportExportResultType;
 import protect.card_locker.importexport.MultiFormatExporter;
 import protect.card_locker.importexport.MultiFormatImporter;
 
 public class ImportExportTask implements CompatCallable<ImportExportResult> {
     private static final String TAG = "Catima";
 
-    private Activity activity;
-    private boolean doImport;
-    private DataFormat format;
+    private final Activity activity;
+    private final boolean doImport;
+    private final DataFormat format;
     private OutputStream outputStream;
     private InputStream inputStream;
-    private char[] password;
-    private TaskCompleteListener listener;
-
-    private ProgressDialog progress;
+    private final char[] password;
+    private final TaskCompleteListener listener;
 
     /**
      * Constructor which will setup a task for exporting to the given file
@@ -63,22 +60,21 @@ public class ImportExportTask implements CompatCallable<ImportExportResult> {
     }
 
     private ImportExportResult performImport(Context context, InputStream stream, SQLiteDatabase database, char[] password) {
-        ImportExportResult importResult = MultiFormatImporter.importData(context, database, stream, format, password);
+        ImportExportResult result = MultiFormatImporter.importData(context, database, stream, format, password);
 
-        Log.i(TAG, "Import result: " + importResult);
+        Log.i(TAG, "Import result: " + result.name());
 
-        return importResult;
+        return result;
     }
 
     private ImportExportResult performExport(Context context, OutputStream stream, SQLiteDatabase database, char[] password) {
-        ImportExportResult result;
+        ImportExportResult result = ImportExportResult.GenericFailure;
 
         try {
             OutputStreamWriter writer = new OutputStreamWriter(stream, StandardCharsets.UTF_8);
             result = MultiFormatExporter.exportData(context, database, stream, format, password);
             writer.close();
         } catch (IOException e) {
-            result = new ImportExportResult(ImportExportResultType.GenericFailure, e.toString());
             Log.e(TAG, "Unable to export file", e);
         }
 
@@ -87,20 +83,6 @@ public class ImportExportTask implements CompatCallable<ImportExportResult> {
         return result;
     }
 
-    public void onPreExecute() {
-        progress = new ProgressDialog(activity);
-        progress.setTitle(doImport ? R.string.importing : R.string.exporting);
-
-        progress.setOnCancelListener(dialog -> cancel());
-        progress.setOnDismissListener(dialog -> cancel());
-
-        progress.show();
-    }
-
-    private void cancel() {
-        ImportExportTask.this.stop();
-    }
-
     protected ImportExportResult doInBackground(Void... nothing) {
         final SQLiteDatabase database = new DBHelper(activity).getWritableDatabase();
         ImportExportResult result;
@@ -117,15 +99,15 @@ public class ImportExportTask implements CompatCallable<ImportExportResult> {
     }
 
     public void onPostExecute(Object castResult) {
-        listener.onTaskComplete((ImportExportResult) castResult, format);
+        ImportExportResult result = (ImportExportResult) castResult;
+
+        listener.onTaskComplete(result, format);
 
-        progress.dismiss();
         Log.i(TAG, (doImport ? "Import" : "Export") + " Complete");
     }
 
-    protected void onCancelled() {
-        progress.dismiss();
-        Log.i(TAG, (doImport ? "Import" : "Export") + " Cancelled");
+    @Override
+    public void onPreExecute() {
     }
 
     protected void stop() {