Update feature graphic

- Noto Sans Kannada font size increased to 125 (it should still fit)

.github/dependabot.yml

@@ -9,15 +9,10 @@ updates:
       - mavenCentral
     schedule:
       interval: "daily"
-    cooldown:
-      default-days: 7
-  
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
       interval: "weekly"
-    cooldown:
-      default-days: 7
 
 # Workaround for https://github.com/dependabot/dependabot-core/issues/6888
 registries:

.github/workflows/android.yml

@@ -32,8 +32,10 @@ jobs:
       matrix:
         flavor: [Foss, Gplay]
     steps:
-      - uses: actions/checkout@v6
-      - uses: gradle/actions/wrapper-validation@v5
+      - uses: actions/checkout@v5.0.0
+      - 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
@@ -64,7 +66,7 @@ jobs:
           script: ./gradlew connected${{ matrix.flavor }}DebugAndroidTest
       - name: Archive test results
         if: always()
-        uses: actions/upload-artifact@v5.0.0
+        uses: actions/upload-artifact@v4.6.2
         with:
           name: test-results-flavor${{ matrix.flavor }}
           path: app/build/reports

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

@@ -1,5 +1,4 @@
 name: Convert CHANGELOG to Fastlane
-
 on:
   workflow_dispatch:
   push:
@@ -7,11 +6,20 @@ on:
       - 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
@@ -19,15 +27,15 @@ jobs:
     steps:
     - name: Checkout repo
       id: checkout
-      uses: actions/checkout@v6
+      uses: actions/checkout@v5.0.0
     - name: Setup Python
-      uses: actions/setup-python@v6.1.0
+      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.11
+      uses: peter-evans/create-pull-request@v7.0.8
       with:
         title: "Update Fastlane changelogs"
         commit-message: "Update Fastlane changelogs"

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

@@ -1,14 +1,22 @@
 name: Write contributors to file
-
 on:
   workflow_dispatch:
   schedule:
     - cron: '3 4 * * 0'
-
 permissions:
+  actions: none
+  checks: none
   contents: write
+  deployments: none
+  discussions: none
+  id-token: none
+  issues: none
+  packages: none
+  pages: none
   pull-requests: write
-
+  repository-projects: none
+  security-events: none
+  statuses: none
 jobs:
   contributors_to_file:
     runs-on: ubuntu-latest
@@ -17,7 +25,7 @@ jobs:
     steps:
     - name: Checkout repo
       id: checkout
-      uses: actions/checkout@v6
+      uses: actions/checkout@v5.0.0
     - name: Update contributors
       id: update_contributors
       uses: TheLastProject/contributors-to-file-action@v3.2.0
@@ -25,7 +33,7 @@ jobs:
         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.11
+      uses: peter-evans/create-pull-request@v7.0.8
       with:
         title: "Update contributors"
         commit-message: "Update contributors"

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

@@ -1,5 +1,4 @@
 name: Generate feature graphic
-
 on:
   workflow_dispatch:
   push:
@@ -8,16 +7,25 @@ on:
     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@v6
+    - uses: actions/checkout@v5.0.0
     - name: Install requirements
       run: |
         sudo apt-get update
@@ -31,7 +39,7 @@ jobs:
     - 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.11
+      uses: peter-evans/create-pull-request@v7.0.8
       with:
         title: "Update feature graphic"
         commit-message: "Update feature graphic"

.github/workflows/i18n-check.yml

@@ -1,34 +0,0 @@
-name: i18n check
-on:
-  workflow_dispatch:
-  push:
-    branches:
-      - main
-      - staging
-      - trying
-  pull_request:
-    branches:
-      - main
-permissions:
-  actions: none
-  checks: none
-  contents: read
-  deployments: none
-  discussions: none
-  id-token: none
-  issues: none
-  packages: none
-  pages: none
-  pull-requests: none
-  repository-projects: none
-  security-events: none
-  statuses: none
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v6
-      - 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
-      - name: Check app_name consistency
-        run: bash .scripts/check_app_name.sh

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

@@ -1,19 +0,0 @@
-name: Update Gradle Wrapper
-
-on:
-  schedule:
-    - cron: "0 0 * * *"
-
-permissions:
-  contents: write
-  pull-requests: write
-
-jobs:
-  update-gradle-wrapper:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v6
-
-      - name: Update Gradle Wrapper
-        uses: gradle-update/update-gradle-wrapper-action@v2

.github/workflows/update-locales.yml

@@ -1,5 +1,4 @@
 name: Update locales
-
 on:
   workflow_dispatch:
   push:
@@ -8,22 +7,31 @@ on:
     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@v6
+    - uses: actions/checkout@v5.0.0
     - 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.11
+      uses: peter-evans/create-pull-request@v7.0.8
       with:
         title: "Update locales"
         commit-message: "Update locales"

.scripts/check_app_name.sh

@@ -1,71 +0,0 @@
-#!/bin/bash
-
-set -e
-shopt -s lastpipe   # Run last command in a pipeline in the current shell.
-
-# Colors
-LIGHTCYAN='\033[1;36m'
-GREEN='\033[0;32m'
-RED='\033[0;31m'
-NC='\033[0m'    # No Color
-
-# Vars
-SUCCESS=1
-CANONICAL_TITLE="Catima"
-ALLOWLIST=("ar" "bn" "fa" "fa-IR" "he-IL" "hi" "hi-IN" "kn" "kn-IN" "ml" "mr" "ta" "ta-IN" "zh-rTW" "zh-TW")  # TODO: Link values and fastlane with different codes together
-
-function get_lang() {
-    LANG_DIRNAME=$(dirname "$FILE" | xargs basename)
-    LANG=${LANG_DIRNAME#values-}    # Fetch lang name
-    LANG=${LANG#values}             # Handle "app/src/main/res/values"
-    LANG=${LANG:-en}                # Default to en
-}
-
-# FIXME: This function should use its own variables and return a success/fail status, instead of working on global variables
-function check() {
-    # FIXME: This allows inconsistency between values and fastlane if the app name is not Catima
-    # When the app name is not Catima, it should still check if title.txt and strings.xml use the same app name (or start)
-    if echo "${ALLOWLIST[*]}" | grep -w -q "${LANG}" || [[ -z ${APP_NAME} ]]; then
-        return 0
-    fi
-
-    if [[ ${FILE} == *"title.txt" ]]; then
-        if [[ ! ${APP_NAME} =~ ^${CANONICAL_TITLE} ]]; then
-            echo -e "${RED}Error: ${LIGHTCYAN}title in $FILE ($LANG) is ${RED}'$APP_NAME'${LIGHTCYAN}, expected to start with ${GREEN}'$CANONICAL_TITLE'. ${NC}"
-            SUCCESS=0
-        fi
-    else
-        if [[ ${APP_NAME} != "${CANONICAL_TITLE}" ]]; then
-            echo -e "${RED}Error: ${LIGHTCYAN}app_name in $FILE ($LANG) is ${RED}'$APP_NAME'${LIGHTCYAN}, expected ${GREEN}'$CANONICAL_TITLE'. ${NC}"
-            SUCCESS=0
-        fi
-    fi
-}
-
-# FIXME: This checks all title.txt and strings.xml files separately, but it needs to check if the title.txt and strings.xml match for a language as well
-echo -e "${LIGHTCYAN}Checking title.txt's. ${NC}"
-
-find fastlane/metadata/android/* -maxdepth 1 -type f -name "title.txt" | while read -r FILE; do
-    APP_NAME=$(head -n 1 "$FILE")
-
-    get_lang
-    check
-done
-
-echo -e "${LIGHTCYAN}Checking string.xml's. ${NC}"
-
-find app/src/main/res/values* -maxdepth 1 -type f -name "strings.xml" | while read -r FILE; do
-    # FIXME: This only checks app_name, but there are more strings with Catima inside it
-    # It should check the original English text for all strings that contain Catima and ensure they use the correct app_name for consistency
-    APP_NAME=$(grep -oP '<string name="app_name">\K[^<]+' "$FILE" | head -n1)
-
-    get_lang
-    check
-done
-
-if [[ $SUCCESS -eq 1 ]]; then
-    echo -e "\n${GREEN}Success!! All app_name values match the canonical title. ${NC}"
-else
-    echo -e "\n${RED}Unsuccessful!! Some app_name values did not match the canonical titles. ${NC}"
-    exit 1
-fi

.scripts/dump_stocard_stores.py

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

.scripts/generate_feature_graphic/featureGraphic.svg

@@ -1,8 +1,8 @@
 <svg width="1024" height="500" viewBox="0 0 1024 500" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g clip-path="url(#clip0_78_203)">
 <path d="M1024 0H0V500H1024V0Z" fill="#1F4262"/>
-<text fill="white" xml:space="preserve" style="white-space: pre" font-family="Lexend" font-size="35" letter-spacing="0em"><tspan x="481" y="325">Loyalty Card Wallet</tspan></text>
-<text fill="white" xml:space="preserve" style="white-space: pre" font-family="Lobster" font-size="150" letter-spacing="0em"><tspan x="469" y="270">Catima</tspan></text>
+<text fill="white" xml:space="preserve" style="white-space: pre" font-family="Lexend" font-size="35" letter-spacing="0em"><tspan x="481" y="325.125">Loyalty Card Wallet</tspan></text>
+<text fill="white" xml:space="preserve" style="white-space: pre" font-family="Lobster" font-size="150" letter-spacing="0em"><tspan x="469" y="270.25">Catima</tspan></text>
 <g filter="url(#filter0_d_78_203)">
 <path d="M218 156.307L308.21 123.473C316.514 120.45 325.696 124.732 328.718 133.035L339.663 163.106L234.417 201.412L218 156.307Z" fill="#F5A3A3"/>
 <path d="M310.263 129.111C315.452 127.222 321.191 129.898 323.08 135.088L331.972 159.52L238.003 193.722L225.69 159.893L310.263 129.111Z" stroke="#E82E2E" stroke-width="12"/>

.scripts/generate_feature_graphic/generate_feature_graphic.sh

@@ -36,19 +36,16 @@ for lang in "$script_location/../../fastlane/metadata/android/"*; do
     # (Lobster and Lexend have limited language support)
     case "$(basename "$lang")" in
       bg|el-GR|ru-RU|uk) sed -i "s/Lexend/Noto Sans/" featureGraphic.svg ;;
-      ar|fa-IR) sed -i -e 's/svg direction="ltr"/svg direction="rtl"/' -e "s/Lobster/Noto Sans Arabic/" -e "s/Lexend/Noto Sans Arabic/" featureGraphic.svg ;;
-      he-IL) sed -i -e "s/Lobster/Noto Sans Hebrew/" -e "s/Lexend/Noto Sans Hebrew/" featureGraphic.svg ;;
+      fa-IR) sed -i -e 's/svg direction="ltr"/svg direction="rtl"/' -e "s/Lobster/Noto Sans Arabic/" -e "s/Lexend/Noto Sans Arabic/" featureGraphic.svg ;;
       hi-IN) sed -i -e "s/Lobster/Noto Sans Devanagari/" -e "s/Lexend/Noto Sans Devanagari/" featureGraphic.svg ;;
       ja-JP) sed -i "s/Lexend/Noto Sans CJK JP/" featureGraphic.svg ;;
-      kn-IN) sed -i -e 's/font-size="150"/font-size="125"/' -e 's/\(<tspan x="469" \)y="270"/\1y="240"/' -e "s/Lobster/Noto Sans Kannada/" -e "s/Lexend/Noto Sans Kannada/" featureGraphic.svg ;;
+      kn-IN) sed -i -e 's/font-size="150"/font-size="125"/' -e "s/Lobster/Noto Sans Kannada/" featureGraphic.svg ;;
       ko) sed -i "s/Lexend/Noto Sans CJK KR/" featureGraphic.svg ;;
-      ta-IN) sed -i -e 's/font-size="150"/font-size="125"/' -e 's/\(<tspan x="469" \)y="270"/\1y="240"/' featureGraphic.svg ;;
       zh-CN) sed -i "s/Lexend/Noto Sans CJK SC/" featureGraphic.svg ;;
       zh-TW) sed -i -e "s/Lobster/Noto Sans CJK TC/" -e "s/Lexend/Noto Sans CJK TC/" featureGraphic.svg ;;
       *) ;;
     esac
   fi
-
   # Ensure images directory exists
   mkdir -p images
   # Generate .png (we use Inkscape because ImageMagick ignores RTL)

CHANGELOG.md

@@ -1,40 +1,5 @@
 # Changelog
 
-## Unreleased - 157
-
-- Add duplicate option to main screen and reorder options slightly
-
-## v2.40.0 - 156 (2025-12-08)
-
-- Copy card ID to clipboard from view dialog or long press
-- Swap balance and currency fields to hopefully reduce unintended rounding
-
-## v2.39.2 - 155 (2025-11-04)
-
-- Preparations for future improvements (rewrote many classes to Kotlin)
-
-## v2.39.1 - 154 (2025-10-01)
-
-- Fix possible crash that could occur for cards missing colour information in the database
-
-## v2.39.0 - 153 (2025-09-30)
-
-- Target Android 16
-- Fix possible crash after removing image from card
-- Remove "Screen orientation" feature (Google removed the ability for apps to control screen rotation when targeting Android 16)
-- Add crash reporter to FOSS build (not used in Google Play version, only in other app stores)
-
-## v2.38.0 - 152 (2025-09-12)
-
-- Add support for .pkpasses files
-- Remove Stocard importer (Stocard no longer exists)
-- Temporarily disable widget images below Android 12L (workaround for a crash issue)
-
-## v2.37.0 - 151 (2025-08-22)
-
-- New redesign of the Catima logo
-- Translation updates
-
 ## v2.36.0 - 150 (2025-08-05)
 
 - Add a widget showing all non-archived cards

CONTRIBUTING.md

@@ -23,30 +23,6 @@ for good reason.
 
 ## Code Changes
 
-Note: submitting LLM ("AI") generated code is strongly discouraged, as such
-code is often (subtly) incorrect or overcomplicated (for example: unnecessarily
-pulling in extra libraries for functionality already covered by existing
-libraries). It also often makes unrelated changes that increase the risk of
-introducing new issues and complicates reviewing. Even when it doesn't do any
-of the before mentioned things, it will often not fit the coding style and flow
-of existing code, requiring excessive refactoring.
-
-While we cannot ever control or be sure if LLMs were used to generate the
-submitted code, it is your responsibility to ensure that whatever code you
-submit is correct and fits within the design of existing code. It is never
-acceptable to defend a change by stating a LLM suggested it.
-
-This is a personal plea more than anything: please understand that writing code
-is the easy part. The hard part is making sure the code fits the design of the
-rest of the application and is maintainable. Reviewing is a very time-consuming
-task for this reason. Please do not use LLMs to quickly generate a "fix" and
-moving the cost of labor to me as a reviewer. If you do use LLMs to generate
-part of your code, please be open about this, explain what was generated how
-and how you confirmed and refactored the code to fit the project and minimized
-risk.
-
-Please never submit LLM-generated code as-is.
-
 ### Test Your Code
 
 There are four possible tests you can run to verify your code.  The first

PRIVACY.md

@@ -1,5 +1,5 @@
 **Last updated**  
-September 30 2025
+August 30 2023
 
 # Privacy Policy
 Catima does not collect or transmit any personal information.
@@ -11,12 +11,6 @@ To ensure correct app functionality, we require access to the following:
 
 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.
 
-## Crash reporting privacy
-
-In the FOSS version of Catima (the version used on IzzyOnDroid, F-Droid and GitHub), the open source crash reporter ACRA is used for crash reporting. When a crash is detected, Catima will ask the user if they are willing to report the crash. If they choose to do so, the user's mail client is opened so they can review the data that would be sent. Crash reporting data is only sent when the user explicitly chooses to do so, it is **never** sent automatically. Crash reporting data is only used to solve crashes and no (potentially) sensitive information is ever shared. Users who do not want to be asked to report crashes can disable the "Ask to send crash reports" setting in Catima settings.
-
-For the Google Play version of Catima, crash reporting is [managed by Google](https://support.google.com/googleplay/android-developer/answer/9859174?hl=en). Users can opt in or out of crash reporting through the Google app under the "Usage and diagnostics" setting.
-
 # 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.
 

app/build.gradle.kts

@@ -1,9 +1,8 @@
 import com.android.build.gradle.internal.tasks.factory.dependsOn
 
 plugins {
-    alias(libs.plugins.com.android.application)
-    alias(libs.plugins.org.jetbrains.kotlin.android)
-    alias(libs.plugins.org.jetbrains.kotlin.plugin.compose)
+    id("com.android.application")
+    id("org.jetbrains.kotlin.android")
 }
 
 kotlin {
@@ -12,14 +11,14 @@ kotlin {
 
 android {
     namespace = "protect.card_locker"
-    compileSdk = 36
+    compileSdk = 35
 
     defaultConfig {
         applicationId = "me.hackerchick.catima"
         minSdk = 21
-        targetSdk = 36
-        versionCode = 156
-        versionName = "2.40.0"
+        targetSdk = 35
+        versionCode = 150
+        versionName = "2.36.0"
 
         vectorDrawables.useSupportLibrary = true
         multiDexEnabled = true
@@ -30,7 +29,6 @@ android {
 
         buildConfigField("boolean", "showDonate", "true")
         buildConfigField("boolean", "showRateOnGooglePlay", "false")
-        buildConfigField("boolean", "useAcraCrashReporter", "true")
     }
 
     buildTypes {
@@ -48,7 +46,6 @@ android {
 
     buildFeatures {
         buildConfig = true
-        compose = true
         viewBinding = true
     }
 
@@ -64,9 +61,6 @@ android {
             // Google doesn't allow donation links
             buildConfigField("boolean", "showDonate", "false")
             buildConfigField("boolean", "showRateOnGooglePlay", "true")
-
-            // Google Play already sends crashes to the Google Play Console
-            buildConfigField("boolean", "useAcraCrashReporter", "false")
         }
     }
 
@@ -105,59 +99,48 @@ android {
         lintConfig = file("lint.xml")
     }
     kotlinOptions {
-        jvmTarget = "17"
+        jvmTarget = "21"
+    }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_21
+        targetCompatibility = JavaVersion.VERSION_21
     }
 }
 
 dependencies {
     // AndroidX
-    implementation(libs.androidx.appcompat.appcompat)
-    implementation(libs.androidx.constraintlayout.constraintlayout)
-    implementation(libs.androidx.core.core.ktx)
-    implementation(libs.androidx.core.core.remoteviews)
-    implementation(libs.androidx.core.core.splashscreen)
-    implementation(libs.androidx.exifinterface.exifinterface)
-    implementation(libs.androidx.palette.palette)
-    implementation(libs.androidx.preference.preference)
-    implementation(libs.com.google.android.material.material)
-    coreLibraryDesugaring(libs.com.android.tools.desugar.jdk.libs)
-
-    // Compose
-    implementation(libs.androidx.activity.activity.compose)
-    val composeBom = platform(libs.androidx.compose.compose.bom)
-    implementation(composeBom)
-    implementation(libs.androidx.compose.foundation.foundation)
-    implementation(libs.androidx.compose.material3.material3)
-    implementation(libs.androidx.compose.material.material.icons.extended)
-    implementation(libs.androidx.compose.ui.ui.tooling.preview.android)
-    debugImplementation(libs.androidx.compose.ui.ui.test.manifest)
-
-    androidTestImplementation(composeBom)
-    androidTestImplementation(libs.androidx.compose.ui.ui.test.junit4)
+    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(libs.com.journeyapps.zxing.android.embedded)
-    implementation(libs.com.github.yalantis.ucrop)
-    implementation(libs.com.google.zxing.core)
-    implementation(libs.org.apache.commons.commons.csv)
-    implementation(libs.com.jaredrummler.colorpicker)
-    implementation(libs.net.lingala.zip4j.zip4j)
-
-    // Crash reporting
-    implementation(libs.bundles.acra)
+    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
-    testImplementation(libs.androidx.test.core)
-    testImplementation(libs.junit.junit)
-    testImplementation(libs.org.robolectric.robolectric)
+    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(libs.bundles.androidx.test)
-    androidTestImplementation(libs.junit.junit)
-    androidTestImplementation(libs.androidx.test.ext.junit)
-    androidTestImplementation(libs.androidx.test.rules)
-    androidTestImplementation(libs.androidx.test.runner)
-    androidTestImplementation(libs.androidx.test.uiautomator.uiautomator)
-    androidTestImplementation(libs.androidx.test.espresso.espresso.core)
+    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) {

app/proguard-rules.pro

@@ -21,19 +21,4 @@
 -keepattributes SourceFile,LineNumberTable
 
 # This keep the class and method names the same, for debugging stack traces
--dontobfuscate
-
-# Required for uCrop 2.2.11
-# This is generated automatically by the Android Gradle plugin.
--dontwarn javax.annotation.processing.AbstractProcessor
--dontwarn javax.annotation.processing.SupportedOptions
--dontwarn okhttp3.Call
--dontwarn okhttp3.Dispatcher
--dontwarn okhttp3.OkHttpClient
--dontwarn okhttp3.Request$Builder
--dontwarn okhttp3.Request
--dontwarn okhttp3.Response
--dontwarn okhttp3.ResponseBody
--dontwarn okio.BufferedSource
--dontwarn okio.Okio
--dontwarn okio.Sink
+-dontobfuscate

app/src/androidTest/java/protect/card_locker/AboutActivityTest.kt

@@ -1,89 +0,0 @@
-package protect.card_locker
-
-import android.app.Instrumentation
-import androidx.compose.ui.test.ExperimentalTestApi
-import androidx.compose.ui.test.assertIsDisplayed
-import androidx.compose.ui.test.assertIsNotDisplayed
-import androidx.compose.ui.test.junit4.ComposeContentTestRule
-import androidx.compose.ui.test.junit4.createComposeRule
-import androidx.compose.ui.test.onNodeWithTag
-import androidx.compose.ui.test.onNodeWithText
-import androidx.compose.ui.test.performScrollTo
-import androidx.compose.ui.test.runComposeUiTest
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import androidx.test.platform.app.InstrumentationRegistry
-import org.junit.Rule
-import org.junit.Test
-import org.junit.runner.RunWith
-import protect.card_locker.compose.theme.CatimaTheme
-
-@OptIn(ExperimentalTestApi::class)
-@RunWith(AndroidJUnit4::class)
-class AboutActivityTest {
-    @get:Rule
-    private val rule: ComposeContentTestRule = createComposeRule()
-
-    private val instrumentation: Instrumentation = InstrumentationRegistry.getInstrumentation()
-
-    private val content: AboutContent = AboutContent(instrumentation.targetContext)
-
-    @Test
-    fun testInitialState(): Unit = runComposeUiTest {
-        setContent {
-            AboutScreenContent(content = content)
-        }
-
-        onNodeWithTag("topbar_catima").assertIsDisplayed()
-
-        onNodeWithTag("card_version_history").assertIsDisplayed()
-        onNodeWithText(content.versionHistory).assertIsDisplayed()
-
-        onNodeWithTag("card_credits").assertIsDisplayed()
-        onNodeWithText(content.copyrightShort).assertIsDisplayed()
-
-        onNodeWithTag("card_translate").assertIsDisplayed()
-        onNodeWithTag("card_license").assertIsDisplayed()
-
-        // We might be off the screen so start scrolling
-        onNodeWithTag("card_source_github").performScrollTo().assertIsDisplayed()
-        onNodeWithTag("card_privacy_policy").performScrollTo().assertIsDisplayed()
-        onNodeWithTag("card_donate").performScrollTo().assertIsDisplayed()
-        // Dont scroll to this, since its not displayed
-        onNodeWithTag("card_rate_google").assertIsNotDisplayed()
-        onNodeWithTag("card_report_error").performScrollTo().assertIsDisplayed()
-    }
-
-    @Test
-    fun testDonateAndGoogleCardVisible(): Unit = runComposeUiTest {
-        setContent {
-            CatimaTheme {
-                AboutScreenContent(
-                    content = content,
-                    showDonate = true,
-                    showRateOnGooglePlay = true,
-                )
-            }
-        }
-
-        onNodeWithTag("card_donate").performScrollTo().assertIsDisplayed()
-        onNodeWithTag("card_rate_google").performScrollTo().assertIsDisplayed()
-    }
-
-    @Test
-    fun testDonateAndGoogleCardHidden(): Unit = runComposeUiTest {
-        setContent {
-            CatimaTheme {
-                AboutScreenContent(
-                    content = content,
-                    showDonate = false,
-                    showRateOnGooglePlay = false,
-                )
-            }
-        }
-
-        onNodeWithTag("card_privacy_policy").performScrollTo().assertIsDisplayed()
-        onNodeWithTag("card_donate").assertIsNotDisplayed()
-        onNodeWithTag("card_rate_google").assertIsNotDisplayed()
-        onNodeWithTag("card_report_error").performScrollTo().assertIsDisplayed()
-    }
-}

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

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

app/src/main/AndroidManifest.xml

@@ -4,7 +4,7 @@
 
     <permission
         android:description="@string/permissionReadCardsDescription"
-        android:icon="@drawable/ic_launcher_monochrome"
+        android:icon="@drawable/ic_launcher_foreground"
         android:label="@string/permissionReadCardsLabel"
         android:name="${applicationId}.READ_CARDS"
         android:protectionLevel="dangerous" />
@@ -65,7 +65,6 @@
                 <data android:mimeType="application/vnd.apple.pkpass" />
                 <data android:mimeType="application/vnd-com.apple.pkpass" />
                 <data android:mimeType="application/vnd.espass-espass" />
-                <data android:mimeType="application/vnd.apple.pkpasses" />
             </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.SEND" />
@@ -77,7 +76,6 @@
                 <data android:mimeType="application/vnd.apple.pkpass" />
                 <data android:mimeType="application/vnd-com.apple.pkpass" />
                 <data android:mimeType="application/vnd.espass-espass" />
-                <data android:mimeType="application/vnd.apple.pkpasses" />
             </intent-filter>
         </activity>
         <activity
@@ -144,11 +142,12 @@
             android:name=".preferences.SettingsActivity"
             android:label="@string/settings"
             android:theme="@style/AppTheme.NoActionBar" />
-        <!-- FIXME: ImportExportActivity cancels import on rotation -->
+        <!-- FIXME: locked screenOrientation is a workaround for https://github.com/CatimaLoyalty/Android/issues/1715, remove when https://github.com/CatimaLoyalty/Android/issues/513 is fixed -->
         <activity
             android:name=".ImportExportActivity"
             android:label="@string/importExport"
             android:exported="true"
+            android:screenOrientation="locked"
             android:theme="@style/AppTheme.NoActionBar">
 
             <!-- ZIP Intent Filter -->

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

@@ -1,167 +1,149 @@
 package protect.card_locker
 
 import android.os.Bundle
-import androidx.activity.ComponentActivity
-import androidx.activity.OnBackPressedDispatcher
-import androidx.activity.compose.setContent
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.rememberScrollState
-import androidx.compose.foundation.verticalScroll
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Scaffold
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.platform.testTag
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.AnnotatedString
-import androidx.compose.ui.text.SpanStyle
-import androidx.compose.ui.text.TextLinkStyles
-import androidx.compose.ui.text.fromHtml
-import androidx.compose.ui.text.style.TextDecoration
-import androidx.compose.ui.tooling.preview.Preview
-import protect.card_locker.compose.CatimaAboutSection
-import protect.card_locker.compose.CatimaTopAppBar
-import protect.card_locker.compose.theme.CatimaTheme
+import android.text.Spanned
+import android.view.MenuItem
+import android.view.View
+import android.widget.ScrollView
+import android.widget.TextView
 
-class AboutActivity : ComponentActivity() {
+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
 
-    @OptIn(ExperimentalMaterial3Api::class)
     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()
 
-        setContent {
-            CatimaTheme {
-                AboutScreenContent(
-                    content = content,
-                    showDonate = BuildConfig.showDonate,
-                    showRateOnGooglePlay = BuildConfig.showRateOnGooglePlay,
-                    onBackPressedDispatcher = onBackPressedDispatcher
-                )
+        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)
         }
     }
 }
-
-@Composable
-fun AboutScreenContent(
-    content: AboutContent,
-    showDonate: Boolean = true,
-    showRateOnGooglePlay: Boolean = false,
-    onBackPressedDispatcher: OnBackPressedDispatcher? = null,
-) {
-    Scaffold(
-        topBar = { CatimaTopAppBar(content.pageTitle.toString(), onBackPressedDispatcher) }
-    ) { innerPadding ->
-        Column(
-            modifier = Modifier
-                .padding(innerPadding)
-                .verticalScroll(rememberScrollState())
-        ) {
-            CatimaAboutSection(
-                stringResource(R.string.version_history),
-                content.versionHistory,
-                modifier = Modifier.testTag("card_version_history"),
-                onClickUrl = "https://catima.app/changelog/",
-                onClickDialogText = AnnotatedString.fromHtml(
-                    htmlString = content.historyHtml,
-                    linkStyles = TextLinkStyles(
-                        style = SpanStyle(
-                            textDecoration = TextDecoration.Underline,
-                            color = MaterialTheme.colorScheme.primary
-                        )
-                    )
-                )
-            )
-            CatimaAboutSection(
-                stringResource(R.string.credits),
-                content.copyrightShort,
-                modifier = Modifier.testTag("card_credits"),
-                onClickDialogText = AnnotatedString.fromHtml(
-                    htmlString = content.contributorInfoHtml,
-                    linkStyles = TextLinkStyles(
-                        style = SpanStyle(
-                            textDecoration = TextDecoration.Underline,
-                            color = MaterialTheme.colorScheme.primary
-                        )
-                    )
-                )
-            )
-            CatimaAboutSection(
-                stringResource(R.string.help_translate_this_app),
-                stringResource(R.string.translate_platform),
-                modifier = Modifier.testTag("card_translate"),
-                onClickUrl = "https://hosted.weblate.org/engage/catima/"
-            )
-            CatimaAboutSection(
-                stringResource(R.string.license),
-                stringResource(R.string.app_license),
-                modifier = Modifier.testTag("card_license"),
-                onClickUrl = "https://github.com/CatimaLoyalty/Android/blob/main/LICENSE",
-                onClickDialogText = AnnotatedString.fromHtml(
-                    htmlString = content.licenseHtml,
-                    linkStyles = TextLinkStyles(
-                        style = SpanStyle(
-                            textDecoration = TextDecoration.Underline,
-                            color = MaterialTheme.colorScheme.primary
-                        )
-                    )
-                )
-            )
-            CatimaAboutSection(
-                stringResource(R.string.source_repository),
-                stringResource(R.string.on_github),
-                modifier = Modifier.testTag("card_source_github"),
-                onClickUrl = "https://github.com/CatimaLoyalty/Android/"
-            )
-            CatimaAboutSection(
-                stringResource(R.string.privacy_policy),
-                stringResource(R.string.and_data_usage),
-                modifier = Modifier.testTag("card_privacy_policy"),
-                onClickUrl = "https://catima.app/privacy-policy/",
-                onClickDialogText = AnnotatedString.fromHtml(
-                    htmlString = content.privacyHtml,
-                    linkStyles = TextLinkStyles(
-                        style = SpanStyle(
-                            textDecoration = TextDecoration.Underline,
-                            color = MaterialTheme.colorScheme.primary
-                        )
-                    )
-                )
-            )
-            if (showDonate) {
-                CatimaAboutSection(
-                    stringResource(R.string.donate),
-                    "",
-                    modifier = Modifier.testTag("card_donate"),
-                    onClickUrl = "https://catima.app/donate"
-                )
-            }
-            if (showRateOnGooglePlay) {
-                CatimaAboutSection(
-                    stringResource(R.string.rate_this_app),
-                    stringResource(R.string.on_google_play),
-                    modifier = Modifier.testTag("card_rate_google"),
-                    onClickUrl = "https://play.google.com/store/apps/details?id=me.hackerchick.catima"
-                )
-            }
-            CatimaAboutSection(
-                stringResource(R.string.report_error),
-                stringResource(R.string.on_github),
-                modifier = Modifier.testTag("card_report_error"),
-                onClickUrl = "https://github.com/CatimaLoyalty/Android/issues"
-            )
-        }
-    }
-}
-
-@Preview
-@Composable
-private fun AboutActivityPreview() {
-    AboutScreenContent(AboutContent(LocalContext.current))
-}

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

@@ -3,8 +3,11 @@ 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;
@@ -52,7 +55,7 @@ public class AboutContent {
         return context.getString(R.string.app_copyright_short);
     }
 
-    public String getContributorsHtml() {
+    public String getContributors() {
         String contributors;
         try {
             contributors = "<br/>" + Utils.readTextFile(context, R.raw.contributors);
@@ -62,7 +65,7 @@ public class AboutContent {
         return contributors.replace("\n", "<br />");
     }
 
-    public String getHistoryHtml() {
+    public String getHistory() {
         String versionHistory;
         try {
             versionHistory = Utils.readTextFile(context, R.raw.changelog)
@@ -74,7 +77,7 @@ public class AboutContent {
                 .replace("\n", "<br />");
     }
 
-    public String getLicenseHtml() {
+    public String getLicense() {
         try {
             return Utils.readTextFile(context, R.raw.license);
         }  catch (IOException ignored) {
@@ -82,7 +85,7 @@ public class AboutContent {
         }
     }
 
-    public String getPrivacyHtml() {
+    public String getPrivacy() {
         String privacyPolicy;
         try {
             privacyPolicy = Utils.readTextFile(context, R.raw.privacy)
@@ -94,11 +97,11 @@ public class AboutContent {
                 .replace("\n", "<br />");
     }
 
-    public String getThirdPartyLibrariesHtml() {
+    public String getThirdPartyLibraries() {
         final List<ThirdPartyInfo> usedLibraries = new ArrayList<>();
-        usedLibraries.add(new ThirdPartyInfo("ACRA", "https://github.com/ACRA/acra", "Apache 2.0"));
         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"));
@@ -113,7 +116,7 @@ public class AboutContent {
         return result.toString();
     }
 
-    public String getUsedThirdPartyAssetsHtml() {
+    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"));
 
@@ -126,19 +129,31 @@ public class AboutContent {
         return result.toString();
     }
 
-    public String getContributorInfoHtml() {
+    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), getContributorsHtml()));
+        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), getThirdPartyLibrariesHtml()));
+        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), getUsedThirdPartyAssetsHtml()));
+        contributorInfo.append(String.format(context.getString(R.string.app_resources), getUsedThirdPartyAssets()));
 
-        return contributorInfo.toString();
+        return HtmlCompat.fromHtml(contributorInfo.toString(), HtmlCompat.FROM_HTML_MODE_COMPACT);
+    }
+
+    public Spanned getHistoryInfo() {
+        return HtmlCompat.fromHtml(getHistory(), HtmlCompat.FROM_HTML_MODE_COMPACT);
+    }
+
+    public Spanned getLicenseInfo() {
+        return HtmlCompat.fromHtml(getLicense(), HtmlCompat.FROM_HTML_MODE_LEGACY);
+    }
+
+    public Spanned getPrivacyInfo() {
+        return HtmlCompat.fromHtml(getPrivacy(), HtmlCompat.FROM_HTML_MODE_COMPACT);
     }
 
     public String getVersionHistory() {

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

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

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

@@ -1,5 +0,0 @@
-package protect.card_locker
-
-interface BarcodeImageWriterResultCallback {
-    fun onBarcodeImageWriterResult(success: Boolean)
-}

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

@@ -0,0 +1,402 @@
+package protect.card_locker;
+
+import android.content.ActivityNotFoundException;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Bundle;
+import android.text.InputType;
+import android.util.Log;
+import android.view.MenuItem;
+import android.view.ViewGroup;
+import android.view.WindowManager;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.FrameLayout;
+import android.widget.LinearLayout;
+import android.widget.Toast;
+
+import androidx.activity.result.ActivityResultLauncher;
+import androidx.activity.result.contract.ActivityResultContracts;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.widget.Toolbar;
+
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+import com.google.android.material.textfield.TextInputLayout;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.List;
+
+import protect.card_locker.async.TaskHandler;
+import protect.card_locker.databinding.ImportExportActivityBinding;
+import protect.card_locker.importexport.DataFormat;
+import protect.card_locker.importexport.ImportExportResult;
+import protect.card_locker.importexport.ImportExportResultType;
+
+public class ImportExportActivity extends CatimaAppCompatActivity {
+    private ImportExportActivityBinding binding;
+    private static final String TAG = "Catima";
+
+    private ImportExportTask importExporter;
+
+    private String importAlertTitle;
+    private String importAlertMessage;
+    private DataFormat importDataFormat;
+    private String exportPassword;
+
+    private ActivityResultLauncher<Intent> fileCreateLauncher;
+    private ActivityResultLauncher<String> fileOpenLauncher;
+
+    final private TaskHandler mTasks = new TaskHandler();
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        binding = ImportExportActivityBinding.inflate(getLayoutInflater());
+        setTitle(R.string.importExport);
+        setContentView(binding.getRoot());
+        Utils.applyWindowInsets(binding.getRoot());
+        Toolbar toolbar = binding.toolbar;
+        setSupportActionBar(toolbar);
+        enableToolbarBackButton();
+
+        Intent fileIntent = getIntent();
+        if (fileIntent != null && fileIntent.getType() != null) {
+            chooseImportType(fileIntent.getData());
+        }
+
+        // would use ActivityResultContracts.CreateDocument() but mime type cannot be set
+        fileCreateLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), result -> {
+            Intent intent = result.getData();
+            if (intent == null) {
+                Log.e(TAG, "Activity returned NULL data");
+                return;
+            }
+            Uri uri = intent.getData();
+            if (uri == null) {
+                Log.e(TAG, "Activity returned NULL uri");
+                return;
+            }
+            // Running this in a thread prevents Android from throwing a NetworkOnMainThreadException for large files
+            // FIXME: This is still suboptimal, because showing that the export started is delayed until the network request finishes
+            new Thread() {
+                @Override
+                public void run() {
+                    try {
+                        OutputStream writer = getContentResolver().openOutputStream(uri);
+                        Log.d(TAG, "Starting file export with: " + result);
+                        startExport(writer, uri, exportPassword.toCharArray(), true);
+                    } catch (IOException e) {
+                        Log.e(TAG, "Failed to export file: " + result, e);
+                        onExportComplete(new ImportExportResult(ImportExportResultType.GenericFailure, result.toString()), uri);
+                    }
+                }
+            }.start();
+        });
+        fileOpenLauncher = registerForActivityResult(new ActivityResultContracts.GetContent(), result -> {
+            if (result == null) {
+                Log.e(TAG, "Activity returned NULL data");
+                return;
+            }
+            openFileForImport(result, null);
+        });
+
+        // Check that there is a file manager available
+        final Intent intentCreateDocumentAction = new Intent(Intent.ACTION_CREATE_DOCUMENT);
+        intentCreateDocumentAction.addCategory(Intent.CATEGORY_OPENABLE);
+        intentCreateDocumentAction.setType("application/zip");
+        intentCreateDocumentAction.putExtra(Intent.EXTRA_TITLE, "catima.zip");
+
+        Button exportButton = binding.exportButton;
+        exportButton.setOnClickListener(v -> {
+            AlertDialog.Builder builder = new MaterialAlertDialogBuilder(ImportExportActivity.this);
+            builder.setTitle(R.string.exportPassword);
+
+            FrameLayout container = new FrameLayout(ImportExportActivity.this);
+
+            final TextInputLayout textInputLayout = new TextInputLayout(ImportExportActivity.this);
+            textInputLayout.setEndIconMode(TextInputLayout.END_ICON_PASSWORD_TOGGLE);
+            LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+            params.setMargins(50, 10, 50, 0);
+            textInputLayout.setLayoutParams(params);
+
+            final EditText input = new EditText(ImportExportActivity.this);
+            input.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD);
+            input.setHint(R.string.exportPasswordHint);
+
+            textInputLayout.addView(input);
+            container.addView(textInputLayout);
+            builder.setView(container);
+            builder.setPositiveButton(R.string.ok, (dialogInterface, i) -> {
+                exportPassword = input.getText().toString();
+                try {
+                    fileCreateLauncher.launch(intentCreateDocumentAction);
+                } catch (ActivityNotFoundException e) {
+                    Toast.makeText(getApplicationContext(), R.string.failedOpeningFileManager, Toast.LENGTH_LONG).show();
+                    Log.e(TAG, "No activity found to handle intent", e);
+                }
+            });
+            builder.setNegativeButton(R.string.cancel, (dialogInterface, i) -> dialogInterface.cancel());
+            builder.show();
+        });
+
+        // Check that there is a file manager available
+        Button importFilesystem = binding.importOptionFilesystemButton;
+        importFilesystem.setOnClickListener(v -> chooseImportType(null));
+
+        // FIXME: The importer/exporter is currently quite broken
+        // To prevent the screen from turning off during import/export and some devices killing Catima as it's no longer foregrounded, force the screen to stay on here
+        getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
+    }
+
+    private void openFileForImport(Uri uri, char[] password) {
+        // Running this in a thread prevents Android from throwing a NetworkOnMainThreadException for large files
+        // FIXME: This is still suboptimal, because showing that the import started is delayed until the network request finishes
+        new Thread() {
+            @Override
+            public void run() {
+                try {
+                    InputStream reader = getContentResolver().openInputStream(uri);
+                    Log.d(TAG, "Starting file import with: " + uri);
+                    startImport(reader, uri, importDataFormat, password, true);
+                } catch (IOException e) {
+                    Log.e(TAG, "Failed to import file: " + uri, e);
+                    onImportComplete(new ImportExportResult(ImportExportResultType.GenericFailure, e.toString()), uri, importDataFormat);
+                }
+            }
+        }.start();
+    }
+
+    private void chooseImportType(@Nullable Uri fileData) {
+
+        List<CharSequence> betaImportOptions = new ArrayList<>();
+        betaImportOptions.add("Fidme");
+        betaImportOptions.add("Stocard");
+        List<CharSequence> importOptions = new ArrayList<>();
+
+        for (String importOption : getResources().getStringArray(R.array.import_types_array)) {
+            if (betaImportOptions.contains(importOption)) {
+                importOption = importOption + " (BETA)";
+            }
+
+            importOptions.add(importOption);
+        }
+
+        AlertDialog.Builder builder = new MaterialAlertDialogBuilder(this);
+        builder.setTitle(R.string.chooseImportType)
+                .setItems(importOptions.toArray(new CharSequence[importOptions.size()]), (dialog, which) -> {
+                    switch (which) {
+                        // Catima
+                        case 0:
+                            importAlertTitle = getString(R.string.importCatima);
+                            importAlertMessage = getString(R.string.importCatimaMessage);
+                            importDataFormat = DataFormat.Catima;
+                            break;
+                        // Fidme
+                        case 1:
+                            importAlertTitle = getString(R.string.importFidme);
+                            importAlertMessage = getString(R.string.importFidmeMessage);
+                            importDataFormat = DataFormat.Fidme;
+                            break;
+                        // Loyalty Card Keychain
+                        case 2:
+                            importAlertTitle = getString(R.string.importLoyaltyCardKeychain);
+                            importAlertMessage = getString(R.string.importLoyaltyCardKeychainMessage);
+                            importDataFormat = DataFormat.Catima;
+                            break;
+                        // Stocard
+                        case 3:
+                            importAlertTitle = getString(R.string.importStocard);
+                            importAlertMessage = getString(R.string.importStocardMessage);
+                            importDataFormat = DataFormat.Stocard;
+                            break;
+                        // Voucher Vault
+                        case 4:
+                            importAlertTitle = getString(R.string.importVoucherVault);
+                            importAlertMessage = getString(R.string.importVoucherVaultMessage);
+                            importDataFormat = DataFormat.VoucherVault;
+                            break;
+                        default:
+                            throw new IllegalArgumentException("Unknown DataFormat");
+                    }
+
+                    if (fileData != null) {
+                        openFileForImport(fileData, null);
+                        return;
+                    }
+
+                    new MaterialAlertDialogBuilder(this)
+                            .setTitle(importAlertTitle)
+                            .setMessage(importAlertMessage)
+                            .setPositiveButton(R.string.ok, (dialog1, which1) -> {
+                                try {
+                                    fileOpenLauncher.launch("*/*");
+                                } catch (ActivityNotFoundException e) {
+                                    Toast.makeText(getApplicationContext(), R.string.failedOpeningFileManager, Toast.LENGTH_LONG).show();
+                                    Log.e(TAG, "No activity found to handle intent", e);
+                                }
+                            })
+                            .setNegativeButton(R.string.cancel, null)
+                            .show();
+                });
+        builder.show();
+    }
+
+    private void startImport(final InputStream target, final Uri targetUri, final DataFormat dataFormat, final char[] password, final boolean closeWhenDone) {
+        mTasks.flushTaskList(TaskHandler.TYPE.IMPORT, true, false, false);
+        ImportExportTask.TaskCompleteListener listener = new ImportExportTask.TaskCompleteListener() {
+            @Override
+            public void onTaskComplete(ImportExportResult result, DataFormat dataFormat) {
+                onImportComplete(result, targetUri, dataFormat);
+                if (closeWhenDone) {
+                    try {
+                        target.close();
+                    } catch (IOException ioException) {
+                        ioException.printStackTrace();
+                    }
+                }
+            }
+        };
+
+        importExporter = new ImportExportTask(ImportExportActivity.this,
+                dataFormat, target, password, listener);
+        mTasks.executeTask(TaskHandler.TYPE.IMPORT, importExporter);
+    }
+
+    private void startExport(final OutputStream target, final Uri targetUri, char[] password, final boolean closeWhenDone) {
+        mTasks.flushTaskList(TaskHandler.TYPE.EXPORT, true, false, false);
+        ImportExportTask.TaskCompleteListener listener = new ImportExportTask.TaskCompleteListener() {
+            @Override
+            public void onTaskComplete(ImportExportResult result, DataFormat dataFormat) {
+                onExportComplete(result, targetUri);
+                if (closeWhenDone) {
+                    try {
+                        target.close();
+                    } catch (IOException ioException) {
+                        ioException.printStackTrace();
+                    }
+                }
+            }
+        };
+
+        importExporter = new ImportExportTask(ImportExportActivity.this,
+                DataFormat.Catima, target, password, listener);
+        mTasks.executeTask(TaskHandler.TYPE.EXPORT, importExporter);
+    }
+
+    @Override
+    protected void onDestroy() {
+        mTasks.flushTaskList(TaskHandler.TYPE.IMPORT, true, false, false);
+        mTasks.flushTaskList(TaskHandler.TYPE.EXPORT, true, false, false);
+        super.onDestroy();
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        int id = item.getItemId();
+
+        if (id == android.R.id.home) {
+            finish();
+            return true;
+        }
+
+        return super.onOptionsItemSelected(item);
+    }
+
+    private void retryWithPassword(DataFormat dataFormat, Uri uri) {
+        AlertDialog.Builder builder = new MaterialAlertDialogBuilder(this);
+        builder.setTitle(R.string.passwordRequired);
+
+        FrameLayout container = new FrameLayout(ImportExportActivity.this);
+
+        final TextInputLayout textInputLayout = new TextInputLayout(ImportExportActivity.this);
+        textInputLayout.setEndIconMode(TextInputLayout.END_ICON_PASSWORD_TOGGLE);
+        LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+        params.setMargins(50, 10, 50, 0);
+        textInputLayout.setLayoutParams(params);
+
+        final EditText input = new EditText(ImportExportActivity.this);
+        input.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD);
+        input.setHint(R.string.exportPasswordHint);
+
+        textInputLayout.addView(input);
+        container.addView(textInputLayout);
+        builder.setView(container);
+
+        builder.setPositiveButton(R.string.ok, (dialogInterface, i) -> {
+            openFileForImport(uri, input.getText().toString().toCharArray());
+        });
+        builder.setNegativeButton(R.string.cancel, (dialogInterface, i) -> dialogInterface.cancel());
+
+        builder.show();
+    }
+
+    private String buildResultDialogMessage(ImportExportResult result, boolean isImport) {
+        int messageId;
+
+        if (result.resultType() == ImportExportResultType.Success) {
+            messageId = isImport ? R.string.importSuccessful : R.string.exportSuccessful;
+        } else {
+            messageId = isImport ? R.string.importFailed : R.string.exportFailed;
+        }
+
+        StringBuilder messageBuilder = new StringBuilder(getResources().getString(messageId));
+        if (result.developerDetails() != null) {
+            messageBuilder.append("\n\n");
+            messageBuilder.append(getResources().getString(R.string.include_if_asking_support));
+            messageBuilder.append("\n\n");
+            messageBuilder.append(result.developerDetails());
+        }
+
+        return messageBuilder.toString();
+    }
+
+    private void onImportComplete(ImportExportResult result, Uri path, DataFormat dataFormat) {
+        ImportExportResultType resultType = result.resultType();
+
+        if (resultType == ImportExportResultType.BadPassword) {
+            retryWithPassword(dataFormat, path);
+            return;
+        }
+
+        AlertDialog.Builder builder = new MaterialAlertDialogBuilder(this);
+        builder.setTitle(resultType == ImportExportResultType.Success ? R.string.importSuccessfulTitle : R.string.importFailedTitle);
+        builder.setMessage(buildResultDialogMessage(result, true));
+        builder.setNeutralButton(R.string.ok, (dialog, which) -> dialog.dismiss());
+
+        builder.create().show();
+    }
+
+    private void onExportComplete(ImportExportResult result, final Uri path) {
+        ImportExportResultType resultType = result.resultType();
+
+        AlertDialog.Builder builder = new MaterialAlertDialogBuilder(this);
+        builder.setTitle(resultType == ImportExportResultType.Success ? R.string.exportSuccessfulTitle : R.string.exportFailedTitle);
+        builder.setMessage(buildResultDialogMessage(result, false));
+        builder.setNeutralButton(R.string.ok, (dialog, which) -> dialog.dismiss());
+
+        if (resultType == ImportExportResultType.Success) {
+            final CharSequence sendLabel = ImportExportActivity.this.getResources().getText(R.string.sendLabel);
+
+            builder.setPositiveButton(sendLabel, (dialog, which) -> {
+                Intent sendIntent = new Intent(Intent.ACTION_SEND);
+                sendIntent.putExtra(Intent.EXTRA_STREAM, path);
+                sendIntent.setType("text/csv");
+
+                // set flag to give temporary permission to external app to use the FileProvider
+                sendIntent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
+
+                ImportExportActivity.this.startActivity(Intent.createChooser(sendIntent,
+                        sendLabel));
+
+                dialog.dismiss();
+            });
+        }
+
+        builder.create().show();
+    }
+}

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

@@ -1,416 +0,0 @@
-package protect.card_locker
-
-import android.content.ActivityNotFoundException
-import android.content.Intent
-import android.net.Uri
-import android.os.Bundle
-import android.text.InputType
-import android.util.Log
-import android.view.MenuItem
-import android.view.ViewGroup
-import android.view.WindowManager
-import android.widget.Button
-import android.widget.EditText
-import android.widget.FrameLayout
-import android.widget.LinearLayout
-import android.widget.Toast
-import androidx.activity.result.ActivityResultLauncher
-import androidx.activity.result.contract.ActivityResultContracts
-import androidx.appcompat.widget.Toolbar
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import com.google.android.material.textfield.TextInputLayout
-import protect.card_locker.async.TaskHandler
-import protect.card_locker.databinding.ImportExportActivityBinding
-import protect.card_locker.importexport.DataFormat
-import protect.card_locker.importexport.ImportExportResult
-import protect.card_locker.importexport.ImportExportResultType
-import java.io.IOException
-import java.io.InputStream
-import java.io.OutputStream
-
-class ImportExportActivity : CatimaAppCompatActivity() {
-    private lateinit var binding: ImportExportActivityBinding
-
-    private var importExporter: ImportExportTask? = null
-
-    private var importAlertTitle: String? = null
-    private var importAlertMessage: String? = null
-    private var importDataFormat: DataFormat? = null
-    private var exportPassword: String? = null
-
-    private lateinit var fileCreateLauncher: ActivityResultLauncher<Intent>
-    private lateinit var fileOpenLauncher: ActivityResultLauncher<String>
-
-    private val mTasks = TaskHandler()
-
-    companion object {
-        private const val TAG = "Catima"
-    }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        binding = ImportExportActivityBinding.inflate(layoutInflater)
-        setTitle(R.string.importExport)
-        setContentView(binding.root)
-        Utils.applyWindowInsets(binding.root)
-        val toolbar: Toolbar = binding.toolbar
-        setSupportActionBar(toolbar)
-        enableToolbarBackButton()
-
-        val fileIntent = intent
-        if (fileIntent?.type != null) {
-            chooseImportType(fileIntent.data)
-        }
-
-        // would use ActivityResultContracts.CreateDocument() but mime type cannot be set
-        fileCreateLauncher =
-            registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
-                val intent = result.data
-                if (intent == null) {
-                    Log.e(TAG, "Activity returned NULL data")
-                    return@registerForActivityResult
-                }
-                val uri = intent.data
-                if (uri == null) {
-                    Log.e(TAG, "Activity returned NULL uri")
-                    return@registerForActivityResult
-                }
-                // Running this in a thread prevents Android from throwing a NetworkOnMainThreadException for large files
-                // FIXME: This is still suboptimal, because showing that the export started is delayed until the network request finishes
-                Thread {
-                    try {
-                        val writer = contentResolver.openOutputStream(uri)
-                        Log.d(TAG, "Starting file export with: $result")
-                        startExport(writer, uri, exportPassword?.toCharArray(), true)
-                    } catch (e: IOException) {
-                        Log.e(TAG, "Failed to export file: $result", e)
-                        onExportComplete(
-                            ImportExportResult(
-                                ImportExportResultType.GenericFailure,
-                                result.toString()
-                            ), uri
-                        )
-                    }
-                }.start()
-            }
-
-        fileOpenLauncher =
-            registerForActivityResult(ActivityResultContracts.GetContent()) { result ->
-                if (result == null) {
-                    Log.e(TAG, "Activity returned NULL data")
-                    return@registerForActivityResult
-                }
-                openFileForImport(result, null)
-            }
-
-        // Check that there is a file manager available
-        val intentCreateDocumentAction = Intent(Intent.ACTION_CREATE_DOCUMENT).apply {
-            addCategory(Intent.CATEGORY_OPENABLE)
-            type = "application/zip"
-            putExtra(Intent.EXTRA_TITLE, "catima.zip")
-        }
-
-        val exportButton: Button = binding.exportButton
-        exportButton.setOnClickListener {
-            val builder = MaterialAlertDialogBuilder(this@ImportExportActivity)
-            builder.setTitle(R.string.exportPassword)
-
-            val container = FrameLayout(this@ImportExportActivity)
-
-            val textInputLayout = TextInputLayout(this@ImportExportActivity).apply {
-                endIconMode = TextInputLayout.END_ICON_PASSWORD_TOGGLE
-                layoutParams = LinearLayout.LayoutParams(
-                    ViewGroup.LayoutParams.MATCH_PARENT,
-                    ViewGroup.LayoutParams.WRAP_CONTENT
-                ).apply {
-                    setMargins(50, 10, 50, 0)
-                }
-            }
-
-            val input = EditText(this@ImportExportActivity).apply {
-                inputType = InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_VARIATION_PASSWORD
-                setHint(R.string.exportPasswordHint)
-            }
-
-            textInputLayout.addView(input)
-            container.addView(textInputLayout)
-            builder.setView(container)
-            builder.setPositiveButton(R.string.ok) { _, _ ->
-                exportPassword = input.text.toString()
-                try {
-                    fileCreateLauncher.launch(intentCreateDocumentAction)
-                } catch (e: ActivityNotFoundException) {
-                    Toast.makeText(
-                        applicationContext,
-                        R.string.failedOpeningFileManager,
-                        Toast.LENGTH_LONG
-                    ).show()
-                    Log.e(TAG, "No activity found to handle intent", e)
-                }
-            }
-            builder.setNegativeButton(R.string.cancel) { dialogInterface, _ -> dialogInterface.cancel() }
-            builder.show()
-        }
-
-        // Check that there is a file manager available
-        val importFilesystem: Button = binding.importOptionFilesystemButton
-        importFilesystem.setOnClickListener { chooseImportType(null) }
-
-        // FIXME: The importer/exporter is currently quite broken
-        // To prevent the screen from turning off during import/export and some devices killing Catima as it's no longer foregrounded, force the screen to stay on here
-        window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
-    }
-
-    private fun openFileForImport(uri: Uri, password: CharArray?) {
-        // Running this in a thread prevents Android from throwing a NetworkOnMainThreadException for large files
-        // FIXME: This is still suboptimal, because showing that the import started is delayed until the network request finishes
-        Thread {
-            try {
-                val reader = contentResolver.openInputStream(uri)
-                Log.d(TAG, "Starting file import with: $uri")
-                startImport(reader, uri, importDataFormat, password, true)
-            } catch (e: IOException) {
-                Log.e(TAG, "Failed to import file: $uri", e)
-                onImportComplete(
-                    ImportExportResult(
-                        ImportExportResultType.GenericFailure,
-                        e.toString()
-                    ), uri, importDataFormat
-                )
-            }
-        }.start()
-    }
-
-    private fun chooseImportType(fileData: Uri?) {
-        val betaImportOptions = mutableListOf<CharSequence>()
-        betaImportOptions.add("Fidme")
-        val importOptions = mutableListOf<CharSequence>()
-
-        for (importOption in resources.getStringArray(R.array.import_types_array)) {
-            var option = importOption
-            if (betaImportOptions.contains(importOption)) {
-                option = "$importOption (BETA)"
-            }
-            importOptions.add(option)
-        }
-
-        val builder = MaterialAlertDialogBuilder(this)
-        builder.setTitle(R.string.chooseImportType)
-            .setItems(importOptions.toTypedArray()) { _, which ->
-                when (which) {
-                    // Catima
-                    0 -> {
-                        importAlertTitle = getString(R.string.importCatima)
-                        importAlertMessage = getString(R.string.importCatimaMessage)
-                        importDataFormat = DataFormat.Catima
-                    }
-                    // Fidme
-                    1 -> {
-                        importAlertTitle = getString(R.string.importFidme)
-                        importAlertMessage = getString(R.string.importFidmeMessage)
-                        importDataFormat = DataFormat.Fidme
-                    }
-                    // Loyalty Card Keychain
-                    2 -> {
-                        importAlertTitle = getString(R.string.importLoyaltyCardKeychain)
-                        importAlertMessage = getString(R.string.importLoyaltyCardKeychainMessage)
-                        importDataFormat = DataFormat.Catima
-                    }
-                    // Voucher Vault
-                    3 -> {
-                        importAlertTitle = getString(R.string.importVoucherVault)
-                        importAlertMessage = getString(R.string.importVoucherVaultMessage)
-                        importDataFormat = DataFormat.VoucherVault
-                    }
-
-                    else -> throw IllegalArgumentException("Unknown DataFormat")
-                }
-
-                if (fileData != null) {
-                    openFileForImport(fileData, null)
-                    return@setItems
-                }
-
-                MaterialAlertDialogBuilder(this)
-                    .setTitle(importAlertTitle)
-                    .setMessage(importAlertMessage)
-                    .setPositiveButton(R.string.ok) { _, _ ->
-                        try {
-                            fileOpenLauncher.launch("*/*")
-                        } catch (e: ActivityNotFoundException) {
-                            Toast.makeText(
-                                applicationContext,
-                                R.string.failedOpeningFileManager,
-                                Toast.LENGTH_LONG
-                            ).show()
-                            Log.e(TAG, "No activity found to handle intent", e)
-                        }
-                    }
-                    .setNegativeButton(R.string.cancel, null)
-                    .show()
-            }
-        builder.show()
-    }
-
-    private fun startImport(
-        target: InputStream?,
-        targetUri: Uri,
-        dataFormat: DataFormat?,
-        password: CharArray?,
-        closeWhenDone: Boolean
-    ) {
-        mTasks.flushTaskList(TaskHandler.TYPE.IMPORT, true, false, false)
-        val listener = ImportExportTask.TaskCompleteListener { result, dataFormat ->
-            onImportComplete(result, targetUri, dataFormat)
-            if (closeWhenDone) {
-                try {
-                    target?.close()
-                } catch (ioException: IOException) {
-                    ioException.printStackTrace()
-                }
-            }
-        }
-
-        importExporter = ImportExportTask(
-            this@ImportExportActivity,
-            dataFormat, target, password, listener
-        )
-        mTasks.executeTask(TaskHandler.TYPE.IMPORT, importExporter)
-    }
-
-    private fun startExport(
-        target: OutputStream?,
-        targetUri: Uri,
-        password: CharArray?,
-        closeWhenDone: Boolean
-    ) {
-        mTasks.flushTaskList(TaskHandler.TYPE.EXPORT, true, false, false)
-        val listener = ImportExportTask.TaskCompleteListener { result, dataFormat ->
-            onExportComplete(result, targetUri)
-            if (closeWhenDone) {
-                try {
-                    target?.close()
-                } catch (ioException: IOException) {
-                    ioException.printStackTrace()
-                }
-            }
-        }
-
-        importExporter = ImportExportTask(
-            this@ImportExportActivity,
-            DataFormat.Catima, target, password, listener
-        )
-        mTasks.executeTask(TaskHandler.TYPE.EXPORT, importExporter)
-    }
-
-    override fun onDestroy() {
-        mTasks.flushTaskList(TaskHandler.TYPE.IMPORT, true, false, false)
-        mTasks.flushTaskList(TaskHandler.TYPE.EXPORT, true, false, false)
-        super.onDestroy()
-    }
-
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        val id = item.itemId
-
-        if (id == android.R.id.home) {
-            finish()
-            return true
-        }
-
-        return super.onOptionsItemSelected(item)
-    }
-
-    private fun retryWithPassword(dataFormat: DataFormat, uri: Uri) {
-        val builder = MaterialAlertDialogBuilder(this)
-        builder.setTitle(R.string.passwordRequired)
-
-        val container = FrameLayout(this@ImportExportActivity)
-
-        val textInputLayout = TextInputLayout(this@ImportExportActivity).apply {
-            endIconMode = TextInputLayout.END_ICON_PASSWORD_TOGGLE
-            layoutParams = LinearLayout.LayoutParams(
-                ViewGroup.LayoutParams.MATCH_PARENT,
-                ViewGroup.LayoutParams.WRAP_CONTENT
-            ).apply {
-                setMargins(50, 10, 50, 0)
-            }
-        }
-
-        val input = EditText(this@ImportExportActivity).apply {
-            inputType = InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_VARIATION_PASSWORD
-            setHint(R.string.exportPasswordHint)
-        }
-
-        textInputLayout.addView(input)
-        container.addView(textInputLayout)
-        builder.setView(container)
-
-        builder.setPositiveButton(R.string.ok) { _, _ ->
-            openFileForImport(uri, input.text.toString().toCharArray())
-        }
-        builder.setNegativeButton(R.string.cancel) { dialogInterface, _ -> dialogInterface.cancel() }
-
-        builder.show()
-    }
-
-    private fun buildResultDialogMessage(result: ImportExportResult, isImport: Boolean): String {
-        val messageId = if (result.resultType() == ImportExportResultType.Success) {
-            if (isImport) R.string.importSuccessful else R.string.exportSuccessful
-        } else {
-            if (isImport) R.string.importFailed else R.string.exportFailed
-        }
-
-        val messageBuilder = StringBuilder(resources.getString(messageId))
-        if (result.developerDetails() != null) {
-            messageBuilder.append("\n\n")
-            messageBuilder.append(resources.getString(R.string.include_if_asking_support))
-            messageBuilder.append("\n\n")
-            messageBuilder.append(result.developerDetails())
-        }
-
-        return messageBuilder.toString()
-    }
-
-    private fun onImportComplete(result: ImportExportResult, path: Uri, dataFormat: DataFormat?) {
-        val resultType = result.resultType()
-
-        if (resultType == ImportExportResultType.BadPassword) {
-            retryWithPassword(dataFormat!!, path)
-            return
-        }
-
-        val builder = MaterialAlertDialogBuilder(this)
-        builder.setTitle(if (resultType == ImportExportResultType.Success) R.string.importSuccessfulTitle else R.string.importFailedTitle)
-        builder.setMessage(buildResultDialogMessage(result, true))
-        builder.setNeutralButton(R.string.ok) { dialog, _ -> dialog.dismiss() }
-
-        builder.create().show()
-    }
-
-    private fun onExportComplete(result: ImportExportResult, path: Uri) {
-        val resultType = result.resultType()
-
-        val builder = MaterialAlertDialogBuilder(this)
-        builder.setTitle(if (resultType == ImportExportResultType.Success) R.string.exportSuccessfulTitle else R.string.exportFailedTitle)
-        builder.setMessage(buildResultDialogMessage(result, false))
-        builder.setNeutralButton(R.string.ok) { dialog, _ -> dialog.dismiss() }
-
-        if (resultType == ImportExportResultType.Success) {
-            val sendLabel = this@ImportExportActivity.resources.getText(R.string.sendLabel)
-
-            builder.setPositiveButton(sendLabel) { dialog, _ ->
-                val sendIntent = Intent(Intent.ACTION_SEND).apply {
-                    putExtra(Intent.EXTRA_STREAM, path)
-                    type = "text/csv"
-                    // set flag to give temporary permission to external app to use the FileProvider
-                    flags = Intent.FLAG_GRANT_READ_URI_PERMISSION
-                }
-
-                this@ImportExportActivity.startActivity(Intent.createChooser(sendIntent, sendLabel))
-                dialog.dismiss()
-            }
-        }
-
-        builder.create().show()
-    }
-}

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

@@ -1,17 +1,12 @@
 package protect.card_locker;
 
 import android.app.Activity;
+import android.app.ProgressDialog;
 import android.content.Context;
+import android.content.DialogInterface;
 import android.database.sqlite.SQLiteDatabase;
 import android.util.Log;
-import android.view.ViewGroup;
-import android.widget.LinearLayout;
-import android.widget.ProgressBar;
-import android.widget.TextView;
-
-import androidx.appcompat.app.AlertDialog;
-
-import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+import android.widget.Toast;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -37,7 +32,7 @@ public class ImportExportTask implements CompatCallable<ImportExportResult> {
     private char[] password;
     private TaskCompleteListener listener;
 
-    private AlertDialog progress;
+    private ProgressDialog progress;
 
     /**
      * Constructor which will setup a task for exporting to the given file
@@ -93,36 +88,12 @@ public class ImportExportTask implements CompatCallable<ImportExportResult> {
     }
 
     public void onPreExecute() {
-        MaterialAlertDialogBuilder progressDialogBuilder = new MaterialAlertDialogBuilder(activity);
-        progressDialogBuilder.setCancelable(false);  // Don't cancel if user taps next to dialog
-        progressDialogBuilder.setTitle(doImport ? R.string.importing : R.string.exporting);
+        progress = new ProgressDialog(activity);
+        progress.setTitle(doImport ? R.string.importing : R.string.exporting);
 
-        // Create components
-        TextView progressDialogTextView = new TextView(activity);
-        progressDialogTextView.setText(R.string.pleaseDoNotRotateTheDevice); // FIXME: Instead of telling the user to not rotate, rotation should not cancel the import
-        ProgressBar progressDialogProgressBar = new ProgressBar(activity);
-        progressDialogProgressBar.setIndeterminate(true);
+        progress.setOnCancelListener(dialog -> cancel());
+        progress.setOnDismissListener(dialog -> cancel());
 
-        // Create LinearLayout (to put the components below each other)
-        LinearLayout progressDialogLayout = new LinearLayout(activity);
-        progressDialogLayout.setOrientation(LinearLayout.VERTICAL);
-        LinearLayout.LayoutParams progressDialogLayoutParams = new LinearLayout.LayoutParams(
-                ViewGroup.LayoutParams.MATCH_PARENT,
-                ViewGroup.LayoutParams.MATCH_PARENT
-        );
-        int contentPadding = activity.getResources().getDimensionPixelSize(R.dimen.alert_dialog_content_padding);
-        progressDialogLayoutParams.setMargins(contentPadding, contentPadding / 2, contentPadding, 0);
-
-        // Put components in layout
-        progressDialogLayout.addView(progressDialogTextView, progressDialogLayoutParams);
-        progressDialogLayout.addView(progressDialogProgressBar, progressDialogLayoutParams);
-
-        // Create and show dialog
-        progressDialogBuilder.setView(progressDialogLayout);
-        progressDialogBuilder.setNeutralButton(R.string.cancel, (dialogInterface, i) -> cancel());
-        progressDialogBuilder.setOnCancelListener(dialogInterface -> cancel());
-        progressDialogBuilder.setOnDismissListener(dialogInterface -> cancel());
-        progress = progressDialogBuilder.create();
         progress.show();
     }
 

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

@@ -0,0 +1,145 @@
+package protect.card_locker;
+
+import android.content.Context;
+import android.content.res.Resources;
+import android.content.res.TypedArray;
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.graphics.Rect;
+import android.graphics.Typeface;
+import android.text.TextPaint;
+import android.util.Log;
+
+import androidx.core.graphics.PaintCompat;
+
+/**
+ * Original from https://github.com/andOTP/andOTP/blob/master/app/src/main/java/org/shadowice/flocke/andotp/Utilities/LetterBitmap.java
+ * which was originally from http://stackoverflow.com/questions/23122088/colored-boxed-with-letters-a-la-gmail
+ * Used to create a {@link Bitmap} that contains a letter used in the English
+ * alphabet or digit, if there is no letter or digit available, a default image
+ * is shown instead.
+ */
+class LetterBitmap {
+
+    /**
+     * The number of available tile colors
+     */
+    private static final int NUM_OF_TILE_COLORS = 8;
+    /**
+     * The letter bitmap
+     */
+    private final Bitmap mBitmap;
+    /**
+     * The background color of the letter bitmap
+     */
+    private final Integer mColor;
+
+    /**
+     * Constructor for <code>LetterTileProvider</code>
+     *
+     * @param context            The {@link Context} to use
+     * @param displayName        The name used to create the letter for the tile
+     * @param key                The key used to generate the background color for the tile
+     * @param tileLetterFontSize The font size used to display the letter
+     * @param width              The desired width of the tile
+     * @param height             The desired height of the tile
+     * @param backgroundColor    (optional) color to use for background.
+     * @param textColor          (optional) color to use for text.
+     */
+    public LetterBitmap(Context context, String displayName, String key, int tileLetterFontSize,
+                        int width, int height, Integer backgroundColor, Integer textColor) {
+        TextPaint paint = new TextPaint();
+
+        if (textColor != null) {
+            paint.setColor(textColor);
+        } else {
+            paint.setColor(Color.WHITE);
+        }
+
+        paint.setTextAlign(Paint.Align.CENTER);
+        paint.setAntiAlias(true);
+        paint.setTextSize(tileLetterFontSize);
+        paint.setTypeface(Typeface.defaultFromStyle(Typeface.BOLD));
+
+        if (backgroundColor == null) {
+            mColor = getDefaultColor(context, key);
+        } else {
+            mColor = backgroundColor;
+        }
+
+        mBitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
+        String firstChar = displayName.substring(0, 1).toUpperCase();
+        int firstCharEnd = 2;
+        while (firstCharEnd <= displayName.length()) {
+            // Test for the longest render-able string
+            // But ignore containing only a-Z0-9 to not render things like ffi as a single character
+            String test = displayName.substring(0, firstCharEnd);
+            if (!isAlphabetical(test) && PaintCompat.hasGlyph(paint, test)) {
+                firstChar = test;
+            }
+            firstCharEnd++;
+        }
+
+        Log.d("LetterBitmap", "using sequence " + firstChar + " to render first char which has length " + firstChar.length());
+
+        final Canvas c = new Canvas();
+        c.setBitmap(mBitmap);
+        c.drawColor(mColor);
+
+        Rect bounds = new Rect();
+        paint.getTextBounds(firstChar, 0, firstChar.length(), bounds);
+        c.drawText(firstChar,
+                0, firstChar.length(),
+                width / 2.0f, (height - (bounds.bottom + bounds.top)) / 2.0f
+                , paint);
+
+    }
+
+    /**
+     * @return A {@link Bitmap} that contains a letter used in the English
+     * alphabet or digit, if there is no letter or digit available, a
+     * default image is shown instead
+     */
+    public Bitmap getLetterTile() {
+        return mBitmap;
+    }
+
+    /**
+     * @return background color used for letter title.
+     */
+    public int getBackgroundColor() {
+        return mColor;
+    }
+
+    /**
+     * @param key The key used to generate the tile color
+     * @return A new or previously chosen color for <code>key</code> used as the
+     * tile background color
+     */
+    private static int pickColor(String key, TypedArray colors) {
+        // String.hashCode() is not supposed to change across java versions, so
+        // this should guarantee the same key always maps to the same color
+        final int color = Math.abs(key.hashCode()) % NUM_OF_TILE_COLORS;
+        return colors.getColor(color, Color.BLACK);
+    }
+
+    private static boolean isAlphabetical(String string) {
+        return string.matches("[a-zA-Z0-9]*");
+    }
+
+    /**
+     * Determine the color which the letter tile will use if no default
+     * color is provided.
+     */
+    public static int getDefaultColor(Context context, String key) {
+        final Resources res = context.getResources();
+
+        TypedArray colors = res.obtainTypedArray(R.array.letter_tile_colors);
+        int color = pickColor(key, colors);
+        colors.recycle();
+
+        return color;
+    }
+}

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

@@ -1,136 +0,0 @@
-package protect.card_locker
-
-import android.content.Context
-import android.content.res.TypedArray
-import android.graphics.Bitmap
-import android.graphics.Canvas
-import android.graphics.Color
-import android.graphics.Paint
-import android.graphics.Rect
-import android.graphics.Typeface
-import android.text.TextPaint
-import android.util.Log
-import androidx.core.graphics.PaintCompat
-import java.util.Locale
-import kotlin.math.abs
-
-/**
- * Original from https://github.com/andOTP/andOTP/blob/master/app/src/main/java/org/shadowice/flocke/andotp/Utilities/LetterBitmap.java
- * which was originally from http://stackoverflow.com/questions/23122088/colored-boxed-with-letters-a-la-gmail
- * Used to create a {@link Bitmap} that contains a letter used in the English
- * alphabet or digit, if there is no letter or digit available, a default image
- * is shown instead.
- *
- * @constructor Constructor for <code>LetterTileProvider</code>
- * @param context            The {@link Context} to use
- * @param displayName        The name used to create the letter for the tile
- * @param key                The key used to generate the background color for the tile
- * @param tileLetterFontSize The font size used to display the letter
- * @param width              The desired width of the tile
- * @param height             The desired height of the tile
- * @param backgroundColor    (optional) color to use for background.
- * @param textColor          (optional) color to use for text.
- */
-class LetterBitmap(
-    context: Context, displayName: String, key: String, tileLetterFontSize: Int,
-    width: Int, height: Int, backgroundColor: Int?, textColor: Int?
-) {
-    /**
-     * A {@link Bitmap} that contains a letter used in the English
-     * alphabet or digit, if there is no letter or digit available, a
-     * default image is shown instead
-     */
-    private val letterTile: Bitmap
-
-    /**
-     * The background color of the letter bitmap
-     */
-    private val mColor: Int
-
-    init {
-        val paint = TextPaint().apply {
-            color = textColor ?: Color.WHITE
-            textAlign = Paint.Align.CENTER
-            isAntiAlias = true
-            textSize = tileLetterFontSize.toFloat()
-            typeface = Typeface.defaultFromStyle(Typeface.BOLD)
-        }
-
-        mColor = backgroundColor ?: getDefaultColor(context, key)
-
-        this.letterTile = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888)
-
-        var firstChar = displayName.substring(0, 1).uppercase(Locale.getDefault())
-        var firstCharEnd = 2
-        while (firstCharEnd <= displayName.length) {
-            // Test for the longest render-able string
-            // But ignore containing only a-Z0-9 to not render things like ffi as a single character
-            val test = displayName.substring(0, firstCharEnd)
-            if (!isAlphabetical(test) && PaintCompat.hasGlyph(paint, test)) {
-                firstChar = test
-            }
-            firstCharEnd++
-        }
-
-        Log.d(
-            "LetterBitmap",
-            "using sequence $firstChar to render first char which has length ${firstChar.length}"
-        )
-
-        Canvas().apply {
-            setBitmap(this@LetterBitmap.letterTile)
-            drawColor(mColor)
-
-            val bounds = Rect()
-            paint.getTextBounds(firstChar, 0, firstChar.length, bounds)
-            drawText(
-                firstChar,
-                0, firstChar.length,
-                width / 2.0f, (height - (bounds.bottom + bounds.top)) / 2.0f,
-                paint
-            )
-        }
-    }
-
-    val backgroundColor: Int
-        /**
-         * @return background color used for letter title.
-         */
-        get() = mColor
-    
-    fun getLetterTile(): Bitmap {
-        return letterTile
-    }
-
-    companion object {
-        /**
-         * @param key The key used to generate the tile color
-         * @return A new or previously chosen color for `key` used as the
-         * tile background color
-         */
-        private fun pickColor(key: String, colors: TypedArray): Int {
-            // String.hashCode() is not supposed to change across java versions, so
-            // this should guarantee the same key always maps to the same color
-            val color = abs(key.hashCode()) % colors.length()
-            return colors.getColor(color, Color.BLACK)
-        }
-
-        private fun isAlphabetical(string: String): Boolean {
-            return string.matches("[a-zA-Z0-9]*".toRegex())
-        }
-
-        /**
-         * Determine the color which the letter tile will use if no default
-         * color is provided.
-         */
-        fun getDefaultColor(context: Context, key: String): Int {
-            val res = context.resources
-
-            val colors = res.obtainTypedArray(R.array.letter_tile_colors)
-            val color: Int = pickColor(key, colors)
-            colors.recycle()
-
-            return color
-        }
-    }
-}

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

@@ -101,8 +101,7 @@ class ListWidget : AppWidgetProvider() {
             setInt(R.id.item_container_foreground, "setBackgroundColor", headerColor)
             val icon = loyaltyCard.getImageThumbnail(context)
             // setImageViewIcon is not supported on Android 5, so force Android 5 down the text path
-            // FIXME: The icon flow causes a crash up to Android 12L, so SDK_INT is forced up from 23 to 33
-            if (icon != null && Build.VERSION.SDK_INT >= 32) {
+            if (icon != null && Build.VERSION.SDK_INT >= 23) {
                 setInt(R.id.item_container_foreground, "setBackgroundColor", foreground)
                 setImageViewIcon(R.id.item_image, Icon.createWithBitmap(icon))
                 setViewVisibility(R.id.item_text, View.INVISIBLE)

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

@@ -123,8 +123,8 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
     ChipGroup groupsChips;
     AutoCompleteTextView validFromField;
     AutoCompleteTextView expiryField;
-    AutoCompleteTextView balanceCurrencyField;
     EditText balanceField;
+    AutoCompleteTextView balanceCurrencyField;
     TextView cardIdFieldView;
     AutoCompleteTextView barcodeIdField;
     AutoCompleteTextView barcodeTypeField;
@@ -148,9 +148,9 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
     boolean onRestoring = false;
     AlertDialog confirmExitDialog = null;
 
+    boolean validBalance = true;
     HashMap<String, Currency> currencies = new HashMap<>();
     HashMap<String, String> currencySymbols = new HashMap<>();
-    boolean validBalance = true;
 
     ActivityResultLauncher<Uri> mPhotoTakerLauncher;
     ActivityResultLauncher<Intent> mPhotoPickerLauncher;
@@ -193,14 +193,14 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
         viewModel.setHasChanged(true);
     }
 
-    protected void setLoyaltyCardBalanceType(@Nullable Currency balanceType) {
-        viewModel.getLoyaltyCard().setBalanceType(balanceType);
+    protected void setLoyaltyCardBalance(@NonNull BigDecimal balance) {
+        viewModel.getLoyaltyCard().setBalance(balance);
 
         viewModel.setHasChanged(true);
     }
 
-    protected void setLoyaltyCardBalance(@NonNull BigDecimal balance) {
-        viewModel.getLoyaltyCard().setBalance(balance);
+    protected void setLoyaltyCardBalanceType(@Nullable Currency balanceType) {
+        viewModel.getLoyaltyCard().setBalanceType(balanceType);
 
         viewModel.setHasChanged(true);
     }
@@ -329,8 +329,8 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
         groupsChips = binding.groupChips;
         validFromField = binding.validFromField;
         expiryField = binding.expiryField;
-        balanceCurrencyField = binding.balanceCurrencyField;
         balanceField = binding.balanceField;
+        balanceCurrencyField = binding.balanceCurrencyField;
         cardIdFieldView = binding.cardIdView;
         barcodeIdField = binding.barcodeIdField;
         barcodeTypeField = binding.barcodeTypeField;
@@ -373,6 +373,33 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
 
         setMaterialDatePickerResultListener();
 
+        balanceField.setOnFocusChangeListener((v, hasFocus) -> {
+            if (!hasFocus && !onResuming && !onRestoring) {
+                if (balanceField.getText().toString().isEmpty()) {
+                    setLoyaltyCardBalance(BigDecimal.valueOf(0));
+                }
+
+                balanceField.setText(Utils.formatBalanceWithoutCurrencySymbol(viewModel.getLoyaltyCard().balance, viewModel.getLoyaltyCard().balanceType));
+            }
+        });
+
+        balanceField.addTextChangedListener(new SimpleTextWatcher() {
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+                if (onResuming || onRestoring) return;
+                try {
+                    BigDecimal balance = Utils.parseBalance(s.toString(), viewModel.getLoyaltyCard().balanceType);
+                    setLoyaltyCardBalance(balance);
+                    balanceField.setError(null);
+                    validBalance = true;
+                } catch (ParseException e) {
+                    e.printStackTrace();
+                    balanceField.setError(getString(R.string.balanceParsingFailed));
+                    validBalance = false;
+                }
+            }
+        });
+
         balanceCurrencyField.addTextChangedListener(new SimpleTextWatcher() {
             @Override
             public void onTextChanged(CharSequence s, int start, int before, int count) {
@@ -425,33 +452,6 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
             }
         });
 
-        balanceField.setOnFocusChangeListener((v, hasFocus) -> {
-            if (!hasFocus && !onResuming && !onRestoring) {
-                if (balanceField.getText().toString().isEmpty()) {
-                    setLoyaltyCardBalance(BigDecimal.valueOf(0));
-                }
-
-                balanceField.setText(Utils.formatBalanceWithoutCurrencySymbol(viewModel.getLoyaltyCard().balance, viewModel.getLoyaltyCard().balanceType));
-            }
-        });
-
-        balanceField.addTextChangedListener(new SimpleTextWatcher() {
-            @Override
-            public void onTextChanged(CharSequence s, int start, int before, int count) {
-                if (onResuming || onRestoring) return;
-                try {
-                    BigDecimal balance = Utils.parseBalance(s.toString(), viewModel.getLoyaltyCard().balanceType);
-                    setLoyaltyCardBalance(balance);
-                    balanceField.setError(null);
-                    validBalance = true;
-                } catch (ParseException e) {
-                    e.printStackTrace();
-                    balanceField.setError(getString(R.string.balanceParsingFailed));
-                    validBalance = false;
-                }
-            }
-        });
-
         cardIdFieldView.addTextChangedListener(new SimpleTextWatcher() {
             @Override
             public void beforeTextChanged(CharSequence s, int start, int count, int after) {
@@ -719,6 +719,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
         int colorOnSurface = MaterialColors.getColor(this, com.google.android.material.R.attr.colorOnSurface, ContextCompat.getColor(this, R.color.md_theme_light_onSurface));
         int colorBackground = MaterialColors.getColor(this, android.R.attr.colorBackground, ContextCompat.getColor(this, R.color.md_theme_light_onSurface));
         mCropperOptions.setToolbarColor(colorSurface);
+        mCropperOptions.setStatusBarColor(colorSurface);
         mCropperOptions.setToolbarWidgetColor(colorOnSurface);
         mCropperOptions.setRootViewBackgroundColor(colorBackground);
         // set tool tip to be the darker of primary color

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

@@ -4,12 +4,6 @@ import android.app.Application;
 
 import androidx.appcompat.app.AppCompatDelegate;
 
-import org.acra.ACRA;
-import org.acra.config.CoreConfigurationBuilder;
-import org.acra.config.DialogConfigurationBuilder;
-import org.acra.config.MailSenderConfigurationBuilder;
-import org.acra.data.StringFormat;
-
 import protect.card_locker.preferences.Settings;
 
 public class LoyaltyCardLockerApplication extends Application {
@@ -18,27 +12,6 @@ public class LoyaltyCardLockerApplication extends Application {
     public void onCreate() {
         super.onCreate();
 
-        // Initialize crash reporter (if enabled)
-        if (BuildConfig.useAcraCrashReporter) {
-            ACRA.init(this, new CoreConfigurationBuilder()
-                    //core configuration:
-                    .withBuildConfigClass(BuildConfig.class)
-                    .withReportFormat(StringFormat.KEY_VALUE_LIST)
-                    .withPluginConfigurations(
-                            new DialogConfigurationBuilder()
-                                    .withText(String.format(getString(R.string.acra_catima_has_crashed), getString(R.string.app_name)))
-                                    .withCommentPrompt(getString(R.string.acra_explain_crash))
-                                    .withResTheme(R.style.AppTheme)
-                                    .build(),
-                            new MailSenderConfigurationBuilder()
-                                    .withMailTo("acra-crash@catima.app")
-                                    .withSubject(String.format(getString(R.string.acra_crash_email_subject), getString(R.string.app_name)))
-                                    .build()
-                    )
-            );
-        }
-
-        // Set theme
         Settings settings = new Settings(this);
         AppCompatDelegate.setDefaultNightMode(settings.getTheme());
     }

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

@@ -1,9 +1,8 @@
 package protect.card_locker;
 
 import android.content.ActivityNotFoundException;
-import android.content.ClipData;
-import android.content.ClipboardManager;
 import android.content.Intent;
+import android.content.pm.ActivityInfo;
 import android.content.res.ColorStateList;
 import android.content.res.Configuration;
 import android.database.sqlite.SQLiteDatabase;
@@ -263,6 +262,19 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
 
         settings = new Settings(this);
 
+        String cardOrientation = settings.getCardViewOrientation();
+        if (cardOrientation.equals(getString(R.string.settings_key_follow_sensor_orientation))) {
+            setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_SENSOR);
+        } else if (cardOrientation.equals(getString(R.string.settings_key_lock_on_opening_orientation))) {
+            setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LOCKED);
+        } else if (cardOrientation.equals(getString(R.string.settings_key_portrait_orientation))) {
+            setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
+        } else if (cardOrientation.equals(getString(R.string.settings_key_landscape_orientation))) {
+            setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
+        } else {
+            setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED);
+        }
+
         if (savedInstanceState != null) {
             mainImageIndex = savedInstanceState.getInt(STATE_IMAGEINDEX);
             isFullscreen = savedInstanceState.getBoolean(STATE_FULLSCREEN);
@@ -705,22 +717,10 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
             AlertDialog.Builder builder = new MaterialAlertDialogBuilder(LoyaltyCardViewActivity.this);
             builder.setTitle(R.string.cardId);
             builder.setView(cardIdView);
-            builder.setPositiveButton(android.R.string.ok, (dialog, which) -> dialog.dismiss());
-            builder.setNeutralButton(R.string.copy_value, (dialog, which) -> {
-                copyCardIdToClipboard();
-            });
+            builder.setPositiveButton(R.string.ok, (dialogInterface, i) -> dialogInterface.dismiss());
             AlertDialog dialog = builder.create();
             dialog.show();
         });
-        binding.mainImageDescription.setOnLongClickListener(view -> {
-            if (mainImageIndex != 0) {
-                // Don't copy to clipboard, we're showing something else
-                return false;
-            }
-
-            copyCardIdToClipboard();
-            return true;
-        });
 
         int backgroundHeaderColor = Utils.getHeaderColor(this, loyaltyCard);
 
@@ -1098,12 +1098,6 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
     }
 
     private void setMainImagePreviousNextButtons() {
-        // Ensure the main image index is valid. After a card update, some images (front/back/barcode)
-        // may have been removed, so the index should not exceed the number of available images.
-        if(mainImageIndex > imageTypes.size() - 1){
-            mainImageIndex = 0;
-        }
-
         if (imageTypes.size() < 2) {
             binding.mainLeftButton.setVisibility(View.INVISIBLE);
             binding.mainRightButton.setVisibility(View.INVISIBLE);
@@ -1260,20 +1254,4 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
             );
         }
     }
-
-    private void copyCardIdToClipboard() {
-        // Take the value that’s already displayed to the user
-        String value = loyaltyCard.cardId;
-
-        if (value == null || value.isEmpty()) {
-            Toast.makeText(this, R.string.nothing_to_copy, Toast.LENGTH_SHORT).show();
-            return;
-        }
-
-        ClipboardManager cm = (ClipboardManager) getSystemService(CLIPBOARD_SERVICE);
-        ClipData clip = ClipData.newPlainText(getString(R.string.cardId), value);
-        cm.setPrimaryClip(clip);
-
-        Toast.makeText(this, R.string.copied_to_clipboard, Toast.LENGTH_SHORT).show();
-    }
 }

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

@@ -0,0 +1,880 @@
+package protect.card_locker;
+
+import android.app.Activity;
+import android.app.SearchManager;
+import android.appwidget.AppWidgetManager;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.database.CursorIndexOutOfBoundsException;
+import android.database.sqlite.SQLiteDatabase;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Bundle;
+import android.util.DisplayMetrics;
+import android.util.Log;
+import android.util.TypedValue;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.CheckBox;
+import android.widget.Toast;
+
+import androidx.activity.OnBackPressedCallback;
+import androidx.activity.result.ActivityResultLauncher;
+import androidx.activity.result.contract.ActivityResultContracts;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.view.ActionMode;
+import androidx.appcompat.widget.SearchView;
+import androidx.core.splashscreen.SplashScreen;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import com.google.android.material.tabs.TabLayout;
+
+import java.io.File;
+import java.io.UnsupportedEncodingException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import protect.card_locker.databinding.ContentMainBinding;
+import protect.card_locker.databinding.MainActivityBinding;
+import protect.card_locker.databinding.SortingOptionBinding;
+import protect.card_locker.preferences.Settings;
+import protect.card_locker.preferences.SettingsActivity;
+
+public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCardCursorAdapter.CardAdapterListener {
+    private MainActivityBinding binding;
+    private ContentMainBinding contentMainBinding;
+    private static final String TAG = "Catima";
+    public static final String RESTART_ACTIVITY_INTENT = "restart_activity_intent";
+
+    private static final int MEDIUM_SCALE_FACTOR_DIP = 460;
+    static final String STATE_SEARCH_QUERY = "SEARCH_QUERY";
+
+    private SQLiteDatabase mDatabase;
+    private LoyaltyCardCursorAdapter mAdapter;
+    private ActionMode mCurrentActionMode;
+    private SearchView mSearchView;
+    private int mLoyaltyCardCount = 0;
+    protected String mFilter = "";
+    private String currentQuery = "";
+    private String finalQuery = "";
+    protected Object mGroup = null;
+    protected DBHelper.LoyaltyCardOrder mOrder = DBHelper.LoyaltyCardOrder.Alpha;
+    protected DBHelper.LoyaltyCardOrderDirection mOrderDirection = DBHelper.LoyaltyCardOrderDirection.Ascending;
+    protected int selectedTab = 0;
+    private RecyclerView mCardList;
+    private View mHelpSection;
+    private View mNoMatchingCardsText;
+    private View mNoGroupCardsText;
+    private TabLayout groupsTabLayout;
+    private Runnable mUpdateLoyaltyCardListRunnable;
+    private ActivityResultLauncher<Intent> mBarcodeScannerLauncher;
+    private ActivityResultLauncher<Intent> mSettingsLauncher;
+
+    private ActionMode.Callback mCurrentActionModeCallback = new ActionMode.Callback() {
+        @Override
+        public boolean onCreateActionMode(ActionMode inputMode, Menu inputMenu) {
+            inputMode.getMenuInflater().inflate(R.menu.card_longclick_menu, inputMenu);
+            return true;
+        }
+
+        @Override
+        public boolean onPrepareActionMode(ActionMode inputMode, Menu inputMenu) {
+            return false;
+        }
+
+        @Override
+        public boolean onActionItemClicked(ActionMode inputMode, MenuItem inputItem) {
+            if (inputItem.getItemId() == R.id.action_share) {
+                final ImportURIHelper importURIHelper = new ImportURIHelper(MainActivity.this);
+                try {
+                    importURIHelper.startShareIntent(mAdapter.getSelectedItems());
+                } catch (UnsupportedEncodingException e) {
+                    Toast.makeText(MainActivity.this, R.string.failedGeneratingShareURL, Toast.LENGTH_LONG).show();
+                    e.printStackTrace();
+                }
+                inputMode.finish();
+                return true;
+            } else if (inputItem.getItemId() == R.id.action_edit) {
+                if (mAdapter.getSelectedItemCount() != 1) {
+                    throw new IllegalArgumentException("Cannot edit more than 1 card at a time");
+                }
+
+                Intent intent = new Intent(getApplicationContext(), LoyaltyCardEditActivity.class);
+                Bundle bundle = new Bundle();
+                bundle.putInt(LoyaltyCardEditActivity.BUNDLE_ID, mAdapter.getSelectedItems().get(0).id);
+                bundle.putBoolean(LoyaltyCardEditActivity.BUNDLE_UPDATE, true);
+                intent.putExtras(bundle);
+                startActivity(intent);
+                inputMode.finish();
+                return true;
+            } else if (inputItem.getItemId() == R.id.action_delete) {
+                AlertDialog.Builder builder = new MaterialAlertDialogBuilder(MainActivity.this);
+                // The following may seem weird, but it is necessary to give translators enough flexibility.
+                // For example, in Russian, Android's plural quantity "one" actually refers to "any number ending on 1 but not ending in 11".
+                // So while in English the extra non-plural form seems unnecessary duplication, it is necessary to give translators enough flexibility.
+                // In here, we use the plain string when meaning exactly 1, and otherwise use the plural forms
+                if (mAdapter.getSelectedItemCount() == 1) {
+                    builder.setTitle(R.string.deleteTitle);
+                    builder.setMessage(R.string.deleteConfirmation);
+                } else {
+                    builder.setTitle(getResources().getQuantityString(R.plurals.deleteCardsTitle, mAdapter.getSelectedItemCount(), mAdapter.getSelectedItemCount()));
+                    builder.setMessage(getResources().getQuantityString(R.plurals.deleteCardsConfirmation, mAdapter.getSelectedItemCount(), mAdapter.getSelectedItemCount()));
+                }
+
+                builder.setPositiveButton(R.string.confirm, (dialog, which) -> {
+                    for (LoyaltyCard loyaltyCard : mAdapter.getSelectedItems()) {
+                        Log.d(TAG, "Deleting card: " + loyaltyCard.id);
+
+                        DBHelper.deleteLoyaltyCard(mDatabase, MainActivity.this, loyaltyCard.id);
+
+                        ShortcutHelper.removeShortcut(MainActivity.this, loyaltyCard.id);
+                    }
+
+                    TabLayout.Tab tab = groupsTabLayout.getTabAt(selectedTab);
+                    mGroup = tab != null ? tab.getTag() : null;
+
+                    updateLoyaltyCardList(true);
+
+                    dialog.dismiss();
+                });
+                builder.setNegativeButton(R.string.cancel, (dialog, which) -> dialog.dismiss());
+                AlertDialog dialog = builder.create();
+                dialog.show();
+
+                return true;
+            } else if (inputItem.getItemId() == R.id.action_archive) {
+                for (LoyaltyCard loyaltyCard : mAdapter.getSelectedItems()) {
+                    Log.d(TAG, "Archiving card: " + loyaltyCard.id);
+                    DBHelper.updateLoyaltyCardArchiveStatus(mDatabase, loyaltyCard.id, 1);
+                    ShortcutHelper.removeShortcut(MainActivity.this, loyaltyCard.id);
+                    updateLoyaltyCardList(false);
+                    inputMode.finish();
+                    invalidateOptionsMenu();
+                }
+                return true;
+            } else if (inputItem.getItemId() == R.id.action_unarchive) {
+                for (LoyaltyCard loyaltyCard : mAdapter.getSelectedItems()) {
+                    Log.d(TAG, "Unarchiving card: " + loyaltyCard.id);
+                    DBHelper.updateLoyaltyCardArchiveStatus(mDatabase, loyaltyCard.id, 0);
+                    updateLoyaltyCardList(false);
+                    inputMode.finish();
+                    invalidateOptionsMenu();
+                }
+                return true;
+            } else if (inputItem.getItemId() == R.id.action_star) {
+                for (LoyaltyCard loyaltyCard : mAdapter.getSelectedItems()) {
+                    Log.d(TAG, "Starring card: " + loyaltyCard.id);
+                    DBHelper.updateLoyaltyCardStarStatus(mDatabase, loyaltyCard.id, 1);
+                    updateLoyaltyCardList(false);
+                    inputMode.finish();
+                }
+                return true;
+            } else if (inputItem.getItemId() == R.id.action_unstar) {
+                for (LoyaltyCard loyaltyCard : mAdapter.getSelectedItems()) {
+                    Log.d(TAG, "Unstarring card: " + loyaltyCard.id);
+                    DBHelper.updateLoyaltyCardStarStatus(mDatabase, loyaltyCard.id, 0);
+                    updateLoyaltyCardList(false);
+                    inputMode.finish();
+                }
+                return true;
+            }
+
+            return false;
+        }
+
+        @Override
+        public void onDestroyActionMode(ActionMode inputMode) {
+            mAdapter.clearSelections();
+            mCurrentActionMode = null;
+        }
+    };
+
+    @Override
+    protected void onCreate(Bundle inputSavedInstanceState) {
+        SplashScreen.installSplashScreen(this);
+        super.onCreate(inputSavedInstanceState);
+
+        // Delete old cache files
+        // These could be temporary images for the cropper, temporary images in LoyaltyCard toBundle/writeParcel/ etc.
+        new Thread(() -> {
+            long twentyFourHoursAgo = System.currentTimeMillis() - (1000 * 60 * 60 * 24);
+
+            File[] tempFiles = getCacheDir().listFiles();
+
+            if (tempFiles == null) {
+                Log.e(TAG, "getCacheDir().listFiles() somehow returned null, this should never happen... Skipping cache cleanup...");
+                return;
+            }
+
+            for (File file : tempFiles) {
+                if (file.lastModified() < twentyFourHoursAgo) {
+                    if (!file.delete()) {
+                        Log.w(TAG, "Failed to delete cache file " + file.getPath());
+                    }
+                };
+            }
+        }).start();
+
+        // We should extract the share intent after we called the super.onCreate as it may need to spawn a dialog window and the app needs to be initialized to not crash
+        extractIntentFields(getIntent());
+
+        binding = MainActivityBinding.inflate(getLayoutInflater());
+        setContentView(binding.getRoot());
+        Utils.applyWindowInsets(binding.getRoot());
+        setSupportActionBar(binding.toolbar);
+        groupsTabLayout = binding.groups;
+        contentMainBinding = ContentMainBinding.bind(binding.include.getRoot());
+
+        mDatabase = new DBHelper(this).getWritableDatabase();
+
+        mUpdateLoyaltyCardListRunnable = () -> {
+            updateLoyaltyCardList(false);
+        };
+
+        groupsTabLayout.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
+            @Override
+            public void onTabSelected(TabLayout.Tab tab) {
+                selectedTab = tab.getPosition();
+                Log.d("onTabSelected", "Tab Position " + tab.getPosition());
+                mGroup = tab.getTag();
+                updateLoyaltyCardList(false);
+                // Store active tab in Shared Preference to restore next app launch
+                SharedPreferences activeTabPref = getApplicationContext().getSharedPreferences(
+                        getString(R.string.sharedpreference_active_tab),
+                        Context.MODE_PRIVATE);
+                SharedPreferences.Editor activeTabPrefEditor = activeTabPref.edit();
+                activeTabPrefEditor.putInt(getString(R.string.sharedpreference_active_tab), tab.getPosition());
+                activeTabPrefEditor.apply();
+            }
+
+            @Override
+            public void onTabUnselected(TabLayout.Tab tab) {
+
+            }
+
+            @Override
+            public void onTabReselected(TabLayout.Tab tab) {
+
+            }
+        });
+
+        mHelpSection = contentMainBinding.helpSection;
+        mNoMatchingCardsText = contentMainBinding.noMatchingCardsText;
+        mNoGroupCardsText = contentMainBinding.noGroupCardsText;
+        mCardList = contentMainBinding.list;
+
+        mAdapter = new LoyaltyCardCursorAdapter(this, null, this, mUpdateLoyaltyCardListRunnable);
+        mCardList.setAdapter(mAdapter);
+        registerForContextMenu(mCardList);
+
+        mBarcodeScannerLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), result -> {
+            // Exit early if the user cancelled the scan (pressed back/home)
+            if (result.getResultCode() != RESULT_OK) {
+                return;
+            }
+
+            Intent editIntent = new Intent(getApplicationContext(), LoyaltyCardEditActivity.class);
+            editIntent.putExtras(result.getData().getExtras());
+            startActivity(editIntent);
+        });
+
+        mSettingsLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), result -> {
+            if (result.getResultCode() == Activity.RESULT_OK) {
+                Intent intent = result.getData();
+                if (intent != null && intent.getBooleanExtra(RESTART_ACTIVITY_INTENT, false)) {
+                    recreate();
+                }
+            }
+        });
+
+        getOnBackPressedDispatcher().addCallback(this, new OnBackPressedCallback(true) {
+            @Override
+            public void handleOnBackPressed() {
+                if (mSearchView != null && !mSearchView.isIconified()) {
+                    mSearchView.setIconified(true);
+                } else {
+                    finish();
+                }
+            }
+        });
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+
+        if (mCurrentActionMode != null) {
+            mAdapter.clearSelections();
+            mCurrentActionMode.finish();
+        }
+
+        if (mSearchView != null && !mSearchView.isIconified()) {
+            mFilter = mSearchView.getQuery().toString();
+        }
+        // Start of active tab logic
+        updateTabGroups(groupsTabLayout);
+
+        // Restore selected tab from Shared Preference
+        SharedPreferences activeTabPref = getApplicationContext().getSharedPreferences(
+                getString(R.string.sharedpreference_active_tab),
+                Context.MODE_PRIVATE);
+        selectedTab = activeTabPref.getInt(getString(R.string.sharedpreference_active_tab), 0);
+
+        // Restore sort preferences from Shared Preferences
+        mOrder = Utils.getLoyaltyCardOrder(this);
+        mOrderDirection = Utils.getLoyaltyCardOrderDirection(this);
+
+        mGroup = null;
+
+        if (groupsTabLayout.getTabCount() != 0) {
+            TabLayout.Tab tab = groupsTabLayout.getTabAt(selectedTab);
+            if (tab == null) {
+                tab = groupsTabLayout.getTabAt(0);
+            }
+
+            groupsTabLayout.selectTab(tab);
+            assert tab != null;
+            mGroup = tab.getTag();
+        } else {
+            scaleScreen();
+        }
+
+        updateLoyaltyCardList(true);
+        // End of active tab logic
+
+        FloatingActionButton addButton = binding.fabAdd;
+
+        addButton.setOnClickListener(v -> {
+            Intent intent = new Intent(getApplicationContext(), ScanActivity.class);
+            Bundle bundle = new Bundle();
+            if (selectedTab != 0) {
+                bundle.putString(LoyaltyCardEditActivity.BUNDLE_ADDGROUP, groupsTabLayout.getTabAt(selectedTab).getText().toString());
+            }
+            intent.putExtras(bundle);
+            mBarcodeScannerLauncher.launch(intent);
+        });
+        addButton.bringToFront();
+
+        var layoutManager = (GridLayoutManager) mCardList.getLayoutManager();
+        if (layoutManager != null) {
+            var settings = new Settings(this);
+            layoutManager.setSpanCount(settings.getPreferredColumnCount());
+        }
+    }
+
+    private void displayCardSetupOptions(Menu menu, boolean shouldShow) {
+        for (int id : new int[]{R.id.action_search, R.id.action_display_options, R.id.action_sort}) {
+            menu.findItem(id).setVisible(shouldShow);
+        }
+    }
+
+    private void updateLoyaltyCardCount() {
+        mLoyaltyCardCount = DBHelper.getLoyaltyCardCount(mDatabase);
+    }
+
+    private void updateLoyaltyCardList(boolean updateCount) {
+        Group group = null;
+        if (mGroup != null) {
+            group = (Group) mGroup;
+        }
+
+        mAdapter.swapCursor(DBHelper.getLoyaltyCardCursor(mDatabase, mFilter, group, mOrder, mOrderDirection, mAdapter.showingArchivedCards() ? DBHelper.LoyaltyCardArchiveFilter.All : DBHelper.LoyaltyCardArchiveFilter.Unarchived));
+
+        if (updateCount) {
+            updateLoyaltyCardCount();
+            // Update menu icons if necessary
+            invalidateOptionsMenu();
+        }
+
+        if (mLoyaltyCardCount > 0) {
+            // We want the cardList to be visible regardless of the filtered match count
+            // to ensure that the noMatchingCardsText doesn't end up being shown below
+            // the keyboard
+            mHelpSection.setVisibility(View.GONE);
+            mNoGroupCardsText.setVisibility(View.GONE);
+
+            if (mAdapter.getItemCount() > 0) {
+                mCardList.setVisibility(View.VISIBLE);
+                mNoMatchingCardsText.setVisibility(View.GONE);
+            } else {
+                mCardList.setVisibility(View.GONE);
+                if (!mFilter.isEmpty()) {
+                    // Actual Empty Search Result
+                    mNoMatchingCardsText.setVisibility(View.VISIBLE);
+                    mNoGroupCardsText.setVisibility(View.GONE);
+                } else {
+                    // Group Tab with no Group Cards
+                    mNoMatchingCardsText.setVisibility(View.GONE);
+                    mNoGroupCardsText.setVisibility(View.VISIBLE);
+                }
+            }
+        } else {
+            mCardList.setVisibility(View.GONE);
+            mHelpSection.setVisibility(View.VISIBLE);
+
+            mNoMatchingCardsText.setVisibility(View.GONE);
+            mNoGroupCardsText.setVisibility(View.GONE);
+        }
+
+        if (mCurrentActionMode != null) {
+            mCurrentActionMode.finish();
+        }
+
+        new ListWidget().updateAll(mAdapter.mContext);
+    }
+
+    private void processParseResultList(List<ParseResult> parseResultList, String group, boolean closeAppOnNoBarcode) {
+        if (parseResultList.isEmpty()) {
+            throw new IllegalArgumentException("parseResultList may not be empty");
+        }
+
+        Utils.makeUserChooseParseResultFromList(MainActivity.this, parseResultList, new ParseResultListDisambiguatorCallback() {
+            @Override
+            public void onUserChoseParseResult(ParseResult parseResult) {
+                Intent intent = new Intent(getApplicationContext(), LoyaltyCardEditActivity.class);
+                Bundle bundle = parseResult.toLoyaltyCardBundle(MainActivity.this);
+                if (group != null) {
+                    bundle.putString(LoyaltyCardEditActivity.BUNDLE_ADDGROUP, group);
+                }
+                intent.putExtras(bundle);
+                startActivity(intent);
+            }
+
+            @Override
+            public void onUserDismissedSelector() {
+                if (closeAppOnNoBarcode) {
+                    finish();
+                }
+            }
+        });
+    }
+
+    private void onSharedIntent(Intent intent) {
+        String receivedAction = intent.getAction();
+        String receivedType = intent.getType();
+
+        if (receivedAction == null || receivedType == null) {
+            return;
+        }
+
+        List<ParseResult> parseResultList;
+
+        // Check for shared text
+        if (receivedAction.equals(Intent.ACTION_SEND) && receivedType.equals("text/plain")) {
+            LoyaltyCard loyaltyCard = new LoyaltyCard();
+            loyaltyCard.setCardId(intent.getStringExtra(Intent.EXTRA_TEXT));
+            parseResultList = Collections.singletonList(new ParseResult(ParseResultType.BARCODE_ONLY, loyaltyCard));
+        } else {
+            // Parse whatever file was sent, regardless of opening or sharing
+            Uri data;
+            if (receivedAction.equals(Intent.ACTION_VIEW)) {
+                data = intent.getData();
+            } else if (receivedAction.equals(Intent.ACTION_SEND)) {
+                data = intent.getParcelableExtra(Intent.EXTRA_STREAM);
+            } else {
+                Log.e(TAG, "Wrong action type to parse intent");
+                return;
+            }
+
+            if (receivedType.startsWith("image/")) {
+                parseResultList = Utils.retrieveBarcodesFromImage(this, data);
+            } else if (receivedType.equals("application/pdf")) {
+                parseResultList = Utils.retrieveBarcodesFromPdf(this, data);
+            } else if (Arrays.asList("application/vnd.apple.pkpass", "application/vnd-com.apple.pkpass").contains(receivedType)) {
+                parseResultList = Utils.retrieveBarcodesFromPkPass(this, data);
+            } else if (receivedType.equals("application/vnd.espass-espass")) {
+                // FIXME: espass is not pkpass
+                // However, several users stated in https://github.com/CatimaLoyalty/Android/issues/2197 that the formats are extremely similar to the point they could rename an .espass file to .pkpass and have it imported
+                // So it makes sense to "unofficially" treat it as a PKPASS for now, even though not completely correct
+                parseResultList = Utils.retrieveBarcodesFromPkPass(this, data);
+            } else {
+                Log.e(TAG, "Wrong mime-type");
+                return;
+            }
+        }
+
+        // Give up if we should parse but there is nothing to parse
+        if (parseResultList == null || parseResultList.isEmpty()) {
+            finish();
+            return;
+        }
+
+        processParseResultList(parseResultList, null, true);
+    }
+
+    private void extractIntentFields(Intent intent) {
+        onSharedIntent(intent);
+    }
+
+    public void updateTabGroups(TabLayout groupsTabLayout) {
+        List<Group> newGroups = DBHelper.getGroups(mDatabase);
+
+        if (newGroups.size() == 0) {
+            groupsTabLayout.removeAllTabs();
+            groupsTabLayout.setVisibility(View.GONE);
+            return;
+        }
+
+        groupsTabLayout.removeAllTabs();
+
+        TabLayout.Tab allTab = groupsTabLayout.newTab();
+        allTab.setText(R.string.all);
+        allTab.setTag(null);
+        groupsTabLayout.addTab(allTab, false);
+
+        for (Group group : newGroups) {
+            TabLayout.Tab tab = groupsTabLayout.newTab();
+            tab.setText(group._id);
+            tab.setTag(group);
+            groupsTabLayout.addTab(tab, false);
+        }
+
+        groupsTabLayout.setVisibility(View.VISIBLE);
+
+    }
+
+    @Override
+    // Saving currentQuery to finalQuery for user, this will be used to restore search history, happens when user clicks a card from list
+    protected void onSaveInstanceState(@NonNull Bundle outState) {
+        super.onSaveInstanceState(outState);
+        finalQuery = currentQuery;
+        // Putting the query also into outState for later use in onRestoreInstanceState when rotating screen
+        if (mSearchView != null) {
+            outState.putString(STATE_SEARCH_QUERY, finalQuery);
+        }
+    }
+
+    @Override
+    // Restoring instance state when rotation of screen happens with the goal to restore search query for user
+    protected void onRestoreInstanceState(@NonNull Bundle savedInstanceState) {
+        super.onRestoreInstanceState(savedInstanceState);
+        finalQuery = savedInstanceState.getString(STATE_SEARCH_QUERY, "");
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu inputMenu) {
+        getMenuInflater().inflate(R.menu.main_menu, inputMenu);
+
+        displayCardSetupOptions(inputMenu, mLoyaltyCardCount > 0);
+
+        SearchManager searchManager = (SearchManager) getSystemService(Context.SEARCH_SERVICE);
+        if (searchManager != null) {
+            MenuItem searchMenuItem = inputMenu.findItem(R.id.action_search);
+            mSearchView = (SearchView) searchMenuItem.getActionView();
+            mSearchView.setSearchableInfo(searchManager.getSearchableInfo(getComponentName()));
+            mSearchView.setSubmitButtonEnabled(false);
+            mSearchView.setOnCloseListener(() -> {
+                invalidateOptionsMenu();
+                return false;
+            });
+
+            /*
+             * On Android 13 and later, pressing Back while the search view is open hides the keyboard
+             * and collapses the search view at the same time.
+             * This brings back the old behavior on Android 12 and lower: pressing Back once
+             * hides the keyboard, press again while keyboard is hidden to collapse the search view.
+             */
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+                searchMenuItem.setOnActionExpandListener(new MenuItem.OnActionExpandListener() {
+                    @Override
+                    public boolean onMenuItemActionExpand(@NonNull MenuItem item) {
+                        return true;
+                    }
+
+                    @Override
+                    public boolean onMenuItemActionCollapse(@NonNull MenuItem item) {
+                        if (mSearchView.hasFocus()) {
+                            mSearchView.clearFocus();
+                            return false;
+                        }
+                        currentQuery = "";
+                        mFilter = "";
+                        updateLoyaltyCardList(false);
+                        return true;
+                    }
+                });
+            }
+
+            mSearchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
+                @Override
+                public boolean onQueryTextSubmit(String query) {
+                    return false;
+                }
+
+                @Override
+                public boolean onQueryTextChange(String newText) {
+                    mFilter = newText;
+                    // New logic to ensure search history after coming back from picked card - user will see the last search query
+                    if (newText.isEmpty()) {
+                        if(!finalQuery.isEmpty()){
+                            // Setting the query text for user after coming back from picked card from finalQuery
+                            mSearchView.setQuery(finalQuery, false);
+                        }
+                        else if(!currentQuery.isEmpty()){
+                            // Else if is needed in case user deletes search - expected behaviour is to show all cards
+                            currentQuery = "";
+                            mSearchView.setQuery(currentQuery, false);
+                        }
+                    } else {
+                        // Setting search query each time user changes the text in search to temporary variable to be used later in finalQuery String which will be used to restore search history
+                        currentQuery = newText;
+                    }
+                    TabLayout.Tab currentTab = groupsTabLayout.getTabAt(groupsTabLayout.getSelectedTabPosition());
+                    mGroup = currentTab != null ? currentTab.getTag() : null;
+
+                    updateLoyaltyCardList(false);
+
+                    return true;
+                }
+            });
+            // Check if we came from a picked card back to search, in that case we want to show the search view with previous search query
+            if(!finalQuery.isEmpty()){
+                // Expand the search view to show the query
+                searchMenuItem.expandActionView();
+                // Setting the query text to empty String due to behaviour of onQueryTextChange after coming back from picked card - onQueryTextChange is called automatically without users interaction
+                finalQuery = "";
+                mSearchView.setQuery(currentQuery, false);
+            }
+        }
+
+        return super.onCreateOptionsMenu(inputMenu);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem inputItem) {
+        int id = inputItem.getItemId();
+
+        if (id == android.R.id.home) {
+            getOnBackPressedDispatcher().onBackPressed();
+        }
+
+        if (id == R.id.action_display_options) {
+            mAdapter.showDisplayOptionsDialog();
+            invalidateOptionsMenu();
+
+            return true;
+        }
+
+        if (id == R.id.action_sort) {
+            AtomicInteger currentIndex = new AtomicInteger();
+            List<DBHelper.LoyaltyCardOrder> loyaltyCardOrders = Arrays.asList(DBHelper.LoyaltyCardOrder.values());
+            for (int i = 0; i < loyaltyCardOrders.size(); i++) {
+                if (mOrder == loyaltyCardOrders.get(i)) {
+                    currentIndex.set(i);
+                    break;
+                }
+            }
+
+            AlertDialog.Builder builder = new MaterialAlertDialogBuilder(MainActivity.this);
+            builder.setTitle(R.string.sort_by);
+
+            SortingOptionBinding sortingOptionBinding = SortingOptionBinding
+                    .inflate(LayoutInflater.from(MainActivity.this), null, false);
+            final View customLayout = sortingOptionBinding.getRoot();
+            builder.setView(customLayout);
+
+            CheckBox showReversed = sortingOptionBinding.checkBoxReverse;
+
+
+            showReversed.setChecked(mOrderDirection == DBHelper.LoyaltyCardOrderDirection.Descending);
+
+
+            builder.setSingleChoiceItems(R.array.sort_types_array, currentIndex.get(), (dialog, which) -> currentIndex.set(which));
+
+            builder.setPositiveButton(R.string.sort, (dialog, which) -> {
+
+                setSort(
+                        loyaltyCardOrders.get(currentIndex.get()),
+                        showReversed.isChecked() ? DBHelper.LoyaltyCardOrderDirection.Descending : DBHelper.LoyaltyCardOrderDirection.Ascending
+                );
+
+                new ListWidget().updateAll(this);
+
+                dialog.dismiss();
+            });
+
+            builder.setNegativeButton(R.string.cancel, (dialog, which) -> dialog.dismiss());
+
+            AlertDialog dialog = builder.create();
+            dialog.show();
+
+            return true;
+        }
+
+        if (id == R.id.action_manage_groups) {
+            Intent i = new Intent(getApplicationContext(), ManageGroupsActivity.class);
+            startActivity(i);
+            return true;
+        }
+
+        if (id == R.id.action_import_export) {
+            Intent i = new Intent(getApplicationContext(), ImportExportActivity.class);
+            startActivity(i);
+            return true;
+        }
+
+        if (id == R.id.action_settings) {
+            Intent i = new Intent(getApplicationContext(), SettingsActivity.class);
+            mSettingsLauncher.launch(i);
+            return true;
+        }
+
+        if (id == R.id.action_about) {
+            Intent i = new Intent(getApplicationContext(), AboutActivity.class);
+            startActivity(i);
+            return true;
+        }
+
+
+        return super.onOptionsItemSelected(inputItem);
+    }
+
+    private void setSort(DBHelper.LoyaltyCardOrder order, DBHelper.LoyaltyCardOrderDirection direction) {
+        // Update values
+        mOrder = order;
+        mOrderDirection = direction;
+
+        // Store in Shared Preference to restore next app launch
+        SharedPreferences sortPref = getApplicationContext().getSharedPreferences(
+                getString(R.string.sharedpreference_sort),
+                Context.MODE_PRIVATE);
+        SharedPreferences.Editor sortPrefEditor = sortPref.edit();
+        sortPrefEditor.putString(getString(R.string.sharedpreference_sort_order), order.name());
+        sortPrefEditor.putString(getString(R.string.sharedpreference_sort_direction), direction.name());
+        sortPrefEditor.apply();
+
+        // Update card list
+        updateLoyaltyCardList(false);
+    }
+
+    @Override
+    public void onRowLongClicked(int inputPosition) {
+        enableActionMode(inputPosition);
+    }
+
+    private void enableActionMode(int inputPosition) {
+        if (mCurrentActionMode == null) {
+            mCurrentActionMode = startSupportActionMode(mCurrentActionModeCallback);
+        }
+        toggleSelection(inputPosition);
+    }
+
+    private void scaleScreen() {
+        DisplayMetrics displayMetrics = new DisplayMetrics();
+        getWindowManager().getDefaultDisplay().getMetrics(displayMetrics);
+        int screenHeight = displayMetrics.heightPixels;
+        float mediumSizePx = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP,MEDIUM_SCALE_FACTOR_DIP,getResources().getDisplayMetrics());
+        boolean shouldScaleSmaller = screenHeight < mediumSizePx;
+
+        binding.include.welcomeIcon.setVisibility(shouldScaleSmaller ? View.GONE : View.VISIBLE);
+    }
+
+    private void toggleSelection(int inputPosition) {
+        mAdapter.toggleSelection(inputPosition);
+        int count = mAdapter.getSelectedItemCount();
+
+        if (count == 0) {
+            mCurrentActionMode.finish();
+        } else {
+            mCurrentActionMode.setTitle(getResources().getQuantityString(R.plurals.selectedCardCount, count, count));
+
+            MenuItem editItem = mCurrentActionMode.getMenu().findItem(R.id.action_edit);
+            MenuItem archiveItem = mCurrentActionMode.getMenu().findItem(R.id.action_archive);
+            MenuItem unarchiveItem = mCurrentActionMode.getMenu().findItem(R.id.action_unarchive);
+            MenuItem starItem = mCurrentActionMode.getMenu().findItem(R.id.action_star);
+            MenuItem unstarItem = mCurrentActionMode.getMenu().findItem(R.id.action_unstar);
+
+            boolean hasStarred = false;
+            boolean hasUnstarred = false;
+            boolean hasArchived = false;
+            boolean hasUnarchived = false;
+
+            for (LoyaltyCard loyaltyCard : mAdapter.getSelectedItems()) {
+                if (loyaltyCard.starStatus == 1) {
+                    hasStarred = true;
+                } else {
+                    hasUnstarred = true;
+                }
+
+                if (loyaltyCard.archiveStatus == 1) {
+                    hasArchived = true;
+                } else {
+                    hasUnarchived = true;
+                }
+
+                // We have all types, no need to keep checking
+                if (hasStarred && hasUnstarred && hasArchived && hasUnarchived) {
+                    break;
+                }
+            }
+
+            unarchiveItem.setVisible(hasArchived);
+            archiveItem.setVisible(hasUnarchived);
+
+            if (count == 1) {
+                starItem.setVisible(!hasStarred);
+                unstarItem.setVisible(!hasUnstarred);
+                editItem.setVisible(true);
+                editItem.setEnabled(true);
+            } else {
+                starItem.setVisible(hasUnstarred);
+                unstarItem.setVisible(hasStarred);
+
+                editItem.setVisible(false);
+                editItem.setEnabled(false);
+            }
+
+            mCurrentActionMode.invalidate();
+        }
+    }
+
+
+    @Override
+    public void onRowClicked(int inputPosition) {
+        if (mAdapter.getSelectedItemCount() > 0) {
+            enableActionMode(inputPosition);
+        } else {
+            // FIXME
+            //
+            // There is a really nasty edge case that can happen when someone taps a card but right
+            // after it swipes (very small window, hard to reproduce). The cursor gets replaced and
+            // may not have a card at the ID number that is returned from onRowClicked.
+            //
+            // The proper fix, obviously, would involve makes sure an onFling can't happen while a
+            // click is being processed. Sadly, I have not yet found a way to make that possible.
+            LoyaltyCard loyaltyCard;
+            try {
+                loyaltyCard = mAdapter.getCard(inputPosition);
+            } catch (CursorIndexOutOfBoundsException e) {
+                Log.w(TAG, "Prevented crash from tap + swipe on ID " + inputPosition + ": " + e);
+                return;
+            }
+
+            Intent intent = new Intent(this, LoyaltyCardViewActivity.class);
+            intent.setAction("");
+            final Bundle b = new Bundle();
+            b.putInt(LoyaltyCardViewActivity.BUNDLE_ID, loyaltyCard.id);
+
+            ArrayList<Integer> cardList = new ArrayList<>();
+            for (int i = 0; i < mAdapter.getItemCount(); i++) {
+                cardList.add(mAdapter.getCard(i).id);
+            }
+
+            b.putIntegerArrayList(LoyaltyCardViewActivity.BUNDLE_CARDLIST, cardList);
+            intent.putExtras(b);
+
+            startActivity(intent);
+        }
+    }
+}

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

@@ -1,945 +0,0 @@
-package protect.card_locker
-
-import android.app.SearchManager
-import android.content.DialogInterface
-import android.content.Intent
-import android.database.CursorIndexOutOfBoundsException
-import android.database.sqlite.SQLiteDatabase
-import android.net.Uri
-import android.os.Build
-import android.os.Bundle
-import android.util.DisplayMetrics
-import android.util.Log
-import android.util.TypedValue
-import android.view.LayoutInflater
-import android.view.Menu
-import android.view.MenuItem
-import android.view.View
-import android.widget.Toast
-import androidx.activity.OnBackPressedCallback
-import androidx.activity.result.ActivityResult
-import androidx.activity.result.ActivityResultCallback
-import androidx.activity.result.ActivityResultLauncher
-import androidx.activity.result.contract.ActivityResultContracts.StartActivityForResult
-import androidx.appcompat.view.ActionMode
-import androidx.appcompat.widget.SearchView
-import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
-import androidx.recyclerview.widget.GridLayoutManager
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import com.google.android.material.tabs.TabLayout
-import com.google.android.material.tabs.TabLayout.OnTabSelectedListener
-import protect.card_locker.DBHelper.LoyaltyCardOrder
-import protect.card_locker.DBHelper.LoyaltyCardOrderDirection
-import protect.card_locker.LoyaltyCardCursorAdapter.CardAdapterListener
-import protect.card_locker.databinding.ContentMainBinding
-import protect.card_locker.databinding.MainActivityBinding
-import protect.card_locker.databinding.SortingOptionBinding
-import protect.card_locker.preferences.Settings
-import protect.card_locker.preferences.SettingsActivity
-import java.io.UnsupportedEncodingException
-import java.util.concurrent.atomic.AtomicInteger
-import androidx.core.content.edit
-
-class MainActivity : CatimaAppCompatActivity(), CardAdapterListener {
-    private lateinit var binding: MainActivityBinding
-    private lateinit var contentMainBinding: ContentMainBinding
-    private lateinit var mDatabase: SQLiteDatabase
-    private lateinit var mAdapter: LoyaltyCardCursorAdapter
-    private var mCurrentActionMode: ActionMode? = null
-    private var mSearchView: SearchView? = null
-    private var mLoyaltyCardCount = 0
-    @JvmField
-    var mFilter: String = ""
-    private var currentQuery = ""
-    private var finalQuery = ""
-    private var mGroup: Any? = null
-    private var mOrder: LoyaltyCardOrder = LoyaltyCardOrder.Alpha
-    private var mOrderDirection: LoyaltyCardOrderDirection = LoyaltyCardOrderDirection.Ascending
-    private var selectedTab: Int = 0
-    private lateinit var groupsTabLayout: TabLayout
-    private lateinit var mUpdateLoyaltyCardListRunnable: Runnable
-    private lateinit var mBarcodeScannerLauncher: ActivityResultLauncher<Intent>
-    private lateinit var mSettingsLauncher: ActivityResultLauncher<Intent>
-
-    private val mCurrentActionModeCallback: ActionMode.Callback = object : ActionMode.Callback {
-        override fun onCreateActionMode(inputMode: ActionMode, inputMenu: Menu?): Boolean {
-            inputMode.menuInflater.inflate(R.menu.card_longclick_menu, inputMenu)
-            return true
-        }
-
-        override fun onPrepareActionMode(inputMode: ActionMode?, inputMenu: Menu?): Boolean {
-            return false
-        }
-
-        override fun onActionItemClicked(inputMode: ActionMode, inputItem: MenuItem): Boolean {
-            when (inputItem.itemId) {
-                R.id.action_share -> {
-                    try {
-                        ImportURIHelper(this@MainActivity).startShareIntent(mAdapter.getSelectedItems())
-                    } catch (e: UnsupportedEncodingException) {
-                        Toast.makeText(
-                            this@MainActivity,
-                            R.string.failedGeneratingShareURL,
-                            Toast.LENGTH_LONG
-                        ).show()
-                        e.printStackTrace()
-                    }
-                    inputMode.finish()
-                    return true
-                }
-                R.id.action_edit -> {
-                    require(mAdapter.selectedItemCount == 1) { "Cannot edit more than 1 card at a time" }
-
-                    startActivity(
-                        Intent(applicationContext, LoyaltyCardEditActivity::class.java).apply {
-                            putExtras(Bundle().apply {
-                                putInt(
-                                    LoyaltyCardEditActivity.BUNDLE_ID,
-                                    mAdapter.getSelectedItems()[0].id
-                                )
-                                putBoolean(LoyaltyCardEditActivity.BUNDLE_UPDATE, true)
-                            })
-                        }
-                    )
-
-                    inputMode.finish()
-                    return true
-                }
-                R.id.action_duplicate -> {
-                    require(mAdapter.selectedItemCount == 1) { "Cannot duplicate more than 1 card at a time" }
-
-                    startActivity(
-                        Intent(applicationContext, LoyaltyCardEditActivity::class.java).apply {
-                            putExtras(Bundle().apply {
-                                putInt(
-                                    LoyaltyCardEditActivity.BUNDLE_ID,
-                                    mAdapter.getSelectedItems()[0].id
-                                )
-                                putBoolean(LoyaltyCardEditActivity.BUNDLE_DUPLICATE_ID, true)
-                            })
-                        }
-                    )
-
-                    inputMode.finish()
-                    return true
-                }
-                R.id.action_delete -> {
-                    MaterialAlertDialogBuilder(this@MainActivity).apply {
-                        // The following may seem weird, but it is necessary to give translators enough flexibility.
-                        // For example, in Russian, Android's plural quantity "one" actually refers to "any number ending on 1 but not ending in 11".
-                        // So while in English the extra non-plural form seems unnecessary duplication, it is necessary to give translators enough flexibility.
-                        // In here, we use the plain string when meaning exactly 1, and otherwise use the plural forms
-                        if (mAdapter.selectedItemCount == 1) {
-                            setTitle(R.string.deleteTitle)
-                            setMessage(R.string.deleteConfirmation)
-                        } else {
-                            setTitle(
-                                getResources().getQuantityString(
-                                    R.plurals.deleteCardsTitle,
-                                    mAdapter.selectedItemCount,
-                                    mAdapter.selectedItemCount
-                                )
-                            )
-                            setMessage(
-                                getResources().getQuantityString(
-                                    R.plurals.deleteCardsConfirmation,
-                                    mAdapter.selectedItemCount,
-                                    mAdapter.selectedItemCount
-                                )
-                            )
-                        }
-
-                        setPositiveButton(
-                            R.string.confirm
-                        ) { dialog, _ ->
-                            for (loyaltyCard in mAdapter.getSelectedItems()) {
-                                Log.d(TAG, "Deleting card: " + loyaltyCard.id)
-
-                                DBHelper.deleteLoyaltyCard(mDatabase, this@MainActivity, loyaltyCard.id)
-
-                                ShortcutHelper.removeShortcut(this@MainActivity, loyaltyCard.id)
-                            }
-                            val tab = groupsTabLayout.getTabAt(selectedTab)
-                            mGroup = tab?.tag
-
-                            updateLoyaltyCardList(true)
-                            dialog.dismiss()
-                        }
-
-                        setNegativeButton(R.string.cancel) { dialog, _ ->
-                            dialog.dismiss()
-                        }
-                    }.create().show()
-
-                    return true
-                }
-                R.id.action_archive -> {
-                    for (loyaltyCard in mAdapter.getSelectedItems()) {
-                        Log.d(TAG, "Archiving card: " + loyaltyCard.id)
-                        DBHelper.updateLoyaltyCardArchiveStatus(mDatabase, loyaltyCard.id, 1)
-                        ShortcutHelper.removeShortcut(this@MainActivity, loyaltyCard.id)
-                        updateLoyaltyCardList(false)
-                        inputMode.finish()
-                        invalidateOptionsMenu()
-                    }
-                    return true
-                }
-                R.id.action_unarchive -> {
-                    for (loyaltyCard in mAdapter.getSelectedItems()) {
-                        Log.d(TAG, "Unarchiving card: " + loyaltyCard.id)
-                        DBHelper.updateLoyaltyCardArchiveStatus(mDatabase, loyaltyCard.id, 0)
-                        updateLoyaltyCardList(false)
-                        inputMode.finish()
-                        invalidateOptionsMenu()
-                    }
-                    return true
-                }
-                R.id.action_star -> {
-                    for (loyaltyCard in mAdapter.getSelectedItems()) {
-                        Log.d(TAG, "Starring card: " + loyaltyCard.id)
-                        DBHelper.updateLoyaltyCardStarStatus(mDatabase, loyaltyCard.id, 1)
-                        updateLoyaltyCardList(false)
-                        inputMode.finish()
-                    }
-                    return true
-                }
-                R.id.action_unstar -> {
-                    for (loyaltyCard in mAdapter.getSelectedItems()) {
-                        Log.d(TAG, "Unstarring card: " + loyaltyCard.id)
-                        DBHelper.updateLoyaltyCardStarStatus(mDatabase, loyaltyCard.id, 0)
-                        updateLoyaltyCardList(false)
-                        inputMode.finish()
-                    }
-                    return true
-                }
-            }
-
-            return false
-        }
-
-        override fun onDestroyActionMode(inputMode: ActionMode?) {
-            mAdapter.clearSelections()
-            mCurrentActionMode = null
-        }
-    }
-
-    override fun onCreate(inputSavedInstanceState: Bundle?) {
-        installSplashScreen()
-        super.onCreate(inputSavedInstanceState)
-
-        // Delete old cache files
-        // These could be temporary images for the cropper, temporary images in LoyaltyCard toBundle/writeParcel/ etc.
-        Thread {
-            val twentyFourHoursAgo = System.currentTimeMillis() - (1000 * 60 * 60 * 24)
-            val tempFiles = cacheDir.listFiles()
-
-            if (tempFiles == null) {
-                Log.e(
-                    TAG,
-                    "getCacheDir().listFiles() somehow returned null, this should never happen... Skipping cache cleanup..."
-                )
-                return@Thread
-            }
-            for (file in tempFiles) {
-                if (file.lastModified() < twentyFourHoursAgo) {
-                    if (!file.delete()) {
-                        Log.w(TAG, "Failed to delete cache file " + file.path)
-                    }
-                }
-            }
-        }.start()
-
-        // We should extract the share intent after we called the super.onCreate as it may need to spawn a dialog window and the app needs to be initialized to not crash
-        extractIntentFields(intent)
-
-        binding = MainActivityBinding.inflate(layoutInflater)
-        setContentView(binding.getRoot())
-        Utils.applyWindowInsets(binding.getRoot())
-        setSupportActionBar(binding.toolbar)
-        groupsTabLayout = binding.groups
-        contentMainBinding = ContentMainBinding.bind(binding.include.getRoot())
-
-        mDatabase = DBHelper(this).writableDatabase
-
-        mUpdateLoyaltyCardListRunnable = Runnable {
-            updateLoyaltyCardList(false)
-        }
-
-        groupsTabLayout.addOnTabSelectedListener(object : OnTabSelectedListener {
-            override fun onTabSelected(tab: TabLayout.Tab) {
-                selectedTab = tab.position
-                Log.d("onTabSelected", "Tab Position " + tab.position)
-                mGroup = tab.tag
-                updateLoyaltyCardList(false)
-                // Store active tab in Shared Preference to restore next app launch
-                applicationContext.getSharedPreferences(
-                    getString(R.string.sharedpreference_active_tab),
-                    MODE_PRIVATE
-                ).edit {
-                    putInt(
-                        getString(R.string.sharedpreference_active_tab),
-                        tab.position
-                    )
-                }
-            }
-
-            override fun onTabUnselected(tab: TabLayout.Tab?) {
-            }
-
-            override fun onTabReselected(tab: TabLayout.Tab?) {
-            }
-        })
-
-        mAdapter = LoyaltyCardCursorAdapter(this, null, this, mUpdateLoyaltyCardListRunnable)
-        contentMainBinding.list.setAdapter(mAdapter)
-        registerForContextMenu(contentMainBinding.list)
-
-        mBarcodeScannerLauncher = registerForActivityResult(
-            StartActivityForResult(),
-            ActivityResultCallback registerForActivityResult@{ result: ActivityResult? ->
-                // Exit early if the user cancelled the scan (pressed back/home)
-                if (result == null || result.resultCode != RESULT_OK) {
-                    return@registerForActivityResult
-                }
-
-                startActivity(
-                    Intent(applicationContext, LoyaltyCardEditActivity::class.java).apply {
-                        putExtras(result.data!!.extras!!)
-                    }
-                )
-            })
-
-        mSettingsLauncher = registerForActivityResult(
-            StartActivityForResult()
-        ) { result: ActivityResult? ->
-            if (result?.resultCode == RESULT_OK) {
-                val intent = result.data
-                if (intent != null && intent.getBooleanExtra(RESTART_ACTIVITY_INTENT, false)) {
-                    recreate()
-                }
-            }
-        }
-
-        onBackPressedDispatcher.addCallback(this, object : OnBackPressedCallback(true) {
-            override fun handleOnBackPressed() {
-                if (mSearchView != null && !mSearchView!!.isIconified) {
-                    mSearchView!!.isIconified = true
-                } else {
-                    finish()
-                }
-            }
-        })
-    }
-
-    override fun onResume() {
-        super.onResume()
-
-        if (mCurrentActionMode != null) {
-            mAdapter.clearSelections()
-            mCurrentActionMode!!.finish()
-        }
-
-        if (mSearchView != null && !mSearchView!!.isIconified) {
-            mFilter = mSearchView!!.query.toString()
-        }
-        // Start of active tab logic
-        updateTabGroups(groupsTabLayout)
-
-        // Restore selected tab from Shared Preference
-        selectedTab = applicationContext.getSharedPreferences(
-            getString(R.string.sharedpreference_active_tab),
-            MODE_PRIVATE
-        ).getInt(getString(R.string.sharedpreference_active_tab), 0)
-
-        // Restore sort preferences from Shared Preferences
-        mOrder = Utils.getLoyaltyCardOrder(this)
-        mOrderDirection = Utils.getLoyaltyCardOrderDirection(this)
-
-        mGroup = null
-
-        if (groupsTabLayout.tabCount != 0) {
-            var tab = groupsTabLayout.getTabAt(selectedTab)
-            if (tab == null) {
-                tab = groupsTabLayout.getTabAt(0)
-            }
-
-            groupsTabLayout.selectTab(tab)
-            checkNotNull(tab)
-            mGroup = tab.tag
-        } else {
-            scaleScreen()
-        }
-
-        updateLoyaltyCardList(true)
-
-        // End of active tab logic
-
-        binding.fabAdd.setOnClickListener {
-            mBarcodeScannerLauncher.launch(
-                Intent(applicationContext, ScanActivity::class.java).apply {
-                    putExtras(Bundle().apply {
-                        if (selectedTab != 0) {
-                            putString(
-                                LoyaltyCardEditActivity.BUNDLE_ADDGROUP,
-                                groupsTabLayout.getTabAt(selectedTab)!!.text.toString()
-                            )
-                        }
-                    })
-                }
-            )
-        }
-        binding.fabAdd.bringToFront()
-
-        val layoutManager = contentMainBinding.list.layoutManager as GridLayoutManager?
-        if (layoutManager != null) {
-            val settings = Settings(this)
-            layoutManager.setSpanCount(settings.getPreferredColumnCount())
-        }
-    }
-
-    private fun displayCardSetupOptions(menu: Menu, shouldShow: Boolean) {
-        for (id in intArrayOf(R.id.action_search, R.id.action_display_options, R.id.action_sort)) {
-            menu.findItem(id).isVisible = shouldShow
-        }
-    }
-
-    private fun updateLoyaltyCardCount() {
-        mLoyaltyCardCount = DBHelper.getLoyaltyCardCount(mDatabase)
-    }
-
-    private fun updateLoyaltyCardList(updateCount: Boolean) {
-        var group: Group? = null
-        if (mGroup != null) {
-            group = mGroup as Group
-        }
-
-        mAdapter.swapCursor(
-            DBHelper.getLoyaltyCardCursor(
-                mDatabase,
-                mFilter,
-                group,
-                mOrder,
-                mOrderDirection,
-                if (mAdapter.showingArchivedCards()) DBHelper.LoyaltyCardArchiveFilter.All else DBHelper.LoyaltyCardArchiveFilter.Unarchived
-            )
-        )
-
-        if (updateCount) {
-            updateLoyaltyCardCount()
-            // Update menu icons if necessary
-            invalidateOptionsMenu()
-        }
-
-        if (mLoyaltyCardCount > 0) {
-            // We want the cardList to be visible regardless of the filtered match count
-            // to ensure that the noMatchingCardsText doesn't end up being shown below
-            // the keyboard
-            contentMainBinding.helpSection.visibility = View.GONE
-            contentMainBinding.noGroupCardsText.visibility = View.GONE
-
-            if (mAdapter.itemCount > 0) {
-                contentMainBinding.list.visibility = View.VISIBLE
-                contentMainBinding.noMatchingCardsText.visibility = View.GONE
-            } else {
-                contentMainBinding.list.visibility = View.GONE
-                if (!mFilter.isEmpty()) {
-                    // Actual Empty Search Result
-                    contentMainBinding.noMatchingCardsText.visibility = View.VISIBLE
-                    contentMainBinding.noGroupCardsText.visibility = View.GONE
-                } else {
-                    // Group Tab with no Group Cards
-                    contentMainBinding.noMatchingCardsText.visibility = View.GONE
-                    contentMainBinding.noGroupCardsText.visibility = View.VISIBLE
-                }
-            }
-        } else {
-            contentMainBinding.list.visibility = View.GONE
-            contentMainBinding.helpSection.visibility = View.VISIBLE
-
-            contentMainBinding.noMatchingCardsText.visibility = View.GONE
-            contentMainBinding.noGroupCardsText.visibility = View.GONE
-        }
-
-        if (mCurrentActionMode != null) {
-            mCurrentActionMode!!.finish()
-        }
-
-        ListWidget().updateAll(mAdapter.mContext)
-    }
-
-    private fun processParseResultList(
-        parseResultList: MutableList<ParseResult?>,
-        group: String?,
-        closeAppOnNoBarcode: Boolean
-    ) {
-        require(!parseResultList.isEmpty()) { "parseResultList may not be empty" }
-
-        Utils.makeUserChooseParseResultFromList(
-            this@MainActivity,
-            parseResultList,
-            object : ParseResultListDisambiguatorCallback {
-                override fun onUserChoseParseResult(parseResult: ParseResult) {
-                    val intent =
-                        Intent(applicationContext, LoyaltyCardEditActivity::class.java)
-                    val bundle = parseResult.toLoyaltyCardBundle(this@MainActivity)
-                    if (group != null) {
-                        bundle.putString(LoyaltyCardEditActivity.BUNDLE_ADDGROUP, group)
-                    }
-                    intent.putExtras(bundle)
-                    startActivity(intent)
-                }
-
-                override fun onUserDismissedSelector() {
-                    if (closeAppOnNoBarcode) {
-                        finish()
-                    }
-                }
-            })
-    }
-
-    private fun onSharedIntent(intent: Intent) {
-        val receivedAction = intent.action
-        val receivedType = intent.type
-
-        if (receivedAction == null || receivedType == null) {
-            return
-        }
-
-        val parseResultList: MutableList<ParseResult?>?
-
-        // Check for shared text
-        if (receivedAction == Intent.ACTION_SEND && receivedType == "text/plain") {
-            val loyaltyCard = LoyaltyCard()
-            loyaltyCard.setCardId(intent.getStringExtra(Intent.EXTRA_TEXT)!!)
-            parseResultList = mutableListOf(ParseResult(ParseResultType.BARCODE_ONLY, loyaltyCard))
-        } else {
-            // Parse whatever file was sent, regardless of opening or sharing
-            val data: Uri? = when (receivedAction) {
-                Intent.ACTION_VIEW -> {
-                    intent.data
-                }
-                Intent.ACTION_SEND -> {
-                    intent.getParcelableExtra(Intent.EXTRA_STREAM)
-                }
-                else -> {
-                    Log.e(TAG, "Wrong action type to parse intent")
-                    return
-                }
-            }
-
-            if (receivedType.startsWith("image/")) {
-                parseResultList = Utils.retrieveBarcodesFromImage(this, data)
-            } else if (receivedType == "application/pdf") {
-                parseResultList = Utils.retrieveBarcodesFromPdf(this, data)
-            } else if (mutableListOf<String?>(
-                    "application/vnd.apple.pkpass",
-                    "application/vnd-com.apple.pkpass"
-                ).contains(receivedType)
-            ) {
-                parseResultList = Utils.retrieveBarcodesFromPkPass(this, data)
-            } else if (receivedType == "application/vnd.espass-espass") {
-                // FIXME: espass is not pkpass
-                // However, several users stated in https://github.com/CatimaLoyalty/Android/issues/2197 that the formats are extremely similar to the point they could rename an .espass file to .pkpass and have it imported
-                // So it makes sense to "unofficially" treat it as a PKPASS for now, even though not completely correct
-                parseResultList = Utils.retrieveBarcodesFromPkPass(this, data)
-            } else if (receivedType == "application/vnd.apple.pkpasses") {
-                parseResultList = Utils.retrieveBarcodesFromPkPasses(this, data)
-            } else {
-                Log.e(TAG, "Wrong mime-type")
-                return
-            }
-        }
-
-        // Give up if we should parse but there is nothing to parse
-        if (parseResultList == null || parseResultList.isEmpty()) {
-            finish()
-            return
-        }
-
-        processParseResultList(parseResultList, null, true)
-    }
-
-    private fun extractIntentFields(intent: Intent) {
-        onSharedIntent(intent)
-    }
-
-    fun updateTabGroups(groupsTabLayout: TabLayout) {
-        val newGroups = DBHelper.getGroups(mDatabase)
-
-        if (newGroups.isEmpty()) {
-            groupsTabLayout.removeAllTabs()
-            groupsTabLayout.visibility = View.GONE
-            return
-        }
-
-        groupsTabLayout.removeAllTabs()
-        groupsTabLayout.addTab(
-            groupsTabLayout.newTab().apply {
-                setText(R.string.all)
-                tag = null
-            },
-            false
-        )
-
-        for (group in newGroups) {
-            groupsTabLayout.addTab(
-                groupsTabLayout.newTab().apply {
-                    text = group._id
-                    tag = group
-                },
-                false
-            )
-        }
-
-        groupsTabLayout.visibility = View.VISIBLE
-    }
-
-    // Saving currentQuery to finalQuery for user, this will be used to restore search history, happens when user clicks a card from list
-    override fun onSaveInstanceState(outState: Bundle) {
-        super.onSaveInstanceState(outState)
-        finalQuery = currentQuery
-        // Putting the query also into outState for later use in onRestoreInstanceState when rotating screen
-        if (mSearchView != null) {
-            outState.putString(STATE_SEARCH_QUERY, finalQuery)
-        }
-    }
-
-    // Restoring instance state when rotation of screen happens with the goal to restore search query for user
-    override fun onRestoreInstanceState(savedInstanceState: Bundle) {
-        super.onRestoreInstanceState(savedInstanceState)
-        finalQuery = savedInstanceState.getString(STATE_SEARCH_QUERY, "")
-    }
-
-    override fun onCreateOptionsMenu(inputMenu: Menu): Boolean {
-        menuInflater.inflate(R.menu.main_menu, inputMenu)
-
-        displayCardSetupOptions(inputMenu, mLoyaltyCardCount > 0)
-
-        val searchManager = getSystemService(SEARCH_SERVICE) as SearchManager?
-        if (searchManager != null) {
-            val searchMenuItem = inputMenu.findItem(R.id.action_search)
-            mSearchView = searchMenuItem.actionView as SearchView?
-            mSearchView!!.setSearchableInfo(searchManager.getSearchableInfo(componentName))
-            mSearchView!!.setSubmitButtonEnabled(false)
-            mSearchView!!.setOnCloseListener {
-                invalidateOptionsMenu()
-                false
-            }
-
-            /*
-             * On Android 13 and later, pressing Back while the search view is open hides the keyboard
-             * and collapses the search view at the same time.
-             * This brings back the old behavior on Android 12 and lower: pressing Back once
-             * hides the keyboard, press again while keyboard is hidden to collapse the search view.
-             */
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-                searchMenuItem.setOnActionExpandListener(object : MenuItem.OnActionExpandListener {
-                    override fun onMenuItemActionExpand(item: MenuItem): Boolean {
-                        return true
-                    }
-
-                    override fun onMenuItemActionCollapse(item: MenuItem): Boolean {
-                        if (mSearchView!!.hasFocus()) {
-                            mSearchView!!.clearFocus()
-                            return false
-                        }
-                        currentQuery = ""
-                        mFilter = ""
-                        updateLoyaltyCardList(false)
-                        return true
-                    }
-                })
-            }
-
-            mSearchView!!.setOnQueryTextListener(object : SearchView.OnQueryTextListener {
-                override fun onQueryTextSubmit(query: String?): Boolean {
-                    return false
-                }
-
-                override fun onQueryTextChange(newText: String): Boolean {
-                    mFilter = newText
-                    // New logic to ensure search history after coming back from picked card - user will see the last search query
-                    if (newText.isEmpty()) {
-                        if (!finalQuery.isEmpty()) {
-                            // Setting the query text for user after coming back from picked card from finalQuery
-                            mSearchView!!.setQuery(finalQuery, false)
-                        } else if (!currentQuery.isEmpty()) {
-                            // Else if is needed in case user deletes search - expected behaviour is to show all cards
-                            currentQuery = ""
-                            mSearchView!!.setQuery(currentQuery, false)
-                        }
-                    } else {
-                        // Setting search query each time user changes the text in search to temporary variable to be used later in finalQuery String which will be used to restore search history
-                        currentQuery = newText
-                    }
-                    val currentTab =
-                        groupsTabLayout.getTabAt(groupsTabLayout.selectedTabPosition)
-                    mGroup = currentTab?.tag
-
-                    updateLoyaltyCardList(false)
-
-                    return true
-                }
-            })
-            // Check if we came from a picked card back to search, in that case we want to show the search view with previous search query
-            if (!finalQuery.isEmpty()) {
-                // Expand the search view to show the query
-                searchMenuItem.expandActionView()
-                // Setting the query text to empty String due to behaviour of onQueryTextChange after coming back from picked card - onQueryTextChange is called automatically without users interaction
-                finalQuery = ""
-                mSearchView!!.setQuery(currentQuery, false)
-            }
-        }
-
-        return super.onCreateOptionsMenu(inputMenu)
-    }
-
-    override fun onOptionsItemSelected(inputItem: MenuItem): Boolean {
-        when (inputItem.itemId) {
-            android.R.id.home -> {
-                onBackPressedDispatcher.onBackPressed()
-            }
-            R.id.action_display_options -> {
-                mAdapter.showDisplayOptionsDialog()
-                invalidateOptionsMenu()
-                return true
-            }
-            R.id.action_sort -> {
-                val currentIndex = AtomicInteger()
-                val loyaltyCardOrders = listOf<LoyaltyCardOrder?>(*LoyaltyCardOrder.entries.toTypedArray())
-                for (i in loyaltyCardOrders.indices) {
-                    if (mOrder == loyaltyCardOrders[i]) {
-                        currentIndex.set(i)
-                        break
-                    }
-                }
-
-                MaterialAlertDialogBuilder(this@MainActivity).apply {
-                    setTitle(R.string.sort_by)
-
-                    val sortingOptionBinding = SortingOptionBinding.inflate(LayoutInflater.from(this@MainActivity), null, false)
-                    val customLayout: View = sortingOptionBinding.getRoot()
-                    setView(customLayout)
-
-                    val showReversed = sortingOptionBinding.checkBoxReverse
-
-                    showReversed.isChecked = mOrderDirection == LoyaltyCardOrderDirection.Descending
-
-                    setSingleChoiceItems(
-                        R.array.sort_types_array,
-                        currentIndex.get()
-                    ) { _: DialogInterface?, which: Int ->
-                        currentIndex.set(which)
-                    }
-
-                    setPositiveButton(
-                        R.string.sort
-                    ) { dialog, _ ->
-                        setSort(
-                            loyaltyCardOrders[currentIndex.get()]!!,
-                            if (showReversed.isChecked) LoyaltyCardOrderDirection.Descending else LoyaltyCardOrderDirection.Ascending
-                        )
-                        ListWidget().updateAll(this@MainActivity)
-                        dialog?.dismiss()
-                    }
-
-                    setNegativeButton(R.string.cancel) { dialog, _ ->
-                        dialog.dismiss()
-                    }
-                }.create().show()
-
-                return true
-            }
-            R.id.action_manage_groups -> {
-                startActivity(
-                    Intent(applicationContext, ManageGroupsActivity::class.java)
-                )
-                return true
-            }
-            R.id.action_import_export -> {
-                startActivity(
-                    Intent(applicationContext, ImportExportActivity::class.java)
-                )
-                return true
-            }
-            R.id.action_settings -> {
-                mSettingsLauncher.launch(
-                    Intent(applicationContext, SettingsActivity::class.java)
-                )
-                return true
-            }
-            R.id.action_about -> {
-                startActivity(
-                    Intent(applicationContext, AboutActivity::class.java)
-                )
-                return true
-            }
-        }
-
-        return super.onOptionsItemSelected(inputItem)
-    }
-
-    private fun setSort(order: LoyaltyCardOrder, direction: LoyaltyCardOrderDirection) {
-        // Update values
-        mOrder = order
-        mOrderDirection = direction
-
-        // Store in Shared Preference to restore next app launch
-        applicationContext.getSharedPreferences(
-            getString(R.string.sharedpreference_sort),
-            MODE_PRIVATE
-        ).edit {
-            putString(
-                getString(R.string.sharedpreference_sort_order),
-                order.name
-            )
-            putString(
-                getString(R.string.sharedpreference_sort_direction),
-                direction.name
-            )
-        }
-
-        // Update card list
-        updateLoyaltyCardList(false)
-    }
-
-    override fun onRowLongClicked(inputPosition: Int) {
-        enableActionMode(inputPosition)
-    }
-
-    private fun enableActionMode(inputPosition: Int) {
-        if (mCurrentActionMode == null) {
-            mCurrentActionMode = startSupportActionMode(mCurrentActionModeCallback)
-        }
-        toggleSelection(inputPosition)
-    }
-
-    private fun scaleScreen() {
-        val displayMetrics = DisplayMetrics()
-        windowManager.defaultDisplay.getMetrics(displayMetrics)
-        val screenHeight = displayMetrics.heightPixels
-        val mediumSizePx = TypedValue.applyDimension(
-            TypedValue.COMPLEX_UNIT_DIP,
-            MEDIUM_SCALE_FACTOR_DIP.toFloat(),
-            getResources().displayMetrics
-        )
-        val shouldScaleSmaller = screenHeight < mediumSizePx
-
-        binding.include.welcomeIcon.visibility = if (shouldScaleSmaller) View.GONE else View.VISIBLE
-    }
-
-    private fun toggleSelection(inputPosition: Int) {
-        mAdapter.toggleSelection(inputPosition)
-        val count = mAdapter.selectedItemCount
-
-        if (count == 0) {
-            mCurrentActionMode!!.finish()
-        } else {
-            mCurrentActionMode!!.title = getResources().getQuantityString(
-                R.plurals.selectedCardCount,
-                count,
-                count
-            )
-
-            val editItem = mCurrentActionMode!!.menu.findItem(R.id.action_edit)
-            val duplicateItem = mCurrentActionMode!!.menu.findItem(R.id.action_duplicate)
-            val archiveItem = mCurrentActionMode!!.menu.findItem(R.id.action_archive)
-            val unarchiveItem = mCurrentActionMode!!.menu.findItem(R.id.action_unarchive)
-            val starItem = mCurrentActionMode!!.menu.findItem(R.id.action_star)
-            val unstarItem = mCurrentActionMode!!.menu.findItem(R.id.action_unstar)
-
-            var hasStarred = false
-            var hasUnstarred = false
-            var hasArchived = false
-            var hasUnarchived = false
-
-            for (loyaltyCard in mAdapter.getSelectedItems()) {
-                if (loyaltyCard.starStatus == 1) {
-                    hasStarred = true
-                } else {
-                    hasUnstarred = true
-                }
-
-                if (loyaltyCard.archiveStatus == 1) {
-                    hasArchived = true
-                } else {
-                    hasUnarchived = true
-                }
-
-                // We have all types, no need to keep checking
-                if (hasStarred && hasUnstarred && hasArchived && hasUnarchived) {
-                    break
-                }
-            }
-
-            unarchiveItem.isVisible = hasArchived
-            archiveItem.isVisible = hasUnarchived
-
-            if (count == 1) {
-                starItem.isVisible = !hasStarred
-                unstarItem.isVisible = !hasUnstarred
-                editItem.isVisible = true
-                editItem.isEnabled = true
-                duplicateItem.isVisible = true
-                duplicateItem.isEnabled = true
-            } else {
-                starItem.isVisible = hasUnstarred
-                unstarItem.isVisible = hasStarred
-
-                editItem.isVisible = false
-                editItem.isEnabled = false
-                duplicateItem.isVisible = false
-                duplicateItem.isEnabled = false
-            }
-
-            mCurrentActionMode!!.invalidate()
-        }
-    }
-
-
-    override fun onRowClicked(inputPosition: Int) {
-        if (mAdapter.selectedItemCount > 0) {
-            enableActionMode(inputPosition)
-        } else {
-            // FIXME
-            //
-            // There is a really nasty edge case that can happen when someone taps a card but right
-            // after it swipes (very small window, hard to reproduce). The cursor gets replaced and
-            // may not have a card at the ID number that is returned from onRowClicked.
-            //
-            // The proper fix, obviously, would involve makes sure an onFling can't happen while a
-            // click is being processed. Sadly, I have not yet found a way to make that possible.
-            val loyaltyCard: LoyaltyCard
-            try {
-                loyaltyCard = mAdapter.getCard(inputPosition)
-            } catch (e: CursorIndexOutOfBoundsException) {
-                Log.w(TAG, "Prevented crash from tap + swipe on ID $inputPosition: $e")
-                return
-            }
-
-            startActivity(
-                Intent(this, LoyaltyCardViewActivity::class.java).apply {
-                    action = ""
-                    putExtras(Bundle().apply {
-                        putInt(LoyaltyCardViewActivity.BUNDLE_ID, loyaltyCard.id)
-
-                        val cardList = ArrayList<Int?>()
-                        for (i in 0..<mAdapter.itemCount) {
-                            cardList.add(mAdapter.getCard(i).id)
-                        }
-
-                        putIntegerArrayList(LoyaltyCardViewActivity.BUNDLE_CARDLIST, cardList)
-                    })
-                }
-            )
-        }
-    }
-
-    companion object {
-        private const val TAG = "Catima"
-        const val RESTART_ACTIVITY_INTENT: String = "restart_activity_intent"
-
-        private const val MEDIUM_SCALE_FACTOR_DIP = 460
-        const val STATE_SEARCH_QUERY: String = "SEARCH_QUERY"
-    }
-}

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

@@ -0,0 +1,242 @@
+package protect.card_locker;
+
+import android.content.Intent;
+import android.database.sqlite.SQLiteDatabase;
+import android.os.Bundle;
+import android.text.Editable;
+import android.text.TextWatcher;
+import android.util.Log;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.EditText;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import androidx.activity.OnBackPressedCallback;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.widget.Toolbar;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+
+import protect.card_locker.databinding.ActivityManageGroupBinding;
+
+public class ManageGroupActivity extends CatimaAppCompatActivity implements ManageGroupCursorAdapter.CardAdapterListener {
+    private ActivityManageGroupBinding binding;
+    private SQLiteDatabase mDatabase;
+    private ManageGroupCursorAdapter mAdapter;
+
+    private final String SAVE_INSTANCE_ADAPTER_STATE = "adapterState";
+    private final String SAVE_INSTANCE_CURRENT_GROUP_NAME = "currentGroupName";
+
+    protected Group mGroup = null;
+    private RecyclerView mCardList;
+    private TextView noGroupCardsText;
+    private EditText mGroupNameText;
+
+    private boolean mGroupNameNotInUse;
+
+    @Override
+    protected void onCreate(Bundle inputSavedInstanceState) {
+        super.onCreate(inputSavedInstanceState);
+        binding = ActivityManageGroupBinding.inflate(getLayoutInflater());
+        setContentView(binding.getRoot());
+        Utils.applyWindowInsetsAndFabOffset(binding.getRoot(), binding.fabSave);
+        Toolbar toolbar = binding.toolbar;
+        setSupportActionBar(toolbar);
+
+        mDatabase = new DBHelper(this).getWritableDatabase();
+
+        noGroupCardsText = binding.include.noGroupCardsText;
+        mCardList = binding.include.list;
+        FloatingActionButton saveButton = binding.fabSave;
+
+        mGroupNameText = binding.editTextGroupName;
+
+        mGroupNameText.addTextChangedListener(new TextWatcher() {
+            @Override
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+            }
+
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+            }
+
+            @Override
+            public void afterTextChanged(Editable s) {
+                mGroupNameNotInUse = true;
+                mGroupNameText.setError(null);
+                String currentGroupName = mGroupNameText.getText().toString().trim();
+                if (currentGroupName.length() == 0) {
+                    mGroupNameText.setError(getResources().getText(R.string.group_name_is_empty));
+                    return;
+                }
+                if (!mGroup._id.equals(currentGroupName)) {
+                    if (DBHelper.getGroup(mDatabase, currentGroupName) != null) {
+                        mGroupNameNotInUse = false;
+                        mGroupNameText.setError(getResources().getText(R.string.group_name_already_in_use));
+                    } else {
+                        mGroupNameNotInUse = true;
+                    }
+                }
+            }
+        });
+
+        Intent intent = getIntent();
+        String groupId = intent.getStringExtra("group");
+        if (groupId == null) {
+            throw (new IllegalArgumentException("this activity expects a group loaded into it's intent"));
+        }
+        Log.d("groupId", "groupId: " + groupId);
+        mGroup = DBHelper.getGroup(mDatabase, groupId);
+        if (mGroup == null) {
+            throw (new IllegalArgumentException("cannot load group " + groupId + " from database"));
+        }
+        mGroupNameText.setText(mGroup._id);
+        setTitle(getString(R.string.editGroup, mGroup._id));
+        mAdapter = new ManageGroupCursorAdapter(this, null, this, mGroup, null);
+        mCardList.setAdapter(mAdapter);
+        registerForContextMenu(mCardList);
+
+        if (inputSavedInstanceState != null) {
+            mAdapter.importInGroupState(integerArrayToAdapterState(inputSavedInstanceState.getIntegerArrayList(SAVE_INSTANCE_ADAPTER_STATE)));
+            mGroupNameText.setText(inputSavedInstanceState.getString(SAVE_INSTANCE_CURRENT_GROUP_NAME));
+        }
+
+        enableToolbarBackButton();
+
+        saveButton.setOnClickListener(v -> {
+            String currentGroupName = mGroupNameText.getText().toString().trim();
+            if (!currentGroupName.equals(mGroup._id)) {
+                if (currentGroupName.length() == 0) {
+                    Toast.makeText(getApplicationContext(), R.string.group_name_is_empty, Toast.LENGTH_SHORT).show();
+                    return;
+                }
+                if (!mGroupNameNotInUse) {
+                    Toast.makeText(getApplicationContext(), R.string.group_name_already_in_use, Toast.LENGTH_SHORT).show();
+                    return;
+                }
+            }
+
+            mAdapter.commitToDatabase();
+            if (!currentGroupName.equals(mGroup._id)) {
+                DBHelper.updateGroup(mDatabase, mGroup._id, currentGroupName);
+            }
+            Toast.makeText(getApplicationContext(), R.string.group_updated, Toast.LENGTH_SHORT).show();
+            finish();
+        });
+        // this setText is here because content_main.xml is reused from main activity
+        noGroupCardsText.setText(getResources().getText(R.string.noGiftCardsGroup));
+        updateLoyaltyCardList();
+
+        getOnBackPressedDispatcher().addCallback(this, new OnBackPressedCallback(true) {
+            @Override
+            public void handleOnBackPressed() {
+                leaveWithoutSaving();
+            }
+        });
+    }
+
+    private ArrayList<Integer> adapterStateToIntegerArray(HashMap<Integer, Boolean> adapterState) {
+        ArrayList<Integer> ret = new ArrayList<>(adapterState.size() * 2);
+        for (Map.Entry<Integer, Boolean> entry : adapterState.entrySet()) {
+            ret.add(entry.getKey());
+            ret.add(entry.getValue() ? 1 : 0);
+        }
+        return ret;
+    }
+
+    private HashMap<Integer, Boolean> integerArrayToAdapterState(ArrayList<Integer> in) {
+        HashMap<Integer, Boolean> ret = new HashMap<>();
+        if (in.size() % 2 != 0) {
+            throw (new RuntimeException("failed restoring adapterState from integer array list"));
+        }
+        for (int i = 0; i < in.size(); i += 2) {
+            ret.put(in.get(i), in.get(i + 1) == 1);
+        }
+        return ret;
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu inputMenu) {
+        getMenuInflater().inflate(R.menu.card_details_menu, inputMenu);
+
+        return super.onCreateOptionsMenu(inputMenu);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem inputItem) {
+        int id = inputItem.getItemId();
+
+        if (id == R.id.action_display_options) {
+            mAdapter.showDisplayOptionsDialog();
+            invalidateOptionsMenu();
+
+            return true;
+        }
+
+        return super.onOptionsItemSelected(inputItem);
+    }
+
+    @Override
+    protected void onSaveInstanceState(@NonNull Bundle outState) {
+        super.onSaveInstanceState(outState);
+
+        outState.putIntegerArrayList(SAVE_INSTANCE_ADAPTER_STATE, adapterStateToIntegerArray(mAdapter.exportInGroupState()));
+        outState.putString(SAVE_INSTANCE_CURRENT_GROUP_NAME, mGroupNameText.getText().toString());
+    }
+
+    private void updateLoyaltyCardList() {
+        mAdapter.swapCursor(DBHelper.getLoyaltyCardCursor(mDatabase));
+
+        if (mAdapter.getItemCount() == 0) {
+            mCardList.setVisibility(View.GONE);
+            noGroupCardsText.setVisibility(View.VISIBLE);
+        } else {
+            mCardList.setVisibility(View.VISIBLE);
+            noGroupCardsText.setVisibility(View.GONE);
+        }
+    }
+
+    private void leaveWithoutSaving() {
+        if (hasChanged()) {
+            AlertDialog.Builder builder = new MaterialAlertDialogBuilder(ManageGroupActivity.this);
+            builder.setTitle(R.string.leaveWithoutSaveTitle);
+            builder.setMessage(R.string.leaveWithoutSaveConfirmation);
+            builder.setPositiveButton(R.string.confirm, (dialog, which) -> finish());
+            builder.setNegativeButton(R.string.cancel, (dialog, which) -> dialog.dismiss());
+            AlertDialog dialog = builder.create();
+            dialog.show();
+        } else {
+            finish();
+        }
+    }
+
+    @Override
+    public boolean onSupportNavigateUp() {
+        getOnBackPressedDispatcher().onBackPressed();
+        return true;
+    }
+
+    private boolean hasChanged() {
+        return mAdapter.hasChanged() || !mGroup._id.equals(mGroupNameText.getText().toString().trim());
+    }
+
+    @Override
+    public void onRowLongClicked(int inputPosition) {
+        mAdapter.toggleSelection(inputPosition);
+    }
+
+    @Override
+    public void onRowClicked(int inputPosition) {
+        mAdapter.toggleSelection(inputPosition);
+
+    }
+}

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

@@ -1,236 +0,0 @@
-package protect.card_locker
-
-import android.content.DialogInterface
-import android.database.sqlite.SQLiteDatabase
-import android.os.Bundle
-import android.util.Log
-import android.view.Menu
-import android.view.MenuItem
-import android.view.View
-import android.widget.EditText
-import android.widget.TextView
-import android.widget.Toast
-import androidx.activity.OnBackPressedCallback
-import androidx.core.widget.doAfterTextChanged
-import androidx.recyclerview.widget.RecyclerView
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import protect.card_locker.LoyaltyCardCursorAdapter.CardAdapterListener
-import protect.card_locker.databinding.ActivityManageGroupBinding
-
-class ManageGroupActivity : CatimaAppCompatActivity(), CardAdapterListener {
-    private lateinit var binding: ActivityManageGroupBinding
-    private lateinit var mDatabase: SQLiteDatabase
-    private lateinit var mAdapter: ManageGroupCursorAdapter
-
-    private lateinit var mGroup: Group
-    private lateinit var mCardList: RecyclerView
-    private lateinit var noGroupCardsText: TextView
-    private lateinit var mGroupNameText: EditText
-
-    private var mGroupNameNotInUse = false
-
-    override fun onCreate(inputSavedInstanceState: Bundle?) {
-        super.onCreate(inputSavedInstanceState)
-        binding = ActivityManageGroupBinding.inflate(layoutInflater)
-        setContentView(binding.root)
-        Utils.applyWindowInsetsAndFabOffset(binding.root, binding.fabSave)
-        setSupportActionBar(binding.toolbar)
-
-        mDatabase = DBHelper(this).writableDatabase
-        noGroupCardsText = binding.include.noGroupCardsText
-        mCardList = binding.include.list
-
-        mGroupNameText = binding.editTextGroupName
-        mGroupNameText.doAfterTextChanged {
-            mGroupNameNotInUse = true
-            mGroupNameText.error = null
-            val currentGroupName = mGroupNameText.text.trim().toString()
-            if (currentGroupName.isEmpty()) {
-                mGroupNameText.error = getText(R.string.group_name_is_empty)
-                return@doAfterTextChanged
-            }
-            if (mGroup._id != currentGroupName) {
-                if (DBHelper.getGroup(mDatabase, currentGroupName) != null) {
-                    mGroupNameNotInUse = false
-                    mGroupNameText.error = getText(R.string.group_name_already_in_use)
-                } else {
-                    mGroupNameNotInUse = true
-                }
-            }
-        }
-
-        val groupId = intent.getStringExtra("group")
-            ?: throw (IllegalArgumentException("this activity expects a group loaded into it's intent"))
-        Log.d("groupId", "groupId: $groupId")
-        mGroup = DBHelper.getGroup(mDatabase, groupId)
-            ?: throw IllegalArgumentException("Cannot load group $groupId from database")
-        mGroupNameText.setText(mGroup._id)
-        setTitle(getString(R.string.editGroup, mGroup._id))
-        mAdapter = ManageGroupCursorAdapter(this, null, this, mGroup, null)
-        mCardList.adapter = mAdapter
-        registerForContextMenu(mCardList)
-
-        if (inputSavedInstanceState != null) {
-            mAdapter.importInGroupState(
-                bundleToAdapterState(
-                    adapterStateBundle = inputSavedInstanceState.getBundle(
-                        SAVE_INSTANCE_ADAPTER_STATE
-                    )
-                )
-            )
-            mGroupNameText.setText(
-                inputSavedInstanceState.getString(
-                    SAVE_INSTANCE_CURRENT_GROUP_NAME
-                )
-            )
-        }
-
-        enableToolbarBackButton()
-
-        binding.fabSave.setOnClickListener { v: View ->
-            val currentGroupName = mGroupNameText.text.trim().toString()
-            if (currentGroupName != mGroup._id) {
-                when {
-                    currentGroupName.isEmpty() -> {
-                        Toast.makeText(
-                            applicationContext,
-                            R.string.group_name_is_empty,
-                            Toast.LENGTH_SHORT
-                        ).show()
-                        return@setOnClickListener
-                    }
-
-                    !mGroupNameNotInUse -> {
-                        Toast.makeText(
-                            applicationContext,
-                            R.string.group_name_already_in_use,
-                            Toast.LENGTH_SHORT
-                        ).show()
-                        return@setOnClickListener
-                    }
-                }
-            }
-
-            mAdapter.commitToDatabase()
-            if (currentGroupName != mGroup._id) {
-                DBHelper.updateGroup(mDatabase, mGroup._id, currentGroupName)
-            }
-            Toast.makeText(
-                applicationContext,
-                R.string.group_updated,
-                Toast.LENGTH_SHORT
-            ).show()
-            finish()
-        }
-        // this setText is here because content_main.xml is reused from main activity
-        noGroupCardsText.text = getText(R.string.noGiftCardsGroup)
-        updateLoyaltyCardList()
-
-        onBackPressedDispatcher.addCallback(
-            owner = this,
-            onBackPressedCallback = object : OnBackPressedCallback(true) {
-                override fun handleOnBackPressed() {
-                    leaveWithoutSaving()
-                }
-            })
-    }
-
-    private fun adapterStateToBundle(adapterState: HashMap<Int, Boolean>): Bundle {
-        val adapterStateBundle = Bundle().apply {
-            for (entry in adapterState.entries) {
-                putBoolean(entry.key.toString(), entry.value)
-            }
-        }
-        return adapterStateBundle
-    }
-
-    private fun bundleToAdapterState(adapterStateBundle: Bundle?): Map<Int, Boolean> {
-        adapterStateBundle ?: return emptyMap()
-        val adapterStateMap = buildMap {
-            for (key in adapterStateBundle.keySet()) {
-                put(key.toInt(), adapterStateBundle.getBoolean(key))
-            }
-        }
-        return adapterStateMap
-    }
-
-    override fun onCreateOptionsMenu(inputMenu: Menu): Boolean {
-        menuInflater.inflate(R.menu.card_details_menu, inputMenu)
-
-        return super.onCreateOptionsMenu(inputMenu)
-    }
-
-    override fun onOptionsItemSelected(inputItem: MenuItem): Boolean {
-        val id = inputItem.itemId
-
-        if (id == R.id.action_display_options) {
-            mAdapter.showDisplayOptionsDialog()
-            invalidateOptionsMenu()
-
-            return true
-        }
-
-        return super.onOptionsItemSelected(inputItem)
-    }
-
-    override fun onSaveInstanceState(outState: Bundle) {
-        super.onSaveInstanceState(outState)
-
-        outState.putBundle(
-            SAVE_INSTANCE_ADAPTER_STATE,
-            adapterStateToBundle(mAdapter.exportInGroupState())
-        )
-        outState.putString(SAVE_INSTANCE_CURRENT_GROUP_NAME, mGroupNameText.text.toString())
-    }
-
-    private fun updateLoyaltyCardList() {
-        mAdapter.swapCursor(DBHelper.getLoyaltyCardCursor(mDatabase))
-
-        if (mAdapter.itemCount == 0) {
-            mCardList.visibility = View.GONE
-            noGroupCardsText.visibility = View.VISIBLE
-        } else {
-            mCardList.visibility = View.VISIBLE
-            noGroupCardsText.visibility = View.GONE
-        }
-    }
-
-    private fun leaveWithoutSaving() {
-        if (hasChanged()) {
-            MaterialAlertDialogBuilder(this@ManageGroupActivity).apply {
-                setTitle(R.string.leaveWithoutSaveTitle)
-                setMessage(R.string.leaveWithoutSaveConfirmation)
-                setPositiveButton(R.string.confirm) { dialog: DialogInterface, _ ->
-                    finish()
-                }
-                setNegativeButton(R.string.cancel) { dialog: DialogInterface, _ ->
-                    dialog.dismiss()
-                }
-            }.create().show()
-        } else {
-            finish()
-        }
-    }
-
-    override fun onSupportNavigateUp(): Boolean {
-        onBackPressedDispatcher.onBackPressed()
-        return true
-    }
-
-    private fun hasChanged(): Boolean {
-        return mAdapter.hasChanged() || mGroup._id != mGroupNameText.text.trim().toString()
-    }
-
-    override fun onRowLongClicked(inputPosition: Int) {
-        mAdapter.toggleSelection(inputPosition)
-    }
-
-    override fun onRowClicked(inputPosition: Int) {
-        mAdapter.toggleSelection(inputPosition)
-    }
-
-    private companion object {
-        const val SAVE_INSTANCE_ADAPTER_STATE = "adapterState"
-        const val SAVE_INSTANCE_CURRENT_GROUP_NAME = "currentGroupName"
-    }
-}

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

@@ -99,7 +99,7 @@ public class ManageGroupCursorAdapter extends LoyaltyCardCursorAdapter {
         }
     }
 
-    public void importInGroupState(Map<Integer, Boolean> cardIdInGroupMap) {
+    public void importInGroupState(HashMap<Integer, Boolean> cardIdInGroupMap) {
         mInGroupOverlay = new HashMap<>(cardIdInGroupMap);
     }
 

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

@@ -0,0 +1,247 @@
+package protect.card_locker;
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.database.sqlite.SQLiteDatabase;
+import android.os.Bundle;
+import android.text.InputType;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.WindowManager;
+import android.widget.EditText;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.widget.Toolbar;
+import androidx.recyclerview.widget.DefaultItemAnimator;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+
+import java.util.List;
+
+import protect.card_locker.databinding.ManageGroupsActivityBinding;
+
+public class ManageGroupsActivity extends CatimaAppCompatActivity implements GroupCursorAdapter.GroupAdapterListener {
+    private ManageGroupsActivityBinding binding;
+    private static final String TAG = "Catima";
+
+    private SQLiteDatabase mDatabase;
+    private TextView mHelpText;
+    private RecyclerView mGroupList;
+    GroupCursorAdapter mAdapter;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        binding = ManageGroupsActivityBinding.inflate(getLayoutInflater());
+        setTitle(R.string.groups);
+        setContentView(binding.getRoot());
+        Utils.applyWindowInsets(binding.getRoot());
+        Toolbar toolbar = binding.toolbar;
+        setSupportActionBar(toolbar);
+        enableToolbarBackButton();
+
+        mDatabase = new DBHelper(this).getWritableDatabase();
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+
+        FloatingActionButton addButton = binding.fabAdd;
+        addButton.setOnClickListener(v -> createGroup());
+        addButton.bringToFront();
+
+        mGroupList = binding.include.list;
+        mHelpText = binding.include.helpText;
+
+        // Init group list
+        RecyclerView.LayoutManager mLayoutManager = new LinearLayoutManager(getApplicationContext());
+        mGroupList.setLayoutManager(mLayoutManager);
+        mGroupList.setItemAnimator(new DefaultItemAnimator());
+
+        mAdapter = new GroupCursorAdapter(this, null, this);
+        mGroupList.setAdapter(mAdapter);
+
+        updateGroupList();
+    }
+
+    private void updateGroupList() {
+        mAdapter.swapCursor(DBHelper.getGroupCursor(mDatabase));
+
+        if (DBHelper.getGroupCount(mDatabase) == 0) {
+            mGroupList.setVisibility(View.GONE);
+            mHelpText.setVisibility(View.VISIBLE);
+
+            return;
+        }
+
+        mGroupList.setVisibility(View.VISIBLE);
+        mHelpText.setVisibility(View.GONE);
+    }
+
+    private void invalidateHomescreenActiveTab() {
+        SharedPreferences activeTabPref = getApplicationContext().getSharedPreferences(
+                getString(R.string.sharedpreference_active_tab),
+                Context.MODE_PRIVATE);
+        SharedPreferences.Editor activeTabPrefEditor = activeTabPref.edit();
+        activeTabPrefEditor.putInt(getString(R.string.sharedpreference_active_tab), 0);
+        activeTabPrefEditor.apply();
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        int id = item.getItemId();
+
+        if (id == android.R.id.home) {
+            finish();
+        }
+
+        return super.onOptionsItemSelected(item);
+    }
+
+    private void createGroup() {
+        AlertDialog.Builder builder = new MaterialAlertDialogBuilder(this);
+
+        // Header
+        builder.setTitle(R.string.enter_group_name);
+
+        // Layout
+        LinearLayout layout = new LinearLayout(this);
+        layout.setOrientation(LinearLayout.VERTICAL);
+        LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(
+                ViewGroup.LayoutParams.MATCH_PARENT,
+                ViewGroup.LayoutParams.WRAP_CONTENT
+        );
+        int contentPadding = getResources().getDimensionPixelSize(R.dimen.alert_dialog_content_padding);
+        params.leftMargin = contentPadding;
+        params.topMargin = contentPadding / 2;
+        params.rightMargin = contentPadding;
+
+        // EditText with spacing
+        final EditText input = new EditText(this);
+        input.setInputType(InputType.TYPE_CLASS_TEXT);
+        input.setLayoutParams(params);
+        layout.addView(input);
+
+        // Set layout
+        builder.setView(layout);
+
+        // Buttons
+        builder.setPositiveButton(getString(R.string.ok), (dialog, which) -> {
+            DBHelper.insertGroup(mDatabase, input.getText().toString().trim());
+            updateGroupList();
+        });
+        builder.setNegativeButton(getString(R.string.cancel), (dialog, which) -> dialog.cancel());
+        AlertDialog dialog = builder.create();
+
+        // Now that the dialog exists, we can bind something that affects the OK button
+        input.addTextChangedListener(new SimpleTextWatcher() {
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+                String groupName = s.toString().trim();
+
+                if (groupName.length() == 0) {
+                    input.setError(getString(R.string.group_name_is_empty));
+                    dialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(false);
+                    return;
+                }
+
+                if (DBHelper.getGroup(mDatabase, groupName) != null) {
+                    input.setError(getString(R.string.group_name_already_in_use));
+                    dialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(false);
+                    return;
+                }
+
+                input.setError(null);
+                dialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(true);
+            }
+        });
+
+        dialog.show();
+
+        // Disable button (must be done **after** dialog is shown to prevent crash
+        dialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(false);
+        // Set focus on input field
+        dialog.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE);
+        input.requestFocus();
+    }
+
+    private String getGroupName(View view) {
+        TextView groupNameTextView = view.findViewById(R.id.name);
+        return (String) groupNameTextView.getText();
+    }
+
+    private void moveGroup(View view, boolean up) {
+        List<Group> groups = DBHelper.getGroups(mDatabase);
+        final String groupName = getGroupName(view);
+
+        int currentIndex = DBHelper.getGroup(mDatabase, groupName).order;
+        int newIndex;
+
+        // Reinsert group in correct position
+        if (up) {
+            newIndex = currentIndex - 1;
+        } else {
+            newIndex = currentIndex + 1;
+        }
+
+        // Don't try to move out of bounds
+        if (newIndex < 0 || newIndex >= groups.size()) {
+            return;
+        }
+
+        Group group = groups.remove(currentIndex);
+        groups.add(newIndex, group);
+
+        // Update database
+        DBHelper.reorderGroups(mDatabase, groups);
+
+        // Update UI
+        updateGroupList();
+
+        // Ordering may have changed, so invalidate
+        invalidateHomescreenActiveTab();
+    }
+
+    @Override
+    public void onMoveDownButtonClicked(View view) {
+        moveGroup(view, false);
+    }
+
+    @Override
+    public void onMoveUpButtonClicked(View view) {
+        moveGroup(view, true);
+    }
+
+    @Override
+    public void onEditButtonClicked(View view) {
+        Intent intent = new Intent(this, ManageGroupActivity.class);
+        intent.putExtra("group", getGroupName(view));
+        startActivity(intent);
+    }
+
+    @Override
+    public void onDeleteButtonClicked(View view) {
+        final String groupName = getGroupName(view);
+
+        AlertDialog.Builder builder = new MaterialAlertDialogBuilder(this);
+        builder.setTitle(R.string.deleteConfirmationGroup);
+        builder.setMessage(groupName);
+
+        builder.setPositiveButton(getString(R.string.ok), (dialog, which) -> {
+            DBHelper.deleteGroup(mDatabase, groupName);
+            updateGroupList();
+            // Delete may change ordering, so invalidate
+            invalidateHomescreenActiveTab();
+        });
+        builder.setNegativeButton(getString(R.string.cancel), (dialog, which) -> dialog.cancel());
+        AlertDialog dialog = builder.create();
+        dialog.show();
+    }
+}

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

@@ -1,240 +0,0 @@
-package protect.card_locker
-
-import android.content.DialogInterface
-import android.content.Intent
-import android.database.sqlite.SQLiteDatabase
-import android.os.Bundle
-import android.text.InputType
-import android.view.MenuItem
-import android.view.View
-import android.view.ViewGroup
-import android.view.WindowManager
-import android.widget.EditText
-import android.widget.LinearLayout
-import android.widget.TextView
-import androidx.appcompat.app.AlertDialog
-import androidx.core.content.edit
-import androidx.core.widget.doOnTextChanged
-import androidx.recyclerview.widget.DefaultItemAnimator
-import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import protect.card_locker.GroupCursorAdapter.GroupAdapterListener
-import protect.card_locker.databinding.ManageGroupsActivityBinding
-
-class ManageGroupsActivity : CatimaAppCompatActivity(), GroupAdapterListener {
-    private lateinit var binding: ManageGroupsActivityBinding
-    private lateinit var mDatabase: SQLiteDatabase
-    private lateinit var mHelpText: TextView
-    private lateinit var mGroupList: RecyclerView
-    private lateinit var mAdapter: GroupCursorAdapter
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-        binding = ManageGroupsActivityBinding.inflate(layoutInflater)
-        setTitle(R.string.groups)
-        setContentView(binding.root)
-        Utils.applyWindowInsets(binding.root)
-        setSupportActionBar(binding.toolbar)
-        enableToolbarBackButton()
-
-        mDatabase = DBHelper(this).writableDatabase
-    }
-
-    override fun onResume() {
-        super.onResume()
-
-        with(binding.fabAdd) {
-            setOnClickListener { v: View ->
-                createGroup()
-            }
-            bringToFront()
-        }
-
-        mGroupList = binding.include.list
-        mHelpText = binding.include.helpText
-
-        // Init group list
-        LinearLayoutManager(applicationContext).apply {
-            mGroupList.layoutManager = this
-        }
-        mGroupList.setItemAnimator(DefaultItemAnimator())
-        mAdapter = GroupCursorAdapter(this, null, this)
-        mGroupList.setAdapter(mAdapter)
-
-        updateGroupList()
-    }
-
-    private fun updateGroupList() {
-        mAdapter.swapCursor(DBHelper.getGroupCursor(mDatabase))
-
-        if (DBHelper.getGroupCount(mDatabase) == 0) {
-            mGroupList.visibility = View.GONE
-            mHelpText.visibility = View.VISIBLE
-
-            return
-        }
-
-        mGroupList.visibility = View.VISIBLE
-        mHelpText.visibility = View.GONE
-    }
-
-    private fun invalidateHomescreenActiveTab() {
-        val activeTabPref = getSharedPreferences(
-            getString(R.string.sharedpreference_active_tab),
-            MODE_PRIVATE
-        )
-        activeTabPref.edit {
-            putInt(getString(R.string.sharedpreference_active_tab), 0)
-        }
-    }
-
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        if (item.itemId == android.R.id.home) {
-            finish()
-        }
-
-        return super.onOptionsItemSelected(item)
-    }
-
-    private fun createGroup() {
-        val builder: AlertDialog.Builder = MaterialAlertDialogBuilder(this)
-
-        // Header
-        builder.setTitle(R.string.enter_group_name)
-
-        // Layout
-        val layout = LinearLayout(this)
-        layout.orientation = LinearLayout.VERTICAL
-        val params = LinearLayout.LayoutParams(
-            ViewGroup.LayoutParams.MATCH_PARENT,
-            ViewGroup.LayoutParams.WRAP_CONTENT
-        ).apply {
-            val contentPadding =
-                resources.getDimensionPixelSize(R.dimen.alert_dialog_content_padding)
-            leftMargin = contentPadding
-            topMargin = contentPadding / 2
-            rightMargin = contentPadding
-        }
-
-        // EditText with spacing
-        val input = EditText(this)
-        input.setInputType(InputType.TYPE_CLASS_TEXT)
-        input.setLayoutParams(params)
-        layout.addView(input)
-
-        // Set layout
-        builder.setView(layout)
-
-        // Buttons
-        builder.setPositiveButton(getString(R.string.ok)) { dialog: DialogInterface, which: Int ->
-            DBHelper.insertGroup(mDatabase, input.text.trim().toString())
-            updateGroupList()
-        }
-        builder.setNegativeButton(getString(R.string.cancel)) { dialog: DialogInterface, which: Int ->
-            dialog.cancel()
-        }
-        val dialog = builder.create()
-
-        // Now that the dialog exists, we can bind something that affects the OK button
-        input.doOnTextChanged { s: CharSequence?, start: Int, before: Int, count: Int ->
-            val groupName = s?.trim().toString()
-
-            if (groupName.isEmpty()) {
-                input.error = getString(R.string.group_name_is_empty)
-                dialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(false)
-                return@doOnTextChanged
-            }
-
-            if (DBHelper.getGroup(mDatabase, groupName) != null) {
-                input.error = getString(R.string.group_name_already_in_use)
-                dialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(false)
-                return@doOnTextChanged
-            }
-
-            input.error = null
-            dialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(true)
-        }
-
-        dialog.apply {
-            show()
-            // Disable button (must be done **after** dialog is shown to prevent crash
-            getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(false)
-            // Set focus on input field
-            window?.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE)
-        }
-
-        input.requestFocus()
-    }
-
-    private fun getGroupName(view: View): String {
-        val groupNameTextView = view.findViewById<TextView>(R.id.name)
-        return groupNameTextView.text.toString()
-    }
-
-    private fun moveGroup(view: View, up: Boolean) {
-        val groups = DBHelper.getGroups(mDatabase)
-        val groupName = getGroupName(view)
-
-        val currentIndex = DBHelper.getGroup(mDatabase, groupName).order
-
-        // Reinsert group in correct position
-        val newIndex: Int = if (up) {
-            currentIndex - 1
-        } else {
-            currentIndex + 1
-        }
-
-        // Don't try to move out of bounds
-        if (newIndex < 0 || newIndex >= groups.size) {
-            return
-        }
-
-        val group = groups.removeAt(currentIndex)
-        groups.add(newIndex, group)
-
-        // Update database
-        DBHelper.reorderGroups(mDatabase, groups)
-
-        // Update UI
-        updateGroupList()
-
-        // Ordering may have changed, so invalidate
-        invalidateHomescreenActiveTab()
-    }
-
-    override fun onMoveDownButtonClicked(view: View) {
-        moveGroup(view, false)
-    }
-
-    override fun onMoveUpButtonClicked(view: View) {
-        moveGroup(view, true)
-    }
-
-    override fun onEditButtonClicked(view: View) {
-        Intent(this, ManageGroupActivity::class.java).apply {
-            putExtra("group", getGroupName(view))
-            startActivity(this)
-        }
-    }
-
-    override fun onDeleteButtonClicked(view: View) {
-        val groupName = getGroupName(view)
-
-        MaterialAlertDialogBuilder(this).apply {
-            setTitle(R.string.deleteConfirmationGroup)
-            setMessage(groupName)
-
-            setPositiveButton(getString(R.string.ok)) { dialog: DialogInterface, which: Int ->
-                DBHelper.deleteGroup(mDatabase, groupName)
-                updateGroupList()
-                // Delete may change ordering, so invalidate
-                invalidateHomescreenActiveTab()
-            }
-            setNegativeButton(getString(R.string.cancel)) { dialog: DialogInterface, which: Int ->
-                dialog.cancel()
-            }
-        }.create().show()
-    }
-}

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

@@ -1,17 +1,18 @@
 package protect.card_locker;
 
-import android.app.Activity;
 import android.content.ActivityNotFoundException;
 import android.content.Intent;
 import android.net.Uri;
 import android.util.Log;
 import android.widget.Toast;
 
+import androidx.appcompat.app.AppCompatActivity;
+
 public class OpenWebLinkHandler {
 
     private static final String TAG = "Catima";
 
-    public void openBrowser(Activity activity, String url) {
+    public void openBrowser(AppCompatActivity activity, String url) {
         if (url == null) {
             return;
         }

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

@@ -1,73 +0,0 @@
-package protect.card_locker
-
-import android.content.Context
-import android.net.Uri
-import android.util.Log
-import androidx.core.net.toUri
-import net.lingala.zip4j.io.inputstream.ZipInputStream
-import net.lingala.zip4j.model.LocalFileHeader
-import java.io.FileNotFoundException
-import java.io.IOException
-
-class PkpassesParser(context: Context, uri: Uri?) {
-    private var mContext = context
-    private val pkPassParsers: ArrayList<PkpassParser> = ArrayList()
-
-    init {
-        mContext = context
-
-        Log.i(TAG, "Received Pkpasses file")
-        if (uri == null) {
-            Log.e(TAG, "Uri did not contain any data")
-            throw IOException(context.getString(R.string.errorReadingFile))
-        }
-
-        try {
-            mContext.contentResolver.openInputStream(uri).use { inputStream ->
-                ZipInputStream(inputStream).use { zipInputStream ->
-                    var localFileHeader: LocalFileHeader?
-
-                    while (true) {
-                        // Retrieve the next file
-                        localFileHeader = zipInputStream.nextEntry
-
-                        // If no next file, exit loop
-                        if (localFileHeader == null) {
-                            break
-                        }
-
-                        // Ignore directories
-                        if (localFileHeader.isDirectory) continue
-
-                        // Ignore non-pkpass files
-                        if (!localFileHeader.fileName.endsWith(".pkpass")) continue
-
-                        // Extract .pkpass (.zip) inside .pkpasses to cache directory
-                        val tempFileName = "pkpassparser_" + System.currentTimeMillis() + "_" + localFileHeader.fileName
-                        val tempFile = Utils.copyToTempFile(mContext, zipInputStream, tempFileName)
-
-                        // Parse temporary file
-                        pkPassParsers.add(
-                            PkpassParser(mContext, tempFile.toUri())
-                        )
-
-                        // Delete temporary file
-                        tempFile.delete()
-                    }
-                }
-            }
-        } catch (e: FileNotFoundException) {
-            throw IOException(mContext.getString(R.string.errorReadingFile))
-        } catch (e: Exception) {
-            throw e
-        }
-    }
-
-    fun getPkpassParsers(): ArrayList<PkpassParser> {
-        return pkPassParsers
-    }
-
-    companion object {
-        private const val TAG = "Catima"
-    }
-}

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

@@ -0,0 +1,542 @@
+package protect.card_locker;
+
+import static protect.card_locker.BarcodeSelectorActivity.BARCODE_CONTENTS;
+import static protect.card_locker.BarcodeSelectorActivity.BARCODE_FORMAT;
+
+import android.Manifest;
+import android.app.Activity;
+import android.content.ActivityNotFoundException;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.graphics.Color;
+import android.net.Uri;
+import android.os.Bundle;
+import android.provider.Settings;
+import android.text.InputType;
+import android.util.DisplayMetrics;
+import android.util.Log;
+import android.util.TypedValue;
+import android.view.KeyEvent;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.WindowManager;
+import android.widget.EditText;
+import android.widget.LinearLayout;
+import android.widget.ListAdapter;
+import android.widget.SimpleAdapter;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import androidx.activity.result.ActivityResultLauncher;
+import androidx.activity.result.contract.ActivityResultContracts;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.widget.Toolbar;
+import androidx.core.content.ContextCompat;
+
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+import com.google.zxing.DecodeHintType;
+import com.google.zxing.ResultPoint;
+import com.google.zxing.client.android.Intents;
+import com.journeyapps.barcodescanner.BarcodeCallback;
+import com.journeyapps.barcodescanner.BarcodeResult;
+import com.journeyapps.barcodescanner.CaptureManager;
+import com.journeyapps.barcodescanner.DecoratedBarcodeView;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+import protect.card_locker.databinding.CustomBarcodeScannerBinding;
+import protect.card_locker.databinding.ScanActivityBinding;
+
+/**
+ * Custom Scannner Activity extending from Activity to display a custom layout form scanner view.
+ * <p>
+ * Based on https://github.com/journeyapps/zxing-android-embedded/blob/0fdfbce9fb3285e985bad9971c5f7c0a7a334e7b/sample/src/main/java/example/zxing/CustomScannerActivity.java
+ * originally licensed under Apache 2.0
+ */
+public class ScanActivity extends CatimaAppCompatActivity {
+    private ScanActivityBinding binding;
+    private CustomBarcodeScannerBinding customBarcodeScannerBinding;
+    private static final String TAG = "Catima";
+
+    private static final int MEDIUM_SCALE_FACTOR_DIP = 460;
+    private static final int COMPAT_SCALE_FACTOR_DIP = 320;
+
+    private static final int PERMISSION_SCAN_ADD_FROM_IMAGE = 100;
+    private static final int PERMISSION_SCAN_ADD_FROM_PDF = 101;
+    private static final int PERMISSION_SCAN_ADD_FROM_PKPASS = 102;
+
+    private CaptureManager capture;
+    private DecoratedBarcodeView barcodeScannerView;
+
+    private String cardId;
+    private String addGroup;
+    private boolean torch = false;
+
+    private ActivityResultLauncher<Intent> manualAddLauncher;
+    // can't use the pre-made contract because that launches the file manager for image type instead of gallery
+    private ActivityResultLauncher<Intent> photoPickerLauncher;
+    private ActivityResultLauncher<Intent> pdfPickerLauncher;
+    private ActivityResultLauncher<Intent> pkpassPickerLauncher;
+
+    static final String STATE_SCANNER_ACTIVE = "scannerActive";
+    private boolean mScannerActive = true;
+    private boolean mHasError = false;
+
+    private void extractIntentFields(Intent intent) {
+        final Bundle b = intent.getExtras();
+        cardId = b != null ? b.getString(LoyaltyCard.BUNDLE_LOYALTY_CARD_CARD_ID) : null;
+        addGroup = b != null ? b.getString(LoyaltyCardEditActivity.BUNDLE_ADDGROUP) : null;
+        Log.d(TAG, "Scan activity: id=" + cardId);
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        binding = ScanActivityBinding.inflate(getLayoutInflater());
+        customBarcodeScannerBinding = CustomBarcodeScannerBinding.bind(binding.zxingBarcodeScanner);
+        setTitle(R.string.scanCardBarcode);
+        setContentView(binding.getRoot());
+        Utils.applyWindowInsets(binding.getRoot());
+        Toolbar toolbar = binding.toolbar;
+        setSupportActionBar(toolbar);
+        enableToolbarBackButton();
+
+        extractIntentFields(getIntent());
+
+        manualAddLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), result -> handleActivityResult(Utils.SELECT_BARCODE_REQUEST, result.getResultCode(), result.getData()));
+        photoPickerLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), result -> handleActivityResult(Utils.BARCODE_IMPORT_FROM_IMAGE_FILE, result.getResultCode(), result.getData()));
+        pdfPickerLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), result -> handleActivityResult(Utils.BARCODE_IMPORT_FROM_PDF_FILE, result.getResultCode(), result.getData()));
+        pkpassPickerLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), result -> handleActivityResult(Utils.BARCODE_IMPORT_FROM_PKPASS_FILE, result.getResultCode(), result.getData()));
+        customBarcodeScannerBinding.fabOtherOptions.setOnClickListener(view -> {
+            setScannerActive(false);
+
+            ArrayList<HashMap<String, Object>> list = new ArrayList<>();
+            String[] texts = new String[]{
+                getString(R.string.addWithoutBarcode),
+                getString(R.string.addManually),
+                getString(R.string.addFromImage),
+                getString(R.string.addFromPdfFile),
+                getString(R.string.addFromPkpass)
+            };
+            Object[] icons = new Object[]{
+                R.drawable.baseline_block_24,
+                R.drawable.ic_edit,
+                R.drawable.baseline_image_24,
+                R.drawable.baseline_picture_as_pdf_24,
+                R.drawable.local_activity_24px
+            };
+            String[] columns = new String[]{"text", "icon"};
+
+            for (int i = 0; i < texts.length; i++) {
+                HashMap<String, Object> map = new HashMap<>();
+                map.put(columns[0], texts[i]);
+                map.put(columns[1], icons[i]);
+                list.add(map);
+            }
+
+            ListAdapter adapter = new SimpleAdapter(
+                ScanActivity.this,
+                list,
+                R.layout.alertdialog_row_with_icon,
+                columns,
+                new int[]{R.id.textView, R.id.imageView}
+            );
+
+            MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(ScanActivity.this);
+            builder.setTitle(getString(R.string.add_a_card_in_a_different_way));
+            builder.setAdapter(
+                    adapter,
+                    (dialogInterface, i) -> {
+                        switch (i) {
+                            case 0:
+                                addWithoutBarcode();
+                                break;
+                            case 1:
+                                addManually();
+                                break;
+                            case 2:
+                                addFromImage();
+                                break;
+                            case 3:
+                                addFromPdf();
+                                break;
+                            case 4:
+                                addFromPkPass();
+                                break;
+                            default:
+                                throw new IllegalArgumentException("Unknown 'Add a card in a different way' dialog option");
+                        }
+                    }
+            );
+            builder.setOnCancelListener(dialogInterface -> setScannerActive(true));
+            builder.show();
+        });
+
+        // Configure barcodeScanner
+        barcodeScannerView = binding.zxingBarcodeScanner;
+        Intent barcodeScannerIntent = new Intent();
+        Bundle barcodeScannerIntentBundle = new Bundle();
+        barcodeScannerIntentBundle.putBoolean(DecodeHintType.ALSO_INVERTED.name(), Boolean.TRUE);
+        barcodeScannerIntent.putExtras(barcodeScannerIntentBundle);
+        barcodeScannerView.initializeFromIntent(barcodeScannerIntent);
+
+        // Even though we do the actual decoding with the barcodeScannerView
+        // CaptureManager needs to be running to show the camera and scanning bar
+        capture = new CatimaCaptureManager(this, barcodeScannerView, this::onCaptureManagerError);
+        Intent captureIntent = new Intent();
+        Bundle captureIntentBundle = new Bundle();
+        captureIntentBundle.putBoolean(Intents.Scan.BEEP_ENABLED, false);
+        captureIntent.putExtras(captureIntentBundle);
+        capture.initializeFromIntent(captureIntent, savedInstanceState);
+
+        barcodeScannerView.decodeSingle(new BarcodeCallback() {
+            @Override
+            public void barcodeResult(BarcodeResult result) {
+                LoyaltyCard loyaltyCard = new LoyaltyCard();
+                loyaltyCard.setCardId(result.getText());
+                loyaltyCard.setBarcodeType(CatimaBarcode.fromBarcode(result.getBarcodeFormat()));
+
+                returnResult(new ParseResult(ParseResultType.BARCODE_ONLY, loyaltyCard));
+            }
+
+            @Override
+            public void possibleResultPoints(List<ResultPoint> resultPoints) {
+
+            }
+        });
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+
+        if (mScannerActive) {
+            capture.onResume();
+        }
+
+        if (!Utils.deviceHasCamera(this)) {
+            showCameraError(getString(R.string.noCameraFoundGuideText), false);
+        } else if (ContextCompat.checkSelfPermission(this, Manifest.permission.CAMERA) != PackageManager.PERMISSION_GRANTED) {
+            showCameraPermissionMissingText();
+        } else {
+            hideCameraError();
+        }
+
+        scaleScreen();
+    }
+
+    @Override
+    protected void onPause() {
+        super.onPause();
+        capture.onPause();
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        capture.onDestroy();
+    }
+
+    @Override
+    protected void onSaveInstanceState(Bundle savedInstanceState) {
+        super.onSaveInstanceState(savedInstanceState);
+        capture.onSaveInstanceState(savedInstanceState);
+
+        savedInstanceState.putBoolean(STATE_SCANNER_ACTIVE, mScannerActive);
+    }
+
+    @Override
+    public void onRestoreInstanceState(@NonNull Bundle savedInstanceState) {
+        super.onRestoreInstanceState(savedInstanceState);
+
+        mScannerActive = savedInstanceState.getBoolean(STATE_SCANNER_ACTIVE);
+    }
+
+    @Override
+    public boolean onKeyDown(int keyCode, KeyEvent event) {
+        return barcodeScannerView.onKeyDown(keyCode, event) || super.onKeyDown(keyCode, event);
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        if (getPackageManager().hasSystemFeature(PackageManager.FEATURE_CAMERA_FLASH)) {
+            getMenuInflater().inflate(R.menu.scan_menu, menu);
+        }
+
+        barcodeScannerView.setTorchOff();
+
+        return super.onCreateOptionsMenu(menu);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == android.R.id.home) {
+            setResult(Activity.RESULT_CANCELED);
+            finish();
+            return true;
+        } else if (item.getItemId() == R.id.action_toggle_flashlight) {
+            if (torch) {
+                torch = false;
+                barcodeScannerView.setTorchOff();
+                item.setTitle(R.string.turn_flashlight_on);
+                item.setIcon(R.drawable.ic_flashlight_off_white_24dp);
+            } else {
+                torch = true;
+                barcodeScannerView.setTorchOn();
+                item.setTitle(R.string.turn_flashlight_off);
+                item.setIcon(R.drawable.ic_flashlight_on_white_24dp);
+            }
+        }
+
+        return super.onOptionsItemSelected(item);
+    }
+
+    private void setScannerActive(boolean isActive) {
+        if (isActive) {
+            barcodeScannerView.resume();
+        } else {
+            barcodeScannerView.pause();
+        }
+        mScannerActive = isActive;
+    }
+
+    private void returnResult(ParseResult parseResult) {
+        Intent result = new Intent();
+        Bundle bundle = parseResult.toLoyaltyCardBundle(ScanActivity.this);
+        if (addGroup != null) {
+            bundle.putString(LoyaltyCardEditActivity.BUNDLE_ADDGROUP, addGroup);
+        }
+        result.putExtras(bundle);
+        ScanActivity.this.setResult(RESULT_OK, result);
+        finish();
+    }
+
+    private void handleActivityResult(int requestCode, int resultCode, Intent intent) {
+        super.onActivityResult(requestCode, resultCode, intent);
+
+        List<ParseResult> parseResultList = Utils.parseSetBarcodeActivityResult(requestCode, resultCode, intent, this);
+
+        if (parseResultList.isEmpty()) {
+            setScannerActive(true);
+            return;
+        }
+
+        Utils.makeUserChooseParseResultFromList(this, parseResultList, new ParseResultListDisambiguatorCallback() {
+            @Override
+            public void onUserChoseParseResult(ParseResult parseResult) {
+                returnResult(parseResult);
+            }
+
+            @Override
+            public void onUserDismissedSelector() {
+                setScannerActive(true);
+            }
+        });
+    }
+
+    private void addWithoutBarcode() {
+        AlertDialog.Builder builder = new MaterialAlertDialogBuilder(this);
+
+        builder.setOnCancelListener(dialogInterface -> setScannerActive(true));
+
+        // Header
+        builder.setTitle(R.string.addWithoutBarcode);
+
+        // Layout
+        LinearLayout layout = new LinearLayout(this);
+        layout.setOrientation(LinearLayout.VERTICAL);
+        LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(
+                ViewGroup.LayoutParams.MATCH_PARENT,
+                ViewGroup.LayoutParams.WRAP_CONTENT
+        );
+        int contentPadding = getResources().getDimensionPixelSize(R.dimen.alert_dialog_content_padding);
+        params.leftMargin = contentPadding;
+        params.topMargin = contentPadding / 2;
+        params.rightMargin = contentPadding;
+
+        // Description
+        TextView currentTextview = new TextView(this);
+        currentTextview.setText(getString(R.string.enter_card_id));
+        currentTextview.setLayoutParams(params);
+        layout.addView(currentTextview);
+
+        // EditText with spacing
+        final EditText input = new EditText(this);
+        input.setInputType(InputType.TYPE_CLASS_TEXT);
+        input.setLayoutParams(params);
+        layout.addView(input);
+
+        // Set layout
+        builder.setView(layout);
+
+        // Buttons
+        builder.setPositiveButton(getString(R.string.ok), (dialog, which) -> {
+            LoyaltyCard loyaltyCard = new LoyaltyCard();
+            loyaltyCard.setCardId(input.getText().toString());
+            returnResult(new ParseResult(ParseResultType.BARCODE_ONLY, loyaltyCard));
+        });
+        builder.setNegativeButton(getString(R.string.cancel), (dialog, which) -> dialog.cancel());
+        AlertDialog dialog = builder.create();
+
+        // Now that the dialog exists, we can bind something that affects the OK button
+        input.addTextChangedListener(new SimpleTextWatcher() {
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+                if (s.length() == 0) {
+                    input.setError(getString(R.string.card_id_must_not_be_empty));
+                    dialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(false);
+                } else {
+                    input.setError(null);
+                    dialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(true);
+                }
+            }
+        });
+
+        dialog.show();
+
+        // Disable button (must be done **after** dialog is shown to prevent crash
+        dialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(false);
+        // Set focus on input field
+        dialog.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE);
+        input.requestFocus();
+    }
+
+    public void addManually() {
+        MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(ScanActivity.this);
+        builder.setTitle(R.string.add_manually_warning_title);
+        builder.setMessage(R.string.add_manually_warning_message);
+        builder.setPositiveButton(R.string.continue_, (dialog, which) -> {
+            Intent i = new Intent(getApplicationContext(), BarcodeSelectorActivity.class);
+            if (cardId != null) {
+                final Bundle b = new Bundle();
+                b.putString(LoyaltyCard.BUNDLE_LOYALTY_CARD_CARD_ID, cardId);
+                i.putExtras(b);
+            }
+            manualAddLauncher.launch(i);
+        });
+        builder.setNegativeButton(R.string.cancel, (dialog, which) -> setScannerActive(true));
+        builder.setOnCancelListener(dialog -> setScannerActive(true));
+        builder.show();
+    }
+
+    public void addFromImage() {
+        PermissionUtils.requestStorageReadPermission(this, PERMISSION_SCAN_ADD_FROM_IMAGE);
+    }
+
+    public void addFromPdf() {
+        PermissionUtils.requestStorageReadPermission(this, PERMISSION_SCAN_ADD_FROM_PDF);
+    }
+
+    public void addFromPkPass() {
+        PermissionUtils.requestStorageReadPermission(this, PERMISSION_SCAN_ADD_FROM_PKPASS);
+    }
+
+    private void addFromImageOrFileAfterPermission(String mimeType, ActivityResultLauncher<Intent> launcher, int chooserText, int errorMessage) {
+        Intent photoPickerIntent = new Intent(Intent.ACTION_PICK);
+        photoPickerIntent.setType(mimeType);
+        Intent contentIntent = new Intent(Intent.ACTION_GET_CONTENT);
+        contentIntent.setType(mimeType);
+
+        Intent chooserIntent = Intent.createChooser(photoPickerIntent, getString(chooserText));
+        chooserIntent.putExtra(Intent.EXTRA_INITIAL_INTENTS, new Intent[] { contentIntent });
+        try {
+            launcher.launch(chooserIntent);
+        } catch (ActivityNotFoundException e) {
+            setScannerActive(true);
+            Toast.makeText(getApplicationContext(), errorMessage, Toast.LENGTH_LONG).show();
+            Log.e(TAG, "No activity found to handle intent", e);
+        }
+    }
+
+    public void onCaptureManagerError(String errorMessage) {
+        if (mHasError) {
+            // We're already showing an error, ignore this new error
+            return;
+        }
+
+        showCameraError(errorMessage, false);
+    }
+
+    private void showCameraPermissionMissingText() {
+        showCameraError(getString(R.string.noCameraPermissionDirectToSystemSetting), true);
+    }
+
+    private void showCameraError(String message, boolean setOnClick) {
+        customBarcodeScannerBinding.cameraErrorLayout.cameraErrorMessage.setText(message);
+
+        setCameraErrorState(true, setOnClick);
+    }
+
+    private void hideCameraError() {
+        setCameraErrorState(false, false);
+    }
+
+    private void setCameraErrorState(boolean visible, boolean setOnClick) {
+        mHasError = visible;
+
+        customBarcodeScannerBinding.cameraErrorLayout.cameraErrorClickableArea.setOnClickListener(visible && setOnClick ? v -> {
+            navigateToSystemPermissionSetting();
+        } : null);
+        customBarcodeScannerBinding.cardInputContainer.setBackgroundColor(visible ? obtainThemeAttribute(com.google.android.material.R.attr.colorSurface) : Color.TRANSPARENT);
+        customBarcodeScannerBinding.cameraErrorLayout.getRoot().setVisibility(visible ? View.VISIBLE : View.GONE);
+    }
+
+    private void scaleScreen() {
+        DisplayMetrics displayMetrics = new DisplayMetrics();
+        getWindowManager().getDefaultDisplay().getMetrics(displayMetrics);
+        int screenHeight = displayMetrics.heightPixels;
+        float mediumSizePx = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP,MEDIUM_SCALE_FACTOR_DIP,getResources().getDisplayMetrics());
+        boolean shouldScaleSmaller = screenHeight < mediumSizePx;
+
+        customBarcodeScannerBinding.cameraErrorLayout.cameraErrorIcon.setVisibility(shouldScaleSmaller ? View.GONE : View.VISIBLE);
+        customBarcodeScannerBinding.cameraErrorLayout.cameraErrorTitle.setVisibility(shouldScaleSmaller ? View.GONE : View.VISIBLE);
+    }
+
+    private int obtainThemeAttribute(int attribute) {
+        TypedValue typedValue = new TypedValue();
+        getTheme().resolveAttribute(attribute, typedValue, true);
+        return typedValue.data;
+    }
+
+    private void navigateToSystemPermissionSetting() {
+        Intent permissionIntent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS, Uri.fromParts("package", getPackageName(), null));
+        permissionIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        startActivity(permissionIntent);
+    }
+
+    @Override
+    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+
+        onMockedRequestPermissionsResult(requestCode, permissions, grantResults);
+    }
+
+    public void onMockedRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+        boolean granted = grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED;
+
+        if (requestCode == CaptureManager.getCameraPermissionReqCode()) {
+            if (granted) {
+                hideCameraError();
+            } else {
+                showCameraPermissionMissingText();
+            }
+        } else if (requestCode == PERMISSION_SCAN_ADD_FROM_IMAGE || requestCode == PERMISSION_SCAN_ADD_FROM_PDF || requestCode == PERMISSION_SCAN_ADD_FROM_PKPASS) {
+            if (granted) {
+                if (requestCode == PERMISSION_SCAN_ADD_FROM_IMAGE) {
+                    addFromImageOrFileAfterPermission("image/*", photoPickerLauncher, R.string.addFromImage, R.string.failedLaunchingPhotoPicker);
+                } else if (requestCode == PERMISSION_SCAN_ADD_FROM_PDF) {
+                    addFromImageOrFileAfterPermission("application/pdf", pdfPickerLauncher, R.string.addFromPdfFile, R.string.failedLaunchingFileManager);
+                } else {
+                    addFromImageOrFileAfterPermission("application/*", pkpassPickerLauncher, R.string.addFromPkpass, R.string.failedLaunchingFileManager);
+                }
+            } else {
+                setScannerActive(true);
+                Toast.makeText(this, R.string.storageReadPermissionRequired, Toast.LENGTH_LONG).show();
+            }
+        }
+    }
+}

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

@@ -1,599 +0,0 @@
-package protect.card_locker
-
-
-import android.Manifest
-import android.content.ActivityNotFoundException
-import android.content.Intent
-import android.content.pm.PackageManager
-import android.graphics.Color
-import android.net.Uri
-import android.os.Bundle
-import android.provider.Settings
-import android.text.InputType
-import android.util.DisplayMetrics
-import android.util.Log
-import android.util.TypedValue
-import android.view.KeyEvent
-import android.view.Menu
-import android.view.MenuItem
-import android.view.View
-import android.view.ViewGroup
-import android.view.WindowManager
-import android.widget.EditText
-import android.widget.LinearLayout
-import android.widget.ListAdapter
-import android.widget.SimpleAdapter
-import android.widget.TextView
-import android.widget.Toast
-import androidx.activity.result.ActivityResultLauncher
-import androidx.activity.result.contract.ActivityResultContracts
-import androidx.appcompat.app.AlertDialog
-import androidx.core.content.ContextCompat
-import androidx.core.widget.doOnTextChanged
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import com.google.zxing.DecodeHintType
-import com.google.zxing.ResultPoint
-import com.journeyapps.barcodescanner.BarcodeCallback
-import com.journeyapps.barcodescanner.BarcodeResult
-import com.journeyapps.barcodescanner.CaptureManager
-import com.journeyapps.barcodescanner.DecoratedBarcodeView
-import protect.card_locker.databinding.CustomBarcodeScannerBinding
-import protect.card_locker.databinding.ScanActivityBinding
-
-/**
- * Custom Scannner Activity extending from Activity to display a custom layout form scanner view.
- * <p>
- * Based on https://github.com/journeyapps/zxing-android-embedded/blob/0fdfbce9fb3285e985bad9971c5f7c0a7a334e7b/sample/src/main/java/example/zxing/CustomScannerActivity.java
- * originally licensed under Apache 2.0
- */
-class ScanActivity : CatimaAppCompatActivity() {
-    private lateinit var binding: ScanActivityBinding
-    private lateinit var customBarcodeScannerBinding: CustomBarcodeScannerBinding
-
-    companion object {
-        private const val TAG = "Catima"
-
-        private const val MEDIUM_SCALE_FACTOR_DIP = 460
-        private const val COMPAT_SCALE_FACTOR_DIP = 320
-
-        private const val PERMISSION_SCAN_ADD_FROM_IMAGE = 100
-        private const val PERMISSION_SCAN_ADD_FROM_PDF = 101
-        private const val PERMISSION_SCAN_ADD_FROM_PKPASS = 102
-
-        private const val STATE_SCANNER_ACTIVE = "scannerActive"
-    }
-
-    private lateinit var capture: CaptureManager
-    private lateinit var barcodeScannerView: DecoratedBarcodeView
-    private var cardId: String? = null
-    private var addGroup: String? = null
-    private var torch = false
-
-    private lateinit var manualAddLauncher: ActivityResultLauncher<Intent>
-    // can't use the pre-made contract because that launches the file manager for image type instead of gallery
-    private lateinit var photoPickerLauncher: ActivityResultLauncher<Intent>
-    private lateinit var pdfPickerLauncher: ActivityResultLauncher<Intent>
-    private lateinit var pkpassPickerLauncher: ActivityResultLauncher<Intent>
-
-    private var mScannerActive = true
-    private var mHasError = false
-
-    private fun extractIntentFields(intent: Intent) {
-        val b = intent.extras
-        cardId = b?.getString(LoyaltyCard.BUNDLE_LOYALTY_CARD_CARD_ID)
-        addGroup = b?.getString(LoyaltyCardEditActivity.BUNDLE_ADDGROUP)
-        Log.d(TAG, "Scan activity: id=$cardId")
-    }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        binding = ScanActivityBinding.inflate(layoutInflater)
-        customBarcodeScannerBinding = CustomBarcodeScannerBinding.bind(binding.zxingBarcodeScanner)
-        setTitle(R.string.scanCardBarcode)
-        setContentView(binding.root)
-        Utils.applyWindowInsets(binding.root)
-        setSupportActionBar(binding.toolbar)
-        enableToolbarBackButton()
-
-        extractIntentFields(intent)
-
-        manualAddLauncher =
-            registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
-                handleActivityResult(
-                    Utils.SELECT_BARCODE_REQUEST,
-                    result.resultCode,
-                    result.data
-                )
-            }
-        photoPickerLauncher =
-            registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
-                handleActivityResult(
-                    Utils.BARCODE_IMPORT_FROM_IMAGE_FILE,
-                    result.resultCode,
-                    result.data
-                )
-            }
-        pdfPickerLauncher =
-            registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
-                handleActivityResult(
-                    Utils.BARCODE_IMPORT_FROM_PDF_FILE,
-                    result.resultCode,
-                    result.data
-                )
-            }
-        pkpassPickerLauncher =
-            registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
-                handleActivityResult(
-                    Utils.BARCODE_IMPORT_FROM_PKPASS_FILE,
-                    result.resultCode,
-                    result.data
-                )
-            }
-
-        customBarcodeScannerBinding.fabOtherOptions.setOnClickListener {
-            setScannerActive(false)
-
-            val list: ArrayList<HashMap<String, Any>> = arrayListOf()
-            val texts = arrayOf(
-                getString(R.string.addWithoutBarcode),
-                getString(R.string.addManually),
-                getString(R.string.addFromImage),
-                getString(R.string.addFromPdfFile),
-                getString(R.string.addFromPkpass)
-            )
-            val icons = arrayOf(
-                R.drawable.baseline_block_24,
-                R.drawable.ic_edit,
-                R.drawable.baseline_image_24,
-                R.drawable.baseline_picture_as_pdf_24,
-                R.drawable.local_activity_24px
-            )
-            val columns = arrayOf("text", "icon")
-
-            for (i in 0 until texts.size) {
-                val map: HashMap<String, Any> = hashMapOf()
-                map.put(columns[0], texts[i])
-                map.put(columns[1], icons[i])
-                list.add(map)
-            }
-
-            val adapter: ListAdapter = SimpleAdapter(
-                this,
-                list,
-                R.layout.alertdialog_row_with_icon,
-                columns,
-                intArrayOf(R.id.textView, R.id.imageView)
-            )
-
-            val builder = MaterialAlertDialogBuilder(this).apply {
-                setTitle(getString(R.string.add_a_card_in_a_different_way))
-                setAdapter(adapter) { _, i ->
-                    when (i) {
-                        0 -> addWithoutBarcode()
-                        1 -> addManually()
-                        2 -> addFromImage()
-                        3 -> addFromPdf()
-                        4 -> addFromPkPass()
-                        else -> throw IllegalArgumentException(
-                            "Unknown 'Add a card in a different way' dialog option: $i"
-                        )
-                    }
-                }
-                setOnCancelListener { _ -> setScannerActive(true) }
-            }
-            builder.show()
-        }
-
-        // Configure barcodeScanner
-        barcodeScannerView = binding.zxingBarcodeScanner
-
-        val barcodeScannerIntent = Intent().apply {
-            val barcodeScannerIntentBundle = Bundle().apply {
-                putBoolean(DecodeHintType.ALSO_INVERTED.name, true)
-            }
-            putExtras(barcodeScannerIntentBundle)
-        }
-        barcodeScannerView.initializeFromIntent(barcodeScannerIntent)
-
-        // Even though we do the actual decoding with the barcodeScannerView
-        // CaptureManager needs to be running to show the camera and scanning bar
-        capture = CatimaCaptureManager(this, barcodeScannerView, this::onCaptureManagerError)
-        val captureIntent = Intent().apply {
-            val captureIntentBundle = Bundle().apply {
-                putBoolean(DecodeHintType.ALSO_INVERTED.name, false)
-            }
-            putExtras(captureIntentBundle)
-        }
-        capture.initializeFromIntent(captureIntent, savedInstanceState)
-
-        barcodeScannerView.decodeSingle(object : BarcodeCallback {
-            override fun barcodeResult(result: BarcodeResult) {
-                val loyaltyCard = LoyaltyCard().apply {
-                    setCardId(result.text)
-                    setBarcodeType(CatimaBarcode.fromBarcode(result.barcodeFormat))
-                }
-
-                returnResult(ParseResult(ParseResultType.BARCODE_ONLY, loyaltyCard))
-            }
-
-            override fun possibleResultPoints(resultPoints: List<ResultPoint?>?) {}
-        })
-    }
-
-    override fun onResume() {
-        super.onResume()
-
-        if (mScannerActive) {
-            capture.onResume()
-        }
-
-        if (!Utils.deviceHasCamera(this)) {
-            showCameraError(getString(R.string.noCameraFoundGuideText), false)
-        } else if (ContextCompat.checkSelfPermission(
-                this,
-                Manifest.permission.CAMERA
-            ) != PackageManager.PERMISSION_GRANTED
-        ) {
-            showCameraPermissionMissingText()
-        } else {
-            hideCameraError()
-        }
-
-        scaleScreen()
-    }
-
-    override fun onPause() {
-        super.onPause()
-        capture.onPause()
-    }
-
-    override fun onDestroy() {
-        super.onDestroy()
-        capture.onDestroy()
-    }
-
-    override fun onSaveInstanceState(savedInstanceState: Bundle) {
-        super.onSaveInstanceState(savedInstanceState)
-        capture.onSaveInstanceState(savedInstanceState)
-
-        savedInstanceState.putBoolean(STATE_SCANNER_ACTIVE, mScannerActive)
-    }
-
-    override fun onRestoreInstanceState(savedInstanceState: Bundle) {
-        super.onRestoreInstanceState(savedInstanceState)
-
-        mScannerActive = savedInstanceState.getBoolean(STATE_SCANNER_ACTIVE)
-    }
-
-    override fun onKeyDown(keyCode: Int, event: KeyEvent): Boolean {
-        return barcodeScannerView.onKeyDown(keyCode, event) || super.onKeyDown(keyCode, event)
-    }
-
-    override fun onCreateOptionsMenu(menu: Menu): Boolean {
-        if (packageManager.hasSystemFeature(PackageManager.FEATURE_CAMERA_FLASH)) {
-            menuInflater.inflate(R.menu.scan_menu, menu)
-        }
-
-        barcodeScannerView.setTorchOff()
-
-        return super.onCreateOptionsMenu(menu)
-    }
-
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        if (item.itemId == android.R.id.home) {
-            setResult(RESULT_CANCELED)
-            finish()
-            return true
-        } else if (item.itemId == R.id.action_toggle_flashlight) {
-            if (torch) {
-                torch = false
-                barcodeScannerView.setTorchOff()
-                item.setTitle(R.string.turn_flashlight_on)
-                item.setIcon(R.drawable.ic_flashlight_off_white_24dp)
-            } else {
-                torch = true
-                barcodeScannerView.setTorchOn()
-                item.setTitle(R.string.turn_flashlight_off)
-                item.setIcon(R.drawable.ic_flashlight_on_white_24dp)
-            }
-        }
-
-        return super.onOptionsItemSelected(item)
-    }
-
-    private fun setScannerActive(isActive: Boolean) {
-        if (isActive) {
-            barcodeScannerView.resume()
-        } else {
-            barcodeScannerView.pause()
-        }
-        mScannerActive = isActive
-    }
-
-    private fun returnResult(parseResult: ParseResult) {
-        val bundle = parseResult.toLoyaltyCardBundle(this).apply {
-            addGroup?.let { putString(LoyaltyCardEditActivity.BUNDLE_ADDGROUP, it) }
-        }
-        val result = Intent().apply { putExtras(bundle) }
-        this.setResult(RESULT_OK, result)
-        finish()
-    }
-
-    private fun handleActivityResult(requestCode: Int, resultCode: Int, intent: Intent?) {
-        super.onActivityResult(resultCode, resultCode, intent)
-
-        val parseResultList: List<ParseResult> =
-            Utils.parseSetBarcodeActivityResult(requestCode, resultCode, intent, this)
-
-        if (parseResultList.isEmpty()) {
-            setScannerActive(true)
-            return
-        }
-
-
-        Utils.makeUserChooseParseResultFromList(
-            this,
-            parseResultList,
-            object : ParseResultListDisambiguatorCallback {
-                override fun onUserChoseParseResult(parseResult: ParseResult) {
-                    returnResult(parseResult)
-                }
-
-                override fun onUserDismissedSelector() {
-                    setScannerActive(true)
-                }
-            })
-    }
-
-    private fun addWithoutBarcode() {
-        val builder: AlertDialog.Builder = MaterialAlertDialogBuilder(this).apply {
-            setOnCancelListener { dialogInterface -> setScannerActive(true) }
-            // Header
-            setTitle(R.string.addWithoutBarcode)
-        }
-
-        // Layout
-        val layout = LinearLayout(this).apply {
-            orientation = LinearLayout.VERTICAL
-        }
-        val contentPadding = resources.getDimensionPixelSize(R.dimen.alert_dialog_content_padding)
-        val params = LinearLayout.LayoutParams(
-            ViewGroup.LayoutParams.MATCH_PARENT,
-            ViewGroup.LayoutParams.WRAP_CONTENT
-        ).apply {
-            leftMargin = contentPadding
-            topMargin = contentPadding / 2
-            rightMargin = contentPadding
-        }
-
-        // Description
-        val currentTextview = TextView(this).apply {
-            text = getString(R.string.enter_card_id)
-            layoutParams = params
-        }
-        layout.addView(currentTextview)
-
-        //EditText with spacing
-        val input = EditText(this).apply {
-            inputType = InputType.TYPE_CLASS_TEXT
-            layoutParams = params
-        }
-        layout.addView(input)
-
-        // Set layout
-        builder.setView(layout).apply {
-
-            setPositiveButton(getString(R.string.ok)) { _, _ ->
-                val loyaltyCard = LoyaltyCard()
-                loyaltyCard.cardId = input.text.toString()
-                returnResult(ParseResult(ParseResultType.BARCODE_ONLY, loyaltyCard))
-            }
-            setNegativeButton(getString(R.string.cancel)) { dialog, _ ->
-                dialog.cancel()
-            }
-        }
-        val dialog: AlertDialog = builder.create()
-
-        // Now that the dialog exists, we can bind something that affects the OK button
-        input.doOnTextChanged { text, _, _, _ ->
-            if (text.isNullOrEmpty()) {
-                input.error = getString(R.string.card_id_must_not_be_empty)
-                dialog.getButton(AlertDialog.BUTTON_POSITIVE).isEnabled = false
-            } else {
-                input.error = null
-                dialog.getButton(AlertDialog.BUTTON_POSITIVE).isEnabled = true
-            }
-        }
-
-        dialog.show()
-
-        // Disable button (must be done **after** dialog is shown to prevent crash
-        dialog.getButton(AlertDialog.BUTTON_POSITIVE).isEnabled = false
-        // Set focus on input field
-        dialog.window?.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE)
-        input.requestFocus()
-    }
-
-    fun addManually() {
-        val builder = MaterialAlertDialogBuilder(this).apply {
-            setTitle(R.string.add_manually_warning_title)
-            setMessage(R.string.add_manually_warning_message)
-            setPositiveButton(R.string.continue_) { _, _ ->
-                val i = Intent(applicationContext, BarcodeSelectorActivity::class.java)
-                if (cardId != null) {
-                    val b = Bundle()
-                    b.putString(LoyaltyCard.BUNDLE_LOYALTY_CARD_CARD_ID, cardId)
-                    i.putExtras(b)
-                }
-                manualAddLauncher.launch(i)
-            }
-            setNegativeButton(R.string.cancel) { _, _ -> setScannerActive(true) }
-            setOnCancelListener { _ -> setScannerActive(true) }
-        }
-        builder.show()
-    }
-
-    fun addFromImage() {
-        PermissionUtils.requestStorageReadPermission(this, PERMISSION_SCAN_ADD_FROM_IMAGE)
-    }
-
-    fun addFromPdf() {
-        PermissionUtils.requestStorageReadPermission(this, PERMISSION_SCAN_ADD_FROM_PDF)
-    }
-
-    fun addFromPkPass() {
-        PermissionUtils.requestStorageReadPermission(this, PERMISSION_SCAN_ADD_FROM_PKPASS)
-    }
-
-    private fun addFromImageOrFileAfterPermission(
-        mimeType: String,
-        launcher: ActivityResultLauncher<Intent>,
-        chooserText: Int,
-        errorMessage: Int
-    ) {
-        val photoPickerIntent = Intent(Intent.ACTION_PICK)
-        photoPickerIntent.type = mimeType
-        val contentIntent = Intent(Intent.ACTION_GET_CONTENT)
-        contentIntent.type = mimeType
-
-        val chooserIntent = Intent.createChooser(photoPickerIntent, getString(chooserText))
-        chooserIntent.putExtra(Intent.EXTRA_INITIAL_INTENTS, arrayOf(contentIntent))
-        try {
-            launcher.launch(chooserIntent)
-        } catch (e: ActivityNotFoundException) {
-            setScannerActive(true)
-            Toast.makeText(applicationContext, errorMessage, Toast.LENGTH_LONG).show()
-            Log.e(TAG, "No activity found to handle intent", e)
-        }
-    }
-
-    fun onCaptureManagerError(errorMessage: String) {
-        if (mHasError) {
-            // We're already showing an error, ignore this new error
-            return
-        }
-
-        showCameraError(errorMessage, false)
-    }
-
-    private fun showCameraPermissionMissingText() {
-        showCameraError(getString(R.string.noCameraPermissionDirectToSystemSetting), true)
-    }
-
-    private fun showCameraError(message: String, setOnClick: Boolean) {
-        customBarcodeScannerBinding.cameraErrorLayout.cameraErrorMessage.text = message
-
-        setCameraErrorState(true, setOnClick)
-    }
-
-    private fun hideCameraError() {
-        setCameraErrorState(false, false)
-    }
-
-    private fun setCameraErrorState(visible: Boolean, setOnClick: Boolean) {
-        mHasError = visible
-        customBarcodeScannerBinding.cameraErrorLayout.cameraErrorClickableArea.setOnClickListener(
-            if (visible && setOnClick) { _ -> navigateToSystemPermissionSetting() }
-            else null
-        )
-        customBarcodeScannerBinding.cardInputContainer.setBackgroundColor(
-            if (visible) obtainThemeAttribute(com.google.android.material.R.attr.colorSurface)
-            else Color.TRANSPARENT
-        )
-        customBarcodeScannerBinding.cameraErrorLayout.root.visibility =
-            if (visible) View.VISIBLE else View.GONE
-    }
-
-    private fun scaleScreen() {
-        val displayMetrics = DisplayMetrics()
-        windowManager.defaultDisplay.getMetrics(displayMetrics)
-        val screenHeight: Int = displayMetrics.heightPixels
-        val mediumSizePx: Float = TypedValue.applyDimension(
-            TypedValue.COMPLEX_UNIT_DIP,
-            MEDIUM_SCALE_FACTOR_DIP.toFloat(),
-            resources.displayMetrics
-        )
-        val shouldScaleSmaller = screenHeight < mediumSizePx
-
-        customBarcodeScannerBinding.cameraErrorLayout.cameraErrorIcon.visibility =
-            if (shouldScaleSmaller) View.GONE else View.VISIBLE
-        customBarcodeScannerBinding.cameraErrorLayout.cameraErrorTitle.visibility =
-            if (shouldScaleSmaller) View.GONE else View.VISIBLE
-    }
-
-    private fun obtainThemeAttribute(attribute: Int): Int {
-        val typedValue = TypedValue()
-        theme.resolveAttribute(attribute, typedValue, true)
-        return typedValue.data
-    }
-
-    private fun navigateToSystemPermissionSetting() {
-        val permissionIntent = Intent(
-            Settings.ACTION_APPLICATION_DETAILS_SETTINGS,
-            Uri.fromParts("package", getPackageName(), null)
-        )
-        permissionIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-        startActivity(permissionIntent)
-    }
-
-    override fun onRequestPermissionsResult(
-        requestCode: Int,
-        permissions: Array<String>,
-        grantResults: IntArray
-    ) {
-        super.onRequestPermissionsResult(requestCode, permissions, grantResults)
-
-        onMockedRequestPermissionsResult(requestCode, permissions, grantResults)
-    }
-
-    override fun onMockedRequestPermissionsResult(
-        requestCode: Int,
-        permissions: Array<String>,
-        grantResults: IntArray
-    ) {
-        val granted =
-            grantResults.isNotEmpty() && grantResults[0] == PackageManager.PERMISSION_GRANTED
-
-        if (requestCode == CaptureManager.getCameraPermissionReqCode()) {
-            if (granted) {
-                hideCameraError()
-            } else {
-                showCameraPermissionMissingText()
-            }
-        } else if (requestCode in listOf(
-                PERMISSION_SCAN_ADD_FROM_IMAGE,
-                PERMISSION_SCAN_ADD_FROM_PDF,
-                PERMISSION_SCAN_ADD_FROM_PKPASS
-            )
-        ) {
-            if (granted) {
-                if (requestCode == PERMISSION_SCAN_ADD_FROM_IMAGE) {
-                    addFromImageOrFileAfterPermission(
-                        "image/*",
-                        photoPickerLauncher,
-                        R.string.addFromImage,
-                        R.string.failedLaunchingPhotoPicker
-                    )
-                } else if (requestCode == PERMISSION_SCAN_ADD_FROM_PDF) {
-                    addFromImageOrFileAfterPermission(
-                        "application/pdf",
-                        pdfPickerLauncher,
-                        R.string.addFromPdfFile,
-                        R.string.failedLaunchingFileManager
-                    )
-                } else {
-                    addFromImageOrFileAfterPermission(
-                        "application/*",
-                        pkpassPickerLauncher,
-                        R.string.addFromPkpass,
-                        R.string.failedLaunchingFileManager
-                    )
-                }
-            } else {
-                setScannerActive(true)
-                Toast.makeText(this, R.string.storageReadPermissionRequired, Toast.LENGTH_LONG)
-                    .show()
-            }
-        }
-    }
-}

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

@@ -0,0 +1,29 @@
+package protect.card_locker;
+
+public class ThirdPartyInfo {
+    private final String mName;
+    private final String mUrl;
+    private final String mLicense;
+
+    public ThirdPartyInfo(String name, String url, String license) {
+        mName = name;
+        mUrl = url;
+        mLicense = license;
+    }
+
+    public String name() {
+        return mName;
+    }
+
+    public String url() {
+        return mUrl;
+    }
+
+    public String license() {
+        return mLicense;
+    }
+
+    public String toHtml() {
+        return String.format("<a href=\"%s\">%s</a> (%s)", url(), name(), license());
+    }
+}

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

@@ -1,23 +0,0 @@
-package protect.card_locker
-
-class ThirdPartyInfo(
-    private val mName: String,
-    private val mUrl: String,
-    private val mLicense: String
-) {
-    fun name(): String {
-        return mName
-    }
-
-    fun url(): String {
-        return mUrl
-    }
-
-    fun license(): String {
-        return mLicense
-    }
-
-    fun toHtml(): String {
-        return String.format("<a href=\"%s\">%s</a> (%s)", url(), name(), license())
-    }
-}

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

@@ -0,0 +1,93 @@
+package protect.card_locker;
+
+import android.content.Intent;
+import android.graphics.Color;
+import android.graphics.Typeface;
+import android.graphics.drawable.Drawable;
+import android.os.Build;
+import android.os.Bundle;
+import android.view.View;
+import android.view.Window;
+import android.widget.FrameLayout;
+import android.widget.LinearLayout;
+
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.AppCompatImageView;
+import androidx.core.content.ContextCompat;
+import androidx.core.graphics.ColorUtils;
+import androidx.core.view.WindowInsetsControllerCompat;
+
+import com.google.android.material.color.MaterialColors;
+import com.google.android.material.textview.MaterialTextView;
+import com.yalantis.ucrop.UCropActivity;
+
+public class UCropWrapper extends UCropActivity {
+    public static final String UCROP_TOOLBAR_TYPEFACE_STYLE = "ucop_toolbar_typeface_style";
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        Utils.applyWindowInsets(findViewById(android.R.id.content));
+    }
+
+    @Override
+    protected void onPostCreate(@Nullable Bundle savedInstanceState) {
+        super.onPostCreate(savedInstanceState);
+        boolean darkMode = Utils.isDarkModeEnabled(this);
+        Window window = getWindow();
+        // setup status bar to look like the rest of the app
+        if (Build.VERSION.SDK_INT >= 23) {
+            if (window != null) {
+                View decorView = window.getDecorView();
+                WindowInsetsControllerCompat wic = new WindowInsetsControllerCompat(window, decorView);
+                wic.setAppearanceLightStatusBars(!darkMode);
+            }
+        } else {
+            // icons are always white back then
+            if (window != null && !darkMode) {
+                window.setStatusBarColor(ColorUtils.compositeColors(Color.argb(127, 0, 0, 0), window.getStatusBarColor()));
+            }
+        }
+
+        // find and check views that we wish to color modify
+        // for when we update ucrop or switch to another cropper
+        View check = findViewById(com.yalantis.ucrop.R.id.wrapper_controls);
+        if (check instanceof FrameLayout) {
+            FrameLayout controls = (FrameLayout) check;
+            check = findViewById(com.yalantis.ucrop.R.id.wrapper_states);
+            if (check instanceof LinearLayout) {
+                LinearLayout states = (LinearLayout) check;
+                for (int i = 0; i < controls.getChildCount(); i++) {
+                    check = controls.getChildAt(i);
+                    if (check instanceof AppCompatImageView) {
+                        AppCompatImageView controlsBackgroundImage = (AppCompatImageView) check;
+                        // everything gathered and are as expected, now perform color patching
+                        Utils.patchColors(this);
+                        int colorSurface = MaterialColors.getColor(this, com.google.android.material.R.attr.colorSurface, ContextCompat.getColor(this, R.color.md_theme_light_surface));
+                        int colorOnSurface = MaterialColors.getColor(this, com.google.android.material.R.attr.colorOnSurface, ContextCompat.getColor(this, R.color.md_theme_light_onSurface));
+
+                        Drawable controlsBackgroundImageDrawable = controlsBackgroundImage.getBackground();
+                        controlsBackgroundImageDrawable.mutate();
+                        controlsBackgroundImageDrawable.setTint(darkMode ? colorOnSurface : colorSurface);
+                        controlsBackgroundImage.setBackgroundDrawable(controlsBackgroundImageDrawable);
+
+                        states.setBackgroundColor(darkMode ? colorSurface : colorOnSurface);
+                        break;
+                    }
+                }
+            }
+        }
+
+        // change toolbar font
+        check = findViewById(com.yalantis.ucrop.R.id.toolbar_title);
+        if (check instanceof MaterialTextView) {
+            MaterialTextView toolbarTextview = (MaterialTextView) check;
+            Intent intent = getIntent();
+            int style = intent.getIntExtra(UCROP_TOOLBAR_TYPEFACE_STYLE, -1);
+            if (style != -1) {
+                toolbarTextview.setTypeface(Typeface.defaultFromStyle(style));
+            }
+        }
+    }
+}

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

@@ -1,122 +0,0 @@
-package protect.card_locker
-
-import android.graphics.Color
-import android.graphics.Typeface
-import android.os.Build
-import android.os.Bundle
-import android.view.View
-import android.widget.FrameLayout
-import android.widget.LinearLayout
-import androidx.appcompat.widget.AppCompatImageView
-import androidx.core.content.ContextCompat
-import androidx.core.graphics.ColorUtils
-import androidx.core.view.WindowInsetsControllerCompat
-import androidx.core.view.children
-import com.google.android.material.color.MaterialColors
-import com.google.android.material.textview.MaterialTextView
-import com.yalantis.ucrop.UCropActivity
-
-class UCropWrapper : UCropActivity() {
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-        Utils.applyWindowInsets(findViewById(android.R.id.content))
-    }
-
-    override fun onPostCreate(savedInstanceState: Bundle?) {
-        super.onPostCreate(savedInstanceState)
-        val darkMode = Utils.isDarkModeEnabled(this)
-        // setup status bar to look like the rest of the app
-        setupStatusBar(darkMode)
-        // find and check views that we wish to color modify
-        // for when we update ucrop or switch to another cropper
-        checkViews(darkMode)
-        // change toolbar font
-        changeToolbarFont()
-    }
-
-    private fun setupStatusBar(darkMode: Boolean) {
-        if (window == null) {
-            return
-        }
-
-        if (Build.VERSION.SDK_INT >= 23) {
-            val decorView = window.decorView
-            val wic = WindowInsetsControllerCompat(window, decorView)
-            wic.isAppearanceLightStatusBars = !darkMode
-        } else if (!darkMode) {
-            window.statusBarColor = ColorUtils.compositeColors(
-                Color.argb(127, 0, 0, 0),
-                window.statusBarColor
-            )
-        }
-    }
-
-    private fun checkViews(darkMode: Boolean) {
-        var view = findViewById<View?>(com.yalantis.ucrop.R.id.wrapper_controls)
-        if (view !is FrameLayout) {
-            return
-        }
-
-        val controls = view
-        view = findViewById(com.yalantis.ucrop.R.id.wrapper_states)
-        if (view !is LinearLayout) {
-            return
-        }
-        val states = view
-        controls.children.firstOrNull { it is AppCompatImageView }?.let {
-            // everything gathered and are as expected, now perform color patching
-            Utils.patchColors(this)
-            val colorSurface = MaterialColors.getColor(
-                this,
-                com.google.android.material.R.attr.colorSurface,
-                ContextCompat.getColor(
-                    this,
-                    R.color.md_theme_light_surface
-                )
-            )
-            val colorOnSurface = MaterialColors.getColor(
-                this,
-                com.google.android.material.R.attr.colorOnSurface,
-                ContextCompat.getColor(
-                    this,
-                    R.color.md_theme_light_onSurface
-                )
-            )
-
-            val controlsBackgroundImageDrawable = it.background
-            controlsBackgroundImageDrawable.mutate()
-            controlsBackgroundImageDrawable.setTint(
-                if (darkMode) {
-                    colorOnSurface
-                } else {
-                    colorSurface
-                }
-            )
-            it.background = controlsBackgroundImageDrawable
-            states.setBackgroundColor(
-                if (darkMode) {
-                    colorSurface
-                } else {
-                    colorOnSurface
-                }
-            )
-        }
-    }
-
-    private fun changeToolbarFont() {
-        val toolbar = findViewById<View?>(com.yalantis.ucrop.R.id.toolbar_title)
-        if (toolbar !is MaterialTextView) {
-            return
-        }
-
-        val style = intent.getIntExtra(UCROP_TOOLBAR_TYPEFACE_STYLE, -1)
-        if (style != -1) {
-            toolbar.setTypeface(Typeface.defaultFromStyle(style))
-        }
-    }
-
-    internal companion object {
-        const val UCROP_TOOLBAR_TYPEFACE_STYLE: String = "ucop_toolbar_typeface_style"
-    }
-}

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

@@ -87,10 +87,10 @@ import java.util.Currency;
 import java.util.Date;
 import java.util.EnumMap;
 import java.util.GregorianCalendar;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
-import java.util.Objects;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -143,7 +143,7 @@ public class Utils {
         int pixelSize = context.getResources().getDimensionPixelSize(R.dimen.tileLetterImageSize);
 
         if (backgroundColor == null) {
-            backgroundColor = LetterBitmap.Companion.getDefaultColor(context, store);
+            backgroundColor = LetterBitmap.getDefaultColor(context, store);
         }
 
         return new LetterBitmap(context, store, store,
@@ -228,58 +228,6 @@ public class Utils {
         return parseResultList;
     }
 
-    static public List<ParseResult> retrieveBarcodesFromPkPasses(Context context, Uri uri) {
-        Log.i(TAG, "Received Pkpasses file with possible barcode");
-        if (uri == null) {
-            Log.e(TAG, "Pkpasses did not contain any data");
-            Toast.makeText(context, R.string.errorReadingFile, Toast.LENGTH_LONG).show();
-            return new ArrayList<>();
-        }
-
-        PkpassesParser pkpassesParser;
-        try {
-            pkpassesParser = new PkpassesParser(context, uri);
-        } catch (Exception e) {
-            Log.e(TAG, "Error reading pkpasses file", e);
-            Toast.makeText(context, R.string.errorReadingFile, Toast.LENGTH_LONG).show();
-            return new ArrayList<>();
-        }
-
-        List<ParseResult> parseResultList = new ArrayList<>();
-        int i = 0;
-        for (PkpassParser pkpassParser : pkpassesParser.getPkpassParsers()) {
-            ParseResult parseResult;
-            List<String> locales = pkpassParser.listLocales();
-            if (locales.isEmpty()) {
-                try {
-                    parseResult = new ParseResult(ParseResultType.FULL, pkpassParser.toLoyaltyCard(null));
-                } catch (Exception e) {
-                    Log.e(TAG, "Error calling toLoyaltyCard on pkpass file", e);
-                    Toast.makeText(context, R.string.errorReadingFile, Toast.LENGTH_LONG).show();
-                    return new ArrayList<>();
-                }
-                parseResult.setNote(String.format(context.getString(R.string.cardWithNumber), i+1));
-                parseResultList.add(parseResult);
-            } else {
-                for (String locale : locales) {
-                    try {
-                        parseResult = new ParseResult(ParseResultType.FULL, pkpassParser.toLoyaltyCard(locale));
-                    } catch (Exception e) {
-                        Log.e(TAG, "Error calling toLoyaltyCard on pkpass file", e);
-                        Toast.makeText(context, R.string.errorReadingFile, Toast.LENGTH_LONG).show();
-                        return new ArrayList<>();
-                    }
-                    parseResult.setNote(String.format(context.getString(R.string.cardWithNumberAndLocale), i+1, locale));
-                    parseResultList.add(parseResult);
-                }
-            }
-
-            i++;
-        }
-
-        return parseResultList;
-    }
-
     static public List<ParseResult> retrieveBarcodesFromPdf(Context context, Uri uri) {
         Log.i(TAG, "Received PDF file with possible barcode");
         if (uri == null) {
@@ -371,19 +319,7 @@ public class Utils {
         }
 
         if (requestCode == Utils.BARCODE_IMPORT_FROM_PKPASS_FILE) {
-            Uri intentData = intent.getData();
-
-            if (intentData == null) {
-                Log.e(TAG, "Uri did not contain any data");
-                Toast.makeText(context, R.string.errorReadingFile, Toast.LENGTH_LONG).show();
-                return new ArrayList<>();
-            }
-
-            if (Objects.equals(context.getContentResolver().getType(intentData), "application/vnd.apple.pkpasses")) {
-                return retrieveBarcodesFromPkPasses(context, intentData);
-            }
-
-            return retrieveBarcodesFromPkPass(context, intentData);
+            return retrieveBarcodesFromPkPass(context, intent.getData());
         }
 
         if (requestCode == Utils.BARCODE_SCAN || requestCode == Utils.SELECT_BARCODE_REQUEST) {
@@ -914,7 +850,7 @@ public class Utils {
 
     public static File copyToTempFile(Context context, InputStream input, String name) throws IOException {
         File file = createTempFile(context, name);
-        try (FileOutputStream out = new FileOutputStream(file)) {
+        try (input; FileOutputStream out = new FileOutputStream(file)) {
             byte[] buf = new byte[4096];
             int len;
             while ((len = input.read(buf)) != -1) {
@@ -1129,7 +1065,7 @@ public class Utils {
     }
 
     public static int getHeaderColor(Context context, LoyaltyCard loyaltyCard) {
-        return loyaltyCard.headerColor != null ? loyaltyCard.headerColor : LetterBitmap.Companion.getDefaultColor(context, loyaltyCard.store);
+        return loyaltyCard.headerColor != null ? loyaltyCard.headerColor : LetterBitmap.getDefaultColor(context, loyaltyCard.store);
     }
 
     public static String checksum(InputStream input) throws IOException {

app/src/main/java/protect/card_locker/async/CompatCallable.java

@@ -0,0 +1,9 @@
+package protect.card_locker.async;
+
+import java.util.concurrent.Callable;
+
+public interface CompatCallable<T> extends Callable<T> {
+    void onPostExecute(Object result);
+
+    void onPreExecute();
+}

app/src/main/java/protect/card_locker/async/CompatCallable.kt

@@ -1,9 +0,0 @@
-package protect.card_locker.async
-
-import java.util.concurrent.Callable
-
-interface CompatCallable<T> : Callable<T?> {
-    fun onPostExecute(result: Any?)
-
-    fun onPreExecute()
-}

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

@@ -1,97 +0,0 @@
-package protect.card_locker.compose
-
-import androidx.activity.compose.LocalActivity
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.rememberScrollState
-import androidx.compose.foundation.verticalScroll
-import androidx.compose.material3.AlertDialog
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Text
-import androidx.compose.material3.TextButton
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.AnnotatedString
-import androidx.compose.ui.unit.dp
-import protect.card_locker.OpenWebLinkHandler
-import protect.card_locker.R
-
-@Composable
-fun CatimaAboutSection(
-    title: String,
-    message: String,
-    modifier: Modifier = Modifier,
-    onClickUrl: String? = null,
-    onClickDialogText: AnnotatedString? = null,
-) {
-    val activity = LocalActivity.current
-
-    val openDialog = remember { mutableStateOf(false) }
-
-    Row(
-        modifier = modifier
-            .padding(horizontal = 16.dp, vertical = 8.dp)
-            .clickable {
-                if (onClickDialogText != null) {
-                    openDialog.value = true
-                } else if (onClickUrl != null) {
-                    OpenWebLinkHandler().openBrowser(activity, onClickUrl)
-                }
-            }
-    ) {
-        Column(modifier = Modifier.weight(1F)) {
-            Text(
-                text = title,
-                style = MaterialTheme.typography.titleMedium
-            )
-            Text(text = message)
-        }
-        Text(modifier = Modifier.align(Alignment.CenterVertically),
-            text = ">",
-            style = MaterialTheme.typography.bodyMedium
-        )
-    }
-    if (openDialog.value && onClickDialogText != null) {
-        AlertDialog(
-            icon = {},
-            title = {
-                Text(text = title)
-            },
-            text = {
-                Text(
-                    text = onClickDialogText,
-                    modifier = Modifier.verticalScroll(rememberScrollState())
-                )
-            },
-            onDismissRequest = {
-                openDialog.value = false
-            },
-            confirmButton = {
-                TextButton(
-                    onClick = {
-                        openDialog.value = false
-                    }
-                ) {
-                    Text(stringResource(R.string.ok))
-                }
-            },
-            dismissButton = {
-                if (onClickUrl != null) {
-                    TextButton(
-                        onClick = {
-                            OpenWebLinkHandler().openBrowser(activity, onClickUrl)
-                        }
-                    ) {
-                        Text(stringResource(R.string.view_online))
-                    }
-                }
-            }
-        )
-    }
-}

app/src/main/java/protect/card_locker/compose/Catima.kt

@@ -1,34 +0,0 @@
-package protect.card_locker.compose
-
-import androidx.activity.OnBackPressedDispatcher
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.automirrored.filled.ArrowBack
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.Icon
-import androidx.compose.material3.IconButton
-import androidx.compose.material3.Text
-import androidx.compose.material3.TopAppBar
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.testTag
-import androidx.compose.ui.res.stringResource
-import protect.card_locker.R
-
-@OptIn(ExperimentalMaterial3Api::class)
-@Composable
-fun CatimaTopAppBar(title: String, onBackPressedDispatcher: OnBackPressedDispatcher?) {
-    TopAppBar(
-        modifier = Modifier.testTag("topbar_catima"),
-        title = { Text(text = title) },
-        navigationIcon = {
-            if (onBackPressedDispatcher != null) {
-                IconButton(onClick = { onBackPressedDispatcher.onBackPressed() }) {
-                    Icon(
-                        imageVector = Icons.AutoMirrored.Filled.ArrowBack,
-                        contentDescription = stringResource(R.string.back)
-                    )
-                }
-            }
-        }
-    )
-}

app/src/main/java/protect/card_locker/compose/theme/Theme.kt

@@ -1,46 +0,0 @@
-package protect.card_locker.compose.theme
-
-import android.os.Build
-import androidx.appcompat.app.AppCompatDelegate
-import androidx.compose.foundation.isSystemInDarkTheme
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.darkColorScheme
-import androidx.compose.material3.dynamicDarkColorScheme
-import androidx.compose.material3.dynamicLightColorScheme
-import androidx.compose.material3.lightColorScheme
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.colorResource
-import protect.card_locker.R
-import protect.card_locker.preferences.Settings
-
-@Composable
-fun CatimaTheme(content: @Composable () -> Unit) {
-    val context = LocalContext.current
-    val settings = Settings(context)
-
-    val isDynamicColorSupported = Build.VERSION.SDK_INT >= Build.VERSION_CODES.S
-
-    val lightTheme = if (isDynamicColorSupported) {
-        dynamicLightColorScheme(context)
-    } else {
-        lightColorScheme(primary = colorResource(id = R.color.md_theme_light_primary))
-    }
-
-    val darkTheme = if (isDynamicColorSupported) {
-        dynamicDarkColorScheme(context)
-    } else {
-        darkColorScheme(primary = colorResource(id = R.color.md_theme_dark_primary))
-    }
-
-    val colorScheme = when (settings.theme) {
-        AppCompatDelegate.MODE_NIGHT_NO -> lightTheme
-        AppCompatDelegate.MODE_NIGHT_YES -> darkTheme
-        else -> if (isSystemInDarkTheme()) darkTheme else lightTheme
-    }
-
-    MaterialTheme(
-        colorScheme = colorScheme,
-        content = content
-    )
-}

app/src/main/java/protect/card_locker/importexport/DataFormat.java

@@ -0,0 +1,8 @@
+package protect.card_locker.importexport;
+
+public enum DataFormat {
+    Catima,
+    Fidme,
+    Stocard,
+    VoucherVault;
+}

app/src/main/java/protect/card_locker/importexport/DataFormat.kt

@@ -1,7 +0,0 @@
-package protect.card_locker.importexport
-
-enum class DataFormat {
-    Catima,
-    Fidme,
-    VoucherVault
-}

app/src/main/java/protect/card_locker/importexport/Exporter.java

@@ -0,0 +1,20 @@
+package protect.card_locker.importexport;
+
+import android.content.Context;
+import android.database.sqlite.SQLiteDatabase;
+
+import java.io.IOException;
+import java.io.OutputStream;
+
+/**
+ * Interface for a class which can export the contents of the database
+ * in a given format.
+ */
+public interface Exporter {
+    /**
+     * Export the database to the output stream in a given format.
+     *
+     * @throws IOException
+     */
+    void exportData(Context context, SQLiteDatabase database, OutputStream output, char[] password) throws IOException, InterruptedException;
+}

app/src/main/java/protect/card_locker/importexport/Exporter.kt

@@ -1,25 +0,0 @@
-package protect.card_locker.importexport
-
-import android.content.Context
-import android.database.sqlite.SQLiteDatabase
-import java.io.IOException
-import java.io.OutputStream
-
-/**
- * Interface for a class which can export the contents of the database
- * in a given format.
- */
-interface Exporter {
-    /**
-     * Export the database to the output stream in a given format.
-     *
-     * @throws IOException, InterruptedException
-     */
-    @Throws(IOException::class, InterruptedException::class)
-    fun exportData(
-        context: Context,
-        database: SQLiteDatabase,
-        output: OutputStream,
-        password: CharArray
-    )
-}

app/src/main/java/protect/card_locker/importexport/ImportExportResultType.java

@@ -0,0 +1,7 @@
+package protect.card_locker.importexport;
+
+public enum ImportExportResultType {
+    Success,
+    GenericFailure,
+    BadPassword;
+}

app/src/main/java/protect/card_locker/importexport/ImportExportResultType.kt

@@ -1,7 +0,0 @@
-package protect.card_locker.importexport
-
-enum class ImportExportResultType {
-    Success,
-    GenericFailure,
-    BadPassword
-}

app/src/main/java/protect/card_locker/importexport/Importer.java

@@ -0,0 +1,27 @@
+package protect.card_locker.importexport;
+
+import android.content.Context;
+import android.database.sqlite.SQLiteDatabase;
+
+import org.json.JSONException;
+
+import java.io.File;
+import java.io.IOException;
+import java.text.ParseException;
+
+import protect.card_locker.FormatException;
+
+/**
+ * Interface for a class which can import the contents of a stream
+ * into the database.
+ */
+public interface Importer {
+    /**
+     * Import data from the input stream in a given format into
+     * the database.
+     *
+     * @throws IOException
+     * @throws FormatException
+     */
+    void importData(Context context, SQLiteDatabase database, File inputFile, char[] password) throws IOException, FormatException, InterruptedException, JSONException, ParseException;
+}

app/src/main/java/protect/card_locker/importexport/Importer.kt

@@ -1,39 +0,0 @@
-package protect.card_locker.importexport
-
-import android.content.Context
-import android.database.sqlite.SQLiteDatabase
-import org.json.JSONException
-import protect.card_locker.FormatException
-import java.io.File
-import java.io.IOException
-import java.text.ParseException
-
-/**
- * Interface for a class which can import the contents of a stream
- * into the database.
- */
-interface Importer {
-    /**
-     * Import data from the input stream in a given format into
-     * the database.
-     *
-     * @throws IOException
-     * @throws FormatException
-     * @throws InterruptedException
-     * @throws JSONException
-     * @throws ParseException
-     */
-    @Throws(
-        IOException::class,
-        FormatException::class,
-        InterruptedException::class,
-        JSONException::class,
-        ParseException::class
-    )
-    fun importData(
-        context: Context,
-        database: SQLiteDatabase,
-        inputFile: File,
-        password: CharArray
-    )
-}

app/src/main/java/protect/card_locker/importexport/MultiFormatImporter.java

@@ -37,6 +37,9 @@ public class MultiFormatImporter {
             case Fidme:
                 importer = new FidmeImporter();
                 break;
+            case Stocard:
+                importer = new StocardImporter();
+                break;
             case VoucherVault:
                 importer = new VoucherVaultImporter();
                 break;

app/src/main/java/protect/card_locker/importexport/StocardImporter.java

@@ -0,0 +1,428 @@
+package protect.card_locker.importexport;
+
+import android.content.Context;
+import android.database.sqlite.SQLiteDatabase;
+import android.graphics.Bitmap;
+import android.util.Log;
+
+import androidx.annotation.NonNull;
+
+import com.google.zxing.BarcodeFormat;
+
+import net.lingala.zip4j.ZipFile;
+import net.lingala.zip4j.io.inputstream.ZipInputStream;
+import net.lingala.zip4j.model.FileHeader;
+
+import org.apache.commons.csv.CSVFormat;
+import org.apache.commons.csv.CSVParser;
+import org.apache.commons.csv.CSVRecord;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.math.BigDecimal;
+import java.nio.charset.StandardCharsets;
+import java.text.ParseException;
+import java.time.Instant;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import protect.card_locker.CatimaBarcode;
+import protect.card_locker.DBHelper;
+import protect.card_locker.FormatException;
+import protect.card_locker.ImageLocationType;
+import protect.card_locker.LoyaltyCard;
+import protect.card_locker.R;
+import protect.card_locker.Utils;
+import protect.card_locker.ZipUtils;
+
+/**
+ * Class for importing a database from CSV (Comma Separate Values)
+ * formatted data.
+ * <p>
+ * The database's loyalty cards are expected to appear in the CSV data.
+ * A header is expected for the each table showing the names of the columns.
+ */
+public class StocardImporter implements Importer {
+    public static class StocardProvider {
+        public String name = null;
+        public String barcodeFormat = null;
+        public Bitmap logo = null;
+    }
+
+    public static class StocardRecord {
+        public String providerId = null;
+        public String store = null;
+        public String label = null;
+        public String note = null;
+        public String cardId = null;
+        public String barcodeType = null;
+        public Long lastUsed = null;
+        public Bitmap frontImage = null;
+        public Bitmap backImage = null;
+
+        @NonNull
+        @Override
+        public String toString() {
+            return String.format(
+                    "StocardRecord{%n  providerId=%s,%n  store=%s,%n  label=%s,%n  note=%s,%n  cardId=%s,%n"
+                            + "  barcodeType=%s,%n  lastUsed=%s,%n  frontImage=%s,%n  backImage=%s%n}",
+                    this.providerId,
+                    this.store,
+                    this.label,
+                    this.note,
+                    this.cardId,
+                    this.barcodeType,
+                    this.lastUsed,
+                    this.frontImage,
+                    this.backImage
+            );
+        }
+    }
+
+    public static class ZIPData {
+        public final Map<String, StocardRecord> cards;
+        public final Map<String, StocardProvider> providers;
+
+        ZIPData(final Map<String, StocardRecord> cards, final Map<String, StocardProvider> providers) {
+            this.cards = cards;
+            this.providers = providers;
+        }
+    }
+
+    public static class ImportedData {
+        public final List<LoyaltyCard> cards;
+        public final Map<Integer, Map<ImageLocationType, Bitmap>> images;
+
+        ImportedData(final List<LoyaltyCard> cards, final Map<Integer, Map<ImageLocationType, Bitmap>> images) {
+            this.cards = cards;
+            this.images = images;
+        }
+    }
+
+    public static final String PROVIDER_PREFIX = "/loyalty-card-providers/";
+
+    private static final String TAG = "Catima";
+
+    public void importData(Context context, SQLiteDatabase database, File inputFile, char[] password) throws IOException, FormatException, JSONException, ParseException {
+        ZIPData zipData = new ZIPData(new HashMap<>(), new HashMap<>());
+
+        final CSVParser parser = new CSVParser(new InputStreamReader(context.getResources().openRawResource(R.raw.stocard_stores), StandardCharsets.UTF_8), CSVFormat.RFC4180.builder().setHeader().build());
+
+        try {
+            for (CSVRecord record : parser) {
+                StocardProvider provider = new StocardProvider();
+                provider.name = record.get("name").trim();
+                provider.barcodeFormat = record.get("barcodeFormat").trim();
+
+                zipData.providers.put(record.get("_id").trim(), provider);
+            }
+
+            parser.close();
+        } catch (IllegalArgumentException | IllegalStateException e) {
+            throw new FormatException("Issue parsing CSV data", e);
+        }
+
+        ZipFile zipFile = new ZipFile(inputFile, password);
+        zipData = importZIP(zipFile, zipData);
+        zipFile.close();
+
+        if (zipData.cards.keySet().size() == 0) {
+            throw new FormatException("Couldn't find any loyalty cards in this Stocard export.");
+        }
+
+        ImportedData importedData = importLoyaltyCardHashMap(context, zipData);
+        saveAndDeduplicate(context, database, importedData);
+    }
+
+    public ZIPData importZIP(ZipFile zipFile, final ZIPData zipData) throws IOException, FormatException, JSONException {
+        Map<String, StocardRecord> cards = zipData.cards;
+        Map<String, StocardProvider> providers = zipData.providers;
+
+        String[] customProvidersBaseName = null;
+        String[] cardBaseName = null;
+        String customProviderId = "";
+        String cardName = "";
+        for (FileHeader fileHeader : zipFile.getFileHeaders()) {
+            String fileName = fileHeader.getFileName();
+            String[] nameParts = fileName.split("/");
+
+            if (nameParts.length < 2) {
+                continue;
+            }
+
+            String userId = nameParts[1];
+            ZipInputStream zipInputStream = zipFile.getInputStream(fileHeader);
+
+            if (customProvidersBaseName == null) {
+                // FIXME: can we use the points-account/statement/content.json balance info somehow?
+                /*
+                  Known files:
+                    extracts/<user-UUID>/users/<user-UUID>/
+                      analytics-properties/content.json
+                      devices/<device-UUID>/
+                        analytics-properties/content.json
+                        content.json
+                        ip-location-wifi/content.json
+                      enabled-regions/<UUID>/content.json
+                      loyalty-card-custom-providers/<provider-UUID>/content.json - custom providers
+                      loyalty-cards/<card-UUID>/
+                        card-linked-coupons/accounts/default/
+                          content.json
+                          user-coupons/<UUID>/content.json
+                        content.json - card itself
+                        images/back.png - back image (legacy)
+                        images/back/back.jpg - back image
+                        images/back/content.json
+                        images/front.png - front image (legacy)
+                        images/front/content.json
+                        images/front/front.jpg - front image
+                        notes/default/content.json - note
+                        points-account/
+                          content.json
+                          statement/content.json
+                        usages/<UUID>/content.json - timestamps
+                        usage-statistics/content.json - timestamps
+                      reward-program-balances/<UUID>/content.json
+                */
+                customProvidersBaseName = new String[]{
+                        "extracts",
+                        userId,
+                        "users",
+                        userId,
+                        "loyalty-card-custom-providers"
+                };
+                cardBaseName = new String[]{
+                        "extracts",
+                        userId,
+                        "users",
+                        userId,
+                        "loyalty-cards"
+                };
+            }
+
+            if (startsWith(nameParts, customProvidersBaseName, 1)) {
+                // Extract providerId
+                customProviderId = nameParts[customProvidersBaseName.length];
+
+                StocardProvider provider = providers.get(customProviderId);
+                if (provider == null) {
+                    provider = new StocardProvider();
+                    providers.put(customProviderId, provider);
+                }
+
+                // Name file
+                if (fileName.endsWith(customProviderId + "/content.json")) {
+                    JSONObject jsonObject = ZipUtils.readJSON(zipInputStream);
+                    provider.name = jsonObject.getString("name");
+                } else if (fileName.endsWith("logo.png")) {
+                    provider.logo = ZipUtils.readImage(zipInputStream);
+                } else if (!fileName.endsWith("/")) {
+                    Log.d(TAG, "Unknown or unused loyalty-card-custom-providers file " + fileName + ", skipping...");
+                }
+            } else if (startsWith(nameParts, cardBaseName, 1)) {
+                // Extract cardName
+                cardName = nameParts[cardBaseName.length];
+
+                StocardRecord record = cards.get(cardName);
+                if (record == null) {
+                    record = new StocardRecord();
+                    cards.put(cardName, record);
+                }
+
+                // This is the card itself
+                if (fileName.endsWith(cardName + "/content.json")) {
+                    JSONObject jsonObject = ZipUtils.readJSON(zipInputStream);
+                    record.cardId = jsonObject.getString("input_id");
+
+                    if (jsonObject.has("input_provider_name")) {
+                        record.store = jsonObject.getString("input_provider_name");
+                    }
+
+                    if (jsonObject.has("label")) {
+                        String label = jsonObject.getString("label");
+                        if (!label.isBlank()) {
+                            record.label = label;
+                        }
+                    }
+
+                    // Provider ID can be either custom or not, extract whatever version is relevant
+                    String customProviderPrefix = "/users/" + userId + "/loyalty-card-custom-providers/";
+                    String providerId = jsonObject
+                            .getJSONObject("input_provider_reference")
+                            .getString("identifier");
+                    if (providerId.startsWith(customProviderPrefix)) {
+                        providerId = providerId.substring(customProviderPrefix.length());
+                    } else if (providerId.startsWith(PROVIDER_PREFIX)) {
+                        providerId = providerId.substring(PROVIDER_PREFIX.length());
+                    } else {
+                        throw new FormatException("Unsupported provider ID format: " + providerId);
+                    }
+
+                    record.providerId = providerId;
+
+                    if (jsonObject.has("input_barcode_format")) {
+                        record.barcodeType = jsonObject.getString("input_barcode_format");
+                    }
+                } else if (fileName.endsWith("notes/default/content.json")) {
+                    record.note = ZipUtils.readJSON(zipInputStream).getString("content");
+                } else if (fileName.endsWith("usage-statistics/content.json")) {
+                    JSONArray usages = ZipUtils.readJSON(zipInputStream).getJSONArray("usages");
+                    for (int i = 0; i < usages.length(); i++) {
+                        JSONObject lastUsedObject = usages.getJSONObject(i);
+                        String lastUsedString = lastUsedObject.getJSONObject("time").getString("value");
+                        long timeStamp = Instant.parse(lastUsedString).getEpochSecond();
+                        if (record.lastUsed == null || timeStamp > record.lastUsed) {
+                            record.lastUsed = timeStamp;
+                        }
+                    }
+                } else if (fileName.matches(".*/usages/[^/]+/content.json")) {
+                    JSONObject lastUsedObject = ZipUtils.readJSON(zipInputStream);
+                    String lastUsedString = lastUsedObject.getJSONObject("time").getString("value");
+                    long timeStamp = Instant.parse(lastUsedString).getEpochSecond();
+                    if (record.lastUsed == null || timeStamp > record.lastUsed) {
+                        record.lastUsed = timeStamp;
+                    }
+                } else if (fileName.endsWith("/images/front.png") || fileName.endsWith("/images/front/front.jpg")) {
+                    record.frontImage = ZipUtils.readImage(zipInputStream);
+                } else if (fileName.endsWith("/images/back.png") || fileName.endsWith("/images/back/back.jpg")) {
+                    record.backImage = ZipUtils.readImage(zipInputStream);
+                } else if (!fileName.endsWith("/")) {
+                    Log.d(TAG, "Unknown or unused loyalty-cards file " + fileName + ", skipping...");
+                }
+            } else if (!fileName.endsWith("/")) {
+                Log.d(TAG, "Unknown or unused file " + fileName + ", skipping...");
+            }
+
+            zipInputStream.close();
+        }
+
+        return new ZIPData(cards, providers);
+    }
+
+    public ImportedData importLoyaltyCardHashMap(Context context, final ZIPData zipData) throws FormatException {
+        ImportedData importedData = new ImportedData(new ArrayList<>(), new HashMap<>());
+        int tempID = 0;
+
+        List<String> cardKeys = new ArrayList<>(zipData.cards.keySet());
+        Collections.sort(cardKeys);
+
+        for (String key : cardKeys) {
+            StocardRecord record = zipData.cards.get(key);
+
+            if (record.providerId == null) {
+                Log.d(TAG, "Missing providerId for card " + record + ", ignoring...");
+                continue;
+            }
+
+            if (record.cardId == null) {
+                throw new FormatException("No card ID listed, but is required");
+            }
+
+            StocardProvider provider = zipData.providers.get(record.providerId);
+
+            // Read store from card, if not available (old export), fall back to providerData
+            String store = record.store != null ? record.store : provider != null ? provider.name : record.providerId;
+            String note = record.note != null ? record.note : "";
+            String barcodeTypeString = record.barcodeType != null ? record.barcodeType : provider != null ? provider.barcodeFormat : null;
+
+            if (record.label != null && !record.label.equals(store) && !record.label.equals(note)) {
+                note = note.isEmpty() ? record.label : note + "\n" + record.label;
+            }
+
+            CatimaBarcode barcodeType = null;
+            if (barcodeTypeString != null && !barcodeTypeString.isEmpty()) {
+                if (barcodeTypeString.equals("RSS_DATABAR_EXPANDED")) {
+                    barcodeType = CatimaBarcode.fromBarcode(BarcodeFormat.RSS_EXPANDED);
+                } else if (barcodeTypeString.equals("GS1_128")) {
+                    barcodeType = CatimaBarcode.fromBarcode(BarcodeFormat.CODE_128);
+                } else {
+                    barcodeType = CatimaBarcode.fromName(barcodeTypeString);
+                }
+            }
+
+            int headerColor = Utils.getRandomHeaderColor(context);
+            if (provider != null && provider.logo != null) {
+                headerColor = Utils.getHeaderColorFromImage(provider.logo, headerColor);
+            }
+
+            long lastUsed = record.lastUsed != null ? record.lastUsed : Utils.getUnixTime();
+
+            LoyaltyCard card = new LoyaltyCard(
+                    tempID,
+                    store,
+                    note,
+                    null,
+                    null,
+                    BigDecimal.valueOf(0),
+                    null,
+                    record.cardId,
+                    null,
+                    barcodeType,
+                    headerColor,
+                    0,
+                    lastUsed,
+                    DBHelper.DEFAULT_ZOOM_LEVEL,
+                    DBHelper.DEFAULT_ZOOM_LEVEL_WIDTH,
+                    0,
+                    null,
+                    null,
+                    null,
+                    null,
+                    null,
+                    null
+            );
+            importedData.cards.add(card);
+
+            Map<ImageLocationType, Bitmap> images = new HashMap<>();
+
+            if (provider != null && provider.logo != null) {
+                images.put(ImageLocationType.icon, provider.logo);
+            }
+            if (record.frontImage != null) {
+                images.put(ImageLocationType.front, record.frontImage);
+            }
+            if (record.backImage != null) {
+                images.put(ImageLocationType.back, record.backImage);
+            }
+
+            importedData.images.put(tempID, images);
+            tempID++;
+        }
+
+        return importedData;
+    }
+
+    public void saveAndDeduplicate(Context context, SQLiteDatabase database, final ImportedData data) throws IOException {
+        // This format does not have IDs that can cause conflicts
+        // Proper deduplication for all formats will be implemented later
+        for (LoyaltyCard card : data.cards) {
+            // card.id is temporary and only used to index the images Map
+            long id = DBHelper.insertLoyaltyCard(database, card.store, card.note, card.validFrom, card.expiry, card.balance, card.balanceType,
+                    card.cardId, card.barcodeId, card.barcodeType, card.headerColor, card.starStatus, card.lastUsed, card.archiveStatus);
+            for (Map.Entry<ImageLocationType, Bitmap> entry : data.images.get(card.id).entrySet()) {
+                Utils.saveCardImage(context, entry.getValue(), (int) id, entry.getKey());
+            }
+        }
+    }
+
+    private boolean startsWith(String[] full, String[] start, int minExtraLength) {
+        if (full.length - minExtraLength < start.length) {
+            return false;
+        }
+
+        for (int i = 0; i < start.length; i++) {
+            if (!start[i].contentEquals(full[i])) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+}

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

@@ -74,6 +74,10 @@ public class Settings {
         return getBoolean(R.string.settings_key_display_barcode_max_brightness, true);
     }
 
+    public String getCardViewOrientation() {
+        return getString(R.string.settings_key_card_orientation, getResString(R.string.settings_key_follow_system_orientation));
+    }
+
     public boolean getKeepScreenOn() {
         return getBoolean(R.string.settings_key_keep_screen_on, true);
     }

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

@@ -0,0 +1,206 @@
+package protect.card_locker.preferences;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Build;
+import android.os.Bundle;
+import android.view.MenuItem;
+
+import androidx.activity.OnBackPressedCallback;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatDelegate;
+import androidx.appcompat.widget.Toolbar;
+import androidx.core.os.LocaleListCompat;
+import androidx.preference.ListPreference;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceFragmentCompat;
+
+import com.google.android.material.color.DynamicColors;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Locale;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+import protect.card_locker.CatimaAppCompatActivity;
+import protect.card_locker.MainActivity;
+import protect.card_locker.R;
+import protect.card_locker.Utils;
+import protect.card_locker.databinding.SettingsActivityBinding;
+
+public class SettingsActivity extends CatimaAppCompatActivity {
+
+    private SettingsActivityBinding binding;
+    private final static String RELOAD_MAIN_STATE = "mReloadMain";
+    private SettingsFragment fragment;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        binding = SettingsActivityBinding.inflate(getLayoutInflater());
+        setTitle(R.string.settings);
+        setContentView(binding.getRoot());
+        Utils.applyWindowInsets(binding.getRoot());
+        Toolbar toolbar = binding.toolbar;
+        setSupportActionBar(toolbar);
+        enableToolbarBackButton();
+
+        // Display the fragment as the main content.
+        fragment = new SettingsFragment();
+        getSupportFragmentManager().beginTransaction()
+                .replace(R.id.settings_container, fragment)
+                .commit();
+
+        // restore reload main state
+        if (savedInstanceState != null) {
+            fragment.mReloadMain = savedInstanceState.getBoolean(RELOAD_MAIN_STATE);
+        }
+
+        getOnBackPressedDispatcher().addCallback(this, new OnBackPressedCallback(true) {
+            @Override
+            public void handleOnBackPressed() {
+                finishSettingsActivity();
+            }
+        });
+    }
+
+    @Override
+    protected void onSaveInstanceState(@NonNull Bundle outState) {
+        super.onSaveInstanceState(outState);
+        outState.putBoolean(RELOAD_MAIN_STATE, fragment.mReloadMain);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        int id = item.getItemId();
+
+        if (id == android.R.id.home) {
+            finishSettingsActivity();
+            return true;
+        }
+
+        return super.onOptionsItemSelected(item);
+    }
+
+    private void finishSettingsActivity() {
+        if (fragment.mReloadMain) {
+            Intent intent = new Intent();
+            intent.putExtra(MainActivity.RESTART_ACTIVITY_INTENT, true);
+            setResult(Activity.RESULT_OK, intent);
+        } else {
+            setResult(Activity.RESULT_OK);
+        }
+        finish();
+    }
+
+    public static class SettingsFragment extends PreferenceFragmentCompat {
+        private static final String DIALOG_FRAGMENT_TAG = "SettingsFragment";
+
+        public boolean mReloadMain;
+
+        @Override
+        public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
+            // Load the preferences from an XML resource
+            addPreferencesFromResource(R.xml.preferences);
+
+            // Show pretty names and summaries
+            ListPreference themePreference = findPreference(getResources().getString(R.string.settings_key_theme));
+            assert themePreference != null;
+            themePreference.setOnPreferenceChangeListener((preference, o) -> {
+                if (o.toString().equals(getResources().getString(R.string.settings_key_light_theme))) {
+                    AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
+                } else if (o.toString().equals(getResources().getString(R.string.settings_key_dark_theme))) {
+                    AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
+                } else {
+                    AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM);
+                }
+
+                return true;
+            });
+
+            ListPreference themeColorPreference = findPreference(getResources().getString(R.string.setting_key_theme_color));
+            assert themeColorPreference != null;
+            themeColorPreference.setOnPreferenceChangeListener((preference, o) -> {
+                refreshActivity(true);
+                return true;
+            });
+            if (!DynamicColors.isDynamicColorAvailable()) {
+                themeColorPreference.setEntryValues(R.array.color_values_no_dynamic);
+                themeColorPreference.setEntries(R.array.color_value_strings_no_dynamic);
+            }
+
+            Preference oledDarkPreference = findPreference(getResources().getString(R.string.settings_key_oled_dark));
+            assert oledDarkPreference != null;
+            oledDarkPreference.setOnPreferenceChangeListener((preference, newValue) -> {
+                refreshActivity(true);
+                return true;
+            });
+
+            ListPreference localePreference = findPreference(getResources().getString(R.string.settings_key_locale));
+            assert localePreference != null;
+            CharSequence[] entryValues = localePreference.getEntryValues();
+            List<CharSequence> entries = new ArrayList<>();
+            for (CharSequence entry : entryValues) {
+                if (entry.length() == 0) {
+                    entries.add(getResources().getString(R.string.settings_system_locale));
+                } else {
+                    Locale entryLocale = Utils.stringToLocale(entry.toString());
+                    entries.add(entryLocale.getDisplayName(entryLocale));
+                }
+            }
+            localePreference.setEntries(entries.toArray(new CharSequence[entryValues.length]));
+            // Make locale picker preference in sync with system settings
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+                Locale sysLocale = AppCompatDelegate.getApplicationLocales().get(0);
+                if (sysLocale == null) {
+                    // Corresponds to "System"
+                    localePreference.setValue("");
+                } else {
+                    // Need to set preference's value to one of localePreference.getEntryValues() to match the locale.
+                    // Locale.toLanguageTag() theoretically should be one of the values in localePreference.getEntryValues()...
+                    // But it doesn't work for some locales. so trying something more heavyweight.
+
+                    // Obtain all locales supported by the app.
+                    List<Locale> appLocales = Arrays.stream(localePreference.getEntryValues())
+                            .map(Objects::toString)
+                            .map(Utils::stringToLocale)
+                            .collect(Collectors.toList());
+                    // Get the app locale that best matches the system one
+                    Locale bestMatchLocale = Utils.getBestMatchLocale(appLocales, sysLocale);
+                    // Get its index in supported locales
+                    int index = appLocales.indexOf(bestMatchLocale);
+                    // Set preference value to entry value at that index
+                    localePreference.setValue(localePreference.getEntryValues()[index].toString());
+                }
+            }
+
+            localePreference.setOnPreferenceChangeListener((preference, newValue) -> {
+                // See corresponding comment in Utils.updateBaseContextLocale for Android 6- notes
+                if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) {
+                    refreshActivity(true);
+                    return true;
+                }
+                String newLocale = (String) newValue;
+                // If newLocale is empty, that means "System" was selected
+                AppCompatDelegate.setApplicationLocales(newLocale.isEmpty() ? LocaleListCompat.getEmptyLocaleList() : LocaleListCompat.create(Utils.stringToLocale(newLocale)));
+                return true;
+            });
+
+            // Disable content provider on SDK < 23 since dangerous permissions
+            // are granted at install-time
+            Preference contentProviderReadPreference = findPreference(getResources().getString(R.string.settings_key_allow_content_provider_read));
+            assert contentProviderReadPreference != null;
+            contentProviderReadPreference.setVisible(Build.VERSION.SDK_INT >= Build.VERSION_CODES.M);
+        }
+
+        private void refreshActivity(boolean reloadMain) {
+            mReloadMain = reloadMain || mReloadMain;
+            Activity activity = getActivity();
+            if (activity != null) {
+                activity.recreate();
+            }
+        }
+    }
+}

app/src/main/java/protect/card_locker/preferences/SettingsActivity.kt

@@ -1,191 +0,0 @@
-package protect.card_locker.preferences
-
-import android.app.Activity
-import android.content.Intent
-import android.os.Build
-import android.os.Bundle
-import android.view.MenuItem
-import androidx.activity.OnBackPressedCallback
-import androidx.appcompat.app.AppCompatDelegate
-import androidx.core.os.LocaleListCompat
-import androidx.preference.ListPreference
-import androidx.preference.Preference
-import androidx.preference.PreferenceFragmentCompat
-import com.google.android.material.color.DynamicColors
-import protect.card_locker.BuildConfig
-import protect.card_locker.CatimaAppCompatActivity
-import protect.card_locker.MainActivity
-import protect.card_locker.R
-import protect.card_locker.Utils
-import protect.card_locker.databinding.SettingsActivityBinding
-
-class SettingsActivity : CatimaAppCompatActivity() {
-
-    private lateinit var binding: SettingsActivityBinding
-    private lateinit var fragment: SettingsFragment
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        binding = SettingsActivityBinding.inflate(layoutInflater)
-        setTitle(R.string.settings)
-        setContentView(binding.root)
-        Utils.applyWindowInsets(binding.root)
-        val toolbar = binding.toolbar
-        setSupportActionBar(toolbar)
-        enableToolbarBackButton()
-
-        // Display the fragment as the main content.
-        fragment = SettingsFragment()
-        supportFragmentManager.beginTransaction()
-            .replace(R.id.settings_container, fragment)
-            .commit()
-
-        // restore reload main state
-        if (savedInstanceState != null) {
-            fragment.mReloadMain = savedInstanceState.getBoolean(RELOAD_MAIN_STATE)
-        }
-
-        onBackPressedDispatcher.addCallback(this, object : OnBackPressedCallback(true) {
-            override fun handleOnBackPressed() {
-                finishSettingsActivity()
-            }
-        })
-    }
-
-    override fun onSaveInstanceState(outState: Bundle) {
-        super.onSaveInstanceState(outState)
-        outState.putBoolean(RELOAD_MAIN_STATE, fragment.mReloadMain)
-    }
-
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        val id = item.itemId
-
-        if (id == android.R.id.home) {
-            finishSettingsActivity()
-            return true
-        }
-
-        return super.onOptionsItemSelected(item)
-    }
-
-    private fun finishSettingsActivity() {
-        if (fragment.mReloadMain) {
-            val intent = Intent()
-            intent.putExtra(MainActivity.RESTART_ACTIVITY_INTENT, true)
-            setResult(RESULT_OK, intent)
-        } else {
-            setResult(RESULT_OK)
-        }
-        finish()
-    }
-
-    class SettingsFragment : PreferenceFragmentCompat() {
-        var mReloadMain: Boolean = false
-
-        override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
-            // Load the preferences from an XML resource
-            addPreferencesFromResource(R.xml.preferences)
-
-            // Show pretty names and summaries
-            val themePreference = findPreference<ListPreference>(getString(R.string.settings_key_theme))
-            themePreference!!.setOnPreferenceChangeListener { _, o ->
-                when (o.toString()) {
-                    getString(R.string.settings_key_light_theme) -> {
-                        AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO)
-                    }
-                    getString(R.string.settings_key_dark_theme) -> {
-                        AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES)
-                    }
-                    else -> {
-                        AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM)
-                    }
-                }
-                true
-            }
-
-            val themeColorPreference = findPreference<ListPreference>(getString(R.string.setting_key_theme_color))
-            themeColorPreference!!.setOnPreferenceChangeListener { _, _ ->
-                refreshActivity(true)
-                true
-            }
-            if (!DynamicColors.isDynamicColorAvailable()) {
-                themeColorPreference.setEntryValues(R.array.color_values_no_dynamic)
-                themeColorPreference.setEntries(R.array.color_value_strings_no_dynamic)
-            }
-
-            val oledDarkPreference = findPreference<Preference>(getString(R.string.settings_key_oled_dark))
-            oledDarkPreference!!.setOnPreferenceChangeListener { _, _ ->
-                refreshActivity(true)
-                true
-            }
-
-            val localePreference =
-                findPreference<ListPreference>(getString(R.string.settings_key_locale))!!
-            localePreference.let {
-                val entryValues = it.entryValues
-                val entries = entryValues.map { entry ->
-                    if (entry.isEmpty()) {
-                        getString(R.string.settings_system_locale)
-                    } else {
-                        val entryLocale = Utils.stringToLocale(entry.toString())
-                        entryLocale.getDisplayName(entryLocale)
-                    }
-                }
-                it.entries = entries.toTypedArray()
-
-                // Make locale picker preference in sync with system settings
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-                    val sysLocale = AppCompatDelegate.getApplicationLocales()[0]
-                    if (sysLocale == null) {
-                        // Corresponds to "System"
-                        it.value = ""
-                    } else {
-                        // Need to set preference's value to one of localePreference.getEntryValues() to match the locale.
-                        // Locale.toLanguageTag() theoretically should be one of the values in localePreference.getEntryValues()...
-                        // But it doesn't work for some locales. so trying something more heavyweight.
-
-                        // Obtain all locales supported by the app.
-                        val appLocales = entryValues.map { entry -> Utils.stringToLocale(entry.toString()) }
-                        // Get the app locale that best matches the system one
-                        val bestMatchLocale = Utils.getBestMatchLocale(appLocales, sysLocale)
-                        // Get its index in supported locales
-                        val index = appLocales.indexOf(bestMatchLocale)
-                        // Set preference value to entry value at that index
-                        it.value = entryValues[index].toString()
-                    }
-                }
-            }
-
-            localePreference.setOnPreferenceChangeListener { _, newValue ->
-                // See corresponding comment in Utils.updateBaseContextLocale for Android 6- notes
-                if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) {
-                    refreshActivity(true)
-                    return@setOnPreferenceChangeListener true
-                }
-                val newLocale = newValue as String
-                // If newLocale is empty, that means "System" was selected
-                AppCompatDelegate.setApplicationLocales(if (newLocale.isEmpty()) LocaleListCompat.getEmptyLocaleList() else LocaleListCompat.create(Utils.stringToLocale(newLocale)))
-                true
-            }
-
-            // Disable content provider on SDK < 23 since dangerous permissions
-            // are granted at install-time
-            val contentProviderReadPreference = findPreference<Preference>(getString(R.string.settings_key_allow_content_provider_read))
-            contentProviderReadPreference!!.isVisible =
-                Build.VERSION.SDK_INT >= Build.VERSION_CODES.M
-
-            // Hide crash reporter settings on builds it's not enabled on
-            val crashReporterPreference = findPreference<Preference>("acra.enable")
-            crashReporterPreference!!.isVisible = BuildConfig.useAcraCrashReporter
-        }
-
-        private fun refreshActivity(reloadMain: Boolean) {
-            mReloadMain = reloadMain || mReloadMain
-            activity?.recreate()
-        }
-    }
-
-    companion object {
-        private const val RELOAD_MAIN_STATE = "mReloadMain"
-    }
-}

app/src/main/res/drawable/ic_launcher_background.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-  <path
-      android:pathData="M0,0h108v108h-108z"
-      android:fillColor="#1F4262"/>
-</vector>

app/src/main/res/drawable/ic_launcher_foreground.xml

@@ -3,57 +3,69 @@
     android:height="108dp"
     android:viewportWidth="108"
     android:viewportHeight="108">
-  <group android:scaleX="0.75"
-      android:scaleY="0.75"
-      android:translateX="13.5"
-      android:translateY="13.5">
+
     <path
-        android:pathData="M45.5,30.58L68.05,22.37C70.13,21.61 72.42,22.68 73.18,24.76L75.92,32.28L49.6,41.85L45.5,30.58Z"
-        android:fillColor="#F5A3A3"/>
+        android:fillColor="#F5A3A3"
+        android:pathData="M45.5,30.5768L68.0526,22.3683C70.1285,21.6127 72.4239,22.6831 73.1795,24.759L75.9156,32.2765L49.6042,41.8531L45.5,30.5768Z" />
+
     <path
-        android:pathData="M70.36,25.78C70.17,25.27 69.6,25 69.08,25.19L49.35,32.37L51.4,38.01L72.07,30.48L70.36,25.78ZM75.92,32.28L49.6,41.85L45.5,30.58L68.05,22.37C70.13,21.61 72.42,22.68 73.18,24.76L75.92,32.28Z"
-        android:fillColor="#CF1717"/>
+        android:fillColor="#CF1717"
+        android:pathData="M70.3604,25.785C70.1715,25.2661 69.5977,24.9985 69.0787,25.1874L49.3451,32.3698L51.3973,38.008L72.0705,30.4835L70.3604,25.785ZM75.9156,32.2765L49.6042,41.8531L45.5,30.5768L68.0526,22.3683C70.1285,21.6127 72.4239,22.6831 73.1795,24.759L75.9156,32.2765Z" />
+
     <path
-        android:pathData="M58.42,30.58L35.86,22.37C33.79,21.61 31.49,22.68 30.74,24.76L28,32.28L54.31,41.85L58.42,30.58Z"
-        android:fillColor="#F5A3A3"/>
+        android:fillColor="#F5A3A3"
+        android:pathData="M58.4155,30.5767L35.8629,22.3682C33.787,21.6126 31.4916,22.683 30.7361,24.7589L27.9999,32.2764L54.3113,41.853L58.4155,30.5767Z" />
+
     <path
-        android:pathData="M33.56,25.78C33.74,25.27 34.32,25 34.84,25.19L54.57,32.37L52.52,38.01L31.84,30.48L33.56,25.78ZM28,32.28L54.31,41.85L58.42,30.58L35.86,22.37C33.79,21.61 31.49,22.68 30.74,24.76L28,32.28Z"
-        android:fillColor="#DD1818"/>
+        android:fillColor="#DD1818"
+        android:pathData="M33.5551,25.7849C33.744,25.2659 34.3179,24.9984 34.8368,25.1873L54.5704,32.3697L52.5183,38.0078L31.845,30.4834L33.5551,25.7849ZM27.9999,32.2764L54.3113,41.853L58.4155,30.5767L35.8629,22.3682C33.787,21.6126 31.4916,22.683 30.7361,24.7589L27.9999,32.2764Z" />
+
     <path
-        android:pathData="M28.7,37.6C29.08,35.42 31.15,33.97 33.33,34.35L80.6,42.69C82.78,43.07 84.23,45.15 83.85,47.32L81.82,58.83C82.3,59.1 84.67,60.16 87.42,57.23V57.23C87.92,56.69 88.45,56.23 89.01,55.86C91.76,54.02 94,55.22 94,58.53C94,61.34 92.39,64.78 90.21,66.88C86.63,70.54 80.69,70.56 79.75,70.53L77.59,82.78C77.21,84.95 75.14,86.4 72.96,86.02L25.69,77.69C25.67,77.68 25.66,77.68 25.64,77.68C23.45,77.32 22,76.7 22,76C22,75.72 22.23,75.45 22.66,75.2C22.4,74.54 22.31,73.8 22.44,73.05L28.7,37.6Z"
-        android:fillColor="#B81414"/>
+        android:fillColor="#B81414"
+        android:pathData="M28.6958,37.5992C29.0794,35.4236 31.1543,33.9709 33.3298,34.3545L80.6006,42.6897C82.7761,43.0734 84.2288,45.148 83.8452,47.3235L81.8157,58.8328C82.2998,59.0988 84.6663,60.1572 87.416,57.2288V57.229C87.9156,56.6942 88.4507,56.2283 89.0068,55.8575C91.764,54.0193 93.9993,55.2156 93.9993,58.5293C93.9992,61.343 92.3876,64.7782 90.2134,66.8763C86.626,70.5423 80.6933,70.5552 79.7524,70.5332L77.5938,82.7766C77.2101,84.9522 75.1355,86.4049 72.96,86.0213L25.6892,77.6861C25.6723,77.6831 25.6555,77.6797 25.6387,77.6765C23.4483,77.3198 22.0001,76.7026 22,76.0003C22,75.7175 22.2348,75.4485 22.6582,75.2046C22.3986,74.5429 22.3121,73.8036 22.4446,73.0523L28.6958,37.5992Z" />
+
     <path
-        android:pathData="M90.67,60.75C90.67,61.85 89.93,63.24 89.01,63.86C88.09,64.47 87.34,64.07 87.34,62.97C87.34,61.86 88.09,60.47 89.01,59.86C89.93,59.24 90.67,59.64 90.67,60.75Z"
-        android:fillColor="#E82E2E"/>
+        android:fillColor="#E82E2E"
+        android:pathData="M90.6707,60.748C90.6707,61.8526 89.9257,63.2447 89.0066,63.8574C88.0876,64.4701 87.3425,64.0714 87.3425,62.9668C87.3425,61.8622 88.0876,60.4701 89.0066,59.8574C89.9257,59.2447 90.6707,59.6434 90.6707,60.748Z" />
+
     <path
-        android:pathData="M78,30C80.21,30 82,31.79 82,34V70C82,72.21 80.21,74 78,74H30C25.58,74 22,74.9 22,76V32C22,30.9 25.58,30 30,30H78Z"
-        android:fillColor="#E82E2E"/>
+        android:fillColor="#E82E2E"
+        android:pathData="M78,30C80.2091,30 82,31.7909 82,34V70C82,72.2091 80.2091,74 78,74H30C25.5817,74 22,74.8954 22,76V32C22,30.8954 25.5817,30 30,30H78Z" />
+
     <path
-        android:pathData="M51.2,54.25C51.62,53.53 52.53,53.29 53.25,53.7C53.94,54.1 54.2,54.98 53.84,55.68L53.76,55.82C53.4,56.52 53.65,57.4 54.35,57.8C55.04,58.2 55.93,57.98 56.36,57.32L56.44,57.18C56.87,56.52 57.75,56.3 58.45,56.7C59.16,57.12 59.41,58.03 58.99,58.75C57.75,60.9 55,61.64 52.85,60.4C50.7,59.15 49.96,56.4 51.2,54.25Z"
-        android:fillColor="#8A0F0F"/>
+        android:fillColor="#8A0F0F"
+        android:pathData="M51.2008,54.25C51.615,53.5325 52.5324,53.2867 53.2498,53.7009C53.9449,54.1022 54.1973,54.9757 53.8358,55.6822L53.762,55.8178C53.4005,56.5242 53.6529,57.3977 54.3479,57.799C55.043,58.2003 55.9256,57.9821 56.3567,57.3158L56.4372,57.1841C56.8683,56.5178 57.751,56.2997 58.446,56.7009C59.1634,57.1151 59.4092,58.0325 58.995,58.75C57.7524,60.9023 55.0002,61.6397 52.8479,60.3971C50.6956,59.1544 49.9582,56.4023 51.2008,54.25Z" />
+
     <path
-        android:pathData="M52.79,54.25C52.38,53.53 51.46,53.29 50.75,53.7C50.05,54.1 49.8,54.98 50.16,55.68L50.23,55.82C50.6,56.52 50.34,57.4 49.65,57.8C48.95,58.2 48.07,57.98 47.64,57.32L47.56,57.18C47.13,56.52 46.24,56.3 45.55,56.7C44.83,57.12 44.59,58.03 45,58.75C46.24,60.9 49,61.64 51.15,60.4C53.3,59.15 54.04,56.4 52.79,54.25Z"
-        android:fillColor="#8A0F0F"/>
+        android:fillColor="#8A0F0F"
+        android:pathData="M52.795,54.25C52.3808,53.5325 51.4634,53.2867 50.746,53.7009C50.051,54.1022 49.7986,54.9757 50.1601,55.6822L50.2339,55.8178C50.5954,56.5242 50.343,57.3977 49.6479,57.799C48.9529,58.2003 48.0702,57.9821 47.6392,57.3158L47.5586,57.1841C47.1276,56.5178 46.2449,56.2997 45.5499,56.7009C44.8324,57.1151 44.5866,58.0325 45.0008,58.75C46.2435,60.9023 48.9956,61.6397 51.1479,60.3971C53.3002,59.1544 54.0377,56.4023 52.795,54.25Z" />
+
     <path
-        android:pathData="M53.3,56.75C52.72,57.75 51.28,57.75 50.7,56.75L48.1,52.25C47.53,51.25 48.25,50 49.4,50L54.6,50C55.75,50 56.47,51.25 55.9,52.25L53.3,56.75Z"
-        android:fillColor="#8A0F0F"/>
+        android:fillColor="#8A0F0F"
+        android:pathData="M53.2989,56.75C52.7216,57.75 51.2782,57.75 50.7009,56.75L48.1028,52.25C47.5254,51.25 48.2471,50 49.4018,50L54.598,50C55.7527,50 56.4744,51.25 55.897,52.25L53.2989,56.75Z" />
+
     <path
-        android:pathData="M40.5,40.5C43.73,40.5 46.46,42.62 47.42,45.53C47.68,46.31 47.26,47.16 46.47,47.42C45.69,47.68 44.84,47.26 44.58,46.47C44,44.73 42.38,43.5 40.5,43.5C38.62,43.5 37,44.73 36.42,46.47C36.16,47.26 35.31,47.68 34.53,47.42C33.74,47.16 33.32,46.31 33.58,45.53C34.54,42.62 37.27,40.5 40.5,40.5Z"
-        android:fillColor="#8A0F0F"/>
+        android:fillColor="#8A0F0F"
+        android:pathData="M40.4999,40.5C43.7321,40.5 46.4561,42.6167 47.4233,45.5269C47.6845,46.313 47.2592,47.162 46.4731,47.4233C45.687,47.6846 44.8379,47.2592 44.5766,46.4731C43.9982,44.7328 42.3813,43.5 40.4999,43.5C38.6186,43.5 37.0016,44.7328 36.4233,46.4731C36.162,47.2592 35.3129,47.6846 34.5268,47.4233C33.7407,47.162 33.3153,46.313 33.5766,45.5269C34.5438,42.6167 37.2678,40.5 40.4999,40.5Z" />
+
     <path
-        android:pathData="M63.5,40.5C66.73,40.5 69.46,42.62 70.42,45.53C70.68,46.31 70.26,47.16 69.47,47.42C68.69,47.68 67.84,47.26 67.58,46.47C67,44.73 65.38,43.5 63.5,43.5C61.62,43.5 60,44.73 59.42,46.47C59.16,47.26 58.31,47.68 57.53,47.42C56.74,47.16 56.32,46.31 56.58,45.53C57.54,42.62 60.27,40.5 63.5,40.5Z"
-        android:fillColor="#8A0F0F"/>
+        android:fillColor="#8A0F0F"
+        android:pathData="M63.4999,40.5C66.7321,40.5 69.4561,42.6167 70.4233,45.5269C70.6845,46.313 70.2592,47.162 69.4731,47.4233C68.687,47.6846 67.8379,47.2592 67.5766,46.4731C66.9982,44.7328 65.3813,43.5 63.4999,43.5C61.6186,43.5 60.0016,44.7328 59.4233,46.4731C59.162,47.2592 58.3129,47.6846 57.5268,47.4233C56.7407,47.162 56.3153,46.313 56.5766,45.5269C57.5438,42.6167 60.2678,40.5 63.4999,40.5Z" />
+
     <path
-        android:pathData="M26,55C25.45,55 25,54.55 25,54C25,53.45 25.45,53 26,53H42C42.55,53 43,53.45 43,54C43,54.55 42.55,55 42,55H26Z"
-        android:fillColor="#8A0F0F"/>
+        android:fillColor="#8A0F0F"
+        android:pathData="M26,55C25.4477,55 25,54.5523 25,54C25,53.4477 25.4477,53 26,53H42C42.5523,53 43,53.4477 43,54C43,54.5523 42.5523,55 42,55H26Z" />
+
     <path
-        android:pathData="M26.35,60.94C25.83,61.13 25.26,60.87 25.06,60.35C24.87,59.83 25.13,59.26 25.65,59.06L41.65,53.06C42.17,52.87 42.74,53.13 42.94,53.65C43.13,54.17 42.87,54.74 42.35,54.94L26.35,60.94Z"
-        android:fillColor="#8A0F0F"/>
+        android:fillColor="#8A0F0F"
+        android:pathData="M26.3511,60.9363C25.834,61.1302 25.2576,60.8682 25.0637,60.3511C24.8698,59.834 25.1318,59.2575 25.6489,59.0636L41.6488,53.0637C42.1659,52.8698 42.7423,53.1318 42.9362,53.6489C43.1302,54.166 42.8681,54.7424 42.351,54.9363L26.3511,60.9363Z" />
+
     <path
-        android:pathData="M61.65,54.94C61.13,54.74 60.87,54.17 61.06,53.65C61.26,53.13 61.83,52.87 62.35,53.06L78.35,59.06C78.87,59.26 79.13,59.83 78.94,60.35C78.74,60.87 78.17,61.13 77.65,60.94L61.65,54.94Z"
-        android:fillColor="#8A0F0F"/>
+        android:fillColor="#8A0F0F"
+        android:pathData="M61.649,54.9364C61.1319,54.7425 60.8699,54.1661 61.0638,53.6489C61.2577,53.1318 61.8341,52.8698 62.3512,53.0637L78.3511,59.0637C78.8682,59.2576 79.1302,59.834 78.9363,60.3511C78.7424,60.8683 78.166,61.1303 77.6489,60.9364L61.649,54.9364Z" />
+
     <path
-        android:pathData="M78,55C78.55,55 79,54.55 79,54C79,53.45 78.55,53 78,53H62C61.45,53 61,53.45 61,54C61,54.55 61.45,55 62,55H78Z"
-        android:fillColor="#8A0F0F"/>
-  </group>
+        android:fillColor="#8A0F0F"
+        android:pathData="M78,55C78.5523,55 79,54.5523 79,54C79,53.4477 78.5523,53 78,53H62C61.4477,53 61,53.4477 61,54C61,54.5523 61.4477,55 62,55H78Z" />
+
 </vector>

app/src/main/res/drawable/ic_launcher_monochrome.xml

@@ -3,34 +3,37 @@
     android:height="108dp"
     android:viewportWidth="108"
     android:viewportHeight="108">
-  <group android:scaleX="0.75"
-      android:scaleY="0.75"
-      android:translateX="13.5"
-      android:translateY="13.5">
+
     <path
-        android:pathData="M75,31C78.31,31 81,33.69 81,37V44.43C81.83,45.67 82.2,47.22 81.92,48.81L81,54.01V55.87C81.24,55.72 81.5,55.51 81.79,55.22L81.86,55.14C82.38,54.59 82.96,54.08 83.58,53.67L83.72,53.57C85.2,52.64 87.03,52.17 88.68,53.05C90.37,53.96 90.99,55.83 90.99,57.63L90.99,57.77C90.94,60.78 89.29,64.16 87.12,66.26L87.12,66.26C85.22,68.18 82.74,69.08 80.76,69.52C80.64,69.55 80.53,69.57 80.41,69.6C79.85,70.76 78.92,71.72 77.77,72.32L76.71,78.35C76.13,81.61 73.02,83.79 69.76,83.22L30.37,76.27C30.33,76.27 30.29,76.26 30.26,76.25C29.12,76.09 28.06,75.84 27.22,75.49C26.8,75.32 26.33,75.07 25.93,74.72C25.54,74.37 25.01,73.72 25,72.78C25,72.78 25,72.78 25,72.78C25,72.77 25,72.76 25,72.75V34.5C25,33.84 25.32,33.25 25.82,32.89C26.23,32.49 26.7,32.24 27.04,32.09C27.6,31.83 28.27,31.63 28.97,31.48C29.75,31.31 30.64,31.18 31.59,31.1C31.59,31.1 31.58,31.1 31.57,31.1L32.67,28.07L32.73,27.93C33.91,24.91 37.3,23.37 40.36,24.49L52.83,29.03L65.3,24.49C68.42,23.36 71.86,24.96 73,28.07L74.06,31H75ZM34.85,73L70.45,79.28C71.54,79.47 72.58,78.74 72.77,77.66L73.59,73H34.85ZM34,35C32.35,35 30.88,35.15 29.82,35.39C29.48,35.46 29.21,35.54 29,35.61V69.47C30.4,69.17 32.15,69 34,69H75L75.1,69C76.13,68.95 76.95,68.13 77,67.1L77,67V37C77,35.9 76.1,35 75,35H34ZM86.78,56.59C86.68,56.59 86.4,56.61 85.88,56.94L85.8,56.99C85.47,57.21 85.13,57.51 84.78,57.88C84.78,57.88 84.78,57.88 84.78,57.88L84.64,58.03C83.44,59.25 82.18,59.88 81,60.12V65.32C82.2,64.94 83.35,64.36 84.22,63.5L84.34,63.38C85.88,61.89 86.99,59.43 86.99,57.63L86.99,57.53C86.98,56.92 86.84,56.67 86.78,56.59ZM46.56,31L38.99,28.25C37.99,27.88 36.88,28.37 36.47,29.35L36.43,29.44L35.86,31H46.56ZM69.8,31L69.24,29.44C68.86,28.41 67.71,27.87 66.67,28.25L59.11,31H69.8Z"
         android:fillColor="#000000"
-        android:fillType="evenOdd"/>
+        android:fillType="evenOdd"
+        android:pathData="M75 31.0001C78.3137 31.0001 81 33.6864 81 37.0001V44.4339C81.8278 45.6739 82.1977 47.2224 81.9185 48.8065L81 54.0147V55.8692C81.2385 55.7207 81.5023 55.5135 81.7856 55.2232L81.864 55.1412C82.3815 54.5878 82.9573 54.0824 83.5825 53.6656L83.7239 53.5736C85.1958 52.6378 87.0298 52.1726 88.6753 53.0533C90.3738 53.9624 90.9907 55.8341 90.9907 57.6305L90.9895 57.7735C90.9384 60.7815 89.2885 64.1632 87.1213 66.2555L87.1211 66.2552C85.2162 68.1795 82.7376 69.0841 80.7588 69.5221C80.6417 69.548 80.5255 69.572 80.4106 69.5951C79.8487 70.7645 78.9192 71.7235 77.7715 72.3223L76.709 78.3509C76.1335 81.6141 73.0215 83.7931 69.7583 83.2179L30.3657 76.2718C30.328 76.2652 30.292 76.2576 30.2576 76.2508C29.124 76.0893 28.0601 75.8434 27.2224 75.4942C26.8046 75.32 26.3313 75.075 25.9299 74.7176C25.538 74.3686 25.0098 73.7183 25.0005 72.7752C25.0005 72.7766 25.0007 72.778 25.0007 72.7794C25.0006 72.7696 25 72.7599 25 72.7501V34.5001C25 33.8368 25.3232 33.2494 25.8203 32.8856C26.2266 32.4885 26.6978 32.2406 27.0352 32.0872C27.6048 31.8283 28.2727 31.6301 28.9683 31.4781C29.7466 31.308 30.6353 31.1794 31.5925 31.0987C31.5854 31.0993 31.5784 31.0998 31.5713 31.1004L32.6726 28.0748L32.7275 27.93C33.9136 24.9114 37.2979 23.3732 40.363 24.4888L52.8337 29.0277L65.3047 24.4888C68.4185 23.3555 71.8617 24.9609 72.9951 28.0748L74.0598 31.0001H75ZM34.8474 73.0001L70.4529 79.2784C71.5406 79.4701 72.5777 78.7437 72.7695 77.6561L73.5906 73.0001H34.8474ZM34 35.0001C32.3461 35.0001 30.8829 35.1543 29.8225 35.3861C29.4849 35.4599 29.2118 35.5362 29 35.6082V69.4718C30.4021 69.1686 32.1493 69.0001 34 69.0001H75L75.103 68.9974C76.1256 68.9455 76.9454 68.1256 76.9973 67.1031L77 67.0001V37.0001C77 35.8955 76.1046 35.0001 75 35.0001H34ZM86.782 56.5904C86.6812 56.5851 86.3996 56.6115 85.8818 56.9412L85.8013 56.9937C85.4702 57.2144 85.1253 57.5101 84.7834 57.8761C84.7824 57.8772 84.7811 57.8783 84.78 57.8795L84.6406 58.025C83.4435 59.2483 82.1848 59.8799 81 60.1214V65.3201C82.1999 64.9382 83.3456 64.358 84.219 63.5015L84.343 63.3775C85.8843 61.8895 86.9907 59.4316 86.9907 57.6305L86.9897 57.5343C86.9769 56.9198 86.8422 56.671 86.782 56.5904ZM46.5574 31.0001L38.9949 28.2476C37.9893 27.8817 36.8807 28.3724 36.469 29.347L36.4314 29.4429L35.8645 31.0001H46.5574ZM69.803 31.0001L69.2363 29.4429C68.8586 28.4051 67.7109 27.8698 66.6729 28.2476L59.1104 31.0001H69.803Z" />
+
     <path
-        android:pathData="M55.17,51C56.32,51 57.04,52.25 56.46,53.25L54.69,56.31C54.6,56.76 54.79,57.24 55.21,57.48C55.73,57.78 56.39,57.6 56.69,57.08C57.11,56.37 58.02,56.12 58.74,56.53C59.46,56.95 59.7,57.87 59.29,58.58C58.16,60.54 55.67,61.21 53.71,60.08C53.45,59.93 53.21,59.75 53,59.55C52.78,59.75 52.54,59.93 52.28,60.08C50.33,61.21 47.83,60.54 46.7,58.58C46.29,57.87 46.53,56.95 47.25,56.53C47.97,56.12 48.88,56.37 49.3,57.08C49.6,57.6 50.26,57.78 50.78,57.48C51.2,57.23 51.4,56.74 51.29,56.29L49.54,53.25C48.96,52.25 49.68,51 50.83,51H55.17Z"
-        android:fillColor="#000000"/>
+        android:fillColor="#000000"
+        android:pathData="M55.165 51C56.3197 51.0001 57.0412 52.25 56.4639 53.25L54.6943 56.3145C54.5983 56.7617 54.7947 57.2387 55.2122 57.4797C55.7303 57.7788 56.3927 57.6015 56.6919 57.0835C57.1061 56.3661 58.0235 56.1202 58.741 56.5344C59.4584 56.9487 59.7042 57.8661 59.29 58.5835C58.1625 60.5364 55.6651 61.2054 53.7122 60.0779C53.4495 59.9262 53.2103 59.7495 52.9954 59.553C52.7804 59.7495 52.5414 59.9263 52.2788 60.0779C50.3258 61.2055 47.8283 60.5365 46.7007 58.5835C46.2865 57.8661 46.5324 56.9487 47.2498 56.5344C47.9672 56.1202 48.8846 56.3661 49.2988 57.0835C49.598 57.6016 50.2607 57.7789 50.7788 57.4797C51.2042 57.2341 51.3997 56.7436 51.2905 56.2891L49.5359 53.25C48.9586 52.25 49.6801 51.0001 50.8347 51H55.165Z" />
+
     <path
-        android:pathData="M43.25,42.5C46,42.5 48.48,44.07 49.4,46.46C49.7,47.24 49.31,48.1 48.54,48.4C47.76,48.7 46.9,48.31 46.6,47.54C46.18,46.44 44.91,45.5 43.25,45.5C41.58,45.5 40.32,46.44 39.9,47.54C39.6,48.31 38.74,48.7 37.96,48.4C37.19,48.1 36.8,47.24 37.1,46.46C38.02,44.07 40.5,42.5 43.25,42.5Z"
-        android:fillColor="#000000"/>
+        android:fillColor="#000000"
+        android:pathData="M43.2499 42.5C46.0011 42.5 48.4844 44.0694 49.4008 46.4639C49.6968 47.2376 49.3097 48.1048 48.536 48.4009C47.7623 48.697 46.8951 48.3098 46.599 47.5361C46.1806 46.4427 44.9148 45.5 43.2499 45.5C41.5849 45.5 40.3192 46.4427 39.9008 47.5361C39.6047 48.3098 38.7374 48.697 37.9637 48.4009C37.1901 48.1048 36.8029 47.2376 37.099 46.4639C38.0153 44.0694 40.4987 42.5 43.2499 42.5Z" />
+
     <path
-        android:pathData="M62.75,42.5C65.5,42.5 67.98,44.07 68.9,46.46C69.2,47.24 68.81,48.1 68.04,48.4C67.26,48.7 66.4,48.31 66.1,47.54C65.68,46.44 64.41,45.5 62.75,45.5C61.08,45.5 59.82,46.44 59.4,47.54C59.1,48.31 58.24,48.7 57.46,48.4C56.69,48.1 56.3,47.24 56.6,46.46C57.52,44.07 60,42.5 62.75,42.5Z"
-        android:fillColor="#000000"/>
+        android:fillColor="#000000"
+        android:pathData="M62.7499 42.5C65.5011 42.5 67.9844 44.0694 68.9008 46.4639C69.1968 47.2376 68.8097 48.1048 68.036 48.4009C67.2623 48.697 66.3951 48.3098 66.099 47.5361C65.6806 46.4427 64.4148 45.5 62.7499 45.5C61.0849 45.5 59.8192 46.4427 59.4008 47.5361C59.1047 48.3098 58.2374 48.697 57.4637 48.4009C56.6901 48.1048 56.3029 47.2376 56.599 46.4639C57.5153 44.0694 59.9987 42.5 62.7499 42.5Z" />
+
     <path
-        android:pathData="M33,55C32.17,55 31.5,54.33 31.5,53.5C31.5,52.67 32.17,52 33,52H44.25C45.08,52 45.75,52.67 45.75,53.5C45.75,54.33 45.08,55 44.25,55H33Z"
-        android:fillColor="#000000"/>
+        android:fillColor="#000000"
+        android:pathData="M33 55C32.1716 55 31.5 54.3284 31.5 53.5C31.5 52.6716 32.1716 52 33 52H44.25C45.0784 52 45.75 52.6716 45.75 53.5C45.75 54.3284 45.0784 55 44.25 55H33Z" />
+
     <path
-        android:pathData="M33.61,59.87C32.85,60.21 31.97,59.87 31.63,59.11C31.29,58.35 31.63,57.47 32.39,57.13L43.61,52.13C44.37,51.79 45.26,52.13 45.59,52.89C45.93,53.65 45.59,54.53 44.83,54.87L33.61,59.87Z"
-        android:fillColor="#000000"/>
+        android:fillColor="#000000"
+        android:pathData="M33.6106 59.8701C32.8538 60.2073 31.9671 59.8671 31.6299 59.1104C31.2928 58.3537 31.6329 57.467 32.3896 57.1298L43.6118 52.1298C44.3685 51.7926 45.2553 52.1328 45.5924 52.8895C45.9296 53.6462 45.5894 54.533 44.8327 54.8701L33.6106 59.8701Z" />
+
     <path
-        android:pathData="M60.85,54.88C60.09,54.55 59.74,53.66 60.07,52.9C60.4,52.14 61.28,51.79 62.04,52.12L73.6,57.12C74.36,57.45 74.71,58.34 74.38,59.1C74.05,59.86 73.16,60.21 72.4,59.88L60.85,54.88Z"
-        android:fillColor="#000000"/>
+        android:fillColor="#000000"
+        android:pathData="M60.8488 54.8768C60.0885 54.5478 59.7389 53.6647 60.0678 52.9044C60.3968 52.1441 61.2798 51.7945 62.0401 52.1234L73.5957 57.1233C74.356 57.4523 74.7056 58.3353 74.3767 59.0956C74.0477 59.8559 73.1647 60.2056 72.4043 59.8766L60.8488 54.8768Z" />
+
     <path
-        android:pathData="M73,52C73.83,52 74.5,52.67 74.5,53.5C74.5,54.33 73.83,55 73,55H61.5C60.67,55 60,54.33 60,53.5C60,52.67 60.67,52 61.5,52H73Z"
-        android:fillColor="#000000"/>
-  </group>
-</vector>
+        android:fillColor="#000000"
+        android:pathData="M73 52C73.8284 52 74.5 52.6716 74.5 53.5C74.5 54.3284 73.8284 55 73 55H61.5C60.6716 55 60 54.3284 60 53.5C60 52.6716 60.6716 52 61.5 52H73Z" />
+</vector>

app/src/main/res/layout/about_activity.xml

@@ -0,0 +1,421 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.coordinatorlayout.widget.CoordinatorLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
+    tools:context="protect.card_locker.MainActivity">
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:fitsSystemWindows="true">
+
+        <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            style="?attr/toolbarStyle" />
+
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <androidx.core.widget.NestedScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginTop="?attr/actionBarSize"
+        android:paddingVertical="8dp"
+        android:clipToPadding="false">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/version_history"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingVertical="8dp"
+                android:paddingHorizontal="16dp"
+                android:background="?android:selectableItemBackground">
+
+                <TextView
+                    android:id="@+id/version_history_main"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:fontFamily="sans-serif-medium"
+                    android:paddingStart="2dp"
+                    android:paddingEnd="30dp"
+                    android:text="@string/version_history"
+                    android:textSize="18sp"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <TextView
+                    android:id="@+id/version_history_sub"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:paddingStart="2dp"
+                    android:paddingEnd="30dp"
+                    android:textSize="16sp"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/version_history_main" />
+
+                <TextView
+                    android:importantForAccessibility="no"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="8dp"
+                    android:fontFamily="sans-serif-medium"
+                    android:text="@string/arrow"
+                    android:textSize="20sp"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/credits"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingVertical="8dp"
+                android:paddingHorizontal="16dp"
+                android:background="?android:selectableItemBackground">
+
+                <TextView
+                    android:id="@+id/credits_main"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:fontFamily="sans-serif-medium"
+                    android:paddingStart="2dp"
+                    android:paddingEnd="30dp"
+                    android:text="@string/credits"
+                    android:textSize="18sp"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <TextView
+                    android:id="@+id/credits_sub"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:paddingStart="2dp"
+                    android:paddingEnd="30dp"
+                    android:textSize="16sp"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/credits_main" />
+
+                <TextView
+                    android:importantForAccessibility="no"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="8dp"
+                    android:fontFamily="sans-serif-medium"
+                    android:text="@string/arrow"
+                    android:textSize="20sp"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/translate"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingVertical="8dp"
+                android:paddingHorizontal="16dp"
+                android:background="?android:selectableItemBackground">
+
+                <TextView
+                    android:id="@+id/translate_main"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:fontFamily="sans-serif-medium"
+                    android:paddingStart="2dp"
+                    android:paddingEnd="30dp"
+                    android:text="@string/help_translate_this_app"
+                    android:textSize="18sp"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <TextView
+                    android:id="@+id/translate_sub"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:paddingStart="2dp"
+                    android:paddingEnd="30dp"
+                    android:text="@string/translate_platform"
+                    android:textSize="16sp"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/translate_main"/>
+
+                <TextView
+                    android:importantForAccessibility="no"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="8dp"
+                    android:fontFamily="sans-serif-medium"
+                    android:text="@string/arrow"
+                    android:textSize="20sp"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/license"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingVertical="8dp"
+                android:paddingHorizontal="16dp"
+                android:background="?android:selectableItemBackground">
+
+                <TextView
+                    android:id="@+id/license_main"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:fontFamily="sans-serif-medium"
+                    android:paddingStart="2dp"
+                    android:paddingEnd="30dp"
+                    android:text="@string/license"
+                    android:textSize="18sp"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <TextView
+                    android:id="@+id/license_sub"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:paddingStart="2dp"
+                    android:paddingEnd="30dp"
+                    android:text="@string/app_license"
+                    android:textSize="16sp"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/license_main"/>
+
+                <TextView
+                    android:importantForAccessibility="no"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="8dp"
+                    android:fontFamily="sans-serif-medium"
+                    android:text="@string/arrow"
+                    android:textSize="20sp"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/repo"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingVertical="8dp"
+                android:paddingHorizontal="16dp"
+                android:background="?android:selectableItemBackground">
+
+                <TextView
+                    android:id="@+id/repo_main"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:fontFamily="sans-serif-medium"
+                    android:paddingStart="2dp"
+                    android:paddingEnd="30dp"
+                    android:text="@string/source_repository"
+                    android:textSize="18sp"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <TextView
+                    android:id="@+id/repo_sub"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:paddingStart="2dp"
+                    android:paddingEnd="30dp"
+                    android:text="@string/on_github"
+                    android:textSize="16sp"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/repo_main" />
+
+                <TextView
+                    android:importantForAccessibility="no"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="8dp"
+                    android:fontFamily="sans-serif-medium"
+                    android:text="@string/arrow"
+                    android:textSize="20sp"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/privacy"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingVertical="8dp"
+                android:paddingHorizontal="16dp"
+                android:background="?android:selectableItemBackground">
+
+                <TextView
+                    android:id="@+id/privacy_main"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:fontFamily="sans-serif-medium"
+                    android:paddingStart="2dp"
+                    android:paddingEnd="30dp"
+                    android:text="@string/privacy_policy"
+                    android:textSize="18sp"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <TextView
+                    android:id="@+id/privacy_sub"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:paddingStart="2dp"
+                    android:paddingEnd="30dp"
+                    android:text="@string/and_data_usage"
+                    android:textSize="16sp"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/privacy_main" />
+
+                <TextView
+                    android:importantForAccessibility="no"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="8dp"
+                    android:fontFamily="sans-serif-medium"
+                    android:text="@string/arrow"
+                    android:textSize="20sp"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/donate"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingVertical="8dp"
+                android:paddingHorizontal="16dp"
+                android:background="?android:selectableItemBackground">
+
+                <TextView
+                    android:id="@+id/donate_main"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:fontFamily="sans-serif-medium"
+                    android:paddingStart="2dp"
+                    android:paddingEnd="30dp"
+                    android:text="@string/donate"
+                    android:textSize="18sp"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <TextView
+                    android:importantForAccessibility="no"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="8dp"
+                    android:fontFamily="sans-serif-medium"
+                    android:text="@string/arrow"
+                    android:textSize="20sp"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/rate"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingVertical="8dp"
+                android:paddingHorizontal="16dp"
+                android:background="?android:selectableItemBackground">
+
+                <TextView
+                    android:id="@+id/rate_main"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:fontFamily="sans-serif-medium"
+                    android:paddingStart="2dp"
+                    android:paddingEnd="30dp"
+                    android:text="@string/rate_this_app"
+                    android:textSize="18sp"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <TextView
+                    android:id="@+id/rate_sub"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:paddingStart="2dp"
+                    android:paddingEnd="30dp"
+                    android:text="@string/on_google_play"
+                    android:textSize="16sp"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/rate_main" />
+
+                <TextView
+                    android:importantForAccessibility="no"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="8dp"
+                    android:fontFamily="sans-serif-medium"
+                    android:text="@string/arrow"
+                    android:textSize="20sp"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/report_error"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingVertical="8dp"
+                android:paddingHorizontal="16dp"
+                android:background="?android:selectableItemBackground">
+
+                <TextView
+                    android:id="@+id/report_error_main"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:fontFamily="sans-serif-medium"
+                    android:paddingStart="2dp"
+                    android:paddingEnd="30dp"
+                    android:text="@string/report_error"
+                    android:textSize="18sp"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <TextView
+                    android:id="@+id/report_error_sub"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    app:layout_constraintTop_toBottomOf="@id/report_error_main"
+                    app:layout_constraintStart_toStartOf="parent"
+                    android:paddingStart="2dp"
+                    android:paddingEnd="30dp"
+                    android:textSize="16sp"
+                    android:text="@string/on_github" />
+
+                <TextView
+                    android:importantForAccessibility="no"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="8dp"
+                    android:fontFamily="sans-serif-medium"
+                    android:text="@string/arrow"
+                    android:textSize="20sp"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+            </androidx.constraintlayout.widget.ConstraintLayout>
+        </LinearLayout>
+    </androidx.core.widget.NestedScrollView>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>

app/src/main/res/layout/loyalty_card_edit_activity.xml

@@ -276,24 +276,6 @@
                     android:paddingTop="@dimen/inputPadding"
                     android:orientation="horizontal">
 
-                    <!-- Currency -->
-                    <com.google.android.material.textfield.TextInputLayout
-                        android:id="@+id/balanceCurrencyView"
-                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1.0"
-                        android:hint="@string/currency"
-                        android:labelFor="@+id/balanceCurrencyField">
-
-                        <AutoCompleteTextView
-                            android:id="@+id/balanceCurrencyField"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:inputType="none"/>
-
-                    </com.google.android.material.textfield.TextInputLayout>
-
                     <!-- Balance -->
                     <com.google.android.material.textfield.TextInputLayout
                         android:id="@+id/balanceView"
@@ -312,6 +294,24 @@
                             android:digits="0123456789,." />
 
                     </com.google.android.material.textfield.TextInputLayout>
+
+                    <!-- Currency -->
+                    <com.google.android.material.textfield.TextInputLayout
+                        android:id="@+id/balanceCurrencyView"
+                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1.0"
+                        android:hint="@string/currency"
+                        android:labelFor="@+id/balanceCurrencyField">
+
+                        <AutoCompleteTextView
+                            android:id="@+id/balanceCurrencyField"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:inputType="none"/>
+
+                    </com.google.android.material.textfield.TextInputLayout>
                 </LinearLayout>
 
                 <!-- Valid from -->

app/src/main/res/menu/card_longclick_menu.xml

@@ -40,16 +40,10 @@
         android:titleCondensed="@string/unarchive"
         app:showAsAction="never"/>
 
-    <item
-        android:id="@+id/action_duplicate"
-        android:title="@string/duplicateCard"
-        android:titleCondensed="@string/duplicateCard"
-        app:showAsAction="never" />
-
     <item
         android:id="@+id/action_delete"
         android:icon="@drawable/ic_delete_white_24dp"
         android:title="@string/delete"
         android:titleCondensed="@string/delete"
         app:showAsAction="never"/>
-</menu>
+</menu>

app/src/main/res/menu/card_view_menu.xml

@@ -21,25 +21,25 @@
         app:showAsAction="always">
 
         <menu>
-            <item
-                android:id="@+id/action_archive"
-                android:title="@string/archive"
-                app:showAsAction="never"/>
-
-            <item
-                android:id="@+id/action_unarchive"
-                android:title="@string/unarchive"
-                app:showAsAction="never"/>
 
             <item
                 android:id="@+id/action_duplicate"
                 android:title="@string/duplicateCard"
                 app:showAsAction="never" />
 
+            <item
+                android:id="@+id/action_archive"
+                android:title="@string/archive"
+                app:showAsAction="never"/>
+            <item
+                android:id="@+id/action_unarchive"
+                android:title="@string/unarchive"
+                app:showAsAction="never"/>
             <item
                 android:id="@+id/action_delete"
                 android:title="@string/delete"
                 app:showAsAction="never"/>
+
         </menu>
 
     </item>

app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background"/>
+    <background android:drawable="@color/ic_launcher_background"/>
     <foreground android:drawable="@drawable/ic_launcher_foreground"/>
     <monochrome android:drawable="@drawable/ic_launcher_monochrome"/>
-</adaptive-icon>
+</adaptive-icon>

app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background"/>
+    <background android:drawable="@color/ic_launcher_background"/>
     <foreground android:drawable="@drawable/ic_launcher_foreground"/>
     <monochrome android:drawable="@drawable/ic_launcher_monochrome"/>
-</adaptive-icon>
+</adaptive-icon>

app/src/main/res/raw/contributors.txt

@@ -7,93 +7,80 @@ Heimen Stoffels
 Oğuz Ersen
 FC (Fay) Stegerman
 StoyanDimitrov
-大王叫我来巡山
-SlavekB
 Katharine Chui
-B o d o
+SlavekB
 mondstern
 IllusiveMan196
-Silvério Santos
+大王叫我来巡山
 Altonss
-Edgars Andersons
-Joel A
+B o d o
 Michael Moroni
-Liner Seven
-Priit Jõerüüt
 Eric
+Joel A
+Silvério Santos
 Максим Горпиніч
-GitSpoon
 GM
-Fjuro
+Priit Jõerüüt
 laralem
 Petr Novák
+Edgars Andersons
 Taco
 nadiafekihahmed
 pfaffenrodt
 Aayush Gupta
 Scrambled777
-josé m
 ikanakova
-Nyatsuki
 Giovanni Donisi
-Milo Ivir
 HudobniVolk
-Горпиніч Максим Олександрович
-Vasilis
-Kachelkaiser
 Jiri Grönroos
-Warder
+Nyatsuki
+josé m
 Samantaz Fox
 Balázs Meskó
+Milo Ivir
+Fjuro
 Cliff Heraldo
 Sergio Paredes
 Ankit Tiwari
-109247019824
-Feike Donia
 Arno-github
+Warder
+Kachelkaiser
 Jose Delvani
-Milan Šalka
-Robin
 mdvhimself
-தமிழ்நேரம்
-damjang
-Govindgopalyadav
+Milan Šalka
+GitSpoon
 Skrripy
+Vasilis
 huuhaa
+தமிழ் நேரம்
 waffshappen
 Marnick L'Eau
 ngocanhtve
-aradxxx
 StellarSand
 Quentin PAGÈS
 Projjal Moitra
-e-michalak
+Robin
 JungHee Lee
 hajertabbane
-inavleb
 Ziad OUALHADJ
 Robin Liu
-Aliaksandr Trush
-Denis Shilin
-Traductor
-Gideon
-Renko
 Ricky Tigg
+Renko
+Denis Shilin
 しいたけ
 Alexander Ivanov
 Miha Frangež
 stavpup
-mrestivill
 ehrt74
 Virginie
 Tim Trek
-MisterCosta96
-arshbeerSingh
-Augustin LAVILLE
-Freddo espresso
-vasudev-cell
-Kim Seohyun
-rudy3
-Michael Gangolf
-PRATHAMESH BHAGAT 
 Peter Dave Hello
+Michael Gangolf
+rudy3
+Kim Seohyun
+Govind S Nair
+Freddo espresso
+Augustin LAVILLE
+arshbeerSingh
+MisterCosta96
+Aliaksandr Trush

app/src/main/res/values-af/strings.xml

@@ -1,11 +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</string>
-    <string name="action_search">Soek</string>
-    <string name="action_add">Voeg by</string>
-    <string name="save">Stoor</string>
-    <plurals name="selectedCardCount">
-        <item quantity="one"><xliff:g>%d</xliff:g> geselekteer</item>
-        <item quantity="other"><xliff:g>%d</xliff:g> geselekteer</item>
-    </plurals>
-</resources>