Fix comment

.github/dependabot.yml

@@ -1,30 +0,0 @@
-version: 2
-updates:
-  - package-ecosystem: "gradle"
-    directory: "/"
-    registries:
-      - google
-      - gradlePluginPortal
-      - jitpack
-      - mavenCentral
-    schedule:
-      interval: "daily"
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    schedule:
-      interval: "weekly"
-
-# Workaround for https://github.com/dependabot/dependabot-core/issues/6888
-registries:
-  google:
-    type: maven-repository
-    url: "https://dl.google.com/dl/android/maven2/"
-  gradlePluginPortal:
-    type: maven-repository
-    url: "https://plugins.gradle.org/m2/"
-  jitpack:
-    type: maven-repository
-    url: "https://jitpack.io/"
-  mavenCentral:
-    type: maven-repository
-    url: "https://repo1.maven.org/maven2/"

.github/workflows/android.yml

@@ -1,72 +1,27 @@
 name: Android CI
+
 on:
-  workflow_dispatch:
   push:
-    branches:
-      - main
-      - staging
-      - trying
+    branches: [ master ]
   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-21-openjdk-amd64
+    branches: [ master ]
+
 jobs:
   build:
+
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        flavor: [Foss, Gplay]
+
     steps:
-      - uses: actions/checkout@v4.2.2
-      - 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 21
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y openjdk-21-jdk-headless
-          sudo update-alternatives --auto java
-      - name: Build
-        run: ./gradlew assemble${{ matrix.flavor }}Release
-      - name: Check lint
-        run: ./gradlew lint${{ matrix.flavor }}Release
-      - name: Run unit tests
-        run: timeout 5m ./gradlew test${{ matrix.flavor }}ReleaseUnitTest || { ./gradlew --stop && timeout 5m ./gradlew test${{ matrix.flavor }}ReleaseUnitTest; }
-      - 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 (API 21)
-        uses: ReactiveCircus/android-emulator-runner@v2
-        with:
-          api-level: 21
-          arch: x86_64
-          script: ./gradlew connected${{ matrix.flavor }}DebugAndroidTest
-      - name: Run instrumented tests (API 35)
-        uses: ReactiveCircus/android-emulator-runner@v2
-        with:
-          api-level: 35
-          arch: x86_64
-          script: ./gradlew connected${{ matrix.flavor }}DebugAndroidTest
-      - name: Archive test results
-        if: always()
-        uses: actions/upload-artifact@v4.6.2
-        with:
-          name: test-results-flavor${{ matrix.flavor }}
-          path: app/build/reports
+    - uses: actions/checkout@v2
+    - name: set up JDK 1.8
+      uses: actions/setup-java@v1
+      with:
+        java-version: 1.8
+    - name: Build
+      run: ./gradlew assembleRelease
+    - name: Check lint
+      run: ./gradlew lintRelease
+    - name: Run unit tests
+      run: ./gradlew testReleaseUnitTest
+    - name: FindBugs
+      run: ./gradlew findbugs

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

@@ -1,42 +0,0 @@
-name: Convert CHANGELOG to Fastlane
-on:
-  workflow_dispatch:
-  push:
-    branches:
-      - main
-    paths:
-      - 'CHANGELOG.md'
-permissions:
-  actions: none
-  checks: none
-  contents: write
-  deployments: none
-  discussions: none
-  id-token: none
-  issues: none
-  packages: none
-  pages: none
-  pull-requests: write
-  repository-projects: none
-  security-events: none
-  statuses: none
-jobs:
-  convert_changelog_to_fastlane:
-    runs-on: ubuntu-latest
-    name: Convert CHANGELOG to Fastlane
-    steps:
-    - name: Checkout repo
-      id: checkout
-      uses: actions/checkout@v4.2.2
-    - name: Setup Python
-      uses: actions/setup-python@v5.6.0
-      with:
-        python-version: '3.x'
-    - name: Run converter script
-      run: python .scripts/changelog_to_fastlane.py
-    - name: Create Pull Request
-      uses: peter-evans/create-pull-request@v7.0.8
-      with:
-        title: "Update Fastlane changelogs"
-        commit-message: "Update Fastlane changelogs"
-        branch-suffix: timestamp

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

@@ -1,40 +0,0 @@
-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'
-    name: Write contributors to file
-    steps:
-    - name: Checkout repo
-      id: checkout
-      uses: actions/checkout@v4.2.2
-    - name: Update contributors
-      id: update_contributors
-      uses: TheLastProject/contributors-to-file-action@v3.2.0
-      with:
-        file_in_repo: app/src/main/res/raw/contributors.txt
-        min_commit_count: 5
-    - name: Create Pull Request
-      uses: peter-evans/create-pull-request@v7.0.8
-      with:
-        title: "Update contributors"
-        commit-message: "Update contributors"
-        branch-suffix: timestamp

.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 inkscape mat2 optipng xvfb
-        # 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.8
-      with:
-        title: "Update feature graphic"
-        commit-message: "Update feature graphic"
-        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.8
-      with:
-        title: "Update locales"
-        commit-message: "Update locales"
-        branch-suffix: timestamp

.gitignore

@@ -1,30 +1,8 @@
-# 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
+/.idea/workspace.xml
+/.idea/libraries
 .DS_Store
 /build
 /captures
-.externalNativeBuild
-.cxx
-#local.properties
-
-# Android extras
-/app/*.log
-/app/build
-/app/release
-/.idea
-
-# Bundle
-/.bundle/
-/vendor/bundle
-/lib/bundler/man/
-
-# Catima-specific
-SHA256SUMS

.scripts/changelog_to_fastlane.py

@@ -1,33 +0,0 @@
-#!/usr/bin/python3
-
-import os
-import re
-
-changelogs = {}
-
-with open('CHANGELOG.md') as changelog:
-    version_code = None
-    text = []
-
-    for line in changelog:
-        if line.startswith("## "):
-            if version_code != None:
-                changelogs[version_code] = text
-
-            text = []
-            match = re.match("## \S* - (\d*).*", line)
-            if not match:
-                raise ValueError(f"Invalid version line: {line}")
-            version_code = match.group(1)
-        elif line:
-            # Turn Markdown [links](to_url) into links (to_url)
-            text.append(re.sub(r'\[(.*?)\]\((.*?)\)', r'\1 (\2)', line))
-
-for version, description in changelogs.items():
-    description = "".join(description).strip()
-
-    if not description:
-        continue
-
-    with open(os.path.join("fastlane", "metadata", "android", "en-US", "changelogs", f"{version}.txt"), "w") as fastlane_file:
-        fastlane_file.write(description)

.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 direction="ltr" 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 direction="ltr" 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,61 +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 ;;
-      fa-IR) sed -i -e 's/svg direction="ltr"/svg direction="rtl"/' -e "s/Yesteryear/Noto Sans Arabic/" -e "s/Lexend Deca/Noto Sans Arabic/" 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 (we use Inkscape because ImageMagick ignores RTL)
-  xvfb-run inkscape --export-filename=images/featureGraphic.png featureGraphic.svg
-  # 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,133 +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",
-    "he": "iw",
-    "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()

.tx/config

@@ -0,0 +1,10 @@
+[main]
+host = https://www.transifex.com
+
+[loyalty-card-locker.stringsxml]
+file_filter = app/src/main/res/values-<lang>/strings.xml
+minimum_perc = 0
+source_file = app/src/main/res/values/strings.xml
+source_lang = en
+type = ANDROID
+

CODE_OF_CONDUCT.md

@@ -1,128 +0,0 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-We as members, contributors, and leaders pledge to make participation in our
-community a harassment-free experience for everyone, regardless of age, body
-size, visible or invisible disability, ethnicity, sex characteristics, gender
-identity and expression, level of experience, education, socio-economic status,
-nationality, personal appearance, race, religion, or sexual identity
-and orientation.
-
-We pledge to act and interact in ways that contribute to an open, welcoming,
-diverse, inclusive, and healthy community.
-
-## Our Standards
-
-Examples of behavior that contributes to a positive environment for our
-community include:
-
-* Demonstrating empathy and kindness toward other people
-* Being respectful of differing opinions, viewpoints, and experiences
-* Giving and gracefully accepting constructive feedback
-* Accepting responsibility and apologizing to those affected by our mistakes,
-  and learning from the experience
-* Focusing on what is best not just for us as individuals, but for the
-  overall community
-
-Examples of unacceptable behavior include:
-
-* The use of sexualized language or imagery, and sexual attention or
-  advances of any kind
-* Trolling, insulting or derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or email
-  address, without their explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
-  professional setting
-
-## Enforcement Responsibilities
-
-Community leaders are responsible for clarifying and enforcing our standards of
-acceptable behavior and will take appropriate and fair corrective action in
-response to any behavior that they deem inappropriate, threatening, offensive,
-or harmful.
-
-Community leaders have the right and responsibility to remove, edit, or reject
-comments, commits, code, wiki edits, issues, and other contributions that are
-not aligned to this Code of Conduct, and will communicate reasons for moderation
-decisions when appropriate.
-
-## Scope
-
-This Code of Conduct applies within all community spaces, and also applies when
-an individual is officially representing the community in public spaces.
-Examples of representing our community include using an official e-mail address,
-posting via an official social media account, or acting as an appointed
-representative at an online or offline event.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported to the community leaders responsible for enforcement at
-catima.g9ex3@hackerchick.me.
-All complaints will be reviewed and investigated promptly and fairly.
-
-All community leaders are obligated to respect the privacy and security of the
-reporter of any incident.
-
-## Enforcement Guidelines
-
-Community leaders will follow these Community Impact Guidelines in determining
-the consequences for any action they deem in violation of this Code of Conduct:
-
-### 1. Correction
-
-**Community Impact**: Use of inappropriate language or other behavior deemed
-unprofessional or unwelcome in the community.
-
-**Consequence**: A private, written warning from community leaders, providing
-clarity around the nature of the violation and an explanation of why the
-behavior was inappropriate. A public apology may be requested.
-
-### 2. Warning
-
-**Community Impact**: A violation through a single incident or series
-of actions.
-
-**Consequence**: A warning with consequences for continued behavior. No
-interaction with the people involved, including unsolicited interaction with
-those enforcing the Code of Conduct, for a specified period of time. This
-includes avoiding interactions in community spaces as well as external channels
-like social media. Violating these terms may lead to a temporary or
-permanent ban.
-
-### 3. Temporary Ban
-
-**Community Impact**: A serious violation of community standards, including
-sustained inappropriate behavior.
-
-**Consequence**: A temporary ban from any sort of interaction or public
-communication with the community for a specified period of time. No public or
-private interaction with the people involved, including unsolicited interaction
-with those enforcing the Code of Conduct, is allowed during this period.
-Violating these terms may lead to a permanent ban.
-
-### 4. Permanent Ban
-
-**Community Impact**: Demonstrating a pattern of violation of community
-standards, including sustained inappropriate behavior,  harassment of an
-individual, or aggression toward or disparagement of classes of individuals.
-
-**Consequence**: A permanent ban from any sort of public interaction within
-the community.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage],
-version 2.0, available at
-https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
-
-Community Impact Guidelines were inspired by [Mozilla's code of conduct
-enforcement ladder](https://github.com/mozilla/diversity).
-
-[homepage]: https://www.contributor-covenant.org
-
-For answers to common questions about this code of conduct, see the FAQ at
-https://www.contributor-covenant.org/faq. Translations are available at
-https://www.contributor-covenant.org/translations.

CONTRIBUTING.md

@@ -1,29 +1,14 @@
-# How to Submit Patches to the Catima Project
+How to Submit Patches to the Loyalty Card Keychain Project
+===============================================================================
+https://github.com/brarcher/budget-watch
 
 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
+Loyalty Card Keychain 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
@@ -36,17 +21,21 @@ These are the Android lint checker, run using:
 
     # ./gradlew lintRelease
 
+and FindBugs, run using:
+
+    # ./gradlew findbugs
+
 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 Loyalty Card Keychain 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
@@ -55,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
+and potentially merged into the main Loyalty Card Keychain repository. The preferred
+way to do this is to submit a Pull Request to the Loyalty Card Keychain project.
+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

@@ -1,8 +0,0 @@
-source "https://rubygems.org"
-
-gem "fastlane"
-
-# https://github.com/fastlane/fastlane/issues/29183
-gem "abbrev"
-gem "mutex_m"
-gem "ostruct"

Gemfile.lock

@@ -1,231 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    CFPropertyList (3.0.7)
-      base64
-      nkf
-      rexml
-    abbrev (0.1.2)
-    addressable (2.8.7)
-      public_suffix (>= 2.0.2, < 7.0)
-    artifactory (3.0.17)
-    atomos (0.1.3)
-    aws-eventstream (1.4.0)
-    aws-partitions (1.1117.0)
-    aws-sdk-core (3.226.0)
-      aws-eventstream (~> 1, >= 1.3.0)
-      aws-partitions (~> 1, >= 1.992.0)
-      aws-sigv4 (~> 1.9)
-      base64
-      jmespath (~> 1, >= 1.6.1)
-      logger
-    aws-sdk-kms (1.105.0)
-      aws-sdk-core (~> 3, >= 3.225.0)
-      aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.189.1)
-      aws-sdk-core (~> 3, >= 3.225.0)
-      aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.5)
-    aws-sigv4 (1.12.1)
-      aws-eventstream (~> 1, >= 1.0.2)
-    babosa (1.0.4)
-    base64 (0.3.0)
-    claide (1.1.0)
-    colored (1.2)
-    colored2 (3.1.2)
-    commander (4.6.0)
-      highline (~> 2.0.0)
-    declarative (0.0.20)
-    digest-crc (0.7.0)
-      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)
-      faraday-em_http (~> 1.0)
-      faraday-em_synchrony (~> 1.0)
-      faraday-excon (~> 1.1)
-      faraday-httpclient (~> 1.0)
-      faraday-multipart (~> 1.0)
-      faraday-net_http (~> 1.0)
-      faraday-net_http_persistent (~> 1.0)
-      faraday-patron (~> 1.0)
-      faraday-rack (~> 1.0)
-      faraday-retry (~> 1.0)
-      ruby2_keywords (>= 0.0.4)
-    faraday-cookie_jar (0.0.7)
-      faraday (>= 0.8.0)
-      http-cookie (~> 1.0.0)
-    faraday-em_http (1.0.0)
-    faraday-em_synchrony (1.0.1)
-    faraday-excon (1.1.0)
-    faraday-httpclient (1.0.1)
-    faraday-multipart (1.1.1)
-      multipart-post (~> 2.0)
-    faraday-net_http (1.0.2)
-    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 (~> 1.0)
-    fastimage (2.4.0)
-    fastlane (2.228.0)
-      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)
-      commander (~> 4.6)
-      dotenv (>= 2.1.1, < 3.0.0)
-      emoji_regex (>= 0.1, < 4.0)
-      excon (>= 0.71.0, < 1.0.0)
-      faraday (~> 1.0)
-      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)
-      naturally (~> 2.2)
-      optparse (>= 0.1.1, < 1.0.0)
-      plist (>= 3.1.0, < 4.0.0)
-      rubyzip (>= 2.0.0, < 3.0.0)
-      security (= 0.1.5)
-      simctl (~> 1.6.3)
-      terminal-notifier (>= 2.0.0, < 3.0.0)
-      terminal-table (~> 3)
-      tty-screen (>= 0.6.3, < 1.0.0)
-      tty-spinner (>= 0.8.0, < 1.0.0)
-      word_wrap (~> 1.0.0)
-      xcodeproj (>= 1.13.0, < 2.0.0)
-      xcpretty (~> 0.4.1)
-      xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
-    fastlane-sirp (1.0.0)
-      sysrandom (~> 1.0)
-    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)
-      addressable (~> 2.5, >= 2.5.1)
-      googleauth (>= 0.16.2, < 2.a)
-      httpclient (>= 2.8.1, < 3.a)
-      mini_mime (~> 1.0)
-      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.8.0)
-      google-cloud-env (>= 1.0, < 3.a)
-      google-cloud-errors (~> 1.0)
-    google-cloud-env (1.6.0)
-      faraday (>= 0.17.3, < 3.0)
-    google-cloud-errors (1.5.0)
-    google-cloud-storage (1.47.0)
-      addressable (~> 2.8)
-      digest-crc (~> 0.4)
-      google-apis-iamcredentials_v1 (~> 0.1)
-      google-apis-storage_v1 (~> 0.31.0)
-      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)
-      jwt (>= 1.4, < 3.0)
-      multi_json (~> 1.11)
-      os (>= 0.9, < 2.0)
-      signet (>= 0.16, < 2.a)
-    highline (2.0.3)
-    http-cookie (1.0.8)
-      domain_name (~> 0.5)
-    httpclient (2.9.0)
-      mutex_m
-    jmespath (1.6.2)
-    json (2.12.2)
-    jwt (2.10.1)
-      base64
-    logger (1.7.0)
-    mini_magick (4.13.2)
-    mini_mime (1.1.5)
-    multi_json (1.15.0)
-    multipart-post (2.4.1)
-    mutex_m (0.3.0)
-    nanaimo (0.4.0)
-    naturally (2.3.0)
-    nkf (0.2.0)
-    optparse (0.6.0)
-    os (1.1.4)
-    ostruct (0.6.1)
-    plist (3.7.2)
-    public_suffix (6.0.2)
-    rake (13.3.0)
-    representable (3.2.0)
-      declarative (< 0.1.0)
-      trailblazer-option (>= 0.1.1, < 0.2.0)
-      uber (< 0.2.0)
-    retriable (3.1.2)
-    rexml (3.4.1)
-    rouge (3.28.0)
-    ruby2_keywords (0.0.5)
-    rubyzip (2.4.1)
-    security (0.1.5)
-    signet (0.20.0)
-      addressable (~> 2.8)
-      faraday (>= 0.17.5, < 3.a)
-      jwt (>= 1.5, < 3.0)
-      multi_json (~> 1.10)
-    simctl (1.6.10)
-      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)
-    tty-cursor (0.7.1)
-    tty-screen (0.8.2)
-    tty-spinner (0.9.3)
-      tty-cursor (~> 0.7)
-    uber (0.1.0)
-    unicode-display_width (2.6.0)
-    word_wrap (1.0.0)
-    xcodeproj (1.27.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.1)
-      rouge (~> 3.28.0)
-    xcpretty-travis-formatter (1.0.1)
-      xcpretty (~> 0.2, >= 0.0.7)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  abbrev
-  fastlane
-  mutex_m
-  ostruct
-
-BUNDLED WITH
-   2.5.22

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/.gitignore

@@ -0,0 +1 @@
+/build

app/build.gradle

@@ -0,0 +1,84 @@
+apply plugin: 'com.android.application'
+apply plugin: 'findbugs'
+
+findbugs {
+    sourceSets = []
+    ignoreFailures = false
+}
+
+android {
+    compileSdkVersion 29
+
+    defaultConfig {
+        applicationId "me.hackerchick.catima"
+        minSdkVersion 16
+        targetSdkVersion 29
+        versionCode 39
+        versionName "0.28"
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+        debug {
+            applicationIdSuffix ".debug"
+        }
+    }
+    lintOptions {
+        disable "GoogleAppIndexingWarning"
+        disable "ButtonStyle"
+        disable "AlwaysShowAction"
+        disable "MissingTranslation"
+        disable "MissingPrefix"
+    }
+    sourceSets {
+        test {
+            resources.srcDirs += ['src/test/resources']
+        }
+    }
+
+    // Starting with Android Studio 3 Robolectric is unable to find resources.
+    // The following allows it to find the resources.
+    testOptions {
+        unitTests {
+            includeAndroidResources = true
+        }
+    }
+}
+
+dependencies {
+    compile fileTree(dir: 'libs', include: ['*.jar'])
+    compile 'androidx.appcompat:appcompat:1.2.0'
+    compile 'com.google.android.material:material:1.2.0-alpha03'
+    compile 'androidx.legacy:legacy-support-v4:1.0.0'
+    compile 'com.journeyapps:zxing-android-embedded:3.5.0@aar'
+    compile 'com.google.zxing:core:3.3.0'
+    compile 'org.apache.commons:commons-csv:1.5'
+    compile 'androidx.constraintlayout:constraintlayout:1.1.3'
+    compile 'com.jaredrummler:colorpicker:1.0.2'
+    compile group: 'com.google.guava', name: 'guava', version: '20.0'
+    compile 'com.github.apl-devs:appintro:v4.2.0'
+    compile "com.vanniktech:vntnumberpickerpreference:1.0.0"
+    testCompile 'junit:junit:4.12'
+    testCompile "org.robolectric:robolectric:4.0.2"
+}
+
+task findbugs(type: FindBugs, dependsOn: 'assembleDebug') {
+
+    description 'Run findbugs'
+    group 'verification'
+
+    classes = fileTree('build/intermediates/javac/debug/compileDebugJavaWithJavac/classes')
+    source = fileTree('src/main/java')
+    classpath = files()
+
+    effort = 'max'
+
+    excludeFilter = file("./config/findbugs/exclude.xml")
+
+    reports {
+        xml.enabled = false
+        html.enabled = true
+    }
+}

app/build.gradle.kts

@@ -1,161 +0,0 @@
-import com.android.build.gradle.internal.tasks.factory.dependsOn
-
-plugins {
-    id("com.android.application")
-    id("org.jetbrains.kotlin.android")
-}
-
-kotlin {
-    jvmToolchain(21)
-}
-
-android {
-    namespace = "protect.card_locker"
-    compileSdk = 35
-
-    defaultConfig {
-        applicationId = "me.hackerchick.catima"
-        minSdk = 21
-        targetSdk = 35
-        versionCode = 150
-        versionName = "2.36.0"
-
-        vectorDrawables.useSupportLibrary = true
-        multiDexEnabled = true
-
-        resourceConfigurations += listOf("ar", "be", "bg", "bn", "bn-rIN", "bs", "cs", "da", "de", "el-rGR", "en", "eo", "es", "es-rAR", "et", "fa", "fi", "fr", "gl", "he-rIL", "hi", "hr", "hu", "in-rID", "is", "it", "ja", "ko", "lt", "lv", "nb-rNO", "nl", "oc", "pl", "pt", "pt-rBR", "pt-rPT", "ro-rRO", "ru", "sk", "sl", "sr", "sv", "ta", "tr", "uk", "vi", "zh-rCN", "zh-rTW")
-
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-
-        buildConfigField("boolean", "showDonate", "true")
-        buildConfigField("boolean", "showRateOnGooglePlay", "false")
-    }
-
-    buildTypes {
-        release {
-            isMinifyEnabled = true
-            proguardFiles(
-                getDefaultProguardFile("proguard-android.txt"),
-                "proguard-rules.pro"
-            )
-        }
-        debug {
-            applicationIdSuffix = ".debug"
-        }
-    }
-
-    buildFeatures {
-        buildConfig = true
-        viewBinding = true
-    }
-
-    flavorDimensions.add("type")
-    productFlavors {
-        create("foss") {
-            dimension = "type"
-            isDefault = true
-        }
-        create("gplay") {
-            dimension = "type"
-
-            // Google doesn't allow donation links
-            buildConfigField("boolean", "showDonate", "false")
-            buildConfigField("boolean", "showRateOnGooglePlay", "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 = "21"
-    }
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_21
-        targetCompatibility = JavaVersion.VERSION_21
-    }
-}
-
-dependencies {
-    // AndroidX
-    implementation("androidx.appcompat:appcompat:1.7.1")
-    implementation("androidx.constraintlayout:constraintlayout:2.2.1")
-    implementation("androidx.core:core-ktx:1.16.0")
-    implementation("androidx.core:core-remoteviews:1.1.0")
-    implementation("androidx.core:core-splashscreen:1.0.1")
-    implementation("androidx.exifinterface:exifinterface:1.4.1")
-    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.5")
-
-    // 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")
-
-    // Testing
-    val androidXTestVersion = "1.7.0"
-    val junitVersion = "4.13.2"
-    testImplementation("androidx.test:core:$androidXTestVersion")
-    testImplementation("junit:junit:$junitVersion")
-    testImplementation("org.robolectric:robolectric:4.15.1")
-
-    androidTestImplementation("androidx.test:core:$androidXTestVersion")
-    androidTestImplementation("junit:junit:$junitVersion")
-    androidTestImplementation("androidx.test.ext:junit:1.3.0")
-    androidTestImplementation("androidx.test:runner:$androidXTestVersion")
-    androidTestImplementation("androidx.test.uiautomator:uiautomator:2.3.0")
-    androidTestImplementation("androidx.test.espresso:espresso-core:3.7.0")
-}
-
-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/findbugs/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/ApplicationTest.java

@@ -0,0 +1,15 @@
+package protect.card_locker;
+
+import android.app.Application;
+import android.test.ApplicationTestCase;
+
+/**
+ * <a href="http://d.android.com/tools/testing/testing_android.html">Testing Fundamentals</a>
+ */
+public class ApplicationTest extends ApplicationTestCase<Application>
+{
+    public ApplicationTest()
+    {
+        super(Application.class);
+    }
+}

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,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="app_name">Catima Fehlersuche</string>
-</resources>

app/src/debug/res/values-bg/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-bn-rIN/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-bn/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-bs/strings.xml

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

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

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="app_name">Debugar Catima</string>
-</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 Ladění</string>
-</resources>

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

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

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

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="app_name">Catima Fejlfinding</string>
-</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,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="app_name">Catima Depuración</string>
-</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-fa/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-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,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="app_name">Catima Villuleit</string>
-</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,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="app_name">Catimaデバーグ</string>
-</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,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="app_name">Catima Feelerkorrektur</string>
-</resources>

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

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="app_name">Catima Klaidų Taisymas</string>
-</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,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="app_name">കാറ്റിമ ഡീബഗ്</string>
-</resources>

app/src/debug/res/values-mr/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-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,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="app_name">Catima Correcion d\'Errors</string>
-</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,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="app_name">Catima Odpravljanje Napak</string>
-</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-ta/strings.xml

@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources></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 Ayıklama</string>
-</resources>

app/src/debug/res/values-tzm/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-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">
+<manifest package="protect.card_locker"
+          xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <permission
-        android:description="@string/permissionReadCardsDescription"
-        android:icon="@drawable/ic_launcher_foreground"
-        android:label="@string/permissionReadCardsLabel"
-        android:name="${applicationId}.READ_CARDS"
-        android:protectionLevel="dangerous" />
-
-    <uses-sdk tools:overrideLibrary="com.google.zxing.client.android" />
-
-    <uses-permission android:name="android.permission.CAMERA" />
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" android:maxSdkVersion="23" />
+    <uses-permission
+        android:name="android.permission.CAMERA"/>
+    <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,199 +19,92 @@
     <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">
-        
-        <receiver
-            android:name=".ListWidget"
-            android:label="@string/card_list_widget_name"
-            android:exported="false">
-            <intent-filter>
-                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
-            </intent-filter>
-
-            <meta-data
-                android:name="android.appwidget.provider"
-                android:resource="@xml/list_widget_info" />
-         </receiver>
-
+        android:theme="@style/AppTheme">
         <activity
-            android:name=".MainActivity"
-            android:exported="true"
-            android:theme="@style/Theme.App.Starting">
+            android:name="protect.card_locker.MainActivity"
+            android:label="@string/app_name"
+            android:theme="@style/AppTheme.NoActionBar">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
+                <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" />
-                <data android:mimeType="application/vnd-com.apple.pkpass" />
-                <data android:mimeType="application/vnd.espass-espass" />
-            </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" />
-                <data android:mimeType="application/vnd-com.apple.pkpass" />
-                <data android:mimeType="application/vnd.espass-espass" />
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity
-            android:name=".AboutActivity"
-            android:label="@string/about"
-            android:theme="@style/AppTheme.NoActionBar" />
-        <activity
-            android:name=".ManageGroupsActivity"
-            android:label="@string/groups"
-            android:theme="@style/AppTheme.NoActionBar" />
-        <activity
-            android:name=".ManageGroupActivity"
-            android:label="@string/group_edit"
-            android:theme="@style/AppTheme.NoActionBar"
-            android:windowSoftInputMode="adjustResize"/>
         <activity
             android:name=".LoyaltyCardViewActivity"
-            android:exported="true"
-            android:theme="@style/AppTheme.NoActionBar" />
+            android:theme="@style/AppTheme.NoActionBar"
+            android:label=""
+            android:windowSoftInputMode="stateHidden"
+            android:exported="true"/>
         <activity
             android:name=".LoyaltyCardEditActivity"
-            android:exported="true"
             android:theme="@style/AppTheme.NoActionBar"
-            android:windowSoftInputMode="adjustResize">
-            <intent-filter
-                android:autoVerify="true"
-                android:label="@string/app_name">
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-                <!-- Main card sharing URIs -->
-                <data android:scheme="http" />
-                <data android:scheme="https" />
-                <data
-                    android:host="@string/intent_import_card_from_url_host_catima_app"
-                    android:pathPrefix="@string/intent_import_card_from_url_path_prefix_catima_app" />
-            </intent-filter>
+            android:configChanges="orientation|screenSize"
+            android:windowSoftInputMode="stateHidden"
+            android:exported="true">
             <intent-filter android:label="@string/app_name">
                 <action android:name="android.intent.action.VIEW" />
-
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
-                <!-- Old card sharing URIs -->
-                <data android:scheme="http" />
-                <data android:scheme="https" />
-                <data
-                    android:host="@string/intent_import_card_from_url_host_thelastproject"
-                    android:pathPrefix="@string/intent_import_card_from_url_path_prefix_thelastproject" />
-                <data
-                    android:host="@string/intent_import_card_from_url_host_brarcher"
-                    android:pathPrefix="@string/intent_import_card_from_url_path_prefix_brarcher" />
+                <!-- Accepts URIs that begin with "https://thelastproject.github.io/Catima/share" or "https://brarcher.github.io/loyalty-card-locker/share” -->
+                <data android:scheme="https"
+                    android:host="@string/intent_import_card_from_url_host"
+                    android:pathPrefix="@string/intent_import_card_from_url_path_prefix" />
+                <data android:scheme="https"
+                    android:host="@string/intent_import_card_from_url_host_old"
+                    android:pathPrefix="@string/intent_import_card_from_url_path_prefix_old" />
+            </intent-filter>
+            <intent-filter android:label="@string/app_name">
+                <action android:name="android.intent.action.VIEW"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <!-- Accept pkpass files -->
+                <data android:scheme="content" android:mimeType="application/octet-stream"/>
+                <data android:scheme="content" android:mimeType="application/x-compressed"/>
+                <data android:scheme="content" android:mimeType="application/x-zip-compressed"/>
+                <data android:scheme="content" android:mimeType="application/zip"/>
+                <data android:scheme="content" android:mimeType="application/vnd.apple.pkpass"/>
+                <data android:scheme="content" android:mimeType="application/pkpass"/>
+                <data android:scheme="content" android:mimeType="application/vndapplepkpass"/>
+                <data android:scheme="content" android:mimeType="application/vnd-com.apple.pkpass"/>
             </intent-filter>
         </activity>
-        <activity
-            android:name=".ScanActivity"
-            android:label="@string/scanCardBarcode"
-            android:theme="@style/AppTheme.NoActionBar" />
         <activity
             android:name=".BarcodeSelectorActivity"
             android:label="@string/selectBarcodeTitle"
-            android:theme="@style/AppTheme.NoActionBar" />
+            android:theme="@style/AppTheme.NoActionBar"
+            android:configChanges="orientation|screenSize"
+            android:windowSoftInputMode="stateHidden"/>
         <activity
             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 -->
+            android:configChanges="orientation|screenSize"/>
         <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:configChanges="orientation|screenSize"
+            android:theme="@style/AppTheme.NoActionBar"/>
         <activity
             android:name=".CardShortcutConfigure"
-            android:exported="true"
             android:label="@string/cardShortcut"
+            android:configChanges="orientation|screenSize"
             android:theme="@style/AppTheme.NoActionBar">
             <intent-filter>
-                <action android:name="android.intent.action.CREATE_SHORTCUT" />
-
-                <category android:name="android.intent.category.DEFAULT" />
+                <action android:name="android.intent.action.CREATE_SHORTCUT"/>
+                <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
         </activity>
-
-        <activity
-            android:name=".UCropWrapper"
-            android:theme="@style/AppTheme.NoActionBar" />
-
-        <provider
-            android:name=".contentprovider.CardsContentProvider"
-            android:authorities="${applicationId}.contentprovider.cards"
-            android:exported="true"
-            android:readPermission="${applicationId}.READ_CARDS"/>
-
         <provider
             android:name="androidx.core.content.FileProvider"
-            android:authorities="${applicationId}"
+            android:grantUriPermissions="true"
             android:exported="false"
-            android:grantUriPermissions="true">
+            android:authorities="${applicationId}">
             <meta-data
                 android:name="android.support.FILE_PROVIDER_PATHS"
-                android:resource="@xml/file_provider_paths" />
+                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">
-            <intent-filter>
-                <action android:name="android.service.controls.ControlsProviderService" />
-            </intent-filter>
-        </service>
     </application>
+
 </manifest>

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

@@ -1,149 +0,0 @@
-package protect.card_locker
-
-import android.os.Bundle
-import android.text.Spanned
-import android.view.MenuItem
-import android.view.View
-import android.widget.ScrollView
-import android.widget.TextView
-
-import androidx.annotation.StringRes
-import androidx.core.view.isVisible
-
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
-
-import protect.card_locker.databinding.AboutActivityBinding
-
-class AboutActivity : CatimaAppCompatActivity() {
-    private companion object {
-        private const val TAG = "Catima"
-    }
-
-    private lateinit var binding: AboutActivityBinding
-    private lateinit var content: AboutContent
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        binding = AboutActivityBinding.inflate(layoutInflater)
-        content = AboutContent(this)
-        title = content.pageTitle
-        setContentView(binding.root)
-        setSupportActionBar(binding.toolbar)
-        enableToolbarBackButton()
-
-        binding.apply {
-            creditsSub.text = content.copyrightShort
-            versionHistorySub.text = content.versionHistory
-
-            versionHistory.tag = "https://catima.app/changelog/"
-            translate.tag = "https://hosted.weblate.org/engage/catima/"
-            license.tag = "https://github.com/CatimaLoyalty/Android/blob/main/LICENSE"
-            repo.tag = "https://github.com/CatimaLoyalty/Android/"
-            privacy.tag = "https://catima.app/privacy-policy/"
-            reportError.tag = "https://github.com/CatimaLoyalty/Android/issues"
-            rate.tag = "https://play.google.com/store/apps/details?id=me.hackerchick.catima"
-            donate.tag = "https://catima.app/donate"
-
-            // Hide Google Play rate button if not on Google Play
-            rate.isVisible = BuildConfig.showRateOnGooglePlay
-            // Hide donate button on Google Play (Google Play doesn't allow donation links)
-            donate.isVisible = BuildConfig.showDonate
-        }
-
-        bindClickListeners()
-    }
-
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        return when (item.itemId) {
-            android.R.id.home -> {
-                finish()
-                true
-            }
-
-            else -> super.onOptionsItemSelected(item)
-        }
-    }
-
-    override fun onDestroy() {
-        super.onDestroy()
-        content.destroy()
-        clearClickListeners()
-    }
-
-    private fun bindClickListeners() {
-        binding.apply {
-            versionHistory.setOnClickListener { showHistory(it) }
-            translate.setOnClickListener { openExternalBrowser(it) }
-            license.setOnClickListener { showLicense(it) }
-            repo.setOnClickListener { openExternalBrowser(it) }
-            privacy.setOnClickListener { showPrivacy(it) }
-            reportError.setOnClickListener { openExternalBrowser(it) }
-            rate.setOnClickListener { openExternalBrowser(it) }
-            donate.setOnClickListener { openExternalBrowser(it) }
-            credits.setOnClickListener { showCredits() }
-        }
-    }
-
-    private fun clearClickListeners() {
-        binding.apply {
-            versionHistory.setOnClickListener(null)
-            translate.setOnClickListener(null)
-            license.setOnClickListener(null)
-            repo.setOnClickListener(null)
-            privacy.setOnClickListener(null)
-            reportError.setOnClickListener(null)
-            rate.setOnClickListener(null)
-            donate.setOnClickListener(null)
-            credits.setOnClickListener(null)
-        }
-    }
-
-    private fun showCredits() {
-        showHTML(R.string.credits, content.contributorInfo, null)
-    }
-
-    private fun showHistory(view: View) {
-        showHTML(R.string.version_history, content.historyInfo, view)
-    }
-
-    private fun showLicense(view: View) {
-        showHTML(R.string.license, content.licenseInfo, view)
-    }
-
-    private fun showPrivacy(view: View) {
-        showHTML(R.string.privacy_policy, content.privacyInfo, view)
-    }
-
-    private fun showHTML(@StringRes title: Int, text: Spanned, view: View?) {
-        val dialogContentPadding = resources.getDimensionPixelSize(R.dimen.alert_dialog_content_padding)
-        val textView = TextView(this).apply {
-            setText(text)
-            Utils.makeTextViewLinksClickable(this, text)
-        }
-
-        val scrollView = ScrollView(this).apply {
-            addView(textView)
-            setPadding(dialogContentPadding, dialogContentPadding / 2, dialogContentPadding, 0)
-        }
-
-        MaterialAlertDialogBuilder(this).apply {
-            setTitle(title)
-            setView(scrollView)
-            setPositiveButton(R.string.ok, null)
-
-            // Add View online button if an URL is linked to this view
-            view?.tag?.let {
-                setNeutralButton(R.string.view_online) { _, _ -> openExternalBrowser(view) }
-            }
-
-            show()
-        }
-    }
-
-    private fun openExternalBrowser(view: View) {
-        val tag = view.tag
-        if (tag is String && tag.startsWith("https://")) {
-            OpenWebLinkHandler().openBrowser(this, 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

@@ -1,35 +1,28 @@
 package protect.card_locker;
 
-import android.content.Context;
 import android.graphics.Bitmap;
-import android.graphics.Color;
-import android.graphics.PorterDuff;
+import android.os.AsyncTask;
 import android.util.Log;
-import android.util.TypedValue;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import com.google.zxing.BarcodeFormat;
 import com.google.zxing.MultiFormatWriter;
 import com.google.zxing.WriterException;
 import com.google.zxing.common.BitMatrix;
 
 import java.lang.ref.WeakReference;
 
-import protect.card_locker.async.CompatCallable;
-
 /**
  * This task will generate a barcode and load it into an ImageView.
  * Only a weak reference of the ImageView is kept, so this class will not
  * prevent the ImageView from being garbage collected.
  */
-public class BarcodeImageWriterTask implements CompatCallable<Bitmap> {
+class BarcodeImageWriterTask extends AsyncTask<Void, Void, Bitmap>
+{
     private static final String TAG = "Catima";
 
-    private static final int IS_VALID = 999;
-    private final Context mContext;
-    private boolean isSuccesful;
-
     // When drawn in a smaller window 1D barcodes for some reason end up
     // squished, whereas 2D barcodes look fine.
     private static final int MAX_WIDTH_1D = 1500;
@@ -37,25 +30,14 @@ public class BarcodeImageWriterTask implements CompatCallable<Bitmap> {
 
     private final WeakReference<ImageView> imageViewReference;
     private final WeakReference<TextView> textViewReference;
-    private String cardId;
-    private final CatimaBarcode format;
+    private final String cardId;
+    private final BarcodeFormat 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;
-
-    BarcodeImageWriterTask(
-            Context context, ImageView imageView, String cardIdString,
-            CatimaBarcode barcodeFormat, TextView textView,
-            boolean showFallback, BarcodeImageWriterResultCallback callback, boolean roundCornerPadding, boolean isFullscreen
-    ) {
-        mContext = context;
-
-        isSuccesful = true;
-        this.callback = callback;
 
+    BarcodeImageWriterTask(ImageView imageView, String cardIdString,
+                           BarcodeFormat barcodeFormat, TextView textView)
+    {
         // Use a WeakReference to ensure the ImageView can be garbage collected
         imageViewReference = new WeakReference<>(imageView);
         textViewReference = new WeakReference<>(textView);
@@ -63,55 +45,39 @@ 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 && !isFullscreen) {
-            imageHeight = imageViewHeight;
-            imageWidth = imageViewWidth;
-        } else {
-            // Scale down the image to reduce the memory needed to produce it
-            imageWidth = Math.min(MAX_WIDTH, this.mContext.getResources().getDisplayMetrics().widthPixels);
-            double ratio = (double) imageWidth / (double) imageViewWidth;
-            imageHeight = (int) (imageViewHeight * ratio);
+        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)imageView.getWidth();
+            imageHeight = (int)(imageView.getHeight() * ratio);
         }
-
-        this.showFallback = showFallback;
     }
 
-    private int getMaxWidth(CatimaBarcode format) {
-        switch (format.format()) {
+    BarcodeImageWriterTask(ImageView imageView, String cardIdString, BarcodeFormat barcodeFormat)
+    {
+        this(imageView, cardIdString, barcodeFormat, null);
+    }
+
+    private int getMaxWidth(BarcodeFormat format)
+    {
+        switch(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:
@@ -130,53 +96,23 @@ public class BarcodeImageWriterTask implements CompatCallable<Bitmap> {
         }
     }
 
-    private String getFallbackString(CatimaBarcode format) {
-        switch (format.format()) {
-            // 2D barcodes
-            case AZTEC:
-                return "AZTEC";
-            case DATA_MATRIX:
-                return "DATA_MATRIX";
-            case PDF_417:
-                return "PDF_417";
-            case QR_CODE:
-                return "QR_CODE";
-
-            // 1D barcodes:
-            case CODABAR:
-                return "C0C";
-            case CODE_39:
-                return "CODE_39";
-            case CODE_93:
-                return "CODE_93";
-            case CODE_128:
-                return "CODE_128";
-            case EAN_8:
-                return "32123456";
-            case EAN_13:
-                return "5901234123457";
-            case ITF:
-                return "1003";
-            case UPC_A:
-                return "123456789012";
-            case UPC_E:
-                return "0123456";
-            default:
-                throw new IllegalArgumentException("No fallback known for this barcode type");
-        }
-    }
-
-    private Bitmap generate() {
-        if (cardId.isEmpty()) {
+    public Bitmap doInBackground(Void... params)
+    {
+        if (cardId.isEmpty())
+        {
             return null;
         }
 
         MultiFormatWriter writer = new MultiFormatWriter();
         BitMatrix bitMatrix;
-        try {
-            try {
-                bitMatrix = writer.encode(cardId, format.format(), imageWidth, imageHeight, null);
-            } catch (Exception e) {
+        try
+        {
+            try
+            {
+                bitMatrix = writer.encode(cardId, format, imageWidth, imageHeight, null);
+            }
+            catch(Exception e)
+            {
                 // Cast a wider net here and catch any exception, as there are some
                 // cases where an encoder may fail if the data is invalid for the
                 // barcode type. If this happens, we want to fail gracefully.
@@ -191,9 +127,11 @@ public class BarcodeImageWriterTask implements CompatCallable<Bitmap> {
 
             int[] pixels = new int[bitMatrixWidth * bitMatrixHeight];
 
-            for (int y = 0; y < bitMatrixHeight; y++) {
+            for (int y = 0; y < bitMatrixHeight; y++)
+            {
                 int offset = y * bitMatrixWidth;
-                for (int x = 0; x < bitMatrixWidth; x++) {
+                for (int x = 0; x < bitMatrixWidth; x++)
+                {
                     int color = bitMatrix.get(x, y) ? BLACK : WHITE;
                     pixels[offset + x] = color;
                 }
@@ -213,108 +151,57 @@ public class BarcodeImageWriterTask implements CompatCallable<Bitmap> {
             int widthScale = imageWidth / bitMatrixHeight;
             int scalingFactor = Math.min(heightScale, widthScale);
 
-            if (scalingFactor > 1) {
+            if(scalingFactor > 1)
+            {
                 bitmap = Bitmap.createScaledBitmap(bitmap, bitMatrixWidth * scalingFactor, bitMatrixHeight * scalingFactor, false);
             }
 
             return bitmap;
-        } catch (WriterException e) {
+        }
+        catch (WriterException e)
+        {
             Log.e(TAG, "Failed to generate barcode of type " + format + ": " + cardId, e);
-        } catch (OutOfMemoryError e) {
+        }
+        catch(OutOfMemoryError e)
+        {
             Log.w(TAG, "Insufficient memory to render barcode, "
-                    + imageWidth + "x" + imageHeight + ", " + format.name()
-                    + ", length=" + cardId.length(), e);
+                + imageWidth + "x" + imageHeight + ", " + format.name()
+                + ", length=" + cardId.length(), e);
         }
 
         return null;
     }
 
-    public Bitmap doInBackground(Void... params) {
-        // Only do the hard tasks if we've not already been cancelled
-        if (!Thread.currentThread().isInterrupted()) {
-            Bitmap bitmap = generate();
-
-            if (bitmap == null) {
-                isSuccesful = false;
-
-                if (showFallback && !Thread.currentThread().isInterrupted()) {
-                    Log.i(TAG, "Barcode generation failed, generating fallback...");
-                    cardId = getFallbackString(format);
-                    bitmap = generate();
-                    return bitmap;
-                }
-            } else {
-                return bitmap;
-            }
-        }
-
-        // We've been interrupted - create a empty fallback
-        Bitmap.Config config = Bitmap.Config.ARGB_8888;
-        return Bitmap.createBitmap(imageWidth, imageHeight, config);
-    }
-
-    public void onPostExecute(Object castResult) {
-        Bitmap result = (Bitmap) castResult;
-
+    protected void onPostExecute(Bitmap result)
+    {
         Log.i(TAG, "Finished generating barcode image of type " + format + ": " + cardId);
         ImageView imageView = imageViewReference.get();
-        if (imageView == null) {
+        if(imageView == null)
+        {
             // The ImageView no longer exists, nothing to do
             return;
         }
 
-        String formatPrettyName = format.prettyName();
-
-        imageView.setTag(isSuccesful);
-
         imageView.setImageBitmap(result);
-        imageView.setContentDescription(mContext.getString(R.string.barcodeImageDescriptionWithType, formatPrettyName));
         TextView textView = textViewReference.get();
 
-        if (result != null) {
+        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) {
-                imageView.setColorFilter(null);
-            } else {
-                imageView.setColorFilter(Color.LTGRAY, PorterDuff.Mode.LIGHTEN);
-            }
-
             if (textView != null) {
                 textView.setVisibility(View.VISIBLE);
-                textView.setText(formatPrettyName);
+                textView.setText(format.name());
             }
-        } else {
+        }
+        else
+        {
             Log.i(TAG, "Barcode generation failed, removing image from display");
             imageView.setVisibility(View.GONE);
             if (textView != null) {
                 textView.setVisibility(View.GONE);
             }
         }
-
-        if (callback != null) {
-            callback.onBarcodeImageWriterResult(isSuccesful);
-        }
-    }
-
-    @Override
-    public void onPreExecute() {
-        // No Action
-    }
-
-    /**
-     * Provided to comply with Callable while keeping the original Syntax of AsyncTask
-     *
-     * @return generated Bitmap
-     */
-    @Override
-    public Bitmap call() {
-        return doInBackground();
     }
 }

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

@@ -0,0 +1,231 @@
+package protect.card_locker;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.AsyncTask;
+import android.os.Build;
+import android.os.Bundle;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+import android.text.Editable;
+import android.text.TextWatcher;
+import android.util.Log;
+import android.util.Pair;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewTreeObserver;
+import android.widget.EditText;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.google.common.collect.ImmutableMap;
+import com.google.zxing.BarcodeFormat;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.Map;
+
+/**
+ * This activity is callable and will allow a user to enter
+ * barcode data and generate all barcodes possible for
+ * the data. The user may then select any barcode, where its
+ * data and type will be returned to the caller.
+ */
+public class BarcodeSelectorActivity extends AppCompatActivity
+{
+    private static final String TAG = "Catima";
+
+    // Result this activity will return
+    public static final String BARCODE_CONTENTS = "contents";
+    public static final String BARCODE_FORMAT = "format";
+
+    // These are all the barcode types that the zxing library
+    // is able to generate a barcode for, and thus should be
+    // the only barcodes which we should attempt to scan.
+    public static final Collection<String> SUPPORTED_BARCODE_TYPES = Collections.unmodifiableList(
+        Arrays.asList(
+                BarcodeFormat.AZTEC.name(),
+                BarcodeFormat.CODE_39.name(),
+                BarcodeFormat.CODE_128.name(),
+                BarcodeFormat.CODABAR.name(),
+                BarcodeFormat.DATA_MATRIX.name(),
+                BarcodeFormat.EAN_8.name(),
+                BarcodeFormat.EAN_13.name(),
+                BarcodeFormat.ITF.name(),
+                BarcodeFormat.PDF_417.name(),
+                BarcodeFormat.QR_CODE.name(),
+                BarcodeFormat.UPC_A.name()
+        ));
+
+    private Map<String, Pair<Integer, Integer>> barcodeViewMap;
+    private LinkedList<AsyncTask> barcodeGeneratorTasks = new LinkedList<>();
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState)
+    {
+        super.onCreate(savedInstanceState);
+
+        setContentView(R.layout.barcode_selector_activity);
+        Toolbar toolbar = findViewById(R.id.toolbar);
+        setSupportActionBar(toolbar);
+        ActionBar actionBar = getSupportActionBar();
+        if(actionBar != null)
+        {
+            actionBar.setDisplayHomeAsUpEnabled(true);
+        }
+
+        barcodeViewMap = ImmutableMap.<String, Pair<Integer, Integer>>builder()
+                .put(BarcodeFormat.AZTEC.name(), new Pair<>(R.id.aztecBarcode, R.id.aztecBarcodeText))
+                .put(BarcodeFormat.CODE_39.name(), new Pair<>(R.id.code39Barcode, R.id.code39BarcodeText))
+                .put(BarcodeFormat.CODE_128.name(), new Pair<>(R.id.code128Barcode, R.id.code128BarcodeText))
+                .put(BarcodeFormat.CODABAR.name(), new Pair<>(R.id.codabarBarcode, R.id.codabarBarcodeText))
+                .put(BarcodeFormat.DATA_MATRIX.name(), new Pair<>(R.id.datamatrixBarcode, R.id.datamatrixBarcodeText))
+                .put(BarcodeFormat.EAN_8.name(), new Pair<>(R.id.ean8Barcode, R.id.ean8BarcodeText))
+                .put(BarcodeFormat.EAN_13.name(), new Pair<>(R.id.ean13Barcode, R.id.ean13BarcodeText))
+                .put(BarcodeFormat.ITF.name(), new Pair<>(R.id.itfBarcode, R.id.itfBarcodeText))
+                .put(BarcodeFormat.PDF_417.name(), new Pair<>(R.id.pdf417Barcode, R.id.pdf417BarcodeText))
+                .put(BarcodeFormat.QR_CODE.name(), new Pair<>(R.id.qrcodeBarcode, R.id.qrcodeBarcodeText))
+                .put(BarcodeFormat.UPC_A.name(), new Pair<>(R.id.upcaBarcode, R.id.upcaBarcodeText))
+                .build();
+
+        EditText cardId = findViewById(R.id.cardId);
+        cardId.addTextChangedListener(new TextWatcher()
+        {
+            @Override
+            public void beforeTextChanged(CharSequence s, int start, int count, int after)
+            {
+                // Noting to do
+            }
+
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count)
+            {
+                Log.d(TAG, "Entered text: " + s);
+
+                // Stop any async tasks which may not have been started yet
+                for(AsyncTask task : barcodeGeneratorTasks)
+                {
+                    task.cancel(false);
+                }
+                barcodeGeneratorTasks.clear();
+
+                // Update barcodes
+                for(String key : barcodeViewMap.keySet())
+                {
+                    ImageView image = findViewById(barcodeViewMap.get(key).first);
+                    TextView text = findViewById(barcodeViewMap.get(key).second);
+                    createBarcodeOption(image, key, s.toString(), text);
+                }
+
+                View noBarcodeButtonView = findViewById(R.id.noBarcode);
+                setButtonListener(noBarcodeButtonView, s.toString());
+                noBarcodeButtonView.setEnabled(s.length() > 0);
+            }
+
+            @Override
+            public void afterTextChanged(Editable s)
+            {
+                // Noting to do
+            }
+        });
+
+        final Bundle b = getIntent().getExtras();
+        final String initialCardId = b != null ? b.getString("initialCardId") : null;
+
+        if(initialCardId != null)
+        {
+            cardId.setText(initialCardId);
+        }
+    }
+
+    private void setButtonListener(final View button, final String cardId)
+    {
+        button.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View 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();
+            }
+        });
+    }
+
+    private void createBarcodeOption(final ImageView image, final String formatType, final String cardId, final TextView text)
+    {
+        final BarcodeFormat format = BarcodeFormat.valueOf(formatType);
+        if(format == null)
+        {
+            Log.w(TAG, "Unsupported barcode format: " + formatType);
+            return;
+        }
+
+        image.setImageBitmap(null);
+        image.setOnClickListener(new View.OnClickListener()
+        {
+            @Override
+            public void onClick(View v)
+            {
+                Log.d(TAG, "Selected barcode type " + formatType);
+                Intent result = new Intent();
+                result.putExtra(BARCODE_FORMAT, formatType);
+                result.putExtra(BARCODE_CONTENTS, cardId);
+                BarcodeSelectorActivity.this.setResult(RESULT_OK, result);
+                finish();
+            }
+        });
+
+        if(image.getHeight() == 0)
+        {
+            // The size of the ImageView is not yet available as it has not
+            // yet been drawn. Wait for it to be drawn so the size is available.
+            image.getViewTreeObserver().addOnGlobalLayoutListener(
+                new ViewTreeObserver.OnGlobalLayoutListener()
+                {
+                    @Override
+                    public void onGlobalLayout()
+                    {
+                        Log.d(TAG, "Global layout finished, type: + " + formatType + ", width: " + image.getWidth());
+                        if (Build.VERSION.SDK_INT < 16)
+                        {
+                            image.getViewTreeObserver().removeGlobalOnLayoutListener(this);
+                        }
+                        else
+                        {
+                            image.getViewTreeObserver().removeOnGlobalLayoutListener(this);
+                        }
+
+                        Log.d(TAG, "Generating barcode for type " + formatType);
+                        BarcodeImageWriterTask task = new BarcodeImageWriterTask(image, cardId, format, text);
+                        barcodeGeneratorTasks.add(task);
+                        task.execute();
+                    }
+                });
+        }
+        else
+        {
+            Log.d(TAG, "Generating barcode for type " + formatType);
+            BarcodeImageWriterTask task = new BarcodeImageWriterTask(image, cardId, format, text);
+            barcodeGeneratorTasks.add(task);
+            task.execute();
+        }
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item)
+    {
+        if (item.getItemId() == android.R.id.home)
+        {
+            setResult(Activity.RESULT_CANCELED);
+            finish();
+            return true;
+        }
+
+        return super.onOptionsItemSelected(item);
+    }
+}

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

@@ -1,118 +0,0 @@
-package protect.card_locker
-
-import android.content.Intent
-import android.os.Bundle
-import android.util.Log
-import android.view.Menu
-import android.view.MenuInflater
-import android.view.MenuItem
-import android.view.View
-import android.widget.Toast
-import androidx.core.view.MenuProvider
-import androidx.core.widget.doOnTextChanged
-import androidx.lifecycle.lifecycleScope
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.launch
-import protect.card_locker.BarcodeSelectorAdapter.BarcodeSelectorListener
-import protect.card_locker.databinding.BarcodeSelectorActivityBinding
-
-/**
- * This activity is callable and will allow a user to enter
- * barcode data and generate all barcodes possible for
- * the data. The user may then select any barcode, where its
- * data and type will be returned to the caller.
- */
-class BarcodeSelectorActivity : CatimaAppCompatActivity(), BarcodeSelectorListener, MenuProvider {
-    
-    private lateinit var binding: BarcodeSelectorActivityBinding
-    private lateinit var mAdapter: BarcodeSelectorAdapter
-    
-    companion object {
-        private const val TAG = "Catima"
-        
-        // Result this activity will return
-        const val BARCODE_CONTENTS = "contents"
-        const val BARCODE_FORMAT = "format"
-        
-        const val INPUT_DELAY = 250L
-    }
-    
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        addMenuProvider(this)
-        binding = BarcodeSelectorActivityBinding.inflate(layoutInflater)
-        setTitle(R.string.selectBarcodeTitle)
-        setContentView(binding.getRoot())
-        Utils.applyWindowInsets(binding.getRoot())
-        setSupportActionBar(binding.toolbar)
-        enableToolbarBackButton()
-        
-        var typingDelayJob: Job? = null
-        val cardId = binding.cardId
-        val mBarcodeList = binding.barcodes
-        mAdapter = BarcodeSelectorAdapter(this, ArrayList<CatimaBarcodeWithValue?>(), this)
-        mBarcodeList.adapter = mAdapter
-        
-        cardId.doOnTextChanged { s, _, _, _ ->
-            typingDelayJob?.cancel()
-            typingDelayJob =
-                lifecycleScope.launch {
-                    delay(INPUT_DELAY) // Delay the input processing so we avoid overload
-                    Log.d(TAG, "Entered text: $s")
-                    generateBarcodes(s.toString())
-                }
-        }
-        
-        val initialCardId = intent.extras?.getString(LoyaltyCard.BUNDLE_LOYALTY_CARD_CARD_ID)
-        
-        initialCardId?.let {
-            cardId.setText(initialCardId)
-        } ?: generateBarcodes("")
-        
-    }
-    
-    private fun generateBarcodes(value: String?) {
-        // Update barcodes
-        val barcodes = ArrayList<CatimaBarcodeWithValue?>()
-        CatimaBarcode.barcodeFormats.forEach {
-            val catimaBarcode = CatimaBarcode.fromBarcode(it)
-            barcodes.add(CatimaBarcodeWithValue(catimaBarcode, value))
-        }
-        mAdapter.setBarcodes(barcodes)
-    }
-    
-    override fun onCreateMenu(menu: Menu, menuInflater: MenuInflater) {}
-    
-    override fun onMenuItemSelected(menuItem: MenuItem): Boolean {
-        if (menuItem.itemId == android.R.id.home) {
-            setResult(RESULT_CANCELED)
-            finish()
-        }
-        
-        return true
-    }
-    
-    override fun onRowClicked(inputPosition: Int, view: View) {
-        val barcodeWithValue = mAdapter.getItem(inputPosition)
-        val catimaBarcode = barcodeWithValue!!.catimaBarcode()
-        
-        if (!mAdapter.isValid(view)) {
-            Toast.makeText(this, getString(R.string.wrongValueForBarcodeType), Toast.LENGTH_LONG).show()
-            return
-        }
-        
-        val barcodeFormat = catimaBarcode.format().name
-        val value = barcodeWithValue.value()
-        
-        Log.d(TAG, "Selected barcode type $barcodeFormat")
-        
-        Intent().apply {
-            putExtra(BARCODE_FORMAT, barcodeFormat)
-            putExtra(BARCODE_CONTENTS, value)
-            setResult(RESULT_OK, this)
-        }
-        finish()
-    }
-    
-}

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

@@ -1,105 +0,0 @@
-package protect.card_locker;
-
-import android.content.Context;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.ViewTreeObserver;
-import android.widget.ArrayAdapter;
-import android.widget.ImageView;
-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";
-
-    private final TaskHandler mTasks = new TaskHandler();
-    private final BarcodeSelectorListener mListener;
-
-    private static class ViewHolder {
-        ImageView image;
-        TextView text;
-    }
-
-    public interface BarcodeSelectorListener {
-        void onRowClicked(int inputPosition, View view);
-    }
-
-    public BarcodeSelectorAdapter(Context context, ArrayList<CatimaBarcodeWithValue> barcodes, BarcodeSelectorListener barcodeSelectorListener) {
-        super(context, 0, barcodes);
-        mListener = barcodeSelectorListener;
-    }
-
-    public void setBarcodes(ArrayList<CatimaBarcodeWithValue> barcodes) {
-        clear();
-        addAll(barcodes);
-        notifyDataSetChanged();
-        mTasks.flushTaskList(TaskHandler.TYPE.BARCODE, true, false, false);
-    }
-
-    @Override
-    public View getView(int position, View convertView, ViewGroup parent) {
-        CatimaBarcodeWithValue catimaBarcodeWithValue = getItem(position);
-        CatimaBarcode catimaBarcode = catimaBarcodeWithValue.catimaBarcode();
-        String value = catimaBarcodeWithValue.value();
-
-        ViewHolder viewHolder;
-        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.setTag(viewHolder);
-        } else {
-            viewHolder = (ViewHolder) convertView.getTag();
-        }
-
-        createBarcodeOption(viewHolder.image, catimaBarcode.format().name(), value, viewHolder.text);
-
-        View finalConvertView = convertView;
-        convertView.setOnClickListener(view -> mListener.onRowClicked(position, finalConvertView));
-
-        return convertView;
-    }
-
-    public boolean isValid(View view) {
-        ViewHolder viewHolder = (ViewHolder) view.getTag();
-        return viewHolder.image.getTag() != null && (boolean) viewHolder.image.getTag();
-    }
-
-    private void createBarcodeOption(final ImageView image, final String formatType, final String cardId, final TextView text) {
-        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
-            // yet been drawn. Wait for it to be drawn so the size is available.
-            image.getViewTreeObserver().addOnGlobalLayoutListener(
-                    new ViewTreeObserver.OnGlobalLayoutListener() {
-                        @Override
-                        public void onGlobalLayout() {
-                            Log.d(TAG, "Global layout finished, type: + " + formatType + ", width: " + image.getWidth());
-                            image.getViewTreeObserver().removeOnGlobalLayoutListener(this);
-
-                            Log.d(TAG, "Generating barcode for type " + formatType);
-
-                            BarcodeImageWriterTask barcodeWriter = new BarcodeImageWriterTask(getContext(), image, cardId, format, text, true, null, true, false);
-                            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, false);
-            mTasks.executeTask(TaskHandler.TYPE.BARCODE, barcodeWriter);
-        }
-    }
-}

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

@@ -1,76 +0,0 @@
-package protect.card_locker;
-
-import android.database.Cursor;
-
-import androidx.recyclerview.widget.RecyclerView;
-
-public abstract class BaseCursorAdapter<V extends RecyclerView.ViewHolder> extends RecyclerView.Adapter<V> {
-    public Cursor mCursor;
-    private boolean mDataValid;
-    private int mRowIDColumn;
-
-    private String mRowIDColumnName;
-
-    public BaseCursorAdapter(Cursor inputCursor, String rowIDColumnName) {
-        setHasStableIds(true);
-
-        mRowIDColumnName = rowIDColumnName;
-
-        swapCursor(inputCursor);
-    }
-
-    public abstract void onBindViewHolder(V inputHolder, Cursor inputCursor);
-
-    @Override
-    public void onBindViewHolder(V inputHolder, int inputPosition) {
-        if (!mDataValid) {
-            throw new IllegalStateException("Cannot bind view holder when cursor is in invalid state.");
-        }
-
-        if (!mCursor.moveToPosition(inputPosition)) {
-            throw new IllegalStateException("Could not move cursor to position " + inputPosition + " when trying to bind view holder");
-        }
-
-        onBindViewHolder(inputHolder, mCursor);
-    }
-
-    @Override
-    public int getItemCount() {
-        if (mDataValid) {
-            return mCursor.getCount();
-        } else {
-            return 0;
-        }
-    }
-
-    @Override
-    public long getItemId(int inputPosition) {
-        if (!mDataValid) {
-            throw new IllegalStateException("Cannot lookup item id when cursor is in invalid state.");
-        }
-
-        if (!mCursor.moveToPosition(inputPosition)) {
-            throw new IllegalStateException("Could not move cursor to position " + inputPosition + " when trying to get an item id");
-        }
-
-        return mCursor.getLong(mRowIDColumn);
-    }
-
-    public void swapCursor(Cursor inputCursor) {
-        if (inputCursor == mCursor) {
-            return;
-        }
-
-        if (inputCursor != null) {
-            mCursor = inputCursor;
-            mRowIDColumn = mCursor.getColumnIndex(mRowIDColumnName);
-            mDataValid = true;
-            notifyDataSetChanged();
-        } else {
-            notifyItemRangeRemoved(0, getItemCount());
-            mCursor = null;
-            mRowIDColumn = -1;
-            mDataValid = false;
-        }
-    }
-}

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

@@ -0,0 +1,83 @@
+package protect.card_locker;
+
+import android.content.Intent;
+import android.database.Cursor;
+import android.os.Bundle;
+import android.os.Parcelable;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+import android.util.Log;
+import android.view.View;
+import android.widget.AdapterView;
+import android.widget.ListView;
+import android.widget.Toast;
+
+/**
+ * The configuration screen for creating a shortcut.
+ */
+public class CardShortcutConfigure extends AppCompatActivity
+{
+    static final String TAG = "Catima";
+
+    @Override
+    public void onCreate(Bundle bundle)
+    {
+        super.onCreate(bundle);
+
+        // Set the result to CANCELED.  This will cause nothing to happen if the
+        // aback button is pressed.
+        setResult(RESULT_CANCELED);
+
+        setContentView(R.layout.main_activity);
+        Toolbar toolbar = findViewById(R.id.toolbar);
+        toolbar.setVisibility(View.GONE);
+
+        final DBHelper db = new DBHelper(this);
+
+        // If there are no cards, bail
+        if(db.getLoyaltyCardCount() == 0)
+        {
+            Toast.makeText(this, R.string.noCardsMessage, Toast.LENGTH_LONG).show();
+            finish();
+        }
+
+        final ListView cardList = findViewById(R.id.list);
+        cardList.setVisibility(View.VISIBLE);
+
+        Cursor cardCursor = db.getLoyaltyCardCursor();
+
+        final LoyaltyCardCursorAdapter adapter = new LoyaltyCardCursorAdapter(this, cardCursor);
+        cardList.setAdapter(adapter);
+
+        cardList.setOnItemClickListener(new AdapterView.OnItemClickListener()
+        {
+            @Override
+            public void onItemClick(AdapterView<?> parent, View view, int position, long id)
+            {
+                Cursor selected = (Cursor) parent.getItemAtPosition(position);
+                LoyaltyCard loyaltyCard = LoyaltyCard.toLoyaltyCard(selected);
+
+                Log.d(TAG, "Creating shortcut for card " + loyaltyCard.store + "," + loyaltyCard.id);
+
+                Intent shortcutIntent = new Intent(CardShortcutConfigure.this, LoyaltyCardViewActivity.class);
+                shortcutIntent.setAction(Intent.ACTION_MAIN);
+                // Prevent instances of the view activity from piling up; if one exists let this
+                // one replace it.
+                shortcutIntent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
+                Bundle bundle = new Bundle();
+                bundle.putInt("id", loyaltyCard.id);
+                bundle.putBoolean("view", true);
+                shortcutIntent.putExtras(bundle);
+
+                Parcelable icon = Intent.ShortcutIconResource.fromContext(CardShortcutConfigure.this, R.mipmap.ic_launcher);
+                Intent intent = new Intent();
+                intent.putExtra(Intent.EXTRA_SHORTCUT_INTENT, shortcutIntent);
+                intent.putExtra(Intent.EXTRA_SHORTCUT_NAME, loyaltyCard.store);
+                intent.putExtra(Intent.EXTRA_SHORTCUT_ICON_RESOURCE, icon);
+                setResult(RESULT_OK, intent);
+
+                finish();
+            }
+        });
+    }
+}

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

@@ -1,96 +0,0 @@
-package protect.card_locker
-
-import android.database.sqlite.SQLiteDatabase
-import android.os.Bundle
-import android.util.Log
-import android.view.Menu
-import android.view.MenuInflater
-import android.view.MenuItem
-import android.widget.Toast
-import androidx.core.content.pm.ShortcutManagerCompat
-import androidx.core.view.MenuProvider
-import androidx.recyclerview.widget.GridLayoutManager
-import protect.card_locker.LoyaltyCardCursorAdapter.CardAdapterListener
-import protect.card_locker.databinding.CardShortcutConfigureActivityBinding
-import protect.card_locker.preferences.Settings
-
-class CardShortcutConfigure : CatimaAppCompatActivity(), CardAdapterListener, MenuProvider {
-    
-    private lateinit var binding: CardShortcutConfigureActivityBinding
-    private lateinit var mDatabase: SQLiteDatabase
-    private lateinit var mAdapter: LoyaltyCardCursorAdapter
-    
-    private companion object {
-        private const val TAG: String = "Catima"
-    }
-    
-    public override fun onCreate(savedInstanceBundle: Bundle?) {
-        super.onCreate(savedInstanceBundle)
-        addMenuProvider(this)
-        binding = CardShortcutConfigureActivityBinding.inflate(layoutInflater)
-        mDatabase = DBHelper(this).readableDatabase
-        
-        // Set the result to CANCELED.
-        // This will cause nothing to happen if the back button is pressed.
-        setResult(RESULT_CANCELED)
-        
-        setContentView(binding.getRoot())
-        Utils.applyWindowInsets(binding.getRoot())
-        
-        binding.toolbar.apply {
-            setTitle(R.string.shortcutSelectCard)
-            setSupportActionBar(this)
-        }
-        
-        // If there are no cards, bail
-        if (DBHelper.getLoyaltyCardCount(mDatabase) == 0) {
-            Toast.makeText(this, R.string.noCardsMessage, Toast.LENGTH_LONG).show()
-            finish()
-        }
-        
-        val cardCursor = DBHelper.getLoyaltyCardCursor(mDatabase, DBHelper.LoyaltyCardArchiveFilter.All)
-        mAdapter = LoyaltyCardCursorAdapter(this, cardCursor, this, null)
-        binding.list.setAdapter(mAdapter)
-    }
-    
-    override fun onResume() {
-        super.onResume()
-        
-        val layoutManager = binding.list.layoutManager as GridLayoutManager?
-        layoutManager?.setSpanCount(Settings(this).getPreferredColumnCount())
-    }
-    
-    private fun onClickAction(position: Int) {
-        val selected = DBHelper.getLoyaltyCardCursor(mDatabase, DBHelper.LoyaltyCardArchiveFilter.All)
-        selected.moveToPosition(position)
-        val loyaltyCard = LoyaltyCard.fromCursor(this, selected)
-        
-        Log.d(TAG, "Creating shortcut for card ${loyaltyCard.store}, ${loyaltyCard.id}")
-        
-        val shortcut = ShortcutHelper.createShortcutBuilder(this, loyaltyCard).build()
-        
-        setResult(RESULT_OK,
-                  ShortcutManagerCompat.createShortcutResultIntent(this, shortcut))
-        
-        finish()
-    }
-    
-    override fun onCreateMenu(inputMenu: Menu, menuInflater: MenuInflater) {
-        menuInflater.inflate(R.menu.card_details_menu, inputMenu)
-    }
-    
-    override fun onMenuItemSelected(menuItem: MenuItem): Boolean {
-        if (menuItem.itemId == R.id.action_display_options) {
-            mAdapter.showDisplayOptionsDialog()
-        }
-        return true
-    }
-    
-    override fun onRowClicked(inputPosition: Int) {
-        onClickAction(inputPosition)
-    }
-    
-    override fun onRowLongClicked(inputPosition: Int) {
-        // do nothing
-    }
-}