Bump com.github.yalantis:ucrop from 2.2.10 to 2.2.11

Bumps [com.github.yalantis:ucrop](https://github.com/Yalantis/uCrop) from 2.2.10 to 2.2.11.
- [Release notes](https://github.com/Yalantis/uCrop/releases)
- [Commits](https://github.com/Yalantis/uCrop/compare/2.2.10...2.2.11)

---
updated-dependencies:
- dependency-name: com.github.yalantis:ucrop
  dependency-version: 2.2.11
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

.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
+      - 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@v6.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

@@ -19,15 +19,15 @@ jobs:
     steps:
     - name: Checkout repo
       id: checkout
-      uses: actions/checkout@v6
+      uses: actions/checkout@v5
     - name: Setup Python
-      uses: actions/setup-python@v6.1.0
+      uses: actions/setup-python@v6.0.0
       with:
         python-version: '3.x'
     - name: Run converter script
       run: python .scripts/changelog_to_fastlane.py
     - name: Create Pull Request
-      uses: peter-evans/create-pull-request@v8.0.0
+      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

@@ -17,7 +17,7 @@ jobs:
     steps:
     - name: Checkout repo
       id: checkout
-      uses: actions/checkout@v6
+      uses: actions/checkout@v5
     - name: Update contributors
       id: update_contributors
       uses: TheLastProject/contributors-to-file-action@v3.2.0
@@ -25,7 +25,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@v8.0.0
+      uses: peter-evans/create-pull-request@v7.0.8
       with:
         title: "Update contributors"
         commit-message: "Update contributors"

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

@@ -17,7 +17,7 @@ jobs:
   generate-feature-graphic:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v5
     - name: Install requirements
       run: |
         sudo apt-get update
@@ -31,7 +31,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@v8.0.0
+      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

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v5
 
       - name: Update Gradle Wrapper
         uses: gradle-update/update-gradle-wrapper-action@v2

.github/workflows/update-locales.yml

@@ -17,13 +17,13 @@ jobs:
   update-locales:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v5
     - 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@v8.0.0
+      uses: peter-evans/create-pull-request@v7.0.8
       with:
         title: "Update locales"
         commit-message: "Update locales"

.gitignore

@@ -19,8 +19,8 @@
 /app/*.log
 /app/build
 /app/release
-/.idea/*
-!/.idea/icon.svg
+/.idea
+
 # Bundle
 /.bundle/
 /vendor/bundle

.idea/icon.svg

@@ -1 +0,0 @@
-../.design/ic_launcher_foreground.svg

.scripts/check_app_name.sh

@@ -1,72 +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"
-# peo is only temporarily allowed due to https://github.com/WeblateOrg/weblate/issues/17455
-ALLOWLIST=("ar" "bn" "fa" "fa-IR" "he-IL" "hi" "hi-IN" "kn" "kn-IN" "ml" "mr" "peo", "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/generate_feature_graphic/generate_feature_graphic.sh

@@ -42,7 +42,6 @@ for lang in "$script_location/../../fastlane/metadata/android/"*; do
       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 ;;
       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 ;;
       *) ;;

CHANGELOG.md

@@ -1,48 +1,5 @@
 # Changelog
 
-## Unreleased - 162
-
-- Fix list widget sometimes opening wrong card
-- Fix several bugs with shortcut handling
-- Fix About activity not using pure black title bar in OLED mode
-- Fully remove automatic barcode encoding detection
-- Expose barcode encoding through ContentProvider (used by Gadgetbridge)
-
-## v2.41.4 - 161 (2026-01-04)
-
-- Disable automatic barcode encoding detection for now (breaks too many cards)
-
-## v2.41.3 - 160 (2026-01-04)
-
-- Follow-up for fix in 2.41.2 for cards explicitly set to ISO-8859-1
-- Migrate old cards to ISO-8859-1 to fix sudden behaviour differences for existing cards
-
-## v2.41.2 - 159 (2026-01-03)
-
-- Fix change introduced in 2.41.0 that broke support for some scanners for non-UTF-8 barcodes
-
-## v2.41.1 - 158 (2025-12-31)
-
-- Fix status and navigation bar colour in new About activity
-
-## v2.41.0 - 157 (2025-12-30)
-
-- Add support for UTF-8 barcodes
-- Add duplicate option to main screen and reorder options slightly
-- Fix column count setting not being applied to group card list
-- Remove theme colour support
-- Reduce max photo size to reduce storage use (only for newly added photos)
-- Migrate About activity from Android XML to Jetpack Compose
-
-## 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

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

app/build.gradle.kts

@@ -1,10 +1,8 @@
 import com.android.build.gradle.internal.tasks.factory.dependsOn
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 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 {
@@ -19,13 +17,13 @@ android {
         applicationId = "me.hackerchick.catima"
         minSdk = 21
         targetSdk = 36
-        versionCode = 161
-        versionName = "2.41.4"
+        versionCode = 154
+        versionName = "2.39.1"
 
         vectorDrawables.useSupportLibrary = true
         multiDexEnabled = true
 
-        resourceConfigurations += listOf("ar", "be", "bg", "bn", "bn-rIN", "bs", "cs", "da", "de", "el-rGR", "en", "eo", "es", "es-rAR", "et", "fa", "fi", "fr", "gl", "he-rIL", "hi", "hr", "hu", "in-rID", "is", "it", "ja", "ko", "lt", "lv", "nb-rNO", "nl", "oc", "peo", "pl", "pt", "pt-rBR", "pt-rPT", "ro-rRO", "ru", "sk", "sl", "sr", "sv", "ta", "tr", "uk", "vi", "zh-rCN", "zh-rTW")
+        resourceConfigurations += listOf("ar", "be", "bg", "bn", "bn-rIN", "bs", "cs", "da", "de", "el-rGR", "en", "eo", "es", "es-rAR", "et", "fa", "fi", "fr", "gl", "he-rIL", "hi", "hr", "hu", "in-rID", "is", "it", "ja", "ko", "lt", "lv", "nb-rNO", "nl", "oc", "pl", "pt", "pt-rBR", "pt-rPT", "ro-rRO", "ru", "sk", "sl", "sr", "sv", "ta", "tr", "uk", "vi", "zh-rCN", "zh-rTW")
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
 
@@ -49,7 +47,6 @@ android {
 
     buildFeatures {
         buildConfig = true
-        compose = true
         viewBinding = true
     }
 
@@ -77,6 +74,16 @@ android {
         }
     }
 
+    compileOptions {
+        encoding = "UTF-8"
+
+        // Flag to enable support for the new language APIs
+        isCoreLibraryDesugaringEnabled = true
+
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+
     sourceSets {
         getByName("test") {
             resources.srcDirs("src/test/res")
@@ -95,73 +102,54 @@ android {
     lint {
         lintConfig = file("lint.xml")
     }
-
-    kotlin {
-        compilerOptions {
-            jvmTarget = JvmTarget.JVM_17
-        }
+    kotlinOptions {
+        jvmTarget = "21"
     }
     compileOptions {
-        encoding = "UTF-8"
-
-        // Flag to enable support for the new language APIs
-        isCoreLibraryDesugaringEnabled = true
-
-
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
+        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.17.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.13.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)
+    implementation("com.journeyapps:zxing-android-embedded:4.3.0@aar")
+    implementation("com.github.yalantis:ucrop:2.2.11-native")
+    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")
 
     // Crash reporting
-    implementation(libs.bundles.acra)
+    val acraVersion = "5.13.1"
+    implementation("ch.acra:acra-mail:$acraVersion")
+    implementation("ch.acra:acra-dialog:$acraVersion")
 
     // 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.16")
 
-    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/main/java/protect/card_locker/AboutActivity.kt

@@ -1,169 +1,149 @@
 package protect.card_locker
 
 import android.os.Bundle
-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 : CatimaComponentActivity() {
+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)
-
-        fixedEdgeToEdge()
-
+        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,7 +97,7 @@ 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"));
@@ -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/BarcodeImageWriterTask.java

@@ -4,27 +4,17 @@ import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.Color;
 import android.graphics.PorterDuff;
-import android.util.ArrayMap;
 import android.util.Log;
 import android.util.TypedValue;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import com.google.zxing.EncodeHintType;
 import com.google.zxing.MultiFormatWriter;
 import com.google.zxing.WriterException;
 import com.google.zxing.common.BitMatrix;
-import com.google.zxing.common.StringUtils;
 
 import java.lang.ref.WeakReference;
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
-import java.util.Map;
-import java.util.Objects;
 
 import protect.card_locker.async.CompatCallable;
 
@@ -49,7 +39,6 @@ public class BarcodeImageWriterTask implements CompatCallable<Bitmap> {
     private final WeakReference<TextView> textViewReference;
     private String cardId;
     private final CatimaBarcode format;
-    private final Charset encoding;
     private final int imageHeight;
     private final int imageWidth;
     private final int imagePadding;
@@ -59,7 +48,7 @@ public class BarcodeImageWriterTask implements CompatCallable<Bitmap> {
 
     BarcodeImageWriterTask(
             Context context, ImageView imageView, String cardIdString,
-            CatimaBarcode barcodeFormat, @NonNull Charset barcodeEncoding, TextView textView,
+            CatimaBarcode barcodeFormat, TextView textView,
             boolean showFallback, BarcodeImageWriterResultCallback callback, boolean roundCornerPadding, boolean isFullscreen
     ) {
         mContext = context;
@@ -73,7 +62,6 @@ public class BarcodeImageWriterTask implements CompatCallable<Bitmap> {
 
         cardId = cardIdString;
         format = barcodeFormat;
-        encoding = barcodeEncoding;
 
         int imageViewHeight = imageView.getHeight();
         int imageViewWidth = imageView.getWidth();
@@ -184,32 +172,10 @@ public class BarcodeImageWriterTask implements CompatCallable<Bitmap> {
         }
 
         MultiFormatWriter writer = new MultiFormatWriter();
-
-        Map<EncodeHintType, Object> encodeHints = new ArrayMap<>();
-        // We don't want to pass the ISO-8859-1 as an encoding hint as zxing may add this as ECI
-        // inside the barcode.
-        //
-        // Due to many barcode scanners in the wild being badly coded they may trip over ECI
-        // info existing and fail to scan.
-        // See:
-        // - https://github.com/CatimaLoyalty/Android/issues/2921
-        // - https://github.com/CatimaLoyalty/Android/issues/2932
-        //
-        // Just not always passing the encoding hint is slightly hacky, but in 5+ years of Catima
-        // cards without encode hints have never caused any issues (unless they were UTF-8), yet
-        // just days after passing ISO-8859-1 as CHARACTER_SET in the encode hints already 2
-        // scan failures were reported (one for QR, one for Aztec).
-        if (!Objects.equals(encoding.name(), StandardCharsets.ISO_8859_1.name())) {
-            Log.d(TAG, "Chosen encoding is not ISO_8859_1, so passing as encoding hint");
-            encodeHints.put(EncodeHintType.CHARACTER_SET, encoding);
-        } else {
-            Log.d(TAG, "Not passing encoding as encoding hint");
-        }
-
         BitMatrix bitMatrix;
         try {
             try {
-                bitMatrix = writer.encode(cardId, format.format(), imageWidth, imageHeight, encodeHints);
+                bitMatrix = writer.encode(cardId, format.format(), imageWidth, imageHeight, null);
             } catch (Exception e) {
                 // Cast a wider net here and catch any exception, as there are some
                 // cases where an encoder may fail if the data is invalid for the

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

@@ -92,13 +92,13 @@ public class BarcodeSelectorAdapter extends ArrayAdapter<CatimaBarcodeWithValue>
 
                             Log.d(TAG, "Generating barcode for type " + formatType);
 
-                            BarcodeImageWriterTask barcodeWriter = new BarcodeImageWriterTask(getContext(), image, cardId, format, null, text, true, null, true, false);
+                            BarcodeImageWriterTask barcodeWriter = new BarcodeImageWriterTask(getContext(), image, cardId, format, text, true, null, true, false);
                             mTasks.executeTask(TaskHandler.TYPE.BARCODE, barcodeWriter);
                         }
                     });
         } else {
             Log.d(TAG, "Generating barcode for type " + formatType);
-            BarcodeImageWriterTask barcodeWriter = new BarcodeImageWriterTask(getContext(), image, cardId, format, null, text, true, null, true, false);
+            BarcodeImageWriterTask barcodeWriter = new BarcodeImageWriterTask(getContext(), image, cardId, format, text, true, null, true, false);
             mTasks.executeTask(TaskHandler.TYPE.BARCODE, barcodeWriter);
         }
     }

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

@@ -1,42 +0,0 @@
-package protect.card_locker
-
-import android.graphics.Color
-import android.os.Bundle
-import android.os.PersistableBundle
-import androidx.activity.ComponentActivity
-import androidx.activity.SystemBarStyle
-import androidx.activity.enableEdgeToEdge
-import androidx.appcompat.app.AppCompatDelegate
-import protect.card_locker.preferences.Settings
-
-open class CatimaComponentActivity() : ComponentActivity() {
-    fun fixedEdgeToEdge() {
-        // Fix edge-to-edge
-        // When overriding onCreate this does not correctly get applied, which is why it is its own function
-
-        // We explicitly need to set the systemBarStyle ourselves, to prevent issues where Android
-        // for example renders white icons on top of a white statusbar (or black on black)
-        val settings = Settings(this)
-        val systemBarStyle = when (settings.theme) {
-            AppCompatDelegate.MODE_NIGHT_NO ->
-                SystemBarStyle.light(
-                    scrim = Color.TRANSPARENT,
-                    darkScrim = Color.TRANSPARENT,
-                )
-            AppCompatDelegate.MODE_NIGHT_YES ->
-                SystemBarStyle.dark(
-                    scrim = Color.TRANSPARENT,
-                )
-            else ->
-                SystemBarStyle.auto(
-                    lightScrim = Color.TRANSPARENT,
-                    darkScrim = Color.TRANSPARENT
-                )
-        }
-
-        enableEdgeToEdge(
-            statusBarStyle = systemBarStyle,
-            navigationBarStyle = systemBarStyle
-        )
-    }
-}

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

@@ -10,12 +10,8 @@ import android.database.sqlite.SQLiteOpenHelper;
 import android.text.TextUtils;
 import android.util.Log;
 
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
 import java.io.FileNotFoundException;
 import java.math.BigDecimal;
-import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Currency;
@@ -27,7 +23,7 @@ import java.util.Set;
 public class DBHelper extends SQLiteOpenHelper {
     public static final String DATABASE_NAME = "Catima.db";
     public static final int ORIGINAL_DATABASE_VERSION = 1;
-    public static final int DATABASE_VERSION = 20;
+    public static final int DATABASE_VERSION = 17;
 
     // NB: changing these values requires a migration
     public static final int DEFAULT_ZOOM_LEVEL = 100;
@@ -53,7 +49,6 @@ public class DBHelper extends SQLiteOpenHelper {
         public static final String CARD_ID = "cardid";
         public static final String BARCODE_ID = "barcodeid";
         public static final String BARCODE_TYPE = "barcodetype";
-        public static final String BARCODE_ENCODING = "barcodeencoding";
         public static final String STAR_STATUS = "starstatus";
         public static final String LAST_USED = "lastused";
         public static final String ZOOM_LEVEL = "zoomlevel";
@@ -117,7 +112,6 @@ public class DBHelper extends SQLiteOpenHelper {
                 LoyaltyCardDbIds.CARD_ID + " TEXT not null," +
                 LoyaltyCardDbIds.BARCODE_ID + " TEXT," +
                 LoyaltyCardDbIds.BARCODE_TYPE + " TEXT," +
-                LoyaltyCardDbIds.BARCODE_ENCODING + " TEXT not null," +
                 LoyaltyCardDbIds.STAR_STATUS + " INTEGER DEFAULT '0'," +
                 LoyaltyCardDbIds.LAST_USED + " INTEGER DEFAULT '0', " +
                 LoyaltyCardDbIds.ZOOM_LEVEL + " INTEGER DEFAULT '" + DEFAULT_ZOOM_LEVEL + "', " +
@@ -341,160 +335,6 @@ public class DBHelper extends SQLiteOpenHelper {
             db.execSQL("ALTER TABLE " + LoyaltyCardDbIds.TABLE
                     + " ADD COLUMN " + LoyaltyCardDbIds.ZOOM_LEVEL_WIDTH + " INTEGER DEFAULT '100' ");
         }
-
-        if (oldVersion < 18 && newVersion >= 18) {
-            db.execSQL("ALTER TABLE " + LoyaltyCardDbIds.TABLE
-                    + " ADD COLUMN " + LoyaltyCardDbIds.BARCODE_ENCODING + " TEXT");
-        }
-
-        // On upgrade to 2.41.3, force all existing "Automatic" cards to ISO-8859-1.
-        // UTF-8 support was only added in 2.42.0, before that, all barcodes were saved without
-        // any encoding info. As many scanners deal badly with ECI info, automatically guessing
-        // UTF-8 for old barcodes may break them.
-        //
-        // New cards will be saved using either "Automatic" encoding to guess or, for pkpass files,
-        // whatever encoding is specified.
-        if (oldVersion < 19 && newVersion >= 19) {
-            db.execSQL("UPDATE " + LoyaltyCardDbIds.TABLE + " SET " + LoyaltyCardDbIds.BARCODE_ENCODING + " = 'ISO-8859-1' WHERE " + LoyaltyCardDbIds.BARCODE_ENCODING + " IS NULL");
-        }
-
-        if (oldVersion < 20 && newVersion >= 20) {
-            // SQLite doesn't support modify column
-            // So we need to create a temp column to make barcode encoding non-nullable
-            // https://www.sqlite.org/faq.html#q11
-            db.beginTransaction();
-
-            // First migrate all cards to ISO-8859-1
-            db.execSQL("UPDATE " + LoyaltyCardDbIds.TABLE + " SET " + LoyaltyCardDbIds.BARCODE_ENCODING + " = 'ISO-8859-1' WHERE " + LoyaltyCardDbIds.BARCODE_ENCODING + " IS NULL");
-
-            // create temp table
-            db.execSQL("CREATE TEMPORARY TABLE tmp (" +
-                    LoyaltyCardDbIds.ID + " INTEGER primary key autoincrement," +
-                    LoyaltyCardDbIds.STORE + " TEXT not null," +
-                    LoyaltyCardDbIds.NOTE + " TEXT not null," +
-                    LoyaltyCardDbIds.VALID_FROM + " INTEGER," +
-                    LoyaltyCardDbIds.EXPIRY + " INTEGER," +
-                    LoyaltyCardDbIds.BALANCE + " TEXT not null DEFAULT '0'," +
-                    LoyaltyCardDbIds.BALANCE_TYPE + " TEXT," +
-                    LoyaltyCardDbIds.HEADER_COLOR + " INTEGER," +
-                    LoyaltyCardDbIds.CARD_ID + " TEXT not null," +
-                    LoyaltyCardDbIds.BARCODE_ID + " TEXT," +
-                    LoyaltyCardDbIds.BARCODE_TYPE + " TEXT," +
-                    LoyaltyCardDbIds.BARCODE_ENCODING + " TEXT not null," +
-                    LoyaltyCardDbIds.STAR_STATUS + " INTEGER DEFAULT '0'," +
-                    LoyaltyCardDbIds.LAST_USED + " INTEGER DEFAULT '0', " +
-                    LoyaltyCardDbIds.ZOOM_LEVEL + " INTEGER DEFAULT '" + DEFAULT_ZOOM_LEVEL + "', " +
-                    LoyaltyCardDbIds.ZOOM_LEVEL_WIDTH + " INTEGER DEFAULT '" + DEFAULT_ZOOM_LEVEL_WIDTH + "', " +
-                    LoyaltyCardDbIds.ARCHIVE_STATUS + " INTEGER DEFAULT '0' )");
-
-            // Insert all cards into temp table
-            db.execSQL("INSERT INTO tmp (" +
-                    LoyaltyCardDbIds.ID + " ," +
-                    LoyaltyCardDbIds.STORE + " ," +
-                    LoyaltyCardDbIds.NOTE + " ," +
-                    LoyaltyCardDbIds.VALID_FROM + " , " +
-                    LoyaltyCardDbIds.EXPIRY + " ," +
-                    LoyaltyCardDbIds.BALANCE + " ," +
-                    LoyaltyCardDbIds.BALANCE_TYPE + " ," +
-                    LoyaltyCardDbIds.HEADER_COLOR + " ," +
-                    LoyaltyCardDbIds.CARD_ID + " ," +
-                    LoyaltyCardDbIds.BARCODE_ID + " ," +
-                    LoyaltyCardDbIds.BARCODE_TYPE + " ," +
-                    LoyaltyCardDbIds.BARCODE_ENCODING + " ," +
-                    LoyaltyCardDbIds.STAR_STATUS + " ," +
-                    LoyaltyCardDbIds.LAST_USED + " ," +
-                    LoyaltyCardDbIds.ZOOM_LEVEL + " ," +
-                    LoyaltyCardDbIds.ZOOM_LEVEL_WIDTH + " ," +
-                    LoyaltyCardDbIds.ARCHIVE_STATUS + ")" +
-                    " SELECT " +
-                    LoyaltyCardDbIds.ID + " ," +
-                    LoyaltyCardDbIds.STORE + " ," +
-                    LoyaltyCardDbIds.NOTE + " ," +
-                    LoyaltyCardDbIds.VALID_FROM + " ," +
-                    LoyaltyCardDbIds.EXPIRY + " ," +
-                    LoyaltyCardDbIds.BALANCE + " ," +
-                    LoyaltyCardDbIds.BALANCE_TYPE + " ," +
-                    LoyaltyCardDbIds.HEADER_COLOR + " ," +
-                    LoyaltyCardDbIds.CARD_ID + " ," +
-                    LoyaltyCardDbIds.BARCODE_ID + " ," +
-                    LoyaltyCardDbIds.BARCODE_TYPE + " ," +
-                    LoyaltyCardDbIds.BARCODE_ENCODING + " ," +
-                    LoyaltyCardDbIds.STAR_STATUS + " ," +
-                    LoyaltyCardDbIds.LAST_USED + " ," +
-                    LoyaltyCardDbIds.ZOOM_LEVEL + " ," +
-                    LoyaltyCardDbIds.ZOOM_LEVEL_WIDTH + " ," +
-                    LoyaltyCardDbIds.ARCHIVE_STATUS +
-                    " FROM " + LoyaltyCardDbIds.TABLE);
-
-            // Drop old table
-            db.execSQL("DROP TABLE " + LoyaltyCardDbIds.TABLE);
-
-            // Create table again
-            db.execSQL("CREATE TABLE " + LoyaltyCardDbIds.TABLE + "(" +
-                    LoyaltyCardDbIds.ID + " INTEGER primary key autoincrement," +
-                    LoyaltyCardDbIds.STORE + " TEXT not null," +
-                    LoyaltyCardDbIds.NOTE + " TEXT not null," +
-                    LoyaltyCardDbIds.VALID_FROM + " INTEGER," +
-                    LoyaltyCardDbIds.EXPIRY + " INTEGER," +
-                    LoyaltyCardDbIds.BALANCE + " TEXT not null DEFAULT '0'," +
-                    LoyaltyCardDbIds.BALANCE_TYPE + " TEXT," +
-                    LoyaltyCardDbIds.HEADER_COLOR + " INTEGER," +
-                    LoyaltyCardDbIds.CARD_ID + " TEXT not null," +
-                    LoyaltyCardDbIds.BARCODE_ID + " TEXT," +
-                    LoyaltyCardDbIds.BARCODE_TYPE + " TEXT," +
-                    LoyaltyCardDbIds.BARCODE_ENCODING + " TEXT not null," +
-                    LoyaltyCardDbIds.STAR_STATUS + " INTEGER DEFAULT '0'," +
-                    LoyaltyCardDbIds.LAST_USED + " INTEGER DEFAULT '0', " +
-                    LoyaltyCardDbIds.ZOOM_LEVEL + " INTEGER DEFAULT '" + DEFAULT_ZOOM_LEVEL + "', " +
-                    LoyaltyCardDbIds.ZOOM_LEVEL_WIDTH + " INTEGER DEFAULT '" + DEFAULT_ZOOM_LEVEL_WIDTH + "', " +
-                    LoyaltyCardDbIds.ARCHIVE_STATUS + " INTEGER DEFAULT '0' )");
-
-            // Insert all temp cards into newly created table
-            db.execSQL("INSERT INTO " + LoyaltyCardDbIds.TABLE + "(" +
-                    LoyaltyCardDbIds.ID + " ," +
-                    LoyaltyCardDbIds.STORE + " ," +
-                    LoyaltyCardDbIds.NOTE + " ," +
-                    LoyaltyCardDbIds.VALID_FROM + " , " +
-                    LoyaltyCardDbIds.EXPIRY + " ," +
-                    LoyaltyCardDbIds.BALANCE + " ," +
-                    LoyaltyCardDbIds.BALANCE_TYPE + " ," +
-                    LoyaltyCardDbIds.HEADER_COLOR + " ," +
-                    LoyaltyCardDbIds.CARD_ID + " ," +
-                    LoyaltyCardDbIds.BARCODE_ID + " ," +
-                    LoyaltyCardDbIds.BARCODE_TYPE + " ," +
-                    LoyaltyCardDbIds.BARCODE_ENCODING + " ," +
-                    LoyaltyCardDbIds.STAR_STATUS + " ," +
-                    LoyaltyCardDbIds.LAST_USED + " ," +
-                    LoyaltyCardDbIds.ZOOM_LEVEL + " ," +
-                    LoyaltyCardDbIds.ZOOM_LEVEL_WIDTH + " ," +
-                    LoyaltyCardDbIds.ARCHIVE_STATUS + ")" +
-                    " SELECT " +
-                    LoyaltyCardDbIds.ID + " ," +
-                    LoyaltyCardDbIds.STORE + " ," +
-                    LoyaltyCardDbIds.NOTE + " ," +
-                    LoyaltyCardDbIds.VALID_FROM + " ," +
-                    LoyaltyCardDbIds.EXPIRY + " ," +
-                    LoyaltyCardDbIds.BALANCE + " ," +
-                    LoyaltyCardDbIds.BALANCE_TYPE + " ," +
-                    LoyaltyCardDbIds.HEADER_COLOR + " ," +
-                    LoyaltyCardDbIds.CARD_ID + " ," +
-                    LoyaltyCardDbIds.BARCODE_ID + " ," +
-                    LoyaltyCardDbIds.BARCODE_TYPE + " ," +
-                    LoyaltyCardDbIds.BARCODE_ENCODING + " ," +
-                    LoyaltyCardDbIds.STAR_STATUS + " ," +
-                    LoyaltyCardDbIds.LAST_USED + " ," +
-                    LoyaltyCardDbIds.ZOOM_LEVEL + " ," +
-                    LoyaltyCardDbIds.ZOOM_LEVEL_WIDTH + " ," +
-                    LoyaltyCardDbIds.ARCHIVE_STATUS +
-                    " FROM tmp");
-
-            // Drop tmp table
-            db.execSQL("DROP TABLE tmp");
-
-            db.setTransactionSuccessful();
-            db.endTransaction();
-        }
-
     }
 
     public static Set<String> imageFiles(Context context, final SQLiteDatabase database) {
@@ -556,8 +396,7 @@ public class DBHelper extends SQLiteOpenHelper {
     public static long insertLoyaltyCard(
             final SQLiteDatabase database, final String store, final String note, final Date validFrom,
             final Date expiry, final BigDecimal balance, final Currency balanceType, final String cardId,
-            final String barcodeId, final CatimaBarcode barcodeType, final @NonNull Charset barcodeEncoding,
-            final Integer headerColor,
+            final String barcodeId, final CatimaBarcode barcodeType, final Integer headerColor,
             final int starStatus, final Long lastUsed, final int archiveStatus) {
         database.beginTransaction();
 
@@ -572,7 +411,6 @@ public class DBHelper extends SQLiteOpenHelper {
         contentValues.put(LoyaltyCardDbIds.CARD_ID, cardId);
         contentValues.put(LoyaltyCardDbIds.BARCODE_ID, barcodeId);
         contentValues.put(LoyaltyCardDbIds.BARCODE_TYPE, barcodeType != null ? barcodeType.name() : null);
-        contentValues.put(LoyaltyCardDbIds.BARCODE_ENCODING, barcodeEncoding.name());
         contentValues.put(LoyaltyCardDbIds.HEADER_COLOR, headerColor);
         contentValues.put(LoyaltyCardDbIds.STAR_STATUS, starStatus);
         contentValues.put(LoyaltyCardDbIds.LAST_USED, lastUsed != null ? lastUsed : Utils.getUnixTime());
@@ -592,8 +430,7 @@ public class DBHelper extends SQLiteOpenHelper {
             final SQLiteDatabase database, final int id, final String store, final String note,
             final Date validFrom, final Date expiry, final BigDecimal balance,
             final Currency balanceType, final String cardId, final String barcodeId,
-            final CatimaBarcode barcodeType, final @NonNull Charset barcodeEncoding,
-            final Integer headerColor, final int starStatus,
+            final CatimaBarcode barcodeType, final Integer headerColor, final int starStatus,
             final Long lastUsed, final int archiveStatus) {
         database.beginTransaction();
 
@@ -609,7 +446,6 @@ public class DBHelper extends SQLiteOpenHelper {
         contentValues.put(LoyaltyCardDbIds.CARD_ID, cardId);
         contentValues.put(LoyaltyCardDbIds.BARCODE_ID, barcodeId);
         contentValues.put(LoyaltyCardDbIds.BARCODE_TYPE, barcodeType != null ? barcodeType.name() : null);
-        contentValues.put(LoyaltyCardDbIds.BARCODE_ENCODING, barcodeEncoding.name());
         contentValues.put(LoyaltyCardDbIds.HEADER_COLOR, headerColor);
         contentValues.put(LoyaltyCardDbIds.STAR_STATUS, starStatus);
         contentValues.put(LoyaltyCardDbIds.LAST_USED, lastUsed != null ? lastUsed : Utils.getUnixTime());
@@ -629,8 +465,7 @@ public class DBHelper extends SQLiteOpenHelper {
             SQLiteDatabase database, final int id, final String store, final String note,
             final Date validFrom, final Date expiry, final BigDecimal balance,
             final Currency balanceType, final String cardId, final String barcodeId,
-            final CatimaBarcode barcodeType, final @NonNull Charset barcodeEncoding,
-            final Integer headerColor, final int starStatus,
+            final CatimaBarcode barcodeType, final Integer headerColor, final int starStatus,
             final Long lastUsed, final int archiveStatus) {
         database.beginTransaction();
 
@@ -645,7 +480,6 @@ public class DBHelper extends SQLiteOpenHelper {
         contentValues.put(LoyaltyCardDbIds.CARD_ID, cardId);
         contentValues.put(LoyaltyCardDbIds.BARCODE_ID, barcodeId);
         contentValues.put(LoyaltyCardDbIds.BARCODE_TYPE, barcodeType != null ? barcodeType.name() : null);
-        contentValues.put(LoyaltyCardDbIds.BARCODE_ENCODING, barcodeEncoding.name());
         contentValues.put(LoyaltyCardDbIds.HEADER_COLOR, headerColor);
         contentValues.put(LoyaltyCardDbIds.STAR_STATUS, starStatus);
         contentValues.put(LoyaltyCardDbIds.LAST_USED, lastUsed != null ? lastUsed : Utils.getUnixTime());

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

@@ -0,0 +1,395 @@
+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");
+        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;
+                        // Voucher Vault
+                        case 3:
+                            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/ImportURIHelper.java

@@ -4,14 +4,11 @@ import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 
-import androidx.annotation.Nullable;
-
 import java.io.InvalidObjectException;
 import java.io.UnsupportedEncodingException;
 import java.math.BigDecimal;
 import java.net.URLDecoder;
 import java.net.URLEncoder;
-import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.util.Currency;
 import java.util.Date;
@@ -28,7 +25,6 @@ public class ImportURIHelper {
     private static final String CARD_ID = DBHelper.LoyaltyCardDbIds.CARD_ID;
     private static final String BARCODE_ID = DBHelper.LoyaltyCardDbIds.BARCODE_ID;
     private static final String BARCODE_TYPE = DBHelper.LoyaltyCardDbIds.BARCODE_TYPE;
-    private static final String BARCODE_ENCODING = DBHelper.LoyaltyCardDbIds.BARCODE_ENCODING;
     private static final String HEADER_COLOR = DBHelper.LoyaltyCardDbIds.HEADER_COLOR;
 
     private final Context context;
@@ -70,7 +66,6 @@ public class ImportURIHelper {
         try {
             // These values are allowed to be null
             CatimaBarcode barcodeType = null;
-            Charset barcodeEncoding = StandardCharsets.ISO_8859_1;
             Date validFrom = null;
             Date expiry = null;
             BigDecimal balance = new BigDecimal("0");
@@ -108,11 +103,6 @@ public class ImportURIHelper {
                 barcodeType = CatimaBarcode.fromName(unparsedBarcodeType);
             }
 
-            String unparsedBarcodeEncoding = kv.get(BARCODE_ENCODING);
-            if (unparsedBarcodeEncoding != null && !unparsedBarcodeEncoding.equals("")) {
-                barcodeEncoding = Charset.forName(unparsedBarcodeEncoding);
-            }
-
             String unparsedBalance = kv.get(BALANCE);
             if (unparsedBalance != null && !unparsedBalance.equals("")) {
                 balance = new BigDecimal(unparsedBalance);
@@ -146,7 +136,6 @@ public class ImportURIHelper {
                     cardId,
                     barcodeId,
                     barcodeType,
-                    barcodeEncoding,
                     headerColor,
                     0,
                     Utils.getUnixTime(),
@@ -206,7 +195,6 @@ public class ImportURIHelper {
         if (loyaltyCard.barcodeType != null) {
             fragment = appendFragment(fragment, BARCODE_TYPE, loyaltyCard.barcodeType.name());
         }
-        fragment = appendFragment(fragment, BARCODE_ENCODING, loyaltyCard.barcodeEncoding.name());
         if (loyaltyCard.headerColor != null) {
             fragment = appendFragment(fragment, HEADER_COLOR, loyaltyCard.headerColor.toString());
         }

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

@@ -0,0 +1,140 @@
+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 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()) % colors.length();
+        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

@@ -69,9 +69,7 @@ class ListWidget : AppWidgetProvider() {
             if (hasCards) {
                 // If we have cards, create the list
                 views = RemoteViews(context.packageName, R.layout.list_widget)
-                val templateIntent = Intent(context, LoyaltyCardViewActivity::class.java).apply {
-                    flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
-                }
+                val templateIntent = Intent(context, LoyaltyCardViewActivity::class.java)
                 val pendingIntent = PendingIntent.getActivity(
                     context,
                     0,

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

@@ -9,8 +9,6 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import java.math.BigDecimal;
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
 import java.util.Currency;
 import java.util.Date;
 import java.util.List;
@@ -32,7 +30,6 @@ public class LoyaltyCard {
     public String barcodeId;
     @Nullable
     public CatimaBarcode barcodeType;
-    public Charset barcodeEncoding;
     @Nullable
     public Integer headerColor;
     public int starStatus;
@@ -65,7 +62,6 @@ public class LoyaltyCard {
     public static final String BUNDLE_LOYALTY_CARD_CARD_ID = "loyaltyCardCardId";
     public static final String BUNDLE_LOYALTY_CARD_BARCODE_ID = "loyaltyCardBarcodeId";
     public static final String BUNDLE_LOYALTY_CARD_BARCODE_TYPE = "loyaltyCardBarcodeType";
-    public static final String BUNDLE_LOYALTY_CARD_BARCODE_ENCODING = "loyaltyCardBarcodeEncoding";
     public static final String BUNDLE_LOYALTY_CARD_HEADER_COLOR = "loyaltyCardHeaderColor";
     public static final String BUNDLE_LOYALTY_CARD_STAR_STATUS = "loyaltyCardStarStatus";
     public static final String BUNDLE_LOYALTY_CARD_LAST_USED = "loyaltyCardLastUsed";
@@ -94,7 +90,6 @@ public class LoyaltyCard {
         setCardId("");
         setBarcodeId(null);
         setBarcodeType(null);
-        setBarcodeEncoding(StandardCharsets.ISO_8859_1);
         setHeaderColor(null);
         setStarStatus(0);
         setLastUsed(Utils.getUnixTime());
@@ -129,7 +124,7 @@ public class LoyaltyCard {
     public LoyaltyCard(final int id, final String store, final String note, @Nullable final Date validFrom,
                        @Nullable final Date expiry, final BigDecimal balance, @Nullable final Currency balanceType,
                        final String cardId, @Nullable final String barcodeId, @Nullable final CatimaBarcode barcodeType,
-                       @NonNull final Charset barcodeEncoding, @Nullable final Integer headerColor, final int starStatus,
+                       @Nullable final Integer headerColor, final int starStatus,
                        final long lastUsed, final int zoomLevel, final int zoomLevelWidth, final int archiveStatus,
                        @Nullable Bitmap imageThumbnail, @Nullable String imageThumbnailPath,
                        @Nullable Bitmap imageFront, @Nullable String imageFrontPath,
@@ -144,7 +139,6 @@ public class LoyaltyCard {
         setCardId(cardId);
         setBarcodeId(barcodeId);
         setBarcodeType(barcodeType);
-        setBarcodeEncoding(barcodeEncoding);
         setHeaderColor(headerColor);
         setStarStatus(starStatus);
         setLastUsed(lastUsed);
@@ -250,10 +244,6 @@ public class LoyaltyCard {
         this.barcodeType = barcodeType;
     }
 
-    public void setBarcodeEncoding(@NonNull Charset barcodeEncoding) {
-        this.barcodeEncoding = barcodeEncoding;
-    }
-
     public void setHeaderColor(@Nullable Integer headerColor) {
         this.headerColor = headerColor;
     }
@@ -389,11 +379,6 @@ public class LoyaltyCard {
         } else if (requireFull) {
             throw new IllegalArgumentException("Missing key " + BUNDLE_LOYALTY_CARD_BARCODE_TYPE);
         }
-        if (bundle.containsKey(BUNDLE_LOYALTY_CARD_BARCODE_ENCODING)) {
-            setBarcodeEncoding(Charset.forName(bundle.getString(BUNDLE_LOYALTY_CARD_BARCODE_ENCODING)));
-        } else if (requireFull) {
-            throw new IllegalArgumentException("Missing key " + BUNDLE_LOYALTY_CARD_BARCODE_ENCODING);
-        }
         if (bundle.containsKey(BUNDLE_LOYALTY_CARD_HEADER_COLOR)) {
             int tmpHeaderColor = bundle.getInt(BUNDLE_LOYALTY_CARD_HEADER_COLOR);
             setHeaderColor(tmpHeaderColor != -1 ? tmpHeaderColor : null);
@@ -477,9 +462,6 @@ public class LoyaltyCard {
         if (!exportIsLimited || exportLimit.contains(BUNDLE_LOYALTY_CARD_BARCODE_TYPE)) {
             bundle.putString(BUNDLE_LOYALTY_CARD_BARCODE_TYPE, barcodeType != null ? barcodeType.name() : null);
         }
-        if (!exportIsLimited || exportLimit.contains(BUNDLE_LOYALTY_CARD_BARCODE_ENCODING)) {
-            bundle.putString(BUNDLE_LOYALTY_CARD_BARCODE_ENCODING, barcodeEncoding.name());
-        }
         if (!exportIsLimited || exportLimit.contains(BUNDLE_LOYALTY_CARD_HEADER_COLOR)) {
             bundle.putInt(BUNDLE_LOYALTY_CARD_HEADER_COLOR, headerColor != null ? headerColor : -1);
         }
@@ -557,8 +539,6 @@ public class LoyaltyCard {
         // barcodeType
         int barcodeTypeColumn = cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.BARCODE_TYPE);
         CatimaBarcode barcodeType = !cursor.isNull(barcodeTypeColumn) ? CatimaBarcode.fromName(cursor.getString(barcodeTypeColumn)) : null;
-        // barcodeEncoding
-        Charset barcodeEncoding = Charset.forName(cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.BARCODE_ENCODING)));
         // headerColor
         int headerColorColumn = cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.HEADER_COLOR);
         Integer headerColor = !cursor.isNull(headerColorColumn) ? cursor.getInt(headerColorColumn) : null;
@@ -584,7 +564,6 @@ public class LoyaltyCard {
                 cardId,
                 barcodeId,
                 barcodeType,
-                barcodeEncoding,
                 headerColor,
                 starStatus,
                 lastUsed,
@@ -614,7 +593,6 @@ public class LoyaltyCard {
                 Utils.equals(a.barcodeId, b.barcodeId) && // nullable String
                 Utils.equals(a.barcodeType == null ? null : a.barcodeType.format(),
                         b.barcodeType == null ? null : b.barcodeType.format()) && // nullable CatimaBarcode with no overridden .equals(), so we need to check .format()
-                a.barcodeEncoding.name().equals(b.barcodeEncoding.name()) && // non-nullable String
                 Utils.equals(a.headerColor, b.headerColor) && // nullable Integer
                 a.starStatus == b.starStatus && // non-nullable int
                 a.archiveStatus == b.archiveStatus && // non-nullable int
@@ -641,7 +619,7 @@ public class LoyaltyCard {
     public String toString() {
         return String.format(
                 "LoyaltyCard{%n  id=%s,%n  store=%s,%n  note=%s,%n  validFrom=%s,%n  expiry=%s,%n"
-                        + "  balance=%s,%n  balanceType=%s,%n  cardId=%s,%n  barcodeId=%s,%n  barcodeType=%s,%n barcodeEncoding=%s,%n"
+                        + "  balance=%s,%n  balanceType=%s,%n  cardId=%s,%n  barcodeId=%s,%n  barcodeType=%s,%n"
                         + "  headerColor=%s,%n  starStatus=%s,%n  lastUsed=%s,%n  zoomLevel=%s,%n  zoomLevelWidth=%s,%n  archiveStatus=%s%n"
                         + "  imageThumbnail=%s,%n  imageThumbnailPath=%s,%n  imageFront=%s,%n  imageFrontPath=%s,%n  imageBack=%s,%n  imageBackPath=%s,%n}",
                 this.id,
@@ -654,7 +632,6 @@ public class LoyaltyCard {
                 this.cardId,
                 this.barcodeId,
                 this.barcodeType != null ? this.barcodeType.format() : null,
-                this.barcodeEncoding.name(),
                 this.headerColor,
                 this.starStatus,
                 this.lastUsed,

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

@@ -70,8 +70,6 @@ import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InvalidObjectException;
 import java.math.BigDecimal;
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
 import java.text.DateFormat;
 import java.text.ParseException;
 import java.util.ArrayList;
@@ -125,12 +123,11 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
     ChipGroup groupsChips;
     AutoCompleteTextView validFromField;
     AutoCompleteTextView expiryField;
-    AutoCompleteTextView balanceCurrencyField;
     EditText balanceField;
+    AutoCompleteTextView balanceCurrencyField;
     TextView cardIdFieldView;
     AutoCompleteTextView barcodeIdField;
     AutoCompleteTextView barcodeTypeField;
-    AutoCompleteTextView barcodeEncodingField;
     ImageView barcodeImage;
     View barcodeImageLayout;
     View barcodeCaptureLayout;
@@ -151,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;
@@ -196,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);
     }
@@ -232,14 +229,6 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
         viewModel.setHasChanged(true);
     }
 
-    protected void setLoyaltyCardBarcodeEncoding(@NonNull Charset barcodeEncoding) {
-        viewModel.getLoyaltyCard().setBarcodeEncoding(barcodeEncoding);
-
-        generateBarcode();
-
-        viewModel.setHasChanged(true);
-    }
-
     protected void setLoyaltyCardHeaderColor(@Nullable Integer headerColor) {
         viewModel.getLoyaltyCard().setHeaderColor(headerColor);
 
@@ -340,12 +329,11 @@ 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;
-        barcodeEncodingField = binding.barcodeEncodingField;
         barcodeImage = binding.barcode;
         barcodeImage.setClipToOutline(true);
         barcodeImageLayout = binding.barcodeLayout;
@@ -385,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) {
@@ -437,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) {
@@ -589,25 +577,6 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
             }
         });
 
-        barcodeEncodingField.addTextChangedListener(new SimpleTextWatcher() {
-            @Override
-            public void onTextChanged(CharSequence s, int start, int before, int count) {
-                if (!s.toString().isEmpty()) {
-                    Log.d(TAG, "Setting barcode encoding to " + s.toString());
-                    setLoyaltyCardBarcodeEncoding(Charset.forName(s.toString()));
-                }
-            }
-
-            @Override
-            public void afterTextChanged(Editable s) {
-                ArrayList<String> barcodeEncodingList = new ArrayList<>();
-                barcodeEncodingList.add(StandardCharsets.ISO_8859_1.name());
-                barcodeEncodingList.add(StandardCharsets.UTF_8.name());
-                ArrayAdapter<String> barcodeEncodingAdapter = new ArrayAdapter<>(LoyaltyCardEditActivity.this, android.R.layout.select_dialog_item, barcodeEncodingList);
-                barcodeEncodingField.setAdapter(barcodeEncodingAdapter);
-            }
-        });
-
         binding.tabs.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
             @Override
             public void onTabSelected(TabLayout.Tab tab) {
@@ -750,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
@@ -804,8 +774,6 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
         barcodeIdField.setText(barcodeId != null && !barcodeId.isEmpty() ? barcodeId : getString(R.string.sameAsCardId));
         CatimaBarcode barcodeType = viewModel.getLoyaltyCard().barcodeType;
         barcodeTypeField.setText(barcodeType != null ? barcodeType.prettyName() : getString(R.string.noBarcode));
-        Charset barcodeEncoding = viewModel.getLoyaltyCard().barcodeEncoding;
-        barcodeEncodingField.setText(barcodeEncoding.name());
 
         // We set the balance here (with onResuming/onRestoring == true) to prevent formatBalanceCurrencyField() from setting it (via onTextChanged),
         // which can cause issues when switching locale because it parses the balance and e.g. the decimal separator may have changed.
@@ -1512,9 +1480,9 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
         // This makes the DBHelper set it to the current date
         // So that new and edited card are always on top when sorting by recently used
         if (viewModel.getUpdateLoyaltyCard()) {
-            DBHelper.updateLoyaltyCard(mDatabase, viewModel.getLoyaltyCardId(), viewModel.getLoyaltyCard().store, viewModel.getLoyaltyCard().note, viewModel.getLoyaltyCard().validFrom, viewModel.getLoyaltyCard().expiry, viewModel.getLoyaltyCard().balance, viewModel.getLoyaltyCard().balanceType, viewModel.getLoyaltyCard().cardId, viewModel.getLoyaltyCard().barcodeId, viewModel.getLoyaltyCard().barcodeType, viewModel.getLoyaltyCard().barcodeEncoding, viewModel.getLoyaltyCard().headerColor, viewModel.getLoyaltyCard().starStatus, null, viewModel.getLoyaltyCard().archiveStatus);
+            DBHelper.updateLoyaltyCard(mDatabase, viewModel.getLoyaltyCardId(), viewModel.getLoyaltyCard().store, viewModel.getLoyaltyCard().note, viewModel.getLoyaltyCard().validFrom, viewModel.getLoyaltyCard().expiry, viewModel.getLoyaltyCard().balance, viewModel.getLoyaltyCard().balanceType, viewModel.getLoyaltyCard().cardId, viewModel.getLoyaltyCard().barcodeId, viewModel.getLoyaltyCard().barcodeType, viewModel.getLoyaltyCard().headerColor, viewModel.getLoyaltyCard().starStatus, null, viewModel.getLoyaltyCard().archiveStatus);
         } else {
-            viewModel.setLoyaltyCardId((int) DBHelper.insertLoyaltyCard(mDatabase, viewModel.getLoyaltyCard().store, viewModel.getLoyaltyCard().note, viewModel.getLoyaltyCard().validFrom, viewModel.getLoyaltyCard().expiry, viewModel.getLoyaltyCard().balance, viewModel.getLoyaltyCard().balanceType, viewModel.getLoyaltyCard().cardId, viewModel.getLoyaltyCard().barcodeId, viewModel.getLoyaltyCard().barcodeType, viewModel.getLoyaltyCard().barcodeEncoding, viewModel.getLoyaltyCard().headerColor, 0, null, 0));
+            viewModel.setLoyaltyCardId((int) DBHelper.insertLoyaltyCard(mDatabase, viewModel.getLoyaltyCard().store, viewModel.getLoyaltyCard().note, viewModel.getLoyaltyCard().validFrom, viewModel.getLoyaltyCard().expiry, viewModel.getLoyaltyCard().balance, viewModel.getLoyaltyCard().balanceType, viewModel.getLoyaltyCard().cardId, viewModel.getLoyaltyCard().barcodeId, viewModel.getLoyaltyCard().barcodeType, viewModel.getLoyaltyCard().headerColor, 0, null, 0));
         }
 
         try {
@@ -1527,7 +1495,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
 
         DBHelper.setLoyaltyCardGroups(mDatabase, viewModel.getLoyaltyCardId(), selectedGroups);
 
-        ShortcutHelper.updateShortcuts(this);
+        ShortcutHelper.updateShortcuts(this, DBHelper.getLoyaltyCard(this, mDatabase, viewModel.getLoyaltyCardId()));
 
         if (viewModel.getDuplicateFromLoyaltyCardId()) {
             Intent intent = new Intent(getApplicationContext(), MainActivity.class);
@@ -1629,7 +1597,6 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
 
         String cardIdString = viewModel.getLoyaltyCard().barcodeId != null ? viewModel.getLoyaltyCard().barcodeId : viewModel.getLoyaltyCard().cardId;
         CatimaBarcode barcodeFormat = viewModel.getLoyaltyCard().barcodeType;
-        Charset barcodeEncoding = viewModel.getLoyaltyCard().barcodeEncoding;
 
         if (cardIdString == null || cardIdString.isEmpty() || barcodeFormat == null) {
             barcodeImageLayout.setVisibility(View.GONE);
@@ -1649,13 +1616,13 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
                             barcodeImage.getViewTreeObserver().removeOnGlobalLayoutListener(this);
 
                             Log.d(TAG, "ImageView size now known");
-                            BarcodeImageWriterTask barcodeWriter = new BarcodeImageWriterTask(getApplicationContext(), barcodeImage, cardIdString, barcodeFormat, barcodeEncoding, null, false, LoyaltyCardEditActivity.this, true, false);
+                            BarcodeImageWriterTask barcodeWriter = new BarcodeImageWriterTask(getApplicationContext(), barcodeImage, cardIdString, barcodeFormat, null, false, LoyaltyCardEditActivity.this, true, false);
                             viewModel.getTaskHandler().executeTask(TaskHandler.TYPE.BARCODE, barcodeWriter);
                         }
                     });
         } else {
             Log.d(TAG, "ImageView size known known, creating barcode");
-            BarcodeImageWriterTask barcodeWriter = new BarcodeImageWriterTask(getApplicationContext(), barcodeImage, cardIdString, barcodeFormat, barcodeEncoding, null, false, this, true, false);
+            BarcodeImageWriterTask barcodeWriter = new BarcodeImageWriterTask(getApplicationContext(), barcodeImage, cardIdString, barcodeFormat, null, false, this, true, false);
             viewModel.getTaskHandler().executeTask(TaskHandler.TYPE.BARCODE, barcodeWriter);
         }
     }

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;
@@ -39,7 +38,6 @@ import android.widget.TextView;
 import android.widget.Toast;
 
 import androidx.activity.OnBackPressedCallback;
-import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AlertDialog;
@@ -59,7 +57,6 @@ import com.google.zxing.BarcodeFormat;
 import java.io.File;
 import java.io.UnsupportedEncodingException;
 import java.math.BigDecimal;
-import java.nio.charset.Charset;
 import java.text.DateFormat;
 import java.text.ParseException;
 import java.util.ArrayList;
@@ -89,7 +86,6 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
     String cardIdString;
     String barcodeIdString;
     CatimaBarcode format;
-    Charset barcodeEncoding;
 
     Bitmap frontImageBitmap;
     Bitmap backImageBitmap;
@@ -689,7 +685,6 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
         format = loyaltyCard.barcodeType;
         cardIdString = loyaltyCard.cardId;
         barcodeIdString = loyaltyCard.barcodeId;
-        barcodeEncoding = loyaltyCard.barcodeEncoding;
 
         binding.mainImageDescription.setText(loyaltyCard.cardId);
 
@@ -709,22 +704,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);
 
@@ -793,7 +776,7 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
 
         invalidateOptionsMenu();
 
-        ShortcutHelper.updateShortcuts(this);
+        ShortcutHelper.updateShortcuts(this, loyaltyCard);
     }
 
     private void setStateBasedOnImageTypes() {
@@ -895,6 +878,7 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
             DBHelper.updateLoyaltyCardArchiveStatus(database, loyaltyCardId, 1);
             Toast.makeText(LoyaltyCardViewActivity.this, R.string.archived, Toast.LENGTH_LONG).show();
 
+            ShortcutHelper.removeShortcut(LoyaltyCardViewActivity.this, loyaltyCardId);
             new ListWidget().updateAll(LoyaltyCardViewActivity.this);
 
             // Re-init loyaltyCard with new data from DB
@@ -920,6 +904,7 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
 
                 DBHelper.deleteLoyaltyCard(database, LoyaltyCardViewActivity.this, loyaltyCardId);
 
+                ShortcutHelper.removeShortcut(LoyaltyCardViewActivity.this, loyaltyCardId);
                 new ListWidget().updateAll(LoyaltyCardViewActivity.this);
 
                 finish();
@@ -961,7 +946,6 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
                     barcodeRenderTarget,
                     barcodeIdString != null ? barcodeIdString : cardIdString,
                     format,
-                    barcodeEncoding,
                     null,
                     false,
                     this,
@@ -1263,20 +1247,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,882 @@
+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 if (receivedType.equals("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 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,944 +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)
-                            }
-                            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)
-                        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()
-
-        // Apply column count setting to card list
-        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)
-        ShortcutHelper.updateShortcuts(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,246 +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.GridLayoutManager
-import androidx.recyclerview.widget.RecyclerView
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import protect.card_locker.LoyaltyCardCursorAdapter.CardAdapterListener
-import protect.card_locker.databinding.ActivityManageGroupBinding
-import protect.card_locker.preferences.Settings
-
-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()
-                }
-            }
-        )
-
-        // Apply column count setting to card list
-        val layoutManager = mCardList.layoutManager as GridLayoutManager?
-        if (layoutManager != null) {
-            val settings = Settings(this)
-            layoutManager.setSpanCount(settings.getPreferredColumnCount())
-        }
-    }
-
-    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/PkpassParser.kt

@@ -14,8 +14,6 @@ import org.json.JSONObject
 import java.io.FileNotFoundException
 import java.io.IOException
 import java.math.BigDecimal
-import java.nio.charset.Charset
-import java.nio.charset.StandardCharsets
 import java.text.DateFormat
 import java.text.ParseException
 import java.time.ZonedDateTime
@@ -42,7 +40,6 @@ class PkpassParser(context: Context, uri: Uri?) {
     private var cardId: String = context.getString(R.string.noBarcode)
     private var barcodeId: String? = null
     private var barcodeType: CatimaBarcode? = null
-    private var barcodeEncoding: Charset = StandardCharsets.ISO_8859_1
     private var headerColor: Int? = null
     private val starStatus = 0
     private val lastUsed: Long = 0
@@ -137,7 +134,6 @@ class PkpassParser(context: Context, uri: Uri?) {
             cardId,
             barcodeId,
             barcodeType,
-            barcodeEncoding,
             headerColor,
             starStatus,
             lastUsed,
@@ -346,6 +342,7 @@ class PkpassParser(context: Context, uri: Uri?) {
             else -> throw IllegalArgumentException("No valid barcode type")
         }
 
+        // FIXME: We probably need to do something with the messageEncoding field
         try {
             cardId = barcodeInfo.getString("altText")
             barcodeId = barcodeInfo.getString("message")
@@ -354,8 +351,6 @@ class PkpassParser(context: Context, uri: Uri?) {
             barcodeId = null
         }
 
-        barcodeEncoding = Charset.forName(barcodeInfo.getString("messageEncoding"))
-
         // Don't set barcodeId if it's the same as cardId
         if (cardId == barcodeId) {
             barcodeId = null

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

@@ -2,35 +2,31 @@ package protect.card_locker;
 
 import android.content.Context;
 import android.content.Intent;
-import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.os.Bundle;
 
-import androidx.annotation.VisibleForTesting;
 import androidx.core.content.pm.ShortcutInfoCompat;
 import androidx.core.content.pm.ShortcutManagerCompat;
+import androidx.core.graphics.ColorUtils;
 import androidx.core.graphics.drawable.IconCompat;
 
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.LinkedList;
+import java.util.List;
 
 class ShortcutHelper {
-    /**
-     * This variable controls the maximum number of shortcuts available.
-     * It is made public only to make testing easier and should not be
-     * manually modified. We use -1 here as a default value to check if
-     * the value has been set either manually by the test scenario or
-     * automatically in the `updateShortcuts` function.
-     * Its actual value will be set based on the maximum amount of shortcuts
-     * declared by the launcher via `getMaxShortcutCountPerActivity`.
-     */
-    @VisibleForTesting
-    public static int maxShortcuts = -1;
+    // Android documentation says that no more than 5 shortcuts
+    // are supported. However, that may be too many, as not all
+    // launcher will show all 5. Instead, the number is limited
+    // to 3 here, so that the most recent shortcut has a good
+    // chance of being shown.
+    private static final int MAX_SHORTCUTS = 3;
 
     // https://developer.android.com/reference/android/graphics/drawable/AdaptiveIconDrawable.html
     private static final int ADAPTIVE_BITMAP_SCALE = 1;
@@ -39,42 +35,86 @@ class ShortcutHelper {
     private static final int ADAPTIVE_BITMAP_IMAGE_SIZE = ADAPTIVE_BITMAP_VISIBLE_SIZE + 5 * ADAPTIVE_BITMAP_SCALE;
 
     /**
-     * Update the dynamic shortcut list with the most recently viewed cards
-     * based on the lastUsed field. Archived cards are excluded from the shortcuts
-     * list. The list keeps at most maxShortcuts number of elements.
+     * Add a card to the app shortcuts, and maintain a list of the most
+     * recently used cards. If there is already a shortcut for the card,
+     * the card is marked as the most recently used card. If adding this
+     * card exceeds the max number of shortcuts, then the least recently
+     * used card shortcut is discarded.
      */
-    static void updateShortcuts(Context context) {
-        if (maxShortcuts == -1) {
-            maxShortcuts = ShortcutManagerCompat.getMaxShortcutCountPerActivity(context);
+    static void updateShortcuts(Context context, LoyaltyCard card) {
+        if (card.archiveStatus == 1) {
+            // Don't add archived card to menu
+            return;
         }
-        LinkedList<ShortcutInfoCompat> finalList = new LinkedList<>();
-        SQLiteDatabase database = new DBHelper(context).getReadableDatabase();
-        Cursor loyaltyCardCursor = DBHelper.getLoyaltyCardCursor(
-                database,
-                "",
-                null,
-                DBHelper.LoyaltyCardOrder.LastUsed,
-                DBHelper.LoyaltyCardOrderDirection.Ascending,
-                DBHelper.LoyaltyCardArchiveFilter.Unarchived
-        );
 
+        LinkedList<ShortcutInfoCompat> list = new LinkedList<>(ShortcutManagerCompat.getDynamicShortcuts(context));
+
+        SQLiteDatabase database = new DBHelper(context).getReadableDatabase();
+
+        String shortcutId = Integer.toString(card.id);
+
+        // Sort the shortcuts by rank, so working with the relative order will be easier.
+        // This sorts so that the lowest rank is first.
+        Collections.sort(list, Comparator.comparingInt(ShortcutInfoCompat::getRank));
+
+        Integer foundIndex = null;
+
+        for (int index = 0; index < list.size(); index++) {
+            if (list.get(index).getId().equals(shortcutId)) {
+                // Found the item already
+                foundIndex = index;
+                break;
+            }
+        }
+
+        if (foundIndex != null) {
+            // If the item is already found, then the list needs to be
+            // reordered, so that the selected item now has the lowest
+            // rank, thus letting it survive longer.
+            ShortcutInfoCompat found = list.remove(foundIndex.intValue());
+            list.addFirst(found);
+        } else {
+            // The item is new to the list. We add it and trim the list later.
+            ShortcutInfoCompat shortcut = createShortcutBuilder(context, card).build();
+            list.addFirst(shortcut);
+        }
+
+        LinkedList<ShortcutInfoCompat> finalList = new LinkedList<>();
         int rank = 0;
 
-        while (rank < maxShortcuts && loyaltyCardCursor.moveToNext()) {
-            int id = loyaltyCardCursor.getInt(loyaltyCardCursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.ID));
-            LoyaltyCard loyaltyCard = DBHelper.getLoyaltyCard(context, database, id);
+        // The ranks are now updated; the order in the list is the rank.
+        for (int index = 0; index < list.size(); index++) {
+            ShortcutInfoCompat prevShortcut = list.get(index);
 
-            ShortcutInfoCompat updatedShortcut = createShortcutBuilder(context, loyaltyCard)
-                    .setRank(rank)
-                    .build();
+            LoyaltyCard loyaltyCard = DBHelper.getLoyaltyCard(context, database, Integer.parseInt(prevShortcut.getId()));
 
-            finalList.addLast(updatedShortcut);
-            rank++;
+            // skip outdated cards that no longer exist
+            if (loyaltyCard != null) {
+                ShortcutInfoCompat updatedShortcut = createShortcutBuilder(context, loyaltyCard)
+                        .setRank(rank)
+                        .build();
+
+                finalList.addLast(updatedShortcut);
+                rank++;
+
+                // trim the list
+                if (rank >= MAX_SHORTCUTS) {
+                    break;
+                }
+            }
         }
 
         ShortcutManagerCompat.setDynamicShortcuts(context, finalList);
     }
 
+    /**
+     * Remove the given card id from the app shortcuts, if such a
+     * shortcut exists.
+     */
+    static void removeShortcut(Context context, int cardId) {
+        ShortcutManagerCompat.removeDynamicShortcuts(context, Collections.singletonList(Integer.toString(cardId)));
+    }
+
     static @NotNull
     Bitmap createAdaptiveBitmap(@NotNull Bitmap in, int paddingColor) {
         Bitmap ret = Bitmap.createBitmap(ADAPTIVE_BITMAP_SIZE, ADAPTIVE_BITMAP_SIZE, Bitmap.Config.ARGB_8888);

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

@@ -118,7 +118,7 @@ public class Utils {
     static final double LUMINANCE_MIDPOINT = 0.5;
 
     static final int BITMAP_SIZE_SMALL = 512;
-    static final int BITMAP_SIZE_BIG = 1600;
+    static final int BITMAP_SIZE_BIG = 2048;
 
     static public LetterBitmap generateIcon(Context context, LoyaltyCard loyaltyCard, boolean forShortcut) {
         return generateIcon(context, loyaltyCard.store, loyaltyCard.headerColor, forShortcut);
@@ -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,
@@ -963,9 +963,31 @@ public class Utils {
     // replace colors in the current theme
     public static void patchColors(AppCompatActivity activity) {
         Settings settings = new Settings(activity);
+        String color = settings.getColor();
 
         Resources.Theme theme = activity.getTheme();
-        DynamicColors.applyToActivityIfAvailable(activity);
+        Resources resources = activity.getResources();
+        if (color.equals(resources.getString(R.string.settings_key_pink_theme))) {
+            theme.applyStyle(R.style.pink, true);
+        } else if (color.equals(resources.getString(R.string.settings_key_magenta_theme))) {
+            theme.applyStyle(R.style.magenta, true);
+        } else if (color.equals(resources.getString(R.string.settings_key_violet_theme))) {
+            theme.applyStyle(R.style.violet, true);
+        } else if (color.equals(resources.getString(R.string.settings_key_blue_theme))) {
+            theme.applyStyle(R.style.blue, true);
+        } else if (color.equals(resources.getString(R.string.settings_key_sky_blue_theme))) {
+            theme.applyStyle(R.style.skyblue, true);
+        } else if (color.equals(resources.getString(R.string.settings_key_green_theme))) {
+            theme.applyStyle(R.style.green, true);
+        } else if (color.equals(resources.getString(R.string.settings_key_brown_theme))) {
+            theme.applyStyle(R.style.brown, true);
+        } else if (color.equals(resources.getString(R.string.settings_key_catima_theme))) {
+            // catima theme is AppTheme itself, no dynamic colors nor applyStyle
+        } else {
+            // final catch all in case of invalid theme value from older versions
+            // also handles R.string.settings_key_system_theme
+            DynamicColors.applyToActivityIfAvailable(activity);
+        }
 
         if (isDarkModeEnabled(activity) && settings.getOledDark()) {
             theme.applyStyle(R.style.DarkBackground, true);
@@ -1107,7 +1129,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/compose/AboutActivity.kt

@@ -1,100 +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.semantics.hideFromAccessibility
-import androidx.compose.ui.semantics.semantics
-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)
-                }
-            }
-            .semantics(mergeDescendants = true) {}
-    ) {
-        Column(modifier = Modifier.weight(1F)) {
-            Text(
-                text = title,
-                style = MaterialTheme.typography.titleMedium
-            )
-            Text(text = message)
-        }
-        Text(modifier = Modifier.align(Alignment.CenterVertically).semantics() { hideFromAccessibility() },
-            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,56 +0,0 @@
-package protect.card_locker.compose
-
-import androidx.activity.OnBackPressedDispatcher
-import androidx.appcompat.app.AppCompatDelegate
-import androidx.compose.foundation.isSystemInDarkTheme
-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.material3.TopAppBarDefaults
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.platform.testTag
-import androidx.compose.ui.res.stringResource
-import protect.card_locker.R
-import protect.card_locker.preferences.Settings
-
-@OptIn(ExperimentalMaterial3Api::class)
-@Composable
-fun CatimaTopAppBar(title: String, onBackPressedDispatcher: OnBackPressedDispatcher?) {
-    // Use pure black in OLED theme
-    val context = LocalContext.current
-    val settings = Settings(context)
-    val isDarkMode = when (settings.theme) {
-        AppCompatDelegate.MODE_NIGHT_NO -> false
-        AppCompatDelegate.MODE_NIGHT_YES -> true
-        else -> isSystemInDarkTheme()
-    }
-
-    val appBarColors = if (isDarkMode && settings.oledDark) {
-        TopAppBarDefaults.topAppBarColors().copy(containerColor = Color.Black)
-    } else {
-        TopAppBarDefaults.topAppBarColors()
-    }
-
-    TopAppBar(
-        modifier = Modifier.testTag("topbar_catima"),
-        title = { Text(text = title) },
-        colors = appBarColors,
-        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,51 +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.graphics.Color
-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))
-    }
-
-    var darkTheme = if (isDynamicColorSupported) {
-        dynamicDarkColorScheme(context)
-    } else {
-        darkColorScheme(primary = colorResource(id = R.color.md_theme_dark_primary))
-    }
-
-    if (settings.oledDark) {
-        darkTheme = darkTheme.copy(background = Color.Black)
-    }
-
-    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/contentprovider/CardsContentProvider.java

@@ -32,7 +32,7 @@ public class CardsContentProvider extends ContentProvider {
         public static final String MAJOR_COLUMN = "major";
         public static final String MINOR_COLUMN = "minor";
         public static final int MAJOR = 1;
-        public static final int MINOR = 1;
+        public static final int MINOR = 0;
     }
 
     private static final int URI_VERSION = 0;
@@ -52,7 +52,6 @@ public class CardsContentProvider extends ContentProvider {
             LoyaltyCardDbIds.CARD_ID,
             LoyaltyCardDbIds.BARCODE_ID,
             LoyaltyCardDbIds.BARCODE_TYPE,
-            LoyaltyCardDbIds.BARCODE_ENCODING,
             LoyaltyCardDbIds.STAR_STATUS,
             LoyaltyCardDbIds.LAST_USED,
             LoyaltyCardDbIds.ARCHIVE_STATUS,

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

@@ -134,7 +134,6 @@ public class CatimaExporter implements Exporter {
                 DBHelper.LoyaltyCardDbIds.CARD_ID,
                 DBHelper.LoyaltyCardDbIds.BARCODE_ID,
                 DBHelper.LoyaltyCardDbIds.BARCODE_TYPE,
-                DBHelper.LoyaltyCardDbIds.BARCODE_ENCODING,
                 DBHelper.LoyaltyCardDbIds.HEADER_COLOR,
                 DBHelper.LoyaltyCardDbIds.STAR_STATUS,
                 DBHelper.LoyaltyCardDbIds.LAST_USED,
@@ -155,7 +154,6 @@ public class CatimaExporter implements Exporter {
                     card.cardId,
                     card.barcodeId,
                     card.barcodeType != null ? card.barcodeType.name() : "",
-                    card.barcodeEncoding.name(),
                     card.headerColor,
                     card.starStatus,
                     card.lastUsed,

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

@@ -20,7 +20,6 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.StringReader;
 import java.math.BigDecimal;
-import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Currency;
@@ -128,10 +127,10 @@ public class CatimaImporter implements Importer {
             LoyaltyCard existing = DBHelper.getLoyaltyCard(context, database, card.id);
             if (existing == null) {
                 DBHelper.insertLoyaltyCard(database, card.id, card.store, card.note, card.validFrom, card.expiry, card.balance, card.balanceType,
-                        card.cardId, card.barcodeId, card.barcodeType, card.barcodeEncoding, card.headerColor, card.starStatus, card.lastUsed, card.archiveStatus);
+                        card.cardId, card.barcodeId, card.barcodeType, card.headerColor, card.starStatus, card.lastUsed, card.archiveStatus);
             } else if (!isDuplicate(context, existing, card, existingImages, imageChecksums)) {
                 long newId = DBHelper.insertLoyaltyCard(database, card.store, card.note, card.validFrom, card.expiry, card.balance, card.balanceType,
-                        card.cardId, card.barcodeId, card.barcodeType, card.barcodeEncoding, card.headerColor, card.starStatus, card.lastUsed, card.archiveStatus);
+                        card.cardId, card.barcodeId, card.barcodeType, card.headerColor, card.starStatus, card.lastUsed, card.archiveStatus);
                 idMap.put(card.id, (int) newId);
             }
         }
@@ -459,15 +458,6 @@ public class CatimaImporter implements Importer {
             barcodeType = CatimaBarcode.fromName(unparsedBarcodeType);
         }
 
-        // Barcode encoding information is only supported since Catima 2.41.0, so old exports will lack this field
-        // Database migration 19 forcing ISO-8859-1 on all cards, so we should treat imports from old Catima versions the same and force ISO-8859-1 there too
-        // This limits the risk of breaking cards when importing an old database backup
-        Charset barcodeEncoding = StandardCharsets.ISO_8859_1;
-        String unparsedBarcodeEncoding = CSVHelpers.extractString(DBHelper.LoyaltyCardDbIds.BARCODE_ENCODING, record, "");
-        if (!unparsedBarcodeEncoding.isEmpty()) {
-            barcodeEncoding = Charset.forName(unparsedBarcodeEncoding);
-        }
-
         Integer headerColor = null;
         try {
             headerColor = CSVHelpers.extractInt(DBHelper.LoyaltyCardDbIds.HEADER_COLOR, record);
@@ -511,7 +501,6 @@ public class CatimaImporter implements Importer {
                 cardId,
                 barcodeId,
                 barcodeType,
-                barcodeEncoding,
                 headerColor,
                 starStatus,
                 lastUsed,

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

@@ -160,7 +160,6 @@ public class FidmeImporter implements Importer {
                 cardId,
                 null,
                 barcodeType,
-                StandardCharsets.ISO_8859_1,
                 headerColor,
                 starStatus,
                 Utils.getUnixTime(),
@@ -182,7 +181,7 @@ public class FidmeImporter implements Importer {
         for (LoyaltyCard card : data.cards) {
             // Do not use card.id which is set to -1
             DBHelper.insertLoyaltyCard(database, card.store, card.note, card.validFrom, card.expiry, card.balance, card.balanceType,
-                    card.cardId, card.barcodeId, card.barcodeType, card.barcodeEncoding, card.headerColor, card.starStatus, card.lastUsed, card.archiveStatus);
+                    card.cardId, card.barcodeId, card.barcodeType, card.headerColor, card.starStatus, card.lastUsed, card.archiveStatus);
         }
     }
 }

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

@@ -162,7 +162,6 @@ public class VoucherVaultImporter implements Importer {
                     cardId,
                     null,
                     barcodeType,
-                    StandardCharsets.ISO_8859_1,
                     headerColor,
                     0,
                     Utils.getUnixTime(),
@@ -187,7 +186,7 @@ public class VoucherVaultImporter implements Importer {
         for (LoyaltyCard card : data.cards) {
             // Do not use card.id which is set to -1
             DBHelper.insertLoyaltyCard(database, card.store, card.note, card.validFrom, card.expiry, card.balance, card.balanceType,
-                    card.cardId, card.barcodeId, card.barcodeType, card.barcodeEncoding, card.headerColor, card.starStatus, card.lastUsed, card.archiveStatus);
+                    card.cardId, card.barcodeId, card.barcodeType, card.headerColor, card.starStatus, card.lastUsed, card.archiveStatus);
         }
     }
 }

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

@@ -90,6 +90,10 @@ public class Settings {
         return getBoolean(R.string.settings_key_oled_dark, false);
     }
 
+    public String getColor() {
+        return getString(R.string.setting_key_theme_color, mContext.getResources().getString(R.string.settings_key_system_theme));
+    }
+
     public int getPreferredColumnCount() {
         var defaultSymbol = mContext.getResources().getString(R.string.settings_key_automatic_column_count);
         var defaultColumnCount = mContext.getResources().getInteger(R.integer.main_view_card_columns);

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

@@ -0,0 +1,212 @@
+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.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;
+
+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);
+
+            // Hide crash reporter settings on builds it's not enabled on
+            Preference crashReporterPreference = findPreference("acra.enable");
+            assert crashReporterPreference != null;
+            crashReporterPreference.setVisible(BuildConfig.useAcraCrashReporter);
+        }
+
+        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,180 +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 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 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/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

@@ -191,32 +191,6 @@
                     </com.google.android.material.textfield.TextInputLayout>
                 </LinearLayout>
 
-                <!-- Barcode encoding -->
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:paddingHorizontal="@dimen/inputPadding"
-                    android:paddingTop="@dimen/inputPadding"
-                    android:orientation="horizontal">
-
-                    <!-- Barcode type -->
-                    <com.google.android.material.textfield.TextInputLayout
-                        android:id="@+id/barcodeEncodingView"
-                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1.0"
-                        android:hint="@string/barcodeEncoding"
-                        android:labelFor="@+id/barcodeEncodingField">
-
-                        <AutoCompleteTextView
-                            android:id="@+id/barcodeEncodingField"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:inputType="none"/>
-                    </com.google.android.material.textfield.TextInputLayout>
-                </LinearLayout>
-
                 <!-- Barcode -->
                 <LinearLayout android:orientation="horizontal"
                     android:layout_marginTop="10.0dp"
@@ -302,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"
@@ -338,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/raw/contributors.txt

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

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

@@ -29,12 +29,12 @@
     <string name="noCardExistsError">لا يمكن العثور على هذه البطاقة</string>
     <string name="failedParsingImportUriError">لا يمكن تحليل الرابط المستورد</string>
     <string name="importExport">استيراد/تصدير</string>
-    <string name="importExportHelp">إنشاء نسخة احتياطية من بياناتك لكي تستطيع نقلها إلى جهاز آخر</string>
+    <string name="importExportHelp">انشاء نسخة احتياطية من بياناتك يسمح بنقلها إلى جهاز آخر.</string>
     <string name="importFailed">تعذر إجراء الاستيراد</string>
     <string name="exportSuccessfulTitle">متصدر</string>
     <string name="exportFailedTitle">فشل التصدير</string>
     <string name="exportFailed">لا يمكن عمل التصدير</string>
-    <string name="exportOptionExplanation">ستكون البيانات مكتوبة في المسار الذي تختاره</string>
+    <string name="exportOptionExplanation">ستتم كتابة البيانات في الموقع الذي تختاره.</string>
     <string name="importOptionFilesystemButton">من نظام الملفات</string>
     <string name="about">حول</string>
     <string name="app_copyright_old">بناء على Loyalty Card Keychain
@@ -53,7 +53,7 @@
     <string name="exportSuccessful">تم تصدير البيانات</string>
     <string name="enter_group_name">أدخل اسم المجموعة</string>
     <string name="group_edit">تعديل المجموعة</string>
-    <string name="noGroups">اضغط زر + لإضافة مجموعات للتصنيف</string>
+    <string name="noGroups">اضغط زر + لإضافة مجموعات للتصنيف.</string>
     <string name="noGroupCards">هذه المجموعة فارغة</string>
     <string name="group_name_already_in_use">اسم المجموعة قيد الاستخدام بالفعل</string>
     <string name="group_name_is_empty">لا يمكن أن يكون اسم المجموعة فارغًا</string>
@@ -71,9 +71,9 @@
     <string name="privacy_policy">سياسة الخصوصية</string>
     <string name="accept">قبول</string>
     <string name="importCatima">الاستيراد من Catima</string>
-    <string name="importCatimaMessage">حدّد ملفك تصدير من Catima للاستيراد.\nإنشئها من قائمة الاستيراد / التصدير لتطبيق Catima آخر بالضغط على تصدير .</string>
+    <string name="importCatimaMessage">حدّد ملفك <i>catima.zip</i> تصدير من Catima للاستيراد. \nإنشئها من قائمة الاستيراد / التصدير لتطبيق Catima آخر بالضغط على تصدير هناك أولاً.</string>
     <string name="importFidme">الاستيراد من FidMe</string>
-    <string name="importFidmeMessage">"حدّد ملفك للتصدير من FidMe  لكي تستورده، ثم حدد أنواع الباركود يدويًا بعد ذلك. \nقم بإنشاءها من ملف التعريف في  FidMe الخاص بك عن طريق اختيار \"حماية البيانات\" ثم النقر على \"استخراج بياناتي\"."</string>
+    <string name="importFidmeMessage">حدّد ملفك <i>fidme-export-request-xxxxxx.zip</i> تصدير من FidMe للاستيراد، ثم حدد أنواع الباركود يدويًا بعد ذلك. \nإنشئها من ملف تعريف FidMe الخاص بك عن طريق اختيار حماية البيانات ثم الضغط على استخراج بياناتي أولاً.</string>
     <string name="importVoucherVault">الاستيراد من Voucher Vault</string>
     <string name="importVoucherVaultMessage">حدّد ملفك <i>vouchervault.json</i> تصدير من Voucher Vault للاستيراد. \nإنشئها بالضغط على تصدير في Voucher Vault أولاً.</string>
     <string name="barcodeId">قيمة الباركود</string>
@@ -101,6 +101,14 @@
     <string name="settings_locale">لغة</string>
     <string name="settings_system_locale">النظام</string>
     <string name="setIcon">تعيين الصورة المصغرة</string>
+    <string name="settings_catima_theme">Catima</string>
+    <string name="settings_pink_theme">زهري</string>
+    <string name="settings_magenta_theme">أرجواني</string>
+    <string name="settings_violet_theme">البنفسجي</string>
+    <string name="settings_blue_theme">أزرق</string>
+    <string name="settings_sky_blue_theme">أزرق سماوي</string>
+    <string name="settings_green_theme">أخضر</string>
+    <string name="settings_brown_theme">بني</string>
     <string name="app_contributors">أصبح ممكنًا بواسطة: <xliff:g id="app_contributors">%s</xliff:g></string>
     <string name="sort">فرز</string>
     <string name="showMoreInfo">اظهر المعلومات</string>
@@ -122,7 +130,7 @@
     <string name="archived">تمت أرشفة البطاقة</string>
     <string name="unarchived">البطاقة غير مؤرشفة</string>
     <string name="failedLaunchingPhotoPicker">تعذر العثور على تطبيق معرض مدعوم</string>
-    <string name="noGiftCardsGroup">أنشئ بعض البطاقات، ثم عيّنهم لهذه المجموعة</string>
+    <string name="noGiftCardsGroup">أنشئ بعض البطاقات، ثم عيّنهم لهذه المجموعة.</string>
     <string name="deleteTitle">مسح بطاقة</string>
     <plurals name="selectedCardCount">
         <item quantity="zero"><xliff:g>%d</xliff:g> محدد</item>
@@ -166,7 +174,7 @@
         <item quantity="other">مسح هذه <xliff:g>%d</xliff:g> البطاقات نهائيا؟</item>
     </plurals>
     <string name="importOptionFilesystemTitle">الاستيراد من نظام الملفات</string>
-    <string name="importOptionFilesystemExplanation">اختر ملفًا محددًا من نظام الملفات</string>
+    <string name="importOptionFilesystemExplanation">اختر ملفًا محددًا من نظام الملفات.</string>
     <string name="about_title_fmt">حول <xliff:g id="app_name">%s</xliff:g></string>
     <string name="debug_version_fmt">نسخة: <xliff:g id="version">%s</xliff:g></string>
     <string name="settings_system_theme">النظام</string>
@@ -217,6 +225,7 @@
     <string name="failedGeneratingShareURL">تعذر إنشاء عنوان URL قابل للمشاركة</string>
     <string name="help_translate_this_app">ساعد في ترجمة هذا التطبيق</string>
     <string name="on_google_play">على Google Play</string>
+    <string name="settings_theme_color">لون المظهر</string>
     <string name="previousCard">السابق</string>
     <string name="nextCard">التالي</string>
     <string name="failedToRetrieveImageFile">فشل في استخراج ملف الصورة</string>
@@ -313,15 +322,4 @@
     <string name="card_list_widget_name">قائمة البطاقات</string>
     <string name="cardWithNumber">البطاقة <xliff:g>%d</xliff:g></string>
     <string name="cardWithNumberAndLocale">البطاقة <xliff:g>%d</xliff:g> (<xliff:g>%s</xliff:g>)</string>
-    <string name="card_list_widget_empty">بعد أن تضيف بطاقات الولاء في كاتيما، ستظهر هنا. وإذا كنت تملك البطاقات، تأكد من عدم وجودهن جميعا في الأرشفة.</string>
-    <string name="pleaseDoNotRotateTheDevice">نرجو منك عدم تدوير الجهاز، أو سيُلغى هذا الإجراء</string>
-    <string name="acra_catima_has_crashed">نأسف، لقد توقف <xliff:g id="app_name">%s</xliff:g>. ساعدنا في إصلاح هذه المشكلة من خلال إرسال تقرير للأخطاء.</string>
-    <string name="acra_explain_crash">بقدر الإمكان، نرجو منك أن تضيف مزيدا من المعلومات عمَّ كنت تفعل هنا:</string>
-    <string name="acra_crash_email_subject">تقرير الأخطاء لـ<xliff:g id="app_name">%s</xliff:g></string>
-    <string name="copy_value">قيمة النسخ</string>
-    <string name="copied_to_clipboard">تم النسخ إلى الحافظة</string>
-    <string name="nothing_to_copy">لم يتم العثور على قيمة</string>
-    <string name="barcodeEncoding">طريقة ترميز الرمز الشريطي \"الباركود\"</string>
-    <string name="back">رجوع</string>
-    <string name="pref_enable_acra">إخطار بإرسال تقارير الأخطاء</string>
 </resources>

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

@@ -158,6 +158,9 @@
     <string name="settings_oled_dark">Чысты чорны фон для цёмнай тэмы</string>
     <string name="selectColor">Выбраць колер</string>
     <string name="setIcon">Задаць мініяцюру</string>
+    <string name="settings_theme_color">Колер тэмы</string>
+    <string name="settings_catima_theme">Catima</string>
+    <string name="settings_magenta_theme">Пурпурны</string>
     <string name="app_contributors">Стала магчымым дзякуючы: <xliff:g id="app_contributors">%s</xliff:g></string>
     <string name="sort">Сартаваць</string>
     <string name="showMoreInfo">Паказаць інфармацыю</string>
@@ -272,6 +275,8 @@
     <string name="switchToBackImage">Пераключыцца на задні відарыс</string>
     <string name="importFidmeMessage">Каб імпартаваць, выберыце файл <i>fidme-export-request-xxxxxx.zip</i> з FidMe, а потым уручную выберыце тыпы штрыхкодаў. \nСтварыце яго з вашага профілю FidMe, выбраўшы \"Абарону даных\", а затым націснуўшы \"Выняць мае даныя\".</string>
     <string name="importCatimaMessage">Каб імпартаваць, выберыце файл <i>catima.zip</i> з Catima. \nСтварыце яго з меню \"Імпарт/Экспарт\" іншай праграмы Catima, спачатку націснуўшы там \"Экспарт\".</string>
+    <string name="settings_sky_blue_theme">Нябесна-блакітны</string>
+    <string name="settings_brown_theme">Карычневы</string>
     <string name="switchToBarcode">Пераключыцца на штрыхкод</string>
     <string name="settings_locale">Мова</string>
     <plurals name="groupCardCountWithArchived">
@@ -283,8 +288,12 @@
     <string name="unarchived">Карта разархівавана</string>
     <string name="updateBarcodeQuestionText">Вы змянілі ID. Вы хочаце таксама абнавіць штрыхкод, каб выкарыстоўваць тое ж значэнне?</string>
     <string name="no">Не</string>
+    <string name="settings_pink_theme">Ружовы</string>
     <string name="settings_system_locale">Сістэма</string>
+    <string name="settings_violet_theme">Фіялетавы</string>
     <string name="multipleBarcodesFoundPleaseChooseOne">Які са знойдзеных штрыхкодаў вы хочаце выкарыстоўваць?</string>
+    <string name="settings_blue_theme">Сіні</string>
+    <string name="settings_green_theme">Зялёны</string>
     <string name="report_error">Паведаміць пра памылку</string>
     <string name="failedLaunchingPhotoPicker">Не атрымалася знайсці праграму для галерэі, якая падтрымліваецца</string>
     <string name="unsupportedFile">Гэты файл не падтрымліваецца</string>
@@ -297,15 +306,4 @@
     <string name="generic_error_please_retry">На жаль, нешта пайшло не так, паспрабуйце яшчэ раз...</string>
     <string name="setBarcodeWidth">Задаць шырыню штрыхкода</string>
     <string name="app_license">Свабоднае копілефт праграмнае забеспячэнне, ліцэнзаванае паводле GPLv3+</string>
-    <string name="cardWithNumber">Карта <xliff:g>%d</xliff:g></string>
-    <string name="cardWithNumberAndLocale">Карта <xliff:g>%d</xliff:g> (<xliff:g>%s</xliff:g>)</string>
-    <string name="pleaseDoNotRotateTheDevice">Калі ласка, не паварочвайце прыладу, бо гэта адменіць дзеянне</string>
-    <string name="acra_explain_crash">Калі магчыма, дадайце больш падрабязную інфармацыю пра тое, што вы тут рабілі:</string>
-    <string name="acra_crash_email_subject">Справаздача аб збоі <xliff:g id="app_name">%s</xliff:g></string>
-    <string name="pref_enable_acra">Запытваць дазвол на адпраўку справаздач аб збоях</string>
-    <string name="pref_enable_acra_summary">Калі гэта ўключана, вам будзе прапанавана паведаміць пра збой, калі ён адбудзецца. Справаздачы аб збоях ніколі не адпраўляюцца аўтаматычна.</string>
-    <string name="card_list_widget_name">Спіс карт</string>
-    <string name="card_list_widget_empty">Пасля таго, як вы дадасце некалькі картак лаяльнасці ў Catima, яны з\'явяцца тут. Калі ў вас ёсць карты, пераканайцеся, што яны не ўсе заархіваваны.</string>
-    <string name="acra_catima_has_crashed">Прабачце, але ў праграме <xliff:g id="app_name">%s</xliff:g> адбыўся збой. Калі ласка, дапамажыце нам выправіць гэту праблему, даслаўшы нам справаздачу аб памылцы.</string>
-    <string name="back">Назад</string>
 </resources>

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

@@ -143,6 +143,15 @@
         <item quantity="other">Желаете ли тези <xliff:g>%d</xliff:g> карти да бъдат премахнати\?</item>
     </plurals>
     <string name="app_contributors">Осъществено от: <xliff:g id="app_contributors">%s</xliff:g></string>
+    <string name="settings_brown_theme">Кафяво</string>
+    <string name="settings_green_theme">Зелено</string>
+    <string name="settings_sky_blue_theme">Небесносиньо</string>
+    <string name="settings_blue_theme">Синьо</string>
+    <string name="settings_violet_theme">Виолетово</string>
+    <string name="settings_magenta_theme">Цикламено</string>
+    <string name="settings_pink_theme">Розово</string>
+    <string name="settings_catima_theme">Catima</string>
+    <string name="settings_theme_color">Цвят на темата</string>
     <string name="settings_system_locale">Система</string>
     <string name="settings_locale">Език</string>
     <string name="noGroupCards">Групата е празна</string>
@@ -296,9 +305,4 @@
     <string name="pref_enable_acra">Питане преди изпращане на доклад за срив</string>
     <string name="pref_enable_acra_summary">Когато е отметнато, при срив ще ви бъде предложено да докладвате за него. Докладите никога не се изпращат автоматично.</string>
     <string name="acra_explain_crash">Ако е възможно добавете подробности за вашите действия:</string>
-    <string name="copy_value">Копиране на стойността</string>
-    <string name="copied_to_clipboard">Копирано</string>
-    <string name="nothing_to_copy">Няма стойност</string>
-    <string name="back">Назад</string>
-    <string name="barcodeEncoding">Кодиране на щрихкода</string>
 </resources>

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

@@ -50,6 +50,15 @@
     <string name="turn_flashlight_off">টর্চলাইট বন্ধ করুন</string>
     <string name="settings_locale">লোকেল</string>
     <string name="settings_system_locale">সিস্টেম লোকেল</string>
+    <string name="settings_theme_color">থিম রঙ</string>
+    <string name="settings_catima_theme">কটিমা থিম</string>
+    <string name="settings_pink_theme">গোলাপী থিম</string>
+    <string name="settings_magenta_theme">ম্যাজেন্টা থিম</string>
+    <string name="settings_violet_theme">ভায়োলেট থিম</string>
+    <string name="settings_blue_theme">নীল থিম</string>
+    <string name="settings_sky_blue_theme">আকাশী নীল থিম</string>
+    <string name="settings_green_theme">সবুজ থিম</string>
+    <string name="settings_brown_theme">বাদামী থিম</string>
     <string name="sort">সাজান</string>
     <string name="sort_by_name">নামের দ্বারা সাজান</string>
     <string name="sort_by_most_recently_used">সর্বাধিক সম্প্রতি ব্যবহৃত দ্বারা সাজান</string>

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

@@ -2,6 +2,10 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="settings_locale">ভাষা</string>
     <string name="action_search">খুঁজুন</string>
+    <string name="settings_pink_theme">গুলাপি</string>
+    <string name="settings_blue_theme">নীল</string>
+    <string name="settings_green_theme">সবুজ</string>
+    <string name="settings_brown_theme">বাদামি</string>
     <string name="save">সংরক্ষণ</string>
     <string name="cardId">কার্ড আইডি</string>
     <string name="barcodeType">বারকোডের ধরন</string>
@@ -15,6 +19,7 @@
     <string name="all">সকল</string>
     <string name="never">কখনো না</string>
     <string name="currency">মুদ্রা</string>
+    <string name="settings_violet_theme">বেগুনি</string>
     <string name="no">না</string>
     <string name="nextCard">পরবর্তী</string>
     <string name="action_add">যুক্ত করুন</string>

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

@@ -50,6 +50,15 @@
     <string name="turn_flashlight_off">Ugasi lampu</string>
     <string name="settings_locale">Jezik</string>
     <string name="settings_system_locale">Sistem</string>
+    <string name="settings_theme_color">Boja teme</string>
+    <string name="settings_catima_theme">Catima</string>
+    <string name="settings_pink_theme">Ružičasto</string>
+    <string name="settings_magenta_theme">Ljubičasto</string>
+    <string name="settings_violet_theme">Ljubičasto</string>
+    <string name="settings_blue_theme">Plavo</string>
+    <string name="settings_sky_blue_theme">Nebo plavo</string>
+    <string name="settings_green_theme">Zeleno</string>
+    <string name="settings_brown_theme">Braun</string>
     <string name="sort">Poništi sortiranje</string>
     <string name="sort_by_name">Ime</string>
     <string name="sort_by_most_recently_used">Nedavno Korišten</string>

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

@@ -7,12 +7,12 @@
     <string name="delete">Elimina</string>
     <string name="confirm">Confirma</string>
     <string name="ok">D\'acord</string>
-    <string name="importExport">Importa/exporta</string>
+    <string name="importExport">Importa/Exporta</string>
     <string name="exportName">Exporta</string>
     <string name="action_search">Cerca</string>
     <string name="deleteTitle">Elimina la targeta</string>
     <string name="welcome">Benvingut a Catima</string>
-    <string name="noGiftCards">Fes clic al botó + per afegir una targeta, o importa des del menú ⋮</string>
+    <string name="noGiftCards">Cliqueu el botó + més per afegir una targeta, o importeu-ne des del ⋮ menú.</string>
     <string name="photos">Fotos</string>
     <string name="app_name">Catima</string>
     <string name="moveDown">Baixar abaix</string>
@@ -24,10 +24,10 @@
     <string name="on_google_play">al Google Play</string>
     <string name="settings_locale">Idioma</string>
     <string name="field_must_not_be_empty">El camp no pot estar buit</string>
-    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Copyright © 2019–<xliff:g>%d</xliff:g> Sylvia van Os i col·laboradors</string>
-    <string name="app_copyright_short">Copyright © Sylvia van Os i col·laboradors</string>
-    <string name="app_license">Programari lliure Copyleft, licència GPLv3+</string>
-    <string name="app_resources">Recursos de tercers: <xliff:g id="app_resources_list">%s</xliff:g></string>
+    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Copyright © 2019–<xliff:g>%d</xliff:g> Sylvia van Os i contribuïdors</string>
+    <string name="app_copyright_short">Copyright © Sylvia van Os i contribuïdors</string>
+    <string name="app_license">Software lliure Copyleft, licència GPLv3+</string>
+    <string name="app_resources">Recursos lliures de tercers: <xliff:g id="app_resources_list">%s</xliff:g></string>
     <string name="thumbnailDescription">Miniatura</string>
     <string name="starImage">Estrella de preferides</string>
     <string name="settings">Configuració</string>
@@ -42,6 +42,10 @@
     <string name="leaveWithoutSaveConfirmation">Vols sortir sense grabar?</string>
     <string name="passwordRequired">Introdueixi el password</string>
     <string name="turn_flashlight_on">Encendre el llum flash</string>
+    <string name="settings_magenta_theme">Magenta</string>
+    <string name="settings_violet_theme">Violeta</string>
+    <string name="settings_blue_theme">Blau</string>
+    <string name="settings_green_theme">Verd</string>
     <string name="translate_platform">a la Pàgina Web</string>
     <string name="report_error">Informar un Error</string>
     <string name="archived">Targeta arxivada</string>
@@ -51,13 +55,13 @@
     <string name="add_manually_warning_title">Recomenem escanejar</string>
     <string name="add_manually_warning_message">En algunes targetes el valor imprès en la targeta no correspon amb el codi registrat en el codi de barres. Per això, introduint manualment el codi pot no funcionar en alguns casos. Recomanem sempre que sigui possible escanejar la targeta amb la càmera. Vol igualment continuar la edició manual?</string>
     <string name="continue_">Continuar</string>
-    <string name="exportOptionExplanation">La informació serà escrita al lloc de la seva elecció</string>
+    <string name="exportOptionExplanation">La informació serà escrita al lloc de la seva elecció.</string>
     <string name="importOptionFilesystemTitle">Importar desde el sistema de fitxers</string>
     <string name="importOptionFilesystemButton">Desde el sistema de fitxers</string>
-    <string name="selectBarcodeTitle">Selecciona el codi de barres</string>
+    <string name="selectBarcodeTitle">Sel•lecciona el Codi de Barres</string>
     <string name="importSuccessful">Dades importades correctament</string>
     <string name="exportSuccessful">Dades exportades correctament</string>
-    <string name="failedOpeningFileManager">No s\'ha pogut obrir el gestor de fitxers</string>
+    <string name="failedOpeningFileManager">Instala un gestor de fitxers.</string>
     <string name="showMoreInfo">Mostrar informació</string>
     <string name="version_history">Històric de versions</string>
     <string name="sort_by">Ordenar per</string>
@@ -68,8 +72,9 @@
         <item quantity="many"><xliff:g>%d</xliff:g> seleccionats</item>
         <item quantity="other"><xliff:g>%d</xliff:g> seleccionats</item>
     </plurals>
-    <string name="importOptionFilesystemExplanation">Escull un fitxer especific del sistema de fitxers</string>
+    <string name="importOptionFilesystemExplanation">Escull un fitxer especific del sistema de fitxers.</string>
     <string name="no">No</string>
+    <string name="settings_pink_theme">Rosa</string>
     <string name="sort">Ordenar</string>
     <string name="failedToRetrieveImageFile">Ha fallat l\'obtenció del fitxer d\'imatge</string>
     <string name="barcodeLongPressMessage">Les imatges només es poden obrir desde la app galeria</string>
@@ -91,8 +96,8 @@
     </plurals>
     <string name="importCancelled">Importació anulada</string>
     <string name="exportCancelled">Exportació cancelada</string>
-    <string name="noGiftCardsGroup">Crea algunes targetes i després asigna-les en al grup aquí</string>
-    <string name="noMatchingGiftCards">No hi ha resultats; prova de modificar la cerca.</string>
+    <string name="noGiftCardsGroup">Crea algunes targetes, asigna-les en un grup aquí.</string>
+    <string name="noMatchingGiftCards">Sense resultats. Prova a canviar la teva cerca.</string>
     <string name="storeName">Nom</string>
     <string name="note">Nota</string>
     <string name="cardId">Id. de la Targeta</string>
@@ -141,6 +146,7 @@
     <string name="settings_oled_dark">Negre pur en el tema fosc</string>
     <string name="selectColor">Sel•leccioni el color</string>
     <string name="setIcon">Setegi la miniatura</string>
+    <string name="settings_theme_color">Color del tema</string>
     <string name="app_contributors">Fet possible per: <xliff:g id="app_contributors">%s</xliff:g></string>
     <string name="updateBalance">Actualitzar el balanç</string>
     <string name="sort_by_name">Nom</string>
@@ -160,21 +166,23 @@
     <string name="deleteConfirmation">Vols eliminar de forma permanent aquesta targeta?</string>
     <string name="share">Compartir</string>
     <string name="sendLabel">Enviar…</string>
-    <string name="editCardTitle">Editar targeta</string>
-    <string name="addCardTitle">Afegir targeta</string>
-    <string name="scanCardBarcode">Escanejar codi de barres</string>
-    <string name="cardShortcut">Drecera a la targeta</string>
+    <string name="editCardTitle">Editar Targeta</string>
+    <string name="addCardTitle">Afegir Targeta</string>
+    <string name="scanCardBarcode">Escanejar Codi de Barres</string>
+    <string name="cardShortcut">Drecera a la Targeta</string>
     <string name="noCardsMessage">Afegeix primer una targeta</string>
     <string name="noCardExistsError">No s\'ha pogut trobar aquesta targeta</string>
-    <string name="failedParsingImportUriError">No s\'ha pogut analitzar l\'URI d\'importació</string>
+    <string name="failedParsingImportUriError">No s\'ha pogut analitzar la URI d\'importació</string>
     <string name="openFrontImageInGalleryApp">Obrir la imatge frontal a l\'app de galeria</string>
     <string name="settings_use_volume_keys_navigation_summary">Utilitza els botons de volum per canviar la targeta que es mostra</string>
     <string name="updateBarcodeQuestionText">Ha canviat el valor ID. Vol actualitzar també el codi de barres per uter utilitzar el mateix valor?</string>
+    <string name="settings_sky_blue_theme">Blau fluix</string>
     <string name="starred">Preferides</string>
     <string name="deleteConfirmationGroup">Vols eliminar aquest grup?</string>
     <string name="removeImage">Eliminar imatge</string>
-    <string name="app_libraries">Llibreries de tercers: <xliff:g id="app_libraries_list">%s</xliff:g></string>
+    <string name="app_libraries">Llibreries lliures de tercers: <xliff:g id="app_libraries_list">%s</xliff:g></string>
     <string name="settings_display_barcode_max_brightness">Màxima iluminació</string>
+    <string name="settings_brown_theme">Marró</string>
     <string name="manually_enter_barcode_instructions">Introdueixi el ID de la targeta manualment i trii un codi de barres que s\'assembli al de la seva targeta.</string>
     <string name="rate_this_app">Valora aquesta app</string>
     <string name="exportPasswordHint">Introdueixi el password</string>
@@ -219,7 +227,7 @@
     <string name="addFromPkpass">Seleccioni el fitxer Passbook (.pkpass)</string>
     <string name="unsupportedFile">Aquest fitxer no està soportat</string>
     <string name="settings_use_volume_keys_navigation">Canviar les targetes al prèmer els botons de volum</string>
-    <string name="noGroups">Feu clic al botó + més per aferir grups pre categoritzar</string>
+    <string name="noGroups">Clica el botó + per afegir grups per categoritzar.</string>
     <string name="noGroupCards">Aquest grup està buit</string>
     <string name="group_name_already_in_use">Ja existeix un grup amb aquest nom</string>
     <string name="group_updated">Grup actualitzat</string>
@@ -228,44 +236,6 @@
     <string name="turn_flashlight_off">Apagar el llum Flash</string>
     <string name="settings_oled_dark_summary">Redueix l\'ús de la bateria en pantalles OLED</string>
     <string name="settings_system_locale">Idioma del sistema</string>
+    <string name="settings_catima_theme">Catima</string>
     <string name="spend">Gastar</string>
-    <string name="importExportHelp">Fer una còpia de seguretat de les dades permet moure-les a un altre dispositiu</string>
-    <string name="importSuccessfulTitle">Importat</string>
-    <string name="importFailedTitle">La importació ha fallat</string>
-    <string name="importFailed">No s\'ha pogut realitzar la importació</string>
-    <string name="exportSuccessfulTitle">Exportat</string>
-    <string name="exportFailedTitle">L\'exportació ha fallat</string>
-    <string name="exportFailed">No s\'ha pogut realitzar l\'exportació</string>
-    <string name="importing">Important…</string>
-    <string name="exporting">Exportant…</string>
-    <string name="storageReadPermissionRequired">Cal permís per llegir l\'emmagatzematge per a aquesta acció…</string>
-    <string name="cameraPermissionRequired">Cal permís per accedir a la càmera per a aquesta acció…</string>
-    <string name="permissionReadCardsLabel">Legeix targetes Catima</string>
-    <string name="permissionReadCardsDescription">llegeix les teves targetes Catima i tots els seus detalls, incloses notes i imatges</string>
-    <string name="cameraPermissionDeniedTitle">No s\'ha pogut accedir a la càmera</string>
-    <string name="noCameraPermissionDirectToSystemSetting">Per escanejar codis de barres, Catima necessitarà accés a la teva càmera. Toca aquí per canviar la configuració dels permisos.</string>
-    <string name="about">Sobre</string>
-    <string name="app_copyright_old">Clauer basat en na Loyalty Card Keychain\ncopyright © 2016–2020 Branden Archer</string>
-    <string name="addManually">Introduïu el codi de barres manualment</string>
-    <string name="addFromImage">Seleccioneu una imatge de la galeria</string>
-    <string name="groupsList">Grups: <xliff:g>%s</xliff:g></string>
-    <string name="editGroup">Editeu el grup: <xliff:g>%s</xliff:g></string>
-    <string name="expiryStateSentence">Caduca el: <xliff:g>%s</xliff:g></string>
-    <string name="expiryStateSentenceExpired">Caducat el: <xliff:g>%s</xliff:g></string>
-    <plurals name="balancePoints">
-        <item quantity="one"><xliff:g>%s</xliff:g> punt</item>
-        <item quantity="many"><xliff:g>%s</xliff:g> punts</item>
-        <item quantity="other"/>
-    </plurals>
-    <string name="balanceSentence">Saldo: <xliff:g>%s</xliff:g></string>
-    <string name="card">Targeta</string>
-    <string name="editBarcode">Editeu el codi de barres</string>
-    <string name="expiryDate">Data de caducitat</string>
-    <string name="never">Mai</string>
-    <string name="chooseExpiryDate">Trieu la data de caducitat</string>
-    <string name="moveBarcodeToTopOfScreen">Moveu el codi de barres a la part superior de la pantalla</string>
-    <string name="noBarcodeFound">No s\'ha trobat cap codi de barres</string>
-    <string name="errorReadingImage">No s\'ha pogut llegir la imatge</string>
-    <string name="balance">Saldo</string>
-    <string name="app_loyalty_card_keychain">Loyalty Card Keychain</string>
 </resources>

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

@@ -83,6 +83,15 @@
     <string name="expiryStateSentence">Platí do: <xliff:g>%s</xliff:g></string>
     <string name="moveDown">Přesunout dolů</string>
     <string name="moveUp">Přesunout nahoru</string>
+    <string name="settings_brown_theme">Hnědá</string>
+    <string name="settings_green_theme">Zelená</string>
+    <string name="settings_sky_blue_theme">Azurová</string>
+    <string name="settings_blue_theme">Modrá</string>
+    <string name="settings_violet_theme">Fialová</string>
+    <string name="settings_magenta_theme">Purpurová</string>
+    <string name="settings_pink_theme">Růžová</string>
+    <string name="settings_catima_theme">Catima</string>
+    <string name="settings_theme_color">Barva motivu</string>
     <string name="settings_system_locale">Podle systému</string>
     <string name="settings_locale">Jazyk</string>
     <string name="turn_flashlight_off">Vypnout světlo</string>
@@ -302,9 +311,4 @@
     <string name="acra_crash_email_subject">Hlášení o pádu <xliff:g id="app_name">%s</xliff:g></string>
     <string name="pref_enable_acra">Ptát se na odesílání hlášení o pádech</string>
     <string name="pref_enable_acra_summary">Pokud je povoleno, budete při pádu aplikace dotázáni na jeho nahlášení. Hlášení nejsou nikdy odesílána automaticky.</string>
-    <string name="copy_value">Kopírovat hodnotu</string>
-    <string name="copied_to_clipboard">Zkopírováno do schránky</string>
-    <string name="nothing_to_copy">Nenalezena žádná hodnota</string>
-    <string name="barcodeEncoding">Kódování čárového kódu</string>
-    <string name="back">Zpět</string>
 </resources>

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

@@ -25,7 +25,7 @@
     <string name="note">Bemærk</string>
     <string name="storeName">Navn</string>
     <string name="noMatchingGiftCards">Ingen resultater. Prøv at ændre din søgning.</string>
-    <string name="noGiftCards">Klik på + plus-knappen for at tilføje et kort, eller importer kort fra ⋮ menuen</string>
+    <string name="noGiftCards">Klik på + plus-knappen for at tilføje et kort, eller importer kort fra ⋮ menuen.</string>
     <plurals name="selectedCardCount">
         <item quantity="one"><xliff:g>%d</xliff:g> valgt kort</item>
         <item quantity="other"><xliff:g>%d</xliff:g> valgte kort</item>

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

@@ -33,8 +33,8 @@
     <string name="exportFailed">Export konnte nicht durchgeführt werden</string>
     <string name="importing">Importiere…</string>
     <string name="exporting">Exportiere…</string>
-    <string name="importOptionFilesystemTitle">Import vom Dateisystem</string>
-    <string name="importOptionFilesystemExplanation">Wähle eine bestimmte Datei aus dem Dateisystem</string>
+    <string name="importOptionFilesystemTitle">Aus Dateisystem importieren</string>
+    <string name="importOptionFilesystemExplanation">Wähle eine bestimmte Datei aus dem Dateisystem aus</string>
     <string name="importOptionFilesystemButton">vom Dateisystem</string>
     <string name="about">Über</string>
     <string name="app_license">Freie Software, lizensiert unter der GPLv3+</string>
@@ -100,7 +100,7 @@
     <string name="importLoyaltyCardKeychain">Aus Loyalty Card Keychain importieren</string>
     <string name="importFidmeMessage">Wähle deinen „FidMe-Export“ zum Importieren und anschließend manuell die Barcodetypen aus.\nErstelle ihn aus deinem FidMe-Profil, indem du Datenschutz wählst und dann auf Meine Daten extrahieren drückst.</string>
     <string name="importFidme">Aus FidMe importieren</string>
-    <string name="importCatimaMessage">Wähle deinen „Catima-Export“ zum Importieren aus.\nExportiere diesen zuvor im Import/Export-Menü einer anderen Catima-Anwendung.</string>
+    <string name="importCatimaMessage">Wähle deinen „Catima-Export“ zum Importieren aus.\nErstelle diesen durch das Drücken auf Export im Import/Export-Menü in einer anderen Catima-Anwendung.</string>
     <string name="importCatima">Aus Catima importieren</string>
     <string name="setBarcodeId">Barcodewert festlegen</string>
     <string name="sameAsCardId">Entspricht Kartennummer</string>
@@ -144,6 +144,15 @@
     </plurals>
     <string name="settings_system_locale">System</string>
     <string name="settings_locale">Sprache</string>
+    <string name="settings_brown_theme">Braun</string>
+    <string name="settings_green_theme">Grün</string>
+    <string name="settings_sky_blue_theme">Himmelblau</string>
+    <string name="settings_blue_theme">Blau</string>
+    <string name="settings_violet_theme">Violett</string>
+    <string name="settings_magenta_theme">Magenta</string>
+    <string name="settings_pink_theme">Rosa</string>
+    <string name="settings_catima_theme">Catima</string>
+    <string name="settings_theme_color">Designfarbe</string>
     <string name="app_contributors">Ermöglicht durch: <xliff:g id="app_contributors">%s</xliff:g></string>
     <string name="barcodeImageDescriptionWithType">Bild <xliff:g>%s</xliff:g> Barcode</string>
     <string name="sort_by">Sortieren nach</string>
@@ -296,9 +305,4 @@
     <string name="acra_explain_crash">Wenn möglich, bitte übermittle mehr Details zu dem, was du hier getan hast:</string>
     <string name="acra_catima_has_crashed">Es tut uns leid, aber <xliff:g id="app_name">%s</xliff:g> ist abgestürzt. Bitte hilf uns diesen Fehler zu beheben und übermittle uns einen Absturzbericht.</string>
     <string name="pleaseDoNotRotateTheDevice">Bitte drehe nicht das Gerät, weil sonst die Aktion abbricht</string>
-    <string name="copy_value">Kopiere Betrag</string>
-    <string name="copied_to_clipboard">In die Zwischenablage kopiert</string>
-    <string name="nothing_to_copy">Keinen Betrag gefunden</string>
-    <string name="barcodeEncoding">Barcode-Kodierung</string>
-    <string name="back">Zurück</string>
 </resources>

app/src/main/res/values-el-rGR/strings.xml

@@ -137,6 +137,9 @@
     <string name="app_resources">Πηγές τρίτων: <xliff:g id="app_resources_list">%s</xliff:g></string>
     <string name="selectColor">Επιλογή χρώματος</string>
     <string name="setIcon">Ορισμός εικονιδίου</string>
+    <string name="settings_sky_blue_theme">Γαλάζιο</string>
+    <string name="settings_green_theme">Πράσινο</string>
+    <string name="settings_brown_theme">Καφέ</string>
     <string name="sort_by_expiry">Λήξη</string>
     <plurals name="groupCardCount">
         <item quantity="one"><xliff:g>%d</xliff:g> κάρτα</item>
@@ -184,6 +187,12 @@
     <string name="settings_locale">Γλώσσα</string>
     <string name="settings_oled_dark">Απόλυτο μαύρο φόντο για το μαύρο θέμα</string>
     <string name="settings_system_locale">Σύστημα</string>
+    <string name="settings_theme_color">Χρώμα θέματος</string>
+    <string name="settings_catima_theme">Κάτιμα</string>
+    <string name="settings_pink_theme">Ροζ</string>
+    <string name="settings_magenta_theme">Φούξια</string>
+    <string name="settings_violet_theme">Βιολετί</string>
+    <string name="settings_blue_theme">Μπλε</string>
     <string name="app_contributors">Δημιουργήθηκε από: <xliff:g id="app_contributors">%s</xliff:g></string>
     <string name="showMoreInfo">Εμφάνιση πληροφοριών</string>
     <string name="sort_by_name">Όνομα</string>
@@ -296,9 +305,4 @@
     <string name="acra_crash_email_subject">Αναφορά σφάλματος <xliff:g id="app_name">%s</xliff:g></string>
     <string name="pref_enable_acra">Ερώτηση για αποστολή αναφορών σφαλμάτων</string>
     <string name="pref_enable_acra_summary">Όταν είναι ενεργοποιημένη, θα σας ζητηθεί να αναφέρετε ένα σφάλμα όταν συμβεί. Οι αναφορές σφάλματος δεν αποστέλλονται ποτέ αυτόματα.</string>
-    <string name="copy_value">Αντιγραφή τιμής</string>
-    <string name="copied_to_clipboard">Αντιγράφηκε στο πρόχειρο</string>
-    <string name="nothing_to_copy">Δεν βρέθηκε τιμή</string>
-    <string name="barcodeEncoding">Κωδικοποίηση γραμμωτού κώδικα</string>
-    <string name="back">Πίσω</string>
 </resources>

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

@@ -74,7 +74,7 @@
     <string name="intent_import_card_from_url_share_text">Mi deziras dividi karto kun vi</string>
     <string name="exportSuccessful">Datumoj eksportitaj</string>
     <string name="noGroupCards">Ĉi tiu grupo estas malplena</string>
-    <string name="noGiftCards">Klavu la \"+\" butonon por aldoni karton, aŭ importu el la menuo \" ⋮\"</string>
+    <string name="noGiftCards">Klavu la \"+\" butonon por aldoni karton, aŭ importu el la menuo \" ⋮\".</string>
     <plurals name="selectedCardCount">
         <item quantity="one"><xliff:g>%d</xliff:g> elektita</item>
         <item quantity="other"><xliff:g>%d</xliff:g> elektitaj</item>
@@ -101,6 +101,7 @@
     <string name="balance">Saldo</string>
     <string name="moveBarcodeToTopOfScreen">Movi la strekodon al la supro de la ekrano</string>
     <string name="errorReadingImage">Ne eblis legi bildon</string>
+    <string name="settings_brown_theme">Bruna</string>
     <string name="showMoreInfo">Montri informojn</string>
     <string name="on_github">sur GitHub</string>
     <string name="archive">Enarkivigi</string>
@@ -126,6 +127,7 @@
     <string name="validFromDate">Valida ekde</string>
     <string name="accept">Akcepti</string>
     <string name="app_loyalty_card_keychain">Loyalty Card Keychain</string>
+    <string name="settings_sky_blue_theme">Ĉielblua</string>
     <string name="unarchive">Elarkivigi</string>
     <string name="switchToBarcode">Ŝanĝi al strikodo</string>
     <string name="currentBalanceSentence">Nuna saldo: <xliff:g>%s</xliff:g></string>
@@ -164,6 +166,7 @@
     <string name="balanceParsingFailed">Nevalida saldo</string>
     <string name="chooseImportType">Importi datumojn de</string>
     <string name="importCatima">Importi el Catima</string>
+    <string name="settings_green_theme">Verda</string>
     <string name="updateBalance">Ĝisdatigi saldon</string>
     <string name="barcodeLongPressMessage">Nur bildoj povas esti malfermitaj en la galeria apo</string>
     <string name="sort_by_name">Nomo</string>
@@ -222,6 +225,8 @@
     <string name="settings_oled_dark_summary">Malpligrandigas baterian uzadon sur OLED-ekranoj</string>
     <string name="selectColor">Elekti koloron</string>
     <string name="setIcon">Starigi bildeton</string>
+    <string name="settings_catima_theme">Catima</string>
+    <string name="settings_pink_theme">Rozkolora</string>
     <string name="field_must_not_be_empty">Kampo devas ne esti malplena</string>
     <string name="manually_enter_barcode_instructions">Entajpu la identigilon aŭ tekston sur via karto kaj premu la strikodon kiu aspektas kiel tiu sur via karto.</string>
     <string name="turn_flashlight_off">Malŝalti poŝlampon</string>
@@ -236,6 +241,7 @@
     <string name="wrongValueForBarcodeType">La valoro ne validas por la elektita tipo de strikodo</string>
     <string name="importCancelled">Importado nuligita</string>
     <string name="exportCancelled">Eksportado nuligita</string>
+    <string name="settings_theme_color">Koloro de la temo</string>
     <string name="app_libraries">Liberaj triaj bibliotekoj: <xliff:g id="app_libraries_list">%s</xliff:g></string>
     <string name="addFromPdfFile">Elekti PDF-dosieron</string>
     <string name="failedLaunchingFileManager">Subtenata dosiermastrumilo ne trovebla</string>
@@ -261,6 +267,9 @@
     <string name="importVoucherVault">Importi el Voucher Vault</string>
     <string name="turn_flashlight_on">Enŝalti poŝlampon</string>
     <string name="settings_locale">Lingvo</string>
+    <string name="settings_magenta_theme">Maĝenta</string>
+    <string name="settings_violet_theme">Viola</string>
+    <string name="settings_blue_theme">Blua</string>
     <string name="enter_card_id">Entajpu la identigilon aŭ tekston sur via karto</string>
     <string name="card_id_must_not_be_empty">Identigilo devas ne esti malplena</string>
     <string name="add_a_card_in_a_different_way">Aldoni karton alimaniere</string>

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

@@ -51,7 +51,7 @@
         <item quantity="many">Borrar estas <xliff:g>%d</xliff:g> tarjetas de forma permanente\?</item>
         <item quantity="other"/>
     </plurals>
-    <string name="failedOpeningFileManager">No se pudo abrir el explorador de archivos</string>
+    <string name="failedOpeningFileManager">Primero instale un administrador de archivos.</string>
     <string name="intent_import_card_from_url_share_multiple_text">Quiero compartirte algunas tarjetas</string>
     <string name="points">Puntos</string>
     <string name="balanceParsingFailed">Balance inválido</string>
@@ -169,7 +169,11 @@
     <string name="updateBarcodeQuestionText">Has cambiado el ID. ¿Quieres actualizar también el código de barras para usar el mismo valor?</string>
     <string name="settings_locale">Idioma</string>
     <string name="settings_system_locale">Sistema</string>
+    <string name="settings_catima_theme">Catima</string>
+    <string name="settings_pink_theme">Rosa</string>
     <string name="exportPassword">Configura una contraseña para proteger tu exportación (opcional)</string>
+    <string name="settings_sky_blue_theme">Celeste</string>
+    <string name="settings_green_theme">Verde</string>
     <string name="exportPasswordHint">Ingresar contraseña</string>
     <string name="setIcon">Establecer miniatura</string>
     <string name="showMoreInfo">Mostrar información</string>
@@ -180,7 +184,12 @@
     <string name="settings_oled_dark_summary">Reduce uso de batería en pantallas OLED</string>
     <string name="settings_oled_dark">Fondo negro puro para tema oscuro</string>
     <string name="selectColor">Seleccionar color</string>
+    <string name="settings_theme_color">Color del tema</string>
+    <string name="settings_magenta_theme">Magenta</string>
+    <string name="settings_violet_theme">Violeta</string>
+    <string name="settings_brown_theme">Marrón</string>
     <string name="sort">Ordenar</string>
+    <string name="settings_blue_theme">Azul</string>
     <string name="app_contributors">Hecho posible por: <xliff:g id="app_contributors">%s</xliff:g></string>
     <string name="barcodeLongPressMessage">Solo se puede abrir imágenes en la aplicación de galería</string>
     <string name="yes">Si</string>
@@ -197,34 +206,4 @@
     <string name="settings_use_volume_keys_navigation_summary">Usá los botones de volumen para cambiar la tarjeta que se muestra</string>
     <string name="cardWithNumberAndLocale">Tarjeta <xliff:g>%d</xliff:g> (<xliff:g>%s</xliff:g>)</string>
     <string name="cardWithNumber">Tarjeta <xliff:g>%d</xliff:g></string>
-    <string name="version_history">Historial de versiones</string>
-    <string name="credits">Créditos</string>
-    <string name="help_translate_this_app">Ayúdanos a traducir esta app</string>
-    <string name="license">Licencia</string>
-    <string name="on_github">en GitHub</string>
-    <string name="rate_this_app">Califica esta app</string>
-    <string name="on_google_play">en Google Play</string>
-    <string name="report_error">Reportar error</string>
-    <string name="translate_platform">en Weblate</string>
-    <string name="shortcutSelectCard">Selecciona una tarjeta</string>
-    <string name="options">Opciones</string>
-    <string name="duplicateCard">Duplicar</string>
-    <string name="archive">Archivo</string>
-    <string name="archived">Tarjeta archivada</string>
-    <string name="failedLaunchingPhotoPicker">No se pudo encontrar un selector de imagen soportado</string>
-    <string name="previousCard">Anterior</string>
-    <string name="nextCard">Siguiente</string>
-    <string name="failedToOpenUrl">Primero instala un navegador web</string>
-    <string name="welcome">Bienvenido/a a Catima</string>
-    <string name="importCards">Importar tarjetas</string>
-    <string name="updateBalanceHint">Ingrese monto</string>
-    <string name="validFromDate">Valido desde</string>
-    <string name="height">Altura</string>
-    <string name="donate">Donar</string>
-    <string name="icon_header_click_text">Manten presionado para editar la miniatura</string>
-    <string name="show_note">Mostrar nota</string>
-    <string name="back">Atrás</string>
-    <string name="source_repository">Fuente de repositorio</string>
-    <string name="and_data_usage">y uso de datos</string>
-    <string name="include_if_asking_support">Si queres solicitar soporte, incluya la siguiente información:</string>
 </resources>

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

@@ -10,7 +10,7 @@
     <string name="edit">Editar</string>
     <string name="delete">Eliminar</string>
     <string name="confirm">Confirmar</string>
-    <string name="ok">Aceptar</string>
+    <string name="ok">De acuerdo</string>
     <string name="sendLabel">Enviar…</string>
     <string name="editCardTitle">Editar tarjeta</string>
     <string name="addCardTitle">Añadir tarjeta</string>
@@ -134,7 +134,7 @@
         <item quantity="many"><xliff:g>%d</xliff:g> seleccionadas</item>
         <item quantity="other"><xliff:g>%d</xliff:g> seleccionadas</item>
     </plurals>
-    <string name="deleteTitle">Eliminar tarjeta</string>
+    <string name="deleteTitle">Eliminar la tarjeta</string>
     <string name="deleteConfirmation">¿Quiere eliminar permanentemente esta tarjeta\?</string>
     <plurals name="deleteCardsConfirmation">
         <item quantity="one">¿Borrar esta tarjeta <xliff:g>%d</xliff:g> permanentemente\?</item>
@@ -147,6 +147,15 @@
         <item quantity="other">Borrar <xliff:g>%d</xliff:g> tarjetas</item>
     </plurals>
     <string name="app_contributors">Hecho posible por: <xliff:g id="app_contributors">%s</xliff:g></string>
+    <string name="settings_brown_theme">Marrón</string>
+    <string name="settings_green_theme">Verde</string>
+    <string name="settings_sky_blue_theme">Azul cielo</string>
+    <string name="settings_blue_theme">Azul</string>
+    <string name="settings_violet_theme">Violeta</string>
+    <string name="settings_magenta_theme">Magenta</string>
+    <string name="settings_pink_theme">Rosa</string>
+    <string name="settings_theme_color">Color del tema</string>
+    <string name="settings_catima_theme">Catima</string>
     <string name="settings_system_locale">Sistema</string>
     <string name="settings_locale">Idioma</string>
     <string name="noGroupCards">Este grupo está vacío</string>
@@ -223,7 +232,7 @@
     <string name="height">Alto</string>
     <string name="switchToFrontImage">Cambiar a imagen frontal</string>
     <string name="openFrontImageInGalleryApp">Abrir imagen frontal en la aplicación de la galería</string>
-    <string name="openBackImageInGalleryApp">Abrir imagen trasera en la aplicación de visor de imagen</string>
+    <string name="openBackImageInGalleryApp">Abrir imagen trasera en la aplicación de la galería</string>
     <string name="setBarcodeHeight">Ajustar la altura del código de barras</string>
     <string name="donate">Donar</string>
     <string name="switchToBarcode">Cambiar a código de barras</string>
@@ -259,7 +268,7 @@
     <string name="app_name">Catima</string>
     <string name="continue_">Continuar</string>
     <string name="add_manually_warning_title">Se recomienda escanear</string>
-    <string name="add_manually_warning_message">En algunas tarjetas, el valor del código de barras difiere del número escrito en la tarjeta. Por este motivo, introducir manualmente puede que no siempre funcione. Se recomienda analizar el código de barras con su cámara en su lugar. ¿Aún desea continuar?</string>
+    <string name="add_manually_warning_message">En algunas tiendas, el valor del código de barras difiere del número escrito en la tarjeta. Por este motivo, es posible que la introducción manual del código de barras no siempre funcione. Se recomienda encarecidamente escanear el código de barras con la cámara. ¿Aún desea continuar?</string>
     <string name="spend">Gastar</string>
     <string name="receive">Recibió</string>
     <string name="amountParsingFailed">Importe incorrecto</string>
@@ -296,15 +305,4 @@
     <string name="card_list_widget_empty">Después de añadir algunas tarjetas de fidelidad en Catima, aparecerán aquí. Si tienes tarjetas, asegúrate de que no estén archivadas.</string>
     <string name="cardWithNumber">Tarjeta <xliff:g>%d</xliff:g></string>
     <string name="cardWithNumberAndLocale">Tarjeta <xliff:g>%d</xliff:g> (<xliff:g>%s</xliff:g>)</string>
-    <string name="pleaseDoNotRotateTheDevice">Por favor, no rote el dispositivo, ya que esto cancelará la acción</string>
-    <string name="acra_catima_has_crashed">Lo sentimos, pero <xliff:g id="app_name">%s</xliff:g> ha fallado. Por favor, ayúdenos a resolver esta incidencia enviándonos un reporte del error.</string>
-    <string name="acra_explain_crash">Si es posible, por favor añada más detalles sobre lo que estaba haciendo aquí:</string>
-    <string name="acra_crash_email_subject">Reporte del fallo <xliff:g id="app_name">%s</xliff:g></string>
-    <string name="pref_enable_acra">Solicitar envío de reportes de fallos</string>
-    <string name="pref_enable_acra_summary">Cuando está activado, se le pedirá que informe sobre un fallo cuando ocurra. Los informes de fallo nunca se envían automáticamente.</string>
-    <string name="copy_value">Copia valor</string>
-    <string name="copied_to_clipboard">Copiado al portapapeles</string>
-    <string name="nothing_to_copy">Ningún valor encontrado</string>
-    <string name="barcodeEncoding">Codificación de barra de código</string>
-    <string name="back">Atrás</string>
 </resources>

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

@@ -118,6 +118,8 @@
     <string name="updateBarcodeQuestionTitle">Kas uuendame triipkoodi väärtust?</string>
     <string name="yes">Jah</string>
     <string name="no">Ei</string>
+    <string name="settings_theme_color">Kujunduse värv</string>
+    <string name="settings_pink_theme">Roosa</string>
     <string name="barcodeLongPressMessage">Galeriirakenduses saad avada vaid pilte</string>
     <string name="sort_by_most_recently_used">Viimati kasutatud</string>
     <string name="sort_by_expiry">Aegumine</string>
@@ -199,6 +201,13 @@
     <string name="settings_system_locale">Süsteemi keel</string>
     <string name="selectColor">Vali värv</string>
     <string name="setIcon">Lisa pisipilt</string>
+    <string name="settings_catima_theme">Catima</string>
+    <string name="settings_magenta_theme">Fuksiapunane</string>
+    <string name="settings_violet_theme">Punakassinine</string>
+    <string name="settings_blue_theme">Sinine</string>
+    <string name="settings_sky_blue_theme">Taevasinine</string>
+    <string name="settings_green_theme">Roheline</string>
+    <string name="settings_brown_theme">Pruun</string>
     <string name="app_contributors">Seda rakendust on aidanud teha: <xliff:g id="app_contributors">%s</xliff:g></string>
     <string name="sort">Järjesta</string>
     <string name="updateBalance">Uuenda maksejääki</string>
@@ -296,9 +305,4 @@
     <string name="acra_crash_email_subject">Kokkujooksmise aruanne: <xliff:g id="app_name">%s</xliff:g></string>
     <string name="pref_enable_acra">Küsi luba kokkujooksmiste aruannete saatmiseks</string>
     <string name="pref_enable_acra_summary">Kui eelistus on kasutusel, siis rakendus küsib sinult luba veateate saatmiseks. Seda ei tehta iialgi automaatselt.</string>
-    <string name="copy_value">Kopeeri väärtus</string>
-    <string name="copied_to_clipboard">Kopeeritud lõikelauale</string>
-    <string name="nothing_to_copy">Ühtegi väärtust ei leidu</string>
-    <string name="barcodeEncoding">Triipkoodi kodeerimine</string>
-    <string name="back">Tagasi</string>
 </resources>

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

@@ -36,7 +36,7 @@
     <string name="scanCardBarcode">اسکن بارکد</string>
     <string name="cardShortcut">میان‌بر کارت</string>
     <string name="noCardsMessage">ابتدا یک کارت بیافزایید</string>
-    <string name="noCardExistsError">آن کارت پیدا نشد</string>
+    <string name="noCardExistsError">کارت پیدا نشد</string>
     <string name="importFailedTitle">ایمپورت ناموفق بود</string>
     <string name="importFailed">نمیتوان ایمپورت کرد</string>
     <string name="exportSuccessfulTitle">خروجی گرفته شده</string>
@@ -68,7 +68,7 @@
     <string name="permissionReadCardsDescription">کارت های کاتیما و تمام جزئیاتشان از جمله یادداشت‌ها و عکس‌ها را بخوانید</string>
     <string name="cameraPermissionDeniedTitle">نمیتوان به دوربین دسترسی پیدا کرد</string>
     <string name="noCameraPermissionDirectToSystemSetting">برای اسکن بارکد ها، کاتیما نیاز دارد به دوربین شما دسترسی داشته باشد. اینجا بزنید تا تنظیمات دسترسی خود را تغییر دهید.</string>
-    <string name="importExport">واردات/صادرات</string>
+    <string name="importExport">ایمپورت/خروجی گرفتن</string>
     <string name="settings_category_title_privacy">حریم شخصی</string>
     <string name="settings_category_title_general">عمومی</string>
     <string name="settings_category_title_cards">نمایش کارت</string>
@@ -117,8 +117,8 @@
     <string name="importCatimaMessage">فایل <i>catima.zip</i> خروجی خود را از Catima برای وارد کردن انتخاب کنید.\nآن را از منوی وارد/صادر کردن در یک اپلیکیشن دیگر Catima با فشردن دکمه صادرکردن ابتدا ایجاد کنید.</string>
     <string name="unsupportedBarcodeType">این نوع بارکد هنوز نمی‌تواند نمایش داده شود. ممکن است در نسخه آینده برنامه پشتیبانی شود.</string>
     <plurals name="balancePoints">
-        <item quantity="one"><xliff:g>%s</xliff:g> نقطه</item>
-        <item quantity="other"><xliff:g>%s</xliff:g> نقطه</item>
+        <item quantity="one"><xliff:g>%s</xliff:g> امتیاز</item>
+        <item quantity="other"><xliff:g>%s</xliff:g> امتیاز</item>
     </plurals>
     <string name="importFidmeMessage">فایل خروجی <i>fidme-export-request-xxxxxx.zip</i> خود را از FidMe برای وارد کردن انتخاب کنید، و سپس نوع بارکدها را به صورت دستی مشخص کنید.\nآن را از پروفایل FidMe خود با انتخاب گزینه حفاظت از داده و سپس فشار دادن گزینه استخراج داده من ابتدا ایجاد کنید.</string>
     <string name="leaveWithoutSaveTitle">خروج</string>
@@ -180,6 +180,7 @@
     <string name="height">ارتفاع</string>
     <string name="add_manually_warning_message">برای برخی از فروشگاه‌ها، مقدار بارکد با عدد نوشته شده روی کارت متفاوت است. به همین دلیل، وارد کردن دستی بارکد ممکن است همیشه کار نکند. اکیداً توصیه می‌شود که به جای آن، بارکد را با دوربین خود اسکن کنید. آیا هنوز می‌خواهید ادامه دهید؟</string>
     <string name="generic_error_please_retry">ببخشید، مشکلی پیش آمده، لطفا دوباره امتحان کنید...</string>
+    <string name="settings_magenta_theme">سرخابی</string>
     <string name="welcome">یه کتیما خوش آمدید</string>
     <string name="chooseValidFromDate">مقداری درست از تاریخ برگزینید</string>
     <string name="intent_import_card_from_url_share_multiple_text">می‌خواهم چند کارت به شما بدهم</string>
@@ -197,8 +198,15 @@
     <string name="settings_oled_dark">پس‌زمینه‌ی یک‌دست سیاه برای حالت تاریک</string>
     <string name="settings_oled_dark_summary">استفاده‌ی باتری را برای نمایشگرهای OLED کاهش می‌دهد</string>
     <string name="setIcon">قالب پیش‌نمایه را بگمارید</string>
+    <string name="settings_theme_color">رنگ زمینه</string>
+    <string name="settings_catima_theme">کتیما</string>
     <string name="settings_system_locale">سیستم</string>
     <string name="selectColor">رنگ را برگزینید</string>
+    <string name="settings_violet_theme">بنفش</string>
+    <string name="settings_blue_theme">آبی</string>
+    <string name="settings_sky_blue_theme">آبی آسمانی</string>
+    <string name="settings_green_theme">سبز</string>
+    <string name="settings_brown_theme">قهوه‌ای</string>
     <string name="app_contributors">با کمک او ممکن شد: <xliff:g id="app_contributors">%s</xliff:g></string>
     <string name="sort">مرتب‌کردن</string>
     <string name="showMoreInfo">نمایش اطلاعات</string>
@@ -212,6 +220,7 @@
     <string name="passwordRequired">لطفا گذرواژه را وارد کنید</string>
     <string name="previousCard">پیشین</string>
     <string name="turn_flashlight_off">چراغ‌قوه را خاموش کنید</string>
+    <string name="settings_pink_theme">صورتی</string>
     <string name="updateBalance">به‌روزرسانی موجودی</string>
     <string name="barcodeLongPressMessage">تنها عکس می‌تواند در گالری برنامه باز شود</string>
     <string name="sort_by_name">نام</string>
@@ -285,5 +294,4 @@
     <string name="spend">خرج کردن</string>
     <string name="addFromPkpass">یک فایل دفترچه حساب (.pkpass) انتخاب کنید</string>
     <string name="noCameraFoundGuideText">به نظر نمی‌رسد دستگاه شما دوربین داشته باشد. اگر دارد، دستگاه را مجدداً راه‌اندازی کنید. در غیر این صورت، از دکمه گزینه‌های بیشتر در زیر برای افزودن بارکد به روش دیگری استفاده کنید.</string>
-    <string name="card_list_widget_empty">بعد از اینکه چند کارت وفاداری در کاتیما اضافه کردید، آنها اینجا ظاهر می‌شوند. اگر کارت دارید، مطمئن شوید که همه آنها بایگانی نشده‌اند.</string>
 </resources>

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

@@ -147,6 +147,15 @@
     <string name="turn_flashlight_on">Käytä taskulamppua</string>
     <string name="turn_flashlight_off">Sammuta salamavalo</string>
     <string name="app_contributors">Mahdollistanut: <xliff:g id="app_contributors">%s</xliff:g></string>
+    <string name="settings_brown_theme">Ruskea</string>
+    <string name="settings_green_theme">Vihreä</string>
+    <string name="settings_sky_blue_theme">Taivaansininen</string>
+    <string name="settings_blue_theme">Siniset</string>
+    <string name="settings_violet_theme">Violetti</string>
+    <string name="settings_magenta_theme">Magenta</string>
+    <string name="settings_pink_theme">Pinkki</string>
+    <string name="settings_theme_color">Teeman väri</string>
+    <string name="settings_catima_theme">Catima</string>
     <string name="settings_system_locale">Järjestelmä</string>
     <string name="settings_locale">Kieli</string>
     <string name="noGroupCards">Tämä ryhmä on tyhjä</string>

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

@@ -15,16 +15,4 @@
         <item quantity="one"><xliff:g>%d</xliff:g> napili</item>
         <item quantity="other"><xliff:g>%d</xliff:g> ang napili</item>
     </plurals>
-    <string name="star">Sa card viewing, ang text ay naka-display lamang tuwing naka-long press ang star icon</string>
-    <string name="cancel">I-kansela</string>
-    <string name="save">I-save</string>
-    <string name="edit">I-edit</string>
-    <string name="delete">I-delete</string>
-    <string name="confirm">I-confirm</string>
-    <string name="share">I-share</string>
-    <string name="sendLabel">I-send…</string>
-    <string name="editCardTitle">I-edit ang card</string>
-    <string name="noCardsMessage">Mag-add ng card muna</string>
-    <string name="noCardExistsError">Hindi mahanap ang card</string>
-    <string name="exportName">I-export</string>
 </resources>

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

@@ -147,6 +147,15 @@
     </plurals>
     <string name="settings_system_locale">Système</string>
     <string name="settings_locale">Langue</string>
+    <string name="settings_brown_theme">Marron</string>
+    <string name="settings_green_theme">Vert</string>
+    <string name="settings_sky_blue_theme">Bleu ciel</string>
+    <string name="settings_blue_theme">Bleu</string>
+    <string name="settings_violet_theme">Violet</string>
+    <string name="settings_magenta_theme">Magenta</string>
+    <string name="settings_pink_theme">Rose</string>
+    <string name="settings_catima_theme">Catima</string>
+    <string name="settings_theme_color">Couleur du thème</string>
     <string name="app_contributors">Rendu possible par : <xliff:g id="app_contributors">%s</xliff:g></string>
     <string name="noGroupCards">Ce groupe est vide</string>
     <string name="barcodeImageDescriptionWithType">Image <xliff:g>%s</xliff:g> code-barres</string>
@@ -302,9 +311,4 @@
     <string name="acra_crash_email_subject">Rapport de plantage de <xliff:g id="app_name">%s</xliff:g></string>
     <string name="pref_enable_acra">Demander pour envoyer des rapports de plantage</string>
     <string name="pref_enable_acra_summary">Quand activé, il vous sera demandé d\'envoyer un rapport de plantage en cas de plantage. Les rapports de plantage ne sont jamais envoyés automatiquement.</string>
-    <string name="copy_value">Copier la valeur</string>
-    <string name="copied_to_clipboard">Copié dans le presse-papier</string>
-    <string name="nothing_to_copy">Aucune valeur trouvée</string>
-    <string name="barcodeEncoding">Encodage du code-barres</string>
-    <string name="back">Retour</string>
 </resources>

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

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

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

@@ -145,6 +145,14 @@
     <string name="settings_oled_dark_summary">Diminúe o uso da batería nas pantallas OLED</string>
     <string name="settings_system_locale">Sistema</string>
     <string name="selectColor">Elixir cor</string>
+    <string name="settings_theme_color">Cor do decorado</string>
+    <string name="settings_catima_theme">Catima</string>
+    <string name="settings_pink_theme">Rosa</string>
+    <string name="settings_magenta_theme">Maxenta</string>
+    <string name="settings_violet_theme">Violeta</string>
+    <string name="settings_sky_blue_theme">Azul celeste</string>
+    <string name="settings_green_theme">Verde</string>
+    <string name="settings_brown_theme">Marrón</string>
     <string name="app_contributors">Creada grazas a: <xliff:g id="app_contributors">%s</xliff:g></string>
     <string name="sort">Orde</string>
     <string name="showMoreInfo">Ver info</string>
@@ -261,6 +269,7 @@
     <string name="deleteConfirmationGroup">Eliminar grupo?</string>
     <string name="failedOpeningFileManager">Non puido abrir un xestor de ficheiros</string>
     <string name="settings_locale">Idioma</string>
+    <string name="settings_blue_theme">Azul</string>
     <string name="passwordRequired">Escribe o contrasinal</string>
     <string name="exportPassword">Establece un contrasinal para protexer a exportación (optativo)</string>
     <string name="exportPasswordHint">Escribe o contrasinal</string>
@@ -295,7 +304,4 @@
     <string name="acra_crash_email_subject">Informe do fallo de <xliff:g id="app_name">%s</xliff:g></string>
     <string name="pref_enable_acra">Solicitar informar sobre os fallos</string>
     <string name="pref_enable_acra_summary">Se está activo, váiseche pedir informar sobre os fallos cando acontezan. Os informes nunca se envían automaticamente.</string>
-    <string name="copy_value">Copiar valor</string>
-    <string name="copied_to_clipboard">Copiado ao portapapeis</string>
-    <string name="nothing_to_copy">Non hai ningún valor</string>
 </resources>

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

@@ -170,19 +170,28 @@
     <string name="action_more_options">अधिक विकल्प</string>
     <string name="frontImageDescription">सामने की छवि</string>
     <string name="anyDate">कोई दिन</string>
+    <string name="settings_green_theme">हरा</string>
+    <string name="settings_pink_theme">गुलाबी</string>
     <string name="action_display_options">प्रदर्शन विकल्प</string>
     <string name="settings_category_title_cards">कार्ड</string>
     <string name="addWithoutBarcode">बिना बारकोड वाला कार्ड जोड़ें</string>
     <string name="on_google_play">गूगल प्ले पर</string>
     <string name="report_error">गलती की रिपोर्ट करें</string>
     <string name="passwordRequired">कृपया पासवर्ड दर्ज करें</string>
+    <string name="settings_brown_theme">भूरा</string>
     <string name="field_must_not_be_empty">फ़ील्ड खाली नहीं होनी चाहिए</string>
+    <string name="settings_catima_theme">कैटिमा</string>
     <string name="options">विकल्प</string>
+    <string name="settings_magenta_theme">मैजेंटा</string>
     <string name="failedGeneratingShareURL">साझा करने योग्य URL जनरेट नहीं किया जा सकता. कृपया इसकी रिपोर्ट करें</string>
     <string name="sort_by_most_recently_used">सबसे हाल ही में उपयोग किया गया</string>
+    <string name="settings_theme_color">थीम का रंग</string>
+    <string name="settings_sky_blue_theme">आसमानी नीला (हल्का नीला)</string>
     <string name="updateBalanceHint">राशि डालें</string>
     <string name="on_github">गिटहब पर</string>
     <string name="donate">दान करें /भेंट दें</string>
+    <string name="settings_violet_theme">बैंगनी</string>
+    <string name="settings_blue_theme">नीला</string>
     <string name="shortcutSelectCard">एक कार्ड चुनें</string>
     <string name="settings_category_title_privacy">गोपनीयता</string>
     <string name="show_balance">शेष राशि दिखाएं</string>
@@ -289,13 +298,4 @@
     <string name="card_list_widget_empty">कैटिमा में कुछ लॉयल्टी कार्ड जोड़ने के बाद, वे यहाँ दिखाई देंगे। अगर आपके पास कार्ड हैं, तो सुनिश्चित करें कि वे सभी संग्रहित न हों।</string>
     <string name="cardWithNumber">कार्ड <xliff:g>%d</xliff:g></string>
     <string name="cardWithNumberAndLocale">कार्ड <xliff:g>%d</xliff:g> (<xliff:g>%s</xliff:g>)</string>
-    <string name="pleaseDoNotRotateTheDevice">कृपया डिवाइस को घुमाएँ नहीं, क्योंकि इससे कार्रवाई रद्द हो जाएगी</string>
-    <string name="acra_catima_has_crashed">हमें खेद है, लेकिन <xliff:g id="app_name">%s</xliff:g> क्रैश हो गया है। कृपया हमें एक त्रुटि रिपोर्ट भेजकर इस समस्या को ठीक करने में हमारी सहायता करें।</string>
-    <string name="acra_explain_crash">यदि संभव हो तो कृपया यहां आप क्या कर रहे थे, इसके बारे में अधिक विवरण जोड़ें:</string>
-    <string name="acra_crash_email_subject"><xliff:g id="app_name">%s</xliff:g> क्रैश रिपोर्ट</string>
-    <string name="pref_enable_acra">दुर्घटना रिपोर्ट भेजने के लिए कहें</string>
-    <string name="pref_enable_acra_summary">सक्षम होने पर, क्रैश होने पर आपको रिपोर्ट करने के लिए कहा जाएगा। क्रैश रिपोर्ट कभी भी स्वचालित रूप से नहीं भेजी जाती हैं।</string>
-    <string name="copy_value">मान कॉपी करें</string>
-    <string name="copied_to_clipboard">क्लिपबोर्ड पर कॉपी किया गया</string>
-    <string name="nothing_to_copy">कोई मूल्य नहीं मिला</string>
 </resources>

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

@@ -88,6 +88,8 @@
     <string name="importCards">Uvezi kartice</string>
     <string name="selectColor">Odaberi boju</string>
     <string name="setIcon">Postavi sličicu</string>
+    <string name="settings_catima_theme">Catima</string>
+    <string name="settings_green_theme">Zelena</string>
     <string name="sort_by_expiry">Istek</string>
     <string name="barcodeImageDescriptionWithType">Slika vrste crtičnog koda <xliff:g>%s</xliff:g></string>
     <string name="importLoyaltyCardKeychain">Uvezi iz Loyalty Card Keychain</string>
@@ -97,6 +99,9 @@
     <string name="failedGeneratingShareURL">Nije bilo moguće generirati URL za dijeljenje</string>
     <string name="turn_flashlight_off">Isključi bljeskalicu</string>
     <string name="settings_locale">Jezik</string>
+    <string name="settings_magenta_theme">Magenta</string>
+    <string name="settings_violet_theme">Ljubičasta</string>
+    <string name="settings_sky_blue_theme">Nebesko plava</string>
     <string name="sort">Razvrstaj</string>
     <string name="updateBalance">Aktualiziraj saldo</string>
     <string name="sort_by">Razvrstaj po</string>
@@ -157,6 +162,8 @@
     <string name="balanceSentence">Saldo: <xliff:g>%s</xliff:g></string>
     <string name="importFidmeMessage">Odaberi tvoj izvoz iz FidMe za uvoz i ručno odaberi vste crtičnog koda nakon toga. \nStvori ga putem tvog FidMe profila biranjem „Zaštita podataka” a zatim pritisni „Dekomprimiraj moje podatke”.</string>
     <string name="importVoucherVaultMessage">Odaberi tvoj izvoz iz Voucher Vault za uvoz. \nStvori ga u aplikaciji Voucher Vault pritiskom na „Izvoz”.</string>
+    <string name="settings_pink_theme">Ružičasta</string>
+    <string name="settings_blue_theme">Plava</string>
     <string name="failedToRetrieveImageFile">Neuspjelo dohvaćanje slikovne datoteke</string>
     <string name="license">Licenca</string>
     <string name="barcodeLongPressMessage">U aplikaciji galerije se mogu otvoriiti samo slike</string>
@@ -216,6 +223,8 @@
     <string name="passwordRequired">Upiši lozinku</string>
     <string name="exportPassword">Postavi lozinku za zaštitu tvog izvoza (opcionalno)</string>
     <string name="settings_oled_dark">Potpuno crna pozadina za tamnu temu</string>
+    <string name="settings_theme_color">Boja teme</string>
+    <string name="settings_brown_theme">Smeđa</string>
     <string name="app_contributors">Doprinositelji: <xliff:g id="app_contributors">%s</xliff:g></string>
     <string name="showMoreInfo">Prikaži informacije</string>
     <string name="sort_by_name">Ime</string>

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

@@ -52,11 +52,14 @@
     <string name="noCardExistsError">A kártya nem található</string>
     <string name="importVoucherVault">Importálás a Voucher Vaultból</string>
     <string name="wrongValueForBarcodeType">Ez az érték meg megfelelő a kiválasztott vonalkódtípushoz</string>
+    <string name="settings_green_theme">Zöld</string>
     <string name="setBackImage">Hátlapi kép beállítása</string>
     <string name="no">Nem</string>
     <string name="passwordRequired">Adja meg a jelszót</string>
+    <string name="settings_catima_theme">Catima</string>
     <string name="exportPasswordHint">Kód beírása</string>
     <string name="failedGeneratingShareURL">Nem lehetett megosztható webcímet előállítani. Kérjük, ezt jelentse.</string>
+    <string name="settings_theme_color">Téma színe</string>
     <string name="sort">Rendezés</string>
     <string name="on_google_play">a Google Playen</string>
     <string name="and_data_usage">és adathasználat</string>
@@ -143,6 +146,12 @@
     <string name="settings_system_locale">Rendszer</string>
     <string name="selectColor">Szín kiválasztása</string>
     <string name="setIcon">Miniatűr beállítása</string>
+    <string name="settings_pink_theme">Rózsaszín</string>
+    <string name="settings_magenta_theme">Bíbor</string>
+    <string name="settings_violet_theme">Ibolya</string>
+    <string name="settings_blue_theme">Kék</string>
+    <string name="settings_sky_blue_theme">Égszínkék</string>
+    <string name="settings_brown_theme">Barna</string>
     <string name="app_contributors">Lehetővé tették: <xliff:g id="app_contributors">%s</xliff:g></string>
     <string name="showMoreInfo">Információk megjelenítése</string>
     <string name="reverse">…fordított sorrendben</string>

app/src/main/res/values-in-rID/strings.xml

@@ -19,7 +19,7 @@
     <string name="license">Lisensi</string>
     <string name="settings">Pengaturan</string>
     <string name="settings_system_theme">Sistem</string>
-    <string name="selectBarcodeTitle">Pilih barcode</string>
+    <string name="selectBarcodeTitle">Pilih Barcode</string>
     <string name="deleteConfirmation">Hapus kartu ini secara permanen?</string>
     <string name="ok">OK</string>
     <string name="share">Bagikan</string>
@@ -27,7 +27,7 @@
     <string name="addCardTitle">Tambah Kartu</string>
     <string name="scanCardBarcode">Pindai Barcode</string>
     <string name="cancel">Batalkan</string>
-    <string name="importExport">Impor/ekspor</string>
+    <string name="importExport">Impor/Ekspor</string>
     <string name="settings_theme">Tema</string>
     <string name="all">Semua</string>
     <string name="leaveWithoutSaveTitle">Keluar</string>
@@ -46,10 +46,19 @@
     <string name="setBarcodeId">Tentukan nilai barcode</string>
     <string name="photos">Foto</string>
     <string name="setFrontImage">Atur gambar bagian depan</string>
-    <string name="report_error">Laporkan kesalahan</string>
+    <string name="report_error">Lapor Kesalahan</string>
     <string name="rate_this_app">Beri nilai pada aplikasi ini</string>
     <string name="sort_by_expiry">Masa berlaku</string>
-    <string name="sort_by_most_recently_used">Yang paling baru digunakan</string>
+    <string name="sort_by_most_recently_used">Paling banyak digunakan</string>
+    <string name="settings_catima_theme">Catima</string>
+    <string name="settings_pink_theme">Merah Muda</string>
+    <string name="settings_blue_theme">Biru</string>
+    <string name="settings_green_theme">Hijau</string>
+    <string name="settings_sky_blue_theme">Biru Langit</string>
+    <string name="settings_brown_theme">Cokelat</string>
+    <string name="settings_violet_theme">Ungu</string>
+    <string name="settings_magenta_theme">Magenta</string>
+    <string name="settings_theme_color">Warna tema</string>
     <string name="settings_system_locale">Sistem</string>
     <string name="settings_locale">Bahasa</string>
     <string name="turn_flashlight_on">Hidupkan lampu flash</string>
@@ -78,9 +87,9 @@
     <string name="exportFailed">Tidak dapat mengekspor</string>
     <string name="importing">Sedang mengimpor…</string>
     <string name="exporting">Sedang mengekspor…</string>
-    <string name="exportOptionExplanation">Data akan ditulis ke lokasi yang Anda pilih</string>
+    <string name="exportOptionExplanation">Data akan ditulis ke lokasi pilihan Anda.</string>
     <string name="importOptionFilesystemTitle">Impor dari pengelola file bawaan</string>
-    <string name="importOptionFilesystemExplanation">Pilih berkas tertentu dari sistem berkas</string>
+    <string name="importOptionFilesystemExplanation">Pilih file dari pengelola file bawaan.</string>
     <string name="importOptionFilesystemButton">Dari pengelola file bawaan</string>
     <string name="about">Tentang</string>
     <string name="app_copyright_fmt">Hak Cipta © 2019–<xliff:g>%d</xliff:g> Sylvia van Os dan para kontributor</string>
@@ -89,8 +98,8 @@
     <string name="app_license">Perangkat lunak bebas copyleft, berlisensi GPLv3+</string>
     <string name="about_title_fmt">Tentang <xliff:g id="app_name">%s</xliff:g></string>
     <string name="debug_version_fmt">Versi: <xliff:g id="version">%s</xliff:g></string>
-    <string name="app_libraries">Perpustakaan pihak ketiga: <xliff:g id="app_libraries_list">%s</xliff:g></string>
-    <string name="app_resources">Sumber daya pihak ketiga: <xliff:g id="app_resources_list">%s</xliff:g></string>
+    <string name="app_libraries">Pustaka pihak ketiga gratis: <xliff:g id="app_libraries_list">%s</xliff:g></string>
+    <string name="app_resources">Sumber daya pihak ketiga gratis: <xliff:g id="app_resources_list">%s</xliff:g></string>
     <string name="thumbnailDescription">Gambar tampilan</string>
     <string name="starImage">Favorit</string>
     <string name="settings_light_theme">Terang</string>
@@ -103,10 +112,10 @@
     <string name="exportSuccessful">Data terekspor</string>
     <string name="enter_group_name">Masukan nama grup</string>
     <string name="groups">Grup</string>
-    <string name="noGroups">Klik tombol + untuk menambahkan grup untuk pengelompokan</string>
+    <string name="noGroups">Klik pada tombol tambah + untuk menambahkan grup untuk pengkategorian.</string>
     <string name="noGroupCards">Grup ini kosong</string>
     <string name="deleteConfirmationGroup">Hapus grup?</string>
-    <string name="failedOpeningFileManager">Gagal membuka pengelola berkas</string>
+    <string name="failedOpeningFileManager">Pasang aplikasi pengelola berkas terlebih dahulu.</string>
     <string name="moveUp">Pindah ke atas</string>
     <string name="moveDown">Pindah ke bawah</string>
     <string name="leaveWithoutSaveConfirmation">Keluar tanpa menyimpan?</string>
@@ -123,32 +132,36 @@
     <string name="points">Poin</string>
     <string name="app_loyalty_card_keychain">Gantungan kunci kartu kesetiaan</string>
     <string name="privacy_policy">Kebijakan Privasi</string>
-    <string name="importCatimaMessage">Pilih ekspor Anda dari Catima untuk diimpor.\nBuatlah dari menu Impor/Ekspor aplikasi Catima lainnya dengan menekan Ekspor.</string>
-    <string name="importFidmeMessage">Pilih ekspor Anda dari FidMe untuk diimpor, lalu pilih jenis barcode secara manual setelahnya.\nBuatlah dari profil FidMe Anda dengan memilih Data Protection, lalu tekan Extract my data.</string>
+    <string name="importCatimaMessage">Pilih ekspor <i>catima.zip</i> Anda dari Catima untuk diimpor.
+\nBuat dari menu Impor/Ekspor aplikasi Catima lain dengan menekan Ekspor di sana terlebih dahulu.</string>
+    <string name="importFidmeMessage">Pilih ekspor <i>fidme-export-request-xxxxxx.zip</i> Anda dari FidMe untuk diimpor, dan pilih jenis barcode secara manual setelahnya.
+\nBuat dari profil FidMe Anda dengan memilih Perlindungan Data lalu tekan Ekstrak data saya terlebih dahulu.</string>
     <string name="importLoyaltyCardKeychain">Impor dari Loyalty Card Keychain</string>
-    <string name="importLoyaltyCardKeychainMessage">Pilih ekspor Anda dari Loyalty Card Keychain untuk diimpor.\nBuatlah dari menu Impor/Ekspor di Loyalty Card Keychain dengan menekan Ekspor.</string>
+    <string name="importLoyaltyCardKeychainMessage">Pilih ekspor <i>LoyaltyCardKeychain.csv</i> Anda dari Loyalty Card Keychain untuk diimpor.
+\nBuat dari menu Import/Export di Loyalty Card Keychain dengan menekan Export terlebih dahulu.</string>
     <string name="importVoucherVault">Impor dari Voucher Vault</string>
-    <string name="importVoucherVaultMessage">Pilih ekspor Anda dari Voucher Vault untuk diimpor.\nBuatlah dengan menekan tombol Ekspor di Voucher Vault.</string>
+    <string name="importVoucherVaultMessage">Pilih ekspor <i>vouchervault.json</i> Anda dari Voucher Vault untuk diimpor.
+\nBuat dengan menekan Ekspor di Voucher Vault terlebih dahulu.</string>
     <string name="unsupportedBarcodeType">Jenis barcode ini belum dapat ditampilkan. Ini mungkin didukung di versi aplikasi yang lebih baru.</string>
-    <string name="wrongValueForBarcodeType">Nilai tersebut tidak valid untuk jenis barcode yang dipilih</string>
+    <string name="wrongValueForBarcodeType">Nilai tidak berlaku untuk jenis barcode yang dipilih</string>
     <string name="frontImageDescription">Gambar depan</string>
     <string name="backImageDescription">Gambar belakang</string>
     <string name="updateBarcodeQuestionTitle">Perbarui barcode?</string>
     <string name="updateBarcodeQuestionText">Anda mengubah ID. Apakah Anda juga ingin memperbarui barcode untuk menggunakan nilai yang sama\?</string>
-    <string name="passwordRequired">Masukkan kata sandi</string>
+    <string name="passwordRequired">Silahkan masukan kata sandi</string>
     <string name="exportPassword">Tetapkan kata sandi untuk melindungi ekspor anda (opsional)</string>
-    <string name="failedGeneratingShareURL">Tidak dapat menghasilkan URL yang dapat dibagikan</string>
+    <string name="failedGeneratingShareURL">Tidak dapat membuat alamat berbagi. Mohon laporkan ini.</string>
     <string name="app_contributors">Pengembangan dibantu oleh: <xliff:g id="app_contributors">%s</xliff:g></string>
     <string name="reverse">…dalam urutan terbalik</string>
-    <string name="version_history">Riwayat versi</string>
+    <string name="version_history">Riwayat Versi</string>
     <string name="help_translate_this_app">Bantu terjemahkan aplikasi ini</string>
-    <string name="source_repository">Repositori sumber</string>
+    <string name="source_repository">Sumber Repositori</string>
     <string name="on_github">di GitHub</string>
     <string name="and_data_usage">dan penggunaan data</string>
     <string name="on_google_play">di Google Play</string>
     <string name="cardShortcut">Pintasan Kartu</string>
     <string name="barcodeImageDescriptionWithType">Gambar <xliff:g>%s</xliff:g> barcode</string>
-    <string name="importExportHelp">Membackup data Anda memungkinkan Anda memindahkan data tersebut ke perangkat lain</string>
+    <string name="importExportHelp">Mencadangkan data anda akan memungkinkan memindahkannya ke perangkat lain.</string>
     <plurals name="selectedCardCount">
         <item quantity="other"><xliff:g>%d</xliff:g> kartu dipilih</item>
     </plurals>
@@ -161,7 +174,7 @@
     <plurals name="deleteCardsTitle">
         <item quantity="other">Hapus <xliff:g>%d</xliff:g> kartu</item>
     </plurals>
-    <string name="editGroup">Kelompok pengeditan: <xliff:g>%s</xliff:g></string>
+    <string name="editGroup">Menyunting Grup: <xliff:g>%s</xliff:g></string>
     <string name="selectColor">Pilih warna</string>
     <string name="noGiftCardsGroup">Buat beberapa kartu, kemudian masukkan mereka ke grup di sini</string>
     <string name="group_name_already_in_use">Nama grup telah dipakai</string>
@@ -176,7 +189,7 @@
     <string name="translate_platform">di Weblate</string>
     <string name="welcome">Selamat datang di Catima</string>
     <string name="failedToOpenUrl">Install browser web terlebih dahulu</string>
-    <string name="failedLaunchingPhotoPicker">Tidak dapat menemukan pemilih gambar yang didukung</string>
+    <string name="failedLaunchingPhotoPicker">Tidak dapat menemukan aplikasi galeri yang didukung</string>
     <string name="previousCard">Sebelumnya</string>
     <string name="nextCard">Berikutnya</string>
     <plurals name="balancePoints">
@@ -212,8 +225,8 @@
     <string name="switchToFrontImage">Ubah ke depan gambar</string>
     <string name="switchToBackImage">Ubah ke belakang gambar</string>
     <string name="switchToBarcode">Ubah ke kode batang</string>
-    <string name="openFrontImageInGalleryApp">Buka gambar depan di aplikasi penampil gambar</string>
-    <string name="openBackImageInGalleryApp">Buka gambar di aplikasi penampil gambar</string>
+    <string name="openFrontImageInGalleryApp">Buka gambar didepan di galeri app</string>
+    <string name="openBackImageInGalleryApp">Buka gambar dibelakang di galeri app</string>
     <string name="setBarcodeHeight">Atur tinggi kode batang</string>
     <string name="donate">Donasi</string>
     <string name="show_validity">Tunjukkan validitas</string>
@@ -221,7 +234,7 @@
     <string name="icon_header_click_text">Tekan lama untuk mengedit thumbnail</string>
     <string name="show_name_below_image_thumbnail">Tampilkan nama di bawah thumbnail gambar</string>
     <string name="show_note">Tampilkan catatan</string>
-    <string name="permissionReadCardsLabel">Bacalah kartu Catima</string>
+    <string name="permissionReadCardsLabel">Baca Kartu Catima</string>
     <string name="permissionReadCardsDescription">baca kartu Anda dan semua detailnya, termasuk catatan dan gambar</string>
     <string name="settings_allow_content_provider_read_title">Izinkan aplikasi lain mengakses data saya</string>
     <string name="settings_allow_content_provider_read_summary">Aplikasi masih harus meminta izin untuk diberikan akses</string>
@@ -247,15 +260,15 @@
     <string name="app_name">Catima</string>
     <string name="add_manually_warning_title">Pemindaian sangat dianjurkan</string>
     <string name="continue_">Lanjut</string>
-    <string name="failedLaunchingFileManager">Tidak dapat menemukan pengelola berkas yang didukung</string>
-    <string name="errorReadingFile">Tidak dapat membaca berkas</string>
+    <string name="failedLaunchingFileManager">Tidak dapat menemukan pengelola file yang didukung</string>
+    <string name="errorReadingFile">Tidak dapat membaca file</string>
     <string name="addFromPdfFile">Pilih file PDF</string>
     <string name="multipleBarcodesFoundPleaseChooseOne">Barcode mana yang ingin Anda gunakan?</string>
     <string name="pageWithNumber">Halaman <xliff:g>%d</xliff:g></string>
     <string name="spend">Dibelanjakan</string>
     <string name="receive">Terima</string>
     <string name="amountParsingFailed">Jumlah tidak valid</string>
-    <string name="add_manually_warning_message">Untuk beberapa kartu, nilai barcode berbeda dengan angka yang tertulis di kartu. Karena itu, memasukkan barcode secara manual mungkin tidak selalu berhasil. Disarankan untuk memindai barcode menggunakan kamera Anda. Apakah Anda tetap ingin melanjutkan?</string>
+    <string name="add_manually_warning_message">Untuk beberapa toko, nilai barcode berbeda dengan nomor yang tertulis di kartu. Oleh karena itu, memasukkan barcode secara manual mungkin tidak selalu berhasil. Sangat disarankan untuk memindai barcode dengan kamera anda. Apakah anda masih ingin melanjutkan?</string>
     <string name="noCameraFoundGuideText">Perangkat Anda sepertinya tidak memiliki kamera. Jika iya, coba mulai ulang perangkat. Jika tidak, gunakan tombol Opsi lainnya di bawah untuk menambahkan barcode dengan cara lain.</string>
     <string name="importCancelled">Impor dibatalkan</string>
     <string name="exportCancelled">Ekspor dibatalkan</string>
@@ -276,20 +289,10 @@
     <string name="settings_column_count_5">5</string>
     <string name="addFromPkpass">Pilih file Buku Tabungan (.pkpass / .pkpasses)</string>
     <string name="unsupportedFile">File ini tidak didukung</string>
-    <string name="generic_error_please_retry">Terjadi kesalahan</string>
-    <string name="sort_by_valid_from">Berlaku mulai</string>
+    <string name="generic_error_please_retry">Maaf, terjadi kesalahan, silakan coba lagi...</string>
+    <string name="sort_by_valid_from">Berlaku dari</string>
     <string name="width">Lebar</string>
     <string name="card_list_widget_name">Daftar kartu</string>
-    <string name="setBarcodeWidth">Atur lebar barcode</string>
+    <string name="setBarcodeWidth">Atur Lebar Barcode</string>
     <string name="card_list_widget_empty">Setelah Anda menambahkan beberapa kartu loyalitas di Catima, kartu tersebut akan muncul di sini. Jika Anda memiliki kartu sebelumnya, pastikan tidak semuanya diarsipkan.</string>
-    <string name="cardWithNumber">Kartu <xliff:g>%d</xliff:g></string>
-    <string name="cardWithNumberAndLocale">Kartu <xliff:g>%d</xliff:g> (<xliff:g>%s</xliff:g>)</string>
-    <string name="pleaseDoNotRotateTheDevice">Jangan memutar perangkat, karena hal ini akan membatalkan tindakan</string>
-    <string name="acra_catima_has_crashed">Kami mohon maaf, tetapi <xliff:g id="app_name">%s</xliff:g> telah mengalami crash. Tolong bantu kami memperbaiki masalah ini dengan mengirimkan laporan kesalahan kepada kami.</string>
-    <string name="acra_explain_crash">Jika memungkinkan, tolong tambahkan detail lebih lanjut tentang apa yang Anda lakukan di sini:</string>
-    <string name="acra_crash_email_subject">Laporan crash <xliff:g id="app_name">%s</xliff:g></string>
-    <string name="pref_enable_acra">Minta untuk mengirimkan laporan crash</string>
-    <string name="pref_enable_acra_summary">Ketika diaktifkan, Anda akan diminta untuk melaporkan crash saat terjadi. Laporan crash tidak pernah dikirim secara otomatis.</string>
-    <string name="copy_value">Salin nilai</string>
-    <string name="copied_to_clipboard">Disalin ke papan klip</string>
 </resources>

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

@@ -76,7 +76,11 @@
         <item quantity="other"><xliff:g>%d</xliff:g> valin</item>
     </plurals>
     <string name="noGiftCardsGroup">Búðu til nokkur kort og settu þau síðan í hópinn hér.</string>
+    <string name="settings_brown_theme">Brún</string>
+    <string name="settings_green_theme">Grænn</string>
     <string name="sort">flokka</string>
     <string name="sort_by">flokka Eftir</string>
     <string name="nextCard">Næsta</string>
+    <string name="settings_blue_theme">Blár</string>
+    <string name="settings_sky_blue_theme">Himinblár</string>
 </resources>

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

@@ -2,7 +2,7 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" xmlns:tools="http://schemas.android.com/tools">
     <string name="action_search">Cerca</string>
     <string name="action_add">Aggiungi</string>
-    <string name="noGiftCards">Premi il pulsante + per aggiungere una carta oppure importala dal menù ⋮</string>
+    <string name="noGiftCards">Premi il pulsante + per aggiungere una carta oppure importala dal menù</string>
     <string name="noMatchingGiftCards">Nessun risultato. Prova a cambiare la tua ricerca.</string>
     <string name="storeName">Nome</string>
     <string name="note">Note</string>
@@ -17,14 +17,14 @@
     <string name="sendLabel">Invia…</string>
     <string name="editCardTitle">Modifica carta</string>
     <string name="addCardTitle">Aggiungi carta</string>
-    <string name="scanCardBarcode">Scansiona codice a barre</string>
-    <string name="cardShortcut">Scorciatoia carta</string>
+    <string name="scanCardBarcode">Scansiona il codice</string>
+    <string name="cardShortcut">Scorciatoia per la carta</string>
     <string name="noCardsMessage">Aggiungi prima una carta</string>
     <string name="noCardExistsError">Impossibile trovare quella carta</string>
-    <string name="failedParsingImportUriError">Impossibile processare l\'URI di importazione</string>
-    <string name="importExport">Importa/esporta</string>
+    <string name="failedParsingImportUriError">Impossibile analizzare l\'URI di importazione</string>
+    <string name="importExport">Importa/Esporta</string>
     <string name="exportName">Esporta</string>
-    <string name="importExportHelp">Il backup dei dati permette di spostarli su un altro dispositivo</string>
+    <string name="importExportHelp">Il backup dei dati permette di spostarli su un altro dispositivo.</string>
     <string name="importSuccessfulTitle">Importato</string>
     <string name="importFailedTitle">Importazione fallita</string>
     <string name="importFailed">Impossibile eseguire l\'importazione</string>
@@ -34,7 +34,7 @@
     <string name="importing">Importazione in corso…</string>
     <string name="exporting">Esportazione in corso…</string>
     <string name="importOptionFilesystemTitle">Importa dall\'archivio</string>
-    <string name="importOptionFilesystemExplanation">Scegli un file specifico dal filesystem</string>
+    <string name="importOptionFilesystemExplanation">Scegli un file dall\'archivio.</string>
     <string name="importOptionFilesystemButton">Dall\'archivio</string>
     <string name="about">Informazioni</string>
     <string name="app_license">Software libero con copyleft, licenza GPLv3+</string>
@@ -53,14 +53,14 @@
     <string name="importSuccessful">Dati importati</string>
     <string name="app_copyright_old">Basato su Loyalty Card Keychain
 \ncopyright © 2016–2020 Branden Archer</string>
-    <string name="exportOptionExplanation">I dati verranno scritti nella posizione da te scelta</string>
+    <string name="exportOptionExplanation">I dati verranno scritti in una posizione a tua scelta.</string>
     <string name="barcodeType">Tipo di codice a barre</string>
     <string name="unstar">Rimuovi dai preferiti</string>
     <string name="star">Aggiungi ai preferiti</string>
     <string name="starImage">Stella dei preferiti</string>
     <string name="deleteConfirmationGroup">Eliminare il gruppo\?</string>
     <string name="all">Tutti</string>
-    <string name="noGroups">Clicca sul pulsante + per aggiungere gruppi per la categorizzazione</string>
+    <string name="noGroups">Clicca sul pulsante + per aggiungere i gruppi per la categorizzazione.</string>
     <string name="groups">Gruppi</string>
     <string name="enter_group_name">Inserisci il nome del gruppo</string>
     <string name="groupsList">Gruppi: <xliff:g>%s</xliff:g></string>
@@ -69,7 +69,7 @@
     <string name="leaveWithoutSaveTitle">Esci</string>
     <string name="moveDown">Sposta in basso</string>
     <string name="moveUp">Sposta in alto</string>
-    <string name="failedOpeningFileManager">Impossibile aprire un gestore di file</string>
+    <string name="failedOpeningFileManager">Installa prima un gestore di file.</string>
     <string name="noBarcode">Nessun codice a barre</string>
     <plurals name="groupCardCount">
         <item quantity="one"><xliff:g>%d</xliff:g> carta</item>
@@ -94,13 +94,17 @@
     <string name="settings_disable_lockscreen_while_viewing_card">Impedisci il blocco dello schermo</string>
     <string name="accept">Accetta</string>
     <string name="privacy_policy">Informativa sulla riservatezza</string>
-    <string name="importVoucherVaultMessage">Seleziona il tuo file di esportazione da Voucher Vault per importarlo. \nCrealo premendo Esporta in Voucher Vault.</string>
+    <string name="importVoucherVaultMessage">Seleziona il tuo file di esportazione <i>vouchervault.json</i> da Voucher Vault per importarlo.
+\nCrealo premendo prima Esporta in Voucher Vault.</string>
     <string name="importVoucherVault">Importa da Voucher Vault</string>
-    <string name="importLoyaltyCardKeychainMessage">Seleziona il tuo file di esportazione da Loyalty Card Keychain per importarlo. \nCrealo dal menu Importa/Esporta in Loyalty Card Keychain premendo su Esporta.</string>
+    <string name="importLoyaltyCardKeychainMessage">Seleziona il tuo file di esportazione <i>LoyaltyCardKeychain.csv</i> da Loyalty Card Keychain per importarlo.
+\nCrealo dal menù Importa/Esporta in Loyalty Card Keychain premendo prima su Esporta.</string>
     <string name="importLoyaltyCardKeychain">Importa da Loyalty Card Keychain</string>
-    <string name="importFidmeMessage">Seleziona il tuo file di esportazione da FidMe per importarlo, dopodiché seleziona i tipi di codice a barre manualmente. \nPer crearlo, si fa dal tuo profilo FidMe scegliendo \"Data Protection\" e poi \"Extract my data\".</string>
+    <string name="importFidmeMessage">Seleziona il tuo file di esportazione <i>fidme-export-request-xxxxxx.zip</i> da FidMe per importare e seleziona successivamente i tipi di codice a barre manualmente.
+\nCrealo dal tuo profilo FidMe scegliendo Protezione Dati e poi premendo Estrai i miei dati prima.</string>
     <string name="importFidme">Importa da FidMe</string>
-    <string name="importCatimaMessage">Seleziona il file di esportazione per importarlo. \nSi può creare dal menu Importa/esporta di un\'altra applicazione Catima premendo su Esporta.</string>
+    <string name="importCatimaMessage">Seleziona il file di esportazione <i>catima.zip</i> per importarlo.
+\nCrealo dal menù Importa/Esporta di un\'altra applicazione Catima premendo prima Esporta.</string>
     <string name="importCatima">Importa da Catima</string>
     <string name="setBarcodeId">Imposta il valore del codice a barre</string>
     <string name="sameAsCardId">Uguale al codice</string>
@@ -110,8 +114,8 @@
     <string name="addFromImage">Seleziona un\'immagine dalla galleria</string>
     <string name="unsupportedBarcodeType">Questo tipo di codice a barre non può ancora essere visualizzato. Potrebbe essere supportato in una versione successiva dell\'applicazione.</string>
     <string name="wrongValueForBarcodeType">Il valore non è valido per il tipo di codice a barre selezionato</string>
-    <string name="app_resources">Risorse di terze parti: <xliff:g id="app_resources_list"> %s </xliff:g></string>
-    <string name="app_libraries">Librerie di terze parti: <xliff:g id="app_libraries_list"> %s </xliff:g></string>
+    <string name="app_resources">Risorse libere di terze parti: <xliff:g id="app_resources_list"> %s </xliff:g></string>
+    <string name="app_libraries">Librerie libere di terze parti: <xliff:g id="app_libraries_list"> %s </xliff:g></string>
     <string name="intent_import_card_from_url_share_multiple_text">Voglio condividere alcune carte con te</string>
     <string name="no">No</string>
     <string name="yes">Sì</string>
@@ -124,10 +128,10 @@
     <string name="photos">Foto</string>
     <string name="backImageDescription">Immagine posteriore</string>
     <string name="frontImageDescription">Immagine frontale</string>
-    <string name="passwordRequired">Inserire la password</string>
+    <string name="passwordRequired">Si prega di inserire la password</string>
     <string name="turn_flashlight_off">Spegni la torcia</string>
     <string name="turn_flashlight_on">Accendi la torcia</string>
-    <string name="failedGeneratingShareURL">Impossibile generare un URL da condividere</string>
+    <string name="failedGeneratingShareURL">Impossibile generare un URL condivisibile. Si prega di segnalarlo.</string>
     <plurals name="selectedCardCount">
         <item quantity="one"><xliff:g>%d</xliff:g> selezionata</item>
         <item quantity="many"><xliff:g>%d</xliff:g> selezionate</item>
@@ -147,17 +151,26 @@
     </plurals>
     <string name="settings_system_locale">Sistema</string>
     <string name="settings_locale">Lingua</string>
+    <string name="settings_brown_theme">Marrone</string>
+    <string name="settings_green_theme">Verde</string>
+    <string name="settings_sky_blue_theme">Azzurro</string>
+    <string name="settings_blue_theme">Blu</string>
+    <string name="settings_violet_theme">Viola</string>
+    <string name="settings_magenta_theme">Magenta</string>
+    <string name="settings_pink_theme">Rosa</string>
+    <string name="settings_catima_theme">Catima</string>
+    <string name="settings_theme_color">Colore del tema</string>
     <string name="app_contributors">Reso possibile da: <xliff:g id="app_contributors">%s</xliff:g></string>
     <string name="noGroupCards">Questo gruppo è vuoto</string>
     <string name="barcodeImageDescriptionWithType">Immagine del codice a barre in formato <xliff:g>%s</xliff:g></string>
     <string name="sort_by">Ordina per</string>
     <string name="reverse">…in ordine inverso</string>
     <string name="sort_by_expiry">Scadenza</string>
-    <string name="sort_by_most_recently_used">Le più recentemente utilizzate</string>
+    <string name="sort_by_most_recently_used">Usate più recentemente</string>
     <string name="sort_by_name">Nome</string>
     <string name="sort">Ordina</string>
     <string name="license">Licenza</string>
-    <string name="source_repository">Repository dei sorgenti</string>
+    <string name="source_repository">Repository del codice sorgente</string>
     <string name="on_github">su GitHub</string>
     <string name="exportPasswordHint">Inserisci la password</string>
     <string name="on_google_play">su Google Play</string>
@@ -170,7 +183,7 @@
     <string name="report_error">Segnala un errore</string>
     <string name="editGroup">Modifica del gruppo: <xliff:g>%s</xliff:g></string>
     <string name="group_name_is_empty">Il nome del gruppo non deve essere vuoto</string>
-    <string name="noGiftCardsGroup">Crea alcune carte e poi assegnale al gruppo qui</string>
+    <string name="noGiftCardsGroup">Crea alcune carte e poi assegnale al gruppo qui.</string>
     <string name="group_edit">Modifica il gruppo</string>
     <string name="group_name_already_in_use">Il nome del gruppo è già in uso</string>
     <string name="group_updated">Gruppo aggiornato</string>
@@ -193,7 +206,7 @@
     <string name="unarchive">Disarchivia</string>
     <string name="unarchived">Carta non archiviata</string>
     <string name="archived">Carta archiviata</string>
-    <string name="failedLaunchingPhotoPicker">Impossibile trovare un selettore di immagini supportato</string>
+    <string name="failedLaunchingPhotoPicker">Impossibile trovare un\'app galleria supportata</string>
     <plurals name="groupCardCountWithArchived">
         <item quantity="one"><xliff:g>%1$d</xliff:g> carta (<xliff:g id="archivedCount">%2$d</xliff:g> archiviata)</item>
         <item quantity="many"><xliff:g>%1$d</xliff:g> carte (<xliff:g id="archivedCount">%2$d</xliff:g> archiviate)</item>
@@ -205,7 +218,7 @@
     <string name="failedToOpenUrl">Installa prima un browser web</string>
     <string name="failedToRetrieveImageFile">Impossibile ottenere il file dell\'immagine</string>
     <string name="barcodeLongPressMessage">Si possono aprire solo immagini dell\'app della galleria</string>
-    <string name="cameraPermissionDeniedTitle">Impossibile accedere alla fotocamera</string>
+    <string name="cameraPermissionDeniedTitle">È impossibile accedere alla fotocamera</string>
     <string name="noCameraPermissionDirectToSystemSetting">Per poter scansionare i codici a barre, Catima ha bisogno di accedere alla tua fotocamera. Premi qui per poter cambiare le impostazioni dei permessi.</string>
     <string name="updateBalance">Aggiorna bilancio</string>
     <string name="updateBalanceTitle">Quanto hai speso o ricevuto?</string>
@@ -223,16 +236,16 @@
     <string name="switchToFrontImage">Passa all\'immagine frontale</string>
     <string name="switchToBackImage">Passa all\'immagine dietro</string>
     <string name="switchToBarcode">Passa al codice a barre</string>
-    <string name="openFrontImageInGalleryApp">Apri immagine frontale nell\'app per la visualizzazione di immagini</string>
+    <string name="openFrontImageInGalleryApp">Apri l\'immagine frontale nell\'app Galleria</string>
     <string name="donate">Dona</string>
-    <string name="openBackImageInGalleryApp">Apri l\'immagine retro nell\'app per la visualizzazione di immagini</string>
+    <string name="openBackImageInGalleryApp">Apri l\'immagine posteriore nell\'app Galleria</string>
     <string name="setBarcodeHeight">Imposta l\'altezza del codice a barre</string>
     <string name="icon_header_click_text">Premi a lungo per modificare l\'immagine</string>
     <string name="show_note">Mostra nota</string>
     <string name="show_balance">Mostra bilancio</string>
     <string name="show_validity">Mostra validità</string>
     <string name="show_name_below_image_thumbnail">Mostra il nome sotto l\'immagine</string>
-    <string name="permissionReadCardsLabel">Leggi Carte Catima</string>
+    <string name="permissionReadCardsLabel">Leggi le carte Catima</string>
     <string name="settings_allow_content_provider_read_summary">Le applicazioni dovranno comunque richiedere l\'autorizzazione per ottenere l\'accesso</string>
     <string name="settings_allow_content_provider_read_title">Consenti ad altre applicazioni di accedere ai miei dati</string>
     <string name="permissionReadCardsDescription">Leggere le sue carte e tutti i suoi dettagli, comprese le note e le immagini</string>
@@ -259,7 +272,7 @@
     <string name="app_name">Catima</string>
     <string name="add_manually_warning_title">Consigliata scansione</string>
     <string name="continue_">Successivo</string>
-    <string name="add_manually_warning_message">Per alcune carte, il valore del codice a barre differisce dal numero scritto sulla carta. Per questo motivo, l\'inserimento manuale del codice a barre potrebbe non funzionare sempre. Per questo motivo si consiglia di scansionare il codice a barre con la fotocamera. Vuoi procedere lo stesso?</string>
+    <string name="add_manually_warning_message">In alcuni negozi, il valore del codice a barre differisce dal numero scritto sulla carta. Per questo motivo, l\'inserimento manuale del codice a barre potrebbe non funzionare sempre. Si consiglia di scansionare il codice a barre con la fotocamera. Vuoi continuare lo stesso?</string>
     <string name="amountParsingFailed">Importo non valido</string>
     <string name="spend">Spendi</string>
     <string name="receive">Ricevi</string>
@@ -287,22 +300,11 @@
     <string name="settings_column_count_5">5</string>
     <string name="settings_category_title_cards_overview">Panoramica delle carte</string>
     <string name="unsupportedFile">Questo file non è supportato</string>
-    <string name="generic_error_please_retry">Rilevato un errore</string>
-    <string name="addFromPkpass">Seleziona un file Passbook (.pkpass/.pkpasses)</string>
+    <string name="generic_error_please_retry">Siamo spiacenti, qualcosa è andato storto, riprova...</string>
+    <string name="addFromPkpass">Seleziona un file Passbook (.pkpass)</string>
     <string name="sort_by_valid_from">Valido da</string>
-    <string name="setBarcodeWidth">Imposta larghezza del codice a barre</string>
+    <string name="setBarcodeWidth">Imposta la larghezza del codice a barre</string>
     <string name="width">Larghezza</string>
     <string name="card_list_widget_name">Lista delle carte</string>
     <string name="card_list_widget_empty">Dopo aver aggiunto alcune carte fedeltà in Catima, queste appariranno qui. Se hai delle carte, assicurati che non siano tutte archiviate.</string>
-    <string name="cardWithNumber">Carta <xliff:g>%d</xliff:g></string>
-    <string name="cardWithNumberAndLocale">Carta <xliff:g>%d</xliff:g> (<xliff:g>%s</xliff:g>)</string>
-    <string name="acra_crash_email_subject"><xliff:g id="app_name">%s</xliff:g> rapporto sull\'incidente</string>
-    <string name="pleaseDoNotRotateTheDevice">Si prega di non ruotare il dispositivo, perché così si annullerà l\'azione</string>
-    <string name="acra_catima_has_crashed">Siamo spiacenti, ma <xliff:g id="app_name">%s</xliff:g> si è interrotta. Aiutaci a risolvere questo problema inviandoci un resoconto dell\'errore.</string>
-    <string name="acra_explain_crash">Se possibile, si prega di aggiungere ulteriori dettagli su quello che si stava facendo:</string>
-    <string name="pref_enable_acra">Chiedi di inviare resoconti di interruzioni anomale</string>
-    <string name="pref_enable_acra_summary">Quando attivo, ti verrà chiesto di inviare un resoconto dell\'interruzione quando avviene. I resoconti non sono mai inviati automaticamente.</string>
-    <string name="copy_value">Copia valore</string>
-    <string name="copied_to_clipboard">Copiato negli appunti</string>
-    <string name="nothing_to_copy">Nessun valore trovato</string>
 </resources>

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

@@ -45,7 +45,7 @@
     <string name="enter_group_name">グループ名を入力</string>
     <string name="exportSuccessful">データがエクスポートされました</string>
     <string name="importSuccessful">データがインポートされました</string>
-    <string name="intent_import_card_from_url_share_text">カードを共有しましょう</string>
+    <string name="intent_import_card_from_url_share_text">カード共有をしましょう</string>
     <string name="settings_disable_lockscreen_while_viewing_card">バーコード表示中に画面をロックしない</string>
     <string name="settings_keep_screen_on">バーコード表示中に画面を点けたままにする</string>
     <string name="settings_display_barcode_max_brightness">画面を明るくする</string>
@@ -109,8 +109,8 @@
     <string name="action_add">追加</string>
     <string name="action_search">検索</string>
     <string name="intent_import_card_from_url_share_multiple_text">カードを共有しましょう</string>
-    <string name="turn_flashlight_off">ライトを消灯する</string>
-    <string name="turn_flashlight_on">ライトを点灯する</string>
+    <string name="turn_flashlight_off">ライトをオフにする</string>
+    <string name="turn_flashlight_on">ライトをオンにする</string>
     <string name="failedGeneratingShareURL">共有可能なURLを作成できませんでした</string>
     <string name="passwordRequired">パスワードを入力</string>
     <string name="no">いいえ</string>
@@ -119,11 +119,11 @@
     <string name="updateBarcodeQuestionTitle">バーコードの番号を変更しますか？</string>
     <string name="takePhoto">写真を撮影する</string>
     <string name="removeImage">画像を削除</string>
-    <string name="setBackImage">背面の画像を設定</string>
-    <string name="setFrontImage">前面の画像を設定</string>
+    <string name="setBackImage">裏面の画像を設定</string>
+    <string name="setFrontImage">表面の画像を設定</string>
     <string name="photos">画像</string>
-    <string name="backImageDescription">背面</string>
-    <string name="frontImageDescription">前面</string>
+    <string name="backImageDescription">裏</string>
+    <string name="frontImageDescription">表</string>
     <plurals name="selectedCardCount">
         <item quantity="other">選択済み: <xliff:g>%d</xliff:g> 枚</item>
     </plurals>
@@ -137,6 +137,15 @@
     </plurals>
     <string name="barcodeImageDescriptionWithType">バーコード形式の画像 <xliff:g>%s</xliff:g></string>
     <string name="app_contributors">Made possible by: <xliff:g id="app_contributors">%s</xliff:g></string>
+    <string name="settings_brown_theme">ブラウン/茶色</string>
+    <string name="settings_green_theme">グリーン/緑色</string>
+    <string name="settings_sky_blue_theme">スカイブルー/水色</string>
+    <string name="settings_blue_theme">ブルー/青色</string>
+    <string name="settings_violet_theme">バイオレット/菫色</string>
+    <string name="settings_magenta_theme">マゼンタ/赤紫色</string>
+    <string name="settings_pink_theme">ピンク/桃色</string>
+    <string name="settings_catima_theme">Catimaテーマ</string>
+    <string name="settings_theme_color">テーマカラー</string>
     <string name="settings_system_locale">システムに従う</string>
     <string name="settings_locale">言語</string>
     <string name="noGroupCards">このグループにはカードがありません</string>
@@ -289,9 +298,4 @@
     <string name="acra_crash_email_subject"><xliff:g id="app_name">%s</xliff:g> クラッシュレポート</string>
     <string name="pref_enable_acra">クラッシュレポートを送信する</string>
     <string name="pref_enable_acra_summary">有効にすると、クラッシュ発生時に報告するかを確認されます。クラッシュレポートが自動送信されることはありません。</string>
-    <string name="copy_value">値をコピー</string>
-    <string name="copied_to_clipboard">クリップボードへコピー</string>
-    <string name="nothing_to_copy">値が見つかりません</string>
-    <string name="barcodeEncoding">バーコードの符号化</string>
-    <string name="back">戻る</string>
 </resources>

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

@@ -16,7 +16,7 @@
     <string name="about">정보</string>
     <string name="exporting">내보내는 중…</string>
     <string name="importing">가져오는 중…</string>
-    <string name="importExportHelp">데이터를 백업하면 다른 장치로 이동할 수 있습니다</string>
+    <string name="importExportHelp">데이터를 백업하면 다른 장치로 이동할 수 있습니다.</string>
     <string name="exportName">내보내기</string>
     <string name="importExport">가져오기/내보내기</string>
     <string name="cardShortcut">카드 바로 가기</string>
@@ -41,7 +41,7 @@
     <string name="noGiftCards">+ 더하기 버튼을 클릭하여 카드를 추가하거나 ⋮ 메뉴에서 가져옵니다.</string>
     <string name="action_add">추가</string>
     <string name="action_search">검색</string>
-    <string name="importOptionFilesystemExplanation">파일 시스템에서 파일을 선택합니다</string>
+    <string name="importOptionFilesystemExplanation">파일 시스템에서 파일을 선택합니다.</string>
     <string name="importOptionFilesystemTitle">파일 시스템에서 가져오기</string>
     <string name="exportFailed">내보내기를 수행할 수 없습니다</string>
     <string name="exportFailedTitle">내보내기 실패</string>
@@ -51,8 +51,8 @@
     <string name="importSuccessfulTitle">가져오기 완료</string>
     <string name="storeName">이름</string>
     <string name="thumbnailDescription">썸네일</string>
-    <string name="failedParsingImportUriError">가져올 URI를 분석할 수 없습니다</string>
-    <string name="noCardExistsError">해당 카드를 찾을 수 없습니다</string>
+    <string name="failedParsingImportUriError">가져올 URI를 분석할 수 없음</string>
+    <string name="noCardExistsError">해당 카드를 찾을 수 없음</string>
     <string name="moveUp">위로 이동</string>
     <string name="leaveWithoutSaveTitle">종료</string>
     <string name="moveDown">아래로 이동</string>
@@ -63,7 +63,7 @@
     <plurals name="deleteCardsTitle">
         <item quantity="other">카드 <xliff:g>%d</xliff:g> 장 제거</item>
     </plurals>
-    <string name="noGiftCardsGroup">카드를 몇 장 만든 다음 이곳에서 그룹에 할당합니다</string>
+    <string name="noGiftCardsGroup">카드를 몇 장 만든 다음 여기에서 그룹에 할당합니다.</string>
     <string name="noCardsMessage">먼저 카드 추가</string>
     <string name="leaveWithoutSaveConfirmation">저장하지 않고 나가시겠습니까\?</string>
     <string name="intent_import_card_from_url_share_text">카드를 공유하고 싶습니다</string>
@@ -87,6 +87,12 @@
     <string name="settings_locale">언어</string>
     <string name="settings_system_locale">시스템</string>
     <string name="selectColor">색상 선택</string>
+    <string name="settings_theme_color">테마 색상</string>
+    <string name="settings_catima_theme">Catima</string>
+    <string name="settings_pink_theme">핑크색</string>
+    <string name="settings_magenta_theme">자홍색</string>
+    <string name="settings_violet_theme">보라색</string>
+    <string name="settings_blue_theme">파란색</string>
     <string name="app_contributors">기여자: <xliff:g id="app_contributors">%s</xliff:g></string>
     <string name="showMoreInfo">정보 보기</string>
     <string name="updateBalance">잔액 업데이트</string>
@@ -147,7 +153,7 @@
     </plurals>
     <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">저작권 © 2019–<xliff:g>%d</xliff:g> Sylvia van Os 및 기여자</string>
     <string name="noCameraPermissionDirectToSystemSetting">바코드를 스캔하려면 Catima가 카메라에 접근해야 합니다. 권한 설정을 변경하려면 여기를 탭하세요.</string>
-    <string name="exportOptionExplanation">데이터는 선택한 위치에 기록됩니다</string>
+    <string name="exportOptionExplanation">데이터는 선택한 위치에 기록됩니다.</string>
     <string name="app_license">GPL v3+로 라이선스된 카피레프트 자유 소프트웨어</string>
     <string name="failedOpeningFileManager">먼저 파일 관리자를 설치하십시오.</string>
     <string name="importSuccessful">데이터 들여옴</string>
@@ -192,7 +198,7 @@
     <string name="barcodeImageDescriptionWithType">이미지 <xliff:g>%s</xliff:g> 바코드</string>
     <string name="photos">사진</string>
     <string name="storageReadPermissionRequired">이 작업에 필요한 저장소를 읽을 수 있는 권한…</string>
-    <string name="app_libraries">서드파티 라이브러리: <xliff:g id="app_libraries_list">%s</xliff:g></string>
+    <string name="app_libraries">자유 타사 라이브러리: <xliff:g id="app_libraries_list">%s</xliff:g></string>
     <string name="cameraPermissionRequired">이 작업에 필요한 카메라 액세스 권한…</string>
     <string name="cameraPermissionDeniedTitle">카메라 접근 실패</string>
     <string name="importOptionFilesystemButton">파일 시스템에서</string>
@@ -222,6 +228,9 @@
     <string name="importVoucherVaultMessage">가져올 Voucher Vault에서 <i>vouchervault.json</i> 내보내기를 선택합니다.
 \n먼저 바우처 금고에서 내보내기를 눌러 생성하세요.</string>
     <string name="sameAsCardId">아이디와 동일</string>
+    <string name="settings_sky_blue_theme">하늘색</string>
+    <string name="settings_green_theme">초록색</string>
+    <string name="settings_brown_theme">갈색</string>
     <string name="previousCard">이전의</string>
     <string name="nextCard">다음</string>
     <string name="failedToOpenUrl">먼저 웹 브라우저를 설치하십시오</string>

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

@@ -152,6 +152,15 @@
     </plurals>
     <string name="settings_system_locale">Sistemos</string>
     <string name="settings_locale">Kalba</string>
+    <string name="settings_brown_theme">Ruda</string>
+    <string name="settings_green_theme">Žalia</string>
+    <string name="settings_sky_blue_theme">Dangaus mėlynumo</string>
+    <string name="settings_blue_theme">Mėlyna</string>
+    <string name="settings_violet_theme">Violetinė</string>
+    <string name="settings_magenta_theme">Rausvai raudona</string>
+    <string name="settings_pink_theme">Rožinė</string>
+    <string name="settings_catima_theme">Catima</string>
+    <string name="settings_theme_color">Temos spalva</string>
     <string name="app_contributors">Tapo įmanoma su pagalba: <xliff:g id="app_contributors">%s</xliff:g></string>
     <string name="noGroupCards">Grupėje yra tuščia</string>
     <string name="barcodeImageDescriptionWithType"><xliff:g>%s</xliff:g> brūkšninio kodo vaizdas</string>

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

@@ -76,16 +76,16 @@
     <string name="leaveWithoutSaveConfirmation">Iziet nesaglabājot\?</string>
     <string name="addFromImage">Atlasīt attēlu no galerijas</string>
     <string name="card">Karte</string>
-    <string name="expiryDate">Derīguma beigu datums</string>
+    <string name="expiryDate">Derīguma termiņš</string>
     <string name="never">Nekad</string>
     <string name="chooseExpiryDate">Izvēlēties beigu datumu</string>
     <string name="failedToRetrieveImageFile">Neizdevās iegūt attēla datni</string>
     <string name="barcodeLongPressMessage">Galerijas lietotnē var atvērt tikai attēlus</string>
-    <string name="sort_by_expiry">Derīgums</string>
+    <string name="sort_by_expiry">Derīguma termiņš</string>
     <string name="reverse">...apgrieztā secībā</string>
     <string name="credits">Pateicības</string>
     <string name="shortcutSelectCard">Atlasīt karti</string>
-    <string name="duplicateCard">Pavairot</string>
+    <string name="duplicateCard">Dublēt</string>
     <string name="archive">Arhivēt</string>
     <string name="translate_platform">Weblate</string>
     <string name="starred">Izlase</string>
@@ -96,8 +96,13 @@
         <item quantity="other">Neatgriezeniski dzēst šīs <xliff:g>%d</xliff:g> kartes\?</item>
     </plurals>
     <string name="about_title_fmt">Par <xliff:g id="app_name">%s</xliff:g></string>
-    <string name="expiryStateSentenceExpired">Derīgums beidzās: <xliff:g>%s</xliff:g></string>
+    <string name="expiryStateSentenceExpired">Derīguma termiņš beidzās: <xliff:g>%s</xliff:g></string>
     <string name="selectColor">Atlasīt krāsu</string>
+    <string name="settings_catima_theme">Catima</string>
+    <string name="settings_pink_theme">Rozā</string>
+    <string name="settings_magenta_theme">Purpura</string>
+    <string name="settings_sky_blue_theme">Gaiši zila</string>
+    <string name="settings_green_theme">Zaļa</string>
     <string name="sort_by_name">Nosaukums</string>
     <string name="on_google_play">pakalpojumā Google Play</string>
     <string name="report_error">Ziņot par kļūdu</string>
@@ -124,7 +129,7 @@
     <string name="source_repository">Pirmkoda glabātava</string>
     <string name="rate_this_app">Novērtēt šo lietotni</string>
     <string name="noGiftCardsGroup">Izveido kādas kartes, tad šeit pievieno tās kopai</string>
-    <string name="options">Iespējas</string>
+    <string name="options">Parametri</string>
     <plurals name="groupCardCount">
         <item quantity="zero"><xliff:g>%d</xliff:g> kartes</item>
         <item quantity="one"><xliff:g>%d</xliff:g> karte</item>
@@ -145,7 +150,8 @@
     <string name="privacy_policy">Privātuma politika</string>
     <string name="accept">Pieņemt</string>
     <string name="editGroup">Kopas labošana: <xliff:g>%s</xliff:g></string>
-    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Autortiesības © 2019–<xliff:g>%d</xliff:g> Sylvia van Os un līdzdalībnieki</string>
+    <string name="settings_brown_theme">Brūna</string>
+    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Autortiesības © 2019–<xliff:g>%d</xliff:g> Sylvia van Os</string>
     <string name="app_copyright_old">Balstīta uz Loyalty Card Keychain
 \nautortiesības © 2016–2020 Branden Archer</string>
     <string name="debug_version_fmt">Versija: <xliff:g id="version">%s</xliff:g></string>
@@ -159,7 +165,7 @@
     <string name="group_updated">Kopa atjaunināta</string>
     <string name="addManually">Pašrocīgi ievadīt svītrkodu</string>
     <string name="groupsList">Kopas: <xliff:g>%s</xliff:g></string>
-    <string name="expiryStateSentence">Derīgums beigsies: <xliff:g>%s</xliff:g></string>
+    <string name="expiryStateSentence">Derīguma termiņš: <xliff:g>%s</xliff:g></string>
     <string name="balanceSentence">Atlikums: <xliff:g>%s</xliff:g></string>
     <string name="editBarcode">Labot svītrkodu</string>
     <string name="importCatima">Ievietot no Catima</string>
@@ -176,15 +182,18 @@
     <string name="intent_import_card_from_url_share_multiple_text">Vēlos ar Tevi kopīgot dažas kartes</string>
     <string name="frontImageDescription">Priekšpuses attēls</string>
     <string name="backImageDescription">Aizmugures attēls</string>
-    <string name="photos">Fotoattēli</string>
+    <string name="photos">Foto</string>
     <string name="setFrontImage">Iestatīt priekšpuses attēlu</string>
     <string name="setBackImage">Iestatīt aizmugures attēlu</string>
-    <string name="takePhoto">Uzņemt attēlu</string>
+    <string name="takePhoto">Fotografēt</string>
     <string name="passwordRequired">Jāievada parole</string>
     <string name="exportPassword">Iestatīt paroli, lai aizsargātu savu izguves datni (pēc izvēles)</string>
     <string name="turn_flashlight_on">Ieslēgt zibspuldzi</string>
     <string name="settings_oled_dark">Tīri melns fons tumšajam izskatam</string>
     <string name="setIcon">Iestatīt sīktēlu</string>
+    <string name="settings_theme_color">Izskata krāsa</string>
+    <string name="settings_violet_theme">Violeta</string>
+    <string name="settings_blue_theme">Zila</string>
     <string name="sort">Kārtot</string>
     <string name="showMoreInfo">Rādīt informāciju</string>
     <string name="sort_by_most_recently_used">Visnesenāk izmantotās</string>
@@ -302,7 +311,4 @@
     <string name="acra_crash_email_subject"><xliff:g id="app_name">%s</xliff:g> avārijas ziņojums</string>
     <string name="pref_enable_acra">Vaicāt, lai nosūtītu ziņojumus par avārijām</string>
     <string name="pref_enable_acra_summary">Kad iespējots, tiks vaicāts ziņot par avāriju, kad tā notiek. Ziņojumi par avārijām nekad netiks automātiski nosūtīti.</string>
-    <string name="copy_value">Ievietot vērtību starpliktuvē</string>
-    <string name="copied_to_clipboard">Ievietots starpliktuvē</string>
-    <string name="nothing_to_copy">Nav atrasta vērtība</string>
 </resources>

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

@@ -146,7 +146,16 @@
     </plurals>
     <string name="settings_system_locale">System</string>
     <string name="settings_locale">Språk</string>
+    <string name="settings_violet_theme">Fiolett</string>
+    <string name="settings_magenta_theme">Magentarød</string>
     <string name="app_contributors">Muliggjort av: <xliff:g id="app_contributors">%s</xliff:g></string>
+    <string name="settings_brown_theme">Brun</string>
+    <string name="settings_green_theme">Grønn</string>
+    <string name="settings_sky_blue_theme">Himmelblå</string>
+    <string name="settings_blue_theme">Blå</string>
+    <string name="settings_pink_theme">Rosa</string>
+    <string name="settings_catima_theme">Catima</string>
+    <string name="settings_theme_color">Draktfarge</string>
     <string name="noGroupCards">Denne gruppen er tom</string>
     <string name="barcodeImageDescriptionWithType">Bilde av <xliff:g>%s</xliff:g>-strekkode</string>
     <string name="sort_by">Sortering</string>

app/src/main/res/values-night/themes.xml

@@ -1,4 +1,5 @@
 <resources>
+
     <style name="AppTheme" parent="Theme.Material3.Dark.NoActionBar">
         <item name="colorPrimary">@color/md_theme_dark_primary</item>
         <item name="colorOnPrimary">@color/md_theme_dark_onPrimary</item>
@@ -45,4 +46,208 @@
         <item name="android:colorBackground">#000000</item>
         <item name="colorSurface">#000000</item>
     </style>
+
+    <!-- color themes -->
+    <style name="pink">
+        <item name="colorPrimary">#FFB2C0</item>
+        <item name="colorOnPrimary">#670024</item>
+        <item name="colorPrimaryContainer">#900036</item>
+        <item name="colorOnPrimaryContainer">#FFD9DF</item>
+        <item name="colorSecondary">#E5BDC2</item>
+        <item name="colorOnSecondary">#43292D</item>
+        <item name="colorSecondaryContainer">#5C3F43</item>
+        <item name="colorOnSecondaryContainer">#FFD9DE</item>
+        <item name="colorTertiary">#EBBF90</item>
+        <item name="colorOnTertiary">#452B08</item>
+        <item name="colorTertiaryContainer">#5F411C</item>
+        <item name="colorOnTertiaryContainer">#FFDDB8</item>
+        <item name="colorError">#FFB4A9</item>
+        <item name="colorErrorContainer">#930006</item>
+        <item name="colorOnError">#680003</item>
+        <item name="colorOnErrorContainer">#FFDAD4</item>
+        <item name="android:colorBackground">#201A1B</item>
+        <item name="colorOnBackground">#ECE0E0</item>
+        <item name="colorSurface">#201A1B</item>
+        <item name="colorOnSurface">#ECE0E0</item>
+        <item name="colorSurfaceVariant">#524345</item>
+        <item name="colorOnSurfaceVariant">#D6C1C3</item>
+        <item name="colorOutline">#9F8C8E</item>
+        <item name="colorOnSurfaceInverse">#201A1B</item>
+        <item name="colorSurfaceInverse">#ECE0E0</item>
+        <item name="colorPrimaryInverse">#BC0049</item>
+    </style>
+
+    <style name="magenta">
+        <item name="colorPrimary">#FBAAFF</item>
+        <item name="colorOnPrimary">#570068</item>
+        <item name="colorPrimaryContainer">#7B0091</item>
+        <item name="colorOnPrimaryContainer">#FFD5FF</item>
+        <item name="colorSecondary">#D7BFD5</item>
+        <item name="colorOnSecondary">#3B2B3B</item>
+        <item name="colorSecondaryContainer">#534153</item>
+        <item name="colorOnSecondaryContainer">#F5DBF2</item>
+        <item name="colorTertiary">#F6B8AE</item>
+        <item name="colorOnTertiary">#4C251F</item>
+        <item name="colorTertiaryContainer">#663B34</item>
+        <item name="colorOnTertiaryContainer">#FFDAD2</item>
+        <item name="colorError">#FFB4A9</item>
+        <item name="colorErrorContainer">#930006</item>
+        <item name="colorOnError">#680003</item>
+        <item name="colorOnErrorContainer">#FFDAD4</item>
+        <item name="android:colorBackground">#1E1A1D</item>
+        <item name="colorOnBackground">#E9E0E5</item>
+        <item name="colorSurface">#1E1A1D</item>
+        <item name="colorOnSurface">#E9E0E5</item>
+        <item name="colorSurfaceVariant">#4D444C</item>
+        <item name="colorOnSurfaceVariant">#D0C3CC</item>
+        <item name="colorOutline">#998E96</item>
+        <item name="colorOnSurfaceInverse">#1E1A1D</item>
+        <item name="colorSurfaceInverse">#E9E0E5</item>
+        <item name="colorPrimaryInverse">#9A25AE</item>
+    </style>
+
+    <style name="violet">
+        <item name="colorPrimary">#D4BAFF</item>
+        <item name="colorOnPrimary">#3E008E</item>
+        <item name="colorPrimaryContainer">#5727A7</item>
+        <item name="colorOnPrimaryContainer">#ECDCFF</item>
+        <item name="colorSecondary">#CDC2DB</item>
+        <item name="colorOnSecondary">#342D41</item>
+        <item name="colorSecondaryContainer">#4B4358</item>
+        <item name="colorOnSecondaryContainer">#E9DEF7</item>
+        <item name="colorTertiary">#F0B8C5</item>
+        <item name="colorOnTertiary">#4A2530</item>
+        <item name="colorTertiaryContainer">#643A46</item>
+        <item name="colorOnTertiaryContainer">#FFD9E2</item>
+        <item name="colorError">#FFB4A9</item>
+        <item name="colorErrorContainer">#930006</item>
+        <item name="colorOnError">#680003</item>
+        <item name="colorOnErrorContainer">#FFDAD4</item>
+        <item name="android:colorBackground">#1D1B1F</item>
+        <item name="colorOnBackground">#E6E1E5</item>
+        <item name="colorSurface">#1D1B1F</item>
+        <item name="colorOnSurface">#E6E1E5</item>
+        <item name="colorSurfaceVariant">#49454E</item>
+        <item name="colorOnSurfaceVariant">#CBC4CF</item>
+        <item name="colorOutline">#948E99</item>
+        <item name="colorOnSurfaceInverse">#1D1B1F</item>
+        <item name="colorSurfaceInverse">#E6E1E5</item>
+        <item name="colorPrimaryInverse">#6F43BF</item>
+    </style>
+
+    <style name="blue">
+        <item name="colorPrimary">#B9C3FF</item>
+        <item name="colorOnPrimary">#08218A</item>
+        <item name="colorPrimaryContainer">#293CA0</item>
+        <item name="colorOnPrimaryContainer">#DDE0FF</item>
+        <item name="colorSecondary">#C4C5DD</item>
+        <item name="colorOnSecondary">#2D2F42</item>
+        <item name="colorSecondaryContainer">#43465A</item>
+        <item name="colorOnSecondaryContainer">#E0E1FA</item>
+        <item name="colorTertiary">#E5BAD7</item>
+        <item name="colorOnTertiary">#45263E</item>
+        <item name="colorTertiaryContainer">#5D3C55</item>
+        <item name="colorOnTertiaryContainer">#FFD7F3</item>
+        <item name="colorError">#FFB4A9</item>
+        <item name="colorErrorContainer">#930006</item>
+        <item name="colorOnError">#680003</item>
+        <item name="colorOnErrorContainer">#FFDAD4</item>
+        <item name="android:colorBackground">#1B1B1F</item>
+        <item name="colorOnBackground">#E4E1E6</item>
+        <item name="colorSurface">#1B1B1F</item>
+        <item name="colorOnSurface">#E4E1E6</item>
+        <item name="colorSurfaceVariant">#46464F</item>
+        <item name="colorOnSurfaceVariant">#C6C5D0</item>
+        <item name="colorOutline">#90909A</item>
+        <item name="colorOnSurfaceInverse">#1B1B1F</item>
+        <item name="colorSurfaceInverse">#E4E1E6</item>
+        <item name="colorPrimaryInverse">#4355B9</item>
+    </style>
+
+    <style name="skyblue">
+        <item name="colorPrimary">#8BCEFF</item>
+        <item name="colorOnPrimary">#003450</item>
+        <item name="colorPrimaryContainer">#004B71</item>
+        <item name="colorOnPrimaryContainer">#C8E6FF</item>
+        <item name="colorSecondary">#B7C8D8</item>
+        <item name="colorOnSecondary">#22323F</item>
+        <item name="colorSecondaryContainer">#384956</item>
+        <item name="colorOnSecondaryContainer">#D3E4F5</item>
+        <item name="colorTertiary">#CFBFE8</item>
+        <item name="colorOnTertiary">#362B4B</item>
+        <item name="colorTertiaryContainer">#4D4162</item>
+        <item name="colorOnTertiaryContainer">#ECDCFF</item>
+        <item name="colorError">#FFB4A9</item>
+        <item name="colorErrorContainer">#930006</item>
+        <item name="colorOnError">#680003</item>
+        <item name="colorOnErrorContainer">#FFDAD4</item>
+        <item name="android:colorBackground">#1A1C1E</item>
+        <item name="colorOnBackground">#E2E2E5</item>
+        <item name="colorSurface">#1A1C1E</item>
+        <item name="colorOnSurface">#E2E2E5</item>
+        <item name="colorSurfaceVariant">#41474D</item>
+        <item name="colorOnSurfaceVariant">#C1C7CE</item>
+        <item name="colorOutline">#8B9198</item>
+        <item name="colorOnSurfaceInverse">#1A1C1E</item>
+        <item name="colorSurfaceInverse">#E2E2E5</item>
+        <item name="colorPrimaryInverse">#006494</item>
+    </style>
+
+    <style name="green">
+        <item name="colorPrimary">#78DC77</item>
+        <item name="colorOnPrimary">#003907</item>
+        <item name="colorPrimaryContainer">#00530F</item>
+        <item name="colorOnPrimaryContainer">#93F990</item>
+        <item name="colorSecondary">#B9CCB3</item>
+        <item name="colorOnSecondary">#253423</item>
+        <item name="colorSecondaryContainer">#3B4B38</item>
+        <item name="colorOnSecondaryContainer">#D5E8CE</item>
+        <item name="colorTertiary">#A1CFD5</item>
+        <item name="colorOnTertiary">#00363B</item>
+        <item name="colorTertiaryContainer">#1E4D52</item>
+        <item name="colorOnTertiaryContainer">#BCEBF0</item>
+        <item name="colorError">#FFB4A9</item>
+        <item name="colorErrorContainer">#930006</item>
+        <item name="colorOnError">#680003</item>
+        <item name="colorOnErrorContainer">#FFDAD4</item>
+        <item name="android:colorBackground">#1A1C19</item>
+        <item name="colorOnBackground">#E2E3DD</item>
+        <item name="colorSurface">#1A1C19</item>
+        <item name="colorOnSurface">#E2E3DD</item>
+        <item name="colorSurfaceVariant">#424840</item>
+        <item name="colorOnSurfaceVariant">#C2C8BD</item>
+        <item name="colorOutline">#8C9288</item>
+        <item name="colorOnSurfaceInverse">#1A1C19</item>
+        <item name="colorSurfaceInverse">#E2E3DD</item>
+        <item name="colorPrimaryInverse">#006E17</item>
+    </style>
+
+    <style name="brown">
+        <item name="colorPrimary">#FFB598</item>
+        <item name="colorOnPrimary">#5C1A00</item>
+        <item name="colorPrimaryContainer">#7B2E0D</item>
+        <item name="colorOnPrimaryContainer">#FFDBCD</item>
+        <item name="colorSecondary">#E7BEB0</item>
+        <item name="colorOnSecondary">#442A20</item>
+        <item name="colorSecondaryContainer">#5D4035</item>
+        <item name="colorOnSecondaryContainer">#FFDBCD</item>
+        <item name="colorTertiary">#D5C78E</item>
+        <item name="colorOnTertiary">#383005</item>
+        <item name="colorTertiaryContainer">#50461A</item>
+        <item name="colorOnTertiaryContainer">#F1E2A7</item>
+        <item name="colorError">#FFB4A9</item>
+        <item name="colorErrorContainer">#930006</item>
+        <item name="colorOnError">#680003</item>
+        <item name="colorOnErrorContainer">#FFDAD4</item>
+        <item name="android:colorBackground">#201A18</item>
+        <item name="colorOnBackground">#EDE0DC</item>
+        <item name="colorSurface">#201A18</item>
+        <item name="colorOnSurface">#EDE0DC</item>
+        <item name="colorSurfaceVariant">#52433E</item>
+        <item name="colorOnSurfaceVariant">#D8C2BB</item>
+        <item name="colorOutline">#A08C86</item>
+        <item name="colorOnSurfaceInverse">#201A18</item>
+        <item name="colorSurfaceInverse">#EDE0DC</item>
+        <item name="colorPrimaryInverse">#9A4523</item>
+    </style>
 </resources>

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

@@ -2,10 +2,10 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" xmlns:tools="http://schemas.android.com/tools">
     <string name="action_search">Zoeken</string>
     <string name="action_add">Toevoegen</string>
-    <string name="noGiftCards">Druk op de + plusknop om een kaart toe te voegen of importeer kaarten via het ⋮-menu</string>
-    <string name="noMatchingGiftCards">Geen zoekresultaten – probeer een andere zoekopdracht.</string>
+    <string name="noGiftCards">Druk op de plusknop (‘+’) om een kaart toe te voegen of importeer kaarten via het ⋮-menu</string>
+    <string name="noMatchingGiftCards">Geen zoekresultaten - probeer een andere zoekopdracht.</string>
     <string name="storeName">Naam</string>
-    <string name="note">Notitie</string>
+    <string name="note">Aantekening</string>
     <string name="cardId">Kaartnummer</string>
     <string name="barcodeType">Soort barcode</string>
     <string name="cancel">Annuleren</string>
@@ -144,6 +144,15 @@
     </plurals>
     <string name="settings_system_locale">Systeemtaal</string>
     <string name="settings_locale">Taal</string>
+    <string name="settings_brown_theme">Bruin</string>
+    <string name="settings_green_theme">Groen</string>
+    <string name="settings_sky_blue_theme">Hemelsblauw</string>
+    <string name="settings_blue_theme">Blauw</string>
+    <string name="settings_violet_theme">Violet</string>
+    <string name="settings_magenta_theme">Magenta</string>
+    <string name="settings_pink_theme">Roze</string>
+    <string name="settings_catima_theme">Catima</string>
+    <string name="settings_theme_color">Themakleur</string>
     <string name="app_contributors">Mede mogelijk gemaakt door: <xliff:g id="app_contributors">%s</xliff:g></string>
     <string name="noGroupCards">Deze groep bevat geen kaarten</string>
     <string name="barcodeImageDescriptionWithType">Afbeelding van barcode <xliff:g>%s</xliff:g></string>
@@ -296,7 +305,4 @@
     <string name="acra_crash_email_subject"><xliff:g id="app_name">%s</xliff:g> foutrapport</string>
     <string name="pref_enable_acra">Vraag om foutrapporten te versturen</string>
     <string name="pref_enable_acra_summary">Als dit aanstaat, zal je gevraagd worden om foutrapporten te sturen als de app crasht. Dit zal nooit automatisch gebeuren.</string>
-    <string name="nothing_to_copy">Geen waarde gevonden</string>
-    <string name="copied_to_clipboard">Gekopieerd naar klembord</string>
-    <string name="copy_value">Kopieer waarde</string>
 </resources>

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

@@ -58,6 +58,7 @@
     <string name="addFromImage">Causir a la galariá</string>
     <string name="groups">Grops</string>
     <string name="groupsList">Grops : <xliff:g>%s</xliff:g></string>
+    <string name="settings_theme_color">Color del tèma</string>
     <string name="settings_locale">Lenga</string>
     <string name="noGiftCardsGroup">Creatz de cartas puèi ligatz-las al grop aicí.</string>
 </resources>

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

@@ -1,299 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" xmlns:tools="http://schemas.android.com/tools">
-    <string name="app_name">کاتیما</string>
-    <string name="action_search">گشتن</string>
-    <string name="action_add">اضافه کردن</string>
-    <plurals name="selectedCardCount">
-        <item quantity="one"><xliff:g>%d</xliff:g> انتخاب شد</item>
-        <item quantity="other"><xliff:g>%d</xliff:g> انتخاب شد</item>
-    </plurals>
-    <string name="noGiftCards">برای اضافه کردن کارت، روی دکمه + به علاوه بزنید ، یا از منوی ⋮ وارد کنید</string>
-    <string name="noMatchingGiftCards">بدون نتیجه. سعی کن گشتن تون رو عوض کنید</string>
-    <string name="storeName">اسم</string>
-    <string name="note">نسخه برداری</string>
-    <string name="cardId">هویت کارت</string>
-    <string name="barcodeType">گونه بارکد</string>
-    <string name="noBarcode">بدون بارکد</string>
-    <string name="star">اضاف کردن به دوست داشتنی‌ها</string>
-    <string name="unstar">‌پاک‌کردن از دوست‌ داشتنی‌ها</string>
-    <string name="cancel">بیخیال</string>
-    <string name="save">نگه داشتن</string>
-    <string name="edit">عوض کردن</string>
-    <string name="delete">بیخیال</string>
-    <string name="confirm">قبول</string>
-    <string name="deleteTitle">پاک کردن‌ کارت</string>
-    <plurals name="deleteCardsTitle">
-        <item quantity="one">پاک‌کردن <xliff:g>%d</xliff:g> کارت</item>
-        <item quantity="other">پاک‌کردن <xliff:g>%d</xliff:g> کارت</item>
-    </plurals>
-    <string name="deleteConfirmation">ای کارت همیشه پاک شه ؟</string>
-    <plurals name="deleteCardsConfirmation">
-        <item quantity="one">ای <xliff:g>%d</xliff:g> \u0020کارت همیشه پاک شه ؟</item>
-        <item quantity="other">ای <xliff:g>%d</xliff:g> \u0020کارت همیشه پاک شه ؟</item>
-    </plurals>
-    <string name="ok">قبول</string>
-    <string name="sendLabel">.‌‌ . . فرستادن</string>
-    <string name="addCardTitle">اضاف کردن کارت</string>
-    <string name="scanCardBarcode">اسکن بارکد</string>
-    <string name="cardShortcut">بریدنِ شرتِ کارت</string>
-    <string name="noCardsMessage">اول کارت اضاف کن</string>
-    <string name="noCardExistsError">اون کارت پیدا نشد</string>
-    <string name="failedParsingImportUriError">نتونستم آدرس اینترنتی (URI) مربوط به واردات رو باز کنم</string>
-    <string name="importExport">آوردن/بردن</string>
-    <string name="exportName">بیرون گرفتن</string>
-    <string name="importExportHelp">پشتیبان‌گیری از داده‌ها امکان انتقال اونا به دستگاه دیگه رو فراهم می‌کنه</string>
-    <string name="importSuccessfulTitle">وارد شده</string>
-    <string name="importFailedTitle">وارد کردن ناموفق بوده</string>
-    <string name="importFailed">نمیشه وارد کرد</string>
-    <string name="exportSuccessfulTitle">بیرونی گرفته شد</string>
-    <string name="exportFailedTitle">خروجی گرفته نمیشه</string>
-    <string name="exportFailed">نمیشه خروجی گرفت</string>
-    <string name="importing">. . ‌.درحال وارد کردن</string>
-    <string name="exporting">. . .درحال بیرونی گرفتن</string>
-    <string name="storageReadPermissionRequired">…برای این کار دسترسی به حافظه نیازه</string>
-    <string name="cameraPermissionRequired">… دسترسی به دوربین نیازه</string>
-    <string name="permissionReadCardsLabel">کارت های کاتیما رو بخونید</string>
-    <string name="permissionReadCardsDescription">کارتای کاتیما و تمام جزئیاتشون از جمله یادداشت‌ها و عکس‌ها رو بخون</string>
-    <string name="cameraPermissionDeniedTitle">دسترسی به دوربین گرفته نشد</string>
-    <string name="noCameraPermissionDirectToSystemSetting">برای اسکن بارکد ها، کاتیما نیاز داره به دوربین شما دسترسی داشته باشه. اینجا بزنید تا تنظیمات دسترسی خود را تغییر دهید.</string>
-    <string name="exportOptionExplanation">داده‌ها تو جای دلخواه خودت نوشته میشه</string>
-    <string name="importOptionFilesystemTitle">ورود از فایل سیستم</string>
-    <string name="importOptionFilesystemExplanation">یه فایل خاص رو از سیستم انتخاب کن</string>
-    <string name="importOptionFilesystemButton">از فایلای سیستم</string>
-    <string name="about">درمورد</string>
-    <string name="app_copyright_short">حق نشر © سیلویا وَن اُس و مشارکت کننده‌ها</string>
-    <string name="app_copyright_old">تبغ کارت وفاداری Keychain\nکپی رایت © 2016-2020 سازنده : Branden</string>
-    <string name="app_license">نرم‌افزار آزاد با حقوق کپی‌لفت، تحت مجوز GPLv3+</string>
-    <string name="about_title_fmt">درمورد <xliff:g id="app_name">%s</xliff:g></string>
-    <string name="debug_version_fmt">ورژن <xliff:g id="version">%s</xliff:g></string>
-    <string name="selectBarcodeTitle">بارکد انتخاب کن</string>
-    <string name="thumbnailDescription">عکس کوچیک</string>
-    <string name="starImage">ستاره دوست داشتنی</string>
-    <string name="settings">تنظیمات</string>
-    <string name="settings_theme">تم</string>
-    <string name="settings_system_theme">سیستم</string>
-    <string name="settings_light_theme">روشن</string>
-    <string name="settings_dark_theme">تیره</string>
-    <string name="settings_display_barcode_max_brightness">نور صفحه</string>
-    <string name="settings_display_barcode_max_brightness_summary">برای کارکردن بعضی اسکنر ها ضروریه</string>
-    <string name="settings_keep_screen_on">روشن گزاشتن صفحه نمایش</string>
-    <string name="settings_keep_screen_on_summary">غیرفعال کردن زمان صفحه نمایش هین نگاه کردن کارت</string>
-    <string name="settings_disable_lockscreen_while_viewing_card">جلوگیری از قفل شدن صفحه</string>
-    <string name="settings_disable_lockscreen_while_viewing_card_summary">جلوگیری از قفل شدن صفحه موقع مشاهده کارت</string>
-    <string name="settings_allow_content_provider_read_title">اجازه به برنامه های دیگه برای دسترسی به داده های من</string>
-    <string name="settings_allow_content_provider_read_summary">برنامه ها باید برای گرفتن مجوز درخواست کنن</string>
-    <string name="settings_use_volume_keys_navigation">جابجایی بین کارتا با استفاده از کلیدای صدا</string>
-    <string name="settings_use_volume_keys_navigation_summary">از کلیدای صدا برای تغیر کارت نمایشی استفاده کنید</string>
-    <string name="intent_import_card_from_url_share_text">میخام یه کارتو با تو به اشتراک بزارم</string>
-    <string name="importSuccessful">اطلاعات وارد شد</string>
-    <string name="exportSuccessful">اطلاعات صادر شدن</string>
-    <string name="enter_group_name">اسم گروه رو وارد کن</string>
-    <string name="groups">گروه‌ها</string>
-    <string name="group_edit">تغیر گروه</string>
-    <string name="noGroups">برای اضافه کردن گروه‌ها جهت دسته‌بندی، روی دکمه + به علاوه کلیک کن</string>
-    <string name="noGroupCards">این گروه خالیه</string>
-    <plurals name="groupCardCount">
-        <item quantity="one"><xliff:g>%d</xliff:g> کارت</item>
-        <item quantity="other"><xliff:g>%d</xliff:g> کارت‌ها</item>
-    </plurals>
-    <string name="group_name_already_in_use">اسم گروه قبلا استفاده شده</string>
-    <string name="group_name_is_empty">اسم گروه نباید خالی باشه</string>
-    <string name="group_updated">گروه به روز شد</string>
-    <string name="all">همش</string>
-    <string name="deleteConfirmationGroup">حذف گروه؟</string>
-    <string name="failedOpeningFileManager">باز نشدن فایل منیجر</string>
-    <string name="moveUp">به بالا حرکت کن</string>
-    <string name="moveDown">به پایین حرکت کن</string>
-    <string name="leaveWithoutSaveTitle">بیرون</string>
-    <string name="leaveWithoutSaveConfirmation">بدون ذخیره میری ؟</string>
-    <string name="addManually">بارکد رو دستی وارد کن</string>
-    <string name="addFromImage">یه تصویر از گالری انتخاب کن</string>
-    <string name="groupsList">گروه‌ها: <xliff:g>%s</xliff:g></string>
-    <string name="editGroup">تغیرگروه: <xliff:g>%s</xliff:g></string>
-    <string name="expiryStateSentence">تاریخ انقضاء: <xliff:g>%s</xliff:g></string>
-    <string name="expiryStateSentenceExpired">منقضی شده: <xliff:g>%s</xliff:g></string>
-    <string name="balanceSentence">دارایی: <xliff:g>%s</xliff:g></string>
-    <plurals name="balancePoints">
-        <item quantity="one"><xliff:g>%s</xliff:g> نقطه</item>
-        <item quantity="other"><xliff:g>%s</xliff:g> نقطه‌ها</item>
-    </plurals>
-    <string name="card">کارت</string>
-    <string name="editBarcode">تغیر بارک</string>
-    <string name="expiryDate">تاریخ انقضاء</string>
-    <string name="never">هیچوقت</string>
-    <string name="chooseExpiryDate">انتخاب تاریخ انقضاء</string>
-    <string name="moveBarcodeToTopOfScreen">بارکد رو به بالای صفحه ببر</string>
-    <string name="noBarcodeFound">بارکدی پیدا نشد</string>
-    <string name="errorReadingImage">عکس خونده نشد</string>
-    <string name="balance">دارایی</string>
-    <string name="currency">ارز</string>
-    <string name="points">امتیازات</string>
-    <string name="balanceParsingFailed">موجودی یوخدی</string>
-    <string name="chooseImportType">وارد کردن اطلاعات از</string>
-    <string name="app_loyalty_card_keychain">جاکیلیدی کارت وفاداری</string>
-    <string name="privacy_policy">سیاست حفظ حریم خصوصی</string>
-    <string name="accept">باشه</string>
-    <string name="importCatima">واردات از کاتیما</string>
-    <string name="importCatimaMessage">خروجی خودتو از کاتیما برای وارد کردن \nانتخاب کن.\n\n اونارو از منوی واردات/صادرات یه برنامه کاتیما دیگه با فشار دادن صادرات ایجاد کن.</string>
-    <string name="importFidme">’واردات از FidMe</string>
-    <string name="importFidmeMessage">خروجی خودتو FidMe برای وارد کردن انتخاب کن و بعد انواع بارکدها رو به صورت دستی انتخاب کن.\n با انتخاب Data Protection و بعد فشردن Extract my data، اون رو از پروفایل FidMe خودتو درست کن.</string>
-    <string name="importLoyaltyCardKeychain">وارد کردن از جاکلیدی کارت وفاداری</string>
-    <string name="importLoyaltyCardKeychainMessage">برای وارد کردن، خروجی خودتو از Loyalty Card Keychain انتخاب کنید.\nبا فشار دادن Export، اون رو از منوی Import/Export تو Loyalty Card Keychain ایجاد کنید.</string>
-    <string name="importVoucherVault">واردات از صندوق کوپن</string>
-    <string name="importVoucherVaultMessage">برای وارد کردن، خروجی خود را از Voucher Vault انتخاب کنید.\nبا فشار دادن دکمه Export در Voucher Vault، آن را ایجاد کنید.</string>
-    <string name="barcodeId">اندازه بارکد</string>
-    <string name="sameAsCardId">مثل شناسه</string>
-    <string name="setBarcodeId">تنظیم اندازه بارکد</string>
-    <string name="unsupportedBarcodeType">این نوع بارکد هنوز نمی‌تونه دیده بشه. ممکنه تو نسخه آینده برنامه پشتیبانی بشه.</string>
-    <string name="wrongValueForBarcodeType">اندازه برای نوع بارکد انتخاب شده معتبر نیست</string>
-    <string name="intent_import_card_from_url_share_multiple_text">می‌خام چندتا کارت با شما به اشتراک بزارم</string>
-    <string name="frontImageDescription">عکس نمایه</string>
-    <string name="backImageDescription">عکس پس‌کله</string>
-    <string name="photos">عکسا</string>
-    <string name="setFrontImage">عکس روبرو رو بزار</string>
-    <string name="setBackImage">عکس پس‌کله رو بزار</string>
-    <string name="removeImage">عکس رو بچین</string>
-    <string name="takePhoto">عکس بگیر</string>
-    <string name="updateBarcodeQuestionTitle">مقدار بارکد رو به‌روز می‌کنی؟</string>
-    <string name="updateBarcodeQuestionText">تو شناسه رو تغییر دادی. می‌خای بارکد رو هم به‌روز کنی تا همین مقدار رو به‌کار ببری؟</string>
-    <string name="yes">اره</string>
-    <string name="no">نه</string>
-    <string name="passwordRequired">رمز عبور رو بزن</string>
-    <string name="exportPassword">خروجی گرفته شده رو به‌وسیله رمز حفاظت کنید (غیر اجباری)</string>
-    <string name="exportPasswordHint">رمز فایل خروجی</string>
-    <string name="failedGeneratingShareURL">نتونستم URL قابل اشتراک‌گذاری ایجاد کنم</string>
-    <string name="turn_flashlight_on">چراغ قوه رو روشن کن</string>
-    <string name="turn_flashlight_off">چراغ‌قوه رو خاموش کن</string>
-    <string name="settings_locale">زبون</string>
-    <string name="settings_oled_dark">پس‌زمینه‌ی یه‌دست سیاه برای حالت تاریک</string>
-    <string name="settings_oled_dark_summary">استفاده‌ی باتری رو برای نمایشگرهای OLED کاهش می‌دهد</string>
-    <string name="editCardTitle">عوض کردن کارت</string>
-    <string name="app_libraries">کتابخانه-تصادفات رانندگی: <xliff:g id="app_libraries_list">%s</xliff:g></string>
-    <string name="app_resources">منابع-تصادفات رانندگی: <xliff:g id="app_resources_list">%s</xliff:g></string>
-    <string name="share">اشتراک گزاری</string>
-    <string name="settings_system_locale">سیستم</string>
-    <string name="selectColor">رنگ انتخاب کن</string>
-    <string name="setIcon">قالب پیش‌نمایه رو نشون‌بده</string>
-    <string name="app_contributors">ساخته شده توسط: <xliff:g id="app_contributors">%s</xliff:g></string>
-    <string name="sort">تمیزکردن</string>
-    <string name="showMoreInfo">دیدن اطلاعات</string>
-    <string name="updateBalance">به‌روزرسانی موجودی</string>
-    <string name="failedToRetrieveImageFile">فایل تصویر بازیابی نشد</string>
-    <string name="barcodeLongPressMessage">فقط عکس میتونه تو گالری برنامه باز بشه</string>
-    <string name="sort_by_name">اسم</string>
-    <string name="sort_by_most_recently_used">جدیدا استفاده شده</string>
-    <string name="sort_by_valid_from">معتبر از</string>
-    <string name="sort_by_expiry">انقضا</string>
-    <string name="reverse">…به ترتیب برعکس</string>
-    <string name="sort_by">مرتب کردن بر اساس</string>
-    <string name="version_history">تاریخچه نسخه</string>
-    <string name="credits">اعتبارات</string>
-    <string name="help_translate_this_app">به ترجمه این برنامه کمک کن</string>
-    <string name="license">مجوز</string>
-    <string name="source_repository">مخزن منبع</string>
-    <string name="on_github">تو گیت‌هاب</string>
-    <string name="and_data_usage">و مصرف داده</string>
-    <string name="rate_this_app">به این برنامه امتیاز بده</string>
-    <string name="on_google_play">تو گوگل پلی</string>
-    <string name="report_error">گزارش خطا</string>
-    <string name="translate_platform">تو سایت</string>
-    <string name="shortcutSelectCard">یه کارت انتخاب کن</string>
-    <string name="options">گزینه‌ها</string>
-    <string name="starred">ستاره دار</string>
-    <string name="include_if_asking_support">اگه میخای درخاست کن، اطلاعات زیر رو پر کن:</string>
-    <string name="duplicateCard">تکراری</string>
-    <string name="archive">بایگانی</string>
-    <string name="unarchive">خارج کردن از بایگانی</string>
-    <string name="archived">کارت بایگانی شد</string>
-    <string name="unarchived">گارت از بایگانی خارج شد</string>
-    <string name="failedLaunchingPhotoPicker">پشتیبانی از انتخابگر تصویر پیدا نشد</string>
-    <plurals name="groupCardCountWithArchived">
-        <item quantity="one"><xliff:g>%1$d</xliff:g> کارت (<xliff:g id="بایگانی شد">%2$d</xliff:g> archived)</item>
-        <item quantity="other"><xliff:g>%1$d</xliff:g> کات‌ها (<xliff:g id="بایگانی شدن">%2$d</xliff:g> archived)</item>
-    </plurals>
-    <string name="previousCard">قبلی</string>
-    <string name="nextCard">بعدی</string>
-    <string name="failedToOpenUrl">اول یه مرورگر وب نصب کن</string>
-    <string name="welcome">به کاتیما خوش اومدی</string>
-    <string name="importCards">کارت‌های وارداتی</string>
-    <string name="updateBalanceTitle">چقدر هزینه کردی یا گرفتی؟</string>
-    <string name="updateBalanceHint">مبلغ رو وارد کن</string>
-    <string name="currentBalanceSentence">موجودی فعلی: <xliff:g>%s</xliff:g></string>
-    <string name="newBalanceSentence">موجودی جدید: <xliff:g>%s</xliff:g></string>
-    <string name="validFromDate">معتبر از</string>
-    <string name="anyDate">هر وقتی</string>
-    <string name="chooseValidFromDate">معتبر از تاریخ رو انتخاب کن</string>
-    <string name="validFromSentence">معتبر از: <xliff:g>%s</xliff:g></string>
-    <string name="height">ارتفاع</string>
-    <string name="switchToFrontImage">تغییر به عکس جلو</string>
-    <string name="switchToBackImage">تغییر به عکس عقب</string>
-    <string name="switchToBarcode">به بارکد تغییر بده</string>
-    <string name="openFrontImageInGalleryApp">عکس جلویی رو تو image viewer app باز کن</string>
-    <string name="openBackImageInGalleryApp">باز کردن عکس تو image viewer app</string>
-    <string name="setBarcodeHeight">تنظیم ارتفاع بارکد</string>
-    <string name="donate">کمک مالی کن</string>
-    <string name="icon_header_click_text">برای ویرایش عکس کوچیک، فشار طولانی بده</string>
-    <string name="show_name_below_image_thumbnail">نمایش اسم زیر عکس بندانگشتی</string>
-    <string name="show_note">دیدن یادداشت</string>
-    <string name="show_balance">دیدن موجودی</string>
-    <string name="show_validity">دیدن دارایی</string>
-    <string name="settings_category_title_cards">نمای کارت</string>
-    <string name="settings_category_title_cards_overview">نمای کلی به کارت‌ها</string>
-    <string name="settings_column_count_portrait">سطون ها تو حالت عمودی</string>
-    <string name="settings_column_count_landscape">سطون ها تو حالت افقی</string>
-    <string name="settings_automatic_column_count">خودکار</string>
-    <string name="settings_column_count_1">۱</string>
-    <string name="settings_column_count_2">۲</string>
-    <string name="settings_column_count_3">۳</string>
-    <string name="settings_column_count_4">۴</string>
-    <string name="settings_column_count_5">۵</string>
-    <string name="settings_column_count_6">۶</string>
-    <string name="settings_column_count_7">۷</string>
-    <string name="settings_category_title_general">عمومی</string>
-    <string name="settings_category_title_privacy">حریم شخصی</string>
-    <string name="action_display_options">گزینه های نمایش</string>
-    <string name="show_archived_cards">دیدن کارت‌های بایگانی شده</string>
-    <string name="view_online">دیدن انلاین</string>
-    <string name="action_more_options">گزینه‌های بیشتر</string>
-    <string name="addWithoutBarcode">اضافه کردن کارت بدون بارکد</string>
-    <string name="enter_card_id">شماره شناسایی یا متن روی کارت خودتو وارد کن</string>
-    <string name="card_id_must_not_be_empty">شناسه کارت نباید خالی باشه</string>
-    <string name="add_a_card_in_a_different_way">یه کارت با روش‌دیگه اضاف کن</string>
-    <string name="field_must_not_be_empty">فیلد نباید خالی باشه</string>
-    <string name="manually_enter_barcode_instructions">شماره شناسایی یا متن روی کارت خودتو وارد‌کن و بارکدی رو که شبیه بارکد روی کارت خودته، فشار بده.</string>
-    <string name="add_manually_warning_title">اسکن توصیه میشه</string>
-    <string name="add_manually_warning_message">برای بعضی از کارت‌ها، اندازه بارکد با عدد نوشته شده روی کارت متفاوته. به همین دلیل، وارد کردن دستی بارکد ممکنه همیشه کار نکنه. توصیه میشه به جای این، بارکد رو با دوربین خودت اسکن کنی. میخای هنوز ادامه بدی؟</string>
-    <string name="continue_">ادامه</string>
-    <string name="spend">خرج کردن</string>
-    <string name="receive">گرفتن</string>
-    <string name="amountParsingFailed">اندازه نامعتبر</string>
-    <string name="addFromPdfFile">یه فایل PDF انتخاب کن</string>
-    <string name="errorReadingFile">نتونستم فایل رو بخونم</string>
-    <string name="failedLaunchingFileManager">نتونستم یه مدیر فایل پشتیبانی شده پیدا کنم</string>
-    <string name="multipleBarcodesFoundPleaseChooseOne">از کدوم بارکد‌های پیدا شده میخای استفاده کنی ؟</string>
-    <string name="pageWithNumber">صفحه <xliff:g>%d</xliff:g></string>
-    <string name="noCameraFoundGuideText">به نظر نمیرسه دستگاهت دوربین داشته باشه. اگه داره، دستگاه رو دوباره راه‌اندازی کن. در غیر این صورت، از دکمه گزینه‌های بیشتر زیر برای اضاف‌کردن بارکد به روش دیگه‌ای استفاده کن.</string>
-    <string name="importCancelled">واردات لغو شد</string>
-    <string name="exportCancelled">خروجی گرفتن لغو شد</string>
-    <string name="useFrontImage">از عکس جلو استفاده کن</string>
-    <string name="useBackImage">از عکس عقب استفاده کنید</string>
-    <string name="addFromPkpass">یه فایل دفترچه‌ حساب انتخاب‌کن(.pkpass / .pkpasses)</string>
-    <string name="unsupportedFile">این فایل پشتیبانی نمیشه</string>
-    <string name="generic_error_please_retry">مشکلی رخ داد</string>
-    <string name="width">عرض</string>
-    <string name="card_list_widget_name">لیست کارت‌ها</string>
-    <string name="setBarcodeWidth">تنظیم عرض بارکد</string>
-    <string name="card_list_widget_empty">بعد از اینکه چندتا کارت وفاداری تو کاتیما اضافه کردی، اونها اینجا ظاهر میشن. اگه کارت داری، مطمئن شو که همه اونها بایگانی نشدن.</string>
-    <string name="cardWithNumber">کارت <xliff:g>%d</xliff:g></string>
-    <string name="cardWithNumberAndLocale">کارت <xliff:g>%d</xliff:g> (<xliff:g>%s</xliff:g>)</string>
-    <string name="pleaseDoNotRotateTheDevice">لطفاً دستگاه رو نچرخون، چون اینکار عملکرد رو لغو میکنه</string>
-    <string name="acra_catima_has_crashed">متاسفیم، اما <xliff:g id="app_name"> %s </xliff:g> از کار افتاده است. لطفاً با ارسال گزارش خطا، به ما در رفع این مشکل کمک کنید.</string>
-    <string name="acra_explain_crash">اگه امکانش هست، لطفاً جزئیات بیشتری از کاری که انجام میدادی رو اینجا اضافه کن:</string>
-    <string name="acra_crash_email_subject"><xliff:g id="app_name">%s</xliff:g> گزارش مشکل</string>
-    <string name="pref_enable_acra">درخاست ارسال گزارش‌های خرابی</string>
-    <string name="pref_enable_acra_summary">وقتی فعال باشه، از شما خواسته می‌شه که در صورت بروز خرابی، اون رو گزارش بدی. گزارش‌های خرابی هرگز به طور خودکار ارسال نمیشن.</string>
-    <string name="copy_value">مقدار کپی</string>
-    <string name="copied_to_clipboard">کپی تو کیبورد</string>
-    <string name="nothing_to_copy">ارزشی پیدا نشد</string>
-    <string name="noGiftCardsGroup">چند کارت ایجاد کنید و سپس آنها را به گروه اینجا اختصاص دهید</string>
-</resources>