Release Catima v2.28.0

Translations update from Hosted Weblate

.github/dependabot.yml

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

.github/workflows/android.yml

@@ -29,10 +29,10 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4.0.0
+    - uses: actions/checkout@v4.1.1
     - name: Fail on bad translations
       run: if grep -ri "<xliff" app/src/main/res/values*/strings.xml; then echo "Invalidly escaped translations found"; exit 1; fi
-    - uses: gradle/wrapper-validation-action@v1
+    - uses: gradle/wrapper-validation-action@v2
     - name: set up OpenJDK 17
       run: |
         sudo apt-get update
@@ -48,7 +48,7 @@ jobs:
       run: ./gradlew spotbugsRelease
     - name: Archive test results
       if: always()
-      uses: actions/upload-artifact@v3.1.3
+      uses: actions/upload-artifact@v4.3.1
       with:
         name: test-results
         path: app/build/reports

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

@@ -27,15 +27,15 @@ jobs:
     steps:
     - name: Checkout repo
       id: checkout
-      uses: actions/checkout@v4.0.0
+      uses: actions/checkout@v4.1.1
     - name: Setup Python
-      uses: actions/setup-python@v4.7.0
+      uses: actions/setup-python@v5.0.0
       with:
         python-version: '3.x'
     - name: Run converter script
       run: python .scripts/changelog_to_fastlane.py
     - name: Create Pull Request
-      uses: peter-evans/create-pull-request@v5.0.2
+      uses: peter-evans/create-pull-request@v6.0.1
       with:
         title: "Update Fastlane changelogs"
         commit-message: "Update Fastlane changelogs"

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

@@ -25,14 +25,15 @@ jobs:
     steps:
     - name: Checkout repo
       id: checkout
-      uses: actions/checkout@v4.0.0
+      uses: actions/checkout@v4.1.1
     - name: Update contributors
       id: update_contributors
-      uses: TheLastProject/contributors-to-file-action@v3.0.1
+      uses: TheLastProject/contributors-to-file-action@v3.2.0
       with:
         file_in_repo: app/src/main/res/raw/contributors.txt
+        min_commit_count: 5
     - name: Create Pull Request
-      uses: peter-evans/create-pull-request@v5.0.2
+      uses: peter-evans/create-pull-request@v6.0.1
       with:
         title: "Update contributors"
         commit-message: "Update contributors"

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

@@ -24,7 +24,7 @@ jobs:
   generate-feature-graphic:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4.0.0
+    - uses: actions/checkout@v4.1.1
     - name: Install requirements
       run: |
         sudo apt-get update
@@ -36,41 +36,9 @@ jobs:
         find .scripts/generate_feature_graphic/fonts -name '*.ttf' -exec cp {} "$HOME/.fonts" \;
         fc-cache
     - name: Generate featureGraphic.png for each language
-      run: |
-        for lang in fastlane/metadata/android/*; do
-          pushd "$lang"
-          # Place temporary copy for editing if needed
-          cp ../../../../.scripts/generate_feature_graphic/featureGraphic.svg featureGraphic.svg
-          # Extract text after 'Catima - '
-          export subtext="$(grep -oP '(?<=Catima \S ).*' title.txt || true)"
-          # If there is subtext, change the .svg accordingly
-          if [ -n "$subtext" ]; then
-            perl -pi -e 's/Loyalty Card Wallet/$ENV{subtext}/' featureGraphic.svg
-            # Set correct font for language if needed (Lexend Deca has limited support)
-            # We specifically need the Serif version because of the 200 weight
-            case "$(basename "$lang")" in
-              bg|el-GR|ru-RU|uk) sed -i "s/Lexend Deca/Noto Serif/" featureGraphic.svg ;;
-              ja-JP) sed -i "s/Lexend Deca/Noto Serif CJK JP/" featureGraphic.svg ;;
-              ko) sed -i "s/Lexend Deca/Noto Serif CJK KR/" featureGraphic.svg ;;
-              zh-CN) sed -i "s/Lexend Deca/Noto Serif CJK SC/" featureGraphic.svg ;;
-              zh-TW) sed -i "s/Lexend Deca/Noto Serif CJK TC/" featureGraphic.svg ;;
-              *) ;;
-            esac
-          fi
-          # Ensure images directory exists
-          mkdir -p images
-          # Generate .png
-          convert featureGraphic.svg images/featureGraphic.png
-          # Optimize .png
-          optipng images/featureGraphic.png
-          # Remove metadata (timestamps) from .png
-          mat2 --inplace images/featureGraphic.png
-          # Remove temporary .svg
-          rm featureGraphic.svg
-          popd
-        done
+      run: .scripts/generate_feature_graphic/generate_feature_graphic.sh
     - name: Create Pull Request
-      uses: peter-evans/create-pull-request@v5.0.2
+      uses: peter-evans/create-pull-request@v6.0.1
       with:
         title: "Update feature graphic"
         commit-message: "Update feature graphic"

.github/workflows/gradle-update.yml

@@ -0,0 +1,33 @@
+name: Gradle update
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: '3 6 * * *'
+permissions:
+  actions: none
+  checks: none
+  contents: write
+  deployments: none
+  discussions: none
+  id-token: none
+  issues: none
+  packages: none
+  pages: none
+  pull-requests: write
+  repository-projects: none
+  security-events: none
+  statuses: none
+jobs:
+  gradle-update:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4.1.1
+    - uses: obfusk/gradle-update-action@v2.0.0
+      id: gradle-update
+    - uses: gradle/wrapper-validation-action@v2
+    - name: Create Pull Request
+      uses: peter-evans/create-pull-request@v6.0.1
+      with:
+        title: "Update Gradle to ${{ steps.gradle-update.outputs.version }}"
+        commit-message: "Update Gradle to ${{ steps.gradle-update.outputs.version }}"
+        branch-suffix: timestamp

.github/workflows/update-locales.yml

@@ -5,6 +5,7 @@ on:
     branches:
       - main
     paths:
+      - app/src/main/res/values-*/strings.xml
       - app/src/main/res/values/settings.xml
 permissions:
   actions: none
@@ -24,11 +25,13 @@ jobs:
   update-locales:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4.0.0
+    - uses: actions/checkout@v4.1.1
+    - name: Add new locales
+      run: .scripts/new-locales.py
     - name: Update locales
       run: .scripts/locales.py
     - name: Create Pull Request
-      uses: peter-evans/create-pull-request@v5.0.2
+      uses: peter-evans/create-pull-request@v6.0.1
       with:
         title: "Update locales"
         commit-message: "Update locales"

.gitignore

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

.scripts/generate_feature_graphic/generate_feature_graphic.sh

@@ -0,0 +1,55 @@
+#!/bin/bash
+set -euo pipefail
+
+script_location="$(dirname "$(readlink -f "$0")")"
+
+for lang in "$script_location/../../fastlane/metadata/android/"*; do
+  pushd "$lang"
+  # Place temporary copy for editing if needed
+  cp "$script_location/featureGraphic.svg" featureGraphic.svg
+  if grep -q — title.txt; then
+    # Try splitting title.txt on — (em dash)
+    IFS='—' read -r appname subtext < title.txt
+  elif grep -q – title.txt; then
+    # No result, try splitting title.txt on – (en dash)
+    IFS='–' read -r appname subtext < title.txt
+  elif grep -q - title.txt; then
+    # No result, try splitting on - (dash)
+    IFS='-' read -r appname subtext < title.txt
+  else
+    # No result, use the full title as app name and default subtext
+    appname=$(< title.txt)
+    subtext="Loyalty Card Wallet"
+  fi
+  export appname=${appname%% }
+  export subtext=${subtext## }
+  # If the appname isn't Catima or there is subtext, change the .svg accordingly
+  if [ "$appname" != "Catima" ] || [ -n "$subtext" ]; then
+    perl -pi -e 's/Catima/$ENV{appname}/' featureGraphic.svg
+    perl -pi -e 's/Loyalty Card Wallet/$ENV{subtext}/' featureGraphic.svg
+    # Set correct font or font size for language if needed
+    # (Lexend Deca has limited support and some characters are big)
+    # We specifically need the Serif version because of the 200 weight
+    case "$(basename "$lang")" in
+      bg|el-GR|ru-RU|uk) sed -i "s/Lexend Deca/Noto Serif/" featureGraphic.svg ;;
+      hi-IN) sed -i -e "s/Yesteryear/Noto Serif Devanagari/" -e "s/Lexend Deca/Noto Serif Devanagari/" featureGraphic.svg ;;
+      ja-JP) sed -i "s/Lexend Deca/Noto Serif CJK JP/" featureGraphic.svg ;;
+      ko) sed -i "s/Lexend Deca/Noto Serif CJK KR/" featureGraphic.svg ;;
+      kn-IN) sed -i -e 's/font-size="150"/font-size="100"/' -e 's/y="285.511"/y="235.511"/' featureGraphic.svg ;;
+      zh-CN) sed -i "s/Lexend Deca/Noto Serif CJK SC/" featureGraphic.svg ;;
+      zh-TW) sed -i "s/Lexend Deca/Noto Serif CJK TC/" featureGraphic.svg ;;
+      *) ;;
+    esac
+  fi
+  # Ensure images directory exists
+  mkdir -p images
+  # Generate .png
+  convert featureGraphic.svg images/featureGraphic.png
+  # Optimize .png
+  optipng images/featureGraphic.png
+  # Remove metadata (timestamps) from .png
+  mat2 --inplace images/featureGraphic.png
+  # Remove temporary .svg
+  rm featureGraphic.svg
+  popd
+done

.scripts/locales.py

@@ -19,8 +19,8 @@ res = ", ".join(f'"{loc}"' for loc in locales)
 sed = [
     "sed",
     "-i",
-    f"s/resourceConfigurations .*/resourceConfigurations += [{res}]/",
-    "app/build.gradle"
+    f"s/resourceConfigurations .*/resourceConfigurations += listOf({res})/",
+    "app/build.gradle.kts"
 ]
 subprocess.run(sed, check=True)
 

.scripts/new-locales.py

@@ -0,0 +1,120 @@
+#!/usr/bin/python3
+
+import glob
+import re
+
+from typing import Iterator, List, Tuple
+
+import requests
+
+MIN_PERCENT = 90
+NOT_LANGS = ("night", "w600dp")
+REPLACE_CODES = {
+    "el": "el-rGR",
+    "id": "in-rID",
+    "ro": "ro-rRO",
+    "zh_Hans": "zh-rCN",
+    "zh_Hant": "zh-rTW",
+}
+STATS_URL = "https://hosted.weblate.org/api/components/catima/catima/statistics/"
+
+
+def get_weblate_langs() -> List[Tuple[str, int]]:
+    r = requests.get(STATS_URL, timeout=5)
+    r.raise_for_status()
+    results = []
+    for lang in r.json()["results"]:
+        if lang["code"] != "en":
+            code = REPLACE_CODES.get(lang["code"], lang["code"]).replace("_", "-r")
+            results.append((code, round(lang["translated_percent"])))
+    return sorted(results)
+
+
+def get_dir_langs() -> List[str]:
+    results = []
+    for d in glob.glob("app/src/main/res/values-*"):
+        code = d.split("-", 1)[1]
+        if code not in NOT_LANGS:
+            results.append(code)
+    return sorted(results)
+
+
+def get_xml_langs() -> List[Tuple[str, bool]]:
+    results = []
+    in_section = False
+    with open("app/src/main/res/values/settings.xml") as fh:
+        for line in fh:
+            if not in_section and 'name="locale_values"' in line:
+                in_section = True
+            elif in_section:
+                if "string-array" in line:
+                    break
+                disabled = "<!--" in line
+                if m := re.search(r">(.*)<", line):
+                    if m[1] != "en":
+                        results.append((m[1], disabled))
+    return sorted(results)
+
+
+def update_xml_langs(langs: List[Tuple[str, bool]]) -> None:
+    lines: List[str] = []
+    in_section = False
+    with open("app/src/main/res/values/settings.xml") as fh:
+        for line in fh:
+            if not in_section and 'name="locale_values"' in line:
+                in_section = True
+            elif in_section:
+                if "string-array" in line:
+                    in_section = False
+                    lines.extend(_lang_lines(langs))
+                else:
+                    continue
+            lines.append(line)
+    with open("app/src/main/res/values/settings.xml", "w") as fh:
+        for line in lines:
+            fh.write(line)
+
+
+def _lang_lines(langs: List[Tuple[str, bool]]) -> Iterator[str]:
+    yield "        <item />\n"
+    for lang, disabled in sorted(langs + [("en", False)]):
+        if disabled:
+            yield f"        <!-- <item>{lang}</item> -->\n"
+        else:
+            yield f"        <item>{lang}</item>\n"
+
+
+def main() -> None:
+    web_langs = get_weblate_langs()
+    dir_langs = get_dir_langs()
+    xml_langs = get_xml_langs()
+
+    web_codes = set(code for code, _ in web_langs)
+    dir_codes = set(dir_langs)
+    xml_codes = set(code for code, _ in xml_langs)
+
+    if diff := web_codes - dir_codes:
+        print(f"WARNING: Weblate codes w/o dir: {diff}")
+    if diff := xml_codes - dir_codes:
+        print(f"WARNING: XML codes w/o dir: {diff}")
+
+    percentages = dict(web_langs)
+    all_langs = xml_langs[:]
+
+    # add new langs as disabled
+    for code in dir_codes - xml_codes:
+        all_langs.append((code, True))
+
+    # enable disabled langs if they are at least MIN_PERCENT translated now
+    updated_langs = sorted(
+        (code, percentages[code] < MIN_PERCENT if disabled else disabled)
+        for code, disabled in all_langs
+    )
+
+    if updated_langs != xml_langs:
+        print("Updating...")
+        update_xml_langs(updated_langs)
+
+
+if __name__ == "__main__":
+    main()

CHANGELOG.md

@@ -1,9 +1,20 @@
 # Changelog
 
-## Unreleased - 132
+## v2.28.0 - 133 (2024-03-08)
+
+- Target Android 14
+- Open card icon in gallery on touch
+- Improve design of Photos tab in edit view
+- Update spending screen to also support receiving
+
+## v2.27.0 - 132 (2024-01-30)
 
 - Refine "Add card" workflow
 - Validation flow improvements
+- Fix edge case causing invalid UI state when toggling showing archive
+- Use theme or card colour for navigation bar (Android 8.1+)
+- Updated validity and expiry date selector
+- Add option to always rotate (ignoring system settings)
 
 ## v2.26.0 - 131 (2023-09-14)
 

CONTRIBUTING.md

@@ -1,13 +1,15 @@
-How to Submit Patches to the Catima Project
-===============================================================================
-https://github.com/TheLastProject/Catima
+# How to Submit Patches to the Catima Project
 
 This document is intended to act as a guide to help you contribute to the
-Catima project.  It is not perfect, and there will always be exceptions
+Catima project. It is not perfect, and there will always be exceptions
 to the rules described here, but by following the instructions below you
 should have a much easier time getting your work merged with the upstream
 project.
 
+When contributing, you certify that you agree to and have the rights to submit
+your contribution under the project's license and understand that git will
+store your name and email address in project history indefinitely.
+
 ## Translation Changes
 
 Translation changes are managed through [Weblate](https://hosted.weblate.org/projects/catima/).
@@ -57,44 +59,6 @@ if you can describe/include a reproducer for the problem in the description as
 well as instructions on how to test for the bug and verify that it has been
 fixed.
 
-### Sign Your Work
-
-The sign-off is a simple line at the end of the patch description, which
-certifies that you wrote it or otherwise have the right to pass it on as an
-open-source patch.  The "Developer's Certificate of Origin" pledge is taken
-from the Linux Kernel and the rules are pretty simple:
-
-	Developer's Certificate of Origin 1.1
-
-	By making a contribution to this project, I certify that:
-
-	(a) The contribution was created in whole or in part by me and I
-	    have the right to submit it under the open source license
-	    indicated in the file; or
-
-	(b) The contribution is based upon previous work that, to the best
-	    of my knowledge, is covered under an appropriate open source
-	    license and I have the right under that license to submit that
-	    work with modifications, whether created in whole or in part
-	    by me, under the same open source license (unless I am
-	    permitted to submit under a different license), as indicated
-	    in the file; or
-
-	(c) The contribution was provided directly to me by some other
-	    person who certified (a), (b) or (c) and I have not modified
-	    it.
-
-	(d) I understand and agree that this project and the contribution
-	    are public and that a record of the contribution (including all
-	    personal information I submit with it, including my sign-off) is
-	    maintained indefinitely and may be redistributed consistent with
-	    this project or the open source license(s) involved.
-
-... then you just add a line to the bottom of your patch description, with
-your real name, saying:
-
-	Signed-off-by: Random J Developer <random@developer.example.org>
-
 ### Submit Patch(es) for Review
 
 Finally, you will need to submit your patches so that they can be reviewed

Gemfile.lock

@@ -3,25 +3,25 @@ GEM
   specs:
     CFPropertyList (3.0.6)
       rexml
-    addressable (2.8.5)
+    addressable (2.8.6)
       public_suffix (>= 2.0.2, < 6.0)
     artifactory (3.0.15)
     atomos (0.1.3)
-    aws-eventstream (1.2.0)
-    aws-partitions (1.824.0)
-    aws-sdk-core (3.181.1)
-      aws-eventstream (~> 1, >= 1.0.2)
+    aws-eventstream (1.3.0)
+    aws-partitions (1.884.0)
+    aws-sdk-core (3.191.0)
+      aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
-      aws-sigv4 (~> 1.5)
+      aws-sigv4 (~> 1.8)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.71.0)
-      aws-sdk-core (~> 3, >= 3.177.0)
+    aws-sdk-kms (1.77.0)
+      aws-sdk-core (~> 3, >= 3.191.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.134.0)
-      aws-sdk-core (~> 3, >= 3.181.0)
+    aws-sdk-s3 (1.143.0)
+      aws-sdk-core (~> 3, >= 3.191.0)
       aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.6)
-    aws-sigv4 (1.6.0)
+      aws-sigv4 (~> 1.8)
+    aws-sigv4 (1.8.0)
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.4)
     claide (1.1.0)
@@ -32,11 +32,10 @@ GEM
     declarative (0.0.20)
     digest-crc (0.6.5)
       rake (>= 12.0.0, < 14.0.0)
-    domain_name (0.5.20190701)
-      unf (>= 0.0.5, < 1.0.0)
+    domain_name (0.6.20240107)
     dotenv (2.8.1)
     emoji_regex (3.2.3)
-    excon (0.103.0)
+    excon (0.109.0)
     faraday (1.10.3)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
@@ -65,8 +64,8 @@ GEM
     faraday-retry (1.0.3)
     faraday_middleware (1.2.0)
       faraday (~> 1.0)
-    fastimage (2.2.7)
-    fastlane (2.215.1)
+    fastimage (2.3.0)
+    fastlane (2.219.0)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.8, < 3.0.0)
       artifactory (~> 3.0)
@@ -85,6 +84,7 @@ GEM
       gh_inspector (>= 1.1.2, < 2.0.0)
       google-apis-androidpublisher_v3 (~> 0.3)
       google-apis-playcustomapp_v1 (~> 0.1)
+      google-cloud-env (>= 1.6.0, < 2.0.0)
       google-cloud-storage (~> 1.31)
       highline (~> 2.0)
       http-cookie (~> 1.0.5)
@@ -93,7 +93,7 @@ GEM
       mini_magick (>= 4.9.4, < 5.0.0)
       multipart-post (>= 2.0.0, < 3.0.0)
       naturally (~> 2.2)
-      optparse (~> 0.1.1)
+      optparse (>= 0.1.1)
       plist (>= 3.1.0, < 4.0.0)
       rubyzip (>= 2.0.0, < 3.0.0)
       security (= 0.1.3)
@@ -107,9 +107,9 @@ GEM
       xcpretty (~> 0.3.0)
       xcpretty-travis-formatter (>= 0.0.3)
     gh_inspector (1.1.3)
-    google-apis-androidpublisher_v3 (0.49.0)
+    google-apis-androidpublisher_v3 (0.54.0)
       google-apis-core (>= 0.11.0, < 2.a)
-    google-apis-core (0.11.1)
+    google-apis-core (0.11.3)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (>= 0.16.2, < 2.a)
       httpclient (>= 2.8.1, < 3.a)
@@ -117,28 +117,27 @@ GEM
       representable (~> 3.0)
       retriable (>= 2.0, < 4.a)
       rexml
-      webrick
     google-apis-iamcredentials_v1 (0.17.0)
       google-apis-core (>= 0.11.0, < 2.a)
     google-apis-playcustomapp_v1 (0.13.0)
       google-apis-core (>= 0.11.0, < 2.a)
-    google-apis-storage_v1 (0.19.0)
-      google-apis-core (>= 0.9.0, < 2.a)
-    google-cloud-core (1.6.0)
-      google-cloud-env (~> 1.0)
+    google-apis-storage_v1 (0.31.0)
+      google-apis-core (>= 0.11.0, < 2.a)
+    google-cloud-core (1.6.1)
+      google-cloud-env (>= 1.0, < 3.a)
       google-cloud-errors (~> 1.0)
     google-cloud-env (1.6.0)
       faraday (>= 0.17.3, < 3.0)
     google-cloud-errors (1.3.1)
-    google-cloud-storage (1.44.0)
+    google-cloud-storage (1.47.0)
       addressable (~> 2.8)
       digest-crc (~> 0.4)
       google-apis-iamcredentials_v1 (~> 0.1)
-      google-apis-storage_v1 (~> 0.19.0)
+      google-apis-storage_v1 (~> 0.31.0)
       google-cloud-core (~> 1.6)
       googleauth (>= 0.16.2, < 2.a)
       mini_mime (~> 1.0)
-    googleauth (1.8.0)
+    googleauth (1.8.1)
       faraday (>= 0.17.3, < 3.a)
       jwt (>= 1.4, < 3.0)
       multi_json (~> 1.11)
@@ -149,7 +148,7 @@ GEM
       domain_name (~> 0.5)
     httpclient (2.8.3)
     jmespath (1.6.2)
-    json (2.6.3)
+    json (2.7.1)
     jwt (2.7.1)
     mini_magick (4.12.0)
     mini_mime (1.1.5)
@@ -157,11 +156,11 @@ GEM
     multipart-post (2.3.0)
     nanaimo (0.3.0)
     naturally (2.2.1)
-    optparse (0.1.1)
+    optparse (0.4.0)
     os (1.1.4)
-    plist (3.7.0)
-    public_suffix (5.0.3)
-    rake (13.0.6)
+    plist (3.7.1)
+    public_suffix (5.0.4)
+    rake (13.1.0)
     representable (3.2.0)
       declarative (< 0.1.0)
       trailblazer-option (>= 0.1.1, < 0.2.0)
@@ -185,17 +184,13 @@ GEM
       unicode-display_width (>= 1.1.1, < 3)
     trailblazer-option (0.1.2)
     tty-cursor (0.7.1)
-    tty-screen (0.8.1)
+    tty-screen (0.8.2)
     tty-spinner (0.9.3)
       tty-cursor (~> 0.7)
     uber (0.1.0)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.8.2)
-    unicode-display_width (2.4.2)
-    webrick (1.8.1)
+    unicode-display_width (2.5.0)
     word_wrap (1.0.0)
-    xcodeproj (1.22.0)
+    xcodeproj (1.24.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)

app/build.gradle

@@ -1,146 +0,0 @@
-import com.github.spotbugs.snom.SpotBugsTask
-
-plugins {
-    id 'com.android.application'
-    id 'com.github.spotbugs'
-}
-
-spotbugs {
-    ignoreFailures = false
-    effort = 'max'
-    excludeFilter = file("./config/spotbugs/exclude.xml")
-    reportsDir = file("$buildDir/reports/spotbugs/")
-}
-
-android {
-    compileSdk 33
-
-    defaultConfig {
-        applicationId "me.hackerchick.catima"
-        minSdk 21
-        targetSdk 33
-        versionCode 131
-        versionName "2.26.0"
-
-        vectorDrawables.useSupportLibrary true
-        multiDexEnabled true
-
-        resourceConfigurations += ["ar", "bg", "bn", "bn-rIN", "bs", "cs", "da", "de", "el-rGR", "en", "eo", "es", "es-rAR", "fi", "fr", "he-rIL", "hi", "hr", "hu", "in-rID", "is", "it", "ja", "ko", "lt", "lv", "nb-rNO", "nl", "oc", "pl", "pt", "ro-rRO", "ru", "sk", "sl", "sv", "tr", "uk", "zh-rTW", "zh-rCN"]
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled true
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-            resValue "string", "app_name", "Catima"
-        }
-        debug {
-            applicationIdSuffix ".debug"
-            resValue "string", "app_name", "Catima Debug"
-        }
-    }
-
-    buildFeatures {
-        viewBinding true
-    }
-
-    bundle {
-        language {
-            enableSplit = false
-        }
-    }
-
-    compileOptions {
-        encoding "UTF-8"
-
-        // Flag to enable support for the new language APIs
-        coreLibraryDesugaringEnabled true
-
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
-    }
-
-
-    sourceSets {
-        test {
-            resources.srcDirs += ['src/test/res']
-        }
-    }
-
-    // Starting with Android Studio 3 Robolectric is unable to find resources.
-    // The following allows it to find the resources.
-    testOptions {
-        unitTests {
-            all {
-                testLogging {
-                    events 'started', 'passed', 'skipped', 'failed'
-                }
-            }
-            includeAndroidResources true
-        }
-    }
-    lint {
-        lintConfig file('lint.xml')
-    }
-    namespace 'protect.card_locker'
-}
-
-dependencies {
-// AndroidX
-    implementation 'androidx.appcompat:appcompat:1.6.1'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    implementation 'androidx.exifinterface:exifinterface:1.3.6'
-    implementation 'androidx.palette:palette:1.0.0'
-    implementation 'androidx.preference:preference:1.2.0'
-    implementation 'com.google.android.material:material:1.9.0'
-    implementation 'com.github.yalantis:ucrop:2.2.8'
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.3'
-
-// Splash Screen
-    implementation 'androidx.core:core-splashscreen:1.0.1'
-
-// Third-party
-    implementation 'com.journeyapps:zxing-android-embedded:4.3.0@aar'
-    implementation 'com.google.zxing:core:3.5.2'
-    implementation 'org.apache.commons:commons-csv:1.9.0'
-    implementation 'com.jaredrummler:colorpicker:1.1.0'
-    implementation 'net.lingala.zip4j:zip4j:2.11.5'
-
-// SpotBugs
-    implementation 'io.wcm.tooling.spotbugs:io.wcm.tooling.spotbugs.annotations:1.0.0'
-
-// Testing
-    testImplementation 'androidx.test:core:1.5.0'
-    testImplementation 'junit:junit:4.13.2'
-    testImplementation 'org.robolectric:robolectric:4.10.3'
-}
-
-tasks.withType(SpotBugsTask) {
-
-    description 'Run spotbugs'
-    group 'verification'
-
-    //classes = fileTree('build/intermediates/javac/debug/compileDebugJavaWithJavac/classes')
-    //source = fileTree('src/main/java')
-    //classpath = files()
-
-    reports {
-        xml.enabled = false
-        html.enabled = true
-    }
-}
-
-tasks.register('copyRawResFiles', Copy) {
-    from layout.projectDirectory.file("../CHANGELOG.md"),
-         layout.projectDirectory.file("../PRIVACY.md")
-    into layout.projectDirectory.dir("src/main/res/raw")
-    rename { String fileName -> fileName.toLowerCase() }
-}
-
-project.afterEvaluate {
-    tasks.each { task ->
-        if (task != copyRawResFiles) {
-            task.dependsOn(copyRawResFiles)
-        }
-    }
-}

app/build.gradle.kts

@@ -0,0 +1,145 @@
+import com.android.build.gradle.internal.tasks.factory.dependsOn
+import com.github.spotbugs.snom.SpotBugsTask
+
+plugins {
+    id("com.android.application")
+    id("com.github.spotbugs")
+}
+
+spotbugs {
+    ignoreFailures.set(false)
+    setEffort("max")
+    excludeFilter.set(file("./config/spotbugs/exclude.xml"))
+    reportsDir.set(layout.buildDirectory.file("reports/spotbugs/").get().asFile)
+}
+
+android {
+    namespace = "protect.card_locker"
+    compileSdk = 34
+
+    defaultConfig {
+        applicationId = "me.hackerchick.catima"
+        minSdk = 21
+        targetSdk = 34
+        versionCode = 133
+        versionName = "2.28.0"
+
+        vectorDrawables.useSupportLibrary = true
+        multiDexEnabled = true
+
+        resourceConfigurations += listOf("ar", "bg", "bn", "bn-rIN", "bs", "cs", "da", "de", "el-rGR", "en", "eo", "es", "es-rAR", "fi", "fr", "he-rIL", "hi", "hr", "hu", "in-rID", "is", "it", "ja", "ko", "lt", "lv", "nb-rNO", "nl", "oc", "pl", "pt-rPT", "ro-rRO", "ru", "sk", "sl", "sv", "tr", "uk", "vi", "zh-rCN", "zh-rTW")
+    }
+
+    buildTypes {
+        release {
+            isMinifyEnabled = true
+            proguardFiles(
+                getDefaultProguardFile("proguard-android.txt"),
+                "proguard-rules.pro"
+            )
+        }
+        debug {
+            applicationIdSuffix = ".debug"
+        }
+    }
+
+    buildFeatures {
+        buildConfig = true
+        viewBinding = true
+    }
+
+    bundle {
+        language {
+            enableSplit = false
+        }
+    }
+
+    compileOptions {
+        encoding = "UTF-8"
+
+        // Flag to enable support for the new language APIs
+        isCoreLibraryDesugaringEnabled = true
+
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
+
+    sourceSets {
+        getByName("test") {
+            resources.srcDirs("src/test/res")
+        }
+    }
+
+    // Starting with Android Studio 3 Robolectric is unable to find resources.
+    // The following allows it to find the resources.
+    testOptions.unitTests.isIncludeAndroidResources = true
+    tasks.withType<Test>().configureEach {
+        testLogging {
+            events("started", "passed", "skipped", "failed")
+        }
+    }
+
+    lint {
+        lintConfig = file("lint.xml")
+    }
+}
+
+dependencies {
+
+    // AndroidX
+    implementation("androidx.appcompat:appcompat:1.6.1")
+    implementation("androidx.constraintlayout:constraintlayout:2.1.4")
+    implementation("androidx.exifinterface:exifinterface:1.3.7")
+    implementation("androidx.palette:palette:1.0.0")
+    implementation("androidx.preference:preference:1.2.1")
+    implementation("com.google.android.material:material:1.11.0")
+    implementation("com.github.yalantis:ucrop:2.2.8")
+    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.0.4")
+
+    // Splash Screen
+    implementation("androidx.core:core-splashscreen:1.0.1")
+
+    // Third-party
+    implementation("com.journeyapps:zxing-android-embedded:4.3.0@aar")
+    implementation("com.google.zxing:core:3.5.3")
+    implementation("org.apache.commons:commons-csv:1.9.0")
+    implementation("com.jaredrummler:colorpicker:1.1.0")
+    implementation("net.lingala.zip4j:zip4j:2.11.5")
+
+    // SpotBugs
+    implementation("io.wcm.tooling.spotbugs:io.wcm.tooling.spotbugs.annotations:1.0.0")
+
+    // Testing
+    testImplementation("androidx.test:core:1.5.0")
+    testImplementation("junit:junit:4.13.2")
+    testImplementation("org.robolectric:robolectric:4.11.1")
+}
+
+tasks.withType<SpotBugsTask>().configureEach {
+    description = "Run spotbugs"
+    group = "verification"
+
+    //classes = fileTree("build/intermediates/javac/debug/compileDebugJavaWithJavac/classes")
+    //source = fileTree("src/main/java")
+    //classpath = files()
+
+    reports.maybeCreate("xml").required.set(false)
+    reports.maybeCreate("html").required.set(true)
+}
+
+tasks.register("copyRawResFiles", Copy::class) {
+    from(
+        layout.projectDirectory.file("../CHANGELOG.md"),
+        layout.projectDirectory.file("../PRIVACY.md")
+    )
+    into(layout.projectDirectory.dir("src/main/res/raw"))
+    rename { it.lowercase() }
+}.also {
+    tasks.preBuild.dependsOn(it)
+    tasks.getByName<Delete>("clean") {
+        val filesNamesToDelete = listOf("CHANGELOG", "PRIVACY")
+        filesNamesToDelete.forEach { fileName ->
+            delete(layout.projectDirectory.file("src/main/res/raw/${fileName.lowercase()}.md"))
+        }
+    }
+}

app/proguard-rules.pro

@@ -2,7 +2,7 @@
 # By default, the flags in this file are appended to flags specified
 # in /Users/brarcher/Library/Android/sdk/tools/proguard/proguard-android.txt
 # You can edit the include path and order by changing the proguardFiles
-# directive in build.gradle.
+# directive in build.gradle.kts.
 #
 # For more details, see
 #   http://developer.android.com/guide/developing/tools/proguard.html

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

app/src/main/AndroidManifest.xml

@@ -24,6 +24,7 @@
     <application
         android:name=".LoyaltyCardLockerApplication"
         android:allowBackup="true"
+        android:enableOnBackInvokedCallback="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:supportsRtl="true"
@@ -32,7 +33,6 @@
         <activity
             android:name=".MainActivity"
             android:exported="true"
-            android:label="@string/app_name"
             android:theme="@style/Theme.App.Starting">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -111,10 +111,12 @@
             android:name=".preferences.SettingsActivity"
             android:label="@string/settings"
             android:theme="@style/AppTheme.NoActionBar" />
+        <!-- FIXME: locked screenOrientation is a workaround for https://github.com/CatimaLoyalty/Android/issues/1715, remove when https://github.com/CatimaLoyalty/Android/issues/513 is fixed -->
         <activity
             android:name=".ImportExportActivity"
             android:label="@string/importExport"
             android:exported="true"
+            android:screenOrientation="locked"
             android:theme="@style/AppTheme.NoActionBar">
 
             <!-- ZIP Intent Filter -->

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

@@ -7,11 +7,11 @@ import android.view.View;
 import android.widget.ScrollView;
 import android.widget.TextView;
 
+import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
 
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 
-
 import protect.card_locker.databinding.AboutActivityBinding;
 
 public class AboutActivity extends CatimaAppCompatActivity {
@@ -43,7 +43,7 @@ public class AboutActivity extends CatimaAppCompatActivity {
         binding.privacy.setTag("https://catima.app/privacy-policy/");
         binding.reportError.setTag("https://github.com/CatimaLoyalty/Android/issues");
         binding.rate.setTag("https://play.google.com/store/apps/details?id=me.hackerchick.catima");
-        binding.donate.setTag("https://catima.app/contribute/#donating");
+        binding.donate.setTag("https://catima.app/donate");
 
         boolean installedFromGooglePlay = Utils.installedFromGooglePlay(this);
         // Hide Google Play rate button if not on Google Play
@@ -98,11 +98,7 @@ public class AboutActivity extends CatimaAppCompatActivity {
     }
 
     private void showCredits() {
-        new MaterialAlertDialogBuilder(this)
-                .setTitle(R.string.credits)
-                .setMessage(content.getContributorInfo())
-                .setPositiveButton(R.string.ok, null)
-                .show();
+        showHTML(R.string.credits, content.getContributorInfo(), null);
     }
 
     private void showHistory(View view) {
@@ -117,7 +113,7 @@ public class AboutActivity extends CatimaAppCompatActivity {
         showHTML(R.string.privacy_policy, content.getPrivacyInfo(), view);
     }
 
-    private void showHTML(@StringRes int title, final Spanned text, View view) {
+    private void showHTML(@StringRes int title, final Spanned text, @Nullable View view) {
         int dialogContentPadding = getResources().getDimensionPixelSize(R.dimen.alert_dialog_content_padding);
         TextView textView = new TextView(this);
         textView.setText(text);
@@ -125,12 +121,21 @@ public class AboutActivity extends CatimaAppCompatActivity {
         ScrollView scrollView = new ScrollView(this);
         scrollView.addView(textView);
         scrollView.setPadding(dialogContentPadding, dialogContentPadding / 2, dialogContentPadding, 0);
-        new MaterialAlertDialogBuilder(this)
+
+        // Create dialog
+        MaterialAlertDialogBuilder materialAlertDialogBuilder = new MaterialAlertDialogBuilder(this);
+        materialAlertDialogBuilder
                 .setTitle(title)
                 .setView(scrollView)
-                .setPositiveButton(R.string.ok, null)
-                .setNeutralButton(R.string.view_online, (dialog, which) -> openExternalBrowser(view))
-                .show();
+                .setPositiveButton(R.string.ok, null);
+
+        // Add View online button if an URL is linked to this view
+        if (view != null && view.getTag() != null) {
+            materialAlertDialogBuilder.setNeutralButton(R.string.view_online, (dialog, which) -> openExternalBrowser(view));
+        }
+
+        // Show dialog
+        materialAlertDialogBuilder.show();
     }
 
     private void openExternalBrowser(View view) {

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

@@ -129,19 +129,19 @@ public class AboutContent {
         return result.toString();
     }
 
-    public String getContributorInfo() {
+    public Spanned getContributorInfo() {
         StringBuilder contributorInfo = new StringBuilder();
         contributorInfo.append(getCopyright());
-        contributorInfo.append("\n\n");
+        contributorInfo.append("<br/><br/>");
         contributorInfo.append(context.getString(R.string.app_copyright_old));
-        contributorInfo.append("\n\n");
-        contributorInfo.append(HtmlCompat.fromHtml(String.format(context.getString(R.string.app_contributors), getContributors()), HtmlCompat.FROM_HTML_MODE_COMPACT));
-        contributorInfo.append("\n\n");
-        contributorInfo.append(HtmlCompat.fromHtml(String.format(context.getString(R.string.app_libraries), getThirdPartyLibraries()), HtmlCompat.FROM_HTML_MODE_COMPACT));
-        contributorInfo.append("\n\n");
-        contributorInfo.append(HtmlCompat.fromHtml(String.format(context.getString(R.string.app_resources), getUsedThirdPartyAssets()), HtmlCompat.FROM_HTML_MODE_COMPACT));
+        contributorInfo.append("<br/><br/>");
+        contributorInfo.append(String.format(context.getString(R.string.app_contributors), getContributors()));
+        contributorInfo.append("<br/><br/>");
+        contributorInfo.append(String.format(context.getString(R.string.app_libraries), getThirdPartyLibraries()));
+        contributorInfo.append("<br/><br/>");
+        contributorInfo.append(String.format(context.getString(R.string.app_resources), getUsedThirdPartyAssets()));
 
-        return contributorInfo.toString();
+        return HtmlCompat.fromHtml(contributorInfo.toString(), HtmlCompat.FROM_HTML_MODE_COMPACT);
     }
 
     public Spanned getHistoryInfo() {

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

@@ -12,12 +12,12 @@ import android.widget.EditText;
 import android.widget.ListView;
 import android.widget.Toast;
 
+import androidx.appcompat.widget.Toolbar;
+
 import com.google.zxing.BarcodeFormat;
 
 import java.util.ArrayList;
 
-import androidx.appcompat.widget.Toolbar;
-
 import protect.card_locker.databinding.BarcodeSelectorActivityBinding;
 
 /**

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

@@ -15,13 +15,13 @@ import android.service.controls.actions.ControlAction;
 import android.service.controls.templates.StatelessTemplate;
 import android.util.Log;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.RequiresApi;
+
 import java.util.List;
 import java.util.concurrent.Flow;
 import java.util.function.Consumer;
 
-import androidx.annotation.NonNull;
-import androidx.annotation.RequiresApi;
-
 @RequiresApi(Build.VERSION_CODES.R)
 public class CardsOnPowerScreenService extends ControlsProviderService {
 

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

@@ -5,6 +5,7 @@ import android.graphics.Color;
 import android.os.Build;
 import android.os.Bundle;
 import android.view.View;
+import android.view.Window;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -13,6 +14,8 @@ import androidx.appcompat.app.AppCompatActivity;
 import androidx.core.view.WindowInsetsControllerCompat;
 
 public class CatimaAppCompatActivity extends AppCompatActivity {
+    protected boolean activityOverridesNavBarColor = false;
+
     @Override
     protected void attachBaseContext(Context base) {
         // Apply chosen language
@@ -30,20 +33,31 @@ public class CatimaAppCompatActivity extends AppCompatActivity {
         super.onPostCreate(savedInstanceState);
         // material 3 designer does not consider status bar colors
         // XXX changing this in onCreate causes issues with the splash screen activity, so doing this here
-        boolean darkMode = Utils.isDarkModeEnabled(this);
-        if (Build.VERSION.SDK_INT >= 23) {
-            View decorView = getWindow().getDecorView();
-            WindowInsetsControllerCompat wic = new WindowInsetsControllerCompat(getWindow(), decorView);
-            wic.setAppearanceLightStatusBars(!darkMode);
-            getWindow().setStatusBarColor(Color.TRANSPARENT);
-        } else {
-            // icons are always white back then
-            getWindow().setStatusBarColor(darkMode ? Color.TRANSPARENT : Color.argb(127, 0, 0, 0));
+        Window window = getWindow();
+        if (window != null) {
+            boolean darkMode = Utils.isDarkModeEnabled(this);
+            if (Build.VERSION.SDK_INT >= 23) {
+                View decorView = window.getDecorView();
+                WindowInsetsControllerCompat wic = new WindowInsetsControllerCompat(window, decorView);
+                wic.setAppearanceLightStatusBars(!darkMode);
+                window.setStatusBarColor(Color.TRANSPARENT);
+            } else {
+                // icons are always white back then
+                window.setStatusBarColor(darkMode ? Color.TRANSPARENT : Color.argb(127, 0, 0, 0));
+            }
         }
         // XXX android 9 and below has a nasty rendering bug if the theme was patched earlier
         Utils.postPatchColors(this);
     }
 
+    @Override
+    protected void onResume() {
+        super.onResume();
+        if (!activityOverridesNavBarColor) {
+            Utils.setNavigationBarColor(this, null, Utils.resolveBackgroundColor(this), !Utils.isDarkModeEnabled(this));
+        }
+    }
+
     protected void enableToolbarBackButton() {
         ActionBar actionBar = getSupportActionBar();
         if (actionBar != null) {

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

@@ -8,14 +8,12 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
-import android.widget.ImageButton;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 
 import protect.card_locker.databinding.GroupLayoutBinding;
-import protect.card_locker.preferences.Settings;
 
 public class GroupCursorAdapter extends BaseCursorAdapter<GroupCursorAdapter.GroupListItemViewHolder> {
     public final Context mContext;

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

@@ -1,10 +1,8 @@
 package protect.card_locker;
 
-import android.Manifest;
 import android.content.ActivityNotFoundException;
 import android.content.DialogInterface;
 import android.content.Intent;
-import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.Bundle;
 import android.text.InputType;
@@ -14,25 +12,24 @@ import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.FrameLayout;
+import android.widget.LinearLayout;
 import android.widget.Toast;
 
+import androidx.activity.result.ActivityResultLauncher;
+import androidx.activity.result.contract.ActivityResultContracts;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.widget.Toolbar;
+
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+import com.google.android.material.textfield.TextInputLayout;
+
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.List;
 
-import androidx.activity.result.ActivityResultLauncher;
-import androidx.activity.result.contract.ActivityResultContracts;
-import androidx.annotation.Nullable;
-import androidx.appcompat.app.ActionBar;
-import androidx.appcompat.app.AlertDialog;
-import androidx.appcompat.widget.Toolbar;
-import androidx.core.app.ActivityCompat;
-import androidx.core.content.ContextCompat;
-
-import com.google.android.material.dialog.MaterialAlertDialogBuilder;
-
 import protect.card_locker.async.TaskHandler;
 import protect.card_locker.databinding.ImportExportActivityBinding;
 import protect.card_locker.importexport.DataFormat;
@@ -126,16 +123,19 @@ public class ImportExportActivity extends CatimaAppCompatActivity {
             builder.setTitle(R.string.exportPassword);
 
             FrameLayout container = new FrameLayout(ImportExportActivity.this);
-            FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
-            params.leftMargin = 50;
-            params.rightMargin = 50;
+
+            final TextInputLayout textInputLayout = new TextInputLayout(ImportExportActivity.this);
+            textInputLayout.setEndIconMode(TextInputLayout.END_ICON_PASSWORD_TOGGLE);
+            LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+            params.setMargins(50, 10, 50, 0);
+            textInputLayout.setLayoutParams(params);
 
             final EditText input = new EditText(ImportExportActivity.this);
             input.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD);
-            input.setLayoutParams(params);
             input.setHint(R.string.exportPasswordHint);
 
-            container.addView(input);
+            textInputLayout.addView(input);
+            container.addView(textInputLayout);
             builder.setView(container);
             builder.setPositiveButton(R.string.ok, (dialogInterface, i) -> {
                 exportPassword = input.getText().toString();
@@ -148,7 +148,6 @@ public class ImportExportActivity extends CatimaAppCompatActivity {
             });
             builder.setNegativeButton(R.string.cancel, (dialogInterface, i) -> dialogInterface.cancel());
             builder.show();
-
         });
 
         // Check that there is a file manager available
@@ -320,9 +319,21 @@ public class ImportExportActivity extends CatimaAppCompatActivity {
         AlertDialog.Builder builder = new MaterialAlertDialogBuilder(this);
         builder.setTitle(R.string.passwordRequired);
 
-        final EditText input = new EditText(this);
+        FrameLayout container = new FrameLayout(ImportExportActivity.this);
+
+        final TextInputLayout textInputLayout = new TextInputLayout(ImportExportActivity.this);
+        textInputLayout.setEndIconMode(TextInputLayout.END_ICON_PASSWORD_TOGGLE);
+        LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+        params.setMargins(50, 10, 50, 0);
+        textInputLayout.setLayoutParams(params);
+
+        final EditText input = new EditText(ImportExportActivity.this);
         input.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD);
-        builder.setView(input);
+        input.setHint(R.string.exportPasswordHint);
+
+        textInputLayout.addView(input);
+        container.addView(textInputLayout);
+        builder.setView(container);
 
         builder.setPositiveButton(R.string.ok, (dialogInterface, i) -> {
             openFileForImport(uri, input.getText().toString().toCharArray());

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

@@ -4,13 +4,13 @@ import android.database.Cursor;
 import android.os.Parcel;
 import android.os.Parcelable;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import java.math.BigDecimal;
 import java.util.Currency;
 import java.util.Date;
 
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
 public class LoyaltyCard implements Parcelable {
     public final int id;
     public final String store;

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

@@ -15,13 +15,6 @@ import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.google.android.material.card.MaterialCardView;
-import com.google.android.material.color.MaterialColors;
-
-import java.math.BigDecimal;
-import java.text.DateFormat;
-import java.util.ArrayList;
-
 import androidx.annotation.NonNull;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.core.content.ContextCompat;
@@ -29,6 +22,13 @@ import androidx.core.graphics.BlendModeColorFilterCompat;
 import androidx.core.graphics.BlendModeCompat;
 import androidx.recyclerview.widget.RecyclerView;
 
+import com.google.android.material.card.MaterialCardView;
+import com.google.android.material.color.MaterialColors;
+
+import java.math.BigDecimal;
+import java.text.DateFormat;
+import java.util.ArrayList;
+
 import protect.card_locker.databinding.LoyaltyCardLayoutBinding;
 
 public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCursorAdapter.LoyaltyCardListItemViewHolder> {
@@ -123,8 +123,7 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
         }
 
         inputHolder.mCardIcon.setContentDescription(loyaltyCard.store);
-        Utils.setIconOrTextWithBackground(mContext, loyaltyCard, icon, inputHolder.mCardIcon, inputHolder.mCardText);
-        inputHolder.setIconBackgroundColor(Utils.getHeaderColor(mContext, loyaltyCard));
+        inputHolder.mIconBackgroundColor = Utils.setIconOrTextWithBackground(mContext, loyaltyCard, icon, inputHolder.mCardIcon, inputHolder.mCardText);
 
         inputHolder.toggleCardStateIcon(loyaltyCard.starStatus != 0, loyaltyCard.archiveStatus != 0, itemSelected(inputCursor.getPosition()));
 
@@ -339,11 +338,6 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
             mArchivedBackground.invalidate();
 
         }
-
-        public void setIconBackgroundColor(int color) {
-            mIconBackgroundColor = color;
-            mCardIcon.setBackgroundColor(color);
-        }
     }
 
     public int dpToPx(int dp, Context mContext) {

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

@@ -2,8 +2,6 @@ package protect.card_locker;
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
-import android.app.DatePickerDialog;
-import android.app.Dialog;
 import android.content.ActivityNotFoundException;
 import android.content.Context;
 import android.content.Intent;
@@ -29,33 +27,34 @@ import android.view.WindowManager;
 import android.widget.ArrayAdapter;
 import android.widget.AutoCompleteTextView;
 import android.widget.Button;
-import android.widget.DatePicker;
 import android.widget.EditText;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import androidx.activity.OnBackPressedCallback;
 import androidx.activity.result.ActivityResultLauncher;
 import androidx.activity.result.contract.ActivityResultContracts;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
 import androidx.appcompat.app.AlertDialog;
-import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.AppCompatTextView;
 import androidx.appcompat.widget.Toolbar;
 import androidx.core.content.ContextCompat;
 import androidx.core.content.FileProvider;
 import androidx.exifinterface.media.ExifInterface;
-import androidx.fragment.app.DialogFragment;
 
 import com.google.android.material.chip.Chip;
 import com.google.android.material.chip.ChipGroup;
 import com.google.android.material.color.MaterialColors;
+import com.google.android.material.datepicker.CalendarConstraints;
+import com.google.android.material.datepicker.DateValidatorPointBackward;
+import com.google.android.material.datepicker.DateValidatorPointForward;
+import com.google.android.material.datepicker.MaterialDatePicker;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
-import com.google.android.material.snackbar.Snackbar;
 import com.google.android.material.tabs.TabLayout;
 import com.jaredrummler.android.colorpicker.ColorPickerDialog;
 import com.jaredrummler.android.colorpicker.ColorPickerDialogListener;
@@ -74,7 +73,6 @@ import java.util.Calendar;
 import java.util.Collections;
 import java.util.Currency;
 import java.util.Date;
-import java.util.GregorianCalendar;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
@@ -94,6 +92,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
 
     private final String STATE_TAB_INDEX = "savedTab";
     private final String STATE_TEMP_CARD = "tempLoyaltyCard";
+    private final String STATE_TEMP_CARD_FIELD = "tempLoyaltyCardField";
     private final String STATE_REQUESTED_IMAGE = "requestedImage";
     private final String STATE_FRONT_IMAGE_UNSAVED = "frontImageUnsaved";
     private final String STATE_BACK_IMAGE_UNSAVED = "backImageUnsaved";
@@ -105,6 +104,9 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
     private final String STATE_ICON_REMOVED = "iconRemoved";
     private final String STATE_OPEN_SET_ICON_MENU = "openSetIconMenu";
 
+    private static final String PICK_DATE_REQUEST_KEY = "pick_date_request";
+    private static final String NEWLY_PICKED_DATE_ARGUMENT_KEY = "newly_picked_date";
+
     private final String TEMP_CAMERA_IMAGE_NAME = LoyaltyCardEditActivity.class.getSimpleName() + "_camera_image.jpg";
     private final String TEMP_CROP_IMAGE_NAME = LoyaltyCardEditActivity.class.getSimpleName() + "_crop_image.png";
     private final Bitmap.CompressFormat TEMP_CROP_IMAGE_FORMAT = Bitmap.CompressFormat.PNG;
@@ -182,6 +184,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
     HashMap<String, String> currencySymbols = new HashMap<>();
 
     LoyaltyCard tempLoyaltyCard;
+    LoyaltyCardField tempLoyaltyCardField;
 
     ActivityResultLauncher<Uri> mPhotoTakerLauncher;
     ActivityResultLauncher<Intent> mPhotoPickerLauncher;
@@ -267,6 +270,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
         tabs = binding.tabs;
         savedInstanceState.putInt(STATE_TAB_INDEX, tabs.getSelectedTabPosition());
         savedInstanceState.putParcelable(STATE_TEMP_CARD, tempLoyaltyCard);
+        savedInstanceState.putSerializable(STATE_TEMP_CARD_FIELD, tempLoyaltyCardField);
         savedInstanceState.putInt(STATE_REQUESTED_IMAGE, mRequestedImage);
 
         Object cardImageFrontObj = cardImageFront.getTag();
@@ -302,6 +306,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
     public void onRestoreInstanceState(@NonNull Bundle savedInstanceState) {
         onRestoring = true;
         tempLoyaltyCard = savedInstanceState.getParcelable(STATE_TEMP_CARD);
+        tempLoyaltyCardField = (LoyaltyCardField) savedInstanceState.getSerializable(STATE_TEMP_CARD_FIELD);
         super.onRestoreInstanceState(savedInstanceState);
         tabs = binding.tabs;
         tabs.selectTab(tabs.getTabAt(savedInstanceState.getInt(STATE_TAB_INDEX)));
@@ -387,20 +392,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
 
         addDateFieldTextChangedListener(expiryField, R.string.never, R.string.chooseExpiryDate, LoyaltyCardField.expiry);
 
-        DatePickerFragment.registerDatePickListener(this, (textFieldToEdit, newDate) -> {
-            switch (textFieldToEdit) {
-                case validFrom:
-                    formatDateField(this, validFromField, newDate);
-                    updateTempState(LoyaltyCardField.validFrom, newDate);
-                    break;
-                case expiry:
-                    formatDateField(this, expiryField, newDate);
-                    updateTempState(LoyaltyCardField.expiry, newDate);
-                    break;
-                default:
-                    throw new AssertionError("Unexpected field: " + textFieldToEdit);
-            }
-        });
+        setMaterialDatePickerResultListener();
 
         balanceField.setOnFocusChangeListener((v, hasFocus) -> {
             if (!hasFocus && !onResuming && !onRestoring) {
@@ -705,6 +697,13 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
         });
 
         mCropperOptions = new UCrop.Options();
+
+        getOnBackPressedDispatcher().addCallback(this, new OnBackPressedCallback(true) {
+            @Override
+            public void handleOnBackPressed() {
+                askBeforeQuitIfChanged();
+            }
+        });
     }
 
     // ucrop 2.2.6 initial aspect ratio is glitched when 0x0 is used as the initial ratio option
@@ -778,7 +777,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
 
     @SuppressLint("DefaultLocale")
     @Override
-    public void onResume() {
+    protected void onResume() {
         super.onResume();
 
         Log.i(TAG, "To view card: " + loyaltyCardId);
@@ -1016,14 +1015,14 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
                     if (!lastValue.toString().equals(getString(chooseDateOptionStringId))) {
                         dateField.setText(lastValue);
                     }
-                    DialogFragment datePickerFragment = DatePickerFragment.newInstance(
+                    showDatePicker(
                             loyaltyCardField,
                             (Date) dateField.getTag(),
                             // if the expiry date is being set, set date picker's minDate to the 'valid from' date
                             loyaltyCardField == LoyaltyCardField.expiry ? (Date) validFromField.getTag() : null,
                             // if the 'valid from' date is being set, set date picker's maxDate to the expiry date
-                            loyaltyCardField == LoyaltyCardField.validFrom ? (Date) expiryField.getTag() : null);
-                    datePickerFragment.show(getSupportFragmentManager(), "datePicker");
+                            loyaltyCardField == LoyaltyCardField.validFrom ? (Date) expiryField.getTag() : null
+                    );
                 }
             }
 
@@ -1064,11 +1063,6 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
         }
     }
 
-    @Override
-    public void onBackPressed() {
-        askBeforeQuitIfChanged();
-    }
-
     @Override
     public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
         super.onRequestPermissionsResult(requestCode, permissions, grantResults);
@@ -1379,103 +1373,106 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity implements
         // Nothing to do, no change made
     }
 
-    public static class DatePickerFragment extends DialogFragment
-            implements DatePickerDialog.OnDateSetListener {
+    private void showDatePicker(
+            LoyaltyCardField loyaltyCardField,
+            @Nullable Date selectedDate,
+            @Nullable Date minDate,
+            @Nullable Date maxDate
+    ) {
+        // Create a new instance of MaterialDatePicker and return it
+        long startDate = minDate != null ? minDate.getTime() : getDefaultMinDateOfDatePicker();
+        long endDate = maxDate != null ? maxDate.getTime() : getDefaultMaxDateOfDatePicker();
 
-        public interface OnDatePickListener {
-            void onDatePicked(@NonNull LoyaltyCardField textFieldToEdit, @NonNull Date newDate);
+        CalendarConstraints.DateValidator dateValidator;
+        switch (loyaltyCardField) {
+            case validFrom:
+                dateValidator = DateValidatorPointBackward.before(endDate);
+                break;
+            case expiry:
+                dateValidator = DateValidatorPointForward.from(startDate);
+                break;
+            default:
+                throw new AssertionError("Unexpected field: " + loyaltyCardField);
         }
 
-        private static final String TEXT_FIELD_TO_EDIT_ARGUMENT_KEY = "text_field_to_edit";
-        private static final String CURRENT_DATE_ARGUMENT_KEY = "current_date";
-        private static final String MIN_DATE_ARGUMENT_KEY = "min_date";
-        private static final String MAX_DATE_ARGUMENT_KEY = "max_date";
-        private static final String PICK_DATE_REQUEST_KEY = "pick_date_request";
-        private static final String NEWLY_PICKED_DATE_ARGUMENT_KEY = "newly_picked_date";
+        CalendarConstraints calendarConstraints = new CalendarConstraints.Builder()
+                .setValidator(dateValidator)
+                .setStart(startDate)
+                .setEnd(endDate)
+                .build();
 
-        LoyaltyCardField textFieldEdit;
-        @Nullable
-        Date minDate;
-        @Nullable
-        Date maxDate;
-
-        public static DatePickerFragment newInstance(@NonNull LoyaltyCardField textField, @Nullable Date currentDate, @Nullable Date minDate, @Nullable Date maxDate) {
-            Bundle args = new Bundle();
-            args.putSerializable(TEXT_FIELD_TO_EDIT_ARGUMENT_KEY, textField);
-            args.putSerializable(CURRENT_DATE_ARGUMENT_KEY, currentDate);
-            args.putSerializable(MIN_DATE_ARGUMENT_KEY, minDate);
-            args.putSerializable(MAX_DATE_ARGUMENT_KEY, maxDate);
-            DatePickerFragment fragment = new DatePickerFragment();
-            fragment.setArguments(args);
-            return fragment;
+        // Use the selected date as the default date in the picker
+        final Calendar calendar = Calendar.getInstance();
+        if (selectedDate != null) {
+            calendar.setTime(selectedDate);
         }
 
-        public static void registerDatePickListener(@NonNull AppCompatActivity activity, @NonNull OnDatePickListener listener) {
-            activity.getSupportFragmentManager().setFragmentResultListener(
-                    PICK_DATE_REQUEST_KEY,
-                    activity,
-                    (requestKey, result) -> listener.onDatePicked(
-                            (LoyaltyCardField) Objects.requireNonNull(result.getSerializable(TEXT_FIELD_TO_EDIT_ARGUMENT_KEY)),
-                            (Date) Objects.requireNonNull(result.getSerializable(NEWLY_PICKED_DATE_ARGUMENT_KEY))));
-        }
+        MaterialDatePicker<Long> materialDatePicker = MaterialDatePicker.Builder.datePicker()
+                .setSelection(calendar.getTimeInMillis())
+                .setCalendarConstraints(calendarConstraints)
+                .build();
 
-        @NonNull
-        @Override
-        public Dialog onCreateDialog(Bundle savedInstanceState) {
-            Bundle args = requireArguments();
-            textFieldEdit = (LoyaltyCardField) args.getSerializable(TEXT_FIELD_TO_EDIT_ARGUMENT_KEY);
-            minDate = (Date) args.getSerializable(MIN_DATE_ARGUMENT_KEY);
-            maxDate = (Date) args.getSerializable(MAX_DATE_ARGUMENT_KEY);
-            // Use the current date as the default date in the picker
-            final Calendar c = Calendar.getInstance();
-
-            Date date = (Date) args.getSerializable(CURRENT_DATE_ARGUMENT_KEY);
-            if (date != null) {
-                c.setTime(date);
+        // Required to handle configuration changes
+        // See https://github.com/material-components/material-components-android/issues/1688
+        tempLoyaltyCardField = loyaltyCardField;
+        getSupportFragmentManager().addFragmentOnAttachListener((fragmentManager, fragment) -> {
+            if (fragment instanceof MaterialDatePicker && Objects.equals(fragment.getTag(), PICK_DATE_REQUEST_KEY)) {
+                ((MaterialDatePicker<Long>) fragment).addOnPositiveButtonClickListener(selection -> {
+                    Bundle args = new Bundle();
+                    args.putLong(NEWLY_PICKED_DATE_ARGUMENT_KEY, selection);
+                    getSupportFragmentManager().setFragmentResult(PICK_DATE_REQUEST_KEY, args);
+                });
             }
+        });
 
-            int year = c.get(Calendar.YEAR);
-            int month = c.get(Calendar.MONTH);
-            int day = c.get(Calendar.DAY_OF_MONTH);
+        materialDatePicker.show(getSupportFragmentManager(), PICK_DATE_REQUEST_KEY);
+    }
 
-            // Create a new instance of DatePickerDialog and return it
-            DatePickerDialog datePickerDialog = new DatePickerDialog(getActivity(), this, year, month, day);
-            datePickerDialog.getDatePicker().setMinDate(minDate != null ? minDate.getTime() : getDefaultMinDateOfDatePicker());
-            datePickerDialog.getDatePicker().setMaxDate(maxDate != null ? maxDate.getTime() : getDefaultMaxDateOfDatePicker());
-            return datePickerDialog;
+    // Required to handle configuration changes
+    // See https://github.com/material-components/material-components-android/issues/1688
+    private void setMaterialDatePickerResultListener() {
+        MaterialDatePicker<Long> fragment = (MaterialDatePicker<Long>) getSupportFragmentManager().findFragmentByTag(PICK_DATE_REQUEST_KEY);
+        if (fragment != null) {
+            fragment.addOnPositiveButtonClickListener(selection -> {
+                Bundle args = new Bundle();
+                args.putLong(NEWLY_PICKED_DATE_ARGUMENT_KEY, selection);
+                getSupportFragmentManager().setFragmentResult(PICK_DATE_REQUEST_KEY, args);
+            });
         }
 
-        private long getDefaultMinDateOfDatePicker() {
-            Calendar minDateCalendar = Calendar.getInstance();
-            minDateCalendar.set(1970, 0, 1);
-            return minDateCalendar.getTimeInMillis();
-        }
+        getSupportFragmentManager().setFragmentResultListener(
+                PICK_DATE_REQUEST_KEY,
+                this,
+                (requestKey, result) -> {
+                    long selection = result.getLong(NEWLY_PICKED_DATE_ARGUMENT_KEY);
 
-        private long getDefaultMaxDateOfDatePicker() {
-            Calendar maxDateCalendar = Calendar.getInstance();
-            maxDateCalendar.set(2100, 11, 31);
-            return maxDateCalendar.getTimeInMillis();
-        }
+                    Date newDate = new Date(selection);
+                    switch (tempLoyaltyCardField) {
+                        case validFrom:
+                            formatDateField(LoyaltyCardEditActivity.this, validFromField, newDate);
+                            updateTempState(LoyaltyCardField.validFrom, newDate);
+                            break;
+                        case expiry:
+                            formatDateField(LoyaltyCardEditActivity.this, expiryField, newDate);
+                            updateTempState(LoyaltyCardField.expiry, newDate);
+                            break;
+                        default:
+                            throw new AssertionError("Unexpected field: " + tempLoyaltyCardField);
+                    }
+                }
+        );
+    }
 
-        public void onDateSet(DatePicker view, int year, int month, int day) {
-            Calendar c = new GregorianCalendar();
-            c.set(Calendar.YEAR, year);
-            c.set(Calendar.MONTH, month);
-            c.set(Calendar.DAY_OF_MONTH, day);
-            c.set(Calendar.HOUR_OF_DAY, 0);
-            c.set(Calendar.MINUTE, 0);
-            c.set(Calendar.SECOND, 0);
-            c.set(Calendar.MILLISECOND, 0);
+    private long getDefaultMinDateOfDatePicker() {
+        Calendar minDateCalendar = Calendar.getInstance();
+        minDateCalendar.set(1970, 0, 1);
+        return minDateCalendar.getTimeInMillis();
+    }
 
-            long unixTime = c.getTimeInMillis();
-
-            Date date = new Date(unixTime);
-
-            Bundle result = new Bundle();
-            result.putSerializable(TEXT_FIELD_TO_EDIT_ARGUMENT_KEY, textFieldEdit);
-            result.putSerializable(NEWLY_PICKED_DATE_ARGUMENT_KEY, date);
-            getParentFragmentManager().setFragmentResult(PICK_DATE_REQUEST_KEY, result);
-        }
+    private long getDefaultMaxDateOfDatePicker() {
+        Calendar maxDateCalendar = Calendar.getInstance();
+        maxDateCalendar.set(2100, 11, 31);
+        return maxDateCalendar.getTimeInMillis();
     }
 
     private void doSave() {

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

@@ -3,6 +3,7 @@ package protect.card_locker;
 import android.app.Application;
 
 import androidx.appcompat.app.AppCompatDelegate;
+
 import protect.card_locker.preferences.Settings;
 
 public class LoyaltyCardLockerApplication extends Application {

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

@@ -20,7 +20,6 @@ import android.text.method.DigitsKeyListener;
 import android.text.style.ForegroundColorSpan;
 import android.text.util.Linkify;
 import android.util.Log;
-import android.util.TypedValue;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
@@ -30,6 +29,7 @@ import android.view.Window;
 import android.view.WindowInsets;
 import android.view.WindowInsetsController;
 import android.view.WindowManager;
+import android.widget.EditText;
 import android.widget.FrameLayout;
 import android.widget.ImageButton;
 import android.widget.ImageView;
@@ -38,19 +38,17 @@ import android.widget.SeekBar;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import androidx.activity.OnBackPressedCallback;
 import androidx.annotation.StringRes;
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AlertDialog;
-import androidx.appcompat.content.res.AppCompatResources;
 import androidx.appcompat.widget.Toolbar;
 import androidx.core.content.FileProvider;
 import androidx.core.graphics.BlendModeColorFilterCompat;
 import androidx.core.graphics.BlendModeCompat;
 import androidx.core.graphics.ColorUtils;
-import androidx.core.graphics.drawable.DrawableCompat;
 import androidx.core.view.ViewCompat;
 import androidx.core.view.accessibility.AccessibilityNodeInfoCompat;
-import androidx.core.widget.TextViewCompat;
 
 import com.google.android.material.color.MaterialColors;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
@@ -112,22 +110,25 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
             return;
         }
 
+        ImageType imageType = imageTypes.get(mainImageIndex);
+
         // If the barcode is shown, switch to fullscreen layout
-        if (imageTypes.get(mainImageIndex) == ImageType.BARCODE) {
+        if (imageType == ImageType.BARCODE) {
             setFullscreen(true);
             return;
         }
 
         // If this is an image, open it in the gallery.
-        openCurrentMainImageInGallery();
+        openImageInGallery(imageType);
     }
 
-    private void openCurrentMainImageInGallery() {
-        ImageType wantedImageType = imageTypes.get(mainImageIndex);
-
+    private void openImageInGallery(ImageType imageType) {
         File file = null;
 
-        switch (wantedImageType) {
+        switch (imageType) {
+            case ICON:
+                file = Utils.retrieveCardImageAsFile(this, loyaltyCardId, ImageLocationType.icon);
+                break;
             case IMAGE_FRONT:
                 file = Utils.retrieveCardImageAsFile(this, loyaltyCardId, ImageLocationType.front);
                 break;
@@ -175,6 +176,7 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
 
     enum ImageType {
         NONE,
+        ICON,
         BARCODE,
         IMAGE_FRONT,
         IMAGE_BACK
@@ -228,7 +230,9 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
         settings = new Settings(this);
 
         String cardOrientation = settings.getCardViewOrientation();
-        if (cardOrientation.equals(getString(R.string.settings_key_lock_on_opening_orientation))) {
+        if (cardOrientation.equals(getString(R.string.settings_key_follow_sensor_orientation))) {
+            setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_SENSOR);
+        } else if (cardOrientation.equals(getString(R.string.settings_key_lock_on_opening_orientation))) {
             setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LOCKED);
         } else if (cardOrientation.equals(getString(R.string.settings_key_portrait_orientation))) {
             setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
@@ -300,7 +304,13 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
         binding.bottomAppBarNextButton.setOnClickListener(view -> prevNextCard(true));
         binding.bottomAppBarUpdateBalanceButton.setOnClickListener(view -> showBalanceUpdateDialog());
 
-        binding.iconContainer.setOnClickListener(view -> Toast.makeText(LoyaltyCardViewActivity.this, R.string.icon_header_click_text, Toast.LENGTH_LONG).show());
+        binding.iconContainer.setOnClickListener(view -> {
+            if (Utils.retrieveCardImage(this, loyaltyCard.id, ImageLocationType.icon) != null) {
+                openImageInGallery(ImageType.ICON);
+            } else {
+                Toast.makeText(LoyaltyCardViewActivity.this, R.string.icon_header_click_text, Toast.LENGTH_LONG).show();
+            }
+        });
         binding.iconContainer.setOnLongClickListener(view -> {
             Intent intent = new Intent(getApplicationContext(), LoyaltyCardEditActivity.class);
             Bundle bundle = new Bundle();
@@ -322,6 +332,17 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
             return true;
         });
         binding.fullscreenImage.setOnClickListener(view -> onMainImageTap());
+
+        getOnBackPressedDispatcher().addCallback(this, new OnBackPressedCallback(true) {
+            @Override
+            public void handleOnBackPressed() {
+                if (isFullscreen) {
+                    setFullscreen(false);
+                } else {
+                    finish();
+                }
+            }
+        });
     }
 
     private SpannableStringBuilder padSpannableString(SpannableStringBuilder spannableStringBuilder) {
@@ -400,7 +421,11 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
 
     private void showBalanceUpdateDialog() {
         AlertDialog.Builder builder = new MaterialAlertDialogBuilder(this);
+
+        // Header
         builder.setTitle(R.string.updateBalanceTitle);
+
+        // Layout
         FrameLayout container = new FrameLayout(this);
         FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(
                 ViewGroup.LayoutParams.MATCH_PARENT,
@@ -418,61 +443,91 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
         currentTextview.setText(getString(R.string.currentBalanceSentence, Utils.formatBalance(this, loyaltyCard.balance, loyaltyCard.balanceType)));
         layout.addView(currentTextview);
 
-        TextView updateTextView = new TextView(this);
-        updateTextView.setText(getString(R.string.newBalanceSentence, Utils.formatBalance(this, loyaltyCard.balance, loyaltyCard.balanceType)));
-        layout.addView(updateTextView);
-
         final TextInputEditText input = new TextInputEditText(this);
-        Context dialogContext = this;
         input.setInputType(InputType.TYPE_CLASS_NUMBER);
         input.setKeyListener(DigitsKeyListener.getInstance("0123456789,."));
         input.setHint(R.string.updateBalanceHint);
-        input.addTextChangedListener(new SimpleTextWatcher() {
-            @Override
-            public void onTextChanged(CharSequence s, int start, int before, int count) {
-                BigDecimal newBalance;
-                try {
-                    newBalance = calculateNewBalance(loyaltyCard.balance, loyaltyCard.balanceType, s.toString());
-                } catch (ParseException e) {
-                    input.setTag(null);
-                    updateTextView.setText(getString(R.string.newBalanceSentence, Utils.formatBalance(dialogContext, loyaltyCard.balance, loyaltyCard.balanceType)));
-                    return;
-                }
 
-                // Save new balance into this element
-                input.setTag(newBalance);
-                updateTextView.setText(getString(R.string.newBalanceSentence, Utils.formatBalance(dialogContext, newBalance, loyaltyCard.balanceType)));
-            }
-        });
         layout.addView(input);
         layout.setLayoutParams(params);
         container.addView(layout);
 
+        // Set layout
         builder.setView(container);
-        builder.setPositiveButton(R.string.ok, (dialogInterface, i) -> {
-            // Grab calculated balance from input field
-            BigDecimal newBalance = (BigDecimal) input.getTag();
-            if (newBalance == null) {
-                return;
+
+        // Buttons
+        builder.setPositiveButton(R.string.spend, (dialogInterface, i) -> {
+            // Calculate and update balance
+            try {
+                BigDecimal balanceChange = Utils.parseBalance(input.getText().toString(), loyaltyCard.balanceType);
+                BigDecimal newBalance = loyaltyCard.balance.subtract(balanceChange).max(new BigDecimal(0));
+                DBHelper.updateLoyaltyCardBalance(database, loyaltyCardId, newBalance);
+            } catch (ParseException e) {
+                Toast.makeText(getApplicationContext(), R.string.amountParsingFailed, Toast.LENGTH_LONG).show();
             }
 
-            // Actually update balance
-            DBHelper.updateLoyaltyCardBalance(database, loyaltyCardId, newBalance);
-            // Reload UI
+            // Reload state
             this.onResume();
+
+            // Show new balance
+            Toast.makeText(getApplicationContext(), getString(R.string.newBalanceSentence, Utils.formatBalance(this, loyaltyCard.balance, loyaltyCard.balanceType)), Toast.LENGTH_LONG).show();
         });
-        builder.setNegativeButton(getString(R.string.cancel), (dialog, which) -> dialog.cancel());
+        builder.setNegativeButton(R.string.receive, (dialogInterface, i) -> {
+            // Calculate and update balance
+            try {
+                BigDecimal balanceChange = Utils.parseBalance(input.getText().toString(), loyaltyCard.balanceType);
+                BigDecimal newBalance = loyaltyCard.balance.add(balanceChange);
+                DBHelper.updateLoyaltyCardBalance(database, loyaltyCardId, newBalance);
+            } catch (ParseException e) {
+                Toast.makeText(getApplicationContext(), R.string.amountParsingFailed, Toast.LENGTH_LONG).show();
+            }
+
+            // Reload state
+            this.onResume();
+
+            // Show new balance
+            Toast.makeText(getApplicationContext(), getString(R.string.newBalanceSentence, Utils.formatBalance(this, loyaltyCard.balance, loyaltyCard.balanceType)), Toast.LENGTH_LONG).show();
+        });
+        builder.setNeutralButton(getString(R.string.cancel), (dialog, which) -> dialog.cancel());
         AlertDialog dialog = builder.create();
+
+        // Now that the dialog exists, we can bind something that affects the buttons
+        input.addTextChangedListener(new SimpleTextWatcher() {
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+                BigDecimal balanceChange;
+
+                try {
+                    balanceChange = Utils.parseBalance(s.toString(), loyaltyCard.balanceType);
+                } catch (ParseException e) {
+                    input.setError(getString(R.string.amountParsingFailed));
+                    dialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(false);
+                    dialog.getButton(AlertDialog.BUTTON_NEGATIVE).setEnabled(false);
+                    return;
+                }
+
+                input.setError(null);
+                if (balanceChange.equals(new BigDecimal(0))) {
+                    dialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(false);
+                    dialog.getButton(AlertDialog.BUTTON_NEGATIVE).setEnabled(false);
+                } else {
+                    dialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(true);
+                    dialog.getButton(AlertDialog.BUTTON_NEGATIVE).setEnabled(true);
+                }
+            }
+        });
+
         dialog.show();
+
+        // Disable buttons (must be done **after** dialog is shown to prevent crash
+        dialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(false);
+        dialog.getButton(AlertDialog.BUTTON_NEGATIVE).setEnabled(false);
+
+        // Set focus on input field
         dialog.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE);
         input.requestFocus();
     }
 
-    private BigDecimal calculateNewBalance(BigDecimal currentBalance, Currency currency, String unparsedSubtraction) throws ParseException {
-        BigDecimal subtraction = Utils.parseBalance(unparsedSubtraction, currency);
-        return currentBalance.subtract(subtraction).max(new BigDecimal(0));
-    }
-
     private void setBottomAppBarButtonState() {
         if (!loyaltyCard.note.isEmpty() || !loyaltyCardGroups.isEmpty() || hasBalance(loyaltyCard) || loyaltyCard.validFrom != null || loyaltyCard.expiry != null) {
             binding.bottomAppBarInfoButton.setVisibility(View.VISIBLE);
@@ -544,7 +599,8 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
 
 
     @Override
-    public void onResume() {
+    protected void onResume() {
+        activityOverridesNavBarColor = true;
         super.onResume();
 
         Log.i(TAG, "To view card: " + loyaltyCardId);
@@ -622,7 +678,11 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
         int darkenedColor = ColorUtils.blendARGB(backgroundHeaderColor, Color.BLACK, 0.1f);
         binding.barcodeScaler.setProgressTintList(ColorStateList.valueOf(darkenedColor));
         binding.barcodeScaler.setThumbTintList(ColorStateList.valueOf(darkenedColor));
+
+        // Set bottomAppBar and system navigation bar color
         binding.bottomAppBar.setBackgroundColor(darkenedColor);
+        Utils.setNavigationBarColor(null, window, darkenedColor, Utils.needsDarkForeground(darkenedColor));
+
         int complementaryColor = Utils.getComplementaryColor(darkenedColor);
         binding.fabEdit.setBackgroundTintList(ColorStateList.valueOf(complementaryColor));
         Drawable editButtonIcon = binding.fabEdit.getDrawable();
@@ -704,16 +764,6 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
         imageButton.setColorFilter(BlendModeColorFilterCompat.createBlendModeColorFilterCompat(backgroundNeedsDarkIcons ? Color.BLACK : Color.WHITE, BlendModeCompat.SRC_ATOP));
     }
 
-    @Override
-    public void onBackPressed() {
-        if (isFullscreen) {
-            setFullscreen(false);
-            return;
-        }
-
-        super.onBackPressed();
-    }
-
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         getMenuInflater().inflate(R.menu.card_view_menu, menu);
@@ -1055,10 +1105,14 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
 
             // Set Android to fullscreen mode
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-                getWindow().setDecorFitsSystemWindows(false);
-                if (getWindow().getInsetsController() != null) {
-                    getWindow().getInsetsController().hide(WindowInsets.Type.statusBars() | WindowInsets.Type.navigationBars());
-                    getWindow().getInsetsController().setSystemBarsBehavior(WindowInsetsController.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE);
+                Window window = getWindow();
+                if (window != null) {
+                    window.setDecorFitsSystemWindows(false);
+                    WindowInsetsController wic = window.getInsetsController();
+                    if (wic != null) {
+                        wic.hide(WindowInsets.Type.statusBars() | WindowInsets.Type.navigationBars());
+                        wic.setSystemBarsBehavior(WindowInsetsController.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE);
+                    }
                 }
             } else {
                 setFullscreenModeSdkLessThan30();
@@ -1085,10 +1139,14 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
 
             // Unset fullscreen mode
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-                getWindow().setDecorFitsSystemWindows(true);
-                if (getWindow().getInsetsController() != null) {
-                    getWindow().getInsetsController().show(WindowInsets.Type.statusBars() | WindowInsets.Type.navigationBars());
-                    getWindow().getInsetsController().setSystemBarsBehavior(WindowInsetsController.BEHAVIOR_DEFAULT);
+                Window window = getWindow();
+                if (window != null) {
+                    window.setDecorFitsSystemWindows(true);
+                    WindowInsetsController wic = window.getInsetsController();
+                    if (wic != null) {
+                        wic.show(WindowInsets.Type.statusBars() | WindowInsets.Type.navigationBars());
+                        wic.setSystemBarsBehavior(WindowInsetsController.BEHAVIOR_DEFAULT);
+                    }
                 }
             } else {
                 unsetFullscreenModeSdkLessThan30();
@@ -1100,19 +1158,25 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
 
     @SuppressWarnings("deprecation")
     private void unsetFullscreenModeSdkLessThan30() {
-        getWindow().getDecorView().setSystemUiVisibility(
-                getWindow().getDecorView().getSystemUiVisibility()
-                        & ~View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY
-                        & ~View.SYSTEM_UI_FLAG_FULLSCREEN
-        );
+        Window window = getWindow();
+        if (window != null) {
+            window.getDecorView().setSystemUiVisibility(
+                    window.getDecorView().getSystemUiVisibility()
+                            & ~View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY
+                            & ~View.SYSTEM_UI_FLAG_FULLSCREEN
+            );
+        }
     }
 
     @SuppressWarnings("deprecation")
     private void setFullscreenModeSdkLessThan30() {
-        getWindow().getDecorView().setSystemUiVisibility(
-                getWindow().getDecorView().getSystemUiVisibility()
-                        | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY
-                        | View.SYSTEM_UI_FLAG_FULLSCREEN
-        );
+        Window window = getWindow();
+        if (window != null) {
+            window.getDecorView().setSystemUiVisibility(
+                    window.getDecorView().getSystemUiVisibility()
+                            | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY
+                            | View.SYSTEM_UI_FLAG_FULLSCREEN
+            );
+        }
     }
 }

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

@@ -2,8 +2,6 @@ package protect.card_locker;
 
 import android.app.Activity;
 import android.app.SearchManager;
-import android.content.ClipData;
-import android.content.ClipboardManager;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
@@ -22,6 +20,7 @@ import android.view.View;
 import android.widget.CheckBox;
 import android.widget.Toast;
 
+import androidx.activity.OnBackPressedCallback;
 import androidx.activity.result.ActivityResultLauncher;
 import androidx.activity.result.contract.ActivityResultContracts;
 import androidx.appcompat.app.AlertDialog;
@@ -70,7 +69,7 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
     private View mNoGroupCardsText;
     private TabLayout groupsTabLayout;
 
-    private Runnable mSwapLoyaltyCardListCursor;
+    private Runnable mUpdateLoyaltyCardListRunnable;
 
     private ActivityResultLauncher<Intent> mBarcodeScannerLauncher;
     private ActivityResultLauncher<Intent> mSettingsLauncher;
@@ -89,35 +88,7 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
 
         @Override
         public boolean onActionItemClicked(ActionMode inputMode, MenuItem inputItem) {
-            if (inputItem.getItemId() == R.id.action_copy_to_clipboard) {
-                ClipboardManager clipboard = (ClipboardManager) getSystemService(CLIPBOARD_SERVICE);
-
-                String clipboardData;
-                int cardCount = mAdapter.getSelectedItemCount();
-
-                if (cardCount == 1) {
-                    clipboardData = mAdapter.getSelectedItems().get(0).cardId;
-                } else {
-                    StringBuilder cardIds = new StringBuilder();
-
-                    for (int i = 0; i < cardCount; i++) {
-                        LoyaltyCard loyaltyCard = mAdapter.getSelectedItems().get(i);
-
-                        cardIds.append(loyaltyCard.store + ": " + loyaltyCard.cardId);
-                        if (i < (cardCount - 1)) {
-                            cardIds.append("\n");
-                        }
-                    }
-
-                    clipboardData = cardIds.toString();
-                }
-
-                ClipData clip = ClipData.newPlainText(getString(R.string.card_ids_copied), clipboardData);
-                clipboard.setPrimaryClip(clip);
-                Toast.makeText(MainActivity.this, cardCount > 1 ? R.string.copy_to_clipboard_multiple_toast : R.string.copy_to_clipboard_toast, Toast.LENGTH_LONG).show();
-                inputMode.finish();
-                return true;
-            } else if (inputItem.getItemId() == R.id.action_share) {
+            if (inputItem.getItemId() == R.id.action_share) {
                 final ImportURIHelper importURIHelper = new ImportURIHelper(MainActivity.this);
                 try {
                     importURIHelper.startShareIntent(mAdapter.getSelectedItems());
@@ -228,7 +199,6 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
         super.onCreate(inputSavedInstanceState);
 
         binding = MainActivityBinding.inflate(getLayoutInflater());
-        setTitle(R.string.app_name);
         setContentView(binding.getRoot());
         setSupportActionBar(binding.toolbar);
         groupsTabLayout = binding.groups;
@@ -236,13 +206,8 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
 
         mDatabase = new DBHelper(this).getWritableDatabase();
 
-        mSwapLoyaltyCardListCursor = () -> {
-            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));
+        mUpdateLoyaltyCardListRunnable = () -> {
+            updateLoyaltyCardList(false);
         };
 
         groupsTabLayout.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
@@ -277,7 +242,7 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
         mNoGroupCardsText = contentMainBinding.noGroupCardsText;
         mCardList = contentMainBinding.list;
 
-        mAdapter = new LoyaltyCardCursorAdapter(this, null, this, mSwapLoyaltyCardListCursor);
+        mAdapter = new LoyaltyCardCursorAdapter(this, null, this, mUpdateLoyaltyCardListRunnable);
         mCardList.setAdapter(mAdapter);
         registerForContextMenu(mCardList);
 
@@ -337,6 +302,17 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
                 }
             }
         });
+
+        getOnBackPressedDispatcher().addCallback(this, new OnBackPressedCallback(true) {
+            @Override
+            public void handleOnBackPressed() {
+                if (mSearchView != null && !mSearchView.isIconified()) {
+                    mSearchView.setIconified(true);
+                } else {
+                    finish();
+                }
+            }
+        });
     }
 
     @Override
@@ -411,16 +387,6 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
         addButton.bringToFront();
     }
 
-    @Override
-    public void onBackPressed() {
-        if (mSearchView != null && !mSearchView.isIconified()) {
-            mSearchView.setIconified(true);
-            return;
-        }
-
-        super.onBackPressed();
-    }
-
     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);
@@ -432,7 +398,12 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
     }
 
     private void updateLoyaltyCardList(boolean updateCount) {
-        mSwapLoyaltyCardListCursor.run();
+        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();
@@ -611,7 +582,7 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
         int id = inputItem.getItemId();
 
         if (id == android.R.id.home) {
-            onBackPressed();
+            getOnBackPressedDispatcher().onBackPressed();
         }
 
         if (id == R.id.action_display_options) {

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

@@ -13,6 +13,12 @@ import android.widget.EditText;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import androidx.activity.OnBackPressedCallback;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.widget.Toolbar;
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 
@@ -20,11 +26,6 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
 
-import androidx.annotation.NonNull;
-import androidx.appcompat.app.AlertDialog;
-import androidx.appcompat.widget.Toolbar;
-import androidx.recyclerview.widget.RecyclerView;
-
 import protect.card_locker.databinding.ActivityManageGroupBinding;
 
 public class ManageGroupActivity extends CatimaAppCompatActivity implements ManageGroupCursorAdapter.CardAdapterListener {
@@ -133,6 +134,13 @@ public class ManageGroupActivity extends CatimaAppCompatActivity implements Mana
         // this setText is here because content_main.xml is reused from main activity
         noGroupCardsText.setText(getResources().getText(R.string.noGiftCardsGroup));
         updateLoyaltyCardList();
+
+        getOnBackPressedDispatcher().addCallback(this, new OnBackPressedCallback(true) {
+            @Override
+            public void handleOnBackPressed() {
+                leaveWithoutSaving();
+            }
+        });
     }
 
     private ArrayList<Integer> adapterStateToIntegerArray(HashMap<Integer, Boolean> adapterState) {
@@ -210,14 +218,9 @@ public class ManageGroupActivity extends CatimaAppCompatActivity implements Mana
         }
     }
 
-    @Override
-    public void onBackPressed() {
-        leaveWithoutSaving();
-    }
-
     @Override
     public boolean onSupportNavigateUp() {
-        onBackPressed();
+        getOnBackPressedDispatcher().onBackPressed();
         return true;
     }
 

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

@@ -14,17 +14,17 @@ import android.widget.EditText;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import com.google.android.material.dialog.MaterialAlertDialogBuilder;
-import com.google.android.material.floatingactionbutton.FloatingActionButton;
-
-import java.util.List;
-
 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 {
@@ -71,11 +71,6 @@ public class ManageGroupsActivity extends CatimaAppCompatActivity implements Gro
         updateGroupList();
     }
 
-    @Override
-    public void onBackPressed() {
-        super.onBackPressed();
-    }
-
     private void updateGroupList() {
         mAdapter.swapCursor(DBHelper.getGroupCursor(mDatabase));
 
@@ -248,4 +243,4 @@ public class ManageGroupsActivity extends CatimaAppCompatActivity implements Gro
         AlertDialog dialog = builder.create();
         dialog.show();
     }
-}
+}

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

@@ -32,7 +32,6 @@ 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;
@@ -344,13 +343,21 @@ public class ScanActivity extends CatimaAppCompatActivity {
     }
 
     public void addManually() {
-        Intent i = new Intent(getApplicationContext(), BarcodeSelectorActivity.class);
-        if (cardId != null) {
-            final Bundle b = new Bundle();
-            b.putString("initialCardId", cardId);
-            i.putExtras(b);
-        }
-        manualAddLauncher.launch(i);
+        MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(ScanActivity.this);
+        builder.setTitle(R.string.add_manually_warning_title);
+        builder.setMessage(R.string.add_manually_warning_message);
+        builder.setPositiveButton(R.string.continue_, (dialog, which) -> {
+            Intent i = new Intent(getApplicationContext(), BarcodeSelectorActivity.class);
+            if (cardId != null) {
+                final Bundle b = new Bundle();
+                b.putString("initialCardId", cardId);
+                i.putExtras(b);
+            }
+            manualAddLauncher.launch(i);
+        });
+        builder.setNegativeButton(R.string.cancel, (dialog, which) -> setScannerActive(true));
+        builder.setOnCancelListener(dialog -> setScannerActive(true));
+        builder.show();
     }
 
     public void addFromImage() {

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

@@ -8,6 +8,11 @@ import android.graphics.Canvas;
 import android.graphics.Color;
 import android.os.Bundle;
 
+import androidx.core.content.pm.ShortcutInfoCompat;
+import androidx.core.content.pm.ShortcutManagerCompat;
+import androidx.core.graphics.ColorUtils;
+import androidx.core.graphics.drawable.IconCompat;
+
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Collections;
@@ -15,11 +20,6 @@ import java.util.Comparator;
 import java.util.LinkedList;
 import java.util.List;
 
-import androidx.core.content.pm.ShortcutInfoCompat;
-import androidx.core.content.pm.ShortcutManagerCompat;
-import androidx.core.graphics.ColorUtils;
-import androidx.core.graphics.drawable.IconCompat;
-
 class ShortcutHelper {
     // Android documentation says that no more than 5 shortcuts
     // are supported. However, that may be too many, as not all

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

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

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

@@ -22,16 +22,19 @@ import android.util.Log;
 import android.util.TypedValue;
 import android.view.MotionEvent;
 import android.view.View;
+import android.view.Window;
 import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.annotation.RawRes;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.app.AppCompatDelegate;
 import androidx.core.graphics.ColorUtils;
 import androidx.core.os.LocaleListCompat;
+import androidx.core.view.WindowInsetsControllerCompat;
 import androidx.exifinterface.media.ExifInterface;
 import androidx.palette.graphics.Palette;
 
@@ -663,13 +666,31 @@ public class Utils {
         }
     }
 
-    // XXX android 9 and below has issues with patched theme where the background becomes a
-    // rendering mess
-    // use after views are inflated
+    // Force correct color
+    // Fixes OLED dark mode in MainActivity
     public static void postPatchColors(AppCompatActivity activity) {
+        activity.findViewById(android.R.id.content).setBackgroundColor(resolveBackgroundColor(activity));
+    }
+
+    // Either pass an Activity on which to call getWindow() or an existing Window (may be null) returned by that function.
+    public static void setNavigationBarColor(@Nullable AppCompatActivity activity, @Nullable Window window, int color, boolean useLightBars) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1) {
+            if (window == null && activity != null) {
+                window = activity.getWindow();
+            }
+            if (window != null) {
+                View decorView = window.getDecorView();
+                WindowInsetsControllerCompat wic = new WindowInsetsControllerCompat(window, decorView);
+                wic.setAppearanceLightNavigationBars(useLightBars);
+                window.setNavigationBarColor(color);
+            }
+        }
+    }
+
+    public static int resolveBackgroundColor(AppCompatActivity activity) {
         TypedValue typedValue = new TypedValue();
         activity.getTheme().resolveAttribute(android.R.attr.colorBackground, typedValue, true);
-        activity.findViewById(android.R.id.content).setBackgroundColor(typedValue.data);
+        return typedValue.data;
     }
 
     public static int getHeaderColorFromImage(Bitmap image, int fallback) {
@@ -727,23 +748,30 @@ public class Utils {
                 .replaceAll("(?<!href=\")\\b(https?://[\\w@#%&+=:?/.-]*[\\w@#%&+=:?/-])", "<a href=\"$1\">$1</a>");
     }
 
-    public static void setIconOrTextWithBackground(Context context, LoyaltyCard loyaltyCard, Bitmap icon, ImageView backgroundOrIcon, TextView textWhenNoImage) {
-        if (icon != null) {
-            Log.d("onResume", "setting icon image");
-            textWhenNoImage.setVisibility(View.GONE);
+    /**
+     * Sets an icon or text with background on the given ImageView and/or TextView, including background colour.
+     *
+     * @param context Android context
+     * @param loyaltyCard Loyalty Card
+     * @param icon Bitmap of the icon to set, or null
+     * @param backgroundOrIcon ImageView to draw the icon and background on to
+     * @param textWhenNoImage TextView to write the loyalty card name into if icon is null
+     * @return background colour
+     */
+    public static int setIconOrTextWithBackground(Context context, LoyaltyCard loyaltyCard, Bitmap icon, ImageView backgroundOrIcon, TextView textWhenNoImage) {
+        int headerColor = getHeaderColor(context, loyaltyCard);
+        backgroundOrIcon.setImageBitmap(icon);
+        backgroundOrIcon.setBackgroundColor(headerColor);
 
-            backgroundOrIcon.setImageBitmap(icon);
-            backgroundOrIcon.setBackgroundColor(Color.TRANSPARENT);
+        if (icon != null) {
+            textWhenNoImage.setVisibility(View.GONE);
         } else {
             textWhenNoImage.setVisibility(View.VISIBLE);
-
-            int headerColor = getHeaderColor(context, loyaltyCard);
-
-            backgroundOrIcon.setImageBitmap(null);
-            backgroundOrIcon.setBackgroundColor(headerColor);
             textWhenNoImage.setText(loyaltyCard.store);
             textWhenNoImage.setTextColor(Utils.needsDarkForeground(headerColor) ? Color.BLACK : Color.WHITE);
         }
+
+        return headerColor;
     }
 
     public static boolean installedFromGooglePlay(Context context) {

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

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

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

@@ -1,12 +1,12 @@
 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;
@@ -56,6 +56,13 @@ public class SettingsActivity extends CatimaAppCompatActivity {
         if (savedInstanceState != null) {
             fragment.mReloadMain = savedInstanceState.getBoolean(RELOAD_MAIN_STATE);
         }
+
+        getOnBackPressedDispatcher().addCallback(this, new OnBackPressedCallback(true) {
+            @Override
+            public void handleOnBackPressed() {
+                finishSettingsActivity();
+            }
+        });
     }
 
     @Override
@@ -76,11 +83,6 @@ public class SettingsActivity extends CatimaAppCompatActivity {
         return super.onOptionsItemSelected(item);
     }
 
-    @Override
-    public void onBackPressed() {
-        finishSettingsActivity();
-    }
-
     private void finishSettingsActivity() {
         if (fragment.mReloadMain) {
             Intent intent = new Intent();

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

@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="#FFFFFFFF"
-      android:pathData="M16,1L4,1c-1.1,0 -2,0.9 -2,2v14h2L4,3h12L16,1zM19,5L8,5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h11c1.1,0 2,-0.9 2,-2L21,7c0,-1.1 -0.9,-2 -2,-2zM19,21L8,21L8,7h11v14z"/>
-</vector>

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

@@ -369,75 +369,106 @@
                 android:visibility="gone"
                 tools:visibility="visible">
 
-                <!-- Front image -->
                 <LinearLayout
-                    android:id="@+id/frontImageHolder"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:orientation="horizontal"
-                    android:paddingHorizontal="@dimen/inputPadding"
-                    android:paddingTop="@dimen/inputPadding">
+                    android:baselineAligned="false">
 
                     <!-- Front image -->
                     <com.google.android.material.card.MaterialCardView
-                        android:layout_width="match_parent"
+                        android:id="@+id/frontImageHolder"
+                        android:layout_weight="1"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:layout_gravity="center_vertical"
-                        android:layout_marginStart="@dimen/activity_margin"
-                        android:layout_marginTop="@dimen/activity_margin"
-                        android:layout_marginEnd="@dimen/activity_margin"
-                        android:layout_marginBottom="@dimen/activity_margin"
-                        android:paddingHorizontal="@dimen/inputPadding"
-                        app:cardCornerRadius="4dp"
-                        app:cardElevation="0dp">
+                        android:orientation="horizontal"
+                        android:layout_margin="5dp"
+                        style="?attr/materialCardViewElevatedStyle">
 
-                        <ImageView
-                            android:id="@+id/frontImage"
+                        <androidx.constraintlayout.widget.ConstraintLayout
+                            android:id="@+id/frontImageConstraint"
                             android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:adjustViewBounds="true"
-                            android:minHeight="50dp"
-                            android:contentDescription="@string/frontImageDescription"
-                            android:scaleType="fitCenter"
-                            app:srcCompat="@drawable/ic_camera_white"
-                            android:background="?attr/colorPrimary" />
+                            android:layout_height="wrap_content">
 
+                            <!-- Back image -->
+                            <ImageView
+                                android:id="@+id/frontImage"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:adjustViewBounds="true"
+                                android:minHeight="50dp"
+                                android:contentDescription="@string/backImageDescription"
+                                android:scaleType="fitCenter"
+                                app:srcCompat="@drawable/ic_camera_white"
+                                android:background="?attr/colorPrimary"
+                                app:layout_constraintBottom_toTopOf="@id/frontImageDescription"
+                                app:layout_constraintEnd_toEndOf="parent"
+                                app:layout_constraintStart_toStartOf="parent"
+                                app:layout_constraintTop_toTopOf="parent" />
+
+                            <TextView
+                                android:id="@+id/frontImageDescription"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginStart="8dp"
+                                android:layout_marginEnd="8dp"
+                                android:layout_marginBottom="4dp"
+                                android:text="@string/frontImageDescription"
+                                android:textAppearance="?attr/textAppearanceHeadlineSmall"
+                                android:gravity="center"
+                                app:layout_constraintTop_toBottomOf="@id/frontImage"
+                                app:layout_constraintBottom_toBottomOf="parent"
+                                app:layout_constraintEnd_toEndOf="parent"
+                                app:layout_constraintStart_toStartOf="parent"/>
+                        </androidx.constraintlayout.widget.ConstraintLayout>
                     </com.google.android.material.card.MaterialCardView>
-                </LinearLayout>
-
-                <!-- Back image -->
-                <LinearLayout
-                    android:id="@+id/backImageHolder"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal"
-                    android:paddingHorizontal="@dimen/inputPadding"
-                    android:paddingTop="@dimen/inputPadding">
 
                     <!-- Back image -->
                     <com.google.android.material.card.MaterialCardView
-                        android:layout_width="match_parent"
+                        android:layout_weight="1"
+                        android:id="@+id/backImageHolder"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:layout_gravity="center_vertical"
-                        android:layout_marginStart="@dimen/activity_margin"
-                        android:layout_marginTop="@dimen/activity_margin"
-                        android:layout_marginEnd="@dimen/activity_margin"
-                        android:layout_marginBottom="@dimen/activity_margin"
-                        android:paddingHorizontal="@dimen/inputPadding"
-                        app:cardCornerRadius="4dp"
-                        app:cardElevation="0dp">
+                        android:orientation="horizontal"
+                        android:layout_margin="5dp"
+                        style="?attr/materialCardViewElevatedStyle">
 
-                        <ImageView
-                            android:id="@+id/backImage"
+                        <androidx.constraintlayout.widget.ConstraintLayout
+                            android:id="@+id/backImageConstraint"
                             android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:adjustViewBounds="true"
-                            android:minHeight="50dp"
-                            android:contentDescription="@string/backImageDescription"
-                            android:scaleType="fitCenter"
-                            app:srcCompat="@drawable/ic_camera_white"
-                            android:background="?attr/colorPrimary" />
+                            android:layout_height="wrap_content">
 
+                            <!-- Back image -->
+                            <ImageView
+                                android:id="@+id/backImage"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:adjustViewBounds="true"
+                                android:minHeight="50dp"
+                                android:contentDescription="@string/backImageDescription"
+                                android:scaleType="fitCenter"
+                                app:srcCompat="@drawable/ic_camera_white"
+                                android:background="?attr/colorPrimary"
+                                app:layout_constraintBottom_toTopOf="@id/backImageDescription"
+                                app:layout_constraintEnd_toEndOf="parent"
+                                app:layout_constraintStart_toStartOf="parent"
+                                app:layout_constraintTop_toTopOf="parent" />
+
+                            <TextView
+                                android:id="@+id/backImageDescription"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginStart="8dp"
+                                android:layout_marginEnd="8dp"
+                                android:layout_marginBottom="4dp"
+                                android:text="@string/backImageDescription"
+                                android:textAppearance="?attr/textAppearanceHeadlineSmall"
+                                android:gravity="center"
+                                app:layout_constraintTop_toBottomOf="@id/backImage"
+                                app:layout_constraintBottom_toBottomOf="parent"
+                                app:layout_constraintEnd_toEndOf="parent"
+                                app:layout_constraintStart_toStartOf="parent"/>
+                        </androidx.constraintlayout.widget.ConstraintLayout>
                     </com.google.android.material.card.MaterialCardView>
                 </LinearLayout>
             </TableLayout>

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

@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<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:id="@+id/coordinator_layout"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"

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

@@ -1,6 +1,5 @@
 <?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"

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

@@ -9,13 +9,6 @@
         android:titleCondensed="@string/editCardTitle"
         app:showAsAction="ifRoom"/>
 
-    <item
-        android:id="@+id/action_copy_to_clipboard"
-        android:icon="@drawable/ic_copy"
-        android:title="@string/copy_to_clipboard"
-        android:titleCondensed="@string/copy_to_clipboard"
-        app:showAsAction="ifRoom"/>
-
     <item
         android:id="@+id/action_share"
         android:icon="@drawable/ic_share"

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

@@ -1,283 +1,58 @@
 Sylvia van Os
 Branden Archer
 J. Lavoie
-Allan Nordhøy
 solokot
+Allan Nordhøy
 Heimen Stoffels
 Oğuz Ersen
 FC (Fay) Stegerman
 Katharine Chui
 SlavekB
-mondstern
 StoyanDimitrov
+mondstern
 IllusiveMan196
 Altonss
 Michael Moroni
-Gediminas Murauskas
+GM
+Eric
 Petr Novák
 Joel A
 laralem
 Taco
 pfaffenrodt
-Eric
-Nyatsuki
-HudobniVolk
-Samantaz Fox
-arno-github
-Ankit Tiwari
-Sergio Paredes
-Clxff H3r4ld0
 Aayush Gupta
+HudobniVolk
+Nyatsuki
+Samantaz Fox
+Jiri Grönroos
+arno-github
+Cliff Heraldo
+Sergio Paredes
+Ankit Tiwari
+Milan Šalka
+Giovanni Donisi
 Balázs Meskó
+mdvhimself
+Milo Ivir
+Skrripy
 huuhaa
+大王叫我来巡山
 Projjal Moitra
 Quentin PAGÈS
-Giovanni Donisi
-Alexander Ivanov
-arshbeerSingh
-Denis Shilin
-Freddo espresso
-Ziad OUALHADJ
-Silvério Santos
-Miha Frangež
-Eryk Michalak
-Arnis Jaundžeikars
-Dan
-sr093906
-mdvhimself
-Jiri Grönroos
-Katarzyna
-echo r"0xX4H" | rev
-Magnitudee
-Olivia (Zoe)
-betsythefc
+ikanakova
 waffshappen
-Robin
-ati3
-enolp
-Evgeniy Khramov
-Jane Kong
-Jean Mareilles
-Jean-Luc Tibaux
-José Rebelo
-K. Herbert
-Lisa A.
-Mawuena M. KODZO A.
-rudy3
-Reza
-Still / Azaka
-String E. Fighter
-Tapu
-Yurical
-rr-vesp
-yangyangdaji
-丛林意志
-alajemba-vik
-/usr/local/ΕΨΗΕΛΩΝ
-Adolfo Jayme-Barrientos
-Alessandro Mandelli
-KovalevArtem
-Artem M.
-Astrohops1
-BMN
-balaraz
-BootVirtual
-Bottan Hermawan
-zChiip
-Clonewayx
-D. Domig
-Danylo Lystopadov
-Diego
-Eudes-alencar
-Fede Pujol
-FineFindus
-francescbassas
-Jason Li
-Jesse Davids
-Kamborio
-Kis Dominik
-Lukas Grassauer
-Luna Jernberg
-Marnick L'Eau
-Michalis
-Michał
-Milo Ivir
-Mohamed A. Salah
-Yatoku
-the7thNightmare
-Quang Trung
-Rishi Agarwal
-Rosdyana Kusuma
-Sabri Ünal
-umoenks
-Simon Rusinov
-Siriusmart
-Mritunjay
-Tarik Dzambic
-Thomas Bertels
-Thomas Cruveilher
-Tian Jiale
-Tong Liu
-Tymofii Lytvynenko
-Wanath
-Younes Bouhouche
-Runner
-ce i moa
-enescan201
-Frablock
-inesre
-lgasp
-notlin4
-phlostically
-pokeghost
-sal0max
-Ágata Leuck
-BmBKun
-NamHyeonjeong
-Aditya Das
-asier123123131
-Kevin Sicong Jiang
-Tomer Ben-Rachel
-Tom Sawyer
-tfuxu
-Ahmed Saleh
-Airat
-Tapwaterisokey
-Alexandra-Ioana Moroz
-sNiXx
-Angela Enogieru
-Animesh Chatterjee
-Artūras Kalenda
-Ashish Yadav
-Aya Elsaadany
-Aya
-Biren
-Booc Sylvan
-Brage Nesteby Reitan
-Cap Amr Karam
-Carlo Maria Cuoghi Barbagli
-ChaoticNeutralCzech
-ChengCheng
-CherryMonster222
-Colgrave
-djcand
-Mylou53
-Daniel Sych
-danieluhrinyi
-Daniele Tricoli
-Kasina Dheeraj
-Donno
-Reihan
-Erik Spjelkavik
-Flav
-Franciszek Stefan
-Gael Caraballo
-Giacomo Alessandroni
-Govind S Nair
-Grzegorz
-gneiss15
-Hamustra Scans
-helzubair
-HowITsDone
-Hubert Maciejewicz
-Izzy
-Jacek
-Jacopo Gennaro Esposito
-Jean-Baptiste
-Kung-chih
-Karvjorm
-polar
-krkk
-Kristoffer Grundström
-Laura Ferraz 
-Lionel HANNEQUIN
-Lucas da Costa
-almir992
-Manan Jhaveri
-Marco
-BRBsoup
-Mateo Gomez
-Mattia
-Md. Al-Amin
+Eryk Michalak
+Ziad OUALHADJ
+Scrambled777
+Robin Liu
+Denis Shilin
+Alexander Ivanov
+Miha Frangež
+Silvério Santos
+Virginie
 Michael Gangolf
-Milan Šalka
-3DN1M
-Minecraft boom
-Mobashir Raihan
-Moi Toi
-DiCeYMaYo
-DivideEtImpera
-Nicolas
-Nosnahc
-osamaqw
-pa4k
-pbeckmann
-Peer Beckmann
-vandman
-Piotr Strebski
-Piotr Zet
-Poorva Patidar
-Quang Nguyen
-Ratnesh
-Rohan Babbar 
-Ronak Upadhyay
-Rose Liverman
-SKULD
-Sabrina
-Salem Malus
-Samarth Asthan
-tatyhub
-Shailendra Maurya
-SilverFS
-Simone Dotto
-Subhashish Anand
-Subhradeep Bera
-Swayam Khare
-SziaTomi
-Mehedi Hasan
-Tim Trek
-Titas Pažereckas
-atakujonc
-tkraljevic
-Tony C
-Vancha March
-tyap-lyap-ivprod
-Waldemar Stoczkowski
-Wiktor Kwapisiewicz
-Yevgeny M
-Yusril A
-ahmed-awad26
-Avik Kundu
-ayuyydev
-diksha-2911
-essys
-gbonaspetti
-gittyboy-cell
-huang ivan
-lassr8
-liva
-lucafont2
-mtrmirez
-michaelpratana
-opsik
-pesta007
-polarhun
-pooyanazari
-psa-jforestier
-z369369
-sergio
-skauVictor
-080502
-Marcus
-techwebpd
-tjw123hh
-Truestorybaby 
-tygyh
-unstartdev
-wmilan 17
-MeH762
-يوسف لطفي
-しいたけ
-元气
-JaeBeom An
-JungHee Lee
+rudy3
+Kim Seohyun
+Govind S Nair
+Freddo espresso
+arshbeerSingh

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

@@ -18,7 +18,6 @@
     <string name="confirm">تأكيد</string>
     <string name="deleteConfirmation">مسح هذة البطاقة نهائيا؟</string>
     <string name="ok">حسنا</string>
-    <string name="copy_to_clipboard">نسخ البطاقة الشخصية الى الحافظة</string>
     <string name="share">شارك</string>
     <string name="sendLabel">ارسل…</string>
     <string name="editCardTitle">عدل البطاقة</string>
@@ -26,7 +25,6 @@
     <string name="scanCardBarcode">مسح باركود</string>
     <string name="cardShortcut">اختصار البطاقة</string>
     <string name="noCardsMessage">اضف بطاقة أولا</string>
-    <string name="card_ids_copied">البطاقة(ات) الشخصية المنسوخة</string>
     <string name="barcodeImageDescriptionWithType">صورة <xliff:g>%s</xliff:g> باركود</string>
     <string name="noCardExistsError">لا يمكن العثور على هذه البطاقة</string>
     <string name="failedParsingImportUriError">لا يمكن تحليل الرابط المستورد</string>
@@ -47,7 +45,6 @@
     <string name="app_license">البرمجيات الحرة متروكة الحقوق, ترخيص +GPLv3</string>
     <string name="app_libraries">مكتبات الطرف الثالث الحرة: <xliff:g id="app_libraries_list">%s</xliff:g></string>
     <string name="selectBarcodeTitle">اختار الباركود</string>
-    <string name="copy_to_clipboard_toast">تم نسخ بطاقة الهوية إلى الحافظة</string>
     <string name="thumbnailDescription">صورة مصغرة</string>
     <string name="starImage">نجم مفضل</string>
     <string name="settings">اعدادات</string>
@@ -95,7 +92,6 @@
     <string name="setBarcodeId">قم بتعيين قيمة الباركود</string>
     <string name="unsupportedBarcodeType">لا يمكن عرض نوع الباركود هذا. قد يكون مدعومًا في إصدار أحدث من التطبيق.</string>
     <string name="wrongValueForBarcodeType">القيمة غير صالحة لنوع الباركود المحدد</string>
-    <string name="copy_to_clipboard_multiple_toast">تم نسخ بطاقات الهوية إلى الحافظة</string>
     <string name="intent_import_card_from_url_share_multiple_text">أريد مشاركة بعض البطاقات معك</string>
     <string name="frontImageDescription">الصورة الأمامية</string>
     <string name="backImageDescription">الصورة الخلفية</string>
@@ -177,9 +173,9 @@
         <item quantity="zero">مسح <xliff:g>%d</xliff:g> بطاقة</item>
         <item quantity="one">مسح <xliff:g>%d</xliff:g> بطاقة</item>
         <item quantity="two">مسح <xliff:g>%d</xliff:g> بطاقتين</item>
-        <item quantity="few">مسح <xliff:g>%d</xliff:g> بطاقات</item>
-        <item quantity="many">مسح <xliff:g>%d</xliff:g> بطاقات</item>
-        <item quantity="other">مسح <xliff:g>%d</xliff:g> بطاقات</item>
+        <item quantity="few">مسح <xliff:g>%d</xliff:g> بطائق</item>
+        <item quantity="many">مسح <xliff:g>%d</xliff:g> بطاقة</item>
+        <item quantity="other">مسح <xliff:g>%d</xliff:g> بطاقة</item>
     </plurals>
     <plurals name="deleteCardsConfirmation">
         <item quantity="zero">مسح هذه <xliff:g>%d</xliff:g> البطاقة نهائيا؟</item>
@@ -203,7 +199,7 @@
     <string name="groupsList">مجموعات: <xliff:g>%s</xliff:g></string>
     <string name="settings_disable_lockscreen_while_viewing_card">منع قفل الشاشة</string>
     <string name="leaveWithoutSaveTitle">خروج</string>
-    <string name="editGroup">مجموعة التعديل: <xliff:g>%s</xliff:g></string>
+    <string name="editGroup">تعديل المجموعه: <xliff:g>%s</xliff:g></string>
     <plurals name="groupCardCount">
         <item quantity="zero"><xliff:g>%d</xliff:g> بطاقة</item>
         <item quantity="one"><xliff:g>%d</xliff:g> بطاقة</item>
@@ -255,7 +251,7 @@
     <string name="barcodeLongPressMessage">يمكن فتح صور فقط في تطبيق معرض الصور</string>
     <string name="failedToOpenUrl">ثبت متصفح ويب أولاً</string>
     <string name="welcome">مرحبا بك في كاتيما</string>
-    <string name="updateBalanceTitle">كم أنفقت؟</string>
+    <string name="updateBalanceTitle">كم أنفقت أو استلمت؟</string>
     <string name="currentBalanceSentence">الرصيد الحالي: <xliff:g> %s </xliff:g></string>
     <plurals name="viewArchivedCardsWithCount">
         <item quantity="zero">عرض الأرشيف (<xliff:g>%1$d</xliff:g> بطاقة)</item>
@@ -306,4 +302,20 @@
     <string name="settings_category_title_privacy">خصوصية</string>
     <string name="show_balance">إظهار التوازن</string>
     <string name="settings_keep_screen_on_summary">تعطيل مهلة الشاشة أثناء عرض البطاقة</string>
+    <string name="balanceParsingFailed">رصيد غير صالح</string>
+    <string name="card_id_must_not_be_empty">يجب ألا يكون معرف البطاقة فارغا</string>
+    <string name="add_a_card_in_a_different_way">أضف بطاقة بطريقة مختلفة</string>
+    <string name="manually_enter_barcode_instructions">أدخل رقم الهوية أو النص الموجود على بطاقتك واضغط على الرمز الشريطي الذي يشبه الموجود على بطاقتك.</string>
+    <string name="action_more_options">خيارات أخرى</string>
+    <string name="enter_card_id">أدخل رقم الهوية أو النص الموجود على بطاقتك</string>
+    <string name="addWithoutBarcode">إضافة بدون باركود</string>
+    <string name="field_must_not_be_empty">يجب ألا يكون الحقل فارغا</string>
+    <string name="app_name">كاتيما</string>
+    <string name="settings_follow_sensor_orientation">التدوير دائمًا ( تجاهل إعدادات النظام)</string>
+    <string name="add_manually_warning_title">الفحص موصى به</string>
+    <string name="continue_">استمر</string>
+    <string name="spend">انفق</string>
+    <string name="receive">استلم</string>
+    <string name="amountParsingFailed">كمية غير صحيحة</string>
+    <string name="add_manually_warning_message">في بعض المتاجر قيمة الباركود تختلف عن الرقم الموجود على البطاقة. لهذا السبب إدخال الباركود يدوياً لن ينجح دائماً. من المستحسن فحص الباركود بكاميرا بدلا من ذالك. هل انت مُصِر على الاستكمال؟</string>
 </resources>

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

@@ -1,5 +1,5 @@
 <?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">
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="storeName">Nome</string>
     <string name="note">Nota</string>
     <string name="noMatchingGiftCards">Nun hai nengún resultáu. Prueba a camudar la busca.</string>
@@ -24,10 +24,6 @@
     <string name="save">Guardar</string>
     <string name="edit">Editar</string>
     <string name="delete">Desaniciar</string>
-    <plurals name="deleteCardsTitle">
-        <item quantity="one"></item>
-        <item quantity="other"></item>
-    </plurals>
     <string name="unstar">Quitar de Favoritos</string>
     <string name="cancel">Encaboxar</string>
     <string name="importFailed">Nun se pudo facer la importación</string>

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

@@ -40,9 +40,8 @@
     <string name="addCardTitle">Добавяне на карта</string>
     <string name="removeImage">Премахване на изображение</string>
     <string name="takePhoto">Снимане</string>
-    <string name="copy_to_clipboard_multiple_toast">Номерата са копирани в междинната памет</string>
     <string name="intent_import_card_from_url_share_multiple_text">Искам да споделя тези карти с вас</string>
-    <string name="wrongValueForBarcodeType">Неприемлива стойност за избрания вид щрихкод</string>
+    <string name="wrongValueForBarcodeType">Стойноста е неприемлива за избрания щрихкод</string>
     <string name="setBarcodeId">Задаване на стойност</string>
     <string name="sameAsCardId">Като номера</string>
     <string name="barcodeId">Стойност на щрихкода</string>
@@ -89,7 +88,6 @@
     <string name="settings">Настройки</string>
     <string name="starImage">Звезда за любимо</string>
     <string name="thumbnailDescription">Миниатюра</string>
-    <string name="copy_to_clipboard_toast">Номерът е копиран в междинната памет</string>
     <string name="selectBarcodeTitle">Избиране на щрихкод</string>
     <string name="importOptionApplicationButton">Избиране чрез приложение</string>
     <string name="importing">Внасяне…</string>
@@ -107,7 +105,6 @@
     <string name="scanCardBarcode">Снемане на щрихкод</string>
     <string name="editCardTitle">Редактиране на карта</string>
     <string name="share">Споделя</string>
-    <string name="copy_to_clipboard">Копира номера в междинната памет</string>
     <string name="ok">Добре</string>
     <string name="importSuccessful">Данните са внесени</string>
     <string name="chooseImportType">Внасяне на данни на</string>
@@ -196,7 +193,7 @@
     <string name="group_name_already_in_use">Има списък с това име</string>
     <string name="group_updated">Промените са запазени</string>
     <string name="selectColor">Избиране на цвят</string>
-    <string name="group_name_is_empty">Името на списъка не може да е празно</string>
+    <string name="group_name_is_empty">Името на списъка не трябва да е празно</string>
     <string name="group_edit">Редактиране на списък</string>
     <string name="noGiftCardsGroup">Създайте карти и ги зачислите към списък от тук.</string>
     <string name="translate_platform">в Weblate</string>
@@ -204,7 +201,6 @@
     <string name="starred">Със звезда</string>
     <string name="showMoreInfo">Показване на информация</string>
     <string name="options">Настройки</string>
-    <string name="card_ids_copied">Номерата са копирани</string>
     <plurals name="balancePoints">
         <item quantity="one"><xliff:g>%s</xliff:g> точка</item>
         <item quantity="other"><xliff:g>%s</xliff:g> точки</item>
@@ -237,7 +233,7 @@
     <string name="barcodeLongPressMessage">В приложението галерия могат да бъдат отваряни само изображения</string>
     <string name="failedToRetrieveImageFile">Не е възможно извличане на изображение</string>
     <string name="noCameraPermissionDirectToSystemSetting">За да сканирате щрихкодове с Catima е необходим достъп до камерата. За да промените разрешението докоснете тук.</string>
-    <string name="updateBalanceTitle">Каква е промяната\?</string>
+    <string name="updateBalanceTitle">Колко е похарчено или получено?</string>
     <string name="updateBalanceHint">Въведете стойност</string>
     <string name="newBalanceSentence">Нов баланс: <xliff:g>%s</xliff:g></string>
     <string name="cameraPermissionDeniedTitle">Камерата е недостъпна</string>
@@ -278,4 +274,20 @@
     <string name="show_archived_cards">Архивирани карти</string>
     <string name="view_online">Преглед</string>
     <string name="app_copyright_short">Всички права запазени © Силвия ван Ос и сътрудници</string>
+    <string name="card_id_must_not_be_empty">Номера на картата не трябва да бъде празен</string>
+    <string name="balanceParsingFailed">Неприемлив баланс</string>
+    <string name="add_a_card_in_a_different_way">Добавяне на карта по друг начин</string>
+    <string name="manually_enter_barcode_instructions">Въведете номера или текста и изберете щрихкода, който прилича на този от картата.</string>
+    <string name="action_more_options">Повече</string>
+    <string name="enter_card_id">Въведете номера или текста от картата</string>
+    <string name="addWithoutBarcode">Добавяне на карта без щрихкод</string>
+    <string name="field_must_not_be_empty">Полето не трябва да е празно</string>
+    <string name="app_name">Catima</string>
+    <string name="settings_follow_sensor_orientation">Винаги да се завърта (пренебрегва системната настройка)</string>
+    <string name="continue_">Продължаване</string>
+    <string name="add_manually_warning_title">Препоръчително е да сканирате</string>
+    <string name="add_manually_warning_message">Стойностите от щрихкода и отбелязаните на картата числа в някои случаи се различават. По тази причина е при ръчно въвеждане картата може да не работи. Силно препоръчително е да сканирате щрихкода с камерата. Желаете ли да продължите въпреки това?</string>
+    <string name="amountParsingFailed">Неприемлива сума</string>
+    <string name="spend">Похарчено</string>
+    <string name="receive">Получено</string>
 </resources>

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

@@ -33,7 +33,6 @@
     <string name="setBarcodeId">বারকোড আইডি সেট করুন</string>
     <string name="unsupportedBarcodeType">এই বারকোডের টাইপটি এখন দেখানো যাচ্ছে না। অ্যাপের পরের সংস্করণে হয়ত এটি সমর্থন করা যেতে পারে।</string>
     <string name="wrongValueForBarcodeType">বারকোড টাইপের জন্য ভুল মান</string>
-    <string name="copy_to_clipboard_multiple_toast">আইডিগুলি ক্লিপবোর্ডে কপি হল</string>
     <string name="intent_import_card_from_url_share_multiple_text">url থেকে ইন্টেন্ট ইম্পোর্ট কার্ড একাধিক টেক্সট শেয়ার করে</string>
     <string name="frontImageDescription">সামনের চিত্র</string>
     <string name="backImageDescription">পিছনের চিত্র</string>
@@ -68,13 +67,11 @@
     <string name="reverse">...উল্টো ক্রমে</string>
     <string name="sort_by">ক্রমানুসার</string>
     <string name="noCardExistsError">কার্ডটি খুঁজে পাওয়া গেল না</string>
-    <string name="card_ids_copied">আইডি কপি করা হয়েছে</string>
     <string name="noCardsMessage">কোন কার্ড বার্তা নেই</string>
     <string name="addCardTitle">কার্ডের শিরোনাম যোগ করুন</string>
     <string name="editCardTitle">কার্ডের শিরোনাম সম্পাদনা করুন</string>
     <string name="sendLabel">পাঠান…</string>
     <string name="share">ভাগ</string>
-    <string name="copy_to_clipboard">নকল করুন ক্লিপবোর্ড এ</string>
     <string name="deleteConfirmation">এই কার্ডটি চিরকালের জন্য মুছে দেবো\?</string>
     <string name="confirm">নিশ্চিত করুন</string>
     <string name="delete">মুছে ফেলুন</string>
@@ -125,7 +122,6 @@
     <string name="importExport">আমদানি/রপ্তানি</string>
     <string name="cardShortcut">কার্ড শর্টকাট</string>
     <string name="exportFailed">রপ্তানি করা যাচ্ছে না</string>
-    <string name="copy_to_clipboard_toast">আইডি ক্লিপবোর্ডে নকল করা হল</string>
     <string name="importExportHelp">নিজের ডেটা অন্য কোথাও সংরক্ষণ করে রাখলে পরে সেটা অন্য ডিভাইসে সরিয়ে নিতে পারবেন।</string>
     <string name="importFailed">আমদানি করা গেল না</string>
     <string name="noGiftCardsGroup">কিছু কার্ড বানান আর এই গ্রুপে স্থির করুন।</string>
@@ -247,7 +243,7 @@
     <string name="unarchive">সংরক্ষণাগারমুক্ত করুন</string>
     <string name="archived">কার্ড সংরক্ষণাগারভুক্ত</string>
     <string name="welcome">Catima-তে স্বাগতম</string>
-    <string name="updateBalanceTitle">আপনি কত খরচ করেছেন\?</string>
+    <string name="updateBalanceTitle">আপনি কত খরচ করেছেন?</string>
     <string name="updateBalanceHint">পরিমান লিখুন</string>
     <string name="currentBalanceSentence">বর্তমান ব্যালেন্স: <xliff:g>%s</xliff:g></string>
     <string name="show_name_below_image_thumbnail">ছবির থাম্বনেইল এর নিচে নামটি দেখান</string>

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

@@ -40,7 +40,6 @@
         <item quantity="one">এই <xliff:g>%d</xliff:g> কার্ডটি স্থায়ীভাবে মুছবেন\?</item>
         <item quantity="other">এই <xliff:g>%d</xliff:g> কার্ডগুলিকে স্থায়ীভাবে মুছবেন\?</item>
     </plurals>
-    <string name="copy_to_clipboard">ক্লিপবোর্ডে আইডি কপি করুন</string>
     <string name="share">শেয়ার করুন</string>
     <string name="editCardTitle">কার্ড সম্পাদনা করুন</string>
     <string name="addCardTitle">কার্ড যোগ করুন</string>
@@ -53,5 +52,28 @@
     <string name="noGiftCards">একটি কার্ড যোগ করতে + প্লাস বোতামে ক্লিক করুন বা ⋮ মেনু থেকে আমদানি করুন।</string>
     <string name="cardShortcut">কার্ড শর্টকাট</string>
     <string name="noCardsMessage">প্রথমে একটি কার্ড যোগ করুন</string>
-    <string name="card_ids_copied">আইডি কপি করা হয়েছে</string>
+    <string name="noCardExistsError">কার্ডটি খুঁজে পাওয়া যায়নি</string>
+    <string name="barcodeImageDescriptionWithType">ছবি <xliff:g>%s</xliff:g> বারকোড</string>
+    <string name="cameraPermissionDeniedTitle">ক্যামেরাটি ব্যবহার করা যাচ্ছে না</string>
+    <string name="failedParsingImportUriError">দেওয়া URL-টি প্রক্রিয়া করা যাচ্ছে না</string>
+    <string name="exporting">রপ্তানি করা হচ্ছে…</string>
+    <string name="noCameraPermissionDirectToSystemSetting">বারকোড স্ক্যান করার জন্য, ক্যাটিমা কে ক্যামেরাটি ব্যবহার করার অনুমতি দিতে হবে। এইখানে টাচ করে আপনার অনুমতি সেটিংস পালটে নিন।</string>
+    <string name="settings_dark_theme">অন্ধকার</string>
+    <string name="exportOptionExplanation">ডেটাটি আপনার পছন্দের জায়গায় রাখা হবে।</string>
+    <string name="importFailed">আমদানি করা গেল না</string>
+    <string name="permissionReadCardsDescription">সমস্ত ক্যাটিমা কার্ডস এবং তার তথ্য পড়ুন, নোট্স আর ছবি সহ</string>
+    <string name="importFailedTitle">আমদানি ব্যর্থ</string>
+    <string name="importExportHelp">নিজের ডেটা সংরক্ষণ করে রাখলে পরে সেটা অন্য ডিভাইসে সরিয়ে নিতে পারবেন।</string>
+    <string name="importExport">আমদানি/রপ্তানি</string>
+    <string name="importing">আমদানি করা হচ্ছে…</string>
+    <string name="exportFailed">রপ্তানি করা যাচ্ছে না</string>
+    <string name="exportName">আমদানি/রপ্তানি</string>
+    <string name="cameraPermissionRequired">এই কাজটির জন্য ক্যামেরা ব্যবহার করার অনুমতি লাগবে…</string>
+    <string name="importSuccessfulTitle">আমদানি শেষ</string>
+    <string name="exportSuccessfulTitle">রপ্তানি শেষ</string>
+    <string name="permissionReadCardsLabel">কাটিমা কার্ডস পড়ুন</string>
+    <string name="storageReadPermissionRequired">এই কাজটির জন্য ফোনের স্টোরেজ দেখার অনুমতি লাগবে…</string>
+    <string name="exportFailedTitle">রপ্তানি ব্যর্থ</string>
+    <string name="settings_card_orientation">বারকোড অভিমুখ (ওরিয়েন্টেশন)</string>
+    <string name="app_name">ক্যাটিমা</string>
 </resources>

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

@@ -33,7 +33,6 @@
     <string name="setBarcodeId">Postavi vrijednost za bar kod</string>
     <string name="unsupportedBarcodeType">Ovaj bar kod još nije prikazan. Ona može biti podržana u kasnijoj verziji app.</string>
     <string name="wrongValueForBarcodeType">Izabrana vrijednost nije izvršna</string>
-    <string name="copy_to_clipboard_multiple_toast">IDs kartica kopiran u clipboard</string>
     <string name="intent_import_card_from_url_share_multiple_text">Želim podijeliti karte s tobom</string>
     <string name="frontImageDescription">Slika kartice</string>
     <string name="backImageDescription">Slika pozadine kartice</string>
@@ -68,13 +67,11 @@
     <string name="reverse">Rikverc</string>
     <string name="sort_by">Sortiraj</string>
     <string name="noCardExistsError">Nisam mogao pronaći tu karticu</string>
-    <string name="card_ids_copied">Kopiran ID/ovi</string>
     <string name="noCardsMessage">Dodaj prvo kartu</string>
     <string name="addCardTitle">Dodaj Kartu</string>
     <string name="editCardTitle">Izmijeni Karticu</string>
     <string name="sendLabel">Pošalji…</string>
     <string name="share">Podijeli</string>
-    <string name="copy_to_clipboard">Kopiraj ID u clipboard</string>
     <string name="deleteConfirmation">Izbriši trajno ovu karticu\?</string>
     <string name="confirm">Potvrdi</string>
     <string name="delete">Obriši</string>

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

@@ -11,7 +11,6 @@
     <string name="delete">Smazat</string>
     <string name="confirm">Potvrdit</string>
     <string name="ok">OK</string>
-    <string name="copy_to_clipboard">Kopírovat ID do schránky</string>
     <string name="sendLabel">Odeslat…</string>
     <string name="editCardTitle">Editovat kartu</string>
     <string name="addCardTitle">Přidat kartu</string>
@@ -38,7 +37,6 @@
     <string name="about_title_fmt">O aplikaci <xliff:g id="app_name">%s</xliff:g></string>
     <string name="debug_version_fmt">Verze: <xliff:g id="version">%s</xliff:g></string>
     <string name="selectBarcodeTitle">Vyberte čárový kód</string>
-    <string name="copy_to_clipboard_toast">ID zkopírováno do schránky</string>
     <string name="deleteTitle">Smazat kartu</string>
     <string name="deleteConfirmation">Opravdu chcete smazat tuto kartu\?</string>
     <string name="moveBarcodeToTopOfScreen">Přesunout čárový kód do horní části obrazovky</string>
@@ -63,7 +61,6 @@
     <string name="noMatchingGiftCards">Nic nenalezeno. Zkuste zadat jiný výraz.</string>
     <string name="action_search">Hledat</string>
     <string name="thumbnailDescription">Miniatura</string>
-    <string name="card_ids_copied">ID zkopírováno</string>
     <plurals name="deleteCardsConfirmation">
         <item quantity="one">Opravdu chcete trvale odstranit <xliff:g>%d</xliff:g> kartu\?</item>
         <item quantity="few">Opravdu chcete trvale odstranit <xliff:g>%d</xliff:g> karty\?</item>
@@ -117,7 +114,6 @@
     <string name="backImageDescription">Obrázek zadní strany</string>
     <string name="frontImageDescription">Obrázek přední strany</string>
     <string name="intent_import_card_from_url_share_multiple_text">Chci s vámi sdílet karty</string>
-    <string name="copy_to_clipboard_multiple_toast">ID zkopírována do schránky</string>
     <string name="wrongValueForBarcodeType">Hodnota není platná pro vybraný typ čárového kódu</string>
     <string name="unsupportedBarcodeType">Tento typ čárového kódu zatím nelze zobrazit. Možná bude podporován v pozdější verzi aplikace.</string>
     <string name="barcodeId">Hodnota čárového kódu</string>
@@ -151,8 +147,8 @@
     <string name="errorReadingImage">Obrázek se nepodařilo přečíst</string>
     <string name="noBarcodeFound">Čárový kód nenalezen</string>
     <string name="groupsList">Skupiny: <xliff:g>%s</xliff:g></string>
-    <string name="addFromImage">Výběr obrázku z galerie</string>
-    <string name="addManually">Ruční zadání ID</string>
+    <string name="addFromImage">Vybrat obrázek z galerie</string>
+    <string name="addManually">Zadat čárový kód ručně</string>
     <string name="leaveWithoutSaveConfirmation">Ukončit bez uložení\?</string>
     <string name="leaveWithoutSaveTitle">Ukončit</string>
     <string name="failedOpeningFileManager">Nejprve si nainstalujte správce souborů.</string>
@@ -199,7 +195,7 @@
     <string name="setIcon">Nastavit miniaturu</string>
     <string name="group_edit">Upravit skupinu</string>
     <string name="group_name_already_in_use">Název skupiny je již použitý</string>
-    <string name="group_name_is_empty">Název skupiny nemůže být prázdný</string>
+    <string name="group_name_is_empty">Název skupiny nesmí být prázdný</string>
     <string name="group_updated">Skupina aktualizována</string>
     <string name="editGroup">Úprava skupiny: <xliff:g>%s</xliff:g></string>
     <string name="noGiftCardsGroup">Zatím nemáte žádné věrnostní karty. Jakmile nějaké přidáte, můžete je zde přiřadit do skupiny.</string>
@@ -247,7 +243,7 @@
     <string name="updateBalance">Aktualizovat zůstatek</string>
     <string name="currentBalanceSentence">Současný zůstatek: <xliff:g>%s</xliff:g></string>
     <string name="noCameraPermissionDirectToSystemSetting">Pro skenování čárových kódů bude Catima potřebovat přístup k fotoaparátu. Klepněte zde pro změnu nastavení oprávnění.</string>
-    <string name="updateBalanceTitle">Kolik jste utratil\?</string>
+    <string name="updateBalanceTitle">Kolik jste utratil/a nebo obdržel/a?</string>
     <string name="updateBalanceHint">Zadejte výši</string>
     <string name="newBalanceSentence">Nový zůstatek: <xliff:g>%s</xliff:g></string>
     <string name="storageReadPermissionRequired">Pro tuto akci je potřeba oprávnění ke čtení úložiště…</string>
@@ -285,4 +281,20 @@
     <string name="action_display_options">Možnosti zobrazení</string>
     <string name="show_archived_cards">Zobrazovat archivované karty</string>
     <string name="view_online">Zobrazovat online</string>
+    <string name="card_id_must_not_be_empty">ID karty nesmí být prázdné</string>
+    <string name="balanceParsingFailed">Neplatný zůstatek</string>
+    <string name="add_a_card_in_a_different_way">Přidat kartu jiným způsobem</string>
+    <string name="manually_enter_barcode_instructions">Zadejte číslo ID nebo text na vaší kartě a stiskněte čárový kód, který vypadá jako ten na vaší kartě.</string>
+    <string name="action_more_options">Více možností</string>
+    <string name="enter_card_id">Zadejte číslo ID nebo text na vaší kartě</string>
+    <string name="addWithoutBarcode">Přidat kartu bez čárového kódu</string>
+    <string name="field_must_not_be_empty">Položka nesmí být prázdná</string>
+    <string name="app_name">Catima</string>
+    <string name="settings_follow_sensor_orientation">Vždy otáčet (ignoruje nastavení systému)</string>
+    <string name="continue_">Pokračovat</string>
+    <string name="add_manually_warning_title">Doporučuje se skenování</string>
+    <string name="add_manually_warning_message">V některých obchodech se hodnota čárového kódu liší od čísla napsaného na kartě. Z tohoto důvodu nemusí ruční zadání čárového kódu vždy fungovat. Důrazně doporučujeme místo toho naskenovat čárový kód pomocí fotoaparátu. Chcete přesto pokračovat?</string>
+    <string name="spend">Utratit</string>
+    <string name="receive">Obdržet</string>
+    <string name="amountParsingFailed">Neplatné množství</string>
 </resources>