Release Catima 2.8.0

Update Fastlane changelogs

.github/dependabot.yml

@@ -0,0 +1,11 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "gradle" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "daily"

.github/workflows/android.yml

@@ -2,9 +2,13 @@ name: Android CI
 
 on:
   push:
-    branches: [ master ]
+    branches:
+      - master
+      - staging
+      - trying
   pull_request:
-    branches: [ master ]
+    branches:
+      - master
 
 jobs:
   build:
@@ -13,6 +17,8 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
+    - name: Fail on bad translations
+      run: if grep -ri "<xliff" app/src/main/res/values*/strings.xml; then echo "Invalidly escaped translations found"; exit 1; fi
     - uses: gradle/wrapper-validation-action@v1
     - name: set up JDK 11
       uses: actions/setup-java@v2
@@ -24,7 +30,7 @@ jobs:
     - name: Check lint
       run: ./gradlew lintRelease
     - name: Run unit tests
-      run: ./gradlew testReleaseUnitTest
+      run: ./gradlew testReleaseUnitTest || ./gradlew testReleaseUnitTest
     - name: SpotBugs
       run: ./gradlew spotbugsRelease
     - name: Archive test results

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

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

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

@@ -10,20 +10,23 @@ on:
       - '**.webp'
 jobs:
   build:
+    # Only run on Pull Requests within the same repository, and not from forks.
+    if: github.event.pull_request.head.repo.full_name == github.repository
     name: calibreapp/image-actions
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Repo
-        uses: actions/checkout@master
+        uses: actions/checkout@v2
       - name: Compress Images
         id: calibre
-        uses: calibreapp/image-actions@master
+        uses: calibreapp/image-actions@1.1.0
         with:
           githubToken: ${{ secrets.GITHUB_TOKEN }}
+          ignorePaths: 'app/src/test'
           compressOnly: true
       - name: Create New Pull Request If Needed
         if: steps.calibre.outputs.markdown != ''
-        uses: peter-evans/create-pull-request@master
+        uses: peter-evans/create-pull-request@v3
         with:
           title: Compressed Images
           branch-suffix: timestamp

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

@@ -0,0 +1,26 @@
+name: Convert CHANGELOG to Fastlane
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  convert_changelog_to_fastlane:
+    runs-on: ubuntu-latest
+    name: Convert CHANGELOG to Fastlane
+    steps:
+    - name: Checkout repo
+      id: checkout
+      uses: actions/checkout@v2
+    - name: Setup Python
+      uses: actions/setup-python@v2
+      with:
+        python-version: '3.x'
+    - name: Run converter script
+      run: python .scripts/changelog_to_fastlane.py
+    - name: Create Pull Request
+      uses: peter-evans/create-pull-request@v3
+      with:
+        title: "Update Fastlane changelogs"
+        commit-message: "Update Fastlane changelogs"
+        branch-suffix: timestamp

.github/workflows/codeql-analysis.yml

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

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

@@ -0,0 +1,25 @@
+name: Write contributors to file
+on:
+  schedule:
+    - cron: '3 4 * * 0'
+
+jobs:
+  contributors_to_file:
+    runs-on: ubuntu-latest
+    if: github.ref == 'refs/heads/master'
+    name: Write contributors to file
+    steps:
+    - name: Checkout repo
+      id: checkout
+      uses: actions/checkout@v2
+    - name: Update contributors
+      id: update_contributors
+      uses: TheLastProject/contributors-to-file-action@v2
+      with:
+        file_in_repo: app/src/main/res/raw/contributors.txt
+    - name: Create Pull Request
+      uses: peter-evans/create-pull-request@v3
+      with:
+        title: "Update contributors"
+        commit-message: "Update contributors"
+        branch-suffix: timestamp

.gitignore

@@ -7,3 +7,4 @@ build/
 captures/
 **/release
 **/debug
+app/*.log

.scripts/changelog_to_fastlane.py

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

CHANGELOG.md

@@ -1,67 +1,114 @@
 # Changelog
 
-## v2.2.1 (2021-08-07)
+## Unreleased - 89
 
-Changes:
+- Fix swiping between groups not working on an empty group
+- Allow password-protecting exports
+- Improve usage of space for QR codes
+- Save the last used zoom level per card
+- Fix a crash when swiping right after a tap
+
+## v2.7.3 - 88 (2021-10-10)
+
+- Fix incorrect migration making first card become invisible
+
+## v2.7.2 - 87 (2021-10-09)
+
+- Fix regression breaking import/export
+
+## v2.7.1 - 86 (2021-10-07)
+
+- Improve search with spaces
+
+## v2.7.0 - 85 (2021-10-05)
+
+Android 4.4 is no longer supported starting with this release. If you want to use Catima on Android 4.4, please use version 2.6.1.
+
+- Improved Android 12 support
+- Improved about screen
+- Search now ignores accents
+
+## v2.6.1 - 84 (2021-09-25)
+
+- Minor bugfixes and improvements
+
+## v2.6.0 - 83 (2021-09-19)
+
+- Support for changing the sorting order
+- Prevent Out Of Memory on scanning large pictures for barcode
+
+## v2.5.0 - 82 (2021-09-10)
+
+- Improved support for screen readers
+- Don't crash when trying to open a video from gallery
+- Swipe support on loyalty card view screen
+- Don't reset group on back button press
+
+## v2.4.0 - 81 (2021-08-29)
+
+- Improve card list for landscape and tablet display
+- Add theming colour support (thanks, Subhashish Anand!)
+- Don't close scan activity on camera error (so manual entry is still possible)
+- Add all contributors to the about dialog
+
+## v2.3.0 - 80 (2021-08-19)
+
+- Fix images not imported from backup
+- Option to override language
+
+## v2.2.3 - 79 (2021-08-13)
+
+- Fix widget creating different-looking shortcut than app shortcuts
+- Replace default Android black screen with splash screen
+
+## v2.2.2 - 78 (2021-08-08)
+
+- Fix crash on rotation in loyalty card edit activity
+
+## v2.2.1 - 77 (2021-08-07)
 
 - Improve Stocard importer
 - Fix importing Catima export with multiline note
 - Scale card title in acceptable range
 - Animation improvements
 
-## v2.2.0 (2021-08-02)
-
-Changes:
+## v2.2.0 - 76 (2021-08-02)
 
 - Make links in notes clickable
 - Pre-select group the user is currently in when creating a new card
 - Comma-separate group names in loyalty card view
 - Fix maximize button appearing on no barcode
 
-## v2.1.0 (2021-08-01)
-
-Changes:
+## v2.1.0 - 75 (2021-08-01)
 
 - Fix selected colour in colour changing dialog
 - Support for deleting multiple cards at once
 - Fix possible ArithmeticException when resizing image
 - Fix fullscreen is closed when rotating device
 
-## v2.0.4 (2021-07-27)
-
-Changes:
+## v2.0.4 - 74 (2021-07-27)
 
 - Fix shortcut creation
 - Generate card-specific shortcut icon
 - Fix ability to change loyalty card colour
 
-## v2.0.3 (2021-07-25)
-
-Changes:
+## v2.0.3 - 73 (2021-07-25)
 
 - Fix loading photos when editing existing card
 
-## v2.0.2 (2021-07-25)
-
-Changes:
+## v2.0.2 - 72 (2021-07-25)
 
 - Fix inability to configure photos in new loyalty card
 
-## v2.0.1 (2021-07-21)
-
-Changes:
+## v2.0.1 - 71 (2021-07-21)
 
 - Several minor translation and UI fixes
 - Fix crash in import/sharing loyalty card on Android 6
 
-## v2.0 (2021-07-14)
-
-Breaking changes:
-- The backup format changed, see https://github.com/TheLastProject/Catima/wiki/Export-format
-- The URL sharing format changed, see https://github.com/TheLastProject/Catima/wiki/Card-sharing-URL-format
-
-Changes:
+## v2.0 - 70 (2021-07-14)
 
+- BREAKING CHANGE: The backup format changed, see https://github.com/TheLastProject/Catima/wiki/Export-format
+- BREAKING CHANGE: The URL sharing format changed, see https://github.com/TheLastProject/Catima/wiki/Card-sharing-URL-format
 - Make it possible to enable or disable the flashlight while scanning
 - Add UPC-E support
 - Support adding a front and back photo to each card
@@ -72,26 +119,20 @@ Changes:
 - Fix Floating Action Buttons being behind other UI elements on Android 4
 - Fix loyalty card viewer appbar top margin
 
-## v1.14.1 (2021-06-14)
-
-Changes:
+## v1.14.1 - 69 (2021-06-14)
 
 - Add missing barcode ID to export
 - Don't show update barcode dialog if value is the same as card ID
 - Add Finnish translation
 
-## v1.14 (2021-06-07)
-
-Changes:
+## v1.14 - 68 (2021-06-07)
 
 - Support new PDF417 export from Voucher Vault
 - Support copying multiple barcodes at once
 - Support sharing multiple loyalty cards at once
 - Ask to update barcode value if card ID changes
 
-## v1.13 (2021-04-10)
-
-Changes:
+## v1.13 - 67 (2021-04-10)
 
 - Add option to set a separate barcode value from card ID
 - Simplify font sizing configuration
@@ -100,175 +141,125 @@ Changes:
 - Always show all barcode types in manual entry
 - Remove privacy policy first start dialog
 
-## v1.12 (2021-03-30)
-
-Changes:
+## v1.12 - 66 (2021-03-30)
 
 - Support importing [Fidme](https://play.google.com/store/apps/details?id=fr.snapp.fidme) exports
 - Allow importing a card from a picture stored in the user's Android gallery
 - Fix multiline note cutoff
 - Change "Thank you" text on privacy dialog to "Accept" because Huawei is overly pedantic
 
-## v1.11 (2021-03-21)
-
-Changes:
+## v1.11 - 64 (2021-03-21)
 
 - Add privacy policy dialog on first start (required by Huawei)
 
-## v1.10 (2021-03-07)
-
-Changes:
+## v1.10 - 63 (2021-03-07)
 
 - Support importing [Voucher Vault](https://github.com/tim-smart/vouchervault/) exports
 - Option to keep the screen on while viewing a loyalty card
 - Option to suspend the lock screen while viewing a loyalty card
 
-## v1.9.2 (2021-02-24)
-
-Changes:
+## v1.9.2 - 62 (2021-02-24)
 
 - Fix parsing balance for countries using space as separator
 
-## v1.9.1 (2021-02-23)
-
-Changes:
+## v1.9.1 - 61 (2021-02-23)
 
 - Improve balance parsing logic
 - Fix currency decimal display on main screen
 
-## v1.9 (2021-02-22)
-
-Changes:
+## v1.9 - 59 (2021-02-22)
 
 - Add balance support
 - Reorganize barcode tab of edit view
 
-## v1.8.1 (2021-02-12)
-
-Changes:
+## v1.8.1 - 58 (2021-02-12)
 
 - Fix Crash on versions before Android 7
 
-## v1.8 (2021-01-28)
-
-Changes:
+## v1.8 - 57 (2021-01-28)
 
 - Add support for scaling the barcode when moving to top to fit even more small scanners
 - Fix bottom sheet jumping after switching to fullscreen
 - Make header in loyalty card view small in landscape mode
 - Fix cards not staying in group when group gets renamed
 
-## v1.7.1 (2021-01-18)
-
-Changes:
+## v1.7.1 - 56 (2021-01-18)
 
 - Fix crash on switching to barcode tab in edit view if there is no barcode
 
-## v1.7.0 (2021-01-18)
-
-Changes:
+## v1.7.0 - 55 (2021-01-18)
 
 - Separate edit UI in tabs to make it feel more spacious
 - Add expiry field support
 
-## v1.6.2 (2021-01-04)
-
-Changes:
+## v1.6.2 - 54 (2021-01-04)
 
 - Fix edit button or more info bottom sheet drawing over barcode ID
 
-## v1.6.1 (2020-12-16)
-
-Changes:
+## v1.6.1 - 64 (2020-12-16)
 
 - Fix regression causing manual barcode entry to not be saved
 
-## v1.6.0 (2020-12-15)
-
-Changes:
+## v1.6.0 - 52 (2020-12-15)
 
 - Automatically focus text field when creating or editing a group
 - Fix blurry icons (use SVG everywhere)
 - Always open camera but add manual scan button to camera view
 
-## v1.5.1 (2020-12-03)
-
-Changes:
+## v1.5.1 - 51 (2020-12-03)
 
 - Fix bottomsheet background being transparent
 
-## v1.5.0 (2020-12-03)
-
-Changes:
+## v1.5.0 - 50 (2020-12-03)
 
 - Improve contrast by always using white text on red buttons
 - Draggable bottom sheet in loyalty card view
 
-## v1.4.1 (2020-12-01)
-
-Changes:
+## v1.4.1 - 49 (2020-12-01)
 
 - Improved translations
 - Small UI fixes
 
-## v1.4.0 (2020-11-28)
-
-Changes:
+## v1.4.0 - 48 (2020-11-28)
 
 - Move About screen into its own activity
 - Ask user if they want to use their camera or manually enter ID on add/edit card
 - Make group ordering manual instead of forced alphabetically
 
-## v1.3.0 (2020-11-22)
-
-Changes:
+## v1.3.0 - 47 (2020-11-22)
 
 - Always show all import/export options and show a toast on actual issues (improves compat with XPrivacyLua)
 - Ask for confirmation when leaving edit view after making changes without saving
 
-## v1.2.2 (2020-11-19)
-
-Changes:
+## v1.2.2 - 46 (2020-11-19)
 
 - Remember active group tab between screens and sessions
 
-## v1.2.1 (2020-11-17)
-
-Changes:
+## v1.2.1 - 45 (2020-11-17)
 
 - Fix home screen swiping triggering during vertical swipes too
 
-## v1.2.0 (2020-11-17)
-
-Changes:
+## v1.2.0 - 44 (2020-11-17)
 
 - Add swiping between groups on the home screen
 - Fix crash with cards lacking header colour
 
-## v1.1.0 (2020-11-11)
-
-Changes:
+## v1.1.0 - 43 (2020-11-11)
 
 - Improved edit UI
 - Removed header text colour option (now automatically generated based on brightness)
 - Updated translations
 
-## v1.0.1 (2020-11-07)
-
-Changes:
+## v1.0.1 - 42 (2020-11-07)
 
 - Fix crash in search with no groups
 
-## v1.0 (2020-11-06)
-
-Changes:
+## v1.0 - 41 (2020-11-06)
 
 - Added rounded edges to card icons on main overview
 - Added support for grouping entries
 
-## v0.29 (2020-10-29)
-
-Changes:
+## v0.29 - 40 (2020-10-29)
 
 - Rebrand to Catima
 - Removed intro
@@ -277,31 +268,23 @@ Changes:
 - Add favourites support
 - Fix disabled auto-rotate being ignored
 
-## v0.28 (2020-03-09)
-
-Changes:
+## v0.28 - 39 (2020-03-09)
 
 - Fix barcode centering when exiting full screen ([#351](https://github.com/brarcher/loyalty-card-locker/pull/351))
 - Allow backup export location to be selected ([#352](https://github.com/brarcher/loyalty-card-locker/pull/352))
 - Update translations ([#357](https://github.com/brarcher/loyalty-card-locker/pull/357)) & ([#362](https://github.com/brarcher/loyalty-card-locker/pull/362))
 
-## v0.27 (2020-01-26)
-
-Changes:
+## v0.27 - 38 (2020-01-26)
 
 - Tapping on a barcode now moves it to the top of the screen ([#348](https://github.com/brarcher/loyalty-card-locker/pull/348))
 - Add white space around barcodes to improve scanning in dark mode ([#328](https://github.com/brarcher/loyalty-card-locker/issues/328))
 - Fix swapped import buttons. ([#346](https://github.com/brarcher/loyalty-card-locker/pull/346))
 
-## v0.26.1 (2020-01-09)
-
-Changes:
+## v0.26.1 - 37 (2020-01-09)
 
 - Fix issue with sharing cards without background color ([#343](https://github.com/brarcher/loyalty-card-locker/pull/343))
 
-## v0.26 (2020-01-05)
-
-Changes:
+## v0.26 - 36 (2020-01-05)
 
 - Add ability to search for a card ([#320](https://github.com/brarcher/loyalty-card-locker/pull/320))
 - Add ability to share and receive loyalty cards ([#321](https://github.com/brarcher/loyalty-card-locker/pull/321))
@@ -318,57 +301,41 @@ Changes:
   - Polish
   - Russian
 
-## v0.25.4 (2019-10-04)
-
-Changes:
+## v0.25.4 - 35 (2019-10-04)
 
 - Enable app backups
 - Update French and Slovenian translations
 
-## v0.25.3 (2019-03-02)
-
-Changes:
+## v0.25.3 - 34 (2019-03-02)
 
 - Update Russian translations
 
-## v0.25.2 (2019-01-05)
-
-Changes:
+## v0.25.2 - 33 (2019-01-05)
 
 - Update and add translations
 
-## v0.25.1 (2018-10-14)
-
-Changes:
+## v0.25.1 - 32 (2018-10-14)
 
 - Fix creating new card by manually entering barcode ([issue #272](https://github.com/brarcher/loyalty-card-locker/issues/272))
 
-## v0.25 (2018-10-07)
-
-Changes:
+## v0.25 - 31 (2018-10-07)
 
 - Sort card list case insensitive ([pull #266](https://github.com/brarcher/loyalty-card-locker/pull/266))
 - Add setting to lock orientation for all cards ([pull #269](https://github.com/brarcher/loyalty-card-locker/pull/269)
 
-## v0.24 (2018-07-31)
-
-Changes:
+## v0.24 - 30 (2018-07-31)
 
 - Add a setting to control screen brightness when displaying a barcode ([pull #259](https://github.com/brarcher/loyalty-card-locker/pull/259))
 - Add Greek translations ([pull #252](https://github.com/brarcher/loyalty-card-locker/pull/252))
 - Add Slovenian translations ([pull #260](https://github.com/brarcher/loyalty-card-locker/pull/260))
 - Update translations ([pull #260](https://github.com/brarcher/loyalty-card-locker/pull/260), [pull #254](https://github.com/brarcher/loyalty-card-locker/pull/254))
 
-## v0.23.4 (2018-05-12)
-
-Changes:
+## v0.23.4 - 29 (2018-05-12)
 
 - Fix Spanish translations ([pull #244](https://github.com/brarcher/loyalty-card-locker/pull/244))
 - Update translations ([pull #244](https://github.com/brarcher/loyalty-card-locker/pull/244))
 
-## v0.23.3 (2018-05-05)
-
-Changes:
+## v0.23.3 - 28 (2018-05-05)
 
 - Added translations
   - Polish ([pull #232](https://github.com/brarcher/loyalty-card-locker/pull/232))
@@ -376,87 +343,63 @@ Changes:
   - Slovak ([pull #232](https://github.com/brarcher/loyalty-card-locker/pull/232))
 - Updated translations ([pull #239](https://github.com/brarcher/loyalty-card-locker/pull/239))
 
-## v0.23.2 (2018-03-11)
-
-Changes:
+## v0.23.2 - 27 (2018-03-11)
 
 - Reduce min SDK from 17 to 15. ([pull #226](https://github.com/brarcher/loyalty-card-locker/pull/226))
 - Remove usage of legacy apache library, used only in unit tests but no longer needed. ([pull #225](https://github.com/brarcher/loyalty-card-locker/pull/225))
 
-## v0.23.1 (2018-03-07)
-
-Changes:
+## v0.23.1 - 26 (2018-03-07)
 
 - Prevent crash when rendering a barcode exhausts the application's memory. ([pull #219](https://github.com/brarcher/loyalty-card-locker/pull/219))
 
-## v0.23 (2018-02-28)
-
-Changes:
+## v0.23 - 25 (2018-02-28)
 
 - Reduce space in header when viewing a card. ([pull #213](https://github.com/brarcher/loyalty-card-locker/pull/213))
 - Disable beep when scanning a barcode. ([pull #216](https://github.com/brarcher/loyalty-card-locker/pull/216))
 
-## v0.22 (2018-02-19)
-
-Changes:
+## v0.22 - 24 (2018-02-19)
 
 - Update translations. ([pull #208](https://github.com/brarcher/loyalty-card-locker/pull/208))
 - Barcode rendering updates: ([pull #209](https://github.com/brarcher/loyalty-card-locker/pull/209))
   - Reload card view activity when screen is rotated, so barcode image is correct size.
   - Render 1D barcodes in a larger space, allowing them to better fill the screen.
 
-## v0.21 (2018-02-17)
-
-Changes:
+## v0.21 - 23 (2018-02-17)
 
 - Add quiet space at the start/end of barcodes. ([pull #200](https://github.com/brarcher/loyalty-card-locker/pull/200))
 - Add options to configure the colors used for the store name font and background. ([pull #203](https://github.com/brarcher/loyalty-card-locker/pull/203))
 - Add options to adjust font sizes on the card listing page and single card page. ([pull #204](https://github.com/brarcher/loyalty-card-locker/pull/204))
 
-## v0.20 (2018-02-10)
-
-Changes:
+## v0.20 - 22 (2018-02-10)
 
 - Changes to Card view to display the note, allow the card ID to take multiple lines, and show the store name. ([pull #197](https://github.com/brarcher/loyalty-card-locker/pull/197))
 
-## v0.19 (2018-02-01)
-
-Changes:
+## v0.19 - 21 (2018-02-01)
 
 - Improved layout for card list. ([pull #188](https://github.com/brarcher/loyalty-card-locker/pull/188))
 - Improved layout when viewing a card. ([pull #190](https://github.com/brarcher/loyalty-card-locker/pull/190))
 
-## v0.18.1 (2018-01-24)
-
-Changes:
+## v0.18.1 - 20 (2018-01-24)
 
 - Workaround crash during install on some Android versions (likely Android 5 and below). ([pull #184](https://github.com/brarcher/loyalty-card-locker/pull/184))
 
-## v0.18 (2018-01-19)
-
-Changes:
+## v0.18 - 19 (2018-01-19)
 
 - Fix crash when importing certain types of corrupted CSV files. ([pull #177](https://github.com/brarcher/loyalty-card-locker/pull/177))
 - Fix importing backups directly from the file system. ([pull #180](https://github.com/brarcher/loyalty-card-locker/pull/180))
 - Fix importing backups from certain types of content providers. ([pull #179](https://github.com/brarcher/loyalty-card-locker/pull/179))
 
-## v0.17 (2018-01-11)
-
-Changes:
+## v0.17 - 18 (2018-01-11)
 
 - Fix issue on Android SDK 24+ where using the file chooser import option would cause a crash. ([pull #170](https://github.com/brarcher/loyalty-card-locker/pull/170))
 - New icon and color scheme. ([pull #171](https://github.com/brarcher/loyalty-card-locker/pull/171))
 
-## v0.16 (2017-11-29)
-
-Changes:
+## v0.16 - 17 (2017-11-29)
 
 - Add support for adding loyalty card shortcuts from the launcher/homescreen. ([pull #161](https://github.com/brarcher/loyalty-card-locker/pull/161))
 - Remove support for adding loyalty card shortcuts from the app itself. This removes the need for the shortcut permission. ([pull #163](https://github.com/brarcher/loyalty-card-locker/pull/163))
 
-## v0.15 (2017-11-25)
-
-Changes:
+## v0.15 - 16 (2017-11-25)
 
 - Add support for adding shortcuts to home screen when adding or editing a card. ([pull #155](https://github.com/brarcher/loyalty-card-locker/pull/155))
 - Remove widget, as it was a poor substitute for shortcuts. ([pull #155](https://github.com/brarcher/loyalty-card-locker/pull/155))
@@ -464,37 +407,27 @@ Changes:
 - Report more accurate mime type when exporting backup data. ([pull #156](https://github.com/brarcher/loyalty-card-locker/pull/156))
 - Fix bug where a card could not be edited. ([pull #155](https://github.com/brarcher/loyalty-card-locker/pull/155))
 
-## v0.14 (2017-10-26)
-
-Changes:
+## v0.14 - 15 (2017-10-26)
 
 - Add support for app shortcuts (Android 7.1+), where the most recently used cards will appear as shortcuts. ([pull #145](https://github.com/brarcher/loyalty-card-locker/pull/145))
 - Add a widget which works like a pinned app shortcut, to support devices which run below Android 7.1. ([pull #142](https://github.com/brarcher/loyalty-card-locker/pull/142))
 
-## v0.13 (2017-07-25)
-
-Changes:
+## v0.13 - 14 (2017-07-25)
 
 - Add screen rotation lock menu option when displaying a card. If locked, the screen will transition to its "natural" orientation and further screen rotation will be blocked. ([pull #128](https://github.com/brarcher/loyalty-card-locker/pull/128))
 - If a card is selected from the main screen but cannot be loaded, the application fails gracefully and posts a message. ([pull #132](https://github.com/brarcher/loyalty-card-locker/pull/132))
 - Fix case where layout IDs for intro wizard could not be found. ([pull #128](https://github.com/brarcher/loyalty-card-locker/pull/128))
 
-## v0.12 (2017-07-16)
-
-Changes:
+## v0.12 - 13 (2017-07-16)
 
 - A change in v0.11 reduced the memory usage of barcode drawing, but affected the barcode dimensions. This is now changed to maintain the barcode dimensions while reducing memory usage. ([pull #126](https://github.com/brarcher/loyalty-card-locker/pull/126))
 - Update German and French translations. ([pull #122](https://github.com/brarcher/loyalty-card-locker/pull/122), [pull #124](https://github.com/brarcher/loyalty-card-locker/pull/124), [pull #125](https://github.com/brarcher/loyalty-card-locker/pull/125))
 
-## v0.11.1 (2017-06-29)
-
-Changes:
+## v0.11.1 - 12 (2017-06-29)
 
 - Prevent a crash when rotation the screen in the first run intro wizard.
 
-## v0.11 (2017-06-26)
-
-Improvements:
+## v0.11 - 11 (2017-06-26)
 
 - When editing a card ID, pre-populate the existing ID to start. ([pull #94](https://github.com/brarcher/loyalty-card-locker/pull/94))
 - Limit the width of generated barcodes to reduce memory usage and out of memory errors. ([pull #103](https://github.com/brarcher/loyalty-card-locker/pull/103))
@@ -502,15 +435,13 @@ Improvements:
 - Change the color scheme to be softer and compatible with the app icon, and change the layout when viewing a card to be cleaner. ([pull #107](https://github.com/brarcher/loyalty-card-locker/pull/107))
 - Add an intro wizard which launches on the app's first launch. ([pull #108](https://github.com/brarcher/loyalty-card-locker/pull/108))
 
-## v0.10 (2017-02-12)
-
-Improvements:
+## v0.10 - 10 (2017-02-12)
 
 - Changed the default import/export filename. ([pull #84](https://github.com/brarcher/loyalty-card-locker/pull/84))
 - Correct string on the import/export page. ([pull #87](https://github.com/brarcher/loyalty-card-locker/pull/87))
 - Improve layout of card view page. The text should be easier to read, and is selectable with a long click. ([pull #91](https://github.com/brarcher/loyalty-card-locker/pull/91))
 
-## v0.9 (2017-01-17)
+## v0.9 - 9 (2017-01-17)
 
 The "Locker" part of the name was not intuitive. To help remedy this a new application icon was created by betsythefc which better represents the purpose of the application: to store loyalty cards which use barcodes. Along with this new icon the name of the application has been changed to "Loyalty Card Keychain".
 
@@ -520,55 +451,36 @@ Additional features/improvements:
 - Translations for Lithuanian added. ([pull #62](https://github.com/brarcher/loyalty-card-locker/pull/62))
 - Translations for French added. ([pull #80](https://github.com/brarcher/loyalty-card-locker/pull/80))
 
-## v0.8 (2016-11-22)
-
-New features/improvements:
+## v0.8 - 8 (2016-11-22)
 
 - Screen brightness increased to its maximum when displaying a card, to help barcode scanners successfully capture the barcode. ([pull #54](https://github.com/brarcher/loyalty-card-locker/pull/54))
 - Add a delete confirmation when deleting a card. ([pull #55](https://github.com/brarcher/loyalty-card-locker/pull/55))
 - Add translations for German ([pull #57](https://github.com/brarcher/loyalty-card-locker/pull/57)) and Czech ([pull #58](https://github.com/brarcher/loyalty-card-locker/pull/58)).
 - Clarification change for Italian translation. ([pull #66](https://github.com/brarcher/loyalty-card-locker/pull/66))
 
-## v0.7 (2016-07-14)
-
-New features/improvements:
+## v0.7 - 7 (2016-07-14)
 
 - Long-click of a card brings up option to copy card ID to the clipboard. ([pull #49](https://github.com/brarcher/loyalty-card-locker/issues/49))
-
-Bug fixes:
-
 - Back button on Input/Export view now works, moving user to main view
 
-## v0.6 (2016-05-23)
-
-New features/improvements:
+## v0.6 - 6 (2016-05-23)
 
 - Allow user to enter barcode manually. If a user elects to enter a barcode manually, a list of all valid and supported barcode images is displayed. The user then may select the barcode image which matches what the user wants. [issue #33](https://github.com/brarcher/loyalty-card-locker/issues/33), [pull #44](https://github.com/brarcher/loyalty-card-locker/pull/44)
-
-Bug fixes:
-
 - Resolve issue where some displayed barcodes were blurry. ([issue #37](https://github.com/brarcher/loyalty-card-locker/issues/37))
 
-## v0.5 (2016-05-16)
-
-New features/improvements:
+## v0.5 - 5 (2016-05-16)
 
 - An about dialog can be opened from the main screen, which gives details about the application and project on GitHub ([issue #19](https://github.com/brarcher/loyalty-card-locker/issues/19))
 - Allow loyalty card information to be imported from/exported to a CSV file in external storage ([issue #36](https://github.com/brarcher/loyalty-card-locker/issues/36), [issue #20](https://github.com/brarcher/loyalty-card-locker/issues/20))
 
-## v0.4 (2016-04-09)
-
-New features/improvements:
+## v0.4 - 4 (2016-04-09)
 
 - Dutch translation
 - Allow name field to be editable after adding loyalty card
 - Add an optional note field
-
-Bug fixes:
-
 - Resolve all issues identified by FindBugs and require all FindBugs issues be resolved prior to pull request acceptance
 
-## v0.3 (2016-02-11)
+## v0.3 - 3 (2016-02-11)
 
 - Now officially supports the following list of 1D and 2D barcodes:
   - AZTEC
@@ -585,13 +497,13 @@ Bug fixes:
 
 - Generated barcodes are larger, easier to scan from a scanning device
 
-## v0.2 (2016-02-07)
+## v0.2 - 2 (2016-02-07)
 
 - Italian translations
 - Support for all 1D barcode types. (Originally only product 1D barcodes were supported)
 - Add required camera permission, which was initially missing.
 
-## v0.1 (2016-01-30)
+## v0.1 - 1 (2016-01-30)
 
 - Ability to create/edit/delete loyalty cards
 - Capture barcode of loyalty card using a camera

CONTRIBUTING.md

@@ -1,9 +1,9 @@
-How to Submit Patches to the Loyalty Card Keychain Project
+How to Submit Patches to the Catima Project
 ===============================================================================
-https://github.com/brarcher/budget-watch
+https://github.com/TheLastProject/Catima
 
 This document is intended to act as a guide to help you contribute to the
-Loyalty Card Keychain 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.
@@ -21,16 +21,16 @@ These are the Android lint checker, run using:
 
     # ./gradlew lintRelease
 
-and FindBugs, run using:
+and SpotBugs, run using:
 
-    # ./gradlew findbugs
+    # ./gradlew spotbugsRelease
 
 The final check is by testing the application on a live device and verifying
 the basic functionality works as expected.
 
 ## Make Sure Your Code is Tested
 
-The Loyalty Card Keychain code uses a fair number of unit tests to verify that
+The Catima code uses a fair number of unit tests to verify that
 the basic functionality is working. Submissions which add functionality
 or significantly change the existing code should include additional tests
 to verify the proper operation of the proposed changes.
@@ -85,7 +85,7 @@ your real name, saying:
 ## Submit Patch(es) for Review
 
 Finally, you will need to submit your patches so that they can be reviewed
-and potentially merged into the main Loyalty Card Keychain repository. The preferred
-way to do this is to submit a Pull Request to the Loyalty Card Keychain project.
+and potentially merged into the main Catima repository. The preferred
+way to do this is to submit a Pull Request to the Catima project.
 Changes need to apply cleanly onto the master branch and pass all
 unit tests and produce no errors during static analysis.

Gemfile.lock

@@ -1,58 +1,75 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (3.0.2)
+    CFPropertyList (3.0.3)
     addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
+    artifactory (3.0.15)
     atomos (0.1.3)
-    aws-eventstream (1.1.0)
-    aws-partitions (1.388.0)
-    aws-sdk-core (3.109.1)
+    aws-eventstream (1.2.0)
+    aws-partitions (1.501.0)
+    aws-sdk-core (3.121.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-kms (1.39.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-kms (1.48.0)
+      aws-sdk-core (~> 3, >= 3.120.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.83.1)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-s3 (1.102.0)
+      aws-sdk-core (~> 3, >= 3.120.0)
       aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.1)
-    aws-sigv4 (1.2.2)
+      aws-sigv4 (~> 1.4)
+    aws-sigv4 (1.4.0)
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.4)
     claide (1.0.3)
     colored (1.2)
     colored2 (3.1.2)
-    commander-fastlane (4.4.6)
-      highline (~> 1.7.2)
+    commander (4.6.0)
+      highline (~> 2.0.0)
     declarative (0.0.20)
-    declarative-option (0.1.0)
-    digest-crc (0.6.1)
-      rake (~> 13.0)
+    digest-crc (0.6.4)
+      rake (>= 12.0.0, < 14.0.0)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
     dotenv (2.7.6)
-    emoji_regex (3.2.0)
-    excon (0.78.0)
-    faraday (1.1.0)
+    emoji_regex (3.2.2)
+    excon (0.85.0)
+    faraday (1.7.2)
+      faraday-em_http (~> 1.0)
+      faraday-em_synchrony (~> 1.0)
+      faraday-excon (~> 1.1)
+      faraday-httpclient (~> 1.0.1)
+      faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.1)
+      faraday-patron (~> 1.0)
+      faraday-rack (~> 1.0)
       multipart-post (>= 1.2, < 3)
-      ruby2_keywords
+      ruby2_keywords (>= 0.0.4)
     faraday-cookie_jar (0.0.7)
       faraday (>= 0.8.0)
       http-cookie (~> 1.0.0)
-    faraday_middleware (1.0.0)
+    faraday-em_http (1.0.0)
+    faraday-em_synchrony (1.0.0)
+    faraday-excon (1.1.0)
+    faraday-httpclient (1.0.1)
+    faraday-net_http (1.0.1)
+    faraday-net_http_persistent (1.2.0)
+    faraday-patron (1.0.0)
+    faraday-rack (1.0.0)
+    faraday_middleware (1.1.0)
       faraday (~> 1.0)
-    fastimage (2.2.0)
-    fastlane (2.165.0)
+    fastimage (2.2.5)
+    fastlane (2.193.1)
       CFPropertyList (>= 2.3, < 4.0.0)
-      addressable (>= 2.3, < 3.0.0)
+      addressable (>= 2.8, < 3.0.0)
+      artifactory (~> 3.0)
       aws-sdk-s3 (~> 1.0)
       babosa (>= 1.0.3, < 2.0.0)
       bundler (>= 1.12.0, < 3.0.0)
       colored
-      commander-fastlane (>= 4.4.6, < 5.0.0)
+      commander (~> 4.6)
       dotenv (>= 2.1.1, < 3.0.0)
       emoji_regex (>= 0.1, < 4.0)
       excon (>= 0.71.0, < 1.0.0)
@@ -61,18 +78,20 @@ GEM
       faraday_middleware (~> 1.0)
       fastimage (>= 2.1.0, < 3.0.0)
       gh_inspector (>= 1.1.2, < 2.0.0)
-      google-api-client (>= 0.37.0, < 0.39.0)
-      google-cloud-storage (>= 1.15.0, < 2.0.0)
-      highline (>= 1.7.2, < 2.0.0)
+      google-apis-androidpublisher_v3 (~> 0.3)
+      google-apis-playcustomapp_v1 (~> 0.1)
+      google-cloud-storage (~> 1.31)
+      highline (~> 2.0)
       json (< 3.0.0)
       jwt (>= 2.1.0, < 3)
       mini_magick (>= 4.9.4, < 5.0.0)
       multipart-post (~> 2.0.0)
+      naturally (~> 2.2)
+      optparse (~> 0.1.1)
       plist (>= 3.1.0, < 4.0.0)
       rubyzip (>= 2.0.0, < 3.0.0)
       security (= 0.1.3)
       simctl (~> 1.6.3)
-      slack-notifier (>= 2.0.0, < 3.0.0)
       terminal-notifier (>= 2.0.0, < 3.0.0)
       terminal-table (>= 1.4.5, < 2.0.0)
       tty-screen (>= 0.6.3, < 1.0.0)
@@ -82,73 +101,85 @@ GEM
       xcpretty (~> 0.3.0)
       xcpretty-travis-formatter (>= 0.0.3)
     gh_inspector (1.1.3)
-    google-api-client (0.38.0)
+    google-apis-androidpublisher_v3 (0.11.0)
+      google-apis-core (>= 0.4, < 2.a)
+    google-apis-core (0.4.1)
       addressable (~> 2.5, >= 2.5.1)
-      googleauth (~> 0.9)
-      httpclient (>= 2.8.1, < 3.0)
+      googleauth (>= 0.16.2, < 2.a)
+      httpclient (>= 2.8.1, < 3.a)
       mini_mime (~> 1.0)
       representable (~> 3.0)
-      retriable (>= 2.0, < 4.0)
-      signet (~> 0.12)
-    google-cloud-core (1.5.0)
+      retriable (>= 2.0, < 4.a)
+      rexml
+      webrick
+    google-apis-iamcredentials_v1 (0.7.0)
+      google-apis-core (>= 0.4, < 2.a)
+    google-apis-playcustomapp_v1 (0.5.0)
+      google-apis-core (>= 0.4, < 2.a)
+    google-apis-storage_v1 (0.6.0)
+      google-apis-core (>= 0.4, < 2.a)
+    google-cloud-core (1.6.0)
       google-cloud-env (~> 1.0)
       google-cloud-errors (~> 1.0)
-    google-cloud-env (1.4.0)
+    google-cloud-env (1.5.0)
       faraday (>= 0.17.3, < 2.0)
-    google-cloud-errors (1.0.1)
-    google-cloud-storage (1.29.1)
+    google-cloud-errors (1.1.0)
+    google-cloud-storage (1.34.1)
       addressable (~> 2.5)
       digest-crc (~> 0.4)
-      google-api-client (~> 0.33)
-      google-cloud-core (~> 1.2)
-      googleauth (~> 0.9)
+      google-apis-iamcredentials_v1 (~> 0.1)
+      google-apis-storage_v1 (~> 0.1)
+      google-cloud-core (~> 1.6)
+      googleauth (>= 0.16.2, < 2.a)
       mini_mime (~> 1.0)
-    googleauth (0.14.0)
+    googleauth (0.17.1)
       faraday (>= 0.17.3, < 2.0)
       jwt (>= 1.4, < 3.0)
       memoist (~> 0.16)
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
-      signet (~> 0.14)
-    highline (1.7.10)
-    http-cookie (1.0.3)
+      signet (~> 0.15)
+    highline (2.0.3)
+    http-cookie (1.0.4)
       domain_name (~> 0.5)
     httpclient (2.8.3)
     jmespath (1.4.0)
-    json (2.3.1)
-    jwt (2.2.2)
+    json (2.5.1)
+    jwt (2.2.3)
     memoist (0.16.2)
-    mini_magick (4.10.1)
-    mini_mime (1.0.2)
+    mini_magick (4.11.0)
+    mini_mime (1.1.1)
     multi_json (1.15.0)
     multipart-post (2.0.0)
     nanaimo (0.3.0)
-    naturally (2.2.0)
+    naturally (2.2.1)
+    optparse (0.1.1)
     os (1.1.1)
-    plist (3.5.0)
+    plist (3.6.0)
     public_suffix (4.0.6)
-    rake (13.0.1)
-    representable (3.0.4)
+    rake (13.0.6)
+    representable (3.1.1)
       declarative (< 0.1.0)
-      declarative-option (< 0.2.0)
+      trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
     retriable (3.1.2)
+    rexml (3.2.5)
     rouge (2.0.7)
-    ruby2_keywords (0.0.2)
-    rubyzip (2.3.0)
+    ruby2_keywords (0.0.5)
+    rubyzip (2.3.2)
     security (0.1.3)
-    signet (0.14.0)
-      addressable (~> 2.3)
+    signet (0.16.0)
+      addressable (~> 2.8)
       faraday (>= 0.17.3, < 2.0)
       jwt (>= 1.5, < 3.0)
       multi_json (~> 1.10)
     simctl (1.6.8)
       CFPropertyList
       naturally
-    slack-notifier (2.3.2)
     terminal-notifier (2.0.0)
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
+    trailblazer-option (0.1.1)
     tty-cursor (0.7.1)
     tty-screen (0.8.1)
     tty-spinner (0.9.3)
@@ -156,18 +187,20 @@ GEM
     uber (0.1.0)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.7)
+    unf_ext (0.0.8)
     unicode-display_width (1.7.0)
+    webrick (1.7.0)
     word_wrap (1.0.0)
-    xcodeproj (1.19.0)
+    xcodeproj (1.21.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
       colored2 (~> 3.1)
       nanaimo (~> 0.3.0)
+      rexml (~> 3.2.4)
     xcpretty (0.3.0)
       rouge (~> 2.0.7)
-    xcpretty-travis-formatter (1.0.0)
+    xcpretty-travis-formatter (1.0.1)
       xcpretty (~> 0.2, >= 0.0.7)
 
 PLATFORMS

app/build.gradle

@@ -11,15 +11,15 @@ spotbugs {
 }
 
 android {
-    compileSdkVersion 30
-    buildToolsVersion "30.0.3"
+    compileSdkVersion 31
+    buildToolsVersion "31.0.0"
 
     defaultConfig {
         applicationId "me.hackerchick.catima"
-        minSdkVersion 19
-        targetSdkVersion 30
-        versionCode 77
-        versionName "2.2.1"
+        minSdkVersion 21
+        targetSdkVersion 31
+        versionCode 89
+        versionName "2.8.0"
 
         vectorDrawables.useSupportLibrary true
         multiDexEnabled true
@@ -37,6 +37,12 @@ android {
         }
     }
 
+    bundle {
+        language {
+            enableSplit = false
+        }
+    }
+
     compileOptions {
         encoding "UTF-8"
 
@@ -75,19 +81,22 @@ android {
 dependencies {
 // AndroidX
     implementation 'androidx.appcompat:appcompat:1.3.1'
-    implementation 'androidx.cardview:cardview:1.0.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.1'
+    implementation 'androidx.exifinterface:exifinterface:1.3.3'
     implementation 'androidx.preference:preference:1.1.1'
     implementation 'com.google.android.material:material:1.4.0'
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
 
+// Splash Screen
+    implementation 'androidx.core:core-splashscreen:1.0.0-alpha02'
+
 // Third-party
-    implementation 'com.journeyapps:zxing-android-embedded:4.1.0@aar'
+    implementation 'com.journeyapps:zxing-android-embedded:4.2.0@aar'
     implementation 'com.google.zxing:core:3.4.1'
-    implementation 'org.apache.commons:commons-csv:1.8'
+    implementation 'org.apache.commons:commons-csv:1.9.0'
     implementation 'com.jaredrummler:colorpicker:1.1.0'
-    implementation 'com.github.invissvenska:NumberPickerPreference:1.0.2'
-    implementation 'net.lingala.zip4j:zip4j:2.8.0'
+    implementation 'com.github.invissvenska:NumberPickerPreference:1.0.3'
+    implementation 'net.lingala.zip4j:zip4j:2.9.0'
 
 // SpotBugs
     implementation 'io.wcm.tooling.spotbugs:io.wcm.tooling.spotbugs.annotations:1.0.0'

app/src/main/AndroidManifest.xml

@@ -17,7 +17,7 @@
         android:name="android.hardware.camera.autofocus"
         android:required="false" />
 
-    <uses-sdk tools:overrideLibrary="com.google.zxing.client.android" />
+    <uses-sdk tools:overrideLibrary="com.google.zxing.client.android"/>
 
     <application
         android:name=".LoyaltyCardLockerApplication"
@@ -29,13 +29,15 @@
         <activity
             android:name="protect.card_locker.MainActivity"
             android:label="@string/app_name"
-            android:theme="@style/AppTheme.NoActionBar">
+            android:theme="@style/Theme.App.Starting"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
 
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
+
         <activity
             android:name=".AboutActivity"
             android:label="@string/about"
@@ -56,19 +58,28 @@
             android:theme="@style/AppTheme.NoActionBar"
             android:windowSoftInputMode="stateHidden"
             android:exported="true">
+            <intent-filter android:autoVerify="true" android:label="@string/app_name">
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <!-- Main card sharing URIs -->
+                <data android:scheme="http" />
+                <data android:scheme="https" />
+
+                <data android:host="@string/intent_import_card_from_url_host_catima_app"
+                    android:pathPrefix="@string/intent_import_card_from_url_path_prefix_catima_app" />
+            </intent-filter>
             <intent-filter android:label="@string/app_name">
                 <action android:name="android.intent.action.VIEW" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
-                <!-- Listen to known card sharing URIs -->
-                <data android:scheme="https"
-                    android:host="@string/intent_import_card_from_url_host_catima_app"
-                    android:pathPrefix="@string/intent_import_card_from_url_path_prefix_catima_app" />
-                <data android:scheme="https"
-                    android:host="@string/intent_import_card_from_url_host_thelastproject"
+                <!-- Old card sharing URIs -->
+                <data android:scheme="http" />
+                <data android:scheme="https" />
+
+                <data android:host="@string/intent_import_card_from_url_host_thelastproject"
                     android:pathPrefix="@string/intent_import_card_from_url_path_prefix_thelastproject" />
-                <data android:scheme="https"
-                    android:host="@string/intent_import_card_from_url_host_brarcher"
+                <data android:host="@string/intent_import_card_from_url_host_brarcher"
                     android:pathPrefix="@string/intent_import_card_from_url_path_prefix_brarcher" />
             </intent-filter>
         </activity>
@@ -83,7 +94,8 @@
             android:windowSoftInputMode="stateHidden"/>
         <activity
             android:name=".preferences.SettingsActivity"
-            android:label="@string/settings"/>
+            android:label="@string/settings"
+            android:theme="@style/AppTheme.NoActionBar"/>
         <activity
             android:name=".ImportExportActivity"
             android:label="@string/importExport"
@@ -91,7 +103,8 @@
         <activity
             android:name=".CardShortcutConfigure"
             android:label="@string/cardShortcut"
-            android:theme="@style/AppTheme.NoActionBar">
+            android:theme="@style/AppTheme.NoActionBar"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.CREATE_SHORTCUT"/>
                 <category android:name="android.intent.category.DEFAULT"/>

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

@@ -1,30 +1,39 @@
 package protect.card_locker;
 
+import android.content.Intent;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
+import android.net.Uri;
 import android.os.Bundle;
-import android.text.method.LinkMovementMethod;
 import android.util.Log;
 import android.view.MenuItem;
+import android.view.View;
 import android.widget.TextView;
 
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.List;
 
 import androidx.appcompat.app.ActionBar;
-import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.widget.Toolbar;
+import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.core.text.HtmlCompat;
 
-public class AboutActivity extends AppCompatActivity
+public class AboutActivity extends CatimaAppCompatActivity implements View.OnClickListener
 {
     private static final String TAG = "Catima";
+    ConstraintLayout version_history, translate, license, repo, privacy, error, credits, rate;
 
     @Override
     protected void onCreate(Bundle savedInstanceState)
     {
         super.onCreate(savedInstanceState);
+        setTitle(R.string.about);
         setContentView(R.layout.about_activity);
         Toolbar toolbar = findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
@@ -34,6 +43,24 @@ public class AboutActivity extends AppCompatActivity
             actionBar.setDisplayHomeAsUpEnabled(true);
         }
 
+        StringBuilder contributors = new StringBuilder().append("<br/>");
+
+        BufferedReader reader = new BufferedReader(new InputStreamReader(getResources().openRawResource(R.raw.contributors), StandardCharsets.UTF_8));
+
+        try {
+            while (true) {
+                String tmp = reader.readLine();
+
+                if (tmp == null || tmp.isEmpty()) {
+                    reader.close();
+                    break;
+                }
+
+                contributors.append("<br/>");
+                contributors.append(tmp);
+            }
+        } catch (IOException ignored) {}
+
         final List<ThirdPartyInfo> USED_LIBRARIES = new ArrayList<>();
         USED_LIBRARIES.add(new ThirdPartyInfo("Color Picker", "https://github.com/jaredrummler/ColorPicker", "Apache 2.0"));
         USED_LIBRARIES.add(new ThirdPartyInfo("Commons CSV", "https://commons.apache.org/proper/commons-csv/", "Apache 2.0"));
@@ -48,13 +75,13 @@ public class AboutActivity extends AppCompatActivity
         StringBuilder libs = new StringBuilder().append("<br/>");
         for (ThirdPartyInfo entry : USED_LIBRARIES)
         {
-            libs.append("<br/><a href=\"").append(entry.url()).append("\">").append(entry.name()).append("</a> (").append(entry.license()).append(")<br/>");
+            libs.append("<br/><a href=\"").append(entry.url()).append("\">").append(entry.name()).append("</a> (").append(entry.license()).append(")");
         }
 
         StringBuilder resources = new StringBuilder().append("<br/>");
         for (ThirdPartyInfo entry : USED_ASSETS)
         {
-            resources.append("<br/><a href=\"").append(entry.url()).append("\">").append(entry.name()).append("</a> (").append(entry.license()).append(")<br/>");
+            resources.append("<br/><a href=\"").append(entry.url()).append("\">").append(entry.name()).append("</a> (").append(entry.license()).append(")");
         }
 
         String appName = getString(R.string.app_name);
@@ -71,37 +98,82 @@ public class AboutActivity extends AppCompatActivity
             Log.w(TAG, "Package name not found", e);
         }
 
+        TextView copyright = findViewById(R.id.credits_sub);
+        copyright.setText(String.format(getString(R.string.app_copyright_fmt), year));
+        TextView vHistory = findViewById(R.id.version_history_sub);
+        vHistory.setText(String.format(getString(R.string.debug_version_fmt), version));
+
         setTitle(String.format(getString(R.string.about_title_fmt), appName));
 
-        TextView aboutTextView = findViewById(R.id.aboutText);
-        aboutTextView.setText(HtmlCompat.fromHtml(String.format(getString(R.string.debug_version_fmt), version) +
-                "<br/><br/>" +
-                String.format(getString(R.string.app_revision_fmt),
-                        "<a href=\"" + getString(R.string.app_revision_url) + "\">" +
-                                "GitHub" +
-                                "</a>") +
-                "<br/><br/>" +
-                String.format(getString(R.string.app_copyright_fmt), year) +
-                "<br/><br/>" +
-                getString(R.string.app_copyright_old) +
-                "<br/><br/>" +
-                getString(R.string.app_license) +
-                "<br/><br/>" +
-                String.format(getString(R.string.app_libraries), libs.toString()) +
-                "<br/><br/>" +
-                String.format(getString(R.string.app_resources), resources.toString()), HtmlCompat.FROM_HTML_MODE_COMPACT));
-        aboutTextView.setMovementMethod(LinkMovementMethod.getInstance());
+        version_history = findViewById(R.id.version_history);
+        translate = findViewById(R.id.translate);
+        license = findViewById(R.id.license);
+        repo = findViewById(R.id.repo);
+        privacy = findViewById(R.id.privacy);
+        error = findViewById(R.id.report_error);
+        credits = findViewById(R.id.credits);
+        rate = findViewById(R.id.rate);
+
+        version_history.setOnClickListener(this);
+        translate.setOnClickListener(this);
+        license.setOnClickListener(this);
+        repo.setOnClickListener(this);
+        privacy.setOnClickListener(this);
+        error.setOnClickListener(this);
+        rate.setOnClickListener(this);
+
+        StringBuilder contributorInfo = new StringBuilder();
+        contributorInfo.append(HtmlCompat.fromHtml(String.format(getString(R.string.app_contributors), contributors.toString()), HtmlCompat.FROM_HTML_MODE_COMPACT));
+        contributorInfo.append("\n\n");
+        contributorInfo.append(getString(R.string.app_copyright_old));
+        contributorInfo.append("\n\n");
+        contributorInfo.append(HtmlCompat.fromHtml(String.format(getString(R.string.app_libraries), libs.toString()), HtmlCompat.FROM_HTML_MODE_COMPACT));
+        contributorInfo.append("\n\n");
+        contributorInfo.append(HtmlCompat.fromHtml(String.format(getString(R.string.app_resources), resources.toString()), HtmlCompat.FROM_HTML_MODE_COMPACT));
+
+        credits.setOnClickListener(view -> new AlertDialog.Builder(this)
+                .setTitle(R.string.credits)
+                .setMessage(contributorInfo.toString())
+                .setPositiveButton(R.string.ok, (dialogInterface, i) -> {})
+                .show());
     }
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item)
     {
         int id = item.getItemId();
-
         if (id == android.R.id.home) {
             finish();
         }
-
         return super.onOptionsItemSelected(item);
     }
+
+    @Override
+    public void onClick(View view) {
+        int id = view.getId();
+
+        String url;
+        if (id == R.id.version_history) {
+            url = "https://catima.app/changelog/";
+        } else if (id == R.id.translate) {
+            url = "https://hosted.weblate.org/engage/catima/";
+        } else if (id == R.id.license) {
+            url = "https://github.com/TheLastProject/Catima/blob/master/LICENSE";
+        } else if (id == R.id.repo) {
+            url = "https://github.com/TheLastProject/Catima/";
+        } else if (id == R.id.privacy) {
+            url = "https://catima.app/privacy-policy/";
+        } else if (id == R.id.report_error) {
+            url = "https://github.com/TheLastProject/Catima/issues";
+        } else if (id == R.id.rate) {
+            url = "https://play.google.com/store/apps/details?id=me.hackerchick.catima";
+        } else {
+            return;
+        }
+
+        Intent intent = new Intent(Intent.ACTION_VIEW);
+        intent.setData(Uri.parse(url));
+        startActivity(intent);
+    }
+
 }

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

@@ -1,31 +1,32 @@
 package protect.card_locker;
 
+import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.Color;
 import android.graphics.PorterDuff;
-import android.os.AsyncTask;
 import android.util.Log;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.google.zxing.BarcodeFormat;
 import com.google.zxing.MultiFormatWriter;
 import com.google.zxing.WriterException;
 import com.google.zxing.common.BitMatrix;
 
 import java.lang.ref.WeakReference;
 
+import protect.card_locker.async.CompatCallable;
+
 /**
  * This task will generate a barcode and load it into an ImageView.
  * Only a weak reference of the ImageView is kept, so this class will not
  * prevent the ImageView from being garbage collected.
  */
-class BarcodeImageWriterTask extends AsyncTask<Void, Void, Bitmap>
-{
+public class BarcodeImageWriterTask implements CompatCallable<Bitmap> {
     private static final String TAG = "Catima";
 
     private static final int IS_VALID = 999;
+    private final Context mContext;
     private boolean isSuccesful;
 
     // When drawn in a smaller window 1D barcodes for some reason end up
@@ -36,16 +37,19 @@ class BarcodeImageWriterTask extends AsyncTask<Void, Void, Bitmap>
     private final WeakReference<ImageView> imageViewReference;
     private final WeakReference<TextView> textViewReference;
     private String cardId;
-    private final BarcodeFormat format;
+    private final CatimaBarcode format;
     private final int imageHeight;
     private final int imageWidth;
     private final boolean showFallback;
     private final Runnable callback;
 
-    BarcodeImageWriterTask(ImageView imageView, String cardIdString,
-                           BarcodeFormat barcodeFormat, TextView textView,
-                           boolean showFallback, Runnable callback)
-    {
+    BarcodeImageWriterTask(
+            Context context, ImageView imageView, String cardIdString,
+            CatimaBarcode barcodeFormat, TextView textView,
+            boolean showFallback, Runnable callback
+    ) {
+        mContext = context;
+
         isSuccesful = true;
         this.callback = callback;
 
@@ -58,26 +62,21 @@ class BarcodeImageWriterTask extends AsyncTask<Void, Void, Bitmap>
 
         final int MAX_WIDTH = getMaxWidth(format);
 
-        if(imageView.getWidth() < MAX_WIDTH)
-        {
+        if (imageView.getWidth() < MAX_WIDTH) {
             imageHeight = imageView.getHeight();
             imageWidth = imageView.getWidth();
-        }
-        else
-        {
+        } else {
             // Scale down the image to reduce the memory needed to produce it
             imageWidth = MAX_WIDTH;
-            double ratio = (double)MAX_WIDTH / (double)imageView.getWidth();
-            imageHeight = (int)(imageView.getHeight() * ratio);
+            double ratio = (double) MAX_WIDTH / (double) imageView.getWidth();
+            imageHeight = (int) (imageView.getHeight() * ratio);
         }
 
         this.showFallback = showFallback;
     }
 
-    private int getMaxWidth(BarcodeFormat format)
-    {
-        switch(format)
-        {
+    private int getMaxWidth(CatimaBarcode format) {
+        switch (format.format()) {
             // 2D barcodes
             case AZTEC:
             case DATA_MATRIX:
@@ -104,10 +103,8 @@ class BarcodeImageWriterTask extends AsyncTask<Void, Void, Bitmap>
         }
     }
 
-    private String getFallbackString(BarcodeFormat format)
-    {
-        switch(format)
-        {
+    private String getFallbackString(CatimaBarcode format) {
+        switch (format.format()) {
             // 2D barcodes
             case AZTEC:
                 return "AZTEC";
@@ -140,23 +137,17 @@ class BarcodeImageWriterTask extends AsyncTask<Void, Void, Bitmap>
         }
     }
 
-    private Bitmap generate()
-    {
-        if (cardId.isEmpty())
-        {
+    private Bitmap generate() {
+        if (cardId.isEmpty()) {
             return null;
         }
 
         MultiFormatWriter writer = new MultiFormatWriter();
         BitMatrix bitMatrix;
-        try
-        {
-            try
-            {
-                bitMatrix = writer.encode(cardId, format, imageWidth, imageHeight, null);
-            }
-            catch(Exception e)
-            {
+        try {
+            try {
+                bitMatrix = writer.encode(cardId, format.format(), imageWidth, imageHeight, null);
+            } catch (Exception e) {
                 // Cast a wider net here and catch any exception, as there are some
                 // cases where an encoder may fail if the data is invalid for the
                 // barcode type. If this happens, we want to fail gracefully.
@@ -171,11 +162,9 @@ class BarcodeImageWriterTask extends AsyncTask<Void, Void, Bitmap>
 
             int[] pixels = new int[bitMatrixWidth * bitMatrixHeight];
 
-            for (int y = 0; y < bitMatrixHeight; y++)
-            {
+            for (int y = 0; y < bitMatrixHeight; y++) {
                 int offset = y * bitMatrixWidth;
-                for (int x = 0; x < bitMatrixWidth; x++)
-                {
+                for (int x = 0; x < bitMatrixWidth; x++) {
                     int color = bitMatrix.get(x, y) ? BLACK : WHITE;
                     pixels[offset + x] = color;
                 }
@@ -195,19 +184,14 @@ class BarcodeImageWriterTask extends AsyncTask<Void, Void, Bitmap>
             int widthScale = imageWidth / bitMatrixHeight;
             int scalingFactor = Math.min(heightScale, widthScale);
 
-            if(scalingFactor > 1)
-            {
+            if (scalingFactor > 1) {
                 bitmap = Bitmap.createScaledBitmap(bitmap, bitMatrixWidth * scalingFactor, bitMatrixHeight * scalingFactor, false);
             }
 
             return bitmap;
-        }
-        catch (WriterException e)
-        {
+        } catch (WriterException e) {
             Log.e(TAG, "Failed to generate barcode of type " + format + ": " + cardId, e);
-        }
-        catch(OutOfMemoryError e)
-        {
+        } catch (OutOfMemoryError e) {
             Log.w(TAG, "Insufficient memory to render barcode, "
                     + imageWidth + "x" + imageHeight + ", " + format.name()
                     + ", length=" + cardId.length(), e);
@@ -216,40 +200,49 @@ class BarcodeImageWriterTask extends AsyncTask<Void, Void, Bitmap>
         return null;
     }
 
-    public Bitmap doInBackground(Void... params)
-    {
-        Bitmap bitmap = generate();
+    public Bitmap doInBackground(Void... params) {
+        // Only do the hard tasks if we've not already been cancelled
+        if (!Thread.currentThread().isInterrupted()) {
+            Bitmap bitmap = generate();
 
-        if (bitmap == null) {
-            isSuccesful = false;
+            if (bitmap == null) {
+                isSuccesful = false;
 
-            if (showFallback) {
-                Log.i(TAG, "Barcode generation failed, generating fallback...");
-                cardId = getFallbackString(format);
-                bitmap = generate();
+                if (showFallback && !Thread.currentThread().isInterrupted()) {
+                    Log.i(TAG, "Barcode generation failed, generating fallback...");
+                    cardId = getFallbackString(format);
+                    bitmap = generate();
+                    return bitmap;
+                }
+            } else {
+                return bitmap;
             }
         }
 
-        return bitmap;
+        // We've been interrupted - create a empty fallback
+        Bitmap.Config config = Bitmap.Config.ARGB_8888;
+        return Bitmap.createBitmap(imageWidth, imageHeight, config);
     }
 
-    protected void onPostExecute(Bitmap result)
-    {
+    public void onPostExecute(Object castResult) {
+        Bitmap result = (Bitmap) castResult;
+
         Log.i(TAG, "Finished generating barcode image of type " + format + ": " + cardId);
         ImageView imageView = imageViewReference.get();
-        if(imageView == null)
-        {
+        if (imageView == null) {
             // The ImageView no longer exists, nothing to do
             return;
         }
 
+        String formatPrettyName = format.prettyName();
+
         imageView.setTag(isSuccesful);
 
         imageView.setImageBitmap(result);
+        imageView.setContentDescription(mContext.getString(R.string.barcodeImageDescriptionWithType, formatPrettyName));
         TextView textView = textViewReference.get();
 
-        if(result != null)
-        {
+        if (result != null) {
             Log.i(TAG, "Displaying barcode");
             imageView.setVisibility(View.VISIBLE);
 
@@ -261,11 +254,9 @@ class BarcodeImageWriterTask extends AsyncTask<Void, Void, Bitmap>
 
             if (textView != null) {
                 textView.setVisibility(View.VISIBLE);
-                textView.setText(format.name());
+                textView.setText(formatPrettyName);
             }
-        }
-        else
-        {
+        } else {
             Log.i(TAG, "Barcode generation failed, removing image from display");
             imageView.setVisibility(View.GONE);
             if (textView != null) {
@@ -277,4 +268,19 @@ class BarcodeImageWriterTask extends AsyncTask<Void, Void, Bitmap>
             callback.run();
         }
     }
+
+    @Override
+    public void onPreExecute() {
+        // No Action
+    }
+
+    /**
+     * Provided to comply with Callable while keeping the original Syntax of AsyncTask
+     *
+     * @return generated Bitmap
+     */
+    @Override
+    public Bitmap call() {
+        return doInBackground();
+    }
 }

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

@@ -2,10 +2,9 @@ package protect.card_locker;
 
 import android.app.Activity;
 import android.content.Intent;
-import android.os.AsyncTask;
 import android.os.Bundle;
-import android.text.Editable;
-import android.text.TextWatcher;
+import android.os.Handler;
+import android.os.Looper;
 import android.util.Log;
 import android.util.Pair;
 import android.view.MenuItem;
@@ -18,64 +17,43 @@ import android.widget.Toast;
 
 import com.google.zxing.BarcodeFormat;
 
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
 import java.util.HashMap;
-import java.util.LinkedList;
 import java.util.Map;
 
 import androidx.appcompat.app.ActionBar;
-import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
 
+import protect.card_locker.async.TaskHandler;
+
 /**
  * This activity is callable and will allow a user to enter
  * barcode data and generate all barcodes possible for
  * the data. The user may then select any barcode, where its
  * data and type will be returned to the caller.
  */
-public class BarcodeSelectorActivity extends AppCompatActivity
-{
+public class BarcodeSelectorActivity extends CatimaAppCompatActivity {
     private static final String TAG = "Catima";
 
     // Result this activity will return
     public static final String BARCODE_CONTENTS = "contents";
     public static final String BARCODE_FORMAT = "format";
 
-    // These are all the barcode types that the zxing library
-    // is able to generate a barcode for, and thus should be
-    // the only barcodes which we should attempt to scan.
-    public static final Collection<String> SUPPORTED_BARCODE_TYPES = Collections.unmodifiableList(
-        Arrays.asList(
-                BarcodeFormat.AZTEC.name(),
-                BarcodeFormat.CODE_39.name(),
-                BarcodeFormat.CODE_128.name(),
-                BarcodeFormat.CODABAR.name(),
-                BarcodeFormat.DATA_MATRIX.name(),
-                BarcodeFormat.EAN_8.name(),
-                BarcodeFormat.EAN_13.name(),
-                BarcodeFormat.ITF.name(),
-                BarcodeFormat.PDF_417.name(),
-                BarcodeFormat.QR_CODE.name(),
-                BarcodeFormat.UPC_A.name(),
-                BarcodeFormat.UPC_E.name()
-        ));
-
     private Map<String, Pair<Integer, Integer>> barcodeViewMap;
-    private LinkedList<AsyncTask> barcodeGeneratorTasks = new LinkedList<>();
+
+    final private TaskHandler mTasks = new TaskHandler();
+
+    private final Handler typingDelayHandler = new Handler(Looper.getMainLooper());
+    public static final Integer INPUT_DELAY = 250;
 
     @Override
-    protected void onCreate(Bundle savedInstanceState)
-    {
+    protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-
+        setTitle(R.string.selectBarcodeTitle);
         setContentView(R.layout.barcode_selector_activity);
         Toolbar toolbar = findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
         ActionBar actionBar = getSupportActionBar();
-        if(actionBar != null)
-        {
+        if (actionBar != null) {
             actionBar.setDisplayHomeAsUpEnabled(true);
         }
 
@@ -94,38 +72,31 @@ public class BarcodeSelectorActivity extends AppCompatActivity
         barcodeViewMap.put(BarcodeFormat.UPC_E.name(), new Pair<>(R.id.upceBarcode, R.id.upceBarcodeText));
 
         EditText cardId = findViewById(R.id.cardId);
-        cardId.addTextChangedListener(new TextWatcher()
-        {
+
+        cardId.addTextChangedListener(new SimpleTextWatcher() {
             @Override
-            public void beforeTextChanged(CharSequence s, int start, int count, int after)
-            {
-                // Noting to do
-            }
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+                // Delay the input processing so we avoid overload
+                typingDelayHandler.removeCallbacksAndMessages(null);
 
-            @Override
-            public void onTextChanged(CharSequence s, int start, int before, int count)
-            {
-                Log.d(TAG, "Entered text: " + s);
+                typingDelayHandler.postDelayed(() -> {
+                    Log.d(TAG, "Entered text: " + s);
 
-                generateBarcodes(s.toString());
+                    runOnUiThread(() -> {
+                        generateBarcodes(s.toString());
 
-                View noBarcodeButtonView = findViewById(R.id.noBarcode);
-                setButtonListener(noBarcodeButtonView, s.toString());
-                noBarcodeButtonView.setEnabled(s.length() > 0);
-            }
-
-            @Override
-            public void afterTextChanged(Editable s)
-            {
-                // Noting to do
+                        View noBarcodeButtonView = findViewById(R.id.noBarcode);
+                        setButtonListener(noBarcodeButtonView, s.toString());
+                        noBarcodeButtonView.setEnabled(s.length() > 0);
+                    });
+                }, INPUT_DELAY);
             }
         });
 
         final Bundle b = getIntent().getExtras();
         final String initialCardId = b != null ? b.getString("initialCardId") : null;
 
-        if(initialCardId != null)
-        {
+        if (initialCardId != null) {
             cardId.setText(initialCardId);
         } else {
             generateBarcodes("");
@@ -133,101 +104,74 @@ public class BarcodeSelectorActivity extends AppCompatActivity
     }
 
     private void generateBarcodes(String value) {
-        // Stop any async tasks which may not have been started yet
-        for(AsyncTask task : barcodeGeneratorTasks)
-        {
-            task.cancel(false);
-        }
-        barcodeGeneratorTasks.clear();
+        // Attempt to stop any async tasks which may not have been started yet
+        // TODO this can be very much optimized by only generating Barcodes visible to the User
+        mTasks.flushTaskList(TaskHandler.TYPE.BARCODE, true, false, false);
 
         // Update barcodes
-        for(Map.Entry<String, Pair<Integer, Integer>> entry : barcodeViewMap.entrySet())
-        {
+        for (Map.Entry<String, Pair<Integer, Integer>> entry : barcodeViewMap.entrySet()) {
             ImageView image = findViewById(entry.getValue().first);
             TextView text = findViewById(entry.getValue().second);
             createBarcodeOption(image, entry.getKey(), value, text);
         }
     }
 
-    private void setButtonListener(final View button, final String cardId)
-    {
-        button.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                Log.d(TAG, "Selected no barcode");
-                Intent result = new Intent();
-                result.putExtra(BARCODE_FORMAT, "");
-                result.putExtra(BARCODE_CONTENTS, cardId);
-                BarcodeSelectorActivity.this.setResult(RESULT_OK, result);
-                finish();
-            }
+    private void setButtonListener(final View button, final String cardId) {
+        button.setOnClickListener(view -> {
+            Log.d(TAG, "Selected no barcode");
+            Intent result = new Intent();
+            result.putExtra(BARCODE_FORMAT, "");
+            result.putExtra(BARCODE_CONTENTS, cardId);
+            BarcodeSelectorActivity.this.setResult(RESULT_OK, result);
+            finish();
         });
     }
 
-    private void createBarcodeOption(final ImageView image, final String formatType, final String cardId, final TextView text)
-    {
-        final BarcodeFormat format = BarcodeFormat.valueOf(formatType);
-        if(format == null)
-        {
-            Log.w(TAG, "Unsupported barcode format: " + formatType);
-            return;
-        }
+    private void createBarcodeOption(final ImageView image, final String formatType, final String cardId, final TextView text) {
+        final CatimaBarcode format = CatimaBarcode.fromName(formatType);
 
         image.setImageBitmap(null);
-        image.setOnClickListener(new View.OnClickListener()
-        {
-            @Override
-            public void onClick(View v)
-            {
-                Log.d(TAG, "Selected barcode type " + formatType);
+        image.setOnClickListener(v -> {
+            Log.d(TAG, "Selected barcode type " + formatType);
 
-                if (!((boolean) image.getTag())) {
-                    Toast.makeText(BarcodeSelectorActivity.this, getString(R.string.wrongValueForBarcodeType), Toast.LENGTH_LONG).show();
-                    return;
-                }
-
-                Intent result = new Intent();
-                result.putExtra(BARCODE_FORMAT, formatType);
-                result.putExtra(BARCODE_CONTENTS, cardId);
-                BarcodeSelectorActivity.this.setResult(RESULT_OK, result);
-                finish();
+            if (!((boolean) image.getTag())) {
+                Toast.makeText(BarcodeSelectorActivity.this, getString(R.string.wrongValueForBarcodeType), Toast.LENGTH_LONG).show();
+                return;
             }
+
+            Intent result = new Intent();
+            result.putExtra(BARCODE_FORMAT, formatType);
+            result.putExtra(BARCODE_CONTENTS, cardId);
+            BarcodeSelectorActivity.this.setResult(RESULT_OK, result);
+            finish();
         });
 
-        if(image.getHeight() == 0)
-        {
+        if (image.getHeight() == 0) {
             // The size of the ImageView is not yet available as it has not
             // yet been drawn. Wait for it to be drawn so the size is available.
             image.getViewTreeObserver().addOnGlobalLayoutListener(
-                new ViewTreeObserver.OnGlobalLayoutListener()
-                {
-                    @Override
-                    public void onGlobalLayout()
-                    {
-                        Log.d(TAG, "Global layout finished, type: + " + formatType + ", width: " + image.getWidth());
-                        image.getViewTreeObserver().removeOnGlobalLayoutListener(this);
+                    new ViewTreeObserver.OnGlobalLayoutListener() {
+                        @Override
+                        public void onGlobalLayout() {
+                            Log.d(TAG, "Global layout finished, type: + " + formatType + ", width: " + image.getWidth());
+                            image.getViewTreeObserver().removeOnGlobalLayoutListener(this);
 
-                        Log.d(TAG, "Generating barcode for type " + formatType);
-                        BarcodeImageWriterTask task = new BarcodeImageWriterTask(image, cardId, format, text, true, null);
-                        barcodeGeneratorTasks.add(task);
-                        task.execute();
-                    }
-                });
-        }
-        else
-        {
+                            Log.d(TAG, "Generating barcode for type " + formatType);
+
+                            BarcodeImageWriterTask barcodeWriter = new BarcodeImageWriterTask(getApplicationContext(), image, cardId, format, text, true, null);
+                            mTasks.executeTask(TaskHandler.TYPE.BARCODE, barcodeWriter);
+                        }
+                    });
+        } else {
             Log.d(TAG, "Generating barcode for type " + formatType);
-            BarcodeImageWriterTask task = new BarcodeImageWriterTask(image, cardId, format, text, true, null);
-            barcodeGeneratorTasks.add(task);
-            task.execute();
+            BarcodeImageWriterTask barcodeWriter = new BarcodeImageWriterTask(getApplicationContext(), image, cardId, format, text, true, null);
+            mTasks.executeTask(TaskHandler.TYPE.BARCODE, barcodeWriter);
         }
     }
 
     @Override
-    public boolean onOptionsItemSelected(MenuItem item)
-    {
-        if (item.getItemId() == android.R.id.home)
-        {
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == android.R.id.home) {
             setResult(Activity.RESULT_CANCELED);
             finish();
             return true;

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

@@ -1,8 +1,6 @@
 package protect.card_locker;
 
-import android.content.Intent;
 import android.database.Cursor;
-import android.graphics.Bitmap;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
@@ -12,6 +10,8 @@ import com.google.android.material.floatingactionbutton.FloatingActionButton;
 
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
+import androidx.core.content.pm.ShortcutInfoCompat;
+import androidx.core.content.pm.ShortcutManagerCompat;
 import androidx.recyclerview.widget.DefaultItemAnimator;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
@@ -69,31 +69,13 @@ public class CardShortcutConfigure extends AppCompatActivity implements LoyaltyC
 
         Log.d(TAG, "Creating shortcut for card " + loyaltyCard.store + "," + loyaltyCard.id);
 
-        Intent shortcutIntent = new Intent(CardShortcutConfigure.this, LoyaltyCardViewActivity.class);
-        shortcutIntent.setAction(Intent.ACTION_MAIN);
-        // Prevent instances of the view activity from piling up; if one exists let this
-        // one replace it.
-        shortcutIntent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
-        Bundle bundle = new Bundle();
-        bundle.putInt("id", loyaltyCard.id);
-        bundle.putBoolean("view", true);
-        shortcutIntent.putExtras(bundle);
+        ShortcutInfoCompat shortcut = ShortcutHelper.createShortcutBuilder(CardShortcutConfigure.this, loyaltyCard).build();
 
-        Bitmap iconBitmap = Utils.generateIcon(CardShortcutConfigure.this, loyaltyCard, true).getLetterTile();
-
-        Intent intent = new Intent();
-        intent.putExtra(Intent.EXTRA_SHORTCUT_INTENT, shortcutIntent);
-        intent.putExtra(Intent.EXTRA_SHORTCUT_NAME, loyaltyCard.store);
-        intent.putExtra(Intent.EXTRA_SHORTCUT_ICON, iconBitmap);
-        setResult(RESULT_OK, intent);
+        setResult(RESULT_OK, ShortcutManagerCompat.createShortcutResultIntent(CardShortcutConfigure.this, shortcut));
 
         finish();
     }
 
-    @Override
-    public void onIconClicked(int inputPosition) {
-        onClickAction(inputPosition);
-    }
 
     @Override
     public void onRowClicked(int inputPosition) {

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

@@ -0,0 +1,53 @@
+package protect.card_locker;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.content.res.Resources;
+import android.util.TypedValue;
+
+import java.util.HashMap;
+
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.preference.PreferenceManager;
+
+public class CatimaAppCompatActivity extends AppCompatActivity {
+
+    SharedPreferences pref;
+    HashMap<String, Integer> supportedThemes;
+
+    @Override
+    protected void attachBaseContext(Context base) {
+        // Apply chosen language
+        super.attachBaseContext(Utils.updateBaseContextLocale(base));
+    }
+
+    @Override
+    public Resources.Theme getTheme() {
+        if (supportedThemes == null) {
+            supportedThemes = new HashMap<>();
+            supportedThemes.put(getString(R.string.settings_key_blue_theme), R.style.AppTheme_blue);
+            supportedThemes.put(getString(R.string.settings_key_brown_theme), R.style.AppTheme_brown);
+            supportedThemes.put(getString(R.string.settings_key_green_theme), R.style.AppTheme_green);
+            supportedThemes.put(getString(R.string.settings_key_grey_theme), R.style.AppTheme_grey);
+            supportedThemes.put(getString(R.string.settings_key_magenta_theme), R.style.AppTheme_magenta);
+            supportedThemes.put(getString(R.string.settings_key_pink_theme), R.style.AppTheme_pink);
+            supportedThemes.put(getString(R.string.settings_key_sky_blue_theme), R.style.AppTheme_sky_blue);
+            supportedThemes.put(getString(R.string.settings_key_violet_theme), R.style.AppTheme_violet);
+        }
+
+        Resources.Theme theme = super.getTheme();
+        pref = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
+        String themeName = pref.getString(getString(R.string.setting_key_theme_color), getString(R.string.settings_key_catima_theme));
+
+        theme.applyStyle(Utils.mapGetOrDefault(supportedThemes, themeName, R.style.AppTheme_NoActionBar), true);
+
+        return theme;
+    }
+
+    public int getThemeColor() {
+        TypedValue typedValue = new TypedValue();
+        Resources.Theme theme = getTheme();
+        theme.resolveAttribute(R.attr.colorPrimary, typedValue, true);
+        return typedValue.data;
+    }
+}

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

@@ -0,0 +1,90 @@
+package protect.card_locker;
+
+import com.google.zxing.BarcodeFormat;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+public class CatimaBarcode {
+    public static final List<BarcodeFormat> barcodeFormats = Collections.unmodifiableList(Arrays.asList(
+        BarcodeFormat.AZTEC,
+        BarcodeFormat.CODE_39,
+        BarcodeFormat.CODE_128,
+        BarcodeFormat.CODABAR,
+        BarcodeFormat.DATA_MATRIX,
+        BarcodeFormat.EAN_8,
+        BarcodeFormat.EAN_13,
+        BarcodeFormat.ITF,
+        BarcodeFormat.PDF_417,
+        BarcodeFormat.QR_CODE,
+        BarcodeFormat.UPC_A,
+        BarcodeFormat.UPC_E
+    ));
+
+    public static final List<String> barcodePrettyNames = Collections.unmodifiableList(Arrays.asList(
+        "Aztec",
+        "Code 39",
+        "Code 128",
+        "Codabar",
+        "Data Matrix",
+        "EAN 8",
+        "EAN 13",
+        "ITF",
+        "PDF 417",
+        "QR Code",
+        "UPC A",
+        "UPC E"
+    ));
+
+    private final BarcodeFormat mBarcodeFormat;
+
+    private CatimaBarcode(BarcodeFormat barcodeFormat) {
+        mBarcodeFormat = barcodeFormat;
+    }
+
+    public static CatimaBarcode fromBarcode(BarcodeFormat barcodeFormat) {
+        return new CatimaBarcode(barcodeFormat);
+    }
+
+    public static CatimaBarcode fromName(String name) {
+        return new CatimaBarcode(BarcodeFormat.valueOf(name));
+    }
+
+    public static CatimaBarcode fromPrettyName(String prettyName) {
+        try {
+            return new CatimaBarcode(barcodeFormats.get(barcodePrettyNames.indexOf(prettyName)));
+        } catch (IndexOutOfBoundsException e) {
+            throw new IllegalArgumentException("No barcode type with pretty name " + prettyName + " known!");
+        }
+    }
+
+    public boolean isSupported() {
+        return barcodeFormats.contains(mBarcodeFormat);
+    }
+
+    public boolean isSquare(){
+        return mBarcodeFormat == BarcodeFormat.AZTEC
+                || mBarcodeFormat == BarcodeFormat.DATA_MATRIX
+                || mBarcodeFormat == BarcodeFormat.MAXICODE
+                || mBarcodeFormat == BarcodeFormat.QR_CODE;
+    }
+
+    public BarcodeFormat format() {
+        return mBarcodeFormat;
+    }
+
+    public String name() {
+        return mBarcodeFormat.name();
+    }
+
+    public String prettyName() {
+        int index = barcodeFormats.indexOf(mBarcodeFormat);
+
+        if (index == -1 || index >= barcodePrettyNames.size()) {
+            return mBarcodeFormat.name();
+        }
+
+        return barcodePrettyNames.get(index);
+    }
+}

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

@@ -0,0 +1,24 @@
+package protect.card_locker;
+
+import android.app.Activity;
+import android.widget.Toast;
+
+import com.journeyapps.barcodescanner.CaptureManager;
+import com.journeyapps.barcodescanner.DecoratedBarcodeView;
+
+public class CatimaCaptureManager extends CaptureManager {
+    private Activity activity;
+
+    public CatimaCaptureManager(Activity activity, DecoratedBarcodeView barcodeView) {
+        super(activity, barcodeView);
+
+        this.activity = activity;
+    }
+
+    @Override
+    protected void displayFrameworkBugMessageAndExit(String message) {
+        // We don't want to exit, as we also have a enter from card image and add manually button here
+        // So we show a toast instead
+        Toast.makeText(activity, message, Toast.LENGTH_LONG).show();
+    }
+}

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

@@ -3,15 +3,17 @@ package protect.card_locker;
 import android.content.ContentValues;
 import android.content.Context;
 import android.database.Cursor;
+import android.database.DatabaseUtils;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteException;
 import android.database.sqlite.SQLiteOpenHelper;
-
-import com.google.zxing.BarcodeFormat;
+import android.text.TextUtils;
+import android.util.Log;
 
 import java.io.FileNotFoundException;
 import java.math.BigDecimal;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Currency;
 import java.util.Date;
 import java.util.List;
@@ -20,7 +22,7 @@ public class DBHelper extends SQLiteOpenHelper
 {
     public static final String DATABASE_NAME = "Catima.db";
     public static final int ORIGINAL_DATABASE_VERSION = 1;
-    public static final int DATABASE_VERSION = 10;
+    public static final int DATABASE_VERSION = 14;
 
     public static class LoyaltyCardDbGroups
     {
@@ -44,6 +46,8 @@ public class DBHelper extends SQLiteOpenHelper
         public static final String BARCODE_ID = "barcodeid";
         public static final String BARCODE_TYPE = "barcodetype";
         public static final String STAR_STATUS = "starstatus";
+        public static final String LAST_USED = "lastused";
+        public static final String ZOOM_LEVEL = "zoomlevel";
     }
 
     public static class LoyaltyCardDbIdsGroups
@@ -53,6 +57,25 @@ public class DBHelper extends SQLiteOpenHelper
         public static final String groupID = "groupId";
     }
 
+    public static class LoyaltyCardDbFTS
+    {
+        public static final String TABLE = "fts";
+        public static final String ID = "rowid"; // This should NEVER be changed
+        public static final String STORE = "store";
+        public static final String NOTE = "note";
+    }
+
+    public enum LoyaltyCardOrder {
+        Alpha,
+        LastUsed,
+        Expiry
+    }
+
+    public enum LoyaltyCardOrderDirection {
+        Ascending,
+        Descending
+    }
+
     private Context mContext;
 
     public DBHelper(Context context)
@@ -66,13 +89,13 @@ public class DBHelper extends SQLiteOpenHelper
     public void onCreate(SQLiteDatabase db)
     {
         // create table for card groups
-        db.execSQL("create table " + LoyaltyCardDbGroups.TABLE + "(" +
+        db.execSQL("CREATE TABLE " + LoyaltyCardDbGroups.TABLE + "(" +
                 LoyaltyCardDbGroups.ID + " TEXT primary key not null," +
                 LoyaltyCardDbGroups.ORDER + " INTEGER DEFAULT '0')");
 
         // create table for cards
         // Balance is TEXT and not REAL to be able to store a BigDecimal without precision loss
-        db.execSQL("create table " + LoyaltyCardDbIds.TABLE + "(" +
+        db.execSQL("CREATE TABLE " + LoyaltyCardDbIds.TABLE + "(" +
                 LoyaltyCardDbIds.ID + " INTEGER primary key autoincrement," +
                 LoyaltyCardDbIds.STORE + " TEXT not null," +
                 LoyaltyCardDbIds.NOTE + " TEXT not null," +
@@ -83,26 +106,32 @@ public class DBHelper extends SQLiteOpenHelper
                 LoyaltyCardDbIds.CARD_ID + " TEXT not null," +
                 LoyaltyCardDbIds.BARCODE_ID + " TEXT," +
                 LoyaltyCardDbIds.BARCODE_TYPE + " TEXT," +
-                LoyaltyCardDbIds.STAR_STATUS + " INTEGER DEFAULT '0')");
+                LoyaltyCardDbIds.STAR_STATUS + " INTEGER DEFAULT '0'," +
+                LoyaltyCardDbIds.LAST_USED + " INTEGER DEFAULT '0', "+
+                LoyaltyCardDbIds.ZOOM_LEVEL + " INTEGER DEFAULT '100' )");
 
         // create associative table for cards in groups
-        db.execSQL("create table " + LoyaltyCardDbIdsGroups.TABLE + "(" +
+        db.execSQL("CREATE TABLE " + LoyaltyCardDbIdsGroups.TABLE + "(" +
                 LoyaltyCardDbIdsGroups.cardID + " INTEGER," +
                 LoyaltyCardDbIdsGroups.groupID + " TEXT," +
                 "primary key (" + LoyaltyCardDbIdsGroups.cardID + "," + LoyaltyCardDbIdsGroups.groupID +"))");
+
+        // create FTS search table
+        db.execSQL("CREATE VIRTUAL TABLE " + LoyaltyCardDbFTS.TABLE + " USING fts4(" +
+                LoyaltyCardDbFTS.STORE + ", " + LoyaltyCardDbFTS.NOTE + ", " +
+                "tokenize=unicode61);");
     }
 
+
     @Override
     public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion)
     {
-        // Upgrade from version 1 to version 2
         if(oldVersion < 2 && newVersion >= 2)
         {
             db.execSQL("ALTER TABLE " + LoyaltyCardDbIds.TABLE
                     + " ADD COLUMN " + LoyaltyCardDbIds.NOTE + " TEXT not null default ''");
         }
 
-        // Upgrade from version 2 to version 3
         if(oldVersion < 3 && newVersion >= 3)
         {
             db.execSQL("ALTER TABLE " + LoyaltyCardDbIds.TABLE
@@ -111,26 +140,23 @@ public class DBHelper extends SQLiteOpenHelper
                     + " ADD COLUMN " + LoyaltyCardDbIds.HEADER_TEXT_COLOR + " INTEGER");
         }
 
-        // Upgrade from version 3 to version 4
         if(oldVersion < 4 && newVersion >= 4)
         {
             db.execSQL("ALTER TABLE " + LoyaltyCardDbIds.TABLE
                     + " ADD COLUMN " + LoyaltyCardDbIds.STAR_STATUS + " INTEGER DEFAULT '0'");
         }
 
-        // Upgrade from version 4 to version 5
         if(oldVersion < 5 && newVersion >= 5)
         {
-            db.execSQL("create table " + LoyaltyCardDbGroups.TABLE + "(" +
+            db.execSQL("CREATE TABLE " + LoyaltyCardDbGroups.TABLE + "(" +
                     LoyaltyCardDbGroups.ID + " TEXT primary key not null)");
 
-            db.execSQL("create table " + LoyaltyCardDbIdsGroups.TABLE + "(" +
+            db.execSQL("CREATE TABLE " + LoyaltyCardDbIdsGroups.TABLE + "(" +
                     LoyaltyCardDbIdsGroups.cardID + " INTEGER," +
                     LoyaltyCardDbIdsGroups.groupID + " TEXT," +
                     "primary key (" + LoyaltyCardDbIdsGroups.cardID + "," + LoyaltyCardDbIdsGroups.groupID +"))");
         }
 
-        // Upgrade from version 5 to 6
         if(oldVersion < 6 && newVersion >= 6)
         {
             db.execSQL("ALTER TABLE " + LoyaltyCardDbGroups.TABLE
@@ -206,7 +232,7 @@ public class DBHelper extends SQLiteOpenHelper
 
             db.execSQL("DROP TABLE " + LoyaltyCardDbIds.TABLE);
 
-            db.execSQL("create table " + LoyaltyCardDbIds.TABLE + "(" +
+            db.execSQL("CREATE TABLE " + LoyaltyCardDbIds.TABLE + "(" +
                     LoyaltyCardDbIds.ID + " INTEGER primary key autoincrement," +
                     LoyaltyCardDbIds.STORE + " TEXT not null," +
                     LoyaltyCardDbIds.NOTE + " TEXT not null," +
@@ -250,15 +276,110 @@ public class DBHelper extends SQLiteOpenHelper
             db.setTransactionSuccessful();
             db.endTransaction();
         }
+
+        if(oldVersion < 11 && newVersion >= 11)
+        {
+            db.execSQL("ALTER TABLE " + LoyaltyCardDbIds.TABLE
+                    + " ADD COLUMN " + LoyaltyCardDbIds.LAST_USED + " INTEGER DEFAULT '0'");
+        }
+
+        if(oldVersion < 12 && newVersion >= 12)
+        {
+            db.execSQL("CREATE VIRTUAL TABLE " + LoyaltyCardDbFTS.TABLE + " USING fts4(" +
+                    LoyaltyCardDbFTS.STORE + ", " + LoyaltyCardDbFTS.NOTE + ", " +
+                    "tokenize=unicode61);");
+
+            Cursor cursor = db.rawQuery("SELECT * FROM " + LoyaltyCardDbIds.TABLE + ";", null, null);
+
+            cursor.moveToFirst();
+
+            while (cursor.moveToNext()) {
+                int id = cursor.getInt(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.ID));
+                String store = cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.STORE));
+                String note = cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.NOTE));
+                insertFTS(db, id, store, note);
+            }
+        }
+
+        if(oldVersion < 13 && newVersion >= 13)
+        {
+            db.execSQL("DELETE FROM " + LoyaltyCardDbFTS.TABLE + ";");
+
+            Cursor cursor = db.rawQuery("SELECT * FROM " + LoyaltyCardDbIds.TABLE + ";", null, null);
+
+            if (cursor.moveToFirst()) {
+                int id = cursor.getInt(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.ID));
+                String store = cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.STORE));
+                String note = cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.NOTE));
+                insertFTS(db, id, store, note);
+
+                while (cursor.moveToNext()) {
+                    id = cursor.getInt(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.ID));
+                    store = cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.STORE));
+                    note = cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.NOTE));
+                    insertFTS(db, id, store, note);
+                }
+            }
+            cursor.close();
+        }
+
+        if(oldVersion < 14 && newVersion >= 14){
+            db.execSQL("ALTER TABLE " + LoyaltyCardDbIds.TABLE
+                    + " ADD COLUMN " + LoyaltyCardDbIds.ZOOM_LEVEL + " INTEGER DEFAULT '100' ");
+        }
+    }
+
+    private ContentValues generateFTSContentValues(final int id, final String store, final String note) {
+        // FTS on Android is severely limited and can only search for word starting with a certain string
+        // So for each word, we grab every single substring
+        // This makes it possible to find Décathlon by searching both de and cat, for example
+
+        ContentValues ftsContentValues = new ContentValues();
+
+        StringBuilder storeString = new StringBuilder();
+        for (String word : store.split(" ")) {
+            for (int i = 0; i < word.length(); i++) {
+                storeString.append(word);
+                storeString.append(" ");
+                word = word.substring(1);
+            }
+        }
+
+        StringBuilder noteString = new StringBuilder();
+        for (String word : note.split(" ")) {
+            for (int i = 0; i < word.length(); i++) {
+                noteString.append(word);
+                noteString.append(" ");
+                word = word.substring(1);
+            }
+        }
+
+        ftsContentValues.put(LoyaltyCardDbFTS.ID, id);
+        ftsContentValues.put(LoyaltyCardDbFTS.STORE, storeString.toString());
+        ftsContentValues.put(LoyaltyCardDbFTS.NOTE, noteString.toString());
+
+        return ftsContentValues;
+    }
+
+    private void insertFTS(final SQLiteDatabase db, final int id, final String store, final String note) {
+        db.insert(LoyaltyCardDbFTS.TABLE, null, generateFTSContentValues(id, store, note));
+    }
+
+    private void updateFTS(final SQLiteDatabase db, final int id, final String store, final String note) {
+        db.update(LoyaltyCardDbFTS.TABLE, generateFTSContentValues(id, store, note),
+                whereAttrs(LoyaltyCardDbFTS.ID), withArgs(id));
     }
 
     public long insertLoyaltyCard(final String store, final String note, final Date expiry,
                                   final BigDecimal balance, final Currency balanceType,
                                   final String cardId, final String barcodeId,
-                                  final BarcodeFormat barcodeType, final Integer headerColor,
-                                  final int starStatus)
+                                  final CatimaBarcode barcodeType, final Integer headerColor,
+                                  final int starStatus, final Long lastUsed)
     {
         SQLiteDatabase db = getWritableDatabase();
+        db.beginTransaction();
+
+        // Card
         ContentValues contentValues = new ContentValues();
         contentValues.put(LoyaltyCardDbIds.STORE, store);
         contentValues.put(LoyaltyCardDbIds.NOTE, note);
@@ -267,19 +388,31 @@ public class DBHelper extends SQLiteOpenHelper
         contentValues.put(LoyaltyCardDbIds.BALANCE_TYPE, balanceType != null ? balanceType.getCurrencyCode() : null);
         contentValues.put(LoyaltyCardDbIds.CARD_ID, cardId);
         contentValues.put(LoyaltyCardDbIds.BARCODE_ID, barcodeId);
-        contentValues.put(LoyaltyCardDbIds.BARCODE_TYPE, barcodeType != null ? barcodeType.toString() : null);
+        contentValues.put(LoyaltyCardDbIds.BARCODE_TYPE, barcodeType != null ? barcodeType.name() : null);
         contentValues.put(LoyaltyCardDbIds.HEADER_COLOR, headerColor);
         contentValues.put(LoyaltyCardDbIds.STAR_STATUS, starStatus);
-        final long newId = db.insert(LoyaltyCardDbIds.TABLE, null, contentValues);
-        return newId;
+        contentValues.put(LoyaltyCardDbIds.LAST_USED, lastUsed != null ? lastUsed : Utils.getUnixTime());
+        long id = db.insert(LoyaltyCardDbIds.TABLE, null, contentValues);
+
+        // FTS
+        insertFTS(db, (int) id, store, note);
+
+        db.setTransactionSuccessful();
+        db.endTransaction();
+
+        return id;
     }
 
     public long insertLoyaltyCard(final SQLiteDatabase db, final String store,
-                                     final String note, final Date expiry, final BigDecimal balance,
-                                     final Currency balanceType, final String cardId,
-                                     final String barcodeId, final BarcodeFormat barcodeType,
-                                     final Integer headerColor, final int starStatus)
+                                  final String note, final Date expiry, final BigDecimal balance,
+                                  final Currency balanceType, final String cardId,
+                                  final String barcodeId, final CatimaBarcode barcodeType,
+                                  final Integer headerColor, final int starStatus,
+                                  final Long lastUsed)
     {
+        db.beginTransaction();
+
+        // Card
         ContentValues contentValues = new ContentValues();
         contentValues.put(LoyaltyCardDbIds.STORE, store);
         contentValues.put(LoyaltyCardDbIds.NOTE, note);
@@ -288,19 +421,31 @@ public class DBHelper extends SQLiteOpenHelper
         contentValues.put(LoyaltyCardDbIds.BALANCE_TYPE, balanceType != null ? balanceType.getCurrencyCode() : null);
         contentValues.put(LoyaltyCardDbIds.CARD_ID, cardId);
         contentValues.put(LoyaltyCardDbIds.BARCODE_ID, barcodeId);
-        contentValues.put(LoyaltyCardDbIds.BARCODE_TYPE, barcodeType != null ? barcodeType.toString() : null);
+        contentValues.put(LoyaltyCardDbIds.BARCODE_TYPE, barcodeType != null ? barcodeType.name() : null);
         contentValues.put(LoyaltyCardDbIds.HEADER_COLOR, headerColor);
-        contentValues.put(LoyaltyCardDbIds.STAR_STATUS,starStatus);
-        final long newId = db.insert(LoyaltyCardDbIds.TABLE, null, contentValues);
-        return newId;
+        contentValues.put(LoyaltyCardDbIds.STAR_STATUS, starStatus);
+        contentValues.put(LoyaltyCardDbIds.LAST_USED, lastUsed != null ? lastUsed : Utils.getUnixTime());
+        long id = db.insert(LoyaltyCardDbIds.TABLE, null, contentValues);
+
+        // FTS
+        insertFTS(db, (int) id, store, note);
+
+        db.setTransactionSuccessful();
+        db.endTransaction();
+
+        return id;
     }
 
     public long insertLoyaltyCard(final SQLiteDatabase db, final int id, final String store,
-                                     final String note, final Date expiry, final BigDecimal balance,
-                                     final Currency balanceType, final String cardId,
-                                     final String barcodeId, final BarcodeFormat barcodeType,
-                                     final Integer headerColor, final int starStatus)
+                                  final String note, final Date expiry, final BigDecimal balance,
+                                  final Currency balanceType, final String cardId,
+                                  final String barcodeId, final CatimaBarcode barcodeType,
+                                  final Integer headerColor, final int starStatus,
+                                  final Long lastUsed)
     {
+        db.beginTransaction();
+
+        // Card
         ContentValues contentValues = new ContentValues();
         contentValues.put(LoyaltyCardDbIds.ID, id);
         contentValues.put(LoyaltyCardDbIds.STORE, store);
@@ -310,20 +455,31 @@ public class DBHelper extends SQLiteOpenHelper
         contentValues.put(LoyaltyCardDbIds.BALANCE_TYPE, balanceType != null ? balanceType.getCurrencyCode() : null);
         contentValues.put(LoyaltyCardDbIds.CARD_ID, cardId);
         contentValues.put(LoyaltyCardDbIds.BARCODE_ID, barcodeId);
-        contentValues.put(LoyaltyCardDbIds.BARCODE_TYPE, barcodeType != null ? barcodeType.toString() : null);
+        contentValues.put(LoyaltyCardDbIds.BARCODE_TYPE, barcodeType != null ? barcodeType.name() : null);
         contentValues.put(LoyaltyCardDbIds.HEADER_COLOR, headerColor);
-        contentValues.put(LoyaltyCardDbIds.STAR_STATUS,starStatus);
-        final long newId = db.insert(LoyaltyCardDbIds.TABLE, null, contentValues);
-        return newId;
+        contentValues.put(LoyaltyCardDbIds.STAR_STATUS, starStatus);
+        contentValues.put(LoyaltyCardDbIds.LAST_USED, lastUsed != null ? lastUsed : Utils.getUnixTime());
+        db.insert(LoyaltyCardDbIds.TABLE, null, contentValues);
+
+        // FTS
+        insertFTS(db, id, store, note);
+
+        db.setTransactionSuccessful();
+        db.endTransaction();
+
+        return id;
     }
 
     public boolean updateLoyaltyCard(final int id, final String store, final String note,
                                      final Date expiry, final BigDecimal balance,
                                      final Currency balanceType, final String cardId,
-                                     final String barcodeId, final BarcodeFormat barcodeType,
+                                     final String barcodeId, final CatimaBarcode barcodeType,
                                      final Integer headerColor)
     {
         SQLiteDatabase db = getWritableDatabase();
+        db.beginTransaction();
+
+        // Card
         ContentValues contentValues = new ContentValues();
         contentValues.put(LoyaltyCardDbIds.STORE, store);
         contentValues.put(LoyaltyCardDbIds.NOTE, note);
@@ -332,11 +488,17 @@ public class DBHelper extends SQLiteOpenHelper
         contentValues.put(LoyaltyCardDbIds.BALANCE_TYPE, balanceType != null ? balanceType.getCurrencyCode() : null);
         contentValues.put(LoyaltyCardDbIds.CARD_ID, cardId);
         contentValues.put(LoyaltyCardDbIds.BARCODE_ID, barcodeId);
-        contentValues.put(LoyaltyCardDbIds.BARCODE_TYPE, barcodeType != null ? barcodeType.toString() : null);
+        contentValues.put(LoyaltyCardDbIds.BARCODE_TYPE, barcodeType != null ? barcodeType.name() : null);
         contentValues.put(LoyaltyCardDbIds.HEADER_COLOR, headerColor);
         int rowsUpdated = db.update(LoyaltyCardDbIds.TABLE, contentValues,
-                LoyaltyCardDbIds.ID + "=?",
-                new String[]{Integer.toString(id)});
+                whereAttrs(LoyaltyCardDbIds.ID), withArgs(id));
+
+        // FTS
+        updateFTS(db, id, store, note);
+
+        db.setTransactionSuccessful();
+        db.endTransaction();
+
         return (rowsUpdated == 1);
     }
 
@@ -346,23 +508,43 @@ public class DBHelper extends SQLiteOpenHelper
         ContentValues contentValues = new ContentValues();
         contentValues.put(LoyaltyCardDbIds.STAR_STATUS,starStatus);
         int rowsUpdated = db.update(LoyaltyCardDbIds.TABLE, contentValues,
-                LoyaltyCardDbIds.ID + "=?",
-                new String[]{Integer.toString(id)});
+                whereAttrs(LoyaltyCardDbIds.ID),
+                withArgs(id));
+        return (rowsUpdated == 1);
+    }
+
+    public boolean updateLoyaltyCardLastUsed(final int id) {
+        SQLiteDatabase db = getWritableDatabase();
+        ContentValues contentValues = new ContentValues();
+        contentValues.put(LoyaltyCardDbIds.LAST_USED, System.currentTimeMillis() / 1000);
+        int rowsUpdated = db.update(LoyaltyCardDbIds.TABLE, contentValues,
+                whereAttrs(LoyaltyCardDbIds.ID),
+                withArgs(id));
+        return (rowsUpdated == 1);
+    }
+
+    public boolean updateLoyaltyCardZoomLevel(int loyaltyCardId, int zoomLevel){
+        SQLiteDatabase db = getWritableDatabase();
+        ContentValues contentValues = new ContentValues();
+        contentValues.put(LoyaltyCardDbIds.ZOOM_LEVEL,zoomLevel);
+        Log.d("updateLoyaltyCardZLevel","Card Id = "+loyaltyCardId+" Zoom level= "+zoomLevel);
+        int rowsUpdated = db.update(LoyaltyCardDbIds.TABLE,contentValues,
+                whereAttrs(LoyaltyCardDbIds.ID),
+                withArgs(loyaltyCardId));
+        Log.d("updateLoyaltyCardZLevel","Rows changed = "+rowsUpdated);
         return (rowsUpdated == 1);
     }
 
     public LoyaltyCard getLoyaltyCard(final int id)
     {
         SQLiteDatabase db = getReadableDatabase();
-        Cursor data = db.rawQuery("select * from " + LoyaltyCardDbIds.TABLE +
-                " where " + LoyaltyCardDbIds.ID + "=?", new String[]{String.format("%d", id)});
+        Cursor data = db.query(LoyaltyCardDbIds.TABLE, null, whereAttrs(LoyaltyCardDbIds.ID), withArgs(id), null, null, null);
 
         LoyaltyCard card = null;
 
         if(data.getCount() == 1)
         {
             data.moveToFirst();
-
             card = LoyaltyCard.toLoyaltyCard(data);
         }
 
@@ -377,7 +559,7 @@ public class DBHelper extends SQLiteOpenHelper
         Cursor data = db.rawQuery("select * from " + LoyaltyCardDbGroups.TABLE + " g " +
                 " LEFT JOIN " + LoyaltyCardDbIdsGroups.TABLE + " ig ON ig." + LoyaltyCardDbIdsGroups.groupID + " = g." + LoyaltyCardDbGroups.ID +
                 " where " + LoyaltyCardDbIdsGroups.cardID + "=?" +
-                " ORDER BY " + LoyaltyCardDbIdsGroups.groupID, new String[]{String.format("%d", id)});
+                " ORDER BY " + LoyaltyCardDbIdsGroups.groupID, withArgs(id));
 
         List<Group> groups = new ArrayList<>();
 
@@ -403,8 +585,8 @@ public class DBHelper extends SQLiteOpenHelper
 
         // First delete lookup table entries associated with this card
         db.delete(LoyaltyCardDbIdsGroups.TABLE,
-                LoyaltyCardDbIdsGroups.cardID + " = ? ",
-                new String[]{String.format("%d", id)});
+                whereAttrs(LoyaltyCardDbIdsGroups.cardID),
+                withArgs(id));
 
         // Then create entries for selected values
         for (Group group : groups) {
@@ -419,8 +601,8 @@ public class DBHelper extends SQLiteOpenHelper
     {
         // First delete lookup table entries associated with this card
         db.delete(LoyaltyCardDbIdsGroups.TABLE,
-                LoyaltyCardDbIdsGroups.cardID + " = ? ",
-                new String[]{String.format("%d", id)});
+                whereAttrs(LoyaltyCardDbIdsGroups.cardID),
+                withArgs(id));
 
         // Then create entries for selected values
         for (Group group : groups) {
@@ -436,13 +618,18 @@ public class DBHelper extends SQLiteOpenHelper
         SQLiteDatabase db = getWritableDatabase();
         // Delete card
         int rowsDeleted = db.delete(LoyaltyCardDbIds.TABLE,
-                LoyaltyCardDbIds.ID + " = ? ",
-                new String[]{String.format("%d", id)});
+                whereAttrs(LoyaltyCardDbIds.ID),
+                withArgs(id));
 
         // And delete lookup table entries associated with this card
         db.delete(LoyaltyCardDbIdsGroups.TABLE,
-                LoyaltyCardDbIdsGroups.cardID + " = ? ",
-                new String[]{String.format("%d", id)});
+                whereAttrs(LoyaltyCardDbIdsGroups.cardID),
+                withArgs(id));
+
+        // Delete FTS table entries
+        db.delete(LoyaltyCardDbFTS.TABLE,
+                whereAttrs(LoyaltyCardDbFTS.ID),
+                withArgs(id));
 
         // Also wipe card images associated with this card
         try {
@@ -481,8 +668,18 @@ public class DBHelper extends SQLiteOpenHelper
      */
     public Cursor getLoyaltyCardCursor(final String filter, Group group)
     {
-        String actualFilter = String.format("%%%s%%", filter);
-        String[] selectionArgs = { actualFilter, actualFilter };
+        return getLoyaltyCardCursor(filter, group, LoyaltyCardOrder.Alpha, LoyaltyCardOrderDirection.Ascending);
+    }
+
+    /**
+     * Returns a cursor to all loyalty cards with the filter text in either the store or note in a certain group sorted as requested.
+     *
+     * @param filter
+     * @param group
+     * @param order
+     * @return Cursor
+     */
+    public Cursor getLoyaltyCardCursor(String filter, Group group, LoyaltyCardOrder order, LoyaltyCardOrderDirection direction) {
         StringBuilder groupFilter = new StringBuilder();
         String limitString = "";
 
@@ -492,11 +689,11 @@ public class DBHelper extends SQLiteOpenHelper
             List<Integer> allowedIds = getGroupCardIds(group._id);
 
             // Empty group
-            if (allowedIds.size() > 0) {
+            if (!allowedIds.isEmpty()) {
                 groupFilter.append("AND (");
 
                 for (int i = 0; i < allowedIds.size(); i++) {
-                    groupFilter.append(LoyaltyCardDbIds.ID + " = " + allowedIds.get(i));
+                    groupFilter.append(LoyaltyCardDbIds.TABLE + "." + LoyaltyCardDbIds.ID + " = ").append(allowedIds.get(i));
                     if (i != allowedIds.size() - 1) {
                         groupFilter.append(" OR ");
                     }
@@ -507,50 +704,29 @@ public class DBHelper extends SQLiteOpenHelper
             }
         }
 
-        Cursor res = db.rawQuery("select * from " + LoyaltyCardDbIds.TABLE +
-                " WHERE (" + LoyaltyCardDbIds.STORE + "  LIKE ? " +
-                " OR " + LoyaltyCardDbIds.NOTE + " LIKE ? )" +
+        String orderField = getFieldForOrder(order);
+
+        return db.rawQuery("SELECT " + LoyaltyCardDbIds.TABLE + ".* FROM " + LoyaltyCardDbIds.TABLE +
+                " JOIN " + LoyaltyCardDbFTS.TABLE +
+                " ON " + LoyaltyCardDbFTS.TABLE + "." + LoyaltyCardDbFTS.ID + " = " + LoyaltyCardDbIds.TABLE + "." + LoyaltyCardDbIds.ID +
+                (filter.trim().isEmpty() ? " " : " AND " + LoyaltyCardDbFTS.TABLE + " MATCH ? ") +
                 groupFilter.toString() +
-                " ORDER BY " + LoyaltyCardDbIds.STAR_STATUS + " DESC," + LoyaltyCardDbIds.STORE + " COLLATE NOCASE ASC " +
-                limitString, selectionArgs, null);
-
-        return res;
-    }
-
-    public int getLoyaltyCardCount()
-    {
-        // An empty string will match everything
-        return getLoyaltyCardCount("");
+                " ORDER BY " + LoyaltyCardDbIds.TABLE + "." + LoyaltyCardDbIds.STAR_STATUS + " DESC, " +
+                " (CASE WHEN " + LoyaltyCardDbIds.TABLE + "." + orderField + " IS NULL THEN 1 ELSE 0 END), " +
+                LoyaltyCardDbIds.TABLE + "." + orderField + " COLLATE NOCASE " + getDbDirection(order, direction) + ", " +
+                LoyaltyCardDbIds.TABLE + "." + LoyaltyCardDbIds.STORE + " COLLATE NOCASE ASC " +
+                limitString, filter.trim().isEmpty() ? null : new String[] { TextUtils.join("* ", filter.split(" ")) + '*' }, null);
     }
 
     /**
-     * Returns the amount of loyalty cards with the filter text in either the store or note.
+     * Returns the amount of loyalty cards.
      *
-     * @param filter
      * @return Integer
      */
-    public int getLoyaltyCardCount(String filter)
+    public int getLoyaltyCardCount()
     {
-        String actualFilter = String.format("%%%s%%", filter);
-        String[] selectionArgs = { actualFilter, actualFilter };
-
         SQLiteDatabase db = getReadableDatabase();
-        Cursor data =  db.rawQuery("SELECT Count(*) FROM " + LoyaltyCardDbIds.TABLE +
-                " WHERE " + LoyaltyCardDbIds.STORE + "  LIKE ? " +
-                " OR " + LoyaltyCardDbIds.NOTE + " LIKE ? "
-                , selectionArgs, null);
-
-        int numItems = 0;
-
-        if(data.getCount() == 1)
-        {
-            data.moveToFirst();
-            numItems = data.getInt(0);
-        }
-
-        data.close();
-
-        return numItems;
+        return (int) DatabaseUtils.queryNumEntries(db, LoyaltyCardDbIds.TABLE);
     }
 
     /**
@@ -562,9 +738,8 @@ public class DBHelper extends SQLiteOpenHelper
     {
         SQLiteDatabase db = getReadableDatabase();
 
-        Cursor res = db.rawQuery("select * from " + LoyaltyCardDbGroups.TABLE +
+        return db.rawQuery("select * from " + LoyaltyCardDbGroups.TABLE +
                 " ORDER BY " + LoyaltyCardDbGroups.ORDER + " ASC," + LoyaltyCardDbGroups.ID + " COLLATE NOCASE ASC", null, null);
-        return res;
     }
 
     public List<Group> getGroups() {
@@ -578,31 +753,27 @@ public class DBHelper extends SQLiteOpenHelper
         }
 
         groups.add(Group.toGroup(data));
-
         while (data.moveToNext()) {
             groups.add(Group.toGroup(data));
         }
 
         data.close();
-
         return groups;
     }
 
     public void reorderGroups(final List<Group> groups)
     {
         Integer order = 0;
-
         SQLiteDatabase db = getWritableDatabase();
-        ContentValues contentValues;
 
         for (Group group : groups)
         {
-            contentValues = new ContentValues();
+            ContentValues contentValues = new ContentValues();
             contentValues.put(LoyaltyCardDbGroups.ORDER, order);
 
             db.update(LoyaltyCardDbGroups.TABLE, contentValues,
-                    LoyaltyCardDbGroups.ID + "=?",
-                    new String[]{group._id});
+                    whereAttrs(LoyaltyCardDbGroups.ID),
+                    withArgs(group._id));
 
             order++;
         }
@@ -611,18 +782,15 @@ public class DBHelper extends SQLiteOpenHelper
     public Group getGroup(final String groupName)
     {
         SQLiteDatabase db = getReadableDatabase();
-        Cursor data = db.rawQuery("select * from " + LoyaltyCardDbGroups.TABLE +
-                " where " + LoyaltyCardDbGroups.ID + "=?", new String[]{groupName});
+        Cursor data = db.query(LoyaltyCardDbGroups.TABLE, null,
+                whereAttrs(LoyaltyCardDbGroups.ID), withArgs(groupName), null, null, null);
 
         Group group = null;
-
         if(data.getCount() == 1)
         {
             data.moveToFirst();
-
             group = Group.toGroup(data);
         }
-
         data.close();
 
         return group;
@@ -631,28 +799,14 @@ public class DBHelper extends SQLiteOpenHelper
     public int getGroupCount()
     {
         SQLiteDatabase db = getReadableDatabase();
-        Cursor data =  db.rawQuery("SELECT Count(*) FROM " + LoyaltyCardDbGroups.TABLE, null);
-
-        int numItems = 0;
-
-        if(data.getCount() == 1)
-        {
-            data.moveToFirst();
-            numItems = data.getInt(0);
-        }
-
-        data.close();
-
-        return numItems;
+        return (int) DatabaseUtils.queryNumEntries(db, LoyaltyCardDbGroups.TABLE);
     }
 
     public List<Integer> getGroupCardIds(final String groupName)
     {
         SQLiteDatabase db = getReadableDatabase();
-        Cursor data =  db.rawQuery("SELECT " + LoyaltyCardDbIdsGroups.cardID +
-                " FROM " + LoyaltyCardDbIdsGroups.TABLE +
-                " WHERE " + LoyaltyCardDbIdsGroups.groupID + " =? ", new String[]{groupName});
-
+        Cursor data = db.query(LoyaltyCardDbIdsGroups.TABLE, withArgs(LoyaltyCardDbIdsGroups.cardID),
+                whereAttrs(LoyaltyCardDbIdsGroups.groupID), withArgs(groupName), null, null, null);
         List<Integer> cardIds = new ArrayList<>();
 
         if (!data.moveToFirst()) {
@@ -678,8 +832,7 @@ public class DBHelper extends SQLiteOpenHelper
         ContentValues contentValues = new ContentValues();
         contentValues.put(LoyaltyCardDbGroups.ID, name);
         contentValues.put(LoyaltyCardDbGroups.ORDER, getGroupCount());
-        final long newId = db.insert(LoyaltyCardDbGroups.TABLE, null, contentValues);
-        return newId;
+        return db.insert(LoyaltyCardDbGroups.TABLE, null, contentValues);
     }
 
     public boolean insertGroup(final SQLiteDatabase db, final String name)
@@ -688,7 +841,7 @@ public class DBHelper extends SQLiteOpenHelper
         contentValues.put(LoyaltyCardDbGroups.ID, name);
         contentValues.put(LoyaltyCardDbGroups.ORDER, getGroupCount());
         final long newId = db.insert(LoyaltyCardDbGroups.TABLE, null, contentValues);
-        return (newId != -1);
+        return newId != -1;
     }
 
     public boolean updateGroup(final String groupName, final String newName)
@@ -708,13 +861,13 @@ public class DBHelper extends SQLiteOpenHelper
         try {
             // Update group name
             int groupsChanged = db.update(LoyaltyCardDbGroups.TABLE, groupContentValues,
-                    LoyaltyCardDbGroups.ID + "=?",
-                    new String[]{groupName});
+                    whereAttrs(LoyaltyCardDbGroups.ID),
+                    withArgs(groupName));
 
             // Also update lookup tables
             db.update(LoyaltyCardDbIdsGroups.TABLE, lookupContentValues,
-                    LoyaltyCardDbIdsGroups.groupID + "=?",
-                    new String[]{groupName});
+                    whereAttrs(LoyaltyCardDbIdsGroups.groupID),
+                    withArgs(groupName));
 
             if (groupsChanged == 1) {
                 db.setTransactionSuccessful();
@@ -738,13 +891,13 @@ public class DBHelper extends SQLiteOpenHelper
         try {
             // Delete group
             int groupsDeleted = db.delete(LoyaltyCardDbGroups.TABLE,
-                    LoyaltyCardDbGroups.ID + " = ? ",
-                    new String[]{groupName});
+                    whereAttrs(LoyaltyCardDbGroups.ID),
+                    withArgs(groupName));
 
             // And delete lookup table entries associated with this group
             db.delete(LoyaltyCardDbIdsGroups.TABLE,
-                    LoyaltyCardDbIdsGroups.groupID + " = ? ",
-                    new String[]{groupName});
+                    whereAttrs(LoyaltyCardDbIdsGroups.groupID),
+                    withArgs(groupName));
 
             if (groupsDeleted == 1) {
                 db.setTransactionSuccessful();
@@ -764,21 +917,49 @@ public class DBHelper extends SQLiteOpenHelper
     {
         SQLiteDatabase db = getReadableDatabase();
 
-        Cursor data =  db.rawQuery("SELECT Count(*) FROM " + LoyaltyCardDbIdsGroups.TABLE +
-                " where " + LoyaltyCardDbIdsGroups.groupID + "=?",
-                new String[]{groupName});
+        return (int) DatabaseUtils.queryNumEntries(db, LoyaltyCardDbIdsGroups.TABLE,
+                whereAttrs(LoyaltyCardDbIdsGroups.groupID), withArgs(groupName));
+    }
 
-        int numItems = 0;
+    private String whereAttrs(String... attrs) {
+        if (attrs.length == 0) {
+            return null;
+        }
+        StringBuilder whereClause = new StringBuilder(attrs[0]).append("=?");
+        for (int i = 1; i < attrs.length; i++) {
+            whereClause.append(" AND ").append(attrs[i]).append("=?");
+        }
+        return whereClause.toString();
+    }
 
-        if(data.getCount() == 1)
-        {
-            data.moveToFirst();
-            numItems = data.getInt(0);
+    private String[] withArgs(Object... object) {
+        return Arrays.stream(object)
+                .map(String::valueOf)
+                .toArray(String[]::new);
+    }
+
+    private String getFieldForOrder(LoyaltyCardOrder order) {
+        if (order == LoyaltyCardOrder.Alpha) {
+            return LoyaltyCardDbIds.STORE;
         }
 
-        data.close();
+        if (order == LoyaltyCardOrder.LastUsed) {
+            return LoyaltyCardDbIds.LAST_USED;
+        }
 
-        return numItems;
+        if (order == LoyaltyCardOrder.Expiry) {
+            return LoyaltyCardDbIds.EXPIRY;
+        }
+
+        throw new IllegalArgumentException("Unknown order " + order);
+    }
+
+    private String getDbDirection(LoyaltyCardOrder order, LoyaltyCardOrderDirection direction) {
+        if (order == LoyaltyCardOrder.LastUsed) {
+            // We want the default sorting to put the most recently used first
+            return direction == LoyaltyCardOrderDirection.Descending ? "ASC" : "DESC";
+        }
+
+        return direction == LoyaltyCardOrderDirection.Ascending ? "ASC" : "DESC";
     }
 }
-

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

@@ -42,7 +42,7 @@ class GroupCursorAdapter extends BaseCursorAdapter<GroupCursorAdapter.GroupListI
     public GroupCursorAdapter.GroupListItemViewHolder onCreateViewHolder(ViewGroup inputParent, int inputViewType)
     {
         View itemView = LayoutInflater.from(inputParent.getContext()).inflate(R.layout.group_layout, inputParent, false);
-        return new GroupCursorAdapter.GroupListItemViewHolder(itemView);
+        return new GroupListItemViewHolder(itemView);
     }
 
     public Cursor getCursor()
@@ -80,7 +80,7 @@ class GroupCursorAdapter extends BaseCursorAdapter<GroupCursorAdapter.GroupListI
         void onDeleteButtonClicked(View view);
     }
 
-    public class GroupListItemViewHolder extends RecyclerView.ViewHolder
+    public static class GroupListItemViewHolder extends RecyclerView.ViewHolder
     {
         public TextView mName, mCardCount;
         public AppCompatImageButton mMoveUp, mMoveDown, mEdit, mDelete;

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

@@ -6,20 +6,21 @@ import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.net.Uri;
-import android.os.AsyncTask;
 import android.os.Bundle;
 import android.text.InputType;
 import android.util.Log;
 import android.view.MenuItem;
 import android.view.View;
+import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.EditText;
+import android.widget.FrameLayout;
 import android.widget.Toast;
 
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
+import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.ArrayList;
@@ -27,15 +28,15 @@ import java.util.List;
 
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AlertDialog;
-import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
 import androidx.core.app.ActivityCompat;
 import androidx.core.content.ContextCompat;
+
+import protect.card_locker.async.TaskHandler;
 import protect.card_locker.importexport.DataFormat;
 import protect.card_locker.importexport.ImportExportResult;
 
-public class ImportExportActivity extends AppCompatActivity
-{
+public class ImportExportActivity extends CatimaAppCompatActivity {
     private static final String TAG = "Catima";
 
     private static final int PERMISSIONS_EXTERNAL_STORAGE = 1;
@@ -47,17 +48,19 @@ public class ImportExportActivity extends AppCompatActivity
     private String importAlertTitle;
     private String importAlertMessage;
     private DataFormat importDataFormat;
+    private String exportPassword;
+
+    final private TaskHandler mTasks = new TaskHandler();
 
     @Override
-    protected void onCreate(Bundle savedInstanceState)
-    {
+    protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        setTitle(R.string.importExport);
         setContentView(R.layout.import_export_activity);
         Toolbar toolbar = findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
         ActionBar actionBar = getSupportActionBar();
-        if(actionBar != null)
-        {
+        if (actionBar != null) {
             actionBar.setDisplayHomeAsUpEnabled(true);
         }
 
@@ -66,12 +69,11 @@ public class ImportExportActivity extends AppCompatActivity
 
         if (ContextCompat.checkSelfPermission(ImportExportActivity.this,
                 Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED ||
-            ContextCompat.checkSelfPermission(ImportExportActivity.this,
-                Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED)
-        {
+                ContextCompat.checkSelfPermission(ImportExportActivity.this,
+                        Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
             ActivityCompat.requestPermissions(ImportExportActivity.this,
                     new String[]{Manifest.permission.READ_EXTERNAL_STORAGE,
-                                 Manifest.permission.WRITE_EXTERNAL_STORAGE},
+                            Manifest.permission.WRITE_EXTERNAL_STORAGE},
                     PERMISSIONS_EXTERNAL_STORAGE);
         }
 
@@ -82,12 +84,31 @@ public class ImportExportActivity extends AppCompatActivity
         intentCreateDocumentAction.putExtra(Intent.EXTRA_TITLE, "catima.zip");
 
         Button exportButton = findViewById(R.id.exportButton);
-        exportButton.setOnClickListener(new View.OnClickListener()
-        {
+        exportButton.setOnClickListener(new View.OnClickListener() {
             @Override
-            public void onClick(View v)
-            {
-                chooseFileWithIntent(intentCreateDocumentAction, CHOOSE_EXPORT_LOCATION);
+            public void onClick(View v) {
+                AlertDialog.Builder builder = new AlertDialog.Builder(ImportExportActivity.this);
+                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 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);
+                builder.setView(container);
+                builder.setPositiveButton(R.string.ok, (dialogInterface, i) -> {
+                    exportPassword = input.getText().toString();
+                    chooseFileWithIntent(intentCreateDocumentAction, CHOOSE_EXPORT_LOCATION);
+                });
+                builder.setNegativeButton(R.string.cancel, (dialogInterface, i) -> dialogInterface.cancel());
+                builder.show();
+
             }
         });
 
@@ -97,11 +118,9 @@ public class ImportExportActivity extends AppCompatActivity
         intentGetContentAction.setType("*/*");
 
         Button importFilesystem = findViewById(R.id.importOptionFilesystemButton);
-        importFilesystem.setOnClickListener(new View.OnClickListener()
-        {
+        importFilesystem.setOnClickListener(new View.OnClickListener() {
             @Override
-            public void onClick(View v)
-            {
+            public void onClick(View v) {
                 chooseImportType(intentGetContentAction);
             }
         });
@@ -110,11 +129,9 @@ public class ImportExportActivity extends AppCompatActivity
         final Intent intentPickAction = new Intent(Intent.ACTION_PICK);
 
         Button importApplication = findViewById(R.id.importOptionApplicationButton);
-        importApplication.setOnClickListener(new View.OnClickListener()
-        {
+        importApplication.setOnClickListener(new View.OnClickListener() {
             @Override
-            public void onClick(View v)
-            {
+            public void onClick(View v) {
                 chooseImportType(intentPickAction);
             }
         });
@@ -176,47 +193,57 @@ public class ImportExportActivity extends AppCompatActivity
                             .setTitle(importAlertTitle)
                             .setMessage(importAlertMessage)
                             .setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
-                                        @Override
-                                        public void onClick(DialogInterface dialog, int which) {
-                                            chooseFileWithIntent(baseIntent, IMPORT);
-                                        }
-                                    })
+                                @Override
+                                public void onClick(DialogInterface dialog, int which) {
+                                    chooseFileWithIntent(baseIntent, IMPORT);
+                                }
+                            })
                             .setNegativeButton(R.string.cancel, null)
                             .show();
                 });
         builder.show();
     }
 
-    private void startImport(final InputStream target, final Uri targetUri, final DataFormat dataFormat, final char[] password)
-    {
-        ImportExportTask.TaskCompleteListener listener = new ImportExportTask.TaskCompleteListener()
-        {
+    private void startImport(final InputStream target, final Uri targetUri, final DataFormat dataFormat, final char[] password, final boolean closeWhenDone) {
+        mTasks.flushTaskList(TaskHandler.TYPE.IMPORT, true, false, false);
+        ImportExportTask.TaskCompleteListener listener = new ImportExportTask.TaskCompleteListener() {
             @Override
-            public void onTaskComplete(ImportExportResult result, DataFormat dataFormat)
-            {
+            public void onTaskComplete(ImportExportResult result, DataFormat dataFormat) {
                 onImportComplete(result, targetUri, dataFormat);
+                if (closeWhenDone) {
+                    try {
+                        target.close();
+                    } catch (IOException ioException) {
+                        ioException.printStackTrace();
+                    }
+                }
             }
         };
 
         importExporter = new ImportExportTask(ImportExportActivity.this,
                 dataFormat, target, password, listener);
-        importExporter.execute();
+        mTasks.executeTask(TaskHandler.TYPE.IMPORT, importExporter);
     }
 
-    private void startExport(final OutputStream target, final Uri targetUri)
-    {
-        ImportExportTask.TaskCompleteListener listener = new ImportExportTask.TaskCompleteListener()
-        {
+    private void startExport(final OutputStream target, final Uri targetUri, char[] password, final boolean closeWhenDone) {
+        mTasks.flushTaskList(TaskHandler.TYPE.EXPORT, true, false, false);
+        ImportExportTask.TaskCompleteListener listener = new ImportExportTask.TaskCompleteListener() {
             @Override
-            public void onTaskComplete(ImportExportResult result, DataFormat dataFormat)
-            {
+            public void onTaskComplete(ImportExportResult result, DataFormat dataFormat) {
                 onExportComplete(result, targetUri);
+                if (closeWhenDone) {
+                    try {
+                        target.close();
+                    } catch (IOException ioException) {
+                        ioException.printStackTrace();
+                    }
+                }
             }
         };
 
         importExporter = new ImportExportTask(ImportExportActivity.this,
-                DataFormat.Catima, target, listener);
-        importExporter.execute();
+                DataFormat.Catima, target, password, listener);
+        mTasks.executeTask(TaskHandler.TYPE.EXPORT, importExporter);
     }
 
     @Override
@@ -244,22 +271,17 @@ public class ImportExportActivity extends AppCompatActivity
     }
 
     @Override
-    protected void onDestroy()
-    {
-        if(importExporter != null && importExporter.getStatus() != AsyncTask.Status.RUNNING)
-        {
-            importExporter.cancel(true);
-        }
+    protected void onDestroy() {
+        mTasks.flushTaskList(TaskHandler.TYPE.IMPORT, true, false, false);
+        mTasks.flushTaskList(TaskHandler.TYPE.EXPORT, true, false, false);
         super.onDestroy();
     }
 
     @Override
-    public boolean onOptionsItemSelected(MenuItem item)
-    {
+    public boolean onOptionsItemSelected(MenuItem item) {
         int id = item.getItemId();
 
-        if(id == android.R.id.home)
-        {
+        if (id == android.R.id.home) {
             finish();
             return true;
         }
@@ -293,13 +315,10 @@ public class ImportExportActivity extends AppCompatActivity
 
         int messageId;
 
-        if (result == ImportExportResult.Success)
-        {
+        if (result == ImportExportResult.Success) {
             builder.setTitle(R.string.importSuccessfulTitle);
             messageId = R.string.importSuccessful;
-        }
-        else
-        {
+        } else {
             builder.setTitle(R.string.importFailedTitle);
             messageId = R.string.importFailed;
         }
@@ -307,11 +326,9 @@ public class ImportExportActivity extends AppCompatActivity
         final String message = getResources().getString(messageId);
 
         builder.setMessage(message);
-        builder.setNeutralButton(R.string.ok, new DialogInterface.OnClickListener()
-        {
+        builder.setNeutralButton(R.string.ok, new DialogInterface.OnClickListener() {
             @Override
-            public void onClick(DialogInterface dialog, int which)
-            {
+            public void onClick(DialogInterface dialog, int which) {
                 dialog.dismiss();
             }
         });
@@ -319,19 +336,15 @@ public class ImportExportActivity extends AppCompatActivity
         builder.create().show();
     }
 
-    private void onExportComplete(ImportExportResult result, final Uri path)
-    {
+    private void onExportComplete(ImportExportResult result, final Uri path) {
         AlertDialog.Builder builder = new AlertDialog.Builder(this);
 
         int messageId;
 
-        if(result == ImportExportResult.Success)
-        {
+        if (result == ImportExportResult.Success) {
             builder.setTitle(R.string.exportSuccessfulTitle);
             messageId = R.string.exportSuccessful;
-        }
-        else
-        {
+        } else {
             builder.setTitle(R.string.exportFailedTitle);
             messageId = R.string.exportFailed;
         }
@@ -341,8 +354,7 @@ public class ImportExportActivity extends AppCompatActivity
         builder.setMessage(message);
         builder.setNeutralButton(R.string.ok, (dialog, which) -> dialog.dismiss());
 
-        if(result == ImportExportResult.Success)
-        {
+        if (result == ImportExportResult.Success) {
             final CharSequence sendLabel = ImportExportActivity.this.getResources().getText(R.string.sendLabel);
 
             builder.setPositiveButton(sendLabel, (dialog, which) -> {
@@ -363,87 +375,64 @@ public class ImportExportActivity extends AppCompatActivity
         builder.create().show();
     }
 
-    private void chooseFileWithIntent(Intent intent, int requestCode)
-    {
-        try
-        {
+    private void chooseFileWithIntent(Intent intent, int requestCode) {
+        try {
             startActivityForResult(intent, requestCode);
-        }
-        catch (ActivityNotFoundException e)
-        {
+        } catch (ActivityNotFoundException e) {
             Toast.makeText(getApplicationContext(), R.string.failedOpeningFileManager, Toast.LENGTH_LONG).show();
             Log.e(TAG, "No activity found to handle intent", e);
         }
     }
 
     private void activityResultParser(int requestCode, int resultCode, Uri uri, char[] password) {
-        if (resultCode != RESULT_OK)
-        {
+        if (resultCode != RESULT_OK) {
             Log.w(TAG, "Failed onActivityResult(), result=" + resultCode);
             return;
         }
 
-        if(uri == null)
-        {
+        if (uri == null) {
             Log.e(TAG, "Activity returned a NULL URI");
             return;
         }
 
-        try
-        {
-            if (requestCode == CHOOSE_EXPORT_LOCATION)
-            {
+        try {
+            if (requestCode == CHOOSE_EXPORT_LOCATION) {
+
                 OutputStream writer;
-                if (uri.getScheme() != null)
-                {
+                if (uri.getScheme() != null) {
                     writer = getContentResolver().openOutputStream(uri);
-                }
-                else
-                {
+                } else {
                     writer = new FileOutputStream(new File(uri.toString()));
                 }
-
                 Log.e(TAG, "Starting file export with: " + uri.toString());
-                startExport(writer, uri);
-            }
-            else
-            {
+                startExport(writer, uri, exportPassword.toCharArray(), true);
+            } else {
                 InputStream reader;
-                if(uri.getScheme() != null)
-                {
+                if (uri.getScheme() != null) {
                     reader = getContentResolver().openInputStream(uri);
-                }
-                else
-                {
+                } else {
                     reader = new FileInputStream(new File(uri.toString()));
                 }
 
                 Log.e(TAG, "Starting file import with: " + uri.toString());
 
-                startImport(reader, uri, importDataFormat, password);
+                startImport(reader, uri, importDataFormat, password, true);
             }
-        }
-        catch(FileNotFoundException e)
-        {
+        } catch (IOException e) {
             Log.e(TAG, "Failed to import/export file: " + uri.toString(), e);
-            if (requestCode == CHOOSE_EXPORT_LOCATION)
-            {
+            if (requestCode == CHOOSE_EXPORT_LOCATION) {
                 onExportComplete(ImportExportResult.GenericFailure, uri);
-            }
-            else
-            {
+            } else {
                 onImportComplete(ImportExportResult.GenericFailure, uri, importDataFormat);
             }
         }
     }
 
     @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data)
-    {
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
 
-        if(data == null)
-        {
+        if (data == null) {
             Log.e(TAG, "Activity returned NULL data");
             return;
         }

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

@@ -4,7 +4,6 @@ import android.app.Activity;
 import android.app.ProgressDialog;
 import android.content.Context;
 import android.content.DialogInterface;
-import android.os.AsyncTask;
 import android.util.Log;
 
 import java.io.IOException;
@@ -13,13 +12,13 @@ import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.nio.charset.StandardCharsets;
 
+import protect.card_locker.async.CompatCallable;
 import protect.card_locker.importexport.DataFormat;
 import protect.card_locker.importexport.ImportExportResult;
 import protect.card_locker.importexport.MultiFormatExporter;
 import protect.card_locker.importexport.MultiFormatImporter;
 
-class ImportExportTask extends AsyncTask<Void, Void, ImportExportResult>
-{
+public class ImportExportTask implements CompatCallable<ImportExportResult> {
     private static final String TAG = "Catima";
 
     private Activity activity;
@@ -35,14 +34,14 @@ class ImportExportTask extends AsyncTask<Void, Void, ImportExportResult>
     /**
      * Constructor which will setup a task for exporting to the given file
      */
-    ImportExportTask(Activity activity, DataFormat format, OutputStream output,
-            TaskCompleteListener listener)
-    {
+    ImportExportTask(Activity activity, DataFormat format, OutputStream output, char[] password,
+                     TaskCompleteListener listener) {
         super();
         this.activity = activity;
         this.doImport = false;
         this.format = format;
         this.outputStream = output;
+        this.password = password;
         this.listener = listener;
     }
 
@@ -50,8 +49,7 @@ class ImportExportTask extends AsyncTask<Void, Void, ImportExportResult>
      * Constructor which will setup a task for importing from the given InputStream.
      */
     ImportExportTask(Activity activity, DataFormat format, InputStream input, char[] password,
-                            TaskCompleteListener listener)
-    {
+                     TaskCompleteListener listener) {
         super();
         this.activity = activity;
         this.doImport = true;
@@ -61,8 +59,7 @@ class ImportExportTask extends AsyncTask<Void, Void, ImportExportResult>
         this.listener = listener;
     }
 
-    private ImportExportResult performImport(Context context, InputStream stream, DBHelper db, char[] password)
-    {
+    private ImportExportResult performImport(Context context, InputStream stream, DBHelper db, char[] password) {
         ImportExportResult importResult = MultiFormatImporter.importData(context, db, stream, format, password);
 
         Log.i(TAG, "Import result: " + importResult.name());
@@ -70,18 +67,14 @@ class ImportExportTask extends AsyncTask<Void, Void, ImportExportResult>
         return importResult;
     }
 
-    private ImportExportResult performExport(Context context, OutputStream stream, DBHelper db)
-    {
+    private ImportExportResult performExport(Context context, OutputStream stream, DBHelper db, char[] password) {
         ImportExportResult result = ImportExportResult.GenericFailure;
 
-        try
-        {
+        try {
             OutputStreamWriter writer = new OutputStreamWriter(stream, StandardCharsets.UTF_8);
-            result = MultiFormatExporter.exportData(context, db, stream, format);
+            result = MultiFormatExporter.exportData(context, db, stream, format, password);
             writer.close();
-        }
-        catch (IOException e)
-        {
+        } catch (IOException e) {
             Log.e(TAG, "Unable to export file", e);
         }
 
@@ -90,55 +83,55 @@ class ImportExportTask extends AsyncTask<Void, Void, ImportExportResult>
         return result;
     }
 
-    protected void onPreExecute()
-    {
+    public void onPreExecute() {
         progress = new ProgressDialog(activity);
         progress.setTitle(doImport ? R.string.importing : R.string.exporting);
 
-        progress.setOnDismissListener(new DialogInterface.OnDismissListener()
-        {
+        progress.setOnDismissListener(new DialogInterface.OnDismissListener() {
             @Override
-            public void onDismiss(DialogInterface dialog)
-            {
-                ImportExportTask.this.cancel(true);
+            public void onDismiss(DialogInterface dialog) {
+                ImportExportTask.this.stop();
             }
         });
 
         progress.show();
     }
 
-    protected ImportExportResult doInBackground(Void... nothing)
-    {
+    protected ImportExportResult doInBackground(Void... nothing) {
         final DBHelper db = new DBHelper(activity);
         ImportExportResult result;
 
-        if(doImport)
-        {
+        if (doImport) {
             result = performImport(activity.getApplicationContext(), inputStream, db, password);
-        }
-        else
-        {
-            result = performExport(activity.getApplicationContext(), outputStream, db);
+        } else {
+            result = performExport(activity.getApplicationContext(), outputStream, db, password);
         }
 
         return result;
     }
 
-    protected void onPostExecute(ImportExportResult result)
-    {
-        listener.onTaskComplete(result, format);
+    public void onPostExecute(Object castResult) {
+        listener.onTaskComplete((ImportExportResult) castResult, format);
 
         progress.dismiss();
         Log.i(TAG, (doImport ? "Import" : "Export") + " Complete");
     }
 
-    protected void onCancelled()
-    {
+    protected void onCancelled() {
         progress.dismiss();
         Log.i(TAG, (doImport ? "Import" : "Export") + " Cancelled");
     }
-    interface TaskCompleteListener
-    {
+
+    protected void stop() {
+        // Whelp
+    }
+
+    @Override
+    public ImportExportResult call() {
+        return doInBackground();
+    }
+
+    interface TaskCompleteListener {
         void onTaskComplete(ImportExportResult result, DataFormat format);
     }
 

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

@@ -63,7 +63,7 @@ public class ImportURIHelper {
 
         try {
             // These values are allowed to be null
-            BarcodeFormat barcodeType = null;
+            CatimaBarcode barcodeType = null;
             Date expiry = null;
             BigDecimal balance = new BigDecimal("0");
             Currency balanceType = null;
@@ -97,7 +97,7 @@ public class ImportURIHelper {
             String unparsedBarcodeType = kv.get(BARCODE_TYPE);
             if(unparsedBarcodeType != null && !unparsedBarcodeType.equals(""))
             {
-                barcodeType = BarcodeFormat.valueOf(unparsedBarcodeType);
+                barcodeType = CatimaBarcode.fromName(unparsedBarcodeType);
             }
 
             String unparsedBalance = kv.get(BALANCE);
@@ -122,7 +122,7 @@ public class ImportURIHelper {
                 headerColor = Integer.parseInt(unparsedHeaderColor);
             }
 
-            return new LoyaltyCard(-1, store, note, expiry, balance, balanceType, cardId, barcodeId, barcodeType, headerColor, 0);
+            return new LoyaltyCard(-1, store, note, expiry, balance, balanceType, cardId, barcodeId, barcodeType, headerColor, 0, Utils.getUnixTime(),100);
         } catch (NullPointerException | NumberFormatException | UnsupportedEncodingException ex) {
             throw new InvalidObjectException("Not a valid import URI");
         }
@@ -164,7 +164,7 @@ public class ImportURIHelper {
         }
 
         if(loyaltyCard.barcodeType != null) {
-            fragment = appendFragment(fragment, BARCODE_TYPE, loyaltyCard.barcodeType.toString());
+            fragment = appendFragment(fragment, BARCODE_TYPE, loyaltyCard.barcodeType.name());
         }
         if(loyaltyCard.headerColor != null) {
             fragment = appendFragment(fragment, HEADER_COLOR, loyaltyCard.headerColor.toString());

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

@@ -1,8 +1,8 @@
 package protect.card_locker;
 
 import android.database.Cursor;
-
-import com.google.zxing.BarcodeFormat;
+import android.os.Parcel;
+import android.os.Parcelable;
 
 import java.math.BigDecimal;
 import java.util.Currency;
@@ -10,7 +10,7 @@ import java.util.Date;
 
 import androidx.annotation.Nullable;
 
-public class LoyaltyCard {
+public class LoyaltyCard implements Parcelable {
     public final int id;
     public final String store;
     public final String note;
@@ -22,17 +22,20 @@ public class LoyaltyCard {
     @Nullable
     public final String barcodeId;
 
-    public final BarcodeFormat barcodeType;
+    @Nullable
+    public final CatimaBarcode barcodeType;
 
     @Nullable
     public final Integer headerColor;
 
     public final int starStatus;
+    public final long lastUsed;
+    public int zoomLevel;
 
     public LoyaltyCard(final int id, final String store, final String note, final Date expiry,
                        final BigDecimal balance, final Currency balanceType, final String cardId,
-                       final String barcodeId, final BarcodeFormat barcodeType, final Integer headerColor,
-                       final int starStatus)
+                       @Nullable final String barcodeId, @Nullable final CatimaBarcode barcodeType,
+                       @Nullable final Integer headerColor, final int starStatus, final long lastUsed,final int zoomLevel)
     {
         this.id = id;
         this.store = store;
@@ -45,6 +48,44 @@ public class LoyaltyCard {
         this.barcodeType = barcodeType;
         this.headerColor = headerColor;
         this.starStatus = starStatus;
+        this.lastUsed = lastUsed;
+        this.zoomLevel = zoomLevel;
+    }
+
+    protected LoyaltyCard(Parcel in) {
+        id = in.readInt();
+        store = in.readString();
+        note = in.readString();
+        long tmpExpiry = in.readLong();
+        expiry = tmpExpiry != -1 ? new Date(tmpExpiry) : null;
+        balance = (BigDecimal) in.readValue(BigDecimal.class.getClassLoader());
+        balanceType = (Currency) in.readValue(Currency.class.getClassLoader());
+        cardId = in.readString();
+        barcodeId = in.readString();
+        String tmpBarcodeType = in.readString();
+        barcodeType = !tmpBarcodeType.isEmpty() ? CatimaBarcode.fromName(tmpBarcodeType) : null;
+        int tmpHeaderColor = in.readInt();
+        headerColor = tmpHeaderColor != -1 ? tmpHeaderColor : null;
+        starStatus = in.readInt();
+        lastUsed = in.readLong();
+        zoomLevel = in.readInt();
+    }
+
+    @Override
+    public void writeToParcel(Parcel parcel, int i) {
+        parcel.writeInt(id);
+        parcel.writeString(store);
+        parcel.writeString(note);
+        parcel.writeLong(expiry != null ? expiry.getTime() : -1);
+        parcel.writeValue(balance);
+        parcel.writeValue(balanceType);
+        parcel.writeString(cardId);
+        parcel.writeString(barcodeId);
+        parcel.writeString(barcodeType != null ? barcodeType.name() : "");
+        parcel.writeInt(headerColor != null ? headerColor : -1);
+        parcel.writeInt(starStatus);
+        parcel.writeLong(lastUsed);
+        parcel.writeInt(zoomLevel);
     }
 
     public static LoyaltyCard toLoyaltyCard(Cursor cursor)
@@ -57,19 +98,21 @@ public class LoyaltyCard {
         String cardId = cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.CARD_ID));
         String barcodeId = cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.BARCODE_ID));
         int starred = cursor.getInt(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.STAR_STATUS));
+        long lastUsed = cursor.getLong(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.LAST_USED));
+        int zoomLevel = cursor.getInt(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.ZOOM_LEVEL));
 
         int barcodeTypeColumn = cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.BARCODE_TYPE);
         int balanceTypeColumn = cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.BALANCE_TYPE);
         int headerColorColumn = cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.HEADER_COLOR);
 
-        BarcodeFormat barcodeType = null;
+        CatimaBarcode barcodeType = null;
         Currency balanceType = null;
         Date expiry = null;
         Integer headerColor = null;
 
         if (cursor.isNull(barcodeTypeColumn) == false)
         {
-            barcodeType = BarcodeFormat.valueOf(cursor.getString(barcodeTypeColumn));
+            barcodeType = CatimaBarcode.fromName(cursor.getString(barcodeTypeColumn));
         }
 
         if (cursor.isNull(balanceTypeColumn) == false)
@@ -87,6 +130,23 @@ public class LoyaltyCard {
             headerColor = cursor.getInt(headerColorColumn);
         }
 
-        return new LoyaltyCard(id, store, note, expiry, balance, balanceType, cardId, barcodeId, barcodeType, headerColor, starred);
+        return new LoyaltyCard(id, store, note, expiry, balance, balanceType, cardId, barcodeId, barcodeType, headerColor, starred, lastUsed,zoomLevel);
     }
+
+    @Override
+    public int describeContents() {
+        return id;
+    }
+
+    public static final Creator<LoyaltyCard> CREATOR = new Creator<LoyaltyCard>() {
+        @Override
+        public LoyaltyCard createFromParcel(Parcel in) {
+            return new LoyaltyCard(in);
+        }
+
+        @Override
+        public LoyaltyCard[] newArray(int size) {
+            return new LoyaltyCard[size];
+        }
+    };
 }

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

@@ -1,10 +1,12 @@
 package protect.card_locker;
 
 import android.content.Context;
+import android.content.res.Resources;
 import android.database.Cursor;
 import android.graphics.Color;
-import android.graphics.PorterDuff;
+import android.graphics.drawable.Drawable;
 import android.util.SparseBooleanArray;
+import android.util.TypedValue;
 import android.view.HapticFeedbackConstants;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -14,19 +16,20 @@ import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
+import com.google.android.material.card.MaterialCardView;
+
 import java.math.BigDecimal;
 import java.text.DateFormat;
 import java.util.ArrayList;
 
-import androidx.cardview.widget.CardView;
-import androidx.constraintlayout.widget.ConstraintLayout;
+import androidx.core.graphics.BlendModeColorFilterCompat;
+import androidx.core.graphics.BlendModeCompat;
 import androidx.recyclerview.widget.RecyclerView;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
 import protect.card_locker.preferences.Settings;
 
-public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCursorAdapter.LoyaltyCardListItemViewHolder>
-{
-    private static int mCurrentSelectedIndex = -1;
+public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCursorAdapter.LoyaltyCardListItemViewHolder> {
+    private int mCurrentSelectedIndex = -1;
     private Cursor mCursor;
     Settings mSettings;
     boolean mDarkModeEnabled;
@@ -36,8 +39,7 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
     private SparseBooleanArray mAnimationItemsIndex;
     private boolean mReverseAllAnimations = false;
 
-    public LoyaltyCardCursorAdapter(Context inputContext, Cursor inputCursor, CardAdapterListener inputListener)
-    {
+    public LoyaltyCardCursorAdapter(Context inputContext, Cursor inputCursor, CardAdapterListener inputListener) {
         super(inputCursor);
         setHasStableIds(true);
         mSettings = new Settings(inputContext);
@@ -58,20 +60,23 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
     }
 
     @Override
-    public LoyaltyCardListItemViewHolder onCreateViewHolder(ViewGroup inputParent, int inputViewType)
-    {
+    public LoyaltyCardListItemViewHolder onCreateViewHolder(ViewGroup inputParent, int inputViewType) {
         View itemView = LayoutInflater.from(inputParent.getContext()).inflate(R.layout.loyalty_card_layout, inputParent, false);
-        return new LoyaltyCardListItemViewHolder(itemView);
+        return new LoyaltyCardListItemViewHolder(itemView, mListener);
     }
 
-    public Cursor getCursor()
-    {
+    public Cursor getCursor() {
         return mCursor;
     }
 
     public void onBindViewHolder(LoyaltyCardListItemViewHolder inputHolder, Cursor inputCursor) {
+        // Invisible until we want to show something more
+        inputHolder.mDivider.setVisibility(View.GONE);
+
+        int size = mSettings.getFontSizeMax(mSettings.getSmallFont());
+
         if (mDarkModeEnabled) {
-            inputHolder.mStarIcon.setColorFilter(Color.WHITE, PorterDuff.Mode.SRC_ATOP);
+            inputHolder.mStarIcon.setColorFilter(BlendModeColorFilterCompat.createBlendModeColorFilterCompat(Color.WHITE, BlendModeCompat.SRC_ATOP));
         }
 
         LoyaltyCard loyaltyCard = LoyaltyCard.toLoyaltyCard(inputCursor);
@@ -81,45 +86,86 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
         if (!loyaltyCard.note.isEmpty()) {
             inputHolder.mNoteField.setVisibility(View.VISIBLE);
             inputHolder.mNoteField.setText(loyaltyCard.note);
-            inputHolder.mNoteField.setTextSize(mSettings.getFontSizeMax(mSettings.getSmallFont()));
+            inputHolder.mNoteField.setTextSize(size);
         } else {
             inputHolder.mNoteField.setVisibility(View.GONE);
         }
 
         if (!loyaltyCard.balance.equals(new BigDecimal("0"))) {
+            int drawableSize = dpToPx((size*24)/14, mContext);
+            inputHolder.mDivider.setVisibility(View.VISIBLE);
             inputHolder.mBalanceField.setVisibility(View.VISIBLE);
-            inputHolder.mBalanceField.setText(mContext.getString(R.string.balanceSentence, Utils.formatBalance(mContext, loyaltyCard.balance, loyaltyCard.balanceType)));
-            inputHolder.mBalanceField.setTextSize(mSettings.getFontSizeMax(mSettings.getSmallFont()));
+            Drawable balanceIcon = inputHolder.mBalanceField.getCompoundDrawables()[0];
+            balanceIcon.setBounds(0,0,drawableSize,drawableSize);
+            inputHolder.mBalanceField.setCompoundDrawablesRelative(balanceIcon, null, null, null);
+            if (mDarkModeEnabled) {
+                balanceIcon.setColorFilter(BlendModeColorFilterCompat.createBlendModeColorFilterCompat(Color.WHITE, BlendModeCompat.SRC_ATOP));
+            }
+            inputHolder.mBalanceField.setText(Utils.formatBalance(mContext, loyaltyCard.balance, loyaltyCard.balanceType));
+            inputHolder.mBalanceField.setTextSize(size);
         } else {
             inputHolder.mBalanceField.setVisibility(View.GONE);
         }
 
-        if (loyaltyCard.expiry != null)
-        {
+        if (loyaltyCard.expiry != null) {
+            int drawableSize = dpToPx((size*24)/14, mContext);
+            inputHolder.mDivider.setVisibility(View.VISIBLE);
             inputHolder.mExpiryField.setVisibility(View.VISIBLE);
-            int expiryString = R.string.expiryStateSentence;
-            if(Utils.hasExpired(loyaltyCard.expiry)) {
-                expiryString = R.string.expiryStateSentenceExpired;
-                inputHolder.mExpiryField.setTextColor(mContext.getResources().getColor(R.color.alert));
+            Drawable expiryIcon = inputHolder.mExpiryField.getCompoundDrawables()[0];
+            expiryIcon.setBounds(0,0, drawableSize, drawableSize);
+            inputHolder.mExpiryField.setCompoundDrawablesRelative(expiryIcon, null, null, null);
+            if (Utils.hasExpired(loyaltyCard.expiry)) {
+                expiryIcon.setColorFilter(BlendModeColorFilterCompat.createBlendModeColorFilterCompat(Color.RED, BlendModeCompat.SRC_ATOP));
+                inputHolder.mExpiryField.setTextColor(Color.RED);
+            } else if (mDarkModeEnabled) {
+                expiryIcon.setColorFilter(BlendModeColorFilterCompat.createBlendModeColorFilterCompat(Color.WHITE, BlendModeCompat.SRC_ATOP));
             }
-            inputHolder.mExpiryField.setText(mContext.getString(expiryString, DateFormat.getDateInstance(DateFormat.LONG).format(loyaltyCard.expiry)));
-            inputHolder.mExpiryField.setTextSize(mSettings.getFontSizeMax(mSettings.getSmallFont()));
+            inputHolder.mExpiryField.setText(DateFormat.getDateInstance(DateFormat.LONG).format(loyaltyCard.expiry));
+            inputHolder.mExpiryField.setTextSize(size);
         } else {
             inputHolder.mExpiryField.setVisibility(View.GONE);
         }
 
-        inputHolder.mStarIcon.setVisibility((loyaltyCard.starStatus != 0) ? View.VISIBLE : View.GONE);
+        inputHolder.mStarIcon.setVisibility(loyaltyCard.starStatus != 0 ? View.VISIBLE : View.GONE);
         inputHolder.mCardIcon.setImageBitmap(Utils.generateIcon(mContext, loyaltyCard.store, loyaltyCard.headerColor).getLetterTile());
+        int imageSize = dpToPx( (size*46)/14, mContext);
+        inputHolder.mCardIcon.getLayoutParams().height = imageSize;
+        inputHolder.mCardIcon.getLayoutParams().width = imageSize;
+        inputHolder.mStarIcon.getLayoutParams().height = imageSize;
+        inputHolder.mStarIcon.getLayoutParams().width = imageSize;
+        inputHolder.mTickIcon.getLayoutParams().height = imageSize;
+        inputHolder.mTickIcon.getLayoutParams().width = imageSize;
+
+        /* Changing Padding and Mragin of different views according to font size
+        * Views Included:
+        * a) InformationContainer padding
+        * b) Store left padding
+        * c) Divider Margin
+        * d) note top margin
+        * e) row margin
+        * */
+        int marginPaddingSize = dpToPx((size*16)/14, mContext );
+        inputHolder.mInformationContainer.setPadding(marginPaddingSize, marginPaddingSize, marginPaddingSize, marginPaddingSize);
+        inputHolder.mStoreField.setPadding(marginPaddingSize, 0, 0, 0);
+        LinearLayout.LayoutParams lpDivider = new LinearLayout.LayoutParams( LinearLayout.LayoutParams.WRAP_CONTENT,
+                LinearLayout.LayoutParams.WRAP_CONTENT );
+        lpDivider.setMargins(0, marginPaddingSize, 0, marginPaddingSize);
+        inputHolder.mDivider.setLayoutParams(lpDivider);
+        LinearLayout.LayoutParams lpNoteField = new LinearLayout.LayoutParams( LinearLayout.LayoutParams.WRAP_CONTENT,
+                LinearLayout.LayoutParams.WRAP_CONTENT );
+        lpNoteField.setMargins(0, marginPaddingSize/2, 0, 0);
+        inputHolder.mNoteField.setLayoutParams(lpNoteField);
+        LinearLayout.LayoutParams lpRow = new LinearLayout.LayoutParams( LinearLayout.LayoutParams.MATCH_PARENT,
+                LinearLayout.LayoutParams.WRAP_CONTENT );
+        lpRow.setMargins(marginPaddingSize/2, marginPaddingSize/2, marginPaddingSize/2, marginPaddingSize/2);
+        inputHolder.mRow.setLayoutParams(lpRow);
 
         inputHolder.itemView.setActivated(mSelectedItems.get(inputCursor.getPosition(), false));
         applyIconAnimation(inputHolder, inputCursor.getPosition());
         applyClickEvents(inputHolder, inputCursor.getPosition());
-
     }
 
-    private void applyClickEvents(LoyaltyCardListItemViewHolder inputHolder, final int inputPosition)
-    {
-        inputHolder.mThumbnailContainer.setOnClickListener(inputView -> mListener.onIconClicked(inputPosition));
+    private void applyClickEvents(LoyaltyCardListItemViewHolder inputHolder, final int inputPosition) {
         inputHolder.mRow.setOnClickListener(inputView -> mListener.onRowClicked(inputPosition));
         inputHolder.mInformationContainer.setOnClickListener(inputView -> mListener.onRowClicked(inputPosition));
 
@@ -136,85 +182,68 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
         });
     }
 
-    private void applyIconAnimation(LoyaltyCardListItemViewHolder inputHolder, int inputPosition)
-    {
-        if (mSelectedItems.get(inputPosition, false))
-        {
+    private void applyIconAnimation(LoyaltyCardListItemViewHolder inputHolder, int inputPosition) {
+        if (mSelectedItems.get(inputPosition, false)) {
             inputHolder.mThumbnailFrontContainer.setVisibility(View.GONE);
             resetIconYAxis(inputHolder.mThumbnailBackContainer);
             inputHolder.mThumbnailBackContainer.setVisibility(View.VISIBLE);
             inputHolder.mThumbnailBackContainer.setAlpha(1);
-            if (mCurrentSelectedIndex == inputPosition)
-            {
+            if (mCurrentSelectedIndex == inputPosition) {
                 LoyaltyCardAnimator.flipView(mContext, inputHolder.mThumbnailBackContainer, inputHolder.mThumbnailFrontContainer, true);
                 resetCurrentIndex();
             }
-        }
-        else
-        {
+        } else {
             inputHolder.mThumbnailBackContainer.setVisibility(View.GONE);
             resetIconYAxis(inputHolder.mThumbnailFrontContainer);
             inputHolder.mThumbnailFrontContainer.setVisibility(View.VISIBLE);
             inputHolder.mThumbnailFrontContainer.setAlpha(1);
-            if ((mReverseAllAnimations && mAnimationItemsIndex.get(inputPosition, false)) || mCurrentSelectedIndex == inputPosition)
-            {
+            if ((mReverseAllAnimations && mAnimationItemsIndex.get(inputPosition, false)) || mCurrentSelectedIndex == inputPosition) {
                 LoyaltyCardAnimator.flipView(mContext, inputHolder.mThumbnailBackContainer, inputHolder.mThumbnailFrontContainer, false);
                 resetCurrentIndex();
             }
         }
     }
 
-    private void resetIconYAxis(View inputView)
-    {
-        if (inputView.getRotationY() != 0)
-        {
+    private void resetIconYAxis(View inputView) {
+        if (inputView.getRotationY() != 0) {
             inputView.setRotationY(0);
         }
     }
 
-    public void resetAnimationIndex()
-    {
+    public void resetAnimationIndex() {
         mReverseAllAnimations = false;
         mAnimationItemsIndex.clear();
     }
 
-    @SuppressFBWarnings("ST_WRITE_TO_STATIC_FROM_INSTANCE_METHOD")
-    public void toggleSelection(int inputPosition)
-    {
+
+    public void toggleSelection(int inputPosition) {
         mCurrentSelectedIndex = inputPosition;
-        if (mSelectedItems.get(inputPosition, false))
-        {
+        if (mSelectedItems.get(inputPosition, false)) {
             mSelectedItems.delete(inputPosition);
             mAnimationItemsIndex.delete(inputPosition);
-        }
-        else
-        {
+        } else {
             mSelectedItems.put(inputPosition, true);
             mAnimationItemsIndex.put(inputPosition, true);
         }
-        notifyItemChanged(inputPosition);
+        notifyDataSetChanged();
     }
 
-    public void clearSelections()
-    {
+    public void clearSelections() {
         mReverseAllAnimations = true;
         mSelectedItems.clear();
         notifyDataSetChanged();
     }
 
-    public int getSelectedItemCount()
-    {
+    public int getSelectedItemCount() {
         return mSelectedItems.size();
     }
 
-    public ArrayList<LoyaltyCard> getSelectedItems()
-    {
+    public ArrayList<LoyaltyCard> getSelectedItems() {
 
         ArrayList<LoyaltyCard> result = new ArrayList<>();
 
         int i;
-        for(i = 0; i < mSelectedItems.size(); i++)
-        {
+        for (i = 0; i < mSelectedItems.size(); i++) {
             mCursor.moveToPosition(mSelectedItems.keyAt(i));
             result.add(LoyaltyCard.toLoyaltyCard(mCursor));
         }
@@ -222,33 +251,29 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
         return result;
     }
 
-    private void resetCurrentIndex()
-    {
+    private void resetCurrentIndex() {
         mCurrentSelectedIndex = -1;
     }
 
-    public interface CardAdapterListener
-    {
-        void onIconClicked(int inputPosition);
+    public interface CardAdapterListener {
         void onRowClicked(int inputPosition);
+
         void onRowLongClicked(int inputPosition);
     }
 
-    public class LoyaltyCardListItemViewHolder extends RecyclerView.ViewHolder implements View.OnLongClickListener
-    {
+    public static class LoyaltyCardListItemViewHolder extends RecyclerView.ViewHolder {
 
         public TextView mStoreField, mNoteField, mBalanceField, mExpiryField;
         public LinearLayout mInformationContainer;
-        public ImageView mCardIcon, mStarIcon;
-        public CardView mThumbnailContainer;
-        public ConstraintLayout mRow;
+        public ImageView mCardIcon, mStarIcon, mTickIcon;
+        public MaterialCardView mRow;
+        public View mDivider;
         public RelativeLayout mThumbnailFrontContainer, mThumbnailBackContainer;
 
-        public LoyaltyCardListItemViewHolder(View inputView)
-        {
+        public LoyaltyCardListItemViewHolder(View inputView, CardAdapterListener inputListener) {
             super(inputView);
-            mThumbnailContainer = inputView.findViewById(R.id.thumbnail_container);
             mRow = inputView.findViewById(R.id.row);
+            mDivider = inputView.findViewById(R.id.info_divider);
             mThumbnailFrontContainer = inputView.findViewById(R.id.thumbnail_front);
             mThumbnailBackContainer = inputView.findViewById(R.id.thumbnail_back);
             mInformationContainer = inputView.findViewById(R.id.information_container);
@@ -258,15 +283,18 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
             mExpiryField = inputView.findViewById(R.id.expiry);
             mCardIcon = inputView.findViewById(R.id.thumbnail);
             mStarIcon = inputView.findViewById(R.id.star);
-            inputView.setOnLongClickListener(this);
-        }
-
-        @Override
-        public boolean onLongClick(View inputView)
-        {
-            mListener.onRowLongClicked(getAdapterPosition());
-            inputView.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS);
-            return true;
+            mTickIcon = inputView.findViewById(R.id.selected_thumbnail);
+            inputView.setOnLongClickListener(view -> {
+                inputListener.onRowClicked(getAdapterPosition());
+                inputView.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS);
+                return true;
+            });
         }
     }
-}
+
+    public int dpToPx(int dp, Context mContext){
+        Resources r = mContext.getResources();
+        int px = (int)TypedValue.applyDimension( TypedValue.COMPLEX_UNIT_DIP, dp, r.getDisplayMetrics());
+        return px;
+    }
+}

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

@@ -12,7 +12,7 @@ import android.content.res.TypedArray;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.Color;
-import android.media.ExifInterface;
+import android.graphics.ImageDecoder;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
@@ -21,7 +21,6 @@ import android.os.LocaleList;
 import android.provider.MediaStore;
 import android.text.Editable;
 import android.text.InputType;
-import android.text.TextWatcher;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -42,7 +41,6 @@ import com.google.android.material.chip.ChipGroup;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.google.android.material.snackbar.Snackbar;
 import com.google.android.material.tabs.TabLayout;
-import com.google.zxing.BarcodeFormat;
 import com.jaredrummler.android.colorpicker.ColorPickerDialog;
 import com.jaredrummler.android.colorpicker.ColorPickerDialogListener;
 
@@ -68,16 +66,18 @@ import java.util.concurrent.Callable;
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AlertDialog;
-import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
 import androidx.core.content.FileProvider;
+import androidx.exifinterface.media.ExifInterface;
 import androidx.fragment.app.DialogFragment;
 
-public class LoyaltyCardEditActivity extends AppCompatActivity
-{
+import protect.card_locker.async.TaskHandler;
+
+public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
     private static final String TAG = "Catima";
 
     private final String STATE_TAB_INDEX = "savedTab";
+    private final String STATE_TEMP_CARD = "tempLoyaltyCard";
 
     private static final int ID_IMAGE_FRONT = 0;
     private static final int ID_IMAGE_BACK = 1;
@@ -141,6 +141,8 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
 
     LoyaltyCard tempLoyaltyCard;
 
+    final private TaskHandler mTasks = new TaskHandler();
+
     private static LoyaltyCard updateTempState(LoyaltyCard loyaltyCard, LoyaltyCardField fieldName, Object value) {
         return new LoyaltyCard(
                 (int) (fieldName == LoyaltyCardField.id ? value : loyaltyCard.id),
@@ -151,9 +153,10 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
                 (Currency) (fieldName == LoyaltyCardField.balanceType ? value : loyaltyCard.balanceType),
                 (String) (fieldName == LoyaltyCardField.cardId ? value : loyaltyCard.cardId),
                 (String) (fieldName == LoyaltyCardField.barcodeId ? value : loyaltyCard.barcodeId),
-                (BarcodeFormat) (fieldName == LoyaltyCardField.barcodeType ? value : loyaltyCard.barcodeType),
+                (CatimaBarcode) (fieldName == LoyaltyCardField.barcodeType ? value : loyaltyCard.barcodeType),
                 (Integer) (fieldName == LoyaltyCardField.headerColor ? value : loyaltyCard.headerColor),
-                (int) (fieldName == LoyaltyCardField.starStatus ? value : loyaltyCard.starStatus)
+                (int) (fieldName == LoyaltyCardField.starStatus ? value : loyaltyCard.starStatus),
+                Utils.getUnixTime(),100
         );
     }
 
@@ -163,8 +166,7 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
         hasChanged = true;
     }
 
-    private void extractIntentFields(Intent intent)
-    {
+    private void extractIntentFields(Intent intent) {
         final Bundle b = intent.getExtras();
         loyaltyCardId = b != null ? b.getInt(BUNDLE_ID) : 0;
         updateLoyaltyCard = b != null && b.getBoolean(BUNDLE_UPDATE, false);
@@ -185,10 +187,12 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
         super.onSaveInstanceState(savedInstanceState);
         tabs = findViewById(R.id.tabs);
         savedInstanceState.putInt(STATE_TAB_INDEX, tabs.getSelectedTabPosition());
+        savedInstanceState.putParcelable(STATE_TEMP_CARD, tempLoyaltyCard);
     }
 
     @Override
     public void onRestoreInstanceState(@NonNull Bundle savedInstanceState) {
+        tempLoyaltyCard = savedInstanceState.getParcelable(STATE_TEMP_CARD);
         super.onRestoreInstanceState(savedInstanceState);
         tabs = findViewById(R.id.tabs);
         tabs.selectTab(tabs.getTabAt(savedInstanceState.getInt(STATE_TAB_INDEX)));
@@ -202,8 +206,7 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
         Toolbar toolbar = findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
         ActionBar actionBar = getSupportActionBar();
-        if(actionBar != null)
-        {
+        if (actionBar != null) {
             actionBar.setDisplayHomeAsUpEnabled(true);
         }
 
@@ -238,6 +241,8 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
         cardImageBack = findViewById(R.id.backImage);
 
         enterButton = findViewById(R.id.enterButton);
+        cardImageFront.setBackgroundColor(getThemeColor());
+        cardImageBack.setBackgroundColor(getThemeColor());
 
         warnOnInvalidBarcodeType = () -> {
             if (!(boolean) barcodeImage.getTag()) {
@@ -245,34 +250,22 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
             }
         };
 
-        storeFieldEdit.addTextChangedListener(new TextWatcher() {
-            @Override
-            public void beforeTextChanged(CharSequence s, int start, int count, int after) { }
-
+        storeFieldEdit.addTextChangedListener(new SimpleTextWatcher() {
             @Override
             public void onTextChanged(CharSequence s, int start, int before, int count) {
                 updateTempState(LoyaltyCardField.store, s.toString());
                 generateIcon(s.toString());
             }
-
-            @Override
-            public void afterTextChanged(Editable s) { }
         });
 
-        noteFieldEdit.addTextChangedListener(new TextWatcher() {
-            @Override
-            public void beforeTextChanged(CharSequence s, int start, int count, int after) { }
-
+        noteFieldEdit.addTextChangedListener(new SimpleTextWatcher() {
             @Override
             public void onTextChanged(CharSequence s, int start, int before, int count) {
                 updateTempState(LoyaltyCardField.note, s.toString());
             }
-
-            @Override
-            public void afterTextChanged(Editable s) { }
         });
 
-        expiryField.addTextChangedListener(new TextWatcher() {
+        expiryField.addTextChangedListener(new SimpleTextWatcher() {
             CharSequence lastValue;
 
             @Override
@@ -311,10 +304,7 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
             }
         });
 
-        balanceField.addTextChangedListener(new TextWatcher() {
-            @Override
-            public void beforeTextChanged(CharSequence s, int start, int count, int after) { }
-
+        balanceField.addTextChangedListener(new SimpleTextWatcher() {
             @Override
             public void onTextChanged(CharSequence s, int start, int before, int count) {
                 try {
@@ -327,15 +317,9 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
                     e.printStackTrace();
                 }
             }
-
-            @Override
-            public void afterTextChanged(Editable s) { }
         });
 
-        balanceCurrencyField.addTextChangedListener(new TextWatcher() {
-            @Override
-            public void beforeTextChanged(CharSequence s, int start, int count, int after) { }
-
+        balanceCurrencyField.addTextChangedListener(new SimpleTextWatcher() {
             @Override
             public void onTextChanged(CharSequence s, int start, int before, int count) {
                 Currency currency;
@@ -391,7 +375,7 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
             }
         });
 
-        cardIdFieldView.addTextChangedListener(new TextWatcher() {
+        cardIdFieldView.addTextChangedListener(new SimpleTextWatcher() {
             @Override
             public void beforeTextChanged(CharSequence s, int start, int count, int after) {
                 if (initDone && !onResuming) {
@@ -411,12 +395,9 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
             public void onTextChanged(CharSequence s, int start, int before, int count) {
                 updateTempState(LoyaltyCardField.cardId, s.toString());
             }
-
-            @Override
-            public void afterTextChanged(Editable s) { }
         });
 
-        barcodeIdField.addTextChangedListener(new TextWatcher() {
+        barcodeIdField.addTextChangedListener(new SimpleTextWatcher() {
             CharSequence lastValue;
 
             @Override
@@ -435,7 +416,8 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
                 } else if (s.toString().equals(getString(R.string.setBarcodeId))) {
                     if (!lastValue.toString().equals(getString(R.string.setBarcodeId))) {
                         barcodeIdField.setText(lastValue);
-                    };
+                    }
+                    ;
 
                     AlertDialog.Builder builder = new AlertDialog.Builder(LoyaltyCardEditActivity.this);
                     builder.setTitle(R.string.setBarcodeId);
@@ -475,10 +457,7 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
             }
         });
 
-        barcodeTypeField.addTextChangedListener(new TextWatcher() {
-            @Override
-            public void beforeTextChanged(CharSequence s, int start, int count, int after) { }
-
+        barcodeTypeField.addTextChangedListener(new SimpleTextWatcher() {
             @Override
             public void onTextChanged(CharSequence s, int start, int before, int count) {
                 if (!s.toString().isEmpty()) {
@@ -486,14 +465,15 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
                         updateTempState(LoyaltyCardField.barcodeType, null);
                     } else {
                         try {
-                            BarcodeFormat barcodeFormat = BarcodeFormat.valueOf(s.toString());
+                            CatimaBarcode barcodeFormat = CatimaBarcode.fromPrettyName(s.toString());
 
                             updateTempState(LoyaltyCardField.barcodeType, barcodeFormat);
 
-                            if (!BarcodeSelectorActivity.SUPPORTED_BARCODE_TYPES.contains(barcodeFormat.name())) {
+                            if (!barcodeFormat.isSupported()) {
                                 Toast.makeText(LoyaltyCardEditActivity.this, getString(R.string.unsupportedBarcodeType), Toast.LENGTH_LONG).show();
                             }
-                        } catch (IllegalArgumentException e) {}
+                        } catch (IllegalArgumentException e) {
+                        }
                     }
 
                     generateOrHideBarcode();
@@ -502,7 +482,7 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
 
             @Override
             public void afterTextChanged(Editable s) {
-                ArrayList<String> barcodeList = new ArrayList<>(BarcodeSelectorActivity.SUPPORTED_BARCODE_TYPES);
+                ArrayList<String> barcodeList = new ArrayList<>(CatimaBarcode.barcodePrettyNames);
                 barcodeList.add(0, getString(R.string.noBarcode));
                 ArrayAdapter<String> barcodeAdapter = new ArrayAdapter<>(LoyaltyCardEditActivity.this, android.R.layout.select_dialog_item, barcodeList);
                 barcodeTypeField.setAdapter(barcodeAdapter);
@@ -532,8 +512,7 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
     }
 
     @Override
-    public void onNewIntent(Intent intent)
-    {
+    public void onNewIntent(Intent intent) {
         super.onNewIntent(intent);
 
         Log.i(TAG, "Received new intent");
@@ -542,15 +521,14 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
 
     @SuppressLint("DefaultLocale")
     @Override
-    public void onResume()
-    {
+    public void onResume() {
         super.onResume();
 
         Log.i(TAG, "To view card: " + loyaltyCardId);
 
         onResuming = true;
 
-        if(tempLoyaltyCard == null) {
+        if (tempLoyaltyCard == null) {
             if (updateLoyaltyCard) {
                 tempLoyaltyCard = db.getLoyaltyCard(loyaltyCardId);
                 if (tempLoyaltyCard == null) {
@@ -573,7 +551,7 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
                 setTitle(R.string.addCardTitle);
             } else {
                 // New card, use default values
-                tempLoyaltyCard = new LoyaltyCard(-1, "", "", null, new BigDecimal("0"), null, "", null, null, null, 0);
+                tempLoyaltyCard = new LoyaltyCard(-1, "", "", null, new BigDecimal("0"), null, "", null, null, null, 0, Utils.getUnixTime(),100);
                 setTitle(R.string.addCardTitle);
             }
         }
@@ -584,10 +562,9 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
         formatBalanceCurrencyField(tempLoyaltyCard.balanceType);
         cardIdFieldView.setText(tempLoyaltyCard.cardId);
         barcodeIdField.setText(tempLoyaltyCard.barcodeId != null ? tempLoyaltyCard.barcodeId : getString(R.string.sameAsCardId));
-        barcodeTypeField.setText(tempLoyaltyCard.barcodeType != null ? tempLoyaltyCard.barcodeType.name() : getString(R.string.noBarcode));
+        barcodeTypeField.setText(tempLoyaltyCard.barcodeType != null ? tempLoyaltyCard.barcodeType.prettyName() : getString(R.string.noBarcode));
 
-        if(groupsChips.getChildCount() == 0)
-        {
+        if (groupsChips.getChildCount() == 0) {
             List<Group> existingGroups = db.getGroups();
 
             List<Group> loyaltyCardGroups = db.getLoyaltyCardGroups(loyaltyCardId);
@@ -626,25 +603,24 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
         }
 
         // Generate random header color
-        if(tempLoyaltyCard.headerColor == null)
-        {
+        if (tempLoyaltyCard.headerColor == null) {
             // Select a random color to start out with.
             TypedArray colors = getResources().obtainTypedArray(R.array.letter_tile_colors);
-            final int color = (int)(Math.random() * colors.length());
+            final int color = (int) (Math.random() * colors.length());
             updateTempState(LoyaltyCardField.headerColor, colors.getColor(color, Color.BLACK));
             colors.recycle();
         }
 
         // It can't be null because we set it in updateTempState but SpotBugs insists it can be
         // NP_NULL_ON_SOME_PATH: Possible null pointer dereference
-        if(tempLoyaltyCard.headerColor != null) {
+        if (tempLoyaltyCard.headerColor != null) {
             thumbnail.setOnClickListener(new ColorSelectListener());
         }
 
         // Update from intent
         if (barcodeType != null) {
             try {
-                barcodeTypeField.setText(BarcodeFormat.valueOf(barcodeType).name());
+                barcodeTypeField.setText(CatimaBarcode.fromName(barcodeType).prettyName());
             } catch (IllegalArgumentException e) {
                 barcodeTypeField.setText(getString(R.string.noBarcode));
             }
@@ -828,11 +804,9 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
         startActivityForResult(i, type);
     }
 
-    class EditCardIdAndBarcode implements View.OnClickListener
-    {
+    class EditCardIdAndBarcode implements View.OnClickListener {
         @Override
-        public void onClick(View v)
-        {
+        public void onClick(View v) {
             Intent i = new Intent(getApplicationContext(), ScanActivity.class);
             final Bundle b = new Bundle();
             b.putString(LoyaltyCardEditActivity.BUNDLE_CARDID, cardIdFieldView.getText().toString());
@@ -841,11 +815,9 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
         }
     }
 
-    class ChooseCardImage implements View.OnClickListener
-    {
+    class ChooseCardImage implements View.OnClickListener {
         @Override
-        public void onClick(View v) throws NoSuchElementException
-        {
+        public void onClick(View v) throws NoSuchElementException {
             ImageView targetView = v.getId() == ID_IMAGE_FRONT ? cardImageFront : cardImageBack;
 
             LinkedHashMap<String, Callable<Void>> cardOptions = new LinkedHashMap<>();
@@ -892,11 +864,9 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
         }
     }
 
-    class ColorSelectListener implements View.OnClickListener
-    {
+    class ColorSelectListener implements View.OnClickListener {
         @Override
-        public void onClick(View v)
-        {
+        public void onClick(View v) {
             ColorPickerDialog.Builder dialogBuilder = ColorPickerDialog.newBuilder();
 
             if (tempLoyaltyCard.headerColor != null) {
@@ -904,19 +874,16 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
             }
 
             ColorPickerDialog dialog = dialogBuilder.create();
-            dialog.setColorPickerDialogListener(new ColorPickerDialogListener()
-            {
+            dialog.setColorPickerDialogListener(new ColorPickerDialogListener() {
                 @Override
-                public void onColorSelected(int dialogId, int color)
-                {
+                public void onColorSelected(int dialogId, int color) {
                     updateTempState(LoyaltyCardField.headerColor, color);
 
                     generateIcon(storeFieldEdit.getText().toString());
                 }
 
                 @Override
-                public void onDialogDismissed(int dialogId)
-                {
+                public void onDialogDismissed(int dialogId) {
                     // Nothing to do, no change made
                 }
             });
@@ -977,20 +944,17 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
             return;
         }
 
-        if(tempLoyaltyCard.store.isEmpty())
-        {
+        if (tempLoyaltyCard.store.isEmpty()) {
             Snackbar.make(storeFieldEdit, R.string.noStoreError, Snackbar.LENGTH_LONG).show();
             return;
         }
 
-        if(tempLoyaltyCard.cardId.isEmpty())
-        {
+        if (tempLoyaltyCard.cardId.isEmpty()) {
             Snackbar.make(cardIdFieldView, R.string.noCardIdError, Snackbar.LENGTH_LONG).show();
             return;
         }
 
-        if(!validBalance)
-        {
+        if (!validBalance) {
             Snackbar.make(balanceField, getString(R.string.parsingBalanceFailed, balanceField.getText().toString()), Snackbar.LENGTH_LONG).show();
             return;
         }
@@ -1002,8 +966,7 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
             selectedGroups.add((Group) chip.getTag());
         }
 
-        if(updateLoyaltyCard)
-        {   //update of "starStatus" not necessary, since it cannot be changed in this activity (only in ViewActivity)
+        if (updateLoyaltyCard) {   //update of "starStatus" not necessary, since it cannot be changed in this activity (only in ViewActivity)
             db.updateLoyaltyCard(loyaltyCardId, tempLoyaltyCard.store, tempLoyaltyCard.note, tempLoyaltyCard.expiry, tempLoyaltyCard.balance, tempLoyaltyCard.balanceType, tempLoyaltyCard.cardId, tempLoyaltyCard.barcodeId, tempLoyaltyCard.barcodeType, tempLoyaltyCard.headerColor);
             try {
                 Utils.saveCardImage(this, (Bitmap) cardImageFront.getTag(), loyaltyCardId, true);
@@ -1012,10 +975,8 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
                 e.printStackTrace();
             }
             Log.i(TAG, "Updated " + loyaltyCardId + " to " + cardId);
-        }
-        else
-        {
-            loyaltyCardId = (int)db.insertLoyaltyCard(tempLoyaltyCard.store, tempLoyaltyCard.note, tempLoyaltyCard.expiry, tempLoyaltyCard.balance, tempLoyaltyCard.balanceType, tempLoyaltyCard.cardId, tempLoyaltyCard.barcodeId, tempLoyaltyCard.barcodeType, tempLoyaltyCard.headerColor, 0);
+        } else {
+            loyaltyCardId = (int) db.insertLoyaltyCard(tempLoyaltyCard.store, tempLoyaltyCard.note, tempLoyaltyCard.expiry, tempLoyaltyCard.balance, tempLoyaltyCard.balanceType, tempLoyaltyCard.cardId, tempLoyaltyCard.barcodeId, tempLoyaltyCard.barcodeType, tempLoyaltyCard.headerColor, 0, tempLoyaltyCard.lastUsed);
             try {
                 Utils.saveCardImage(this, (Bitmap) cardImageFront.getTag(), loyaltyCardId, true);
                 Utils.saveCardImage(this, (Bitmap) cardImageBack.getTag(), loyaltyCardId, false);
@@ -1030,14 +991,10 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
     }
 
     @Override
-    public boolean onCreateOptionsMenu(Menu menu)
-    {
-        if(updateLoyaltyCard)
-        {
+    public boolean onCreateOptionsMenu(Menu menu) {
+        if (updateLoyaltyCard) {
             getMenuInflater().inflate(R.menu.card_update_menu, menu);
-        }
-        else
-        {
+        } else {
             getMenuInflater().inflate(R.menu.card_add_menu, menu);
         }
 
@@ -1045,12 +1002,10 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
     }
 
     @Override
-    public boolean onOptionsItemSelected(MenuItem item)
-    {
+    public boolean onOptionsItemSelected(MenuItem item) {
         int id = item.getItemId();
 
-        switch(id)
-        {
+        switch (id) {
             case android.R.id.home:
                 askBeforeQuitIfChanged();
                 break;
@@ -1081,8 +1036,7 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
     }
 
     @Override
-    public void onActivityResult(int requestCode, int resultCode, Intent intent)
-    {
+    public void onActivityResult(int requestCode, int resultCode, Intent intent) {
         super.onActivityResult(requestCode, resultCode, intent);
 
         if (resultCode == RESULT_OK) {
@@ -1104,15 +1058,21 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
                     }
 
                     hasChanged = true;
+                } else {
+                    Toast.makeText(this, R.string.errorReadingImage, Toast.LENGTH_LONG).show();
                 }
             } else if (requestCode == Utils.CARD_IMAGE_FROM_FILE_FRONT || requestCode == Utils.CARD_IMAGE_FROM_FILE_BACK) {
                 Bitmap bitmap = null;
                 try {
-                    bitmap = MediaStore.Images.Media.getBitmap(getContentResolver(), intent.getData());
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+                        ImageDecoder.Source image_source = ImageDecoder.createSource(getContentResolver(), intent.getData());
+                        bitmap = ImageDecoder.decodeBitmap(image_source, (decoder, info, source) -> decoder.setMutableRequired(true));
+                    } else {
+                        bitmap = MediaStore.Images.Media.getBitmap(getContentResolver(), intent.getData());
+                    }
                 } catch (IOException e) {
                     Log.e(TAG, "Error getting data from image file");
                     e.printStackTrace();
-                    Toast.makeText(this, R.string.errorReadingImage, Toast.LENGTH_LONG).show();
                 }
 
                 if (bitmap != null) {
@@ -1124,6 +1084,8 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
                     }
 
                     hasChanged = true;
+                } else {
+                    Toast.makeText(this, R.string.errorReadingImage, Toast.LENGTH_LONG).show();
                 }
             } else {
                 BarcodeValues barcodeValues = Utils.parseSetBarcodeActivityResult(requestCode, resultCode, intent, this);
@@ -1147,16 +1109,18 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
 
     private void generateOrHideBarcode() {
         String cardIdString = tempLoyaltyCard.barcodeId != null ? tempLoyaltyCard.barcodeId : tempLoyaltyCard.cardId;
-        BarcodeFormat barcodeFormat = tempLoyaltyCard.barcodeType;
+        CatimaBarcode barcodeFormat = tempLoyaltyCard.barcodeType;
 
-        if (barcodeFormat == null || cardIdString.isEmpty() || !BarcodeSelectorActivity.SUPPORTED_BARCODE_TYPES.contains(barcodeFormat.name())) {
+        if (barcodeFormat == null || cardIdString.isEmpty() || !barcodeFormat.isSupported()) {
             hideBarcode();
         } else {
             generateBarcode(cardIdString, barcodeFormat);
         }
     }
 
-    private void generateBarcode(String cardIdString, BarcodeFormat barcodeFormat) {
+    private void generateBarcode(String cardIdString, CatimaBarcode barcodeFormat) {
+        mTasks.flushTaskList(TaskHandler.TYPE.BARCODE, true, false, false);
+        
         if (barcodeImage.getHeight() == 0) {
             Log.d(TAG, "ImageView size is not known known at start, waiting for load");
             // The size of the ImageView is not yet available as it has not
@@ -1168,12 +1132,14 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
                             barcodeImage.getViewTreeObserver().removeOnGlobalLayoutListener(this);
 
                             Log.d(TAG, "ImageView size now known");
-                            new BarcodeImageWriterTask(barcodeImage, cardIdString, barcodeFormat, null, false, warnOnInvalidBarcodeType).execute();
+                            BarcodeImageWriterTask barcodeWriter = new BarcodeImageWriterTask(getApplicationContext(), barcodeImage, cardIdString, barcodeFormat, null, false, warnOnInvalidBarcodeType);
+                            mTasks.executeTask(TaskHandler.TYPE.BARCODE, barcodeWriter);
                         }
                     });
         } else {
             Log.d(TAG, "ImageView size known known, creating barcode");
-            new BarcodeImageWriterTask(barcodeImage, cardIdString, barcodeFormat, null, false, warnOnInvalidBarcodeType).execute();
+            BarcodeImageWriterTask barcodeWriter = new BarcodeImageWriterTask(getApplicationContext(), barcodeImage, cardIdString, barcodeFormat, null, false, warnOnInvalidBarcodeType);
+            mTasks.executeTask(TaskHandler.TYPE.BARCODE, barcodeWriter);
         }
 
         showBarcode();

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

@@ -1,14 +1,18 @@
 package protect.card_locker;
 
+import android.app.Application;
+
 import androidx.appcompat.app.AppCompatDelegate;
-import androidx.multidex.MultiDexApplication;
+
 import protect.card_locker.preferences.Settings;
 
-public class LoyaltyCardLockerApplication extends MultiDexApplication {
+public class LoyaltyCardLockerApplication extends Application {
+
+    @Override
     public void onCreate() {
         super.onCreate();
 
-        Settings settings = new Settings(getApplicationContext());
+        Settings settings = new Settings(this);
         AppCompatDelegate.setDefaultNightMode(settings.getTheme());
     }
 }

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

@@ -12,8 +12,10 @@ import android.text.TextUtils;
 import android.util.DisplayMetrics;
 import android.util.Log;
 import android.util.TypedValue;
+import android.view.GestureDetector;
 import android.view.Menu;
 import android.view.MenuItem;
+import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewTreeObserver;
 import android.view.Window;
@@ -28,7 +30,6 @@ import android.widget.Toast;
 import com.google.android.material.appbar.AppBarLayout;
 import com.google.android.material.bottomsheet.BottomSheetBehavior;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
-import com.google.zxing.BarcodeFormat;
 
 import java.io.UnsupportedEncodingException;
 import java.math.BigDecimal;
@@ -39,35 +40,35 @@ import java.util.List;
 
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.ActionBar;
-import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.content.res.AppCompatResources;
 import androidx.appcompat.widget.AppCompatTextView;
 import androidx.appcompat.widget.Toolbar;
 import androidx.constraintlayout.widget.Guideline;
+import androidx.core.content.ContextCompat;
 import androidx.core.graphics.drawable.DrawableCompat;
 import androidx.core.widget.TextViewCompat;
+
+import protect.card_locker.async.TaskHandler;
 import protect.card_locker.preferences.Settings;
 
-public class LoyaltyCardViewActivity extends AppCompatActivity
-{
+public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements GestureDetector.OnGestureListener {
     private static final String TAG = "Catima";
 
+    private GestureDetector mGestureDetector;
+
     TextView cardIdFieldView;
     BottomSheetBehavior behavior;
     View bottomSheet;
     View bottomSheetContentWrapper;
     ImageView bottomSheetButton;
-    View frontImageView;
-    ImageView frontImage;
-    View backImageView;
-    ImageView backImage;
     TextView noteView;
     TextView groupsView;
     TextView balanceView;
     TextView expiryView;
     AppCompatTextView storeName;
     ImageButton maximizeButton;
-    ImageView barcodeImage;
+    ImageView mainImage;
+    LinearLayout dotIndicator;
     ImageButton minimizeButton;
     View collapsingToolbarLayout;
     AppBarLayout appBarLayout;
@@ -80,7 +81,7 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
 
     String cardIdString;
     String barcodeIdString;
-    BarcodeFormat format;
+    CatimaBarcode format;
 
     FloatingActionButton editButton;
 
@@ -92,36 +93,119 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
 
     boolean starred;
     boolean backgroundNeedsDarkIcons;
-    FullscreenType fullscreenType = FullscreenType.NONE;
+    boolean isFullscreen = false;
+    int mainImageIndex = 0;
+    List<ImageType> imageTypes;
+    private ImageView[] dots;
     boolean isBarcodeSupported = true;
 
-    static final String STATE_FULLSCREENTYPE = "fullscreenType";
+    static final String STATE_IMAGEINDEX = "imageIndex";
+    static final String STATE_FULLSCREEN = "isFullscreen";
 
-    enum FullscreenType {
+    final private TaskHandler mTasks = new TaskHandler();
+
+    @Override
+    public boolean onDown(MotionEvent e) {
+        return true;
+    }
+
+    @Override
+    public void onShowPress(MotionEvent e) {
+
+    }
+
+    @Override
+    public boolean onSingleTapUp(MotionEvent e) {
+        if (imageTypes.size() > 1) {
+            Toast.makeText(this, getString(R.string.swipeToSwitchImages), Toast.LENGTH_SHORT).show();
+        }
+
+        return false;
+    }
+
+    @Override
+    public boolean onScroll(MotionEvent e1, MotionEvent e2, float distanceX, float distanceY) {
+        return false;
+    }
+
+    @Override
+    public void onLongPress(MotionEvent e) {
+        // Also switch on long-press for accessibility
+        setMainImage(true, true);
+    }
+
+    @Override
+    public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX, float velocityY) {
+        Log.d(TAG, "On fling");
+
+        if (Math.abs(velocityY) > (0.75 * Math.abs(velocityX))) {
+            // Vertical swipe
+            // Swipe up
+            if (velocityY < -150) {
+                if (!isFullscreen) {
+                    setFullscreen(true);
+                }
+                return false;
+            }
+
+            // Swipe down
+            if (velocityY > 150) {
+                if (isFullscreen) {
+                    setFullscreen(false);
+                }
+                return false;
+            }
+        } else if (Math.abs(velocityX) > (0.75 * Math.abs(velocityY))) {
+            // Horizontal swipe
+            // Swipe right
+            if (velocityX < -150) {
+                setMainImage(true, false);
+                return false;
+            }
+
+            // Swipe left
+            if (velocityX > 150) {
+                setMainImage(false, false);
+                return false;
+            }
+        }
+
+        if (imageTypes.size() > 1) {
+            Toast.makeText(this, getString(R.string.swipeToSwitchImages), Toast.LENGTH_SHORT).show();
+        }
+
+        return true;
+    }
+
+    enum ImageType {
         NONE,
         BARCODE,
         IMAGE_FRONT,
         IMAGE_BACK
     }
 
-    private void extractIntentFields(Intent intent)
-    {
+    private void extractIntentFields(Intent intent) {
         final Bundle b = intent.getExtras();
         loyaltyCardId = b != null ? b.getInt("id") : 0;
         Log.d(TAG, "View activity: id=" + loyaltyCardId);
     }
 
-    private Drawable getIcon(int icon, boolean dark)
-    {
+    private Drawable getDotIcon(boolean active) {
+        Drawable unwrappedIcon = AppCompatResources.getDrawable(this, active ? R.drawable.active_dot : R.drawable.inactive_dot);
+        assert unwrappedIcon != null;
+        Drawable wrappedIcon = DrawableCompat.wrap(unwrappedIcon);
+        DrawableCompat.setTint(wrappedIcon, ContextCompat.getColor(getApplicationContext(), R.color.iconColor));
+
+        return wrappedIcon;
+    }
+
+    private Drawable getIcon(int icon, boolean dark) {
         Drawable unwrappedIcon = AppCompatResources.getDrawable(this, icon);
         assert unwrappedIcon != null;
         Drawable wrappedIcon = DrawableCompat.wrap(unwrappedIcon);
-        if(dark)
-        {
+        if (dark) {
             DrawableCompat.setTint(wrappedIcon, Color.BLACK);
-        }
-        else
-        {
+        } else {
             DrawableCompat.setTintList(wrappedIcon, null);
         }
 
@@ -129,12 +213,12 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
     }
 
     @Override
-    protected void onCreate(Bundle savedInstanceState)
-    {
+    protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
         if (savedInstanceState != null) {
-            fullscreenType = FullscreenType.valueOf(savedInstanceState.getString(STATE_FULLSCREENTYPE));
+            mainImageIndex = savedInstanceState.getInt(STATE_IMAGEINDEX);
+            isFullscreen = savedInstanceState.getBoolean(STATE_FULLSCREEN);
         }
 
         settings = new Settings(this);
@@ -150,25 +234,23 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
         bottomSheet = findViewById(R.id.bottom_sheet);
         bottomSheetContentWrapper = findViewById(R.id.bottomSheetContentWrapper);
         bottomSheetButton = findViewById(R.id.bottomSheetButton);
-        frontImageView = findViewById(R.id.frontImageView);
-        frontImage = findViewById(R.id.frontImage);
-        backImageView = findViewById(R.id.backImageView);
-        backImage = findViewById(R.id.backImage);
         noteView = findViewById(R.id.noteView);
         groupsView = findViewById(R.id.groupsView);
         balanceView = findViewById(R.id.balanceView);
         expiryView = findViewById(R.id.expiryView);
         storeName = findViewById(R.id.storeName);
         maximizeButton = findViewById(R.id.maximizeButton);
-        barcodeImage = findViewById(R.id.barcode);
+        mainImage = findViewById(R.id.mainImage);
+        dotIndicator = findViewById(R.id.dotIndicator);
         minimizeButton = findViewById(R.id.minimizeButton);
         collapsingToolbarLayout = findViewById(R.id.collapsingToolbarLayout);
         appBarLayout = findViewById(R.id.app_bar_layout);
 
         centerGuideline = findViewById(R.id.centerGuideline);
-        centerGuideline.setGuidelinePercent(0.5f);
         barcodeScaler = findViewById(R.id.barcodeScaler);
-        barcodeScaler.setProgress(100);
+        maximizeButton.setBackgroundColor(getThemeColor());
+        minimizeButton.setBackgroundColor(getThemeColor());
+        bottomSheetButton.setBackgroundColor(getThemeColor());
         barcodeScaler.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
             @Override
             public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
@@ -177,10 +259,18 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
                 float scale = (float) progress / (float) barcodeScaler.getMax();
                 Log.d(TAG, "Scaling to " + scale);
 
-                if (fullscreenType == FullscreenType.BARCODE) {
-                    redrawBarcodeAfterResize();
+                if(isFullscreen){
+                    loyaltyCard.zoomLevel = progress;
+                    db.updateLoyaltyCardZoomLevel(loyaltyCardId, loyaltyCard.zoomLevel);
                 }
-                centerGuideline.setGuidelinePercent(0.5f * scale);
+
+                if (format != null && format.isSquare()) {
+                    centerGuideline.setGuidelinePercent(0.75f * scale);
+                } else {
+                    centerGuideline.setGuidelinePercent(0.5f * scale);
+                }
+
+                drawMainImage(mainImageIndex, true);
             }
 
             @Override
@@ -197,29 +287,8 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
         rotationEnabled = true;
 
         // Allow making barcode fullscreen on tap
-        maximizeButton.setOnClickListener(v -> setFullscreen(FullscreenType.BARCODE));
-        barcodeImage.setOnClickListener(view -> {
-            if (fullscreenType != FullscreenType.NONE) {
-                setFullscreen(FullscreenType.NONE);
-            } else {
-                setFullscreen(FullscreenType.BARCODE);
-            }
-        });
-        frontImageView.setOnClickListener(view -> {
-            if (fullscreenType != FullscreenType.IMAGE_FRONT) {
-                setFullscreen(FullscreenType.IMAGE_FRONT);
-            } else {
-                setFullscreen(FullscreenType.NONE);
-            }
-        });
-        backImageView.setOnClickListener(view -> {
-            if (fullscreenType != FullscreenType.IMAGE_BACK) {
-                setFullscreen(FullscreenType.IMAGE_BACK);
-            } else {
-                setFullscreen(FullscreenType.NONE);
-            }
-        });
-        minimizeButton.setOnClickListener(v -> setFullscreen(FullscreenType.NONE));
+        maximizeButton.setOnClickListener(v -> setFullscreen(true));
+        minimizeButton.setOnClickListener(v -> setFullscreen(false));
 
         editButton = findViewById(R.id.fabEdit);
         editButton.setOnClickListener(v -> {
@@ -244,7 +313,7 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
                     editButton.hide();
                 } else if (newState == BottomSheetBehavior.STATE_COLLAPSED) {
                     bottomSheetButton.setImageResource(R.drawable.ic_baseline_arrow_drop_up_24);
-                    if (fullscreenType == FullscreenType.NONE) {
+                    if (!isFullscreen) {
                         editButton.show();
                     }
 
@@ -254,7 +323,8 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
             }
 
             @Override
-            public void onSlide(@NonNull View bottomSheet, float slideOffset) { }
+            public void onSlide(@NonNull View bottomSheet, float slideOffset) {
+            }
         });
 
         bottomSheetButton.setOnClickListener(v -> {
@@ -283,11 +353,14 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
                 );
             }
         });
+
+        mGestureDetector = new GestureDetector(this, this);
+        View.OnTouchListener gestureTouchListener = (v, event) -> mGestureDetector.onTouchEvent(event);
+        mainImage.setOnTouchListener(gestureTouchListener);
     }
 
     @Override
-    public void onNewIntent(Intent intent)
-    {
+    public void onNewIntent(Intent intent) {
         super.onNewIntent(intent);
 
         Log.i(TAG, "Received new intent");
@@ -296,14 +369,14 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
 
     @Override
     public void onSaveInstanceState(Bundle savedInstanceState) {
-        savedInstanceState.putString(STATE_FULLSCREENTYPE, String.valueOf(fullscreenType));
+        savedInstanceState.putInt(STATE_IMAGEINDEX, mainImageIndex);
+        savedInstanceState.putBoolean(STATE_FULLSCREEN, isFullscreen);
         super.onSaveInstanceState(savedInstanceState);
     }
 
 
     @Override
-    public void onResume()
-    {
+    public void onResume() {
         super.onResume();
 
         Log.i(TAG, "To view card: " + loyaltyCardId);
@@ -312,12 +385,10 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
         // '1' is the brightest. We attempt to maximize the brightness
         // to help barcode readers scan the barcode.
         Window window = getWindow();
-        if(window != null)
-        {
+        if (window != null) {
             WindowManager.LayoutParams attributes = window.getAttributes();
 
-            if (settings.useMaxBrightnessDisplayingBarcode())
-            {
+            if (settings.useMaxBrightnessDisplayingBarcode()) {
                 attributes.screenBrightness = 1F;
             }
 
@@ -326,7 +397,7 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
             }
 
             if (settings.getDisableLockscreenWhileViewingCard()) {
-                window.addFlags(WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD|
+                window.addFlags(WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD |
                         WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED);
             }
 
@@ -334,8 +405,7 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
         }
 
         loyaltyCard = db.getLoyaltyCard(loyaltyCardId);
-        if(loyaltyCard == null)
-        {
+        if (loyaltyCard == null) {
             Log.w(TAG, "Could not lookup loyalty card " + loyaltyCardId);
             Toast.makeText(this, R.string.noCardExistsError, Toast.LENGTH_LONG).show();
             finish();
@@ -353,36 +423,17 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
                 settings.getFontSizeMin(settings.getLargeFont()), settings.getFontSizeMax(settings.getLargeFont()),
                 1, TypedValue.COMPLEX_UNIT_SP);
 
-        frontImageBitmap = Utils.retrieveCardImage(this, loyaltyCard.id, true);
-        if (frontImageBitmap != null) {
-            frontImageView.setVisibility(View.VISIBLE);
-            frontImage.setImageBitmap(frontImageBitmap);
-        } else {
-            frontImageView.setVisibility(View.GONE);
-        }
-
-        backImageBitmap = Utils.retrieveCardImage(this, loyaltyCard.id, false);
-        if (backImageBitmap != null) {
-            backImageView.setVisibility(View.VISIBLE);
-            backImage.setImageBitmap(backImageBitmap);
-        } else {
-            backImageView.setVisibility(View.GONE);
-        }
-
-        if(loyaltyCard.note.length() > 0)
-        {
+        if (loyaltyCard.note.length() > 0) {
             noteView.setVisibility(View.VISIBLE);
             noteView.setText(loyaltyCard.note);
             noteView.setTextSize(settings.getFontSizeMax(settings.getMediumFont()));
-        }
-        else
-        {
+        } else {
             noteView.setVisibility(View.GONE);
         }
 
         List<Group> loyaltyCardGroups = db.getLoyaltyCardGroups(loyaltyCardId);
 
-        if(loyaltyCardGroups.size() > 0) {
+        if (loyaltyCardGroups.size() > 0) {
             List<String> groupNames = new ArrayList<>();
             for (Group group : loyaltyCardGroups) {
                 groupNames.add(group._id);
@@ -391,40 +442,34 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
             groupsView.setVisibility(View.VISIBLE);
             groupsView.setText(getString(R.string.groupsList, TextUtils.join(", ", groupNames)));
             groupsView.setTextSize(settings.getFontSizeMax(settings.getMediumFont()));
-        }
-        else
-        {
+        } else {
             groupsView.setVisibility(View.GONE);
         }
 
-        if(!loyaltyCard.balance.equals(new BigDecimal(0))) {
+        if (!loyaltyCard.balance.equals(new BigDecimal(0))) {
             balanceView.setVisibility(View.VISIBLE);
             balanceView.setText(getString(R.string.balanceSentence, Utils.formatBalance(this, loyaltyCard.balance, loyaltyCard.balanceType)));
             balanceView.setTextSize(settings.getFontSizeMax(settings.getMediumFont()));
-        }
-        else
-        {
+        } else {
             balanceView.setVisibility(View.GONE);
         }
 
-        if(loyaltyCard.expiry != null) {
+        if (loyaltyCard.expiry != null) {
             expiryView.setVisibility(View.VISIBLE);
 
             int expiryString = R.string.expiryStateSentence;
-            if(Utils.hasExpired(loyaltyCard.expiry)) {
+            if (Utils.hasExpired(loyaltyCard.expiry)) {
                 expiryString = R.string.expiryStateSentenceExpired;
-                expiryView.setTextColor(getResources().getColor(R.color.alert));
+                expiryView.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.alert));
             }
             expiryView.setText(getString(expiryString, DateFormat.getDateInstance(DateFormat.LONG).format(loyaltyCard.expiry)));
             expiryView.setTextSize(settings.getFontSizeMax(settings.getMediumFont()));
-        }
-        else
-        {
+        } else {
             expiryView.setVisibility(View.GONE);
         }
         expiryView.setTag(loyaltyCard.expiry);
 
-        if (fullscreenType == FullscreenType.NONE) {
+        if (!isFullscreen) {
             makeBottomSheetVisibleIfUseful();
         }
 
@@ -438,12 +483,9 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
                 TypedValue.COMPLEX_UNIT_DIP);
 
         int backgroundHeaderColor;
-        if(loyaltyCard.headerColor != null)
-        {
+        if (loyaltyCard.headerColor != null) {
             backgroundHeaderColor = loyaltyCard.headerColor;
-        }
-        else
-        {
+        } else {
             backgroundHeaderColor = LetterBitmap.getDefaultColor(this, loyaltyCard.store);
         }
 
@@ -451,12 +493,9 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
         appBarLayout.setBackgroundColor(backgroundHeaderColor);
 
         int textColor;
-        if(Utils.needsDarkForeground(backgroundHeaderColor))
-        {
+        if (Utils.needsDarkForeground(backgroundHeaderColor)) {
             textColor = Color.BLACK;
-        }
-        else
-        {
+        } else {
             textColor = Color.WHITE;
         }
         storeName.setTextColor(textColor);
@@ -465,38 +504,70 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
         // If the background is very bright, we should use dark icons
         backgroundNeedsDarkIcons = Utils.needsDarkForeground(backgroundHeaderColor);
         ActionBar actionBar = getSupportActionBar();
-        if(actionBar != null)
-        {
+        if (actionBar != null) {
             actionBar.setHomeAsUpIndicator(getIcon(R.drawable.ic_arrow_back_white, backgroundNeedsDarkIcons));
         }
 
         // Make notification area light if dark icons are needed
-        if(Build.VERSION.SDK_INT >= 23)
-        {
+        if (Build.VERSION.SDK_INT >= 23) {
             window.getDecorView().setSystemUiVisibility(backgroundNeedsDarkIcons ? View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR : 0);
         }
-        if(Build.VERSION.SDK_INT >= 21)
-        {
-            window.setStatusBarColor(Color.TRANSPARENT);
-        }
+        window.setStatusBarColor(Color.TRANSPARENT);
 
         // Set shadow colour of store text so even same color on same color would be readable
         storeName.setShadowLayer(1, 1, 1, backgroundNeedsDarkIcons ? Color.BLACK : Color.WHITE);
 
-        if (format != null && !BarcodeSelectorActivity.SUPPORTED_BARCODE_TYPES.contains(format.name())) {
+        if (format != null && !format.isSupported()) {
             isBarcodeSupported = false;
 
             Toast.makeText(this, getString(R.string.unsupportedBarcodeType), Toast.LENGTH_LONG).show();
+        } else if (format == null) {
+            isBarcodeSupported = false;
         }
 
-        setFullscreen(fullscreenType);
+        imageTypes = new ArrayList<>();
+
+        if (isBarcodeSupported) {
+            imageTypes.add(ImageType.BARCODE);
+        }
+
+        frontImageBitmap = Utils.retrieveCardImage(this, loyaltyCard.id, true);
+        backImageBitmap = Utils.retrieveCardImage(this, loyaltyCard.id, false);
+
+        if (frontImageBitmap != null) {
+            imageTypes.add(ImageType.IMAGE_FRONT);
+        }
+
+        if (backImageBitmap != null) {
+            imageTypes.add(ImageType.IMAGE_BACK);
+        }
+
+        dotIndicator.removeAllViews();
+        if (imageTypes.size() >= 2) {
+            dots = new ImageView[imageTypes.size()];
+
+            for (int i = 0; i < imageTypes.size(); i++) {
+                dots[i] = new ImageView(this);
+                dots[i].setImageDrawable(getDotIcon(false));
+
+                LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT);
+                params.setMargins(8, 0, 8, 0);
+
+                dotIndicator.addView(dots[i], params);
+            }
+
+            dotIndicator.setVisibility(View.VISIBLE);
+        }
+
+        setFullscreen(isFullscreen);
+
+        db.updateLoyaltyCardLastUsed(loyaltyCard.id);
     }
 
     @Override
     public void onBackPressed() {
-        if (fullscreenType != FullscreenType.NONE)
-        {
-            setFullscreen(FullscreenType.NONE);
+        if (isFullscreen) {
+            setFullscreen(false);
             return;
         }
 
@@ -504,16 +575,14 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
     }
 
     @Override
-    public boolean onCreateOptionsMenu(Menu menu)
-    {
+    public boolean onCreateOptionsMenu(Menu menu) {
         getMenuInflater().inflate(R.menu.card_view_menu, menu);
 
         // Always calculate lockscreen icon, it may need a black color
         boolean lockBarcodeScreenOrientation = settings.getLockBarcodeScreenOrientation();
         MenuItem item = menu.findItem(R.id.action_lock_unlock);
         setOrientatonLock(item, lockBarcodeScreenOrientation);
-        if(lockBarcodeScreenOrientation)
-        {
+        if (lockBarcodeScreenOrientation) {
             item.setVisible(false);
         }
 
@@ -532,8 +601,7 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
         if (starred) {
             menu.findItem(R.id.action_star_unstar).setIcon(getIcon(R.drawable.ic_starred_white, backgroundNeedsDarkIcons));
             menu.findItem(R.id.action_star_unstar).setTitle(R.string.unstar);
-        }
-        else {
+        } else {
             menu.findItem(R.id.action_star_unstar).setIcon(getIcon(R.drawable.ic_unstarred_white, backgroundNeedsDarkIcons));
             menu.findItem(R.id.action_star_unstar).setTitle(R.string.star);
         }
@@ -541,12 +609,10 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
     }
 
     @Override
-    public boolean onOptionsItemSelected(MenuItem item)
-    {
+    public boolean onOptionsItemSelected(MenuItem item) {
         int id = item.getItemId();
 
-        switch(id)
-        {
+        switch (id) {
             case android.R.id.home:
                 finish();
                 break;
@@ -561,12 +627,9 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
                 return true;
 
             case R.id.action_lock_unlock:
-                if(rotationEnabled)
-                {
+                if (rotationEnabled) {
                     setOrientatonLock(item, true);
-                }
-                else
-                {
+                } else {
                     setOrientatonLock(item, false);
                 }
                 rotationEnabled = !rotationEnabled;
@@ -582,8 +645,7 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
         return super.onOptionsItemSelected(item);
     }
 
-    private void setupOrientation()
-    {
+    private void setupOrientation() {
         Toolbar portraitToolbar = findViewById(R.id.toolbar);
         Toolbar landscapeToolbar = findViewById(R.id.toolbar_landscape);
 
@@ -611,60 +673,110 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
         }
 
         ActionBar actionBar = getSupportActionBar();
-        if(actionBar != null)
-        {
+        if (actionBar != null) {
             actionBar.setDisplayHomeAsUpEnabled(true);
         }
     }
-    private void setOrientatonLock(MenuItem item, boolean lock)
-    {
-        if(lock)
-        {
+
+    private void setOrientatonLock(MenuItem item, boolean lock) {
+        if (lock) {
 
             item.setIcon(getIcon(R.drawable.ic_lock_outline_white_24dp, backgroundNeedsDarkIcons));
             item.setTitle(R.string.unlockScreen);
             setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_NOSENSOR);
-        }
-        else
-        {
+        } else {
             item.setIcon(getIcon(R.drawable.ic_lock_open_white_24dp, backgroundNeedsDarkIcons));
             item.setTitle(R.string.lockScreen);
             setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED);
         }
     }
 
-    private void makeBottomSheetVisibleIfUseful()
-    {
-        if (frontImageView.getVisibility() == View.VISIBLE || backImageView.getVisibility() == View.VISIBLE || noteView.getVisibility() == View.VISIBLE || groupsView.getVisibility() == View.VISIBLE || balanceView.getVisibility() == View.VISIBLE || expiryView.getVisibility() == View.VISIBLE) {
+    private void makeBottomSheetVisibleIfUseful() {
+        if (noteView.getVisibility() == View.VISIBLE || groupsView.getVisibility() == View.VISIBLE || balanceView.getVisibility() == View.VISIBLE || expiryView.getVisibility() == View.VISIBLE) {
             bottomSheet.setVisibility(View.VISIBLE);
-        }
-        else
-        {
+        } else {
             bottomSheet.setVisibility(View.GONE);
         }
     }
 
-    private void redrawBarcodeAfterResize()
-    {
+    private void drawBarcode() {
+        mTasks.flushTaskList(TaskHandler.TYPE.BARCODE, true, false, false);
         if (format != null) {
-            barcodeImage.getViewTreeObserver().addOnGlobalLayoutListener(
+            BarcodeImageWriterTask barcodeWriter = new BarcodeImageWriterTask(
+                    getApplicationContext(),
+                    mainImage,
+                    barcodeIdString != null ? barcodeIdString : cardIdString,
+                    format,
+                    null,
+                    false,
+                    null);
+            mTasks.executeTask(TaskHandler.TYPE.BARCODE, barcodeWriter);
+        }
+    }
+
+    private void redrawBarcodeAfterResize() {
+        if (format != null) {
+            mainImage.getViewTreeObserver().addOnGlobalLayoutListener(
                     new ViewTreeObserver.OnGlobalLayoutListener() {
                         @Override
                         public void onGlobalLayout() {
-                            barcodeImage.getViewTreeObserver().removeOnGlobalLayoutListener(this);
+                            mainImage.getViewTreeObserver().removeOnGlobalLayoutListener(this);
 
                             Log.d(TAG, "ImageView size now known");
-                            new BarcodeImageWriterTask(
-                                barcodeImage,
-                                barcodeIdString != null ? barcodeIdString : cardIdString,
-                                format,
-                                null,
-                                false,
-                                null)
-                            .execute();
+                            drawBarcode();
                         }
                     });
-        };
+        }
+    }
+
+    private void drawMainImage(int index, boolean waitForResize) {
+        if (imageTypes.isEmpty()) {
+            mainImage.setVisibility(View.GONE);
+            return;
+        }
+
+        if (dots != null) {
+            for (int i = 0; i < dots.length; i++) {
+                dots[i].setImageDrawable(getDotIcon(i == index));
+            }
+        }
+
+        ImageType wantedImageType = imageTypes.get(index);
+
+        if (wantedImageType == ImageType.BARCODE) {
+            if (waitForResize) {
+                redrawBarcodeAfterResize();
+            } else {
+                drawBarcode();
+            }
+            mainImage.setBackgroundColor(Color.WHITE);
+        } else if (wantedImageType == ImageType.IMAGE_FRONT) {
+            mainImage.setImageBitmap(frontImageBitmap);
+            mainImage.setBackgroundColor(Color.TRANSPARENT);
+        } else if (wantedImageType == ImageType.IMAGE_BACK) {
+            mainImage.setImageBitmap(backImageBitmap);
+            mainImage.setBackgroundColor(Color.TRANSPARENT);
+        } else {
+            throw new IllegalArgumentException("Unknown image type: " + wantedImageType);
+        }
+
+        mainImage.setVisibility(View.VISIBLE);
+    }
+
+    private void setMainImage(boolean next, boolean overflow) {
+        int newIndex = mainImageIndex + (next ? 1 : -1);
+
+        if (newIndex >= imageTypes.size() && overflow) {
+            newIndex = 0;
+        }
+
+        if (newIndex == -1 || newIndex >= imageTypes.size()) {
+            return;
+        }
+
+        mainImageIndex = newIndex;
+
+        drawMainImage(newIndex, false);
     }
 
     /**
@@ -673,22 +785,16 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
      * The purpose of this function is to make sure the barcode can be scanned from the phone
      * by machines which offer no space to insert the complete device.
      */
-    private void setFullscreen(FullscreenType fullscreenType)
-    {
+    private void setFullscreen(boolean enabled) {
+        isFullscreen = enabled;
         ActionBar actionBar = getSupportActionBar();
-        if (fullscreenType != FullscreenType.NONE) {
+
+        if (enabled && !imageTypes.isEmpty()) {
             Log.d(TAG, "Move into fullscreen");
 
-            if (fullscreenType == FullscreenType.IMAGE_FRONT) {
-                barcodeImage.setImageBitmap(frontImageBitmap);
-                barcodeImage.setVisibility(View.VISIBLE);
-            } else if (fullscreenType == FullscreenType.IMAGE_BACK) {
-                barcodeImage.setImageBitmap(backImageBitmap);
-                barcodeImage.setVisibility(View.VISIBLE);
-            } else {
-                // Prepare redraw after size change
-                redrawBarcodeAfterResize();
-            }
+            drawMainImage(mainImageIndex, true);
+
+            barcodeScaler.setProgress(loyaltyCard.zoomLevel);
 
             // Hide maximize and show minimize button and scaler
             maximizeButton.setVisibility(View.GONE);
@@ -696,8 +802,7 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
             barcodeScaler.setVisibility(View.VISIBLE);
 
             // Hide actionbar
-            if(actionBar != null)
-            {
+            if (actionBar != null) {
                 actionBar.hide();
             }
 
@@ -722,31 +827,22 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
                             | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY
                             | View.SYSTEM_UI_FLAG_FULLSCREEN
             );
-        }
-        else
-        {
+        } else {
             Log.d(TAG, "Move out of fullscreen");
 
             // Reset center guideline
             barcodeScaler.setProgress(100);
 
-            // Prepare redraw after size change
-            if (format != null && isBarcodeSupported) {
-                redrawBarcodeAfterResize();
-            } else {
-                barcodeImage.setVisibility(View.GONE);
-            }
+            drawMainImage(mainImageIndex, true);
 
             // Show maximize and hide minimize button and scaler
-            if (format != null && isBarcodeSupported) {
-                maximizeButton.setVisibility(View.VISIBLE);
-            }
+            maximizeButton.setVisibility(imageTypes.isEmpty() ? View.GONE : View.VISIBLE);
+
             minimizeButton.setVisibility(View.GONE);
             barcodeScaler.setVisibility(View.GONE);
 
             // Show actionbar
-            if(actionBar != null)
-            {
+            if (actionBar != null) {
                 actionBar.show();
             }
 
@@ -770,6 +866,6 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
             );
         }
 
-        this.fullscreenType = fullscreenType;
+        Log.d("setFullScreen","Is full screen enabled? "+enabled+" Zoom Level = "+barcodeScaler.getProgress());
     }
 }

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

@@ -8,7 +8,7 @@ import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.res.Configuration;
 import android.database.Cursor;
-import android.net.Uri;
+import android.database.CursorIndexOutOfBoundsException;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.GestureDetector;
@@ -16,25 +16,27 @@ import android.view.Menu;
 import android.view.MenuItem;
 import android.view.MotionEvent;
 import android.view.View;
+import android.widget.CheckBox;
 import android.widget.Toast;
 
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.google.android.material.tabs.TabLayout;
 
 import java.io.UnsupportedEncodingException;
+import java.util.Arrays;
 import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
 
 import androidx.appcompat.app.AlertDialog;
-import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.view.ActionMode;
 import androidx.appcompat.widget.SearchView;
 import androidx.appcompat.widget.Toolbar;
-import androidx.recyclerview.widget.DefaultItemAnimator;
-import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.core.app.ActivityCompat;
+import androidx.core.splashscreen.SplashScreen;
 import androidx.recyclerview.widget.RecyclerView;
 import protect.card_locker.preferences.SettingsActivity;
 
-public class MainActivity extends AppCompatActivity implements LoyaltyCardCursorAdapter.CardAdapterListener, GestureDetector.OnGestureListener
+public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCardCursorAdapter.CardAdapterListener, GestureDetector.OnGestureListener
 {
     private static final String TAG = "Catima";
 
@@ -44,10 +46,14 @@ public class MainActivity extends AppCompatActivity implements LoyaltyCardCursor
     private Menu mMenu;
     private GestureDetector mGestureDetector;
     protected String mFilter = "";
+    protected Object mGroup = null;
+    protected DBHelper.LoyaltyCardOrder mOrder = DBHelper.LoyaltyCardOrder.Alpha;
+    protected DBHelper.LoyaltyCardOrderDirection mOrderDirection = DBHelper.LoyaltyCardOrderDirection.Ascending;
     protected int selectedTab = 0;
     private RecyclerView mCardList;
     private View mHelpText;
     private View mNoMatchingCardsText;
+    private View mNoGroupCardsText;
 
     private ActionMode.Callback mCurrentActionModeCallback = new ActionMode.Callback()
     {
@@ -142,8 +148,9 @@ public class MainActivity extends AppCompatActivity implements LoyaltyCardCursor
                     }
 
                     TabLayout.Tab tab = ((TabLayout) findViewById(R.id.groups)).getTabAt(selectedTab);
+                    mGroup = tab != null ? tab.getTag() : null;
 
-                    updateLoyaltyCardList(mFilter, tab != null ? tab.getTag() : null);
+                    updateLoyaltyCardList();
 
                     dialog.dismiss();
                 });
@@ -177,6 +184,8 @@ public class MainActivity extends AppCompatActivity implements LoyaltyCardCursor
     protected void onCreate(Bundle inputSavedInstanceState)
     {
         super.onCreate(inputSavedInstanceState);
+        SplashScreen.installSplashScreen(this);
+        setTitle(R.string.app_name);
         setContentView(R.layout.main_activity);
         Toolbar toolbar = findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
@@ -186,14 +195,15 @@ public class MainActivity extends AppCompatActivity implements LoyaltyCardCursor
             @Override
             public void onTabSelected(TabLayout.Tab tab) {
                 selectedTab = tab.getPosition();
-                updateLoyaltyCardList(mFilter, tab.getTag());
-
+                Log.d("onTabSelected","Tab Position "+tab.getPosition());
+                mGroup = tab.getTag();
+                updateLoyaltyCardList();
                 // Store active tab in Shared Preference to restore next app launch
                 SharedPreferences activeTabPref = getApplicationContext().getSharedPreferences(
                         getString(R.string.sharedpreference_active_tab),
                         Context.MODE_PRIVATE);
                 SharedPreferences.Editor activeTabPrefEditor = activeTabPref.edit();
-                activeTabPrefEditor.putInt(getString(R.string.sharedpreference_active_tab), selectedTab);
+                activeTabPrefEditor.putInt(getString(R.string.sharedpreference_active_tab), tab.getPosition());
                 activeTabPrefEditor.apply();
             }
 
@@ -210,31 +220,24 @@ public class MainActivity extends AppCompatActivity implements LoyaltyCardCursor
 
         mGestureDetector = new GestureDetector(this, this);
 
-        View.OnTouchListener gestureTouchListener = new View.OnTouchListener() {
-            @Override
-            public boolean onTouch(final View v, final MotionEvent event){
-                return mGestureDetector.onTouchEvent(event);
-            }
-        };
+        View.OnTouchListener gestureTouchListener = (v, event) -> mGestureDetector.onTouchEvent(event);
 
         mHelpText = findViewById(R.id.helpText);
         mNoMatchingCardsText = findViewById(R.id.noMatchingCardsText);
+        mNoGroupCardsText = findViewById(R.id.noGroupCardsText);
         mCardList = findViewById(R.id.list);
 
         mHelpText.setOnTouchListener(gestureTouchListener);
         mNoMatchingCardsText.setOnTouchListener(gestureTouchListener);
         mCardList.setOnTouchListener(gestureTouchListener);
-
-        // Init card list
-        RecyclerView.LayoutManager mLayoutManager = new LinearLayoutManager(getApplicationContext());
-        mCardList.setLayoutManager(mLayoutManager);
-        mCardList.setItemAnimator(new DefaultItemAnimator());
+        mNoGroupCardsText.setOnTouchListener(gestureTouchListener);
 
         mAdapter = new LoyaltyCardCursorAdapter(this, null, this);
         mCardList.setAdapter(mAdapter);
         registerForContextMenu(mCardList);
 
-        updateLoyaltyCardList(mFilter, null);
+        mGroup = null;
+        updateLoyaltyCardList();
 
         /*
          * This was added for Huawei, but Huawei is just too much of a fucking pain.
@@ -293,13 +296,20 @@ public class MainActivity extends AppCompatActivity implements LoyaltyCardCursor
         TabLayout groupsTabLayout = findViewById(R.id.groups);
         updateTabGroups(groupsTabLayout);
 
-        // Restore active tab from Shared Preference
+        // Restore settings from Shared Preference
         SharedPreferences activeTabPref = getApplicationContext().getSharedPreferences(
                 getString(R.string.sharedpreference_active_tab),
                 Context.MODE_PRIVATE);
         selectedTab = activeTabPref.getInt(getString(R.string.sharedpreference_active_tab), 0);
+        SharedPreferences sortPref = getApplicationContext().getSharedPreferences(
+                getString(R.string.sharedpreference_sort),
+                Context.MODE_PRIVATE);
+        try {
+            mOrder = DBHelper.LoyaltyCardOrder.valueOf(sortPref.getString(getString(R.string.sharedpreference_sort_order), null));
+            mOrderDirection = DBHelper.LoyaltyCardOrderDirection.valueOf(sortPref.getString(getString(R.string.sharedpreference_sort_direction), null));
+        } catch (IllegalArgumentException | NullPointerException ignored) {}
 
-        Object group = null;
+        mGroup = null;
 
         if (groupsTabLayout.getTabCount() != 0) {
             TabLayout.Tab tab = groupsTabLayout.getTabAt(selectedTab);
@@ -309,9 +319,9 @@ public class MainActivity extends AppCompatActivity implements LoyaltyCardCursor
 
             groupsTabLayout.selectTab(tab);
             assert tab != null;
-            group = tab.getTag();
+            mGroup = tab.getTag();
         }
-        updateLoyaltyCardList(mFilter, group);
+        updateLoyaltyCardList();
         // End of active tab logic
 
         FloatingActionButton addButton = findViewById(R.id.fabAdd);
@@ -340,7 +350,7 @@ public class MainActivity extends AppCompatActivity implements LoyaltyCardCursor
                 MenuItem searchItem = mMenu.findItem(R.id.action_search);
                 searchItem.collapseActionView();
             }
-            recreate();
+            ActivityCompat.recreate(this);
 
             return;
         }
@@ -364,52 +374,50 @@ public class MainActivity extends AppCompatActivity implements LoyaltyCardCursor
     @Override
     public void onBackPressed()
     {
-        if (mMenu == null)
-        {
-            super.onBackPressed();
-            return;
-        }
+        if (mMenu != null) {
+            SearchView searchView = (SearchView) mMenu.findItem(R.id.action_search).getActionView();
 
-        SearchView searchView = (SearchView) mMenu.findItem(R.id.action_search).getActionView();
-
-        if (!searchView.isIconified())
-        {
-            searchView.setIconified(true);
-        } else {
-            TabLayout groupsTabLayout = findViewById(R.id.groups);
-
-            if (groupsTabLayout.getVisibility() == View.VISIBLE && selectedTab != 0) {
-                selectedTab = 0;
-                groupsTabLayout.selectTab(groupsTabLayout.getTabAt(0));
-            } else {
-                super.onBackPressed();
+            if (!searchView.isIconified()) {
+                searchView.setIconified(true);
+                return;
             }
         }
+
+        super.onBackPressed();
     }
 
-    private void updateLoyaltyCardList(String filterText, Object tag)
-    {
+    private void updateLoyaltyCardList() {
         Group group = null;
-        if (tag != null) {
-            group = (Group) tag;
+        if (mGroup != null) {
+            group = (Group) mGroup;
         }
 
-        mAdapter.swapCursor(mDB.getLoyaltyCardCursor(filterText, group));
+        mAdapter.swapCursor(mDB.getLoyaltyCardCursor(mFilter, group, mOrder, mOrderDirection));
 
         if(mDB.getLoyaltyCardCount() > 0)
         {
             // We want the cardList to be visible regardless of the filtered match count
             // to ensure that the noMatchingCardsText doesn't end up being shown below
             // the keyboard
-            mCardList.setVisibility(View.VISIBLE);
             mHelpText.setVisibility(View.GONE);
+            mNoGroupCardsText.setVisibility(View.GONE);
             if(mAdapter.getItemCount() > 0)
             {
+                mCardList.setVisibility(View.VISIBLE);
                 mNoMatchingCardsText.setVisibility(View.GONE);
             }
             else
             {
-                mNoMatchingCardsText.setVisibility(View.VISIBLE);
+                mCardList.setVisibility(View.GONE);
+                if (!mFilter.isEmpty()) {
+                    // Actual Empty Search Result
+                    mNoMatchingCardsText.setVisibility(View.VISIBLE);
+                    mNoGroupCardsText.setVisibility(View.GONE);
+                } else {
+                    // Group Tab with no Group Cards
+                    mNoMatchingCardsText.setVisibility(View.GONE);
+                    mNoGroupCardsText.setVisibility(View.VISIBLE);
+                }
             }
         }
         else
@@ -417,6 +425,7 @@ public class MainActivity extends AppCompatActivity implements LoyaltyCardCursor
             mCardList.setVisibility(View.GONE);
             mHelpText.setVisibility(View.VISIBLE);
             mNoMatchingCardsText.setVisibility(View.GONE);
+            mNoGroupCardsText.setVisibility(View.GONE);
         }
 
         if (mCurrentActionMode != null) {
@@ -453,14 +462,6 @@ public class MainActivity extends AppCompatActivity implements LoyaltyCardCursor
         groupsTabLayout.setVisibility(View.VISIBLE);
     }
 
-    private void openPrivacyPolicy() {
-        Intent browserIntent = new Intent(
-                Intent.ACTION_VIEW,
-                Uri.parse("https://catima.app/privacy-policy")
-        );
-        startActivity(browserIntent);
-    }
-
     @Override
     public boolean onCreateOptionsMenu(Menu inputMenu)
     {
@@ -495,11 +496,9 @@ public class MainActivity extends AppCompatActivity implements LoyaltyCardCursor
 
                     TabLayout groupsTabLayout = findViewById(R.id.groups);
                     TabLayout.Tab currentTab = groupsTabLayout.getTabAt(groupsTabLayout.getSelectedTabPosition());
+                    mGroup = currentTab != null ? currentTab.getTag() : null;
 
-                    updateLoyaltyCardList(
-                        mFilter,
-                        currentTab != null ? currentTab.getTag() : null
-                    );
+                    updateLoyaltyCardList();
 
                     return true;
                 }
@@ -513,6 +512,47 @@ public class MainActivity extends AppCompatActivity implements LoyaltyCardCursor
     {
         int id = inputItem.getItemId();
 
+        if (id == R.id.action_sort)
+        {
+            TabLayout.Tab tab = ((TabLayout) findViewById(R.id.groups)).getTabAt(selectedTab);
+            AtomicInteger currentIndex = new AtomicInteger();
+            List<DBHelper.LoyaltyCardOrder> loyaltyCardOrders = Arrays.asList(DBHelper.LoyaltyCardOrder.values());
+            for (int i = 0; i < loyaltyCardOrders.size(); i++) {
+                if (mOrder == loyaltyCardOrders.get(i)) {
+                    currentIndex.set(i);
+                    break;
+                }
+            }
+
+            AlertDialog.Builder builder = new AlertDialog.Builder(MainActivity.this);
+            builder.setTitle(R.string.sort_by);
+
+            final View customLayout = getLayoutInflater().inflate(R.layout.sorting_option, null);
+            builder.setView(customLayout);
+
+            CheckBox ch = (CheckBox) customLayout.findViewById(R.id.checkBox_reverse);
+            ch.setChecked(mOrderDirection == DBHelper.LoyaltyCardOrderDirection.Descending);
+
+            builder.setSingleChoiceItems(R.array.sort_types_array, currentIndex.get(), (dialog, which) -> currentIndex.set(which));
+
+            builder.setPositiveButton(R.string.sort, (dialog, which) -> {
+                if(ch.isChecked()) {
+                    setSort(loyaltyCardOrders.get(currentIndex.get()), DBHelper.LoyaltyCardOrderDirection.Descending);
+                }
+                else {
+                    setSort(loyaltyCardOrders.get(currentIndex.get()), DBHelper.LoyaltyCardOrderDirection.Ascending);
+                }
+                dialog.dismiss();
+            });
+
+            builder.setNegativeButton(R.string.cancel, (dialog, which) -> dialog.dismiss());
+
+            AlertDialog dialog = builder.create();
+            dialog.show();
+
+            return true;
+        }
+
         if (id == R.id.action_manage_groups)
         {
             Intent i = new Intent(getApplicationContext(), ManageGroupsActivity.class);
@@ -534,12 +574,6 @@ public class MainActivity extends AppCompatActivity implements LoyaltyCardCursor
             return true;
         }
 
-        if(id == R.id.action_privacy_policy)
-        {
-            openPrivacyPolicy();
-            return true;
-        }
-
         if (id == R.id.action_about)
         {
             Intent i = new Intent(getApplicationContext(), AboutActivity.class);
@@ -550,6 +584,24 @@ public class MainActivity extends AppCompatActivity implements LoyaltyCardCursor
         return super.onOptionsItemSelected(inputItem);
     }
 
+    private void setSort(DBHelper.LoyaltyCardOrder order, DBHelper.LoyaltyCardOrderDirection direction) {
+        // Update values
+        mOrder = order;
+        mOrderDirection = direction;
+
+        // Store in Shared Preference to restore next app launch
+        SharedPreferences sortPref = getApplicationContext().getSharedPreferences(
+                getString(R.string.sharedpreference_sort),
+                Context.MODE_PRIVATE);
+        SharedPreferences.Editor sortPrefEditor = sortPref.edit();
+        sortPrefEditor.putString(getString(R.string.sharedpreference_sort_order), order.name());
+        sortPrefEditor.putString(getString(R.string.sharedpreference_sort_direction), direction.name());
+        sortPrefEditor.apply();
+
+        // Update card list
+        updateLoyaltyCardList();
+    }
+
     protected static boolean isDarkModeEnabled(Context inputContext)
     {
         Configuration config = inputContext.getResources().getConfiguration();
@@ -582,6 +634,12 @@ public class MainActivity extends AppCompatActivity implements LoyaltyCardCursor
 
     }
 
+    @Override
+    public boolean dispatchTouchEvent(MotionEvent ev) {
+        mGestureDetector.onTouchEvent(ev);
+        return super.dispatchTouchEvent(ev);
+    }
+
     @Override
     public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX, float velocityY) {
         Log.d(TAG, "On fling");
@@ -597,9 +655,10 @@ public class MainActivity extends AppCompatActivity implements LoyaltyCardCursor
         }
 
         Integer currentTab = groupsTabLayout.getSelectedTabPosition();
-
+        Log.d("onFling","Current Tab "+currentTab);
         // Swipe right
         if (velocityX < -150) {
+            Log.d("onFling","Right Swipe detected "+velocityX);
             Integer nextTab = currentTab + 1;
 
             if (nextTab == groupsTabLayout.getTabCount()) {
@@ -613,6 +672,7 @@ public class MainActivity extends AppCompatActivity implements LoyaltyCardCursor
 
         // Swipe left
         if (velocityX > 150) {
+            Log.d("onFling","Left Swipe detected "+velocityX);
             Integer nextTab = currentTab - 1;
 
             if (nextTab < 0) {
@@ -665,16 +725,6 @@ public class MainActivity extends AppCompatActivity implements LoyaltyCardCursor
         }
     }
 
-    @Override
-    public void onIconClicked(int inputPosition)
-    {
-        if (mCurrentActionMode == null)
-        {
-            mCurrentActionMode = startSupportActionMode(mCurrentActionModeCallback);
-        }
-
-        toggleSelection(inputPosition);
-    }
 
     @Override
     public void onRowClicked(int inputPosition)
@@ -687,7 +737,21 @@ public class MainActivity extends AppCompatActivity implements LoyaltyCardCursor
         {
             Cursor selected = mAdapter.getCursor();
             selected.moveToPosition(inputPosition);
-            LoyaltyCard loyaltyCard = LoyaltyCard.toLoyaltyCard(selected);
+            // FIXME
+            //
+            // There is a really nasty edge case that can happen when someone taps a card but right
+            // after it swipes (very small window, hard to reproduce). The cursor gets replaced and
+            // may not have a card at the ID number that is returned from onRowClicked.
+            //
+            // The proper fix, obviously, would involve makes sure an onFling can't happen while a
+            // click is being processed. Sadly, I have not yet found a way to make that possible.
+            LoyaltyCard loyaltyCard;
+            try {
+                loyaltyCard = LoyaltyCard.toLoyaltyCard(selected);
+            } catch (CursorIndexOutOfBoundsException e) {
+                Log.w(TAG, "Prevented crash from tap + swipe on ID " + inputPosition + ": " + e);
+                return;
+            }
 
             Intent i = new Intent(this, LoyaltyCardViewActivity.class);
             i.setAction("");
@@ -695,9 +759,9 @@ public class MainActivity extends AppCompatActivity implements LoyaltyCardCursor
             b.putInt("id", loyaltyCard.id);
             i.putExtras(b);
 
-            ShortcutHelper.updateShortcuts(MainActivity.this, loyaltyCard, i);
+            ShortcutHelper.updateShortcuts(MainActivity.this, loyaltyCard);
 
             startActivityForResult(i, Utils.MAIN_REQUEST);
         }
     }
-}
+}

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

@@ -2,7 +2,6 @@ package protect.card_locker;
 
 import android.content.Context;
 import android.content.SharedPreferences;
-import android.database.Cursor;
 import android.os.Bundle;
 import android.text.InputType;
 import android.view.MenuItem;
@@ -17,13 +16,12 @@ import java.util.List;
 
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AlertDialog;
-import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
 import androidx.recyclerview.widget.DefaultItemAnimator;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
-public class ManageGroupsActivity extends AppCompatActivity implements GroupCursorAdapter.GroupAdapterListener
+public class ManageGroupsActivity extends CatimaAppCompatActivity implements GroupCursorAdapter.GroupAdapterListener
 {
     private static final String TAG = "Catima";
 
@@ -36,6 +34,7 @@ public class ManageGroupsActivity extends AppCompatActivity implements GroupCurs
     protected void onCreate(Bundle savedInstanceState)
     {
         super.onCreate(savedInstanceState);
+        setTitle(R.string.groups);
         setContentView(R.layout.manage_groups_activity);
         Toolbar toolbar = findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
@@ -111,7 +110,7 @@ public class ManageGroupsActivity extends AppCompatActivity implements GroupCurs
     }
 
     private void createGroup() {
-        AlertDialog.Builder builder = new AlertDialog.Builder(this);
+        AlertDialog.Builder builder = new AlertDialog.Builder(this,R.style.AlertDialogTheme);
         builder.setTitle(R.string.enter_group_name);
         final EditText input = new EditText(this);
         input.setInputType(InputType.TYPE_CLASS_TEXT);

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

@@ -9,6 +9,7 @@ import android.view.KeyEvent;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
+import android.widget.Toast;
 
 import com.google.zxing.ResultPoint;
 import com.google.zxing.client.android.Intents;
@@ -20,7 +21,6 @@ import com.journeyapps.barcodescanner.DecoratedBarcodeView;
 import java.util.List;
 
 import androidx.appcompat.app.ActionBar;
-import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
 
 /**
@@ -29,7 +29,7 @@ import androidx.appcompat.widget.Toolbar;
  * Based on https://github.com/journeyapps/zxing-android-embedded/blob/0fdfbce9fb3285e985bad9971c5f7c0a7a334e7b/sample/src/main/java/example/zxing/CustomScannerActivity.java
  * originally licensed under Apache 2.0
  */
-public class ScanActivity extends AppCompatActivity {
+public class ScanActivity extends CatimaAppCompatActivity {
     private static final String TAG = "Catima";
 
     private CaptureManager capture;
@@ -49,6 +49,7 @@ public class ScanActivity extends AppCompatActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        setTitle(R.string.scanCardBarcode);
         setContentView(R.layout.scan_activity);
         Toolbar toolbar = findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
@@ -67,7 +68,7 @@ public class ScanActivity extends AppCompatActivity {
 
         // Even though we do the actual decoding with the barcodeScannerView
         // CaptureManager needs to be running to show the camera and scanning bar
-        capture = new CaptureManager(this, barcodeScannerView);
+        capture = new CatimaCaptureManager(this, barcodeScannerView);
         Intent captureIntent = new Intent();
         Bundle captureIntentBundle = new Bundle();
         captureIntentBundle.putBoolean(Intents.Scan.BEEP_ENABLED, false);
@@ -80,7 +81,7 @@ public class ScanActivity extends AppCompatActivity {
                 Intent scanResult = new Intent();
                 Bundle scanResultBundle = new Bundle();
                 scanResultBundle.putString(BarcodeSelectorActivity.BARCODE_CONTENTS, result.getText());
-                scanResultBundle.putString(BarcodeSelectorActivity.BARCODE_FORMAT, result.getBarcodeFormat().toString());
+                scanResultBundle.putString(BarcodeSelectorActivity.BARCODE_FORMAT, result.getBarcodeFormat().name());
                 if (addGroup != null) {
                     scanResultBundle.putString(LoyaltyCardEditActivity.BUNDLE_ADDGROUP, addGroup);
                 }
@@ -145,8 +146,7 @@ public class ScanActivity extends AppCompatActivity {
             setResult(Activity.RESULT_CANCELED);
             finish();
             return true;
-        } else if (item.getItemId() == R.id.action_toggle_flashlight)
-        {
+        } else if (item.getItemId() == R.id.action_toggle_flashlight) {
             if (torch) {
                 torch = false;
                 barcodeScannerView.setTorchOff();
@@ -168,7 +168,14 @@ public class ScanActivity extends AppCompatActivity {
     {
         super.onActivityResult(requestCode, resultCode, intent);
 
-        BarcodeValues barcodeValues = Utils.parseSetBarcodeActivityResult(requestCode, resultCode, intent, this);
+        BarcodeValues barcodeValues;
+
+        try {
+            barcodeValues = Utils.parseSetBarcodeActivityResult(requestCode, resultCode, intent, this);
+        } catch (NullPointerException e) {
+            Toast.makeText(this, R.string.errorReadingImage, Toast.LENGTH_LONG).show();
+            return;
+        }
 
         if (!barcodeValues.isEmpty()) {
             Intent manualResult = new Intent();

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

@@ -1,19 +1,19 @@
 package protect.card_locker;
 
-import android.annotation.TargetApi;
 import android.content.Context;
 import android.content.Intent;
-import android.content.pm.ShortcutInfo;
-import android.content.pm.ShortcutManager;
 import android.graphics.Bitmap;
-import android.graphics.drawable.Icon;
-import android.os.Build;
+import android.os.Bundle;
 
 import java.util.Collections;
 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.drawable.IconCompat;
+
 class ShortcutHelper
 {
     // Android documentation says that no more than 5 shortcuts
@@ -30,135 +30,113 @@ class ShortcutHelper
      * card exceeds the max number of shortcuts, then the least recently
      * used card shortcut is discarded.
      */
-    @TargetApi(25)
-    static void updateShortcuts(Context context, LoyaltyCard card, Intent intent)
+    static void updateShortcuts(Context context, LoyaltyCard card)
     {
-        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.N_MR1)
+        LinkedList<ShortcutInfoCompat> list = new LinkedList<>(ShortcutManagerCompat.getDynamicShortcuts(context));
+
+        DBHelper dbHelper = new DBHelper(context);
+
+        String shortcutId = Integer.toString(card.id);
+
+        // Sort the shortcuts by rank, so working with the relative order will be easier.
+        // This sorts so that the lowest rank is first.
+        Collections.sort(list, Comparator.comparingInt(ShortcutInfoCompat::getRank));
+
+        Integer foundIndex = null;
+
+        for(int index = 0; index < list.size(); index++)
         {
-            ShortcutManager shortcutManager = context.getSystemService(ShortcutManager.class);
-            LinkedList<ShortcutInfo> list = new LinkedList<>(shortcutManager.getDynamicShortcuts());
-
-            DBHelper dbHelper = new DBHelper(context);
-
-            String shortcutId = Integer.toString(card.id);
-
-            // Sort the shortcuts by rank, so working with the relative order will be easier.
-            // This sorts so that the lowest rank is first.
-            Collections.sort(list, new Comparator<ShortcutInfo>()
+            if(list.get(index).getId().equals(shortcutId))
             {
-                @Override
-                public int compare(ShortcutInfo o1, ShortcutInfo o2)
-                {
-                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1)
-                    {
-                        return o1.getRank() - o2.getRank();
-                    }
-                    else
-                    {
-                        return 0;
-                    }
-                }
-            });
+                // Found the item already
+                foundIndex = index;
+                break;
+            }
+        }
 
-            Integer foundIndex = null;
-
-            for(int index = 0; index < list.size(); index++)
+        if(foundIndex != null)
+        {
+            // If the item is already found, then the list needs to be
+            // reordered, so that the selected item now has the lowest
+            // rank, thus letting it survive longer.
+            ShortcutInfoCompat found = list.remove(foundIndex.intValue());
+            list.addFirst(found);
+        }
+        else
+        {
+            // The item is new to the list. First, we need to trim the list
+            // until it is able to accept a new item, then the item is
+            // inserted.
+            while(list.size() >= MAX_SHORTCUTS)
             {
-                if(list.get(index).getId().equals(shortcutId))
-                {
-                    // Found the item already
-                    foundIndex = index;
-                    break;
-                }
+                list.pollLast();
             }
 
-            if(foundIndex != null)
-            {
-                // If the item is already found, then the list needs to be
-                // reordered, so that the selected item now has the lowest
-                // rank, thus letting it survive longer.
-                ShortcutInfo found = list.remove(foundIndex.intValue());
-                list.addFirst(found);
-            }
-            else
-            {
-                // The item is new to the list. First, we need to trim the list
-                // until it is able to accept a new item, then the item is
-                // inserted.
-                while(list.size() >= MAX_SHORTCUTS)
-                {
-                    list.pollLast();
-                }
+            ShortcutInfoCompat shortcut = createShortcutBuilder(context, card).build();
 
-                ShortcutInfo shortcut = new ShortcutInfo.Builder(context, Integer.toString(card.id))
-                    .setShortLabel(card.store)
-                    .setLongLabel(card.store)
-                    .setIntent(intent)
-                    .build();
+            list.addFirst(shortcut);
+        }
 
-                list.addFirst(shortcut);
-            }
+        LinkedList<ShortcutInfoCompat> finalList = new LinkedList<>();
 
-            LinkedList<ShortcutInfo> finalList = new LinkedList<>();
+        // The ranks are now updated; the order in the list is the rank.
+        for(int index = 0; index < list.size(); index++)
+        {
+            ShortcutInfoCompat prevShortcut = list.get(index);
 
-            // The ranks are now updated; the order in the list is the rank.
-            for(int index = 0; index < list.size(); index++)
-            {
-                ShortcutInfo prevShortcut = list.get(index);
+            LoyaltyCard loyaltyCard = dbHelper.getLoyaltyCard(Integer.parseInt(prevShortcut.getId()));
 
-                Intent shortcutIntent = prevShortcut.getIntent();
-
-                Bitmap iconBitmap = Utils.generateIcon(context, dbHelper.getLoyaltyCard(Integer.parseInt(prevShortcut.getId())), true).getLetterTile();
-                Icon icon;
-                if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O) {
-                    icon = Icon.createWithAdaptiveBitmap(iconBitmap);
-                } else {
-                    icon = Icon.createWithBitmap(iconBitmap);
-                }
-
-                // Prevent instances of the view activity from piling up; if one exists let this
-                // one replace it.
-                shortcutIntent.setFlags(shortcutIntent.getFlags() | Intent.FLAG_ACTIVITY_SINGLE_TOP);
-
-                ShortcutInfo updatedShortcut = new ShortcutInfo.Builder(context, prevShortcut.getId())
-                        .setShortLabel(prevShortcut.getShortLabel())
-                        .setLongLabel(prevShortcut.getLongLabel())
-                        .setIntent(shortcutIntent)
-                        .setIcon(icon)
+            ShortcutInfoCompat updatedShortcut = createShortcutBuilder(context, loyaltyCard)
                         .setRank(index)
                         .build();
 
-                finalList.addLast(updatedShortcut);
-            }
-
-            shortcutManager.setDynamicShortcuts(finalList);
+            finalList.addLast(updatedShortcut);
         }
+
+        ShortcutManagerCompat.setDynamicShortcuts(context, finalList);
     }
 
     /**
      * Remove the given card id from the app shortcuts, if such a
      * shortcut exists.
      */
-    @TargetApi(25)
     static void removeShortcut(Context context, int cardId)
     {
-        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.N_MR1)
+        List<ShortcutInfoCompat> list = ShortcutManagerCompat.getDynamicShortcuts(context);
+
+        String shortcutId = Integer.toString(cardId);
+
+        for(int index = 0; index < list.size(); index++)
         {
-            ShortcutManager shortcutManager = context.getSystemService(ShortcutManager.class);
-            List<ShortcutInfo> list = shortcutManager.getDynamicShortcuts();
-
-            String shortcutId = Integer.toString(cardId);
-
-            for(int index = 0; index < list.size(); index++)
+            if(list.get(index).getId().equals(shortcutId))
             {
-                if(list.get(index).getId().equals(shortcutId))
-                {
-                    list.remove(index);
-                    break;
-                }
+                list.remove(index);
+                break;
             }
-
-            shortcutManager.setDynamicShortcuts(list);
         }
+
+        ShortcutManagerCompat.setDynamicShortcuts(context, list);
+    }
+
+    static ShortcutInfoCompat.Builder createShortcutBuilder(Context context, LoyaltyCard loyaltyCard) {
+        Intent intent = new Intent(context, LoyaltyCardViewActivity.class);
+        intent.setAction(Intent.ACTION_MAIN);
+        // Prevent instances of the view activity from piling up; if one exists let this
+        // one replace it.
+        intent.setFlags(intent.getFlags() | Intent.FLAG_ACTIVITY_SINGLE_TOP);
+        final Bundle bundle = new Bundle();
+        bundle.putInt("id", loyaltyCard.id);
+        bundle.putBoolean("view", true);
+        intent.putExtras(bundle);
+
+        Bitmap iconBitmap = Utils.generateIcon(context, loyaltyCard, true).getLetterTile();
+
+        IconCompat icon = IconCompat.createWithAdaptiveBitmap(iconBitmap);
+
+        return new ShortcutInfoCompat.Builder(context, Integer.toString(loyaltyCard.id))
+                .setShortLabel(loyaltyCard.store)
+                .setLongLabel(loyaltyCard.store)
+                .setIntent(intent)
+                .setIcon(icon);
     }
 }

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

@@ -0,0 +1,15 @@
+package protect.card_locker;
+
+import android.text.Editable;
+import android.text.TextWatcher;
+
+public class SimpleTextWatcher implements TextWatcher {
+    @Override
+    public void beforeTextChanged(CharSequence s, int start, int count, int after) { }
+
+    @Override
+    public void onTextChanged(CharSequence s, int start, int before, int count) { }
+
+    @Override
+    public void afterTextChanged(Editable s) { }
+}

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

@@ -3,11 +3,15 @@ package protect.card_locker;
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
+import android.content.res.Configuration;
+import android.content.res.Resources;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.Color;
+import android.graphics.ImageDecoder;
 import android.graphics.Matrix;
-import android.media.ExifInterface;
+import android.os.Build;
+import android.os.LocaleList;
 import android.provider.MediaStore;
 import android.util.Log;
 import android.widget.Toast;
@@ -31,9 +35,12 @@ import java.util.Calendar;
 import java.util.Currency;
 import java.util.Date;
 import java.util.GregorianCalendar;
-import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
 
 import androidx.core.graphics.ColorUtils;
+import androidx.exifinterface.media.ExifInterface;
+import protect.card_locker.preferences.Settings;
 
 public class Utils {
     private static final String TAG = "Catima";
@@ -99,7 +106,12 @@ public class Utils {
 
             Bitmap bitmap;
             try {
-                bitmap = MediaStore.Images.Media.getBitmap(context.getContentResolver(), intent.getData());
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+                    ImageDecoder.Source image_source = ImageDecoder.createSource(context.getContentResolver(), intent.getData());
+                    bitmap = ImageDecoder.decodeBitmap(image_source, (decoder, info, source) -> decoder.setMutableRequired(true));
+                } else {
+                    bitmap = MediaStore.Images.Media.getBitmap(context.getContentResolver(), intent.getData());
+                }
             } catch (IOException e) {
                 Log.e(TAG, "Error getting data from image file");
                 e.printStackTrace();
@@ -140,6 +152,21 @@ public class Utils {
     }
 
     static public BarcodeValues getBarcodeFromBitmap(Bitmap bitmap) {
+        // This function is vulnerable to OOM, so we try again with a smaller bitmap is we get OOM
+        for (int i = 0; i < 10; i++) {
+            try {
+                return Utils.getBarcodeFromBitmapReal(bitmap);
+            } catch (OutOfMemoryError e) {
+                Log.w(TAG, "Ran OOM in getBarcodeFromBitmap! Trying again with smaller picture! Retry " + i + " of 10.");
+                bitmap = Bitmap.createScaledBitmap(bitmap, (int) Math.round(0.75 * bitmap.getWidth()), (int) Math.round(0.75 * bitmap.getHeight()), false);
+            }
+        }
+
+        // Give up
+        return new BarcodeValues(null, null);
+    }
+
+    static private BarcodeValues getBarcodeFromBitmapReal(Bitmap bitmap) {
         // In order to decode it, the Bitmap must first be converted into a pixel array...
         int[] intArray = new int[bitmap.getWidth() * bitmap.getHeight()];
         bitmap.getPixels(intArray, 0, bitmap.getWidth(), 0, 0, bitmap.getWidth(), bitmap.getHeight());
@@ -332,15 +359,46 @@ public class Utils {
         return retrieveCardImage(context, getCardImageFileName(loyaltyCardId, front));
     }
 
-    static public Object hashmapGetOrDefault(HashMap hashMap, Object key, Object defaultValue, Class keyType) {
-        Object value = hashMap.get(keyType.cast(key));
+    static public <T,U> U mapGetOrDefault(Map<T,U> map, T key, U defaultValue) {
+        U value = map.get(key);
         if (value == null) {
             return defaultValue;
         }
         return value;
     }
 
-    static public Object hashmapGetOrDefault(HashMap hashMap, String key, Object defaultValue) {
-        return hashmapGetOrDefault(hashMap, key, defaultValue, String.class);
+    static public Locale stringToLocale(String localeString) {
+        String[] localeParts = localeString.split("-");
+        if (localeParts.length == 1) {
+            return new Locale(localeParts[0]);
+        }
+
+        if (localeParts[1].startsWith("r")) {
+            localeParts[1] = localeParts[1].substring(1);
+        }
+        return new Locale(localeParts[0], localeParts[1]);
+    }
+
+    static public Context updateBaseContextLocale(Context context) {
+        Settings settings = new Settings(context);
+
+        Locale chosenLocale = settings.getLocale();
+
+        Resources res = context.getResources();
+        Configuration configuration = res.getConfiguration();
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) {
+            configuration.locale = chosenLocale != null ? chosenLocale : Locale.getDefault();
+            res.updateConfiguration(configuration, res.getDisplayMetrics());
+            return context;
+        }
+
+        LocaleList localeList = chosenLocale != null ? new LocaleList(chosenLocale) : LocaleList.getDefault();
+        LocaleList.setDefault(localeList);
+        configuration.setLocales(localeList);
+        return context.createConfigurationContext(configuration);
+    }
+
+    static public long getUnixTime() {
+        return System.currentTimeMillis() / 1000;
     }
 }

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

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

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

@@ -0,0 +1,174 @@
+package protect.card_locker.async;
+
+import android.os.Handler;
+import android.os.Looper;
+
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * AsyncTask has been deprecated so this provides very rudimentary compatibility without
+ * needing to redo too many Parts.
+ *
+ * However this is a much, much more cooperative Behaviour than before so
+ * the callers need to ensure we do NOT rely on forced cancellation and feed less into the
+ * ThreadPools so we don't OOM/Overload the Users device
+ *
+ * This assumes single-threaded callers.
+ */
+public class TaskHandler {
+
+    public enum TYPE {
+        BARCODE,
+        IMPORT,
+        EXPORT
+    }
+
+    HashMap<TYPE, ThreadPoolExecutor> executors = generateExecutors();
+
+    final private HashMap<TYPE, LinkedList<Future<?>>> taskList = new HashMap<>();
+
+    private final Handler uiHandler = new Handler(Looper.getMainLooper());
+
+    private HashMap<TYPE, ThreadPoolExecutor> generateExecutors() {
+        HashMap<TYPE, ThreadPoolExecutor> initExecutors = new HashMap<>();
+        for (TYPE type : TYPE.values()) {
+            replaceExecutor(initExecutors, type, false, false);
+        }
+        return initExecutors;
+    }
+
+    /**
+     * Replaces (or initializes) an Executor with a clean (new) one
+     * @param executors Map Reference
+     * @param type Which Queue
+     * @param flushOld attempt shutdown
+     * @param waitOnOld wait for Termination
+     */
+    private void replaceExecutor(HashMap<TYPE, ThreadPoolExecutor> executors, TYPE type, Boolean flushOld, Boolean waitOnOld) {
+        ThreadPoolExecutor oldExecutor = executors.get(type);
+        if (oldExecutor != null) {
+            if (flushOld) {
+                oldExecutor.shutdownNow();
+            }
+            if (waitOnOld) {
+                try {
+                    //noinspection ResultOfMethodCallIgnored
+                    oldExecutor.awaitTermination(5, TimeUnit.SECONDS);
+                } catch (InterruptedException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+        executors.put(type, (ThreadPoolExecutor) Executors.newCachedThreadPool());
+    }
+
+    /**
+     * Queue a Pseudo-AsyncTask for execution
+     *
+     * @param type     Queue
+     * @param callable PseudoAsyncTask
+     */
+    public void executeTask(TYPE type, CompatCallable<?> callable) {
+        Runnable runner = () -> {
+            try {
+                // Run on the UI Thread
+                uiHandler.post(callable::onPreExecute);
+
+                // Background
+                final Object result = callable.call();
+
+                // Post results on UI Thread so we can show them
+                uiHandler.post(() -> {
+                    callable.onPostExecute(result);
+                });
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        };
+
+        LinkedList<Future<?>> list = taskList.get(type);
+
+        if (list == null) {
+            list = new LinkedList<>();
+        }
+
+        ThreadPoolExecutor executor = executors.get(type);
+
+        if (executor != null) {
+            Future<?> task = executor.submit(runner);
+            // Test Queue Cancellation:
+            // task.cancel(true);
+            list.push(task);
+            taskList.put(type, list);
+        }
+    }
+
+    /**
+     * This will attempt to cancel a currently running list of Tasks
+     * Useful to ignore scheduled tasks - but not able to hard-stop tasks that are running
+     *
+     * @param type                    Which Queue to target
+     * @param forceCancel             attempt to close the Queue and force-replace it after
+     * @param waitForFinish           wait and return after the old executor finished. Times out after 5s
+     * @param waitForCurrentlyRunning wait before cancelling tasks. Useful for tests.
+     */
+    public void flushTaskList(TYPE type, Boolean forceCancel, Boolean waitForFinish, Boolean waitForCurrentlyRunning) {
+        // Only used for Testing
+        if (waitForCurrentlyRunning) {
+            ThreadPoolExecutor oldExecutor = executors.get(type);
+
+            if (oldExecutor != null) {
+                try {
+                    //noinspection ResultOfMethodCallIgnored
+                    oldExecutor.awaitTermination(5, TimeUnit.SECONDS);
+                } catch (InterruptedException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+
+        // Attempt to cancel known Tasks and clean the List
+        LinkedList<Future<?>> tasks = taskList.get(type);
+        if (tasks != null) {
+            for (Future<?> task : tasks) {
+                if (!task.isDone() || !task.isCancelled()) {
+                    // Interrupt any Task we can
+                    task.cancel(true);
+                }
+            }
+        }
+        tasks = new LinkedList<>();
+        taskList.put(type, tasks);
+
+        if (forceCancel || waitForFinish) {
+            ThreadPoolExecutor oldExecutor = executors.get(type);
+
+            if (oldExecutor != null) {
+                if (forceCancel) {
+                    if (waitForFinish) {
+                        try {
+                            //noinspection ResultOfMethodCallIgnored
+                            oldExecutor.awaitTermination(5, TimeUnit.SECONDS);
+                        } catch (InterruptedException e) {
+                            e.printStackTrace();
+                        }
+                    }
+                    oldExecutor.shutdownNow();
+                    replaceExecutor(executors, type, true, false);
+                } else {
+                    try {
+                        //noinspection ResultOfMethodCallIgnored
+                        oldExecutor.awaitTermination(5, TimeUnit.SECONDS);
+                    } catch (InterruptedException e) {
+                        e.printStackTrace();
+                    }
+                }
+            }
+        }
+    }
+}

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

@@ -6,6 +6,7 @@ import android.graphics.Bitmap;
 
 import net.lingala.zip4j.io.outputstream.ZipOutputStream;
 import net.lingala.zip4j.model.ZipParameters;
+import net.lingala.zip4j.model.enums.EncryptionMethod;
 import net.lingala.zip4j.util.InternalZipConstants;
 
 import org.apache.commons.csv.CSVFormat;
@@ -30,14 +31,21 @@ import protect.card_locker.Utils;
  */
 public class CatimaExporter implements Exporter
 {
-    public void exportData(Context context, DBHelper db, OutputStream output) throws IOException, InterruptedException
+    public void exportData(Context context, DBHelper db, OutputStream output,char[] password) throws IOException, InterruptedException
     {
         // Necessary vars
         int readLen;
         byte[] readBuffer = new byte[InternalZipConstants.BUFF_SIZE];
 
         // Create zip output stream
-        ZipOutputStream zipOutputStream = new ZipOutputStream(output);
+        ZipOutputStream zipOutputStream;
+
+        if(password!=null && password.length>0){
+            zipOutputStream = new ZipOutputStream(output,password);
+        }
+        else{
+            zipOutputStream = new ZipOutputStream(output);
+        }
 
         // Generate CSV
         ByteArrayOutputStream catimaOutputStream = new ByteArrayOutputStream();
@@ -45,8 +53,7 @@ public class CatimaExporter implements Exporter
         writeCSV(db, catimaOutputStreamWriter);
 
         // Add CSV to zip file
-        ZipParameters csvZipParameters = new ZipParameters();
-        csvZipParameters.setFileNameInZip("catima.csv");
+        ZipParameters csvZipParameters = createZipParameters("catima.csv",password);
         zipOutputStream.putNextEntry(csvZipParameters);
         InputStream csvInputStream = new ByteArrayInputStream(catimaOutputStream.toByteArray());
         while ((readLen = csvInputStream.read(readBuffer)) != -1) {
@@ -71,8 +78,7 @@ public class CatimaExporter implements Exporter
                 // If it exists, add to the .zip file
                 Bitmap image = Utils.retrieveCardImage(context, card.id, front);
                 if (image != null) {
-                    ZipParameters imageZipParameters = new ZipParameters();
-                    imageZipParameters.setFileNameInZip(Utils.getCardImageFileName(card.id, front));
+                    ZipParameters imageZipParameters = createZipParameters(Utils.getCardImageFileName(card.id, front),password);
                     zipOutputStream.putNextEntry(imageZipParameters);
                     InputStream imageInputStream = new ByteArrayInputStream(Utils.bitmapToByteArray(image));
                     while ((readLen = imageInputStream.read(readBuffer)) != -1) {
@@ -86,6 +92,16 @@ public class CatimaExporter implements Exporter
         zipOutputStream.close();
     }
 
+    private ZipParameters createZipParameters(String fileName, char[] password){
+        ZipParameters zipParameters = new ZipParameters();
+        zipParameters.setFileNameInZip(fileName);
+        if(password!=null && password.length>0){
+            zipParameters.setEncryptFiles(true);
+            zipParameters.setEncryptionMethod(EncryptionMethod.AES);
+        }
+        return zipParameters;
+    }
+
     private void writeCSV(DBHelper db, OutputStreamWriter output) throws IOException, InterruptedException {
         CSVPrinter printer = new CSVPrinter(output, CSVFormat.RFC4180);
 
@@ -127,7 +143,8 @@ public class CatimaExporter implements Exporter
                 DBHelper.LoyaltyCardDbIds.BARCODE_ID,
                 DBHelper.LoyaltyCardDbIds.BARCODE_TYPE,
                 DBHelper.LoyaltyCardDbIds.HEADER_COLOR,
-                DBHelper.LoyaltyCardDbIds.STAR_STATUS);
+                DBHelper.LoyaltyCardDbIds.STAR_STATUS,
+                DBHelper.LoyaltyCardDbIds.LAST_USED);
 
         Cursor cardCursor = db.getLoyaltyCardCursor();
 
@@ -143,9 +160,10 @@ public class CatimaExporter implements Exporter
                     card.balanceType,
                     card.cardId,
                     card.barcodeId,
-                    card.barcodeType,
+                    card.barcodeType != null ? card.barcodeType.name() : "",
                     card.headerColor,
-                    card.starStatus);
+                    card.starStatus,
+                    card.lastUsed);
 
             if(Thread.currentThread().isInterrupted())
             {

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

@@ -2,6 +2,7 @@ package protect.card_locker.importexport;
 
 import android.content.Context;
 import android.database.sqlite.SQLiteDatabase;
+import android.net.Uri;
 
 import com.google.zxing.BarcodeFormat;
 
@@ -26,6 +27,7 @@ import java.util.Currency;
 import java.util.Date;
 import java.util.List;
 
+import protect.card_locker.CatimaBarcode;
 import protect.card_locker.DBHelper;
 import protect.card_locker.FormatException;
 import protect.card_locker.Group;
@@ -46,25 +48,28 @@ public class CatimaImporter implements Importer
         bufferedInputStream.mark(100);
 
         // First, check if this is a zip file
-        ZipInputStream zipInputStream = new ZipInputStream(bufferedInputStream);
-        LocalFileHeader localFileHeader = zipInputStream.getNextEntry();
+        ZipInputStream zipInputStream = new ZipInputStream(bufferedInputStream,password);
 
-        if (localFileHeader == null) {
+        boolean isZipFile = false;
+
+        LocalFileHeader localFileHeader;
+        while ((localFileHeader = zipInputStream.getNextEntry()) != null) {
+            isZipFile = true;
+
+            String fileName = Uri.parse(localFileHeader.getFileName()).getLastPathSegment();
+            if (fileName.equals("catima.csv")) {
+                importCSV(context, db, new ByteArrayInputStream(ZipUtils.read(zipInputStream).getBytes(StandardCharsets.UTF_8)));
+            } else if (fileName.endsWith(".png")) {
+                Utils.saveCardImage(context, ZipUtils.readImage(zipInputStream), fileName);
+            } else {
+                throw new FormatException("Unexpected file in import: " + fileName);
+            }
+        }
+
+        if (!isZipFile) {
             // This is not a zip file, try importing as bare CSV
             bufferedInputStream.reset();
             importCSV(context, db, bufferedInputStream);
-            return;
-        }
-
-        importZipFile(context, db, zipInputStream, localFileHeader);
-    }
-
-    public void importZipFile(Context context, DBHelper db, ZipInputStream input, LocalFileHeader localFileHeader) throws IOException, FormatException, InterruptedException {
-        String fileName = localFileHeader.getFileName();
-        if (fileName.equals("catima.csv")) {
-            importCSV(context, db, new ByteArrayInputStream(ZipUtils.read(input).getBytes(StandardCharsets.UTF_8)));
-        } else {
-            Utils.saveCardImage(context, ZipUtils.readImage(input), fileName);
         }
     }
 
@@ -99,7 +104,7 @@ public class CatimaImporter implements Importer
 
     public void parseV1(Context context, DBHelper db, BufferedReader input) throws IOException, FormatException, InterruptedException
     {
-        final CSVParser parser = new CSVParser(input, CSVFormat.RFC4180.withHeader());
+        final CSVParser parser = new CSVParser(input, CSVFormat.RFC4180.builder().setHeader().build());
 
         SQLiteDatabase database = db.getWritableDatabase();
         database.beginTransaction();
@@ -204,7 +209,7 @@ public class CatimaImporter implements Importer
     public void parseV2Groups(DBHelper db, SQLiteDatabase database, String data) throws IOException, FormatException, InterruptedException
     {
         // Parse groups
-        final CSVParser groupParser = new CSVParser(new StringReader(data), CSVFormat.RFC4180.withHeader());
+        final CSVParser groupParser = new CSVParser(new StringReader(data), CSVFormat.RFC4180.builder().setHeader().build());
 
         List<CSVRecord> records = new ArrayList<>();
 
@@ -230,7 +235,7 @@ public class CatimaImporter implements Importer
     public void parseV2Cards(Context context, DBHelper db, SQLiteDatabase database, String data) throws IOException, FormatException, InterruptedException
     {
         // Parse cards
-        final CSVParser cardParser = new CSVParser(new StringReader(data), CSVFormat.RFC4180.withHeader());
+        final CSVParser cardParser = new CSVParser(new StringReader(data), CSVFormat.RFC4180.builder().setHeader().build());
 
         List<CSVRecord> records = new ArrayList<>();
 
@@ -256,7 +261,7 @@ public class CatimaImporter implements Importer
     public void parseV2CardGroups(DBHelper db, SQLiteDatabase database, String data) throws IOException, FormatException, InterruptedException
     {
         // Parse card group mappings
-        final CSVParser cardGroupParser = new CSVParser(new StringReader(data), CSVFormat.RFC4180.withHeader());
+        final CSVParser cardGroupParser = new CSVParser(new StringReader(data), CSVFormat.RFC4180.builder().setHeader().build());
 
         List<CSVRecord> records = new ArrayList<>();
 
@@ -327,11 +332,11 @@ public class CatimaImporter implements Importer
             barcodeId = null;
         }
 
-        BarcodeFormat barcodeType = null;
+        CatimaBarcode barcodeType = null;
         String unparsedBarcodeType = CSVHelpers.extractString(DBHelper.LoyaltyCardDbIds.BARCODE_TYPE, record, "");
         if(!unparsedBarcodeType.isEmpty())
         {
-            barcodeType = BarcodeFormat.valueOf(unparsedBarcodeType);
+            barcodeType = CatimaBarcode.fromName(unparsedBarcodeType);
         }
 
         Integer headerColor = null;
@@ -344,13 +349,21 @@ public class CatimaImporter implements Importer
         int starStatus = 0;
         try {
             starStatus = CSVHelpers.extractInt(DBHelper.LoyaltyCardDbIds.STAR_STATUS, record, false);
-        } catch (FormatException _e ) {
-            // This field did not exist in versions 0.278 and before
+        } catch (FormatException _e) {
+            // This field did not exist in versions 0.28 and before
             // We catch this exception so we can still import old backups
         }
         if (starStatus != 1) starStatus = 0;
 
-        helper.insertLoyaltyCard(database, id, store, note, expiry, balance, balanceType, cardId, barcodeId, barcodeType, headerColor, starStatus);
+        Long lastUsed = 0L;
+        try {
+            lastUsed = CSVHelpers.extractLong(DBHelper.LoyaltyCardDbIds.LAST_USED, record, false);
+        } catch (FormatException _e) {
+            // This field did not exist in versions 2.5.0 and before
+            // We catch this exception so we can still import old backups
+        }
+
+        helper.insertLoyaltyCard(database, id, store, note, expiry, balance, balanceType, cardId, barcodeId, barcodeType, headerColor, starStatus, lastUsed);
     }
 
     /**

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

@@ -17,5 +17,5 @@ public interface Exporter
      * Export the database to the output stream in a given format.
      * @throws IOException
      */
-    void exportData(Context context, DBHelper db, OutputStream output) throws IOException, InterruptedException;
+    void exportData(Context context, DBHelper db, OutputStream output,char[] password) throws IOException, InterruptedException;
 }

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

@@ -20,8 +20,10 @@ import java.math.BigDecimal;
 import java.nio.charset.StandardCharsets;
 import java.text.ParseException;
 
+import protect.card_locker.CatimaBarcode;
 import protect.card_locker.DBHelper;
 import protect.card_locker.FormatException;
+import protect.card_locker.Utils;
 
 /**
  * Class for importing a database from CSV (Comma Separate Values)
@@ -30,8 +32,7 @@ import protect.card_locker.FormatException;
  * The database's loyalty cards are expected to appear in the CSV data.
  * A header is expected for the each table showing the names of the columns.
  */
-public class FidmeImporter implements Importer
-{
+public class FidmeImporter implements Importer {
     public void importData(Context context, DBHelper db, InputStream input, char[] password) throws IOException, FormatException, JSONException, ParseException {
         // We actually retrieve a .zip file
         ZipInputStream zipInputStream = new ZipInputStream(input, password);
@@ -57,7 +58,7 @@ public class FidmeImporter implements Importer
         SQLiteDatabase database = db.getWritableDatabase();
         database.beginTransaction();
 
-        final CSVParser fidmeParser = new CSVParser(new StringReader(loyaltyCards.toString()), CSVFormat.RFC4180.withDelimiter(';').withHeader());
+        final CSVParser fidmeParser = new CSVParser(new StringReader(loyaltyCards.toString()), CSVFormat.RFC4180.builder().setDelimiter(';').setHeader().build());
 
         try {
             for (CSVRecord record : fidmeParser) {
@@ -85,8 +86,7 @@ public class FidmeImporter implements Importer
      * session.
      */
     private void importLoyaltyCard(SQLiteDatabase database, DBHelper helper, CSVRecord record)
-            throws IOException, FormatException
-    {
+            throws IOException, FormatException {
         // A loyalty card export from Fidme contains the following fields:
         // Retailer (store name)
         // Program (program name)
@@ -98,8 +98,7 @@ public class FidmeImporter implements Importer
         // The store is called Retailer
         String store = CSVHelpers.extractString("Retailer", record, "");
 
-        if (store.isEmpty())
-        {
+        if (store.isEmpty()) {
             throw new FormatException("No store listed, but is required");
         }
 
@@ -119,21 +118,20 @@ public class FidmeImporter implements Importer
 
         // The ID is called reference
         String cardId = CSVHelpers.extractString("Reference", record, "");
-        if(cardId.isEmpty())
-        {
+        if (cardId.isEmpty()) {
             throw new FormatException("No card ID listed, but is required");
         }
 
         // Sadly, Fidme exports don't contain the card type
         // I guess they have an online DB of all the different companies and what type they use
         // TODO: Hook this into our own loyalty card DB if we ever get one
-        BarcodeFormat barcodeType = null;
+        CatimaBarcode barcodeType = null;
 
         // No favourite data in the export either
         int starStatus = 0;
 
         // TODO: Front and back image
 
-        helper.insertLoyaltyCard(database, store, note, null, BigDecimal.valueOf(0), null, cardId, null, barcodeType, null, starStatus);
+        helper.insertLoyaltyCard(database, store, note, null, BigDecimal.valueOf(0), null, cardId, null, barcodeType, null, starStatus, null);
     }
 }

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

@@ -22,7 +22,7 @@ public class MultiFormatExporter
      * another ImportExportResult otherwise. If not Success, partial data may have been
      * written to the output stream, and it should be discarded.
      */
-    public static ImportExportResult exportData(Context context, DBHelper db, OutputStream output, DataFormat format)
+    public static ImportExportResult exportData(Context context, DBHelper db, OutputStream output, DataFormat format,char[] password)
     {
         Exporter exporter = null;
 
@@ -40,7 +40,7 @@ public class MultiFormatExporter
         {
             try
             {
-                exporter.exportData(context, db, output);
+                exporter.exportData(context, db, output,password);
                 return ImportExportResult.Success;
             }
             catch(IOException e)

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

@@ -23,6 +23,7 @@ import java.nio.charset.StandardCharsets;
 import java.text.ParseException;
 import java.util.HashMap;
 
+import protect.card_locker.CatimaBarcode;
 import protect.card_locker.DBHelper;
 import protect.card_locker.FormatException;
 import protect.card_locker.R;
@@ -42,7 +43,7 @@ public class StocardImporter implements Importer
         HashMap<String, HashMap<String, Object>> loyaltyCardHashMap = new HashMap<>();
         HashMap<String, HashMap<String, String>> providers = new HashMap<>();
 
-        final CSVParser parser = new CSVParser(new InputStreamReader(context.getResources().openRawResource(R.raw.stocard_stores), StandardCharsets.UTF_8), CSVFormat.RFC4180.withHeader());
+        final CSVParser parser = new CSVParser(new InputStreamReader(context.getResources().openRawResource(R.raw.stocard_stores), StandardCharsets.UTF_8), CSVFormat.RFC4180.builder().setHeader().build());
 
         try
         {
@@ -115,14 +116,14 @@ public class StocardImporter implements Importer
                                     .substring("/loyalty-card-providers/".length())
                         );
 
-                        try {
+                        if (jsonObject.has("input_barcode_format")) {
                             loyaltyCardHashMap = appendToLoyaltyCardHashMap(
                                     loyaltyCardHashMap,
                                     cardName,
                                     "barcodeType",
                                     jsonObject.getString("input_barcode_format")
                             );
-                        } catch (JSONException ignored) {}
+                        }
                     }
                 } else if (fileName.endsWith("notes/default.json")) {
                     loyaltyCardHashMap = appendToLoyaltyCardHashMap(
@@ -162,19 +163,19 @@ public class StocardImporter implements Importer
             HashMap<String, String> providerData = providers.get(providerId);
 
             String store = providerData != null ? providerData.get("name") : providerId;
-            String note = (String) Utils.hashmapGetOrDefault(loyaltyCardData, "note", "");
+            String note = (String) Utils.mapGetOrDefault(loyaltyCardData, "note", "");
             String cardId = (String) loyaltyCardData.get("cardId");
-            String barcodeTypeString = (String) Utils.hashmapGetOrDefault(loyaltyCardData, "barcodeType", providerData != null ? providerData.get("barcodeFormat") : null);
-            BarcodeFormat barcodeType = null;
+            String barcodeTypeString = (String) Utils.mapGetOrDefault(loyaltyCardData, "barcodeType", providerData != null ? providerData.get("barcodeFormat") : null);
+            CatimaBarcode barcodeType = null;
             if (barcodeTypeString != null) {
                 if (barcodeTypeString.equals("RSS_DATABAR_EXPANDED")) {
-                    barcodeType = BarcodeFormat.RSS_EXPANDED;
+                    barcodeType = CatimaBarcode.fromBarcode(BarcodeFormat.RSS_EXPANDED);
                 } else {
-                    barcodeType = BarcodeFormat.valueOf(barcodeTypeString);
+                    barcodeType = CatimaBarcode.fromName(barcodeTypeString);
                 }
             }
 
-            long loyaltyCardInternalId = db.insertLoyaltyCard(database, store, note, null, BigDecimal.valueOf(0), null, cardId, null, barcodeType, null, 0);
+            long loyaltyCardInternalId = db.insertLoyaltyCard(database, store, note, null, BigDecimal.valueOf(0), null, cardId, null, barcodeType, null, 0, null);
 
             if (loyaltyCardData.containsKey("frontImage")) {
                 Utils.saveCardImage(context, (Bitmap) loyaltyCardData.get("frontImage"), (int) loyaltyCardInternalId, true);

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

@@ -23,8 +23,10 @@ import java.util.Currency;
 import java.util.Date;
 import java.util.TimeZone;
 
+import protect.card_locker.CatimaBarcode;
 import protect.card_locker.DBHelper;
 import protect.card_locker.FormatException;
+import protect.card_locker.Utils;
 
 /**
  * Class for importing a database from CSV (Comma Separate Values)
@@ -74,24 +76,24 @@ public class VoucherVaultImporter implements Importer
 
             String cardId = jsonCard.getString("code");
 
-            BarcodeFormat barcodeType = null;
+            CatimaBarcode barcodeType = null;
 
             String codeTypeFromJSON = jsonCard.getString("codeType");
             switch (codeTypeFromJSON) {
                 case "CODE128":
-                    barcodeType = BarcodeFormat.CODE_128;
+                    barcodeType = CatimaBarcode.fromBarcode(BarcodeFormat.CODE_128);
                     break;
                 case "CODE39":
-                    barcodeType = BarcodeFormat.CODE_39;
+                    barcodeType = CatimaBarcode.fromBarcode(BarcodeFormat.CODE_39);
                     break;
                 case "EAN13":
-                    barcodeType = BarcodeFormat.EAN_13;
+                    barcodeType = CatimaBarcode.fromBarcode(BarcodeFormat.EAN_13);
                     break;
                 case "PDF417":
-                    barcodeType = BarcodeFormat.PDF_417;
+                    barcodeType = CatimaBarcode.fromBarcode(BarcodeFormat.PDF_417);
                     break;
                 case "QR":
-                    barcodeType = BarcodeFormat.QR_CODE;
+                    barcodeType = CatimaBarcode.fromBarcode(BarcodeFormat.QR_CODE);
                     break;
                 case "TEXT":
                     break;
@@ -128,7 +130,7 @@ public class VoucherVaultImporter implements Importer
                     throw new FormatException("Unknown colour type found: " + colorFromJSON);
             }
 
-            db.insertLoyaltyCard(store, "", expiry, balance, balanceType, cardId, null, barcodeType, headerColor, 0);
+            db.insertLoyaltyCard(store, "", expiry, balance, balanceType, cardId, null, barcodeType, headerColor, 0, Utils.getUnixTime());
         }
 
         database.setTransactionSuccessful();

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

@@ -3,11 +3,14 @@ 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 protect.card_locker.R;
+import protect.card_locker.Utils;
 
 public class Settings
 {
@@ -45,6 +48,17 @@ public class Settings
         return settings.getBoolean(getResString(keyId), defaultValue);
     }
 
+    public Locale getLocale()
+    {
+        String value = getString(R.string.settings_key_locale, "");
+
+        if (value.length() == 0) {
+            return null;
+        }
+
+        return Utils.stringToLocale(value);
+    }
+
     public int getTheme()
     {
         String value = getString(R.string.settings_key_theme, getResString(R.string.settings_key_system_theme));

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

@@ -1,27 +1,39 @@
 package protect.card_locker.preferences;
 
+
+import android.content.Intent;
 import android.os.Bundle;
 import android.view.MenuItem;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+
 import androidx.appcompat.app.ActionBar;
-import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.app.AppCompatDelegate;
+import androidx.appcompat.widget.Toolbar;
+import androidx.core.app.ActivityCompat;
 import androidx.fragment.app.DialogFragment;
 import androidx.fragment.app.FragmentActivity;
+import androidx.preference.ListPreference;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceFragmentCompat;
 import nl.invissvenska.numberpickerpreference.NumberDialogPreference;
 import nl.invissvenska.numberpickerpreference.NumberPickerPreferenceDialogFragment;
+import protect.card_locker.CatimaAppCompatActivity;
 import protect.card_locker.R;
+import protect.card_locker.Utils;
 
-public class SettingsActivity extends AppCompatActivity
+public class SettingsActivity extends CatimaAppCompatActivity
 {
     @Override
     protected void onCreate(Bundle savedInstanceState)
     {
         super.onCreate(savedInstanceState);
+        setTitle(R.string.settings);
         setContentView(R.layout.settings_activity);
-
+        Toolbar toolbar = findViewById(R.id.toolbar);
+        setSupportActionBar(toolbar);
         ActionBar actionBar = getSupportActionBar();
         if(actionBar != null)
         {
@@ -29,8 +41,9 @@ public class SettingsActivity extends AppCompatActivity
         }
 
         // Display the fragment as the main content.
+        SettingsFragment fragment = new SettingsFragment();
         getSupportFragmentManager().beginTransaction()
-                .replace(R.id.settings_container, new SettingsFragment())
+                .replace(R.id.settings_container, fragment)
                 .commit();
     }
 
@@ -51,46 +64,68 @@ public class SettingsActivity extends AppCompatActivity
     public static class SettingsFragment extends PreferenceFragmentCompat
     {
         private static final String DIALOG_FRAGMENT_TAG = "SettingsFragment";
+
         @Override
-        public void onCreatePreferences(Bundle savedInstanceState, String rootKey)
-        {
+        public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
             // Load the preferences from an XML resource
             addPreferencesFromResource(R.xml.preferences);
 
+            // Show pretty names
+            ListPreference localePreference = findPreference(getResources().getString(R.string.settings_key_locale));
+            assert localePreference != null;
+            CharSequence[] entryValues = localePreference.getEntryValues();
+            List<CharSequence> entries = new ArrayList<>();
+            for (CharSequence entry : entryValues) {
+                if (entry.length() == 0) {
+                    entries.add(getResources().getString(R.string.settings_system_locale));
+                } else {
+                    Locale entryLocale = Utils.stringToLocale(entry.toString());
+                    entries.add(entryLocale.getDisplayName(entryLocale));
+                }
+            }
+
+            localePreference.setEntries(entries.toArray(new CharSequence[entryValues.length]));
+
             Preference themePreference = findPreference(getResources().getString(R.string.settings_key_theme));
             assert themePreference != null;
-            themePreference.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener()
-            {
-                @Override
-                public boolean onPreferenceChange(Preference preference, Object o)
-                {
-                    if(o.toString().equals(getResources().getString(R.string.settings_key_light_theme)))
-                    {
-                        AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
-                    }
-                    else if(o.toString().equals(getResources().getString(R.string.settings_key_dark_theme)))
-                    {
-                        AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
-                    }
-                    else
-                    {
-                        AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM);
-                    }
-
-                    FragmentActivity activity = getActivity();
-                    if (activity != null) {
-                        activity.recreate();
-                    }
-                    return true;
+            themePreference.setOnPreferenceChangeListener((preference, o) -> {
+                if (o.toString().equals(getResources().getString(R.string.settings_key_light_theme))) {
+                    AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
+                } else if (o.toString().equals(getResources().getString(R.string.settings_key_dark_theme))) {
+                    AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
+                } else {
+                    AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM);
                 }
+
+                FragmentActivity activity = getActivity();
+                if (activity != null) {
+                    ActivityCompat.recreate(activity);
+                }
+                return true;
+            });
+
+            Preference colorPreference = findPreference(getResources().getString(R.string.setting_key_theme_color));
+            assert colorPreference != null;
+            colorPreference.setOnPreferenceChangeListener((preference, o) -> {
+                FragmentActivity activity = getActivity();
+                if (activity != null) {
+                    ActivityCompat.recreate(activity);
+                }
+                return true;
+            });
+            localePreference.setOnPreferenceChangeListener((preference, newValue) -> {
+                // Refresh the activity
+                Intent intent = new Intent(getContext(), SettingsActivity.class);
+                intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+                getContext().startActivity(intent);
+
+                return true;
             });
         }
 
         @Override
-        public void onDisplayPreferenceDialog(Preference preference)
-        {
-            if (preference instanceof NumberDialogPreference)
-            {
+        public void onDisplayPreferenceDialog(Preference preference) {
+            if (preference instanceof NumberDialogPreference) {
                 NumberDialogPreference dialogPreference = (NumberDialogPreference) preference;
                 DialogFragment dialogFragment = NumberPickerPreferenceDialogFragment
                         .newInstance(
@@ -102,9 +137,7 @@ public class SettingsActivity extends AppCompatActivity
                         );
                 dialogFragment.setTargetFragment(this, 0);
                 dialogFragment.show(getParentFragmentManager(), DIALOG_FRAGMENT_TAG);
-            }
-            else
-            {
+            } else {
                 super.onDisplayPreferenceDialog(preference);
             }
         }

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

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval" android:useLevel="true"
+    android:dither="true">
+
+    <size android:height="12dip" android:width="12dip"/>
+
+    <solid android:color="@android:color/white"/>
+</shape>

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

@@ -0,0 +1,13 @@
+<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="@android:color/white"
+      android:pathData="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8z"/>
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M12.5,7H11v6l5.25,3.15 0.75,-1.23 -4.5,-2.67z"/>
+</vector>

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

@@ -0,0 +1,10 @@
+<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="@android:color/white"
+      android:pathData="M19,14L19,6c0,-1.1 -0.9,-2 -2,-2L3,4c-1.1,0 -2,0.9 -2,2v8c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2zM10,13c-1.66,0 -3,-1.34 -3,-3s1.34,-3 3,-3 3,1.34 3,3 -1.34,3 -3,3zM23,7v11c0,1.1 -0.9,2 -2,2L4,20v-2h17L21,7h2z"/>
+</vector>

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

@@ -0,0 +1,5 @@
+<vector android:autoMirrored="true" android:height="24dp"
+    android:tint="#FFFFFF" android:viewportHeight="24"
+    android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M3,18h6v-2L3,16v2zM3,6v2h18L21,6L3,6zM3,13h12v-2L3,11v2z"/>
+</vector>

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

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval" android:useLevel="true"
+    android:dither="true">
+
+    <size android:height="8dip" android:width="8dip"/>
+
+    <solid android:color="@android:color/white"/>
+</shape>

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

@@ -22,21 +22,333 @@
 
     </com.google.android.material.appbar.AppBarLayout>
 
-    <LinearLayout
+    <ScrollView
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="match_parent"
         android:layout_marginTop="?attr/actionBarSize"
-        android:orientation="vertical"
         android:padding="10dp">
 
-        <TextView
-            android:id="@+id/aboutText"
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:linksClickable="true"
-            android:singleLine="false"
-            android:focusable="true" />
+            android:orientation="vertical">
 
-    </LinearLayout>
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/version_history"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:padding="8dp">
 
+                <TextView
+                    android:id="@+id/version_history_main"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:fontFamily="sans-serif-medium"
+                    android:padding="2dp"
+                    android:text="@string/version_history"
+                    android:textColor="@color/colorSecondaryText"
+                    android:textSize="18sp"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <TextView
+                    android:id="@+id/version_history_sub"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:padding="2dp"
+                    android:textSize="16sp"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/version_history_main" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="8dp"
+                    android:fontFamily="sans-serif-medium"
+                    android:text="@string/arrow"
+                    android:textColor="@color/colorSecondaryText"
+                    android:textSize="20sp"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/credits"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:padding="8dp">
+
+                <TextView
+                    android:id="@+id/credits_main"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:fontFamily="sans-serif-medium"
+                    android:padding="2dp"
+                    android:text="@string/credits"
+                    android:textColor="@color/colorSecondaryText"
+                    android:textSize="18sp"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <TextView
+                    android:id="@+id/credits_sub"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:padding="2dp"
+                    android:textSize="16sp"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/credits_main" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="8dp"
+                    android:fontFamily="sans-serif-medium"
+                    android:text="@string/arrow"
+                    android:textColor="@color/colorSecondaryText"
+                    android:textSize="20sp"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/translate"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:padding="8dp">
+
+                <TextView
+                    android:id="@+id/translate_main"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:fontFamily="sans-serif-medium"
+                    android:padding="2dp"
+                    android:text="@string/help_translate_this_app"
+                    android:textColor="@color/colorSecondaryText"
+                    android:textSize="18sp"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="8dp"
+                    android:fontFamily="sans-serif-medium"
+                    android:text="@string/arrow"
+                    android:textColor="@color/colorSecondaryText"
+                    android:textSize="20sp"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/license"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:padding="8dp">
+
+                <TextView
+                    android:id="@+id/license_main"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:fontFamily="sans-serif-medium"
+                    android:padding="2dp"
+                    android:text="@string/license"
+                    android:textColor="@color/colorSecondaryText"
+                    android:textSize="18sp"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <TextView
+                    android:id="@+id/license_sub"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:padding="2dp"
+                    android:text="@string/app_license"
+                    android:layout_marginEnd="20dp"
+                    android:textSize="16sp"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/license_main"/>
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="8dp"
+                    android:fontFamily="sans-serif-medium"
+                    android:text="@string/arrow"
+                    android:textColor="@color/colorSecondaryText"
+                    android:textSize="20sp"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/repo"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:padding="8dp">
+
+                <TextView
+                    android:id="@+id/repo_main"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:fontFamily="sans-serif-medium"
+                    android:padding="2dp"
+                    android:text="@string/source_repository"
+                    android:textColor="@color/colorSecondaryText"
+                    android:textSize="18sp"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <TextView
+                    android:id="@+id/repo_sub"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:padding="2dp"
+                    android:text="@string/on_github"
+                    android:textSize="16sp"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/repo_main" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="8dp"
+                    android:fontFamily="sans-serif-medium"
+                    android:text="@string/arrow"
+                    android:textColor="@color/colorSecondaryText"
+                    android:textSize="20sp"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/privacy"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:padding="8dp">
+
+                <TextView
+                    android:id="@+id/privacy_main"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:fontFamily="sans-serif-medium"
+                    android:padding="2dp"
+                    android:text="@string/privacy_policy"
+                    android:textColor="@color/colorSecondaryText"
+                    android:textSize="18sp"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <TextView
+                    android:id="@+id/privacy_sub"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:padding="2dp"
+                    android:text="@string/and_data_usage"
+                    android:textSize="16sp"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/privacy_main" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="8dp"
+                    android:fontFamily="sans-serif-medium"
+                    android:text="@string/arrow"
+                    android:textColor="@color/colorSecondaryText"
+                    android:textSize="20sp"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/rate"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:padding="8dp">
+
+                <TextView
+                    android:id="@+id/rate_main"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:fontFamily="sans-serif-medium"
+                    android:padding="2dp"
+                    android:text="@string/rate_this_app"
+                    android:textColor="@color/colorSecondaryText"
+                    android:textSize="18sp"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <TextView
+                    android:id="@+id/rate_sub"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:padding="2dp"
+                    android:text="@string/on_google_play"
+                    android:textSize="16sp"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/rate_main" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="8dp"
+                    android:fontFamily="sans-serif-medium"
+                    android:text="@string/arrow"
+                    android:textColor="@color/colorSecondaryText"
+                    android:textSize="20sp"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:padding="8dp"
+                android:id="@+id/report_error"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <TextView
+                    android:id="@+id/report_error_main"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:fontFamily="sans-serif-medium"
+                    android:padding="2dp"
+                    android:text="@string/report_error"
+                    android:textColor="@color/colorSecondaryText"
+                    android:textSize="18sp"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <TextView
+                    android:id="@+id/report_error_sub"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    app:layout_constraintTop_toBottomOf="@id/report_error_main"
+                    app:layout_constraintStart_toStartOf="parent"
+                    android:textSize="16sp"
+                    android:text="@string/on_github"
+                    android:padding="2dp"/>
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="8dp"
+                    android:fontFamily="sans-serif-medium"
+                    android:text="@string/arrow"
+                    android:textColor="@color/colorSecondaryText"
+                    android:textSize="20sp"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+            </androidx.constraintlayout.widget.ConstraintLayout>
+        </LinearLayout>
+    </ScrollView>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>

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

@@ -82,7 +82,6 @@
                     android:layout_height="@dimen/barcode_disp_height"
                     android:layout_gravity="center_horizontal"
                     android:id="@+id/aztecBarcode"
-                    android:contentDescription="@string/barcodeImageDescription"
                     android:layout_weight="1.0"/>
                 <TextView
                     android:id="@+id/aztecBarcodeText"
@@ -103,7 +102,6 @@
                     android:layout_height="@dimen/barcode_disp_height"
                     android:layout_gravity="center_horizontal"
                     android:id="@+id/code39Barcode"
-                    android:contentDescription="@string/barcodeImageDescription"
                     android:layout_weight="1.0"/>
                 <TextView
                     android:id="@+id/code39BarcodeText"
@@ -124,7 +122,6 @@
                     android:layout_height="@dimen/barcode_disp_height"
                     android:layout_gravity="center_horizontal"
                     android:id="@+id/code128Barcode"
-                    android:contentDescription="@string/barcodeImageDescription"
                     android:layout_weight="1.0"/>
                 <TextView
                     android:id="@+id/code128BarcodeText"
@@ -145,7 +142,6 @@
                     android:layout_height="@dimen/barcode_disp_height"
                     android:layout_gravity="center_horizontal"
                     android:id="@+id/codabarBarcode"
-                    android:contentDescription="@string/barcodeImageDescription"
                     android:layout_weight="1.0"/>
                 <TextView
                     android:id="@+id/codabarBarcodeText"
@@ -166,7 +162,6 @@
                     android:layout_height="@dimen/barcode_disp_height"
                     android:layout_gravity="center_horizontal"
                     android:id="@+id/datamatrixBarcode"
-                    android:contentDescription="@string/barcodeImageDescription"
                     android:layout_weight="1.0"/>
                 <TextView
                     android:id="@+id/datamatrixBarcodeText"
@@ -187,7 +182,6 @@
                     android:layout_height="@dimen/barcode_disp_height"
                     android:layout_gravity="center_horizontal"
                     android:id="@+id/ean8Barcode"
-                    android:contentDescription="@string/barcodeImageDescription"
                     android:layout_weight="1.0"/>
                 <TextView
                     android:id="@+id/ean8BarcodeText"
@@ -208,7 +202,6 @@
                     android:layout_height="@dimen/barcode_disp_height"
                     android:layout_gravity="center_horizontal"
                     android:id="@+id/ean13Barcode"
-                    android:contentDescription="@string/barcodeImageDescription"
                     android:layout_weight="1.0"/>
                 <TextView
                     android:id="@+id/ean13BarcodeText"
@@ -229,7 +222,6 @@
                     android:layout_height="@dimen/barcode_disp_height"
                     android:layout_gravity="center_horizontal"
                     android:id="@+id/itfBarcode"
-                    android:contentDescription="@string/barcodeImageDescription"
                     android:layout_weight="1.0"/>
                 <TextView
                     android:id="@+id/itfBarcodeText"
@@ -250,7 +242,6 @@
                     android:layout_height="@dimen/barcode_disp_height"
                     android:layout_gravity="center_horizontal"
                     android:id="@+id/pdf417Barcode"
-                    android:contentDescription="@string/barcodeImageDescription"
                     android:layout_weight="1.0"/>
                 <TextView
                     android:id="@+id/pdf417BarcodeText"
@@ -271,7 +262,6 @@
                     android:layout_height="@dimen/barcode_disp_height"
                     android:layout_gravity="center_horizontal"
                     android:id="@+id/qrcodeBarcode"
-                    android:contentDescription="@string/barcodeImageDescription"
                     android:layout_weight="1.0"/>
                 <TextView
                     android:id="@+id/qrcodeBarcodeText"
@@ -292,7 +282,6 @@
                     android:layout_height="@dimen/barcode_disp_height"
                     android:layout_gravity="center_horizontal"
                     android:id="@+id/upcaBarcode"
-                    android:contentDescription="@string/barcodeImageDescription"
                     android:layout_weight="1.0"/>
                 <TextView
                     android:id="@+id/upcaBarcodeText"
@@ -313,7 +302,6 @@
                     android:layout_height="@dimen/barcode_disp_height"
                     android:layout_gravity="center_horizontal"
                     android:id="@+id/upceBarcode"
-                    android:contentDescription="@string/barcodeImageDescription"
                     android:layout_weight="1.0"/>
                 <TextView
                     android:id="@+id/upceBarcodeText"

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

@@ -26,12 +26,24 @@
         android:gravity="center"
         android:text="@string/noMatchingGiftCards"
         android:visibility="gone"/>
+    
+    <TextView
+        style="@style/AppTheme.TextView.NoData"
+        android:id="@+id/noGroupCardsText"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:gravity="center"
+        android:text="@string/noGroupCards"
+        android:visibility="gone"/>
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/list"
+        app:layoutManager="androidx.recyclerview.widget.StaggeredGridLayoutManager"
+        app:spanCount="@integer/main_view_card_columns"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:scrollbars="vertical"
-        android:visibility="gone" />
+        android:background="@color/mainLoyaltyCardBackground"
+        android:visibility="gone"/>
 
 </RelativeLayout>

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

@@ -1,10 +1,11 @@
 <?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"
+<androidx.coordinatorlayout.widget.CoordinatorLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-                                                     android:layout_height="match_parent"
-                                                     android:fitsSystemWindows="true">
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true">
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/fabSave"
@@ -67,7 +68,7 @@
                     android:paddingTop="@dimen/inputPadding"
                     android:orientation="horizontal">
 
-                    <androidx.cardview.widget.CardView
+                    <com.google.android.material.card.MaterialCardView
                         android:layout_width="@dimen/cardThumbnailSize"
                         android:layout_height="@dimen/cardThumbnailSize"
                         android:layout_marginEnd="@dimen/activity_margin"
@@ -83,7 +84,7 @@
                             android:contentDescription="@string/thumbnailDescription"
                             android:src="@mipmap/ic_launcher"/>
 
-                    </androidx.cardview.widget.CardView>
+                    </com.google.android.material.card.MaterialCardView>
 
                     <com.google.android.material.textfield.TextInputLayout
                         android:id="@+id/storeNameField"
@@ -312,7 +313,6 @@
                         android:padding="10.0dp"
                         android:background="#ffffff"
                         android:id="@+id/barcode"
-                        android:contentDescription="@string/barcodeImageDescription"
                         android:layout_weight="1.0"/>
                 </LinearLayout>
 
@@ -347,7 +347,7 @@
                     android:paddingTop="@dimen/inputPadding">
 
                     <!-- Front image -->
-                    <androidx.cardview.widget.CardView
+                    <com.google.android.material.card.MaterialCardView
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_vertical"
@@ -365,12 +365,11 @@
                             android:layout_height="wrap_content"
                             android:adjustViewBounds="true"
                             android:minHeight="50dp"
-                            android:background="@color/colorPrimary"
                             android:contentDescription="@string/frontImageDescription"
                             android:scaleType="fitCenter"
                             app:srcCompat="@drawable/ic_camera_white" />
 
-                    </androidx.cardview.widget.CardView>
+                    </com.google.android.material.card.MaterialCardView>
                 </LinearLayout>
 
                 <!-- Back image -->
@@ -383,7 +382,7 @@
                     android:paddingTop="@dimen/inputPadding">
 
                     <!-- Back image -->
-                    <androidx.cardview.widget.CardView
+                    <com.google.android.material.card.MaterialCardView
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_vertical"
@@ -401,12 +400,11 @@
                             android:layout_height="wrap_content"
                             android:adjustViewBounds="true"
                             android:minHeight="50dp"
-                            android:background="@color/colorPrimary"
                             android:contentDescription="@string/backImageDescription"
                             android:scaleType="fitCenter"
                             app:srcCompat="@drawable/ic_camera_white" />
 
-                    </androidx.cardview.widget.CardView>
+                    </com.google.android.material.card.MaterialCardView>
                 </LinearLayout>
             </TableLayout>
         </TableLayout>

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

@@ -1,118 +1,154 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.google.android.material.card.MaterialCardView
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/row"
     android:orientation="horizontal"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginBottom="0.5dp"
-    android:background="@drawable/list_row"
-    android:clickable="true"
-    android:focusable="true"
-    android:padding="@dimen/activity_margin">
+    android:layout_margin="8dp">
 
     <LinearLayout
-        android:id="@+id/information_container"
-        android:layout_width="0dp"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/activity_margin"
-        android:layout_marginLeft="@dimen/activity_margin"
-        android:layout_toEndOf="@+id/thumbnail_container"
-        android:layout_toRightOf="@+id/thumbnail_container"
-        android:layout_weight="1"
-        android:clickable="true"
-        android:focusable="true"
-        android:orientation="vertical"
-        app:layout_constraintBottom_toBottomOf="@+id/thumbnail_container"
-        app:layout_constraintEnd_toStartOf="@+id/star"
-        app:layout_constraintStart_toEndOf="@+id/thumbnail_container"
-        app:layout_constraintTop_toTopOf="@+id/thumbnail_container">
+        android:orientation="vertical">
 
-        <TextView
-            android:id="@+id/store"
-            android:layout_width="wrap_content"
+        <LinearLayout
+            android:id="@+id/information_container"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:textSize="@dimen/storeNameTextSize"
-            android:textStyle="bold" />
+            android:orientation="vertical"
+            android:padding="16dp">
 
-        <TextView
-            android:id="@+id/note"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:ellipsize="end"
-            android:lines="1"
-            android:textSize="@dimen/noteTextSize" />
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
 
-        <TextView
-            android:id="@+id/balance"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:ellipsize="end"
-            android:lines="1"
-            android:textSize="@dimen/noteTextSize" />
+                <com.google.android.material.card.MaterialCardView
+                    android:id="@+id/thumbnail_container"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    app:cardCornerRadius="4dp"
+                    android:layout_alignParentStart="true"
+                    android:layout_centerVertical="true"
+                    >
 
-        <TextView
-            android:id="@+id/expiry"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:ellipsize="end"
-            android:lines="1"
-            android:textSize="@dimen/noteTextSize" />
+                    <RelativeLayout
+                        android:id="@+id/thumbnail_front"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignTop="@+id/storeContainer"
+                        android:layout_alignBottom="@+id/storeContainer"
+                        android:layout_gravity="center_vertical">
 
+                        <ImageView
+                            android:id="@+id/thumbnail"
+                            android:scaleType="centerCrop"
+                            android:layout_width="@dimen/cardThumbnailSize"
+                            android:layout_height="@dimen/cardThumbnailSize"
+                            android:layout_centerVertical="true"
+                            android:contentDescription="@string/thumbnailDescription"
+                            android:src="@mipmap/ic_launcher" />
+
+                    </RelativeLayout>
+
+                    <RelativeLayout
+                        android:id="@+id/thumbnail_back"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical">
+
+                        <ImageView
+                            android:id="@+id/selected_thumbnail"
+                            android:layout_width="@dimen/cardThumbnailSize"
+                            android:layout_height="@dimen/cardThumbnailSize"
+                            android:layout_centerInParent="true"
+                            android:contentDescription="@string/thumbnailDescription"
+                            android:scaleType="centerCrop"
+                            app:srcCompat="@drawable/ic_done" />
+
+                    </RelativeLayout>
+                </com.google.android.material.card.MaterialCardView>
+
+                <LinearLayout
+                    android:id="@+id/storeContainer"
+                    android:layout_height="wrap_content"
+                    android:layout_width="wrap_content"
+                    android:orientation="vertical"
+                    android:layout_gravity="center_vertical"
+                    android:gravity="center_vertical"
+                    android:layout_toEndOf="@+id/thumbnail_container">
+
+                    <TextView
+                        android:id="@+id/store"
+                        android:paddingStart="16dp"
+                        android:layout_width="wrap_content"
+                        android:layout_height="match_parent"
+                        android:gravity="left"
+                        android:textAppearance="?attr/textAppearanceHeadline6" />
+                </LinearLayout>
+
+                <ImageView
+                    android:id="@+id/star"
+                    android:layout_width="@dimen/cardThumbnailSize"
+                    android:layout_height="@dimen/cardThumbnailSize"
+                    android:layout_centerVertical="true"
+                    android:scaleType="centerCrop"
+                    app:srcCompat="@drawable/ic_starred_white"
+                    android:contentDescription="@string/starImage"
+                    app:tint="?attr/colorControlNormal"
+                    android:layout_alignParentEnd="true"
+                    android:visibility="gone" />
+            </RelativeLayout>
+
+            <TextView
+                android:id="@+id/note"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"
+                android:textAppearance="?attr/textAppearanceBody2"
+                android:textColor="?android:attr/textColorSecondary"
+                android:visibility="gone" />
+
+            <View android:id="@+id/info_divider"
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_marginTop="16dp"
+                android:layout_marginBottom="16dp"
+                android:background="?android:attr/dividerVertical"
+                android:visibility="gone" />
+
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+                <TextView
+                    android:id="@+id/balance"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:gravity="center_vertical"
+                    android:paddingEnd="8dp"
+                    android:textAppearance="?attr/textAppearanceBody2"
+                    android:textColor="?android:attr/textColorSecondary"
+                    app:drawableLeftCompat="@drawable/ic_baseline_payments_24"
+                    android:drawablePadding="4dp"
+                    android:layout_alignParentStart="true"
+                    android:visibility="gone" />
+                <TextView
+                    android:id="@+id/expiry"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:gravity="center_vertical"
+                    android:textAppearance="?attr/textAppearanceBody2"
+                    android:textColor="?android:attr/textColorSecondary"
+                    app:drawableLeftCompat="@drawable/ic_baseline_access_time_24"
+                    android:drawablePadding="4dp"
+                    android:layout_toEndOf="@+id/balance"
+                    android:visibility="gone" />
+            </RelativeLayout>
+        </LinearLayout>
     </LinearLayout>
-
-    <androidx.cardview.widget.CardView
-        android:id="@+id/thumbnail_container"
-        android:layout_width="@dimen/cardThumbnailSize"
-        android:layout_height="@dimen/cardThumbnailSize"
-        app:cardCornerRadius="4dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
-
-        <RelativeLayout
-            android:id="@+id/thumbnail_front"
-            android:layout_width="@dimen/cardThumbnailSize"
-            android:layout_height="@dimen/cardThumbnailSize">
-
-            <ImageView
-                android:id="@+id/thumbnail"
-                android:layout_width="@dimen/cardThumbnailSize"
-                android:layout_height="@dimen/cardThumbnailSize"
-                android:contentDescription="@string/thumbnailDescription"
-                android:src="@mipmap/ic_launcher" />
-
-        </RelativeLayout>
-
-        <RelativeLayout
-            android:id="@+id/thumbnail_back"
-            android:layout_width="@dimen/cardThumbnailSize"
-            android:layout_height="@dimen/cardThumbnailSize">
-
-            <ImageView
-                android:layout_width="@dimen/cardThumbnailSize"
-                android:layout_height="@dimen/cardThumbnailSize"
-                android:layout_centerHorizontal="true"
-                android:contentDescription="@string/thumbnailDescription"
-                app:srcCompat="@drawable/ic_done" />
-
-        </RelativeLayout>
-    </androidx.cardview.widget.CardView>
-
-    <ImageView
-        android:id="@+id/star"
-        android:layout_width="@dimen/cardThumbnailSize"
-        android:layout_height="@dimen/cardThumbnailSize"
-        android:layout_marginLeft="@dimen/activity_margin"
-        app:srcCompat="@drawable/ic_starred_white"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentRight="true"
-        android:layout_centerVertical="true"
-        android:layout_marginStart="@dimen/activity_margin"
-        android:contentDescription="@string/starImage"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:tint="#000000" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
+</com.google.android.material.card.MaterialCardView>

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

@@ -55,25 +55,24 @@
                 app:srcCompat="@drawable/ic_baseline_arrow_drop_up_24"
                 android:contentDescription="@string/moveBarcodeToTopOfScreen"
                 app:tint="#ffffff"
-                android:background="@color/colorPrimary"
                 app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintBottom_toTopOf="@+id/barcode"
+                app:layout_constraintBottom_toTopOf="@+id/mainImage"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent" />
 
             <ImageView
-                android:id="@+id/barcode"
-                android:layout_width="0dp"
+                android:id="@+id/mainImage"
+                android:layout_width="match_parent"
                 android:layout_height="0dp"
+                android:orientation="horizontal"
+                android:layout_marginTop="10dp"
+                android:layout_marginBottom="10dp"
                 android:layout_marginStart="15.0dip"
                 android:layout_marginEnd="15.0dip"
-                android:padding="10dp"
-                android:background="#ffffff"
                 app:layout_constraintBottom_toTopOf="@+id/centerGuideline"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/maximizeButton"
-                android:contentDescription="@string/barcodeImageDescription"/>
+                app:layout_constraintTop_toBottomOf="@+id/maximizeButton"/>
 
             <ImageButton
                 android:id="@+id/minimizeButton"
@@ -82,15 +81,31 @@
                 android:layout_height="40dp"
                 android:layout_marginStart="15.0dip"
                 android:layout_marginEnd="15.0dip"
+                android:layout_marginTop="10dp"
                 android:padding="0dp"
                 app:srcCompat="@drawable/ic_baseline_arrow_drop_down_24"
                 android:contentDescription="@string/moveBarcodeToCenterOfScreen"
                 app:tint="#ffffff"
-                android:background="@color/colorPrimary"
-                app:layout_constraintTop_toBottomOf="@+id/barcode"
+                app:layout_constraintTop_toBottomOf="@+id/mainImage"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent" />
 
+            <LinearLayout
+                android:id="@+id/dotIndicator"
+                android:visibility="gone"
+                android:gravity="center_vertical"
+                android:layout_gravity="center_vertical"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:layout_marginTop="10dp"
+                android:layout_marginBottom="10dp"
+                android:layout_marginStart="15.0dip"
+                android:layout_marginEnd="15.0dip"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/minimizeButton"/>
+
             <SeekBar
                 android:id="@+id/barcodeScaler"
                 android:visibility="gone"
@@ -107,12 +122,16 @@
 
             <TextView
                 android:id="@+id/cardIdView"
+                android:enabled="true"
+                android:textIsSelectable="true"
+                android:focusable="true"
+                android:longClickable="true"
                 android:layout_width="0dp"
                 android:layout_height="0dp"
                 android:layout_marginLeft="10.0dip"
                 android:layout_marginRight="10.0dip"
                 android:paddingBottom="80dp"
-                app:layout_constraintTop_toBottomOf="@+id/minimizeButton"
+                app:layout_constraintTop_toBottomOf="@+id/dotIndicator"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
@@ -149,8 +168,8 @@
             android:layout_width="match_parent"
             android:layout_height="80dp"
             android:layout_gravity="top|start"
-            android:background="@color/colorPrimary"
             android:scaleType="fitCenter"
+            android:contentDescription="@string/toggleMoreInfo"
             app:tint="#ffffff"
             app:srcCompat="@drawable/ic_baseline_arrow_drop_up_24" />
 
@@ -164,62 +183,12 @@
                 android:layout_height="wrap_content"
                 android:orientation="vertical">
 
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal">
-
-                    <androidx.cardview.widget.CardView
-                        android:id="@+id/frontImageView"
-                        android:layout_width="match_parent"
-                        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"
-                        android:layout_weight="1"
-                        app:cardCornerRadius="4dp"
-                        app:cardElevation="0dp">
-
-                        <ImageView
-                            android:id="@+id/frontImage"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:adjustViewBounds="true"
-                            android:contentDescription="@string/frontImageDescription"
-                            android:scaleType="fitCenter" />
-
-                    </androidx.cardview.widget.CardView>
-
-                    <androidx.cardview.widget.CardView
-                        android:id="@+id/backImageView"
-                        android:layout_width="match_parent"
-                        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"
-                        android:layout_weight="1"
-                        app:cardCornerRadius="4dp"
-                        app:cardElevation="0dp">
-
-                        <ImageView
-                            android:id="@+id/backImage"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:adjustViewBounds="true"
-                            android:contentDescription="@string/backImageDescription"
-                            android:scaleType="fitCenter" />
-
-                    </androidx.cardview.widget.CardView>
-                </LinearLayout>
-
                 <TextView
                     android:id="@+id/noteView"
+                    android:enabled="true"
+                    android:textIsSelectable="true"
+                    android:focusable="true"
+                    android:longClickable="true"
                     android:autoLink="all"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -229,6 +198,10 @@
 
                 <TextView
                     android:id="@+id/groupsView"
+                    android:enabled="true"
+                    android:textIsSelectable="true"
+                    android:focusable="true"
+                    android:longClickable="true"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:gravity="center"
@@ -237,6 +210,10 @@
 
                 <TextView
                     android:id="@+id/balanceView"
+                    android:enabled="true"
+                    android:textIsSelectable="true"
+                    android:focusable="true"
+                    android:longClickable="true"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:gravity="center"
@@ -245,6 +222,10 @@
 
                 <TextView
                     android:id="@+id/expiryView"
+                    android:enabled="true"
+                    android:textIsSelectable="true"
+                    android:focusable="true"
+                    android:longClickable="true"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:gravity="center"

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

@@ -2,8 +2,23 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical">
 
+    <com.google.android.material.appbar.AppBarLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:theme="@style/AppTheme.AppBarOverlay">
+
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="?attr/colorPrimary"
+            app:popupTheme="@style/AppTheme.PopupOverlay"/>
+
+    </com.google.android.material.appbar.AppBarLayout>
+
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/settings_container"
         android:layout_width="match_parent"

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

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <CheckBox
+            android:id="@+id/checkBox_reverse"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="20dp"
+            android:paddingLeft="20dp"
+            android:text="@string/reverse"
+            android:textSize="19sp"/>
+
+    </LinearLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -8,11 +8,16 @@
         android:icon="@drawable/ic_search_white"
         app:actionViewClass="androidx.appcompat.widget.SearchView"
         app:showAsAction="always|collapseActionView"/>
+    <item
+        android:id="@+id/action_sort"
+        android:title="@string/sort"
+        android:icon="@drawable/ic_baseline_sort_24"
+        app:showAsAction="always"/>
     <item
         android:id="@+id/action_manage_groups"
         android:icon="@drawable/ic_folder_white"
         android:title="@string/groups"
-        app:showAsAction="always"/>
+        app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/action_import_export"
         android:icon="@drawable/ic_import_export_white_24dp"
@@ -22,10 +27,6 @@
         android:id="@+id/action_settings"
         android:title="@string/settings"
         app:showAsAction="never"/>
-    <item
-        android:id="@+id/action_privacy_policy"
-        android:title="@string/privacy_policy"
-        app:showAsAction="never"/>
     <item
         android:id="@+id/action_about"
         android:title="@string/about"

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

@@ -0,0 +1,74 @@
+Sylvia van Os
+Branden Archer
+J. Lavoie
+Allan Nordhøy
+Heimen Stoffels
+solokot
+mondstern
+Taco
+IllusiveMan196
+Petr Novák
+Oğuz Ersen
+Gediminas Murauskas
+Joel A
+StoyanDimitrov
+Samantaz Fox
+Nyatsuki
+arno-github
+Ankit Tiwari
+Sergio Paredes
+arshbeerSingh
+huuhaa
+Michael Moroni
+Olivia (Zoe)
+betsythefc
+waffshappen
+Miha Frangež
+K. Herbert
+Quentin PAGÈS
+String E. Fighter
+Yurical
+Adolfo Jayme-Barrientos
+Alessandro Mandelli
+KovalevArtem
+Clonewayx
+D. Domig
+Diego
+Jane Kong
+Lukas Grassauer
+Michalis
+schirinowski
+Thomas Bertels
+inesre
+lgasp
+phlostically
+Aditya Das
+Kevin Sicong Jiang
+Airat
+BMN
+Biren
+Flav
+Franciszek Stefan
+Izzy
+Karol Kosek
+bittin
+Maciej Błędkowski
+Mattia
+Michael Gangolf
+pbeckmann
+Peer Beckmann
+QuangDNguyen2211
+Rohan Babbar 
+Rose Liverman
+Simone Dotto
+Still Hsu
+Subhashish Anand
+Tymofii Lytvynenko
+Tjipke van der Heide
+avikkundu
+opsik
+psa-jforestier
+Robin
+sergio
+Marcus
+techwebpd

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

@@ -24,11 +24,10 @@
         <item quantity="other"><xliff:g>%d</xliff:g> карти</item>
     </plurals>
     <string name="failedOpeningFileManager">Инсталирайте приложение за управление на файлове.</string>
-    <string name="app_license">Свободен софтуер с авторски права, лицензиран под GPLv3+.</string>
+    <string name="app_license">Свободен софтуер с авторски права, лицензиран под GPLv3+</string>
     <string name="frontImageDescription">Снимка на предната страна на карта</string>
     <string name="backImageDescription">Снимка на задната страна на карта</string>
     <string name="parsingBalanceFailed"><xliff:g>%s</xliff:g> не изглежда истинска наличност.</string>
-    <string name="barcodeImageDescription">Изображение на щрихкода на картата</string>
     <string name="no">Не</string>
     <string name="yes">Да</string>
     <string name="setBackImage">Снимка на задната страна</string>
@@ -53,7 +52,7 @@
     <string name="barcodeId">Стойност на щрихкода</string>
     <string name="importLoyaltyCardKeychain">Внасяне от Loyalty Card Keychain</string>
     <string name="importFidmeMessage">Изберете файла <i>fidme-export-request-xxxxxx.zip</i>, предварително изнесен от FidMe и ръчно изберете вида на щрихкодовете.
-\nИли създайте такъв файл от Data Protection в менюто на профила във FidMe и изберете „Extract my data“.</string>
+\nСъздайте такъв файл от Data Protection в менюто на профила във FidMe и изберете „Extract my data“.</string>
     <string name="importFidme">Внасяне от FidMe</string>
     <string name="exportOptionExplanation">Данните ще бъдат запазени на място по ваш избор.</string>
     <string name="accept">Приемане</string>
@@ -117,7 +116,7 @@
     <string name="exportName">Изнасяне</string>
     <string name="importExport">Внасяне/изнасяне</string>
     <string name="sendLabel">Изпращане…</string>
-    <string name="scanCardBarcode">Сканиране на щрихкод от карта</string>
+    <string name="scanCardBarcode">Снемане на щрихкод от карта</string>
     <string name="editCardTitle">Редактиране на карта</string>
     <string name="share">Споделя</string>
     <string name="copy_to_clipboard">Копира идентификатора в междинната памет</string>
@@ -125,7 +124,7 @@
     <string name="importSuccessful">Картите са внесени успешно</string>
     <string name="chooseImportType">От къде ще внесете\?</string>
     <string name="importCatimaMessage">Изберете файла <i>catima.zip</i>, предварително изнесен от Catima.
-\nИли създайте такъв файл от меню Внасяне/изнасяне от друго устройство със Catima като изберете Изнасяне.</string>
+\nСъздайте такъв файл от меню Внасяне/изнасяне от друго устройство с Catima като изберете Изнасяне.</string>
     <string name="importOptionApplicationTitle">От друго приложение</string>
     <string name="importOptionFilesystemButton">Избиране от файлова система</string>
     <string name="importOptionFilesystemExplanation">Изберете определен файл от файловата система.</string>
@@ -134,9 +133,9 @@
     <string name="app_revision_fmt">Компилация: <xliff:g id="app_revision_url">%s</xliff:g></string>
     <string name="debug_version_fmt">Издание: <xliff:g id="version">%s</xliff:g></string>
     <string name="about_title_fmt">Относно <xliff:g id="app_name">%s</xliff:g></string>
-    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Всички права запазени © 2019–<xliff:g>%d</xliff:g> Sylvia van Os.</string>
+    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Всички права запазени © 2019–<xliff:g>%d</xliff:g> Sylvia van Os</string>
     <string name="app_copyright_old">На основата на Loyalty Card Keychain
-\nвсички права запазени © 2016–2020 Branden Archer.</string>
+\nвсички права запазени © 2016–2020 Branden Archer</string>
     <string name="about">Относно</string>
     <string name="importOptionFilesystemTitle">Внасяне от файловата система</string>
     <string name="importCatima">Внасяне от Catima</string>
@@ -157,22 +156,58 @@
     <string name="importStocard">Внасяне от Stocard</string>
     <string name="importVoucherVault">Внасяне от Voucher Vault</string>
     <string name="importVoucherVaultMessage">Изберете файла <i>vouchervault.json</i>, предварително изнесен от Voucher Vault.
-\nИли създайте такъв файл от меню Изнасяне от Voucher Vault.</string>
-    <string name="importStocardMessage">Изберете файла <i>***-sync.zip</i>, предварително изнесен от Stocard и ръчно изберете вида на щрихкодовете.
-\nИли получете такъв файл като пишете до support@stocardapp.com с молба за копие от вашата информация.</string>
+\nСъздайте такъв файл от меню „Export“ във Voucher Vault.</string>
+    <string name="importStocardMessage">Изберете файла <i>***-sync.zip</i>, предварително изнесен от Stocard.
+\nПолучете го като изпратите писмо на support@stocardapp.com с искане за изнасяне вашите данни.</string>
     <string name="importLoyaltyCardKeychainMessage">Изберете файла <i>LoyaltyCardKeychain.csv</i>, предварително изнесен от Loyalty Card Keychain.
-\nИли създайте такъв файл от меню Внасяне/изнасяне от друго устройство със Loyalty Card Keychain като изберете Изнасяне.</string>
+\nСъздайте такъв файл от меню Внасяне/изнасяне от друго устройство с Loyalty Card Keychain като изберете Изнасяне.</string>
     <string name="failedParsingImportUriError">Препратката не може да бъде анализирана за внасяне</string>
     <string name="card_ids_copied">[не превеждай този низ, https://github.com/TheLastProject/Catima/issues/278]</string>
     <string name="failedGeneratingShareURL">Грешка при създаване на адрес за споделяне. Изпратете доклад за дефект.</string>
-    <string name="deleteTitle">Премахване на карта</string>
+    <string name="deleteTitle">Изтрийте картата</string>
     <plurals name="deleteCardsTitle">
-        <item quantity="one">Премахване на карта</item>
-        <item quantity="other">Премахване на карти</item>
+        <item quantity="one">Изтриване на <xliff:g>%d</xliff:g> карта</item>
+        <item quantity="other">Изтриване на <xliff:g>%d</xliff:g> карти</item>
     </plurals>
-    <string name="deleteConfirmation">Потвърдете премахване на карта</string>
+    <string name="deleteConfirmation">Потвърдете премахване на карта\?</string>
     <plurals name="deleteCardsConfirmation">
-        <item quantity="one">Желаете ли картата да бъде премахната\?</item>
-        <item quantity="other">Желаете ли <xliff:g>%d</xliff:g> картати да бъдат премахнати\?</item>
+        <item quantity="one">Изтриване на тази <xliff:g>%d</xliff:g> карта завинаги\?</item>
+        <item quantity="other">Изтриване на тези <xliff:g>%d</xliff:g> карти за постоянно\?</item>
     </plurals>
+    <string name="app_contributors">Осъществено от: <xliff:g id="app_contributors">%s</xliff:g></string>
+    <string name="settings_brown_theme">Браун</string>
+    <string name="settings_grey_theme">Сив</string>
+    <string name="settings_green_theme">Зелен</string>
+    <string name="settings_sky_blue_theme">Небесно синьо</string>
+    <string name="settings_blue_theme">Синьо</string>
+    <string name="settings_violet_theme">Виолет</string>
+    <string name="settings_magenta_theme">Магента</string>
+    <string name="settings_pink_theme">Розов</string>
+    <string name="settings_catima_theme">Catima</string>
+    <string name="settings_theme_color">Цвят на темата</string>
+    <string name="settings_system_locale">Система</string>
+    <string name="settings_locale">Език</string>
+    <string name="noGroupCards">Тази група не съдържа карти</string>
+    <string name="toggleMoreInfo">Превключване на повече информация</string>
+    <string name="barcodeImageDescriptionWithType">Изображение на щрихкод на карта от вида <xliff:g>%s</xliff:g></string>
+    <string name="swipeToSwitchImages">Плъзване или задържане за смяна на изображения</string>
+    <string name="sort_by">Сортиране по</string>
+    <string name="reverse">Наобратно</string>
+    <string name="sort_by_balance">Наличност</string>
+    <string name="sort_by_expiry">Валидност</string>
+    <string name="sort_by_most_recently_used">Последно използване</string>
+    <string name="sort_by_name">Наименование</string>
+    <string name="sort">Сортиране</string>
+    <string name="credits">Заслуги</string>
+    <string name="license">Лиценз</string>
+    <string name="source_repository">Хранилище на изходния код</string>
+    <string name="on_github">в GitHub</string>
+    <string name="rate_this_app">Оценете приложението</string>
+    <string name="report_error">Докладване на грешка</string>
+    <string name="version_history">История на изданията</string>
+    <string name="on_google_play">в Google Play</string>
+    <string name="and_data_usage">и използване на данни</string>
+    <string name="help_translate_this_app">Помогнете за превода на приложението</string>
+    <string name="exportPasswordHint">Въведете парола</string>
+    <string name="exportPassword">Задаване на парола за защита на изнесеното (по избор)</string>
 </resources>

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

@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="save">সংরক্ষণ</string>
+    <string name="cancel">বাতিল</string>
+    <string name="unstar">তারা মুক্ত</string>
+    <string name="star">তারা</string>
+    <string name="barcodeNoBarcode">বারকোড না বারকোড</string>
+    <string name="barcodeType">বারকোড ধরন</string>
+    <string name="note">বিঃদ্রঃ</string>
+    <string name="storeName">দোকানের নাম</string>
+    <string name="noMatchingGiftCards">কোন ম্যাচিং উপহার কার্ড নেই</string>
+    <string name="noGiftCards">উপহার কার্ড নেই</string>
+    <string name="action_add">কর্ম যোগ</string>
+    <string name="all">সব</string>
+    <string name="noGroupCards">গোষ্ঠী কার্ড নেই</string>
+    <string name="noGroups">গোষ্ঠীগুলি নেই</string>
+    <string name="groups">গোষ্ঠীগুলি</string>
+    <string name="enter_group_name">গোষ্ঠী নাম লিখুন </string>
+    <string name="exportSuccessful">রপ্তানি সফল</string>
+    <string name="importSuccessful">আগম সফল</string>
+    <string name="intent_import_card_from_url_share_text">url শেয়ার টেক্সট থেকে ইন্টেন্ট ইম্পোর্ট কার্ড</string>
+    <string name="settings_disable_lockscreen_while_viewing_card"> কার্ড দেখা কালিন লকস্ক্রিন নিষ্ক্রিয়</string>
+    <string name="settings_keep_screen_on">সেটিংস পর্দা খোলা রাখুন</string>
+    <string name="settings_lock_barcode_orientation"> তালাবদ্ধ বার কোড অভিযোজন</string>
+    <string name="settings_max_font_size_scale">সর্বোচ্চ হরফ আকার</string>
+    <string name="settings_light_theme">সাদাটে থিম</string>
+    <string name="settings_system_theme">যন্ত্রর থিম</string>
+    <string name="settings_theme">থিম</string>
+    <string name="settings_category_title_ui">বিভাগ শিরোনাম</string>
+    <string name="starImage">তারা ছবি</string>
+    <string name="importCatima">ক্যাতিনা আগম</string>
+    <string name="importLoyaltyCardKeychain">আমদানি লয়্যালটি কার্ড কীচেন</string>
+    <string name="importStocard">স্টো কার্ড আমদানি করুন</string>
+    <string name="importVoucherVault">আমদানি ভাউচার ভল্ট</string>
+    <string name="barcodeId">বারকোড আইডি</string>
+    <string name="sameAsCardId">কার্ড আইডির মতো</string>
+    <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>
+    <string name="photos">ছবি</string>
+    <string name="setFrontImage">সদর ছবি স্থাপন</string>
+    <string name="setBackImage">পিছনের ছবি স্থাপন</string>
+    <string name="removeImage">ছবি অপসারণ</string>
+    <string name="takePhoto">ছবি নেত্তয়া</string>
+    <string name="updateBarcodeQuestionTitle">হালনাগাদ বারকোড প্রশ্ন শিরোনাম</string>
+    <string name="updateBarcodeQuestionText">হালনাগাদ বারকোড প্রশ্ন টেক্সট </string>
+    <string name="yes">হাঁ</string>
+    <string name="no">না</string>
+    <string name="passwordRequired">পাসওয়ার্ড প্রয়োজন</string>
+    <string name="failedGeneratingShareURL">শেয়ার ইউআরএল তৈরি করতে ব্যর্থ হয়েছে</string>
+    <string name="turn_flashlight_on">টর্চলাইট চালু করুন</string>
+    <string name="turn_flashlight_off">টর্চলাইট বন্ধ করুন</string>
+    <string name="settings_locale">লোকেল</string>
+    <string name="settings_system_locale">সিস্টেম লোকেল</string>
+    <string name="settings_theme_color">থিম রঙ</string>
+    <string name="settings_catima_theme">কটিমা থিম</string>
+    <string name="settings_pink_theme">গোলাপী থিম</string>
+    <string name="settings_magenta_theme">ম্যাজেন্টা থিম</string>
+    <string name="settings_violet_theme">ভায়োলেট থিম</string>
+    <string name="settings_blue_theme">নীল থিম</string>
+    <string name="settings_sky_blue_theme">আকাশী নীল থিম</string>
+    <string name="settings_green_theme">সবুজ থিম</string>
+    <string name="settings_brown_theme">বাদামী থিম</string>
+    <string name="sort">সাজান</string>
+    <string name="toggleMoreInfo">আরও তথ্য টগল করুন</string>
+    <string name="swipeToSwitchImages">ছবি পরিবর্তন করতে সোয়াইপ করুন</string>
+    <string name="sort_by_name">নামের দ্বারা সাজান</string>
+    <string name="sort_by_most_recently_used">সর্বাধিক সম্প্রতি ব্যবহৃত দ্বারা সাজান</string>
+    <string name="sort_by_expiry">মেয়াদ শেষ করে সাজান</string>
+    <string name="reverse">বিপরীত</string>
+    <string name="sort_by">ক্রমানুসার</string>
+    <string name="noCardExistsError">কোন কার্ড নেই ত্রুটি</string>
+    <string name="noStoreError">স্টোরেজ ত্রুটি নেই</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="unlockScreen">পর্দা আনলক করুন</string>
+    <string name="confirm">নিশ্চিত করুন</string>
+    <string name="delete">মুছে ফেলুন</string>
+    <string name="edit">সম্পাদনা</string>
+</resources>

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

@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="save">Snimi</string>
+    <string name="cancel">Odustani</string>
+    <string name="unstar">Ukloni sve omiljene</string>
+    <string name="star">Omiljene</string>
+    <string name="barcodeNoBarcode">Ova kartica nema barkode</string>
+    <string name="barcodeType">Barcode tip</string>
+    <string name="note">Bilježnica</string>
+    <string name="storeName">Ime</string>
+    <string name="noMatchingGiftCards">Nisam našao ništa. Pokušaj promijeniti pretragu.</string>
+    <string name="noGiftCards">Kliknite + Plus dugme da dodate kartu ili uvozite nešto iz menija prvo.</string>
+    <string name="action_add">Dodaj</string>
+    <string name="all">Sve</string>
+    <string name="noGroupCards">Ova grupa ne sadrži nikakve karte</string>
+    <string name="noGroups">Kliknite + Plus dugme da dodate grupe za kategorizaciju prvo.</string>
+    <string name="groups">Grupe</string>
+    <string name="enter_group_name">Unesite ime grupe</string>
+    <string name="exportSuccessful">Podaci o kartama izvožen</string>
+    <string name="importSuccessful">Uvezeni podaci o kartama</string>
+    <string name="intent_import_card_from_url_share_text">Želim podijeliti čestitku s tobom</string>
+    <string name="settings_disable_lockscreen_while_viewing_card">Spriječi zaključavanje ekrana</string>
+    <string name="settings_keep_screen_on">Zadrži ekran</string>
+    <string name="settings_lock_barcode_orientation">Zaključaj barcode orjentacija</string>
+    <string name="settings_max_font_size_scale">Max. veliäťina fonta</string>
+    <string name="settings_light_theme">Svjetlo</string>
+    <string name="settings_system_theme">Sistem</string>
+    <string name="settings_theme">Tema</string>
+    <string name="settings_category_title_ui">Korisničko okruženje</string>
+    <string name="starImage">Omiljena zvijezda</string>
+    <string name="importCatima">Uvezi iz Catima</string>
+    <string name="importLoyaltyCardKeychain">Uvezi iz Loyalty Card Keychain</string>
+    <string name="importStocard">Uvezi iz Stokarda</string>
+    <string name="importVoucherVault">Uvezi iz trezora vaučer</string>
+    <string name="barcodeId">Barcode vrijednost</string>
+    <string name="sameAsCardId">Isto kao i kartica</string>
+    <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>
+    <string name="photos">Slike</string>
+    <string name="setFrontImage">Postavi naslovnu sliku</string>
+    <string name="setBackImage">Vrati sliku</string>
+    <string name="removeImage">Ukloni sliku</string>
+    <string name="takePhoto">Slikaj</string>
+    <string name="updateBarcodeQuestionTitle">Ažurirati bar kod vrijednost\?</string>
+    <string name="updateBarcodeQuestionText">Promijenio si auto. Da li želite ažurirati bar kod koristiti istu vrijednost\?</string>
+    <string name="yes">Da</string>
+    <string name="no">Ne.</string>
+    <string name="passwordRequired">Upišite šifru</string>
+    <string name="failedGeneratingShareURL">Ne mogu generisati oštriji URL. Molim vas, prijavite ovo.</string>
+    <string name="turn_flashlight_on">Upali lampu</string>
+    <string name="turn_flashlight_off">Ugasi lampu</string>
+    <string name="settings_locale">Jezik</string>
+    <string name="settings_system_locale">Sistem</string>
+    <string name="settings_theme_color">Boja teme</string>
+    <string name="settings_catima_theme">Catima</string>
+    <string name="settings_pink_theme">Ružičasto</string>
+    <string name="settings_magenta_theme">Ljubičasto</string>
+    <string name="settings_violet_theme">Ljubičasto</string>
+    <string name="settings_blue_theme">Plavo</string>
+    <string name="settings_sky_blue_theme">Nebo plavo</string>
+    <string name="settings_green_theme">Zeleno</string>
+    <string name="settings_brown_theme">Braun</string>
+    <string name="sort">Poništi sortiranje</string>
+    <string name="toggleMoreInfo">Uključi savjete</string>
+    <string name="swipeToSwitchImages">Swipe ili long press za prebacivanje slika</string>
+    <string name="sort_by_name">Ime</string>
+    <string name="sort_by_most_recently_used">Nedavno Korišten</string>
+    <string name="sort_by_expiry">Sajam</string>
+    <string name="reverse">Rikverc</string>
+    <string name="sort_by">Sortiraj</string>
+    <string name="noCardExistsError">Nisam mogao pronaći karticu</string>
+    <string name="noStoreError">Nije uneseno ime</string>
+    <string name="card_ids_copied">Kopiran ID kartice(s)</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="unlockScreen">Odblokalna Rotacija</string>
+    <string name="confirm">Potvrdi</string>
+    <string name="delete">Obriši</string>
+    <string name="edit">Izmijeni</string>
+</resources>

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" xmlns:tools="http://schemas.android.com/tools">
     <string name="action_add">Přidat</string>
     <string name="noGiftCards">Klepnutím na tlačítko + plus přidáte kartu nebo ji nejprve importujete z nabídky⋮.</string>
     <string name="storeName">Název</string>
@@ -16,7 +16,6 @@
     <string name="editCardTitle">Editovat věrnostní kartu</string>
     <string name="addCardTitle">Přidat věrnostní kartu</string>
     <string name="scanCardBarcode">Skenování Čárový Kód Karty</string>
-    <string name="barcodeImageDescription">Obrázek čárového kódu karty</string>
     <string name="noStoreError">Zadáno žádné jméno</string>
     <string name="noCardIdError">Žádné ID karty zadáno</string>
     <string name="importExport">Import/Export</string>
@@ -38,7 +37,7 @@
     <string name="importOptionApplicationExplanation">K otevření souboru použijte libovolnou aplikaci nebo svého oblíbeného správce souborů.</string>
     <string name="importOptionApplicationButton">Použijte jinou aplikaci</string>
     <string name="about">O aplikaci</string>
-    <string name="app_license">Copylefted libre software, licencovaný GPLv3+.</string>
+    <string name="app_license">Copylefted libre software, licencovaný GPLv3+</string>
     <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="app_revision_fmt">Informace o revizi: <xliff:g id="app_revision_url">%s</xliff:g></string>
@@ -56,7 +55,7 @@
     <string name="app_resources">Zdroje třetích stran Libre: <xliff:g id="app_resources_list">%s</xliff:g></string>
     <string name="app_libraries">Libre knihovny třetích stran: <xliff:g id="app_libraries_list">%s</xliff:g></string>
     <string name="app_copyright_old">Na základě Loyalty Card Keychain
-\ncopyright © 2016–2020 Branden Archer.</string>
+\ncopyright © 2016–2020 Branden Archer</string>
     <string name="exportOptionExplanation">Data budou zapsána na místo podle vašeho výběru.</string>
     <string name="failedParsingImportUriError">Nelze analyzovat import URI</string>
     <string name="noCardExistsError">Nelze najít kartu</string>
@@ -72,4 +71,147 @@
     <string name="barcodeType">Typ čárového kódu</string>
     <string name="noMatchingGiftCards">Nic jsem nenašel. Zkuste změnit vyhledávání.</string>
     <string name="action_search">Vyhledávání</string>
+    <string name="thumbnailDescription">Miniatura karty</string>
+    <string name="card_ids_copied">Zkopírované ID karty(karet)</string>
+    <plurals name="deleteCardsConfirmation">
+        <item quantity="one">Opravdu chcete kartu <xliff:g>%d</xliff:g> trvale odstranit\?</item>
+        <item quantity="few">Opravdu chcete karty <xliff:g>%d</xliff:g> trvale odstranit\?</item>
+        <item quantity="other">Opravdu chcete karty <xliff:g>%d</xliff:g> trvale odstranit\?</item>
+    </plurals>
+    <plurals name="deleteCardsTitle">
+        <item quantity="one">Odstranit kartu <xliff:g>%d</xliff:g></item>
+        <item quantity="few">Odstranit karty <xliff:g>%d</xliff:g></item>
+        <item quantity="other">Odstranit karty <xliff:g>%d</xliff:g></item>
+    </plurals>
+    <string name="importSuccessful">Data karty importována</string>
+    <string name="intent_import_card_from_url_share_text">Chci s Vámi sdílet kartu</string>
+    <string name="settings_disable_lockscreen_while_viewing_card">Bránit uzamykání obrazovky</string>
+    <string name="settings_keep_screen_on">Udržovat obrazovku zapnutou</string>
+    <string name="settings_lock_barcode_orientation">Zamknout orientaci čárového kódu</string>
+    <string name="settings_max_font_size_scale">Maximální velikost písma</string>
+    <string name="settings_dark_theme">Tmavý</string>
+    <string name="settings_light_theme">Světlý</string>
+    <string name="settings_system_theme">Systém</string>
+    <string name="settings_theme">Vzhled</string>
+    <string name="settings_category_title_ui">Uživatelské rozhraní</string>
+    <string name="settings">Nastavení</string>
+    <string name="card">Karta</string>
+    <string name="balancePoints"><xliff:g>%s</xliff:g> bodů</string>
+    <string name="balanceSentence">Zůstatek: <xliff:g>%s</xliff:g></string>
+    <string name="expiryStateSentenceExpired">Platnost vypršela: <xliff:g>%s</xliff:g></string>
+    <string name="expiryStateSentence">Platí do: <xliff:g>%s</xliff:g></string>
+    <string name="moveDown">Přesunout dolů</string>
+    <string name="moveUp">Přesunout nahoru</string>
+    <string name="enterBarcodeInstructions">Zadejte ID karty a níže vyberte typ čárového kódu nebo \"Tato karta nemá čárový kód\".</string>
+    <string name="settings_brown_theme">Hnědá</string>
+    <string name="settings_grey_theme">Šedá</string>
+    <string name="settings_green_theme">Zelená</string>
+    <string name="settings_sky_blue_theme">Azurová</string>
+    <string name="settings_blue_theme">Modrá</string>
+    <string name="settings_violet_theme">Fialová</string>
+    <string name="settings_magenta_theme">Purpurová</string>
+    <string name="settings_pink_theme">Růžová</string>
+    <string name="settings_catima_theme">Catima</string>
+    <string name="settings_theme_color">Barva motivu</string>
+    <string name="settings_system_locale">Systém</string>
+    <string name="settings_locale">Jazyk</string>
+    <string name="turn_flashlight_off">Vypnout světlo</string>
+    <string name="turn_flashlight_on">Zapnout světlo</string>
+    <string name="failedGeneratingShareURL">Nepodařilo se vygenerovat sdílenou adresu URL. Nahlaste to prosím.</string>
+    <string name="passwordRequired">Zadejte prosím heslo</string>
+    <string name="no">Ne</string>
+    <string name="yes">Ano</string>
+    <string name="updateBarcodeQuestionText">Změnili jste ID karty. Chcete také aktualizovat čárový kód, aby používal stejnou hodnotu\?</string>
+    <string name="updateBarcodeQuestionTitle">Aktualizovat hodnotu čárového kódu\?</string>
+    <string name="takePhoto">Pořídit fotku</string>
+    <string name="removeImage">Odstranit obrázek</string>
+    <string name="setBackImage">Nastavit obrázek zadní strany</string>
+    <string name="setFrontImage">Nastavit obrázek přední strany</string>
+    <string name="photos">Fotky</string>
+    <string name="backImageDescription">Obrázek zadní strany karty</string>
+    <string name="frontImageDescription">Obrázek přední strany karty</string>
+    <string name="intent_import_card_from_url_share_multiple_text">Chci s Vámi sdílet kartu</string>
+    <string name="copy_to_clipboard_multiple_toast">ID karty zkopírováno 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>
+    <string name="setBarcodeId">Nastavení hodnoty čárového kódu</string>
+    <string name="sameAsCardId">Stejné jako ID karty</string>
+    <string name="importVoucherVaultMessage">Vyberte svůj <i>vouchervault.json</i> export z Voucher Vault, který chcete importovat.
+\nVytvořte jej tak, že nejprve stisknete tlačítko Exportovat v aplikaci Voucher Vault.</string>
+    <string name="importVoucherVault">Import z Voucher Vault</string>
+    <string name="importStocardMessage">Vyberte svůj <i>***-sync.zip</i> export z aplikace Stocard, který chcete importovat.
+\nZískejte ji zasláním e-mailu na adresu support@stocardapp.com s žádostí o export vašich dat.</string>
+    <string name="importStocard">Import ze Stocard</string>
+    <string name="importLoyaltyCardKeychainMessage">Vyberte export <i>LoyaltyCardKeychain.csv</i> z klíčenky věrnostních karet, který chcete importovat.
+\nVytvořte jej z nabídky Import/Export v Loyalty Card Keychain tak, že tam nejprve stisknete tlačítko Exportovat.</string>
+    <string name="importLoyaltyCardKeychain">Import z Loyalty Card Keychain</string>
+    <string name="importFidmeMessage">Vyberte svůj <i>fidme-export-request-xxxxxx.zip</i> export z FidMe k importu a poté vyberte typy čárových kódů ručně.
+\nVytvořte jej ze svého profilu FidMe tak, že nejprve zvolíte možnost Ochrana dat a poté stisknete tlačítko Extract moje data.</string>
+    <string name="importFidme">Import z FidMe</string>
+    <string name="importCatimaMessage">Vyberte export <i>catima.zip</i> z programu Catima, který chcete importovat.
+\nVytvořte jej z nabídky Import/Export jiné aplikace Catima tak, že v ní nejprve stisknete tlačítko Exportovat.</string>
+    <string name="importCatima">Import z Catima</string>
+    <string name="accept">Přijmout</string>
+    <string name="privacy_policy_popup_text">Oznámení o zásadách ochrany osobních údajů (vyžadováno některými obchody s aplikacemi):
+\n
+\nNejsou shromažďovány žádné údaje, což může potvrdit každý, protože naše aplikace je libre software.</string>
+    <string name="privacy_policy">Zásady soukromí</string>
+    <string name="app_loyalty_card_keychain">Loyalty Card Keychain</string>
+    <string name="chooseImportType">Importovat data z\?</string>
+    <string name="parsingBalanceFailed"><xliff:g>%s</xliff:g> se nezdá být platným zůstatkem.</string>
+    <string name="points">Body</string>
+    <string name="currency">Měna</string>
+    <string name="balance">Zůstatek</string>
+    <string name="errorReadingImage">Obrázek se nepodařilo přečíst</string>
+    <string name="noBarcodeFound">Čarový 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 karty</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>
+    <string name="deleteConfirmationGroup">Smazat skupinu\?</string>
+    <string name="all">Všechny</string>
+    <plurals name="groupCardCount">
+        <item quantity="one"><xliff:g>%d</xliff:g> karta</item>
+        <item quantity="few"><xliff:g>%d</xliff:g> karty</item>
+        <item quantity="other"><xliff:g>%d</xliff:g> karet</item>
+    </plurals>
+    <string name="noGroups">Kliknutím na tlačítko + plus nejprve přidejte skupiny pro kategorizaci.</string>
+    <string name="groups">Skupiny</string>
+    <string name="enter_group_name">Zadejte název skupiny</string>
+    <string name="exportSuccessful">Data karty exportována</string>
+    <string name="settings_display_barcode_max_brightness">Rozjasněné zobrazení čárového kódu</string>
+    <string name="starImage">Oblíbená hvězda</string>
+    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Copyright © 2019–<xliff:g>%d</xliff:g> Sylvia van Os</string>
+    <plurals name="selectedCardCount">
+        <item quantity="one">Vybrána <xliff:g>%d</xliff:g> karta</item>
+        <item quantity="few">Vybrány <xliff:g>%d</xliff:g> karty</item>
+        <item quantity="other">Vybráno <xliff:g>%d</xliff:g> karet</item>
+    </plurals>
+    <string name="app_contributors">Přispěli: <xliff:g id="app_contributors">%s</xliff:g></string>
+    <string name="noGroupCards">Tato skupina neobsahuje žádné karty</string>
+    <string name="sort_by">Seřadit podle</string>
+    <string name="reverse">Obrátit</string>
+    <string name="sort_by_balance">Zůstatek</string>
+    <string name="sort_by_expiry">Vypršení</string>
+    <string name="sort_by_most_recently_used">Naposledy použité</string>
+    <string name="sort_by_name">Název</string>
+    <string name="swipeToSwitchImages">Přejetím nebo dlouhým stisknutím přepínáte obrázky</string>
+    <string name="toggleMoreInfo">Přepnout zobrazení dalších informací</string>
+    <string name="sort">Seřadit</string>
+    <string name="barcodeImageDescriptionWithType">Obrázek čárového kódu karty typu <xliff:g>%s</xliff:g></string>
+    <string name="version_history">Historie verzí</string>
+    <string name="rate_this_app">Ohodnoťte tuto aplikaci</string>
+    <string name="and_data_usage">a využití dat</string>
+    <string name="credits">Kredity</string>
+    <string name="on_github">na GitHubu</string>
+    <string name="source_repository">Úložiště zdrojů</string>
+    <string name="license">Licence</string>
+    <string name="help_translate_this_app">Pomozte s překladem této aplikace</string>
+    <string name="report_error">Nahlásit chybu</string>
+    <string name="on_google_play">na Google Play</string>
+    <string name="exportPassword">Nastavení hesla pro ochranu exportu (volitelné)</string>
+    <string name="exportPasswordHint">Zadejte heslo</string>
 </resources>

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

@@ -36,4 +36,61 @@
     </plurals>
     <string name="action_add">Tilføj</string>
     <string name="action_search">Søg</string>
+    <string name="importExport">Import/eksport</string>
+    <string name="exportName">Eksport</string>
+    <string name="importExportHelp">Hvis du sikkerhedskopierer dine kort, kan du flytte dem til en anden enhed.</string>
+    <string name="importSuccessfulTitle">Importeret</string>
+    <string name="importFailedTitle">Import mislykkedes</string>
+    <string name="importFailed">Kunne ikke importere kort</string>
+    <string name="exportSuccessfulTitle">Eksporteret</string>
+    <string name="exportFailedTitle">Eksport mislykkedes</string>
+    <string name="exportFailed">Kunne ikke eksportere kort</string>
+    <string name="importing">Importere…</string>
+    <string name="exporting">Eksportere…</string>
+    <string name="settings_dark_theme">Mørk</string>
+    <string name="settings_light_theme">Lys</string>
+    <string name="settings_theme">Tema</string>
+    <string name="settings_category_title_ui">Brugergrænseflade</string>
+    <string name="settings">Indstillinger</string>
+    <string name="starImage">Favorit stjerne</string>
+    <string name="thumbnailDescription">Miniaturebillede til kort</string>
+    <string name="copy_to_clipboard_toast">Kort-ID kopieret til udklipsholderen</string>
+    <string name="enterBarcodeInstructions">Indtast kortets ID, og vælg enten kortets stregkodetype nedenfor, eller \"Dette kort har ingen stregkode\".</string>
+    <string name="selectBarcodeTitle">Vælg stregkode</string>
+    <string name="app_copyright_old">Baseret på Loyalty Card Keychain
+\ncopyright © 2016-2020 Branden Archer.</string>
+    <string name="about">Om</string>
+    <string name="importOptionApplicationButton">Brug en anden app</string>
+    <string name="importOptionApplicationExplanation">Brug en hvilken som helst app eller din foretrukne filhåndtering til at åbne en fil.</string>
+    <string name="importOptionApplicationTitle">Brug en anden app</string>
+    <string name="noCardsMessage">Tilføj først et kort</string>
+    <string name="cardShortcut">Kort genvej</string>
+    <string name="importOptionFilesystemButton">Fra filsystemet</string>
+    <string name="importOptionFilesystemExplanation">Vælg en bestemt fil fra filsystemet.</string>
+    <string name="importOptionFilesystemTitle">Import fra filsystem</string>
+    <string name="exportOptionExplanation">Dataene skrives til en placering efter eget valg.</string>
+    <string name="noExternalStoragePermissionError">Giv først tilladelse til ekstern lagring til at importere eller eksportere kort</string>
+    <string name="failedParsingImportUriError">Kunne ikke analysere import-URI\'en</string>
+    <string name="noCardExistsError">Kunne ikke finde kort</string>
+    <string name="noCardIdError">Der er ikke angivet noget kort-ID</string>
+    <string name="noStoreError">Intet navn angivet</string>
+    <string name="deleteConfirmationGroup">Slet gruppe\?</string>
+    <string name="all">Alle</string>
+    <string name="noGroupCards">Denne gruppe indeholder ikke nogen kort</string>
+    <string name="noGroups">Klik på + plus-knappen for først at tilføje grupper til kategorisering.</string>
+    <string name="groups">Grupper</string>
+    <string name="enter_group_name">Indtast gruppenavn</string>
+    <string name="exportSuccessful">Eksporterede kortdata</string>
+    <string name="importSuccessful">Kortdata importeret</string>
+    <string name="intent_import_card_from_url_share_text">Jeg vil dele et kort med jer</string>
+    <string name="settings_disable_lockscreen_while_viewing_card">Forebyg låseskærm</string>
+    <string name="settings_keep_screen_on">LHold skærm tændt</string>
+    <string name="settings_lock_barcode_orientation">Lås stregkode-orientering</string>
+    <string name="moveUp">Bevæg dig opad</string>
+    <string name="leaveWithoutSaveConfirmation">Forlade uden at gemme\?</string>
+    <string name="settings_display_barcode_max_brightness">Lysere stregkodevisning</string>
+    <string name="failedOpeningFileManager">Installer først en filhåndteringsprogram.</string>
+    <string name="moveDown">Bevæger sig nedad</string>
+    <string name="leaveWithoutSaveTitle">Afslut</string>
+    <string name="addManually">Indtast kort-ID manuelt</string>
 </resources>

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

@@ -2,8 +2,8 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" xmlns:tools="http://schemas.android.com/tools">
     <string name="action_search">Suchen</string>
     <string name="action_add">Hinzufügen</string>
-    <string name="noGiftCards">Klicken Sie auf das Pluszeichen +, um eine Karte hinzuzufügen, oder importieren Sie zunächst einige aus dem ⋮ Menü.</string>
-    <string name="noMatchingGiftCards">Nichts gefunden. Versuchen Sie, Ihre Suche zu ändern.</string>
+    <string name="noGiftCards">Füge eine Karte mit + hinzu oder importiere welche über das ⋮ Menü.</string>
+    <string name="noMatchingGiftCards">Nichts gefunden. Versuche, deine Suche zu ändern.</string>
     <string name="storeName">Name</string>
     <string name="note">Notiz</string>
     <string name="cardId">Kartennummer</string>
@@ -12,25 +12,24 @@
     <string name="edit">Bearbeiten</string>
     <string name="delete">Löschen</string>
     <string name="confirm">Bestätigen</string>
-    <string name="lockScreen">Rotation blockieren</string>
-    <string name="unlockScreen">Rotation zulassen</string>
+    <string name="lockScreen">Rotation sperren</string>
+    <string name="unlockScreen">Rotation erlauben</string>
     <string name="star">Zu den Favoriten hinzufügen</string>
-    <string name="unstar">Aus der Favoritenliste entfernen</string>
+    <string name="unstar">Aus den Favoriten entfernen</string>
     <string name="ok">OK</string>
-    <string name="copy_to_clipboard">Nummer in die Zwischenablage kopieren</string>
+    <string name="copy_to_clipboard">Kartennummer in die Zwischenablage kopieren</string>
     <string name="sendLabel">Senden …</string>
-    <string name="editCardTitle">Kundenkarte bearbeiten</string>
-    <string name="addCardTitle">Neue Kundenkarte</string>
-    <string name="scanCardBarcode">Strichcode scannen</string>
+    <string name="editCardTitle">Karte bearbeiten</string>
+    <string name="addCardTitle">Neue Karte</string>
+    <string name="scanCardBarcode">Barcode scannen</string>
     <string name="cardShortcut">Shortcut zu einer Karte</string>
-    <string name="noCardsMessage">Fügen Sie zuerst eine Karte hinzu</string>
-    <string name="barcodeImageDescription">Bild des Strichcodes</string>
+    <string name="noCardsMessage">Füge zuerst eine Karte hinzu</string>
     <string name="noStoreError">Kein Name eingegeben</string>
     <string name="noCardIdError">Keine Kartennummer angegeben</string>
     <string name="noCardExistsError">Karte konnte nicht gefunden werden</string>
     <string name="importExport">Import/Export</string>
-    <string name="exportName">Exportieren</string>
-    <string name="importExportHelp">Durch das Sichern Ihrer Karten können Sie sie auf ein anderes Gerät verschieben.</string>
+    <string name="exportName">Export</string>
+    <string name="importExportHelp">Durch das Sichern deiner Karten kannst du sie auf ein anderes Gerät übertragen.</string>
     <string name="importSuccessfulTitle">Importiert</string>
     <string name="importFailedTitle">Import fehlgeschlagen</string>
     <string name="importFailed">Karten konnten nicht importiert werden</string>
@@ -39,51 +38,52 @@
     <string name="exportFailed">Karten konnten nicht exportiert werden</string>
     <string name="importing">Importiere…</string>
     <string name="exporting">Exportiere…</string>
-    <string name="noExternalStoragePermissionError">Erteilen Sie zuerst die Erlaubnis zur externen Speicherung, um Karten zu importieren oder zu exportieren</string>
-    <string name="importOptionFilesystemTitle">Importiere aus Dateisystem</string>
-    <string name="importOptionFilesystemExplanation">Wähle eine Datei aus dem Speicher aus.</string>
-    <string name="importOptionFilesystemButton">Aus Dateisystem</string>
-    <string name="importOptionApplicationTitle">Andere Anwendung verwenden</string>
-    <string name="importOptionApplicationExplanation">Verwenden Sie eine beliebige Anwendung oder Ihren bevorzugten Dateiverwaltungsprogramm, um eine Datei zu öffnen.</string>
-    <string name="importOptionApplicationButton">Andere Anwendung verwenden</string>
+    <string name="noExternalStoragePermissionError">Erlaube Speicherzugriff um Karten zu importieren oder exportieren</string>
+    <string name="importOptionFilesystemTitle">Importiere aus dem Dateisystem</string>
+    <string name="importOptionFilesystemExplanation">Wähle eine Datei vom Dateisystem aus.</string>
+    <string name="importOptionFilesystemButton">Wähle vom Dateisystem</string>
+    <string name="importOptionApplicationTitle">Andere Anwendungen</string>
+    <string name="importOptionApplicationExplanation">Beliebige Anwendung oder deinen bevorzugten Dateimanager zur Dateiauswahl verwenden.</string>
+    <string name="importOptionApplicationButton">Aus anderer Anwendung</string>
     <string name="about">Über</string>
-    <string name="app_license">Freie Software, lizensiert unter der GPLv3+.</string>
+    <string name="app_license">Freie Software, lizensiert unter der GPLv3+</string>
     <string name="about_title_fmt">Über <xliff:g id="app_name">%s</xliff:g></string>
     <string name="debug_version_fmt">Version: <xliff:g id="version">%s</xliff:g></string>
-    <string name="app_revision_fmt">Informationen zu dieser Version: <xliff:g id="app_revision_url">%s</xliff:g></string>
-    <string name="selectBarcodeTitle">Strichcode auswählen</string>
-    <string name="copy_to_clipboard_toast">Nummer in die Zwischenablage kopiert</string>
+    <string name="app_revision_fmt">Revisionsinfo: <xliff:g id="app_revision_url">%s</xliff:g></string>
+    <string name="selectBarcodeTitle">Barcode auswählen</string>
+    <string name="copy_to_clipboard_toast">Kartennummer in die Zwischenablage kopiert</string>
     <string name="thumbnailDescription">Vorschaubild für die Karte</string>
     <string name="settings">Einstellungen</string>
     <string name="settings_category_title_ui">Benutzeroberfläche</string>
-    <string name="settings_display_barcode_max_brightness">Helligkeit bei Strichcode Ansicht erhöhen</string>
-    <string name="settings_lock_barcode_orientation">Strichcodeausrichtung sperren</string>
+    <string name="settings_display_barcode_max_brightness">Barcodeansicht aufhellen</string>
+    <string name="settings_lock_barcode_orientation">Barcoderotation sperren</string>
     <string name="exportSuccessful">Kartendaten exportiert</string>
     <string name="importSuccessful">Kartendaten importiert</string>
-    <string name="intent_import_card_from_url_share_text">Ich will eine Karte mit Ihnen teilen</string>
+    <string name="intent_import_card_from_url_share_text">Ich würde gerne diese Karte mit dir teilen</string>
     <string name="settings_dark_theme">Dunkel</string>
     <string name="settings_light_theme">Hell</string>
     <string name="settings_system_theme">System</string>
-    <string name="settings_theme">Design</string>
-    <string name="enterBarcodeInstructions">Geben Sie die Karten-ID ein und wählen Sie unten entweder den Strichcodetyp oder „Diese Karte hat keinen Strichcode“.</string>
+    <string name="settings_theme">Farbschema</string>
+    <string name="enterBarcodeInstructions">Gib die Kartennummer ein und wähle entweder den Barcode-Typ unten oder wähle \"Diese Karte hat keinen Barcode\" aus.</string>
     <string name="app_copyright_old">Basierend auf Loyalty Card Keychain
-\nCopyright © 2016-2020 Branden Archer.</string>
-    <string name="exportOptionExplanation">Die Daten werden an einen Ort Ihrer Wahl geschrieben.</string>
-    <string name="failedParsingImportUriError">Der Import-URI konnte nicht analysiert werden</string>
+\nCopyright © 2016-2020 Branden Archer</string>
+    <string name="exportOptionExplanation">Die Daten werden an einen Ort deiner Wahl geschrieben.</string>
+    <string name="failedParsingImportUriError">Die Import-URI konnte nicht verarbeitet werden</string>
     <string name="share">Teilen</string>
-    <string name="barcodeNoBarcode">Diese Karte hat keinen Strichcode</string>
-    <string name="barcodeType">Strichcode-Typ</string>
+    <string name="barcodeNoBarcode">Diese Karte hat keinen Barcode</string>
+    <string name="barcodeType">Barcodetyp</string>
     <string name="starImage">Favoritenstern</string>
-    <string name="deleteConfirmationGroup">Gruppe löschen\?</string>
+    <string name="deleteConfirmationGroup">Gruppe löschen?</string>
     <string name="all">Alle</string>
-    <string name="noGroups">Klicken Sie auf das Pluszeichen +, um zunächst Gruppen zur Kategorisierung hinzuzufügen.</string>
+    <string name="noGroups">Klicke auf das Pluszeichen + um eine Gruppe hinzuzufügen.</string>
+    <string name="noGroupCards">Diese Gruppe hat noch keine Karten</string>
     <string name="groups">Gruppen</string>
-    <string name="enter_group_name">Geben Sie den Gruppennamen ein</string>
+    <string name="enter_group_name">Gib einen Gruppennamen ein</string>
     <string name="leaveWithoutSaveConfirmation">Beenden ohne zu speichern\?</string>
     <string name="leaveWithoutSaveTitle">Beenden</string>
-    <string name="failedOpeningFileManager">Installieren Sie zunächst ein Dateiverwaltungsprogramm.</string>
-    <string name="noBarcode">Kein Strichcode</string>
-    <string name="addManually">Die Karten-ID manuell eingeben</string>
+    <string name="failedOpeningFileManager">Installiere zuerst einen Dateimanager.</string>
+    <string name="noBarcode">Kein Barcode</string>
+    <string name="addManually">Kartennummer manuell eingeben</string>
     <string name="moveDown">Nach unten verschieben</string>
     <string name="moveUp">Nach oben verschieben</string>
     <plurals name="groupCardCount">
@@ -91,18 +91,18 @@
         <item quantity="other"><xliff:g>%d</xliff:g> Karten</item>
     </plurals>
     <string name="groupsList">Gruppen: <xliff:g>%s</xliff:g></string>
-    <string name="app_loyalty_card_keychain">Bonuskartenschlüsselring</string>
-    <string name="chooseImportType">Daten importieren aus\?</string>
+    <string name="app_loyalty_card_keychain">Loyalty Card Keychain</string>
+    <string name="chooseImportType">Daten importieren aus?</string>
     <string name="parsingBalanceFailed"><xliff:g>%s</xliff:g> scheint kein gültiges Guthaben zu sein.</string>
     <string name="points">Punkte</string>
     <string name="currency">Währung</string>
     <string name="balance">Guthaben</string>
-    <string name="moveBarcodeToCenterOfScreen">Strichcode auf dem Bildschirm zentrieren</string>
-    <string name="moveBarcodeToTopOfScreen">Strichcode auf dem Bildschirm nach oben schieben</string>
+    <string name="moveBarcodeToCenterOfScreen">Barcode auf dem Bildschirm zentrieren</string>
+    <string name="moveBarcodeToTopOfScreen">Barcode auf dem Bildschirm oben fixieren</string>
     <string name="chooseExpiryDate">Ablaufdatum wählen</string>
     <string name="never">Nie</string>
     <string name="expiryDate">Ablaufdatum</string>
-    <string name="editBarcode">Strichcode bearbeiten</string>
+    <string name="editBarcode">Barcode ändern</string>
     <string name="barcode">Strichcode</string>
     <string name="card">Karte</string>
     <string name="balancePoints"><xliff:g>%s</xliff:g> Punkte</string>
@@ -110,63 +110,63 @@
     <string name="expiryStateSentenceExpired">Abgelaufen: <xliff:g>%s</xliff:g></string>
     <string name="expiryStateSentence">Läuft ab: <xliff:g>%s</xliff:g></string>
     <string name="settings_disable_lockscreen_while_viewing_card">Sperrbildschirm verhindern</string>
-    <string name="settings_keep_screen_on">Bildschirm eingeschaltet halten</string>
+    <string name="settings_keep_screen_on">Bildschirm aktiv halten</string>
     <string name="privacy_policy_popup_text">Hinweis zum Datenschutz (oft gefordert):
 \n
 \nKEINE DATEN WERDEN GESAMMELT, was jeder bestätigen kann, da unsere Anwendung eine freie Software ist.</string>
     <string name="accept">Annehmen</string>
     <string name="privacy_policy">Datenschutzrichtlinie</string>
     <string name="importVoucherVaultMessage">Wählen Sie Ihren <i>vouchervault.json</i>-Export aus Voucher Vault zum Importieren aus.
-\nOder erstellen Sie ihn, indem Sie zuerst auf Export in Voucher Vault drücken.</string>
+\nErstellen Sie ihn, indem Sie zuerst auf Export in Voucher Vault drücken.</string>
     <string name="importVoucherVault">Aus Voucher Vault importieren</string>
     <string name="importLoyaltyCardKeychainMessage">Wählen Sie Ihren <i>LoyaltyCardKeychain.csv</i>-Export aus Loyalty Card Keychain zum Importieren aus.
-\nOder erstellen Sie ihn über das Menü Import/Export in Loyalty Card Keychain, indem Sie dort zuerst auf Export drücken.</string>
+\nErstellen Sie ihn über das Menü Import/Export in Loyalty Card Keychain, indem Sie dort zuerst auf Export drücken.</string>
     <string name="importLoyaltyCardKeychain">Aus Loyalty Card Keychain importieren</string>
     <string name="importFidmeMessage">Wählen Sie Ihren <i>fidme-export-request-xxxxxx.zip</i>-Export aus FidMe zum Importieren aus und wählen Sie anschließend die Strichcodetypen manuell aus.
 \nOder erstellen Sie ihn aus Ihrem FidMe-Profil, indem Sie Datenschutz wählen und dann zuerst auf Meine Daten extrahieren drücken.</string>
     <string name="importFidme">Aus FidMe importieren</string>
     <string name="importCatimaMessage">Wählen Sie Ihren <i>catima.zip</i>-Export aus Catima zum Importieren aus.
-\nOder erstellen Sie ihn aus dem Import/Export-Menü einer anderen Catima-Anwendung, indem Sie dort zuerst Export drücken.</string>
+\nErstellen Sie ihn aus dem Import/Export-Menü einer anderen Catima-Anwendung, indem Sie dort zuerst Export drücken.</string>
     <string name="importCatima">Aus Catima importieren</string>
-    <string name="setBarcodeId">Strichcodewert setzen</string>
-    <string name="sameAsCardId">Gleich wie Karten-ID</string>
-    <string name="barcodeId">Strichcodewert</string>
-    <string name="errorReadingImage">Das Bild konnte nicht gelesen werden</string>
-    <string name="noBarcodeFound">Kein Strichcode gefunden</string>
-    <string name="addFromImage">Bild aus der Galerie auswählen</string>
-    <string name="settings_max_font_size_scale">Max. Schriftgröße</string>
-    <string name="unsupportedBarcodeType">Dieser Strichcodetyp kann noch nicht angezeigt werden. Er wird möglicherweise in einer späteren Version der Anwendung unterstützt.</string>
-    <string name="wrongValueForBarcodeType">Der Wert ist für den gewählten Strichcodetyp nicht gültig</string>
+    <string name="setBarcodeId">Manuell eingeben</string>
+    <string name="sameAsCardId">Entspricht Kartennummer</string>
+    <string name="barcodeId">Barcodewert</string>
+    <string name="errorReadingImage">Bildverarbeitung fehlgeschlagen</string>
+    <string name="noBarcodeFound">Kein Barcode erkannt</string>
+    <string name="addFromImage">Bild aus der Galerie wählen</string>
+    <string name="settings_max_font_size_scale">Maximale Schriftgröße</string>
+    <string name="unsupportedBarcodeType">Dieser Barcodetyp kann noch nicht angezeigt werden. Wir hoffen das Format in einer zukünftigen Version zu unterstützen.</string>
+    <string name="wrongValueForBarcodeType">Der Wert ist für den gewählten Barcodetyp leider nicht gültig</string>
     <string name="app_resources">Freie Ressourcen von Drittanbietern: <xliff:g id="app_resources_list">%s</xliff:g></string>
     <string name="app_libraries">Freie Bibliotheken von Drittanbietern: <xliff:g id="app_libraries_list">%s</xliff:g></string>
-    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Copyright © 2019–<xliff:g>%d</xliff:g> Sylvia van Os.</string>
-    <string name="intent_import_card_from_url_share_multiple_text">Ich möchte Karten mit dir teilen</string>
+    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Copyright © 2019–<xliff:g>%d</xliff:g> Sylvia van Os</string>
+    <string name="intent_import_card_from_url_share_multiple_text">Ich möchte diese Karten mit dir teilen</string>
     <string name="copy_to_clipboard_multiple_toast">Kartennummern in die Zwischenablage kopiert</string>
     <string name="card_ids_copied">Kartennummer(n) kopiert</string>
     <string name="no">Nein</string>
     <string name="yes">Ja</string>
-    <string name="updateBarcodeQuestionText">Sie haben die Karten-ID geändert. Möchten Sie auch den Strichcode aktualisieren, um denselben Wert zu verwenden\?</string>
-    <string name="updateBarcodeQuestionTitle">Strichcodewert aktualisieren\?</string>
+    <string name="updateBarcodeQuestionText">Kartennummer geändert. Möchtest du auch den Barcode auf den gleichen Wert ändern?</string>
+    <string name="updateBarcodeQuestionTitle">Barcodewert aktualisieren?</string>
     <string name="takePhoto">Foto aufnehmen</string>
     <string name="removeImage">Bild entfernen</string>
-    <string name="setBackImage">Rückseitenbild einstellen</string>
-    <string name="setFrontImage">Vorderseitenbild einstellen</string>
+    <string name="setBackImage">Kartenrückseite</string>
+    <string name="setFrontImage">Kartenvorderseite</string>
     <string name="photos">Fotos</string>
     <string name="frontImageDescription">Bild der Kartenvorderseite</string>
     <string name="backImageDescription">Bild der Kartenrückseite</string>
-    <string name="passwordRequired">Bitte geben Sie das Passwort ein</string>
+    <string name="passwordRequired">Bitte gib das Passwort ein</string>
     <string name="importStocardMessage">Wählen Sie Ihren <i>***-sync.zip</i>-Export aus Stocard zum Importieren aus.
-\nOder Sie erhalten ihn, indem Sie eine E-Mail an support@stocardapp.com senden und um einen Export Ihrer Daten bitten.</string>
+\nSie erhalten ihn, indem Sie eine E-Mail an support@stocardapp.com senden und um einen Export Ihrer Daten bitten.</string>
     <string name="importStocard">Von Stocard importieren</string>
-    <string name="turn_flashlight_off">Taschenlampe ausschalten</string>
-    <string name="turn_flashlight_on">Taschenlampe einschalten</string>
-    <string name="failedGeneratingShareURL">Keine teilbare URL konnte generiert werden. Bitte melden Sie dies.</string>
+    <string name="turn_flashlight_off">Licht ausschalten</string>
+    <string name="turn_flashlight_on">Licht einschalten</string>
+    <string name="failedGeneratingShareURL">URL konnte nicht erstellt werden. Bitte melde das an uns.</string>
     <plurals name="selectedCardCount">
         <item quantity="one"><xliff:g>%d</xliff:g> Karte ausgewählt</item>
         <item quantity="other"><xliff:g>%d</xliff:g> Karten ausgewählt</item>
     </plurals>
-    <string name="deleteTitle">Karte entfernen</string>
-    <string name="deleteConfirmation">Diese Karte löschen\?</string>
+    <string name="deleteTitle">Karte löschen</string>
+    <string name="deleteConfirmation">Diese Karte wirklich löschen?</string>
     <plurals name="deleteCardsConfirmation">
         <item quantity="one">Diese <xliff:g>%d</xliff:g> Karte endgültig löschen\?</item>
         <item quantity="other">Diese <xliff:g>%d</xliff:g> Karten endgültig löschen\?</item>
@@ -175,4 +175,39 @@
         <item quantity="one"><xliff:g>%d</xliff:g> Karte löschen</item>
         <item quantity="other"><xliff:g>%d</xliff:g> Karten löschen</item>
     </plurals>
+    <string name="settings_system_locale">System</string>
+    <string name="settings_locale">Sprache</string>
+    <string name="settings_brown_theme">Braun</string>
+    <string name="settings_grey_theme">Grau</string>
+    <string name="settings_green_theme">Grün</string>
+    <string name="settings_sky_blue_theme">Himmelblau</string>
+    <string name="settings_blue_theme">Blau</string>
+    <string name="settings_violet_theme">Violett</string>
+    <string name="settings_magenta_theme">Magenta</string>
+    <string name="settings_pink_theme">Rosa</string>
+    <string name="settings_catima_theme">Catima</string>
+    <string name="settings_theme_color">Designfarbe</string>
+    <string name="app_contributors">Ermöglicht durch: <xliff:g id="app_contributors">%s</xliff:g></string>
+    <string name="toggleMoreInfo">Umschalten, um weitere Informationen anzuzeigen</string>
+    <string name="barcodeImageDescriptionWithType">Bild des Kartenstrichcodes des Typs <xliff:g>%s</xliff:g></string>
+    <string name="swipeToSwitchImages">Wischen oder langes Drücken zum Wechseln der Bilder</string>
+    <string name="sort_by">Sortieren nach</string>
+    <string name="sort_by_balance">Kontostand</string>
+    <string name="sort_by_expiry">Ablaufdatum</string>
+    <string name="sort_by_most_recently_used">Zuletzt verwendet</string>
+    <string name="sort_by_name">Name</string>
+    <string name="sort">Sortieren</string>
+    <string name="reverse">Umgekehrt</string>
+    <string name="version_history">Versionshistorie</string>
+    <string name="credits">Dank an</string>
+    <string name="help_translate_this_app">Hilfe bei der Übersetzung</string>
+    <string name="and_data_usage">und Datennutzung</string>
+    <string name="rate_this_app">Bewerte die Anwendung</string>
+    <string name="on_google_play">auf Google Play</string>
+    <string name="license">Lizenz</string>
+    <string name="source_repository">Quellcode</string>
+    <string name="on_github">auf GitHub</string>
+    <string name="report_error">Fehler melden</string>
+    <string name="exportPassword">Legen Sie ein Passwort fest, um Ihren Export zu schützen (optional)</string>
+    <string name="exportPasswordHint">Passwort eingeben</string>
 </resources>

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

@@ -20,7 +20,6 @@
     <string name="scanCardBarcode">Σαρώστε τον κωδικό της κάρτας</string>
     <string name="cardShortcut">Συντόμευση Κάρτας</string>
     <string name="noCardsMessage">Δεν υπάρχουν κάρτες. προσθέστε μία πρώτα</string>
-    <string name="barcodeImageDescription">Εικόνα του barcode της κάρτας</string>
     <string name="noStoreError">Δεν δώσατε κατάστημα</string>
     <string name="noCardIdError">Δεν δώσατε κωδικό κάρτας</string>
     <string name="noCardExistsError">Δεν ήταν δυνατό να εντοπιστεί κάρτα</string>

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

@@ -52,4 +52,40 @@
     <string name="action_search">Serĉi</string>
     <string name="deleteConfirmation">Ĉu forigi ĉi tiun karton\?</string>
     <string name="deleteTitle">Forigi karton</string>
+    <string name="settings_lock_barcode_orientation">Seruro barcode orientiĝo</string>
+    <string name="settings_display_barcode_max_brightness">Heligi barcode vido</string>
+    <string name="settings_max_font_size_scale">Max. tiparo grandeco</string>
+    <string name="starImage">Preferata stelo</string>
+    <string name="thumbnailDescription">Bildeto por karto</string>
+    <string name="app_copyright_old">Bazita sur Lojaleco Karto Keychain
+\nkopirajto © 2016-2020 Branden Archer.</string>
+    <string name="importOptionApplicationButton">Uzi alian app</string>
+    <string name="importOptionApplicationExplanation">Uzi ajna app aŭ via preferata dosiera # mana\? ero por malfermi dosieron.</string>
+    <string name="importOptionApplicationTitle">Uzi alian app</string>
+    <string name="importOptionFilesystemExplanation">Elektu specifa dosiero de la dosiersistemo.</string>
+    <string name="exportOptionExplanation">La datumoj estos skribita al loko de via elekto.</string>
+    <string name="noExternalStoragePermissionError">Grant ekstera stokado permeso de importado aŭ eksportado kartoj unua</string>
+    <string name="exportFailed">Ne povis eksporti kartoj</string>
+    <string name="importFailed">Ne povis importi kartoj</string>
+    <string name="importExportHelp">Subtenanta supre vian kartoj permesas vin movi ilin al alia aparato.</string>
+    <string name="failedParsingImportUriError">Ne eblis analizi la importado URI</string>
+    <string name="noCardExistsError">Ne eblis trovi karto</string>
+    <string name="noCardIdError">Neniu karto ID eniris</string>
+    <string name="noStoreError">Neniu eniris nomo</string>
+    <string name="noCardsMessage">Aldoni karto unua</string>
+    <string name="cardShortcut">Karto Mallongirejo</string>
+    <string name="scanCardBarcode">Scintigrafio Barcode Card</string>
+    <string name="share">Interŝanĝado</string>
+    <string name="unlockScreen">Malbloki Rotacio</string>
+    <string name="lockScreen">Bloko Rotacio</string>
+    <string name="star">Aldoni al miaj plej ŝatataj</string>
+    <string name="copy_to_clipboard_toast">Card ID kopiita al la tondujo</string>
+    <string name="settings_keep_screen_on">Teni sur ekrano</string>
+    <string name="importSuccessful">Karto datumo importitaj</string>
+    <string name="enter_group_name">Eniri nomo de la grupo</string>
+    <string name="noGroups">Klaki la + plus butonon por aldoni grupoj por categorization unua.</string>
+    <string name="all">Ĉiuj</string>
+    <string name="intent_import_card_from_url_share_text">Mi deziras dividi karto kun vi</string>
+    <string name="exportSuccessful">Karto datumo eksportita</string>
+    <string name="noGroupCards">Ĉi tiu grupo ne enhavas ajnan kartoj</string>
 </resources>

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

@@ -20,7 +20,6 @@
     <string name="scanCardBarcode">Escanear código de barras de la tarjeta</string>
     <string name="cardShortcut">Atajo de tarjeta</string>
     <string name="noCardsMessage">Añada una tarjeta primero</string>
-    <string name="barcodeImageDescription">Imagen del código de barras de la tarjeta</string>
     <string name="noStoreError">No se proporcionó ningún nombre</string>
     <string name="noCardIdError">Id. de tarjeta no especificado</string>
     <string name="noCardExistsError">No se ha podido encontrar la tarjeta</string>
@@ -113,7 +112,7 @@
 \nO créalo primero desde tu perfil de FidMe eligiendo Protección de datos y pulsa Extraer mis datos.</string>
     <string name="importLoyaltyCardKeychainMessage">Seleccione su <i>LoyaltyCardKeychain.csv</i> exportado desde Loyalty Card Keychain para importarlo.
 \nO créalo primero desde el menú Importar/Exportar en Loyalty Card Keychain pulsando Exportar desde allí.</string>
-    <string name="importStocardMessage">Seleccione su <i>*-sync.zip</i> exportado de Stocard para importarla, y selecciona los tipos de códigos de barras manualmente después.
+    <string name="importStocardMessage">Seleccione su exportación <i>*-sync.zip</i> de Stocard para importarla.
 \nO consígalo enviando un correo electrónico a support@stocardapp.com solicitando una exportación de sus datos.</string>
     <string name="importVoucherVaultMessage">Seleccione su <i>vouchervault.json</i> exportado desde Voucher Vault para importarlo.
 \nO créalo pulsando primero Exportar en Voucher Vault.</string>
@@ -175,4 +174,18 @@
         <item quantity="one">Borrar <xliff:g>%d</xliff:g> tarjeta</item>
         <item quantity="other">Borrar <xliff:g>%d</xliff:g> tarjetas</item>
     </plurals>
+    <string name="app_contributors">Hecho posible por: <xliff:g id="app_contributors">%s</xliff:g></string>
+    <string name="settings_brown_theme">Marrón</string>
+    <string name="settings_grey_theme">Gris</string>
+    <string name="settings_green_theme">Verde</string>
+    <string name="settings_sky_blue_theme">Azul cielo</string>
+    <string name="settings_blue_theme">Azul</string>
+    <string name="settings_violet_theme">Violeta</string>
+    <string name="settings_magenta_theme">Magenta</string>
+    <string name="settings_pink_theme">Rosa</string>
+    <string name="settings_theme_color">Color del tema</string>
+    <string name="settings_catima_theme">Catima</string>
+    <string name="settings_system_locale">Sistema</string>
+    <string name="settings_locale">Lengua</string>
+    <string name="noGroupCards">Este grupo no contiene ninguna tarjeta</string>
 </resources>

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

@@ -6,30 +6,30 @@
     <string name="updateBarcodeQuestionText">Vaihdoit kortin ID-tunnuksen. Haluatko päivittää myös viivakoodin käyttämään samaa arvoa\?</string>
     <string name="updateBarcodeQuestionTitle">Päivitä viivakoodin arvo\?</string>
     <string name="intent_import_card_from_url_share_multiple_text">Haluan jakaa joitain kortteja kanssasi</string>
-    <string name="copy_to_clipboard_multiple_toast">Kopioitiin korttitunnukset leikepöydälle</string>
+    <string name="copy_to_clipboard_multiple_toast">Kortin tunnukset kopioidaan leikepöydälle</string>
     <string name="wrongValueForBarcodeType">Arvo ei ole kelvollinen valitulle viivakoodityypille</string>
-    <string name="unsupportedBarcodeType">Tätä viivakoodityyppiä ei voi vielä näyttää. Sitä saatetaan tukea sovelluksen uudemmassa versiossa.</string>
+    <string name="unsupportedBarcodeType">Tätä viivakoodityyppiä ei voi vielä näyttää. Sitä saatetaan tukea sovelluksen myöhemmässä versiossa.</string>
     <string name="setBarcodeId">Aseta viivakoodin arvo</string>
     <string name="sameAsCardId">Sama kuin kortin ID-tunnus</string>
     <string name="barcodeId">Viivakoodin arvo</string>
-    <string name="importVoucherVaultMessage">Etsi tiedostoa joka on todennäköisesti nimetty nimellä <i>vouchervault.json</i> tuotavaksi.
-\nTai luo se Vie toiminnolla Voucher Vault sovelluksessa.</string>
+    <string name="importVoucherVaultMessage">Valitse tuotava <i>vouchervault.json</i>-vienti Voucher Vaultista.
+\nTai luo se painamalla ensin Vie Voucher Vaultissa.</string>
     <string name="importVoucherVault">Tuo Voucher Vault varmuuskopiotiedostosta</string>
-    <string name="importLoyaltyCardKeychainMessage">Etsi tiedostoa joka on todennäköisesti nimetty nimellä <i>LoyaltyCardKeychain.csv</i> tuotavaksi.
-\nTai luo se Tuo/Vie toiminnolla Loyalty Card Keychain sovelluksessa, valitsemalla valikosta Vie.</string>
+    <string name="importLoyaltyCardKeychainMessage">Valitse <i>LoyaltyCardKeychain.csv</i>-vientitietosi Loyalty Card Keychainista tuotavaksi.
+\nTai luo se Loyalty Card Keychainin Import/Export-valikosta painamalla ensin Export (Vie).</string>
     <string name="importLoyaltyCardKeychain">Tuo Loyalty Card Keychain varmuuskopiotiedostosta</string>
-    <string name="importFidmeMessage">Etsi tiedostoa joka on todennäköisesti nimetty nimellä <i>fidme-export-request-xxxxxx.zip</i> tuotavaksi ja valitse viivakoodityypit manuaalisesti jälkeenpäin.
-\nTai luo se Tuo/Vie toiminnolla FidMe profiilistasi, valitsemalla Tietotosuoja ja sitten valitsemalla Vie tietoni.</string>
+    <string name="importFidmeMessage">Valitse <i>fidme-export-request-xxxxxxxx.zip</i>-vienti FidMe:stä tuotavaksi ja valitse viivakoodityypit manuaalisesti sen jälkeen.
+\nTai luo se FidMe-profiilistasi valitsemalla Tietosuoja ja painamalla ensin Extract my data.</string>
     <string name="importFidme">Tuo FidMe varmuuskopiotiedostosta</string>
-    <string name="importCatimaMessage">Etsi tiedostoa joka on todennäköisesti nimetty nimellä <i>Catima.csv</i> tuotavaksi.
-\nTai luo se Tuo/Vie toiminnolla Catima sovelluksessa, valitsemalla valikosta Vie.</string>
+    <string name="importCatimaMessage">Valitse tuotava <i>catima.zip</i>-vienti Catimasta.
+\nTai luo se jonkin toisen Catima-sovelluksen Tuo/Vie-valikosta painamalla siellä ensin Vie.</string>
     <string name="importCatima">Tuo Catima varmuuskopiotiedostosta</string>
     <string name="accept">Hyväksy</string>
     <string name="privacy_policy_popup_text">Tietosuojaseloste (joidenkin sovelluskauppojen vaatimus):
 \n
 \nMITÄÄN TIETOJA EI KERÄTÄ LAINKAAN, minkä kuka tahansa voi vahvistaa, koska sovelluksemma on vapaa ohjelmisto.</string>
     <string name="privacy_policy">Tietosuojakäytäntö</string>
-    <string name="app_loyalty_card_keychain">Loyalty Card Keychain</string>
+    <string name="app_loyalty_card_keychain">Kanta-asiakaskortin avainnippu</string>
     <string name="chooseImportType">Tuo tietoja kohteesta\?</string>
     <string name="parsingBalanceFailed"><xliff:g>%s</xliff:g> ei vaikuta olevan kelvollinen saldo.</string>
     <string name="points">Pisteet</string>
@@ -85,8 +85,8 @@
     <string name="copy_to_clipboard_toast">Kortin ID-tunnus kopioitu leikepöydälle</string>
     <string name="enterBarcodeInstructions">Syötä kortin ID-tunnus ja valitse sen viivakoodityyppi, tai valitse \"Tällä kortilla ei ole viivakoodia\".</string>
     <string name="selectBarcodeTitle">Valitse viivakoodi</string>
-    <string name="app_resources">Kolmannen osapuolen vapaat resurssit: <xliff:g id="app_resources_list">%s</xliff:g></string>
-    <string name="app_libraries">Kolmannen osapuolen vapaat kirjastot: <xliff:g id="app_libraries_list">%s</xliff:g></string>
+    <string name="app_resources">Vapaat kolmannen osapuolen resurssit: <xliff:g id="app_resources_list">%s</xliff:g></string>
+    <string name="app_libraries">Kolmannen osapuolen Libre-kirjastot: <xliff:g id="app_libraries_list">%s</xliff:g></string>
     <string name="app_revision_fmt">Muutostiedot: <xliff:g id="app_revision_url">%s</xliff:g></string>
     <string name="debug_version_fmt">Versio: <xliff:g id="version">%s</xliff:g></string>
     <string name="about_title_fmt">Tietoja <xliff:g id="app_name">%s</xliff:g></string>
@@ -117,7 +117,6 @@
     <string name="noCardExistsError">Korttia ei löytynyt</string>
     <string name="noCardIdError">Kortin ID-tunnusta ei annettu</string>
     <string name="noStoreError">Nimeä ei annettu</string>
-    <string name="barcodeImageDescription">Kuva kortin viivakoodista</string>
     <string name="card_ids_copied">Kopioidut korttitunnukset</string>
     <string name="noCardsMessage">Lisää ensin kortti</string>
     <string name="cardShortcut">Kortin pikakuvake</string>
@@ -156,4 +155,37 @@
     <string name="frontImageDescription">Kortin etukuva</string>
     <string name="deleteConfirmation">Poista tämä kortti\?</string>
     <string name="deleteTitle">Poista kortti</string>
+    <plurals name="deleteCardsConfirmation">
+        <item quantity="one">Poista tämä <xliff:g>%d</xliff:g> kortti pysyvästi\?</item>
+        <item quantity="other">Poista tämä <xliff:g>%d</xliff:g> kortit pysyvästi\?</item>
+    </plurals>
+    <plurals name="deleteCardsTitle">
+        <item quantity="one">Poista <xliff:g>%d</xliff:g>kortti</item>
+        <item quantity="other">Poista <xliff:g>%d</xliff:g>kortit</item>
+    </plurals>
+    <plurals name="selectedCardCount">
+        <item quantity="one"><xliff:g>%d</xliff:g> Kortti valittu</item>
+        <item quantity="other"><xliff:g>%d</xliff:g> kortit valitut</item>
+    </plurals>
+    <string name="importStocard">Tuo Stocardista</string>
+    <string name="importStocardMessage">Valitse tuotava <i>***-sync.zip</i>-vienti Stocardista.
+\nTai hanki se lähettämällä sähköpostia osoitteeseen support@stocardapp.com ja pyytämällä tietojesi vientiä.</string>
+    <string name="passwordRequired">Ole hyvä ja syötä salasana</string>
+    <string name="failedGeneratingShareURL">Ei pystynyt luomaan jaettavaa URL-osoitetta. Ilmoita tästä.</string>
+    <string name="turn_flashlight_on">Sytytä taskulamppu</string>
+    <string name="turn_flashlight_off">Sammuta salamavalo</string>
+    <string name="app_contributors">Mahdollistanut: <xliff:g id="app_contributors">%s</xliff:g></string>
+    <string name="settings_brown_theme">Ruskea</string>
+    <string name="settings_grey_theme">Harmaa</string>
+    <string name="settings_green_theme">Vihreä</string>
+    <string name="settings_sky_blue_theme">Taivaan sininen</string>
+    <string name="settings_blue_theme">Siniset</string>
+    <string name="settings_violet_theme">Violetti</string>
+    <string name="settings_magenta_theme">Magenta</string>
+    <string name="settings_pink_theme">Pinkki</string>
+    <string name="settings_theme_color">Teeman väri</string>
+    <string name="settings_catima_theme">Catima</string>
+    <string name="settings_system_locale">Järjestelmä</string>
+    <string name="settings_locale">Kieli</string>
+    <string name="noGroupCards">Tämä ryhmä ei sisällä kortteja</string>
 </resources>

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

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" xmlns:tools="http://schemas.android.com/tools">
     <string name="action_add">Ajouter</string>
-    <string name="noGiftCards">Cliquez sur le bouton + plus pour ajouter une carte, ou importez-en d’abord depuis le menu ⋮</string>
+    <string name="noGiftCards">Cliquez sur le bouton + plus pour ajouter une carte, ou importez les depuis le menu ⋮</string>
     <string name="storeName">Nom</string>
     <string name="note">Notes</string>
     <string name="cardId">Numéro</string>
@@ -20,7 +20,6 @@
     <string name="scanCardBarcode">Scanner le code-barres</string>
     <string name="cardShortcut">Raccourci de carte</string>
     <string name="noCardsMessage">Ajoutez d\'abord une carte</string>
-    <string name="barcodeImageDescription">Image du code-barres</string>
     <string name="noStoreError">Aucun nom saisi</string>
     <string name="noCardIdError">Aucun numéro de carte saisi</string>
     <string name="noCardExistsError">Aucune carte trouvée</string>
@@ -43,7 +42,7 @@
     <string name="importOptionApplicationExplanation">Utilisez le gestionnaire de fichiers de votre choix pour importer un fichier.</string>
     <string name="importOptionApplicationButton">Utiliser une autre application</string>
     <string name="about">À propos</string>
-    <string name="app_license">Logiciel libre à copyleft, sous licence GPLv3+.</string>
+    <string name="app_license">Logiciel libre à copyleft, sous licence GPLv3+</string>
     <string name="about_title_fmt">À propos de <xliff:g id="app_name">%s</xliff:g></string>
     <string name="debug_version_fmt">Version : <xliff:g id="version">%s</xliff:g></string>
     <string name="app_revision_fmt">Notes de version : <xliff:g id="app_revision_url">%s</xliff:g></string>
@@ -63,7 +62,7 @@
     <string name="settings_theme">Thème</string>
     <string name="enterBarcodeInstructions">Entrez l’identifiant de la carte et choisissez le type de code-barres ci-dessous, ou « Cette carte n’a pas de code-barres ».</string>
     <string name="app_copyright_old">Basé sur Loyalty Card Keychain
-\ncopyright © 2016-2020 Branden Archer.</string>
+\ncopyright © 2016-2020 Branden Archer</string>
     <string name="exportOptionExplanation">Les données seront exportées vers l\'emplacement de votre choix.</string>
     <string name="failedParsingImportUriError">Impossible d\'analyser l\'URI d\'importation</string>
     <string name="share">Partager</string>
@@ -117,16 +116,16 @@
     <string name="settings_disable_lockscreen_while_viewing_card">Empêcher le verrouillage de l’écran</string>
     <string name="settings_keep_screen_on">Garder l’écran allumé</string>
     <string name="importVoucherVaultMessage">Sélectionnez votre exportation <i>vouchervault.json</i> de Voucher Vault à importer.
-\nOu créez-la en appuyant d’abord sur Exporter dans Voucher Vault.</string>
+\nCréez-la en appuyant d’abord sur Exporter dans Voucher Vault.</string>
     <string name="importVoucherVault">Importer depuis Voucher Vault</string>
     <string name="importLoyaltyCardKeychainMessage">Sélectionnez votre exportation <i>LoyaltyCardKeychain.csv</i> à partir de Loyalty Card Keychain pour l’importer.
-\nOu créez-la à partir du menu Importer/Exporter du Loyalty Card Keychain en appuyant d’abord sur Exporter.</string>
+\nCréez-la à partir du menu Importer/Exporter du Loyalty Card Keychain en appuyant d’abord sur Exporter.</string>
     <string name="importLoyaltyCardKeychain">Importer depuis Loyalty Card Keychain</string>
     <string name="importFidmeMessage">Sélectionnez votre exportation <i>fidme-export-request-xxxxxx.zip</i> de FidMe pour l’importer, puis sélectionnez manuellement les types de codes-barres.
-\nOu créez-la à partir de votre profil FidMe en choisissant Protection des données, puis en cliquant sur Extraire mes données d’abord.</string>
+\nCréez-la à partir de votre profil FidMe en choisissant Protection des données, puis en cliquant sur Extraire mes données d’abord.</string>
     <string name="importFidme">Importer depuis FidMe</string>
     <string name="importCatimaMessage">Sélectionnez votre exportation <i>catima.zip</i> depuis Catima à importer.
-\nOu créez-la à partir du menu Importer/Exporter d’une autre application Catima en appuyant d’abord sur Exporter.</string>
+\nCréez-la à partir du menu Importer/Exporter d’une autre application Catima en appuyant d’abord sur Exporter.</string>
     <string name="importCatima">Importer depuis Catima</string>
     <string name="addFromImage">Sélectionner dans la galerie</string>
     <string name="errorReadingImage">Impossible de lire l\'image</string>
@@ -139,7 +138,7 @@
     <string name="wrongValueForBarcodeType">La valeur n\'est pas valide pour le type de code-barres sélectionné</string>
     <string name="app_resources">Ressources tierces libres : <xliff:g id="app_resources_list">%s</xliff:g></string>
     <string name="app_libraries">Bibliothèques tierces libres : <xliff:g id="app_libraries_list">%s</xliff:g></string>
-    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Copyright © 2019–<xliff:g>%d</xliff:g> Sylvia van Os.</string>
+    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Copyright © 2019–<xliff:g>%d</xliff:g> Sylvia van Os</string>
     <string name="intent_import_card_from_url_share_multiple_text">Je veux partager des cartes avec vous</string>
     <string name="copy_to_clipboard_multiple_toast">Identifiants des cartes copiés dans le presse-papiers</string>
     <string name="card_ids_copied">Num. de la carte copié(s)</string>
@@ -156,7 +155,7 @@
     <string name="frontImageDescription">Image recto de la carte</string>
     <string name="passwordRequired">Veuillez entrer le mot de passe</string>
     <string name="importStocardMessage">Sélectionnez votre exportation <i>***-sync.zip</i> de Stocard pour l’importer.
-\nVous pouvez aussi l’obtenir en envoyant un courriel à support@stocardapp.com pour demander une exportation de vos données.</string>
+\nVous pouvez l’obtenir en envoyant un courriel à support@stocardapp.com pour demander une exportation de vos données.</string>
     <string name="importStocard">Importer depuis Stocard</string>
     <string name="turn_flashlight_off">Éteindre la lampe de poche</string>
     <string name="turn_flashlight_on">Allumer la lampe de poche</string>
@@ -175,4 +174,40 @@
         <item quantity="one">Supprimer <xliff:g>%d</xliff:g> carte</item>
         <item quantity="other">Supprimer <xliff:g>%d</xliff:g> cartes</item>
     </plurals>
+    <string name="settings_system_locale">Système</string>
+    <string name="settings_locale">Langue</string>
+    <string name="settings_brown_theme">Marron</string>
+    <string name="settings_grey_theme">Gris</string>
+    <string name="settings_green_theme">Vert</string>
+    <string name="settings_sky_blue_theme">Bleu ciel</string>
+    <string name="settings_blue_theme">Bleu</string>
+    <string name="settings_violet_theme">Violet</string>
+    <string name="settings_magenta_theme">Magenta</string>
+    <string name="settings_pink_theme">Rose</string>
+    <string name="settings_catima_theme">Catima</string>
+    <string name="settings_theme_color">Couleur du thème</string>
+    <string name="app_contributors">Rendu possible par : <xliff:g id="app_contributors">%s</xliff:g></string>
+    <string name="noGroupCards">Ce groupe ne contient pas de cartes</string>
+    <string name="toggleMoreInfo">Activer/désactiver l\'affichage de plus d\'infos</string>
+    <string name="barcodeImageDescriptionWithType">Image du code-barres de la carte de type <xliff:g>%s</xliff:g></string>
+    <string name="swipeToSwitchImages">Balayez ou appuyez longuement pour changer d\'image</string>
+    <string name="sort">Trier</string>
+    <string name="sort_by">Trier par</string>
+    <string name="reverse">Inversé</string>
+    <string name="sort_by_expiry">Date d\'expiration</string>
+    <string name="sort_by_most_recently_used">Les plus récemment utilisées</string>
+    <string name="sort_by_name">Nom</string>
+    <string name="sort_by_balance">Solde</string>
+    <string name="report_error">Signaler une erreur</string>
+    <string name="on_google_play">sur Google Play</string>
+    <string name="rate_this_app">Notez cette appli</string>
+    <string name="and_data_usage">utilisation des données</string>
+    <string name="on_github">sur GitHub</string>
+    <string name="source_repository">Dépôt source</string>
+    <string name="license">Licence</string>
+    <string name="help_translate_this_app">Aidez à traduire cette appli</string>
+    <string name="credits">Contributeurs</string>
+    <string name="version_history">Historique des versions</string>
+    <string name="exportPassword">Définissez un mot de passe pour protéger vos exportations (facultatif)</string>
+    <string name="exportPasswordHint">Entrez le mot de passe</string>
 </resources>

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

@@ -0,0 +1,190 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" xmlns:tools="http://schemas.android.com/tools">
+    <string name="app_revision_url">https://github.com/TheLastProject/Catima/releases</string>
+    <string name="storeName">Nama</string>
+    <string name="note">Keterangan</string>
+    <string name="delete">Hapus</string>
+    <string name="edit">Ubah</string>
+    <string name="save">Simpan</string>
+    <string name="deleteTitle">Hapus kartu</string>
+    <string name="cardId">Kartu ID</string>
+    <string name="barcodeType">Tipe barcode</string>
+    <string name="star">Tambahkan ke favorit</string>
+    <string name="unstar">Hapus dari favorit</string>
+    <string name="action_add">Tambah</string>
+    <string name="action_search">Cari</string>
+    <string name="sort_by_name">Nama</string>
+    <string name="sort_by_balance">Saldo</string>
+    <string name="sort_by">Sortir dengan</string>
+    <string name="sort">Sortir</string>
+    <string name="credits">Kredit</string>
+    <string name="license">Lisensi</string>
+    <string name="settings">Pengaturan</string>
+    <string name="settings_system_theme">Sistem</string>
+    <string name="selectBarcodeTitle">Pilih Barcode</string>
+    <string name="deleteConfirmation">Hapus kartu ini secara permanen?</string>
+    <string name="ok">OK</string>
+    <string name="share">Bagikan</string>
+    <string name="editCardTitle">Ubah Kartu</string>
+    <string name="addCardTitle">Tambah Kartu</string>
+    <string name="scanCardBarcode">Pindai Kartu Barcode</string>
+    <string name="barcodeNoBarcode">Kartu ini tidak memiliki barcode</string>
+    <string name="cancel">Batalkan</string>
+    <string name="importExport">Import/Ekspor</string>
+    <string name="settings_category_title_ui">Tampilan Pengguna</string>
+    <string name="settings_theme">Tema</string>
+    <string name="all">Semua</string>
+    <string name="leaveWithoutSaveTitle">Keluar</string>
+    <string name="card">Kartu</string>
+    <string name="barcode">Barcode</string>
+    <string name="chooseExpiryDate">Pilih masa berlaku</string>
+    <string name="noBarcodeFound">Barcode tidak ditemukan</string>
+    <string name="errorReadingImage">TIdak dapat membaca gambar</string>
+    <string name="balance">Saldo</string>
+    <string name="currency">Mata uang</string>
+    <string name="chooseImportType">Impor data dari?</string>
+    <string name="accept">Terima</string>
+    <string name="importCatima">Impor dari Catima</string>
+    <string name="importFidme">Impor dari FidMe</string>
+    <string name="barcodeId">Nilai barcode</string>
+    <string name="sameAsCardId">Sama denga kartu ID</string>
+    <string name="setBarcodeId">Tentukan nilai barcode</string>
+    <string name="photos">Foto</string>
+    <string name="setFrontImage">Atur gambar bagian depan</string>
+    <string name="report_error">Lapor Kesalahan</string>
+    <string name="rate_this_app">Beri nilai pada aplikasi ini</string>
+    <string name="sort_by_expiry">Masa berlaku</string>
+    <string name="sort_by_most_recently_used">Paling banyak digunakan</string>
+    <string name="settings_catima_theme">Catima</string>
+    <string name="settings_pink_theme">Merah Muda</string>
+    <string name="settings_blue_theme">Biru</string>
+    <string name="settings_green_theme">Hijau</string>
+    <string name="settings_sky_blue_theme">Biru Langit</string>
+    <string name="settings_grey_theme">Abu-abu</string>
+    <string name="settings_brown_theme">Cokelat</string>
+    <string name="settings_violet_theme">Ungu</string>
+    <string name="settings_magenta_theme">Magenta</string>
+    <string name="settings_theme_color">Warna tema</string>
+    <string name="settings_system_locale">Sistem</string>
+    <string name="settings_locale">Bahasa</string>
+    <string name="turn_flashlight_on">Hidupkan lampu flash</string>
+    <string name="turn_flashlight_off">Matikan lampu flash</string>
+    <string name="exportPasswordHint">Masukan kata sandi</string>
+    <string name="yes">Ya</string>
+    <string name="no">Tidak</string>
+    <string name="takePhoto">Ambil foto</string>
+    <string name="removeImage">Hapus gambar</string>
+    <string name="setBackImage">Atur gambar bagian belakang</string>
+    <string name="intent_import_card_from_url_share_multiple_text">Saya ingin berbagi kartu dengan anda</string>
+    <string name="noGiftCards">Klik tanda + tombol tambah untuk menambahkan kartu, atau mengimpor beberapa kartu melalui menu ⋮ terlebih dahulu.</string>
+    <string name="noMatchingGiftCards">Tidak menemukan apapun. Coba untuk mengubah pencarian anda.</string>
+    <string name="noBarcode">Bukan barcode</string>
+    <string name="confirm">Konfirmasi</string>
+    <string name="copy_to_clipboard">Salin ID</string>
+    <string name="sendLabel">Kirim…</string>
+    <string name="noCardsMessage">Tambah kartu terlebih dahulu</string>
+    <string name="noStoreError">Nama masih kosong</string>
+    <string name="noCardIdError">Kartu ID masih kosong</string>
+    <string name="noCardExistsError">Tidak dapat menemukan kartu</string>
+    <string name="failedParsingImportUriError">Tidak dapat menguraikan alamat impor situs web</string>
+    <string name="exportName">Ekspor</string>
+    <string name="importSuccessfulTitle">Sudah diimpor</string>
+    <string name="importFailedTitle">Impor gagal</string>
+    <string name="importFailed">Tidak dapat mengimpor kartu</string>
+    <string name="exportSuccessfulTitle">Sudah diekspor</string>
+    <string name="exportFailedTitle">Ekspor gagal</string>
+    <string name="exportFailed">Tidak dapat mengekspor kartu</string>
+    <string name="importing">Mengimpor…</string>
+    <string name="exporting">Mengekspor…</string>
+    <string name="noExternalStoragePermissionError">Berikan izin penyimpanan eksternal untuk mengimpor atau mengekspor kartu terlebih dahulu</string>
+    <string name="exportOptionExplanation">The data will be written to a location of your choice.</string>
+    <string name="importOptionFilesystemTitle">Impor dari sistem</string>
+    <string name="importOptionFilesystemExplanation">Pilih file dari sistem</string>
+    <string name="importOptionFilesystemButton">Dari sistem</string>
+    <string name="importOptionApplicationTitle">Gunakan aplikasi lain</string>
+    <string name="importOptionApplicationExplanation">Gunakan aplikasi lain atau pengelola file favorit anda untuk membuka file.</string>
+    <string name="importOptionApplicationButton">Gunakan aplikasi lain</string>
+    <string name="about">Tentang</string>
+    <string name="app_copyright_fmt">Hak Cipta © 2019–<xliff:g>%d</xliff:g> Sylvia van Os</string>
+    <string name="app_copyright_old">Berdasarkan Loyalty Card Keychain hak cipta © 2016–2020 Branden Archer</string>
+    <string name="app_license">Perangkat lunak bebas copyleft, berlisensi GPLv3+</string>
+    <string name="about_title_fmt">Tentang <xliff:g id="app_name">%s</xliff:g></string>
+    <string name="debug_version_fmt">Versi: <xliff:g id="version">%s</xliff:g></string>
+    <string name="app_revision_fmt">Info Revisi: <xliff:g id="app_revision_url">%s</xliff:g></string>
+    <string name="app_libraries">Pustaka pihak ketiga gratis: <xliff:g id="app_libraries_list">%s</xliff:g></string>
+    <string name="app_resources">Sumber daya pihak ketiga gratis: <xliff:g id="app_resources_list">%s</xliff:g></string>
+    <string name="enterBarcodeInstructions">Masukkan ID kartu, dan pilih jenis barcodenya di bawah atau \"Kartu ini tidak memiliki barcode\".</string>
+    <string name="copy_to_clipboard_toast">ID kartu telah disalin</string>
+    <string name="thumbnailDescription">Gambar tampilan untuk kartu</string>
+    <string name="starImage">Favorit</string>
+    <string name="settings_light_theme">Terang</string>
+    <string name="settings_dark_theme">Gelap</string>
+    <string name="settings_max_font_size_scale">Ukuran maksimal huruf</string>
+    <string name="settings_display_barcode_max_brightness">Terangkan tampilan barcode</string>
+    <string name="settings_lock_barcode_orientation">Kunci orientasi barcode</string>
+    <string name="settings_keep_screen_on">Biarkan layar menyala</string>
+    <string name="settings_disable_lockscreen_while_viewing_card">Mencegah layar menyala</string>
+    <string name="intent_import_card_from_url_share_text">Saya ingin berbagi kartu dengan anda</string>
+    <string name="importSuccessful">Data kartu terimpor</string>
+    <string name="exportSuccessful">Data kartu terekspor</string>
+    <string name="enter_group_name">Masukan nama grup</string>
+    <string name="groups">Grup</string>
+    <string name="noGroups">Klik pada tombol tambah + untuk menambahkan grup atau kategori terlebih dahulu.</string>
+    <string name="noGroupCards">Grup ini tidak memilik kartu</string>
+    <string name="deleteConfirmationGroup">Hapus grup?</string>
+    <string name="failedOpeningFileManager">Instal aplikasi pengelola file terlebih dahulu.</string>
+    <string name="moveUp">Pindah ke atas</string>
+    <string name="moveDown">Pindah ke bawah</string>
+    <string name="leaveWithoutSaveConfirmation">Keluar tanpa menyimpan?</string>
+    <string name="addManually">Masukan ID kartu</string>
+    <string name="addFromImage">Pilih gambar dari galeri</string>
+    <string name="groupsList">Grup: <xliff:g>%s</xliff:g></string>
+    <string name="expiryStateSentence">Masa ber: <xliff:g>%s</xliff:g></string>
+    <string name="expiryStateSentenceExpired">Kadaluwarsa: <xliff:g>%s</xliff:g></string>
+    <string name="balanceSentence">Saldo: <xliff:g>%s</xliff:g></string>
+    <string name="balancePoints"><xliff:g>%s</xliff:g> poin</string>
+    <string name="editBarcode">Ubah barcode</string>
+    <string name="expiryDate">Tanggal masa berlaku</string>
+    <string name="never">Tidak pernah</string>
+    <string name="moveBarcodeToTopOfScreen">Pindah barcode ke bagian paling depan</string>
+    <string name="moveBarcodeToCenterOfScreen">Pusatkan barcode pada layar</string>
+    <string name="points">Poin</string>
+    <string name="parsingBalanceFailed"><xliff:g>%s</xliff:g> sepertinya bukan saldo yang valid.</string>
+    <string name="app_loyalty_card_keychain">Loyalty Card Keychain</string>
+    <string name="privacy_policy">Kebijakan Privasi</string>
+    <string name="privacy_policy_popup_text">Pemberitahuan kebijakan privasi (diperlukan oleh beberapa toko aplikasi): TIDAK ADA DATA YANG DIKUMPULKAN SAMA SEKALI, yang dapat dikonfirmasi oleh siapa pun karena aplikasi kami adalah perangkat lunak gratis.</string>
+    <string name="importCatimaMessage">Pilih ekspor <i>catima.zip</i> Anda dari Catima untuk diimpor. Buat dari menu Impor/Ekspor aplikasi Catima lain dengan menekan Ekspor di sana terlebih dahulu.</string>
+    <string name="importFidmeMessage">Pilih ekspor <i>fidme-export-request-xxxxxx.zip</i> Anda dari FidMe untuk diimpor, dan pilih jenis barcode secara manual setelahnya. Buat dari profil FidMe Anda dengan memilih Perlindungan Data lalu tekan Ekstrak data saya terlebih dahulu.</string>
+    <string name="importLoyaltyCardKeychain">Impor dari Loyalty Card Keychain</string>
+    <string name="importLoyaltyCardKeychainMessage">Pilih ekspor <i>LoyaltyCardKeychain.csv</i> Anda dari Loyalty Card Keychain untuk diimpor. Buat dari menu Import/Export di Loyalty Card Keychain dengan menekan Export terlebih dahulu.</string>
+    <string name="importStocard">Impor dari Stocard</string>
+    <string name="importStocardMessage">Pilih ekspor <i>***-sync.zip</i> Anda dari Stocard untuk diimpor. Dapatkan dengan mengirim email ke support@stocardapp.com untuk meminta ekspor data Anda.</string>
+    <string name="importVoucherVault">Impor dari Voucher Vault</string>
+    <string name="importVoucherVaultMessage">Pilih ekspor <i>vouchervault.json</i> Anda dari Vault Voucher untuk diimpor. Buat dengan menekan Ekspor di Vault Voucher terlebih dahulu.</string>
+    <string name="unsupportedBarcodeType">Jenis barcode ini belum dapat ditampilkan. Ini mungkin didukung di versi aplikasi yang lebih baru.</string>
+    <string name="wrongValueForBarcodeType">Nilai tidak berlaku untuk jenis barcode yang dipilih</string>
+    <string name="copy_to_clipboard_multiple_toast">ID kartu telah disalin</string>
+    <string name="frontImageDescription">Gambar depan kartu</string>
+    <string name="backImageDescription">Gambar belakang kartu</string>
+    <string name="updateBarcodeQuestionTitle">Perbarui barcode?</string>
+    <string name="updateBarcodeQuestionText">Anda mengubah ID kartu. Apakah Anda juga ingin memperbarui barcode untuk menggunakan nilai yang sama?</string>
+    <string name="passwordRequired">Silahkan masukan kata sandi</string>
+    <string name="exportPassword">Tetapkan kata sandi untuk melindungi ekspor anda (opsional)</string>
+    <string name="failedGeneratingShareURL">Tidak dapat membuat alamat berbagi. Mohon laporkan ini.</string>
+    <string name="app_contributors">Pengembangan dibantu oleh: <xliff:g id="app_contributors">%s</xliff:g></string>
+    <string name="toggleMoreInfo">Tampilkan info selengkapnya</string>
+    <string name="swipeToSwitchImages">Geser atau tekan yang lama untuk mengganti gambar</string>
+    <string name="reverse">Ubah urutan</string>
+    <string name="version_history">Riwayat Versi</string>
+    <string name="help_translate_this_app">Bantu terjemahkan aplikasi ini</string>
+    <string name="source_repository">Sumber Repositori</string>
+    <string name="on_github">di GitHub</string>
+    <string name="and_data_usage">dan penggunaan data</string>
+    <string name="on_google_play">di Google Play</string>
+    <string name="lockScreen">Blokir rotasi</string>
+    <string name="unlockScreen">Buka blokir rotasi</string>
+    <string name="cardShortcut">Pintasan kartu</string>
+    <string name="card_ids_copied">ID kartu yang tersalin</string>
+    <string name="barcodeImageDescriptionWithType">Gambar dari jenis barcode <xliff:g>%s</xliff:g></string>
+    <string name="importExportHelp">Mencadangkan kartu memungkinkan anda memindahkannya ke perangkat lain.</string>
+</resources>

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

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="action_add">Bæta</string>
+    <string name="noBarcode">Nei strikamerkið</string>
+    <string name="action_search">Leita að</string>
+    <string name="delete">Eyða</string>
+    <string name="unlockScreen">Opna Snúningur</string>
+    <string name="noGiftCards">Smelltu á + plús takka til að bæta kort, eða að flytja inn sumir frá ⋮ matseðill fyrst.</string>
+    <string name="note">Athugið</string>
+    <string name="barcodeType">Strikamerkið tegund</string>
+    <string name="cancel">Hætta</string>
+    <string name="noMatchingGiftCards">Vissi ekki að finna neitt. Reyna að breyta leita.</string>
+    <string name="storeName">Nafnið</string>
+    <string name="barcodeNoBarcode">Þetta kort hefur ekki strikamerkið</string>
+    <string name="star">Bæta við eftirlæti</string>
+    <string name="unstar">Fjarlægja frá eftirlæti</string>
+    <string name="save">Sparaðu</string>
+    <string name="edit">Breyta</string>
+    <string name="confirm">Staðfesta</string>
+    <string name="lockScreen">Blokk Snúningur</string>
+    <string name="ok">OK</string>
+    <string name="sendLabel">Sendu…</string>
+    <string name="deleteConfirmation">Eyða þetta kort til frambúðar\?</string>
+    <string name="share">Deila</string>
+    <string name="editCardTitle">Breyta Kort</string>
+    <string name="addCardTitle">Bæta Kort</string>
+    <string name="scanCardBarcode">Skanna Kort Strikamerkið</string>
+</resources>

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

@@ -24,7 +24,6 @@
     <string name="scanCardBarcode">Scansiona il codice carta</string>
     <string name="cardShortcut">Scorciatoia per la carta</string>
     <string name="noCardsMessage">Aggiungi prima una carta</string>
-    <string name="barcodeImageDescription">Immagine del codice della carta</string>
     <string name="noStoreError">Nessun nome inserito</string>
     <string name="noCardIdError">Nessun codice carta inserito</string>
     <string name="noCardExistsError">Impossibile trovare la carta</string>
@@ -48,7 +47,7 @@
     <string name="importOptionApplicationExplanation">Usa qualsiasi app o il tuo gestore di file preferito per aprire un file.</string>
     <string name="importOptionApplicationButton">Usa un’altra app</string>
     <string name="about">Informazioni</string>
-    <string name="app_license">Software libero con copyleft, licenza GPLv3+.</string>
+    <string name="app_license">Software libero con copyleft, licenza GPLv3+</string>
     <string name="about_title_fmt">Informazioni su <xliff:g id="app_name">%s</xliff:g></string>
     <string name="debug_version_fmt">Versione: <xliff:g id="version">%s</xliff:g></string>
     <string name="app_revision_fmt">Informazioni sulla revisione: <xliff:g id="app_revision_url"> %s </xliff:g></string>
@@ -68,7 +67,7 @@
     <string name="exportSuccessful">Dati della carta importati</string>
     <string name="importSuccessful">Dati della carta importati</string>
     <string name="app_copyright_old">Basato su Loyalty Card Keychain
-\ncopyright © 2016–2020 Branden Archer.</string>
+\ncopyright © 2016–2020 Branden Archer</string>
     <string name="exportOptionExplanation">I dati verranno scritti in una posizione a tua scelta.</string>
     <string name="barcodeType">Tipo di codice a barre</string>
     <string name="unstar">Rimuovi dai preferiti</string>
@@ -117,16 +116,16 @@
 \nNESSUN DATO VIENE RACCOLTO, cosa che chiunque può confermare dato che la nostra applicazione è un software libero.</string>
     <string name="privacy_policy">Informativa sulla riservatezza</string>
     <string name="importVoucherVaultMessage">Seleziona la tua esportazione <i>vouchervault.json</i> da Voucher Vault da importare.
-\nOppure crealo premendo prima Esporta in Voucher Vault.</string>
+\nCrealo premendo prima Esporta in Voucher Vault.</string>
     <string name="importVoucherVault">Importa da Voucher Vault</string>
     <string name="importLoyaltyCardKeychainMessage">Seleziona la tua esportazione <i>LoyaltyCardKeychain.csv</i> da Loyalty Card Keychain per importarla.
-\nOppure createlo dal menù Importazione/Esportazione in Loyalty Card Keychain premendo prima su Esporta.</string>
+\nCreatelo dal menù Importazione/Esportazione in Loyalty Card Keychain premendo prima su Esporta.</string>
     <string name="importLoyaltyCardKeychain">Importa da Loyalty Card Keychain</string>
     <string name="importFidmeMessage">Seleziona la tua esportazione <i>fidme-export-request-xxxxxx.zip</i> da FidMe per importare, e seleziona i tipi di codice a barre manualmente dopo.
-\nOppure crearlo dal tuo profilo FidMe scegliendo Protezione Dati e poi premendo Estrai i miei dati prima.</string>
+\nCrearlo dal tuo profilo FidMe scegliendo Protezione Dati e poi premendo Estrai i miei dati prima.</string>
     <string name="importFidme">Importa da FidMe</string>
     <string name="importCatimaMessage">Seleziona la tua esportazione <i>catima.zip</i> da Catima per importarla.
-\nOppure crealo dal menù Importazione/Esportazione di un\'altra applicazione Catima premendo prima Esporta.</string>
+\nCrealo dal menù Importazione/Esportazione di un\'altra applicazione Catima premendo prima Esporta.</string>
     <string name="importCatima">Importa da Catima</string>
     <string name="setBarcodeId">Imposta il valore del codice a barre</string>
     <string name="sameAsCardId">Uguale all\'ID della carta</string>
@@ -139,7 +138,7 @@
     <string name="wrongValueForBarcodeType">Il valore non è valido per il tipo di codice a barre selezionato</string>
     <string name="app_resources">Risorse libre di terze parti: <xliff:g id="app_resources_list"> %s </xliff:g></string>
     <string name="app_libraries">Librerie libre di terze parti: <xliff:g id="app_libraries_list"> %s </xliff:g></string>
-    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Copyright © 2019–<xliff:g>%d</xliff:g> Sylvia van Os.</string>
+    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Copyright © 2019–<xliff:g>%d</xliff:g> Sylvia van Os</string>
     <string name="intent_import_card_from_url_share_multiple_text">Voglio condividere alcune carte con te</string>
     <string name="copy_to_clipboard_multiple_toast">Numeri delle carte copiati negli appunti</string>
     <string name="card_ids_copied">Numero/i della carta copiato/i</string>
@@ -156,7 +155,7 @@
     <string name="frontImageDescription">Immagine frontale della carta</string>
     <string name="passwordRequired">Si prega di inserire la password</string>
     <string name="importStocardMessage">Seleziona la tua esportazione <i>***-sync.zip</i> da Stocard per importare.
-\nOppure ottenerlo inviando un\'e-mail a support@stocardapp.com chiedendo un\'esportazione dei tuoi dati.</string>
+\nOttienilo inviando un\'e-mail a support@stocardapp.com chiedendo un\'esportazione dei tuoi dati.</string>
     <string name="importStocard">Importa da Stocard</string>
     <string name="turn_flashlight_off">Spegni la torcia</string>
     <string name="turn_flashlight_on">Accendi la torcia</string>
@@ -175,4 +174,40 @@
         <item quantity="one">Elimina <xliff:g>%d</xliff:g> carta</item>
         <item quantity="other">Elimina <xliff:g>%d</xliff:g> carte</item>
     </plurals>
+    <string name="settings_system_locale">Sistema</string>
+    <string name="settings_locale">Lingua</string>
+    <string name="settings_brown_theme">Marrone</string>
+    <string name="settings_grey_theme">Grigio</string>
+    <string name="settings_green_theme">Verde</string>
+    <string name="settings_sky_blue_theme">Azzurro</string>
+    <string name="settings_blue_theme">Blu</string>
+    <string name="settings_violet_theme">Viola</string>
+    <string name="settings_magenta_theme">Magenta</string>
+    <string name="settings_pink_theme">Rosa</string>
+    <string name="settings_catima_theme">Catima</string>
+    <string name="settings_theme_color">Colore del tema</string>
+    <string name="app_contributors">Reso possibile da: <xliff:g id="app_contributors">%s</xliff:g></string>
+    <string name="noGroupCards">Questo gruppo non contiene carte</string>
+    <string name="toggleMoreInfo">Attiva/disattiva la visualizzazione di altre informazioni</string>
+    <string name="barcodeImageDescriptionWithType">Immagine del codice a barre della carta del tipo <xliff:g>%s</xliff:g></string>
+    <string name="swipeToSwitchImages">Scorri o premi a lungo per cambiare immagine</string>
+    <string name="sort_by">Ordina per</string>
+    <string name="reverse">Inverti</string>
+    <string name="sort_by_balance">Saldo</string>
+    <string name="sort_by_expiry">Scadenza</string>
+    <string name="sort_by_most_recently_used">Usate più di recente</string>
+    <string name="sort_by_name">Nome</string>
+    <string name="sort">Ordina</string>
+    <string name="license">Licenza</string>
+    <string name="source_repository">Repository fonti</string>
+    <string name="on_github">su GitHub</string>
+    <string name="exportPasswordHint">Inserisci la password</string>
+    <string name="on_google_play">su Google Play</string>
+    <string name="exportPassword">Imposta una password per proteggere la tua esportazione (opzionale)</string>
+    <string name="version_history">Cronologia delle versioni</string>
+    <string name="credits">Crediti</string>
+    <string name="help_translate_this_app">Aiuta a tradurre questa app</string>
+    <string name="and_data_usage">e utilizzo dei dati</string>
+    <string name="rate_this_app">Valuta questa applicazione</string>
+    <string name="report_error">Segnala un errore</string>
 </resources>

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

@@ -76,10 +76,10 @@
     <string name="app_revision_fmt">Revision Info: <xliff:g id="app_revision_url">%s</xliff:g></string>
     <string name="debug_version_fmt">Version: <xliff:g id="version">%s</xliff:g></string>
     <string name="about_title_fmt">About <xliff:g id="app_name">%s</xliff:g></string>
-    <string name="app_license">Copylefted libre software, licensed GPLv3+.</string>
+    <string name="app_license">Copylefted libre software, licensed GPLv3+</string>
     <string name="app_copyright_old">Based on Loyalty Card Keychain
 \ncopyright © 2016–2020 Branden Archer.</string>
-    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Copyright © 2019–<xliff:g>%d</xliff:g> Sylvia van Os.</string>
+    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Copyright © 2019–<xliff:g>%d</xliff:g> Sylvia van Os</string>
     <string name="app_resources">Libre third-party resources: <xliff:g id="app_resources_list">%s</xliff:g></string>
     <string name="about">Catimaについて</string>
     <string name="importOptionApplicationButton">外部のアプリを使う</string>
@@ -95,7 +95,7 @@
     <string name="exportFailed">カードをエクスポートできませんでした</string>
     <string name="exportFailedTitle">エクスポートに失敗しました</string>
     <string name="exportSuccessfulTitle">エクスポートしました</string>
-    <string name="sameAsCardId">カードの表記と同一</string>
+    <string name="sameAsCardId">カード番号に合わせる</string>
     <string name="barcodeId">バーコード番号</string>
     <string name="importVoucherVaultMessage">Voucher Vaultでエクスポートした <i>vouchervault.json</i>ファイルを選択してください。
 \nファイルがない場合、Voucher Vaultでファイルをエクスポートしてください。</string>
@@ -110,7 +110,6 @@
     <string name="noCardExistsError">カードが見つかりません</string>
     <string name="noCardIdError">カード番号が入力されていません</string>
     <string name="noStoreError">名前が入力されていません</string>
-    <string name="barcodeImageDescription">バーコードの画像</string>
     <string name="noCardsMessage">カードを追加</string>
     <string name="cardShortcut">カードのショートカット</string>
     <string name="scanCardBarcode">カードのバーコードをスキャン</string>
@@ -126,7 +125,7 @@
     <string name="delete">削除</string>
     <string name="edit">編集</string>
     <string name="save">保存</string>
-    <string name="cancel">取り消し</string>
+    <string name="cancel">取消</string>
     <string name="unstar">お気に入りから削除</string>
     <string name="star">お気に入りに追加</string>
     <string name="noBarcode">バーコードなし</string>
@@ -141,10 +140,10 @@
     <string name="action_search">検索</string>
     <string name="intent_import_card_from_url_share_multiple_text">カードを共有しましょう</string>
     <string name="copy_to_clipboard_multiple_toast">カード番号をクリップボードにコピーしました</string>
-    <string name="card_ids_copied">コピーしたカード</string>
+    <string name="card_ids_copied">カード番号をコピーしました</string>
     <string name="turn_flashlight_off">ライトをオフにする</string>
     <string name="turn_flashlight_on">ライトをオンにする</string>
-    <string name="failedGeneratingShareURL">共有URLの生成に失敗しました。バグを報告してください。</string>
+    <string name="failedGeneratingShareURL">共有URLの生成を生成できませんでした。バグを報告してください。</string>
     <string name="passwordRequired">パスワードを入力してください</string>
     <string name="no">いいえ</string>
     <string name="yes">はい</string>
@@ -153,11 +152,11 @@
     <string name="takePhoto">写真を撮影する</string>
     <string name="removeImage">画像を削除</string>
     <string name="setBackImage">裏面の画像を設定</string>
-    <string name="setFrontImage">表面の画像を設定</string>
+    <string name="setFrontImage">オモテ面の画像を設定</string>
     <string name="photos">フォト</string>
-    <string name="backImageDescription">裏面</string>
-    <string name="frontImageDescription">表面</string>
-    <string name="importStocardMessage">Stocardでエクスポートした<i>***-sync.zip</i>ファイルを選択し、手動でバーコード形式を選択してください。
+    <string name="backImageDescription">カードの裏面</string>
+    <string name="frontImageDescription">カードのオモテ面</string>
+    <string name="importStocardMessage">Stocardでエクスポートした<i>***-sync.zip</i>ファイルを選択してください。
 \nファイルがない場合、e-mailing support@stocardapp.comにデータのエクスポートを要求してください。</string>
     <string name="importStocard">Stocardからインポート</string>
     <plurals name="selectedCardCount">
@@ -165,4 +164,46 @@
     </plurals>
     <string name="deleteConfirmation">このカードを削除しますか？</string>
     <string name="deleteTitle">カードの削除</string>
+    <plurals name="deleteCardsConfirmation">
+        <item quantity="other"><xliff:g>%d</xliff:g> 枚のカードを削除しますか？</item>
+    </plurals>
+    <plurals name="deleteCardsTitle">
+        <item quantity="other"><xliff:g>%d</xliff:g> 枚のカードの削除</item>
+    </plurals>
+    <string name="barcodeImageDescriptionWithType">バーコード形式の画像 <xliff:g>%s</xliff:g></string>
+    <string name="toggleMoreInfo">詳細を表示する</string>
+    <string name="app_contributors">Made possible by: <xliff:g id="app_contributors">%s</xliff:g></string>
+    <string name="settings_brown_theme">Brown</string>
+    <string name="settings_grey_theme">Gray</string>
+    <string name="settings_green_theme">Green</string>
+    <string name="settings_sky_blue_theme">Sky Blue</string>
+    <string name="settings_blue_theme">Blue</string>
+    <string name="settings_violet_theme">Violet</string>
+    <string name="settings_magenta_theme">Magenta</string>
+    <string name="settings_pink_theme">Pink</string>
+    <string name="settings_catima_theme">Catima</string>
+    <string name="settings_theme_color">テーマカラー</string>
+    <string name="settings_system_locale">システムに従う</string>
+    <string name="settings_locale">言語</string>
+    <string name="noGroupCards">このグループにはカードがありません</string>
+    <string name="swipeToSwitchImages">画像を切り替えるには長押し、またはスワイプ</string>
+    <string name="sort_by">並び替え</string>
+    <string name="sort_by_balance">残高</string>
+    <string name="sort_by_expiry">期限</string>
+    <string name="sort_by_most_recently_used">最近使用したカード</string>
+    <string name="sort_by_name">名前</string>
+    <string name="sort">並び替え</string>
+    <string name="rate_this_app">このアプリを評価する</string>
+    <string name="on_github">GitHub</string>
+    <string name="source_repository">ソースリポジトリ</string>
+    <string name="exportPassword">パスワードを設定してエクスポートしたファイルを保護する(任意)</string>
+    <string name="exportPasswordHint">パスワードを入力してください</string>
+    <string name="version_history">更新履歴</string>
+    <string name="credits">貢献者</string>
+    <string name="help_translate_this_app">このアプリの翻訳を手伝う</string>
+    <string name="license">ライセンス</string>
+    <string name="on_google_play">Google Play</string>
+    <string name="report_error">エラーを報告する</string>
+    <string name="reverse">逆順</string>
+    <string name="and_data_usage">and data usage</string>
 </resources>

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

@@ -63,7 +63,6 @@
     <string name="importFailedTitle">가져오기 실패</string>
     <string name="importSuccessfulTitle">가져오기 완료</string>
     <string name="noCardIdError">카드 ID를 입력하지 않음</string>
-    <string name="barcodeImageDescription">카드 바코드 이미지</string>
     <string name="storeName">매장</string>
     <string name="thumbnailDescription">카드 섬네일</string>
     <string name="importOptionApplicationButton">외부 앱 사용</string>

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

@@ -15,7 +15,6 @@
     <string name="editCardTitle">Redaguoti lojalumo kortelę</string>
     <string name="addCardTitle">Pridėti lojalumo kortelę</string>
     <string name="scanCardBarcode">Skenuoti kortelės brūkšninį kodą</string>
-    <string name="barcodeImageDescription">Kortelės brūkšninio kodo vaizdas</string>
     <string name="noStoreError">Neįvestas pavadinimas</string>
     <string name="noCardIdError">Neįvestas kortelės ID</string>
     <string name="importExport">Importuoti/Exportuoti</string>
@@ -26,7 +25,7 @@
     <string name="exporting">Eksportuoja…</string>
     <string name="noExternalStoragePermissionError">Pirmiausia suteikite išorinės saugyklos leidimą, kad galėtumėte importuoti arba eksportuoti korteles</string>
     <string name="about">Apie</string>
-    <string name="app_license">Copylefted libre programinė įranga, licencijuota GPLv3+.</string>
+    <string name="app_license">Copylefted libre programinė įranga, licencijuota GPLv3+</string>
     <string name="about_title_fmt">Apie <xliff:g id="app_name">%s</xliff:g></string>
     <string name="debug_version_fmt">Versija: <xliff:g id="version">%s</xliff:g></string>
     <string name="app_revision_fmt">Revizijos info: <xliff:g id="app_revision_url">%s</xliff:g></string>
@@ -46,10 +45,10 @@
     <string name="action_search">Ieškoti</string>
     <string name="cardShortcut">Kortelės sparčioji nuoroda</string>
     <string name="importVoucherVaultMessage">Pasirinkite savo <i>vouchervault.json</i> eksportą iš Voucher Vault, kurį norite importuoti.
-\nArba sukurkite jį pirmiausia paspausdami Eksportuoti Voucher Vault.</string>
+\nSukurkite jį pirmiausia paspausdami Eksportuoti Voucher Vault.</string>
     <string name="importVoucherVault">Importuoti iš Voucher Vault</string>
     <string name="importLoyaltyCardKeychainMessage">Pasirinkite savo <i> LoyaltyCardKeychain.csv</i> eksportą iš Loyalty Card Keychain, kurį norite importuoti.
-\nArba sukurkite jį iš Loyalty Card Keychain meniu Importas/Eksportas, pirmiausia paspausdami Eksportuoti.</string>
+\nSukurkite jį iš Loyalty Card Keychain meniu Importavimas/Eksportavimas, pirmiausia paspausdami Eksportuoti.</string>
     <string name="importLoyaltyCardKeychain">Importuoti iš Loyalty Card Keychain</string>
     <string name="app_loyalty_card_keychain">Loyalty Card Keychain</string>
     <string name="parsingBalanceFailed">Panašu, kad <xliff:g> %s </xliff:g> reikšmė nėra tinkama.</string>
@@ -80,13 +79,13 @@
     <string name="sameAsCardId">Tokia pat kaip kortelės ID</string>
     <string name="barcodeId">Brūkšninio kodo reikšmė</string>
     <string name="importStocardMessage">Pasirinkite <i>***-sync.zip</i> eksportą iš Stocard, kad galėtumėte importuoti.
-\nArba gaukite susisiekę el. paštu support@stocardapp.com, prašydami eksportuoti jūsų duomenis.</string>
+\nGaukite susisiekę el. paštu support@stocardapp.com, prašydami eksportuoti jūsų duomenis.</string>
     <string name="importStocard">Importuoti iš Stocard</string>
     <string name="importFidmeMessage">Pasirinkite <i>fidme-export-request-xxxxxx.zip</i> eksportą iš FidMe, kurį norite importuoti, ir po to brūkšninių kodų tipus pasirinkite rankiniu būdu.
-\nArba sukurkite jį iš savo FidMe profilio, pasirinkę Duomenų apsauga ir pirmiausia paspaudę Išgauti mano duomenis.</string>
+\nSukurkite jį iš savo FidMe profilio, pasirinkę Duomenų apsauga ir pirmiausia paspaudę Išgauti mano duomenis.</string>
     <string name="importFidme">Importuoti iš FidMe</string>
-    <string name="importCatimaMessage">Norėdami importuoti, pasirinkite savo <i> catima.zip </i> eksportą iš Catima.
-\nArba sukurkite ją iš kitos Catima programos importavimo / eksportavimo meniu, pirmiausia paspausdami Eksportuoti ten.</string>
+    <string name="importCatimaMessage">Norėdami importuoti, pasirinkite savo <i> catima.zip </i> eksportavimą iš Catima.
+\nSukurkite ją iš kitos Catima programos importavimo / eksportavimo meniu, pirmiausia ten paspausdami Eksportuoti.</string>
     <string name="importCatima">Importuoti iš Catima</string>
     <string name="accept">Priimti</string>
     <string name="privacy_policy_popup_text">Privatumo politikos pranešimas (kurio reikalaujama kai kuriose programėlių parduotuvėse):
@@ -146,8 +145,8 @@
     <string name="app_resources">Libre trečiųjų šalių ištekliai: <xliff:g id="app_resources_list">%s</xliff:g></string>
     <string name="app_libraries">Libre trečiųjų šalių bibliotekos: <xliff:g id="app_libraries_list">%s</xliff:g></string>
     <string name="app_copyright_old">Paremta Loyalty Card Keychain
-\nautorinės teisės © 2016–2020 Branden Archer.</string>
-    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Autorinės teisės © 2019–<xliff:g>%d</xliff:g> Sylvia van Os.</string>
+\nautorinės teisės © 2016–2020 Branden Archer</string>
+    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Autorinės teisės © 2019–<xliff:g>%d</xliff:g> Sylvia van Os</string>
     <string name="importOptionApplicationButton">Naudoti kitą programą</string>
     <string name="importOptionApplicationExplanation">Norėdami atidaryti failą, naudokite bet kurią programą arba mėgstamą failų tvarkyklę.</string>
     <string name="importOptionApplicationTitle">Naudoti kitą programą</string>
@@ -179,4 +178,40 @@
         <item quantity="few">Ištrinti <xliff:g>%d</xliff:g> korteles</item>
         <item quantity="other">Ištrinti <xliff:g>%d</xliff:g> kortelių</item>
     </plurals>
+    <string name="settings_system_locale">Sistemos</string>
+    <string name="settings_locale">Kalba</string>
+    <string name="settings_brown_theme">Ruda</string>
+    <string name="settings_grey_theme">Pilka</string>
+    <string name="settings_green_theme">Žalia</string>
+    <string name="settings_sky_blue_theme">Dangaus mėlynumo</string>
+    <string name="settings_blue_theme">Mėlyna</string>
+    <string name="settings_violet_theme">Violetinė</string>
+    <string name="settings_magenta_theme">Rausvai raudona</string>
+    <string name="settings_pink_theme">Rožinė</string>
+    <string name="settings_catima_theme">Catima</string>
+    <string name="settings_theme_color">Temos spalva</string>
+    <string name="app_contributors">Tapo įmanoma su pagalba: <xliff:g id="app_contributors">%s</xliff:g></string>
+    <string name="noGroupCards">Šioje grupėje nėra jokių kortelių</string>
+    <string name="toggleMoreInfo">Perjungti išsamios informacijos rodymą</string>
+    <string name="barcodeImageDescriptionWithType"><xliff:g>%s</xliff:g> tipo kortelės brūkšninio kodo vaizdas</string>
+    <string name="swipeToSwitchImages">Perbraukite arba ilgai palaikykite paspaudę, kad perjungtumėte vaizdus</string>
+    <string name="sort_by">Rikiuoti pagal</string>
+    <string name="reverse">Atvirkštinis</string>
+    <string name="sort_by_balance">Balansas</string>
+    <string name="sort_by_expiry">Galiojimo pabaiga</string>
+    <string name="sort_by_most_recently_used">Vėliausiai naudota</string>
+    <string name="sort_by_name">Pavadinimas</string>
+    <string name="sort">Rikiuoti</string>
+    <string name="credits">Padėkos</string>
+    <string name="source_repository">Šaltinio repozitorija</string>
+    <string name="and_data_usage">ir duomenų naudojimas</string>
+    <string name="rate_this_app">Įvertinkite šią programėlę</string>
+    <string name="version_history">Versijų istorija</string>
+    <string name="license">Licencija</string>
+    <string name="on_github">GitHub</string>
+    <string name="on_google_play">Google Play</string>
+    <string name="help_translate_this_app">Padėkite išversti šią programėlę</string>
+    <string name="report_error">Pranešti apie klaidą</string>
+    <string name="exportPasswordHint">Įveskite slaptažodį</string>
+    <string name="exportPassword">Nustatykite slaptažodį, kad apsaugotumėte eksportavimą (neprivaloma)</string>
 </resources>

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

@@ -11,7 +11,7 @@
     <string name="edit">Rediger</string>
     <string name="delete">Slett</string>
     <string name="confirm">Bekreft</string>
-    <string name="lockScreen">Ingen rotering</string>
+    <string name="lockScreen">Skru av rotering</string>
     <string name="unlockScreen">Skru på rotering</string>
     <string name="ok">OK</string>
     <string name="copy_to_clipboard">Kopier ID til utklippstavle</string>
@@ -21,11 +21,10 @@
     <string name="scanCardBarcode">Skann kortets strekkode</string>
     <string name="cardShortcut">Kort-snarvei</string>
     <string name="noCardsMessage">Legg til et kort først</string>
-    <string name="barcodeImageDescription">Bilde av kortets strekkode</string>
     <string name="noStoreError">Navn ikke angitt</string>
     <string name="noCardIdError">Ingen kort-ID innskrevet</string>
     <string name="noCardExistsError">Kunne ikke finne kort</string>
-    <string name="importExport">Import/eksport</string>
+    <string name="importExport">Importer/eksporter</string>
     <string name="exportName">Eksporter</string>
     <string name="importExportHelp">Sikkerhetskopiering av kort lar deg flytte dem til en annen enhet.</string>
     <string name="importSuccessfulTitle">Importert</string>
@@ -41,11 +40,11 @@
     <string name="importOptionFilesystemTitle">Importer fra filsystem</string>
     <string name="importOptionFilesystemExplanation">Velg spesifikk fil fra filsystemet.</string>
     <string name="importOptionFilesystemButton">Fra filsystem</string>
-    <string name="importOptionApplicationTitle">Bruk et annet program</string>
-    <string name="importOptionApplicationExplanation">Bruk hvilket som helst program, eller din favoritt-filutforsker for å åpne en fil.</string>
-    <string name="importOptionApplicationButton">Bruk et annet program</string>
+    <string name="importOptionApplicationTitle">Bruk en annen app</string>
+    <string name="importOptionApplicationExplanation">Bruk en hvilken som helst app, eller din favoritt-filutforsker for å åpne en fil.</string>
+    <string name="importOptionApplicationButton">Bruk en annen app</string>
     <string name="about">Om</string>
-    <string name="app_license">Gemenhetslig fri programvare, lisensiert GPLv3+.</string>
+    <string name="app_license">Gemenhetslig fri programvare, lisensiert GPLv3+</string>
     <string name="about_title_fmt">Om <xliff:g id="app_name">%s</xliff:g></string>
     <string name="debug_version_fmt">Versjon: <xliff:g id="version">%s</xliff:g></string>
     <string name="app_revision_fmt">Utgivelsesinfo: <xliff:g id="app_revision_url">%s</xliff:g></string>
@@ -65,7 +64,7 @@
     <string name="settings_system_theme">System</string>
     <string name="settings_theme">Drakt</string>
     <string name="app_copyright_old">Basert på Kundekortknippe
-\nopphavsrett 2016–2020 Branden Archer.</string>
+\nopphavsrett 2016–2020 Branden Archer</string>
     <string name="failedParsingImportUriError">Kunne ikke tolke importerings-URI</string>
     <string name="share">Del</string>
     <string name="barcodeNoBarcode">Dette kortet har ingen strekkode</string>
@@ -75,13 +74,13 @@
     <string name="unstar">Fjern fra favoritter</string>
     <string name="star">Legg til i favoritter</string>
     <string name="noGroups">Klikk på «+»- (pluss)-tegnet for å legge til grupper for kategorisering først.</string>
-    <string name="deleteConfirmationGroup">Slett gruppe\?</string>
+    <string name="deleteConfirmationGroup">Slett gruppe?</string>
     <string name="all">Alle</string>
     <string name="groups">Grupper</string>
     <string name="enter_group_name">Skriv inn gruppenavn</string>
     <string name="noBarcode">Ingen strekkode</string>
     <string name="failedOpeningFileManager">Installer en filbehandler først.</string>
-    <string name="leaveWithoutSaveConfirmation">Forlat uten å lagre\?</string>
+    <string name="leaveWithoutSaveConfirmation">Forlat uten å lagre?</string>
     <string name="leaveWithoutSaveTitle">Avslutt</string>
     <string name="addManually">Skriv inn kort-ID manuelt</string>
     <string name="moveDown">Flytt nedover</string>
@@ -107,46 +106,44 @@
     <string name="balance">Saldo</string>
     <string name="balancePoints"><xliff:g>%s</xliff:g> poeng</string>
     <string name="balanceSentence">Saldo: <xliff:g>%s</xliff:g></string>
-    <string name="chooseImportType">Importer data fra\?</string>
+    <string name="chooseImportType">Importer data fra?</string>
     <string name="app_loyalty_card_keychain">Kundekortknippe</string>
     <string name="settings_disable_lockscreen_while_viewing_card">Forhindre skjermlås</string>
     <string name="settings_keep_screen_on">Behold skjerm påslått</string>
     <string name="privacy_policy_popup_text">Personvernspraksis-notis (påkrevd av noen programbutikker):
 \n
-\nINGEN DATA SAMLES INN, noe alle kan bekreftes siden programmet vårt er fri programvare.</string>
+\nINGEN DATA SAMLES INN I DET HELE TATT, noe alle kan bekreftes siden programmet vårt er fri programvare.</string>
     <string name="accept">Godta</string>
     <string name="privacy_policy">Personvernspraksis</string>
     <string name="importFidme">Importer fra FidMe</string>
     <string name="importCatima">Importer fra Catima</string>
-    <string name="errorReadingImage">Klarte ikke å lese bildet</string>
+    <string name="errorReadingImage">Kunne ikke lese bildet</string>
     <string name="noBarcodeFound">Fant ingen strekkode</string>
     <string name="addFromImage">Velg bilde fra galleri</string>
     <string name="unsupportedBarcodeType">Denne strekkodetypen kan ikke vises for øyeblikket. Støtte kan bli lagt til i en senere versjon av programmet.</string>
     <string name="setBarcodeId">Sett strekkodeverdi</string>
     <string name="sameAsCardId">Samme som kort-ID</string>
     <string name="barcodeId">Strekkodeverdi</string>
-    <string name="importVoucherVaultMessage">Finn en fil som antagelig heter <i>voucher.vault.json</i> å importere.
-\nEller opprett den ved å trykke «Eksport» i Voucher Vault først.</string>
+    <string name="importVoucherVaultMessage">Velg din <i>vouchervault.json</i>-eksport fra Voucher Vault å importere.
+\nOpprett den ved å trykke «Eksport» i Voucher Vault først.</string>
     <string name="importVoucherVault">Importer fra Voucher Vault</string>
-    <string name="importLoyaltyCardKeychainMessage">Finn en fil som antagelig heter <i>LoyaltyCardKeychain.csv</i> å importere.
-\nEller opprett den i Import/eksport-menyen i Kundekortknippe ved å trykke «Eksporter» der først.</string>
+    <string name="importLoyaltyCardKeychainMessage">Velg din <i>LoyaltyCardKeychain.csv</i>-eksport fra Kundekortknippe å importere.
+\nOpprett den i «Import/Eksport»-menyen i Kundekortknippe ved å trykke «Eksporter» der først.</string>
     <string name="importLoyaltyCardKeychain">Importer fra Kundekortknippe</string>
-    <string name="importFidmeMessage">Finn en fil som antagelig heter <i>fidme.export-request-xxxxx.zip</i> å importere, for så å velge strekkodetypene manuelt etterpå-
-\nEller opprett den i din FidMe-profil ved å velge «Databeskyttelse», for så å trykke «Pakk ut dataen min» først.</string>
-    <string name="importCatimaMessage">Finn en fil som antagelig heter <i>Catima.csv</i> å importere.
-\nEller opprett den i Import/eksport-menyen i et annet Catima-program ved å trykke «Eksporter» der først.</string>
-    <string name="settings_max_font_size_scale">Maksimal skriftstørrelse</string>
+    <string name="importFidmeMessage">Velg din <i>fidme.export-request-xxxxx.zip</i>-eksport fra FidMe å importere, for så å velge strekkodetypene manuelt etterpå-
+\nOpprett den i din FidMe-profil ved å velge «Databeskyttelse», for så å trykke «Pakk ut dataen min» først.</string>
+    <string name="settings_max_font_size_scale">Maks. skriftstørrelse</string>
     <string name="wrongValueForBarcodeType">Verdien er ikke gyldig for valgt strekkodetype</string>
-    <string name="intent_import_card_from_url_share_multiple_text">Jeg ønsker å dele noen kort med deg</string>
-    <string name="copy_to_clipboard_multiple_toast">Kopierte kort-ID-er til utklippstavle</string>
+    <string name="intent_import_card_from_url_share_multiple_text">Jeg vil dele noen kort med deg</string>
+    <string name="copy_to_clipboard_multiple_toast">Kort-ID-er kopiert til utklippstavle</string>
     <string name="app_resources">Frie tredjepartsressurser: <xliff:g id="app_resources_list">%s</xliff:g></string>
     <string name="app_libraries">Frie tredjepartsbibliotek: <xliff:g id="app_libraries_list">%s</xliff:g></string>
     <string name="card_ids_copied">Kopierte kort-ID(er)</string>
-    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Opphavsrett © 2019–<xliff:g>%d</xliff:g> Sylvia van Os.</string>
-    <string name="updateBarcodeQuestionText">Du har endret kortets ID. Ønsker du å også oppdatere strekkoden til samme verdi\?</string>
+    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Opphavsrett © 2019–<xliff:g>%d</xliff:g> Sylvia van Os</string>
+    <string name="updateBarcodeQuestionText">Du har endret kortets ID. Ønsker du å også oppdatere strekkoden til samme verdi?</string>
     <string name="no">Nei</string>
     <string name="yes">Ja</string>
-    <string name="updateBarcodeQuestionTitle">Oppdater strekkodeverdi\?</string>
+    <string name="updateBarcodeQuestionTitle">Oppdater strekkodeverdi?</string>
     <string name="takePhoto">Ta et bilde</string>
     <string name="removeImage">Fjern bilde</string>
     <string name="setBackImage">Sett bakside</string>
@@ -155,24 +152,62 @@
     <string name="backImageDescription">Kortets bakside</string>
     <string name="frontImageDescription">Kortets forside</string>
     <string name="importStocardMessage">Velg din <i>***-sync.zip</i>-eksport fra Stocard å importere.
-\nEller få den ved å sende e-post til support@stocardapp.com der du etterspør eksport av dataen din.</string>
+\nSkaff den ved å sende e-post til support@stocardapp.com der du etterspør eksport av dataen din.</string>
     <string name="passwordRequired">Skriv inn passordet</string>
     <string name="importStocard">Importer fra Stocard</string>
     <string name="failedGeneratingShareURL">Klarte ikke å lage delbar nettadresse. Rapporter denne feilen.</string>
     <plurals name="selectedCardCount">
         <item quantity="one"><xliff:g>%d</xliff:g> kort valgt</item>
-        <item quantity="other"><xliff:g>%d</xliff:g> kort valgt</item>
+        <item quantity="other"><xliff:g>%d</xliff:g> korten valgt</item>
     </plurals>
-    <string name="deleteConfirmation">Slett dette kortet\?</string>
+    <string name="deleteConfirmation">Slett dette kortet for godt?</string>
     <plurals name="deleteCardsConfirmation">
         <item quantity="one">Slett dette kortet for godt\?</item>
-        <item quantity="other">Slett disse <xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%d</xliff:g> kortene for godt\?</item>
+        <item quantity="other">Slett disse <xliff:g>%d</xliff:g> kortene for godt\?</item>
     </plurals>
     <string name="turn_flashlight_on">Skru på lommelykten</string>
     <string name="turn_flashlight_off">Skru av lommelykten</string>
-    <string name="deleteTitle">Fjern kundekort</string>
+    <string name="deleteTitle">Slett kort</string>
     <plurals name="deleteCardsTitle">
-        <item quantity="one">Slett <xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%d</xliff:g> kort</item>
-        <item quantity="other">Slett <xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%d</xliff:g> kort</item>
+        <item quantity="one">Slett <xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%s</xliff:g> kort</item>
+        <item quantity="other">Slett <xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%s</xliff:g> kort</item>
     </plurals>
-</resources>
+    <string name="settings_system_locale">System</string>
+    <string name="settings_locale">Språk</string>
+    <string name="settings_violet_theme">Fiolett</string>
+    <string name="settings_magenta_theme">Magentarød</string>
+    <string name="app_contributors">Muliggjort av: <xliff:g id="app_contributors">%s</xliff:g></string>
+    <string name="settings_brown_theme">Brun</string>
+    <string name="settings_grey_theme">Grå</string>
+    <string name="settings_green_theme">Grønn</string>
+    <string name="settings_sky_blue_theme">Himmelblå</string>
+    <string name="settings_blue_theme">Blå</string>
+    <string name="settings_pink_theme">Rosa</string>
+    <string name="settings_catima_theme">Catima</string>
+    <string name="settings_theme_color">Draktfarge</string>
+    <string name="noGroupCards">Denne gruppen inneholder ikke noen kort</string>
+    <string name="toggleMoreInfo">Veksle visning av mer info</string>
+    <string name="barcodeImageDescriptionWithType">Bilde av kortstrekkode av typen <xliff:g>%s</xliff:g></string>
+    <string name="swipeToSwitchImages">Dra eller hold lenge for å bygge bilder</string>
+    <string name="sort_by">Sorter etter</string>
+    <string name="reverse">Vend</string>
+    <string name="sort_by_balance">Saldo</string>
+    <string name="sort_by_expiry">Utløp</string>
+    <string name="sort_by_most_recently_used">Nyligst brukt</string>
+    <string name="sort_by_name">Navn</string>
+    <string name="sort">Sorter</string>
+    <string name="help_translate_this_app">Hjelp med å oversette denne appen</string>
+    <string name="license">Lisens</string>
+    <string name="version_history">Versjonshistorikk</string>
+    <string name="importCatimaMessage">Velg din <i>catima.zip</i>-eksport fra Catima å importere.
+\nOpprett den fra «Importer/Eksporter»-menyen i en annen Catima-app ved å trykke på «Eksporter» der først</string>
+    <string name="source_repository">Kildekode</string>
+    <string name="on_github">på GitHub</string>
+    <string name="and_data_usage">og bruk av data</string>
+    <string name="rate_this_app">Vurder denne appen</string>
+    <string name="on_google_play">på Google Play</string>
+    <string name="report_error">Rapporter feil</string>
+    <string name="credits">Bidragsytere</string>
+    <string name="exportPassword">Sett et passord for å beskytte eksporten din (valgfritt)</string>
+    <string name="exportPasswordHint">Skriv inn passord</string>
+</resources>

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

@@ -19,4 +19,6 @@
     <color name="inputDividerBorder">#666666</color>
 
     <color name="iconColor">#ffffff</color>
+
+    <color name="mainLoyaltyCardBackground">#000000</color>
 </resources>

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

@@ -25,7 +25,6 @@
     <string name="scanCardBarcode">Scan de barcode van de kaart</string>
     <string name="cardShortcut">Kaartsnelkoppeling</string>
     <string name="noCardsMessage">Voeg eerst een kaart toe</string>
-    <string name="barcodeImageDescription">Afbeelding van barcode</string>
     <string name="noStoreError">Geen naam ingevoerd</string>
     <string name="noCardIdError">Geen kaartnummer ingevoerd</string>
     <string name="noCardExistsError">De kaart is niet aangetroffen</string>
@@ -44,18 +43,18 @@
     <string name="noExternalStoragePermissionError">Verleen het recht ‘externe opslag’ om kaarten te kunnen im- of exporteren</string>
     <string name="exportOptionExplanation">De gegevens worden weggeschreven op een locatie naar keuze.</string>
     <string name="importOptionFilesystemTitle">Importeren uit bestandssysteem</string>
-    <string name="importOptionFilesystemExplanation">Kies een specifiek bestand vanop het bestandssysteem.</string>
+    <string name="importOptionFilesystemExplanation">Kies een specifiek bestand van het bestandssysteem.</string>
     <string name="importOptionFilesystemButton">Van bestandssysteem</string>
     <string name="importOptionApplicationTitle">Andere app gebruiken</string>
     <string name="importOptionApplicationExplanation">Open een bestand middels een app of je favoriete bestandsbeheerder.</string>
     <string name="importOptionApplicationButton">Andere app gebruiken</string>
     <string name="about">Over</string>
-    <string name="app_license">Vrije software, uitgebracht onder de GPLv3-licentie.</string>
+    <string name="app_license">Vrije software, uitgebracht onder de GPLv3+-licentie</string>
     <string name="about_title_fmt">Over <xliff:g id="app_name">%s</xliff:g></string>
     <string name="debug_version_fmt">Versie: <xliff:g id="version">%s</xliff:g></string>
     <string name="app_revision_fmt">Versie-informatie: <xliff:g id="app_revision_url">%s</xliff:g></string>
     <string name="selectBarcodeTitle">Barcode toevoegen</string>
-    <string name="enterBarcodeInstructions">Voer de kaart-id in en kies daarna het soort barcode druk op “Deze kaart heeft geen barcode”.</string>
+    <string name="enterBarcodeInstructions">Voer de kaart-id in en kies daarna het soort barcode of druk op “Deze kaart heeft geen barcode”.</string>
     <string name="copy_to_clipboard_toast">De kaart-id is gekopieerd naar het klembord</string>
     <string name="thumbnailDescription">Miniatuurvoorbeeld van kaart</string>
     <string name="settings">Instellingen</string>
@@ -75,8 +74,8 @@
     <string name="groups">Groepen</string>
     <string name="enter_group_name">Voer een groepsnaam in</string>
     <string name="starImage">Favoriete ster</string>
-    <string name="app_copyright_old">Gebaseerd op Loyalty Card Keychain,
-\ncopyright ©2016–2020 Branden Archer.</string>
+    <string name="app_copyright_old">Gebaseerd op Klantenkaartkluis,
+\ncopyright ©2016–2020 Branden Archer</string>
     <string name="unstar">Verwijderen uit favorieten</string>
     <string name="star">Toevoegen aan favorieten</string>
     <string name="addManually">Kaartnummer handmatig invoeren</string>
@@ -117,15 +116,15 @@
     <string name="privacy_policy">Privacybeleid</string>
     <string name="accept">Accepteren</string>
     <string name="importVoucherVaultMessage">Kies het te importeren <i>vouchervault.json</i>-exportbestand.
-\nOf ga naar het exportmenu van Voucher Vault om een exportbestand samen te stellen.</string>
+\nGa naar het exportmenu van Voucher Vault om een exportbestand samen te stellen.</string>
     <string name="importVoucherVault">Importeren uit Voucher Vault</string>
     <string name="importLoyaltyCardKeychainMessage">Kies het te importeren genaamd <i>LoyaltyCardKeychain.csv</i>-exportbestand.
-\nOf ga naar het import-/exportmenu van Klantenkaartkluis om een exportbestand samen te stellen.</string>
+\nGa naar het import-/exportmenu van Klantenkaartkluis om een exportbestand samen te stellen.</string>
     <string name="importLoyaltyCardKeychain">Importeren uit Klantenkaartkluis</string>
     <string name="importFidmeMessage">Kies het te importeren <i>fidme-export-request-xxxxxx.zip</i>-exportbestand en kies nadien de juiste barcodes.
-\nOf ga naar je FidMe-profiel en druk op ‘Gegevensbescherming’ om een exportbestand samen te stellen.</string>
+\nGa naar je FidMe-profiel en druk op ‘Gegevensbescherming’ om een exportbestand samen te stellen.</string>
     <string name="importCatimaMessage">Kies het te importeren <i>Catima.zip</i>-exportbestand.
-\nOf ga naar het import-/exportmenu van Catima op een ander apparaat om een exportbestand samen te stellen.</string>
+\nGa naar het import-/exportmenu van Catima op een ander apparaat om een exportbestand samen te stellen.</string>
     <string name="importFidme">Importeren uit FidMe</string>
     <string name="importCatima">Importeren uit Catima</string>
     <string name="errorReadingImage">De afbeelding kan niet worden uitgelezen</string>
@@ -139,7 +138,7 @@
     <string name="wrongValueForBarcodeType">Deze waarde komt niet overeen met het gekozen barcodetype</string>
     <string name="app_resources">Vrije externe bronnen: <xliff:g id="app_resources_list">%s</xliff:g></string>
     <string name="app_libraries">Vrije externe bibliotheken: <xliff:g id="app_libraries_list">%s</xliff:g></string>
-    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Auteursrecht © 2019–<xliff:g>%d</xliff:g> Sylvia van Os.</string>
+    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Auteursrecht © 2019–<xliff:g>%d</xliff:g> Sylvia van Os</string>
     <string name="intent_import_card_from_url_share_multiple_text">Ik wil kaarten met je delen</string>
     <string name="copy_to_clipboard_multiple_toast">De kaart-id\'s zijn gekopieerd naar het klembord</string>
     <string name="card_ids_copied">De kaart-id‘s zijn gekopieerd</string>
@@ -156,7 +155,7 @@
     <string name="frontImageDescription">Voorzijde van de kaart</string>
     <string name="passwordRequired">Voer het wachtwoord in</string>
     <string name="importStocardMessage">Kies het te importeren Stocard-exportbestand genaamd <i>***-sync.zip</i>.
-\nOf stuur een e-mail naar support@stocardapp.com waarin je vraagt om een exportbestand.</string>
+\nStuur een e-mail naar support@stocardapp.com waarin je vraagt om een exportbestand.</string>
     <string name="importStocard">Importeren uit Stocard</string>
     <string name="failedGeneratingShareURL">De te delen link kan niet worden gegenereerd. Meld deze fout.</string>
     <string name="turn_flashlight_off">Zaklamp uitzetten</string>
@@ -175,4 +174,40 @@
         <item quantity="one">Weet je zeker dat je deze <xliff:g>%d</xliff:g> kaart wilt verwijderen\?</item>
         <item quantity="other">Weet je zeker dat je deze <xliff:g>%d</xliff:g> kaarten wilt verwijderen\?</item>
     </plurals>
+    <string name="settings_system_locale">Systeemtaal</string>
+    <string name="settings_locale">Taal</string>
+    <string name="settings_brown_theme">Bruin</string>
+    <string name="settings_grey_theme">Grijs</string>
+    <string name="settings_green_theme">Groen</string>
+    <string name="settings_sky_blue_theme">Hemelsblauw</string>
+    <string name="settings_blue_theme">Blauw</string>
+    <string name="settings_violet_theme">Violet</string>
+    <string name="settings_magenta_theme">Magenta</string>
+    <string name="settings_pink_theme">Roze</string>
+    <string name="settings_catima_theme">Catima</string>
+    <string name="settings_theme_color">Themakleur</string>
+    <string name="app_contributors">Mede mogelijk gemaakt door: <xliff:g id="app_contributors">%s</xliff:g></string>
+    <string name="noGroupCards">Deze groep bevat geen kaarten</string>
+    <string name="toggleMoreInfo">Meer informatie tonen/verbergen</string>
+    <string name="barcodeImageDescriptionWithType">Afbeelding van de barcode, type <xliff:g>%s</xliff:g></string>
+    <string name="swipeToSwitchImages">Veeg of houd lang ingedrukt om te bladeren</string>
+    <string name="sort_by">Sorteren op</string>
+    <string name="reverse">Omdraaien</string>
+    <string name="sort_by_balance">Op saldo</string>
+    <string name="sort_by_expiry">Op vervaldatum</string>
+    <string name="sort_by_most_recently_used">Op onlangs gebruikt</string>
+    <string name="sort_by_name">Op naam</string>
+    <string name="sort">Sorteren</string>
+    <string name="report_error">Fout melden</string>
+    <string name="on_google_play">in Google Play</string>
+    <string name="rate_this_app">Beoordeel deze app</string>
+    <string name="and_data_usage">en gegevensgebruik</string>
+    <string name="on_github">op GitHub</string>
+    <string name="source_repository">Broncode</string>
+    <string name="license">Licentie</string>
+    <string name="help_translate_this_app">Help deze app te vertalen</string>
+    <string name="credits">Met dank aan</string>
+    <string name="version_history">Versiegeschiedenis</string>
+    <string name="exportPasswordHint">Voer een wachtwoord in</string>
+    <string name="exportPassword">Stel een wachtwoord in om je exportbestand te beveiligen (optioneel)</string>
 </resources>

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="exporting">Exportacion…</string>
     <string name="importing">Importacion…</string>
     <string name="exportFailed">Exportacion pas possibla</string>
@@ -14,7 +14,6 @@
     <string name="noCardExistsError">Cap de carta pas trobada</string>
     <string name="noCardIdError">Cap de numèro de carta pas picat</string>
     <string name="noStoreError">Cap de nom pas picat</string>
-    <string name="barcodeImageDescription">Imatge del còdi de barras</string>
     <string name="card_ids_copied">Num. de la carta copiada</string>
     <string name="noCardsMessage">Apondètz d’en primièr una carta</string>
     <string name="cardShortcut">Acorchi de carta</string>
@@ -38,4 +37,17 @@
     <string name="storeName">Nom</string>
     <string name="action_add">Apondre</string>
     <string name="action_search">Recercar</string>
+    <string name="ok">D\'acòrdi</string>
+    <string name="deleteConfirmation">Suprimir aquesta carta \?</string>
+    <plurals name="deleteCardsTitle">
+        <item quantity="one">Suprimir <xliff:g>%d</xliff:g> carta</item>
+        <item quantity="other">Suprimir <xliff:g>%d</xliff:g> cartas</item>
+    </plurals>
+    <string name="deleteTitle">Suprimir la carta</string>
+    <string name="noBarcode">Cap de còdi de barras</string>
+    <string name="barcodeNoBarcode">Aquesta carta a pas cap de còdi de barras</string>
+    <plurals name="selectedCardCount">
+        <item quantity="one"><xliff:g>%d</xliff:g> carta seleccionada</item>
+        <item quantity="other"><xliff:g>%d</xliff:g> cartas seleccionadas</item>
+    </plurals>
 </resources>

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

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" xmlns:tools="http://schemas.android.com/tools">
     <string name="action_search">Szukaj</string>
     <string name="action_add">Dodaj</string>
-    <string name="noGiftCards">W tej chwili nie masz żadnych kart lojalnościowych. Kliknij przycisk \"+\" (plus) u góry, aby rozpocząć. \n\nLoyalty Locker Card pozwala nosić karty lojalnościowe w telefonie, dzięki czemu są zawsze w zasięgu ręki.</string>
+    <string name="noGiftCards">Kliknij przycisk + plus, aby dodać kartę lub zaimportuj jakieś z ⋮ menu w pierwszej kolejności.</string>
     <string name="noMatchingGiftCards">Nic nie znaleziono. Spróbuj zmienić wyszukiwanie.</string>
-    <string name="storeName">Sklep</string>
+    <string name="storeName">Nazwa</string>
     <string name="note">Notatka</string>
     <string name="cardId">Identyfikator karty</string>
     <string name="barcodeNoBarcode">Ta karta nie ma kodu kreskowego</string>
@@ -24,8 +24,7 @@
     <string name="scanCardBarcode">Zeskanuj kod kreskowy karty lojalnościowej</string>
     <string name="cardShortcut">Skrót karty</string>
     <string name="noCardsMessage">Najpierw dodaj kartę</string>
-    <string name="barcodeImageDescription">Obraz kodu kreskowego karty</string>
-    <string name="noStoreError">Nie wprowadzono nazwy sklepu</string>
+    <string name="noStoreError">Nie wprowadzono nazwy</string>
     <string name="noCardIdError">Nie wprowadzono identyfikatora karty</string>
     <string name="noCardExistsError">Nie można wyszukać karty lojalnościowej</string>
     <string name="failedParsingImportUriError">Nie można przeanalizować identyfikatora importu URI</string>
@@ -44,17 +43,17 @@
     <string name="importOptionFilesystemTitle">Importuj z systemu plików</string>
     <string name="importOptionFilesystemExplanation">Wybierz określony plik z systemu plików.</string>
     <string name="importOptionFilesystemButton">Z systemu plików</string>
-    <string name="importOptionApplicationTitle">Użyj zewnętrznej aplikacji</string>
+    <string name="importOptionApplicationTitle">Użyj innej aplikacji</string>
     <string name="importOptionApplicationExplanation">Użyj dowolnej aplikacji lub ulubionego menedżera plików, aby otworzyć plik.</string>
-    <string name="importOptionApplicationButton">Użyj zewnętrznej aplikacji</string>
+    <string name="importOptionApplicationButton">Użyj innej aplikacji</string>
     <string name="about">O aplikacji</string>
     <string name="app_license">Wolne oprogramowanie copylefted, licencjonowane GPLv3 +.</string>
     <string name="about_title_fmt">O <xliff:g id="app_name">%s</xliff:g></string>
     <string name="debug_version_fmt">Wersja: <xliff:g id="version">%s</xliff:g></string>
-    <string name="app_revision_fmt">Info o wydaniu: <xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" id="app_revision_url">%s</xliff:g></string>
+    <string name="app_revision_fmt">Info o wydaniu: <xliff:g id="app_revision_url">%s</xliff:g></string>
     <string name="selectBarcodeTitle">Wybierz kod kreskowy</string>
-    <string name="enterBarcodeInstructions">Wprowadź identyfikator karty, a następnie wybierz obraz reprezentujący kod kreskowy, którego chcesz użyć, lub wybierz „Ta karta nie ma kodu kreskowego”, aby nie używać kodu kreskowego.</string>
-    <string name="copy_to_clipboard_toast">Skopiowano identyfikator karty do schowka</string>
+    <string name="enterBarcodeInstructions">Wprowadź ID karty, a następnie wybierz typ kodu kreskowego, którego chcesz użyć lub wybierz „Ta karta nie ma kodu kreskowego”.</string>
+    <string name="copy_to_clipboard_toast">Skopiowano ID karty do schowka</string>
     <string name="thumbnailDescription">Miniaturka karty</string>
     <string name="settings">Ustawienia</string>
     <string name="settings_category_title_ui">Interfejs użytkownika</string>
@@ -65,22 +64,136 @@
     <string name="settings_display_barcode_max_brightness">Rozjaśnij widok kodu kreskowego</string>
     <string name="settings_lock_barcode_orientation">Zablokuj autoobracanie kodów kreskowych</string>
     <string name="intent_import_card_from_url_share_text">Chcę udostępnić Ci kartę lojalnościową</string>
-    <string name="deleteConfirmationGroup">Potwierdź, że chcesz usunąć tę grupę</string>
+    <string name="deleteConfirmationGroup">Usunąć grupę\?</string>
     <string name="all">Wszystko</string>
-    <string name="noGroups">Kliknij przycisk + (plus), aby najpierw dodać grupy.
-\n
-\nGrupy ułatwiają wyszukiwanie.</string>
+    <string name="noGroups">Najpierw kliknij przycisk + plus, aby dodać grupy dla kategoryzacji.</string>
     <string name="groups">Grupy</string>
     <string name="enter_group_name">Wpisz nazwę grupy</string>
     <string name="exportSuccessful">Dane karty zostały wyeksportowane</string>
     <string name="importSuccessful">Zaimportowano dane karty</string>
     <string name="starImage">Ulubiona gwiazda</string>
-    <string name="app_copyright_old">Na podstawie Loyalty Card Keychain, prawa autorskie 2016–2020 Branden Archer.</string>
+    <string name="app_copyright_old">Na podstawie Loyalty Card Keychain
+\nWszelkie prawa zastrzeżone © 2016–2020 Branden Archer.</string>
     <string name="exportOptionExplanation">Dane zostaną zapisane w wybranym przez Ciebie miejscu.</string>
     <string name="unstar">Usuń z ulubionych</string>
     <string name="star">Dodaj do ulubionych</string>
     <string name="noBarcode">Brak kodu kreskowego</string>
     <string name="barcodeType">Typ kodu kreskowego</string>
-    <string name="deleteTitle">Usuń kartę lojalnościową</string>
-    <string name="deleteConfirmation">Potwierdź, że chcesz usunąć tę kartę.</string>
+    <string name="deleteTitle">Usuń kartę</string>
+    <string name="deleteConfirmation">Usunąć tę kartę na stałe\?</string>
+    <string name="app_contributors">Możliwe dzięki: <xliff:g id="app_contributors">%s</xliff:g></string>
+    <string name="settings_brown_theme">Brązowy</string>
+    <string name="settings_grey_theme">Szary</string>
+    <string name="settings_green_theme">Zielony</string>
+    <string name="settings_sky_blue_theme">Błękitny</string>
+    <string name="settings_blue_theme">Niebieski</string>
+    <string name="settings_violet_theme">Fioletowy</string>
+    <string name="settings_magenta_theme">Magenta</string>
+    <string name="settings_pink_theme">Różowy</string>
+    <string name="settings_catima_theme">Catima</string>
+    <string name="settings_theme_color">Kolor motywu</string>
+    <string name="settings_system_locale">System</string>
+    <string name="settings_locale">Język</string>
+    <string name="turn_flashlight_off">Wyłącz latarkę</string>
+    <string name="turn_flashlight_on">Włącz latarkę</string>
+    <string name="failedGeneratingShareURL">Nie można wygenerować adresu URL do udostępnienia. Proszę to zgłosić.</string>
+    <string name="passwordRequired">Proszę wpisać hasło</string>
+    <string name="no">Nie</string>
+    <string name="yes">Tak</string>
+    <string name="updateBarcodeQuestionText">Zmieniłeś ID karty. Czy chcesz zaktualizować kod kreskowy, aby używał tej samej wartości\?</string>
+    <string name="updateBarcodeQuestionTitle">Zaktualizować wartość kodu kreskowego\?</string>
+    <string name="takePhoto">Zrób zdjęcie</string>
+    <string name="removeImage">Usuń zdjęcie</string>
+    <string name="setBackImage">Ustaw tylne zdjęcie</string>
+    <string name="setFrontImage">Ustaw zdjęcie przednie</string>
+    <string name="photos">Zdjęcia</string>
+    <string name="backImageDescription">Zdjęcie tylne karty</string>
+    <string name="frontImageDescription">Zdjęcie przednie karty</string>
+    <string name="intent_import_card_from_url_share_multiple_text">Chcę Ci udostępnić karty</string>
+    <string name="copy_to_clipboard_multiple_toast">Skopiowano ID karty do schowka</string>
+    <string name="wrongValueForBarcodeType">Wartość nie jest prawidłowa dla wybranego typu kodu kreskowego</string>
+    <string name="unsupportedBarcodeType">Nie można jeszcze wyświetlić tego typu kodu kreskowego. Być może będzie on obsługiwany w nowszej wersji aplikacji.</string>
+    <string name="setBarcodeId">Ustaw wartość kodu kreskowego</string>
+    <string name="sameAsCardId">Taki sam jak ID karty</string>
+    <string name="barcodeId">Wartość kodu kreskowego</string>
+    <string name="importVoucherVaultMessage">Wybierz swój <i>vouchervault.json</i> z Voucher Vault, aby zaimportować.
+\nLub utwórz go wpierw klikając Eksportuj w Voucher Vault.</string>
+    <string name="importVoucherVault">Importuj z Voucher Vault</string>
+    <string name="importStocardMessage">Wybierz swój <i>***-sync.zip</i> z Stocard, aby zaimportować.
+\nLub uzyskaj go, wysyłając email na adres support@stocardapp.com, z prośbą o eksport Twoich danych.</string>
+    <string name="importStocard">Importuj z Stocard</string>
+    <string name="importLoyaltyCardKeychainMessage">Wybierz swój <i>LoyaltyCardKeychain.csv</i> z Loyalty Card Keychain, aby zaimportować.
+\nLub utwórz go z menu Importuj/Eksportuj w Loyalty Card Keychain, wpierw klikając tam Eksportuj.</string>
+    <string name="importLoyaltyCardKeychain">Importuj z Loyalty Card Keychain</string>
+    <string name="importFidmeMessage">Wybierz swój <i>fidme-export-request-xxxxxx.zip</i> z FidMe, aby zaimportować, po czym wybierz typy kodów kreskowych.
+\nLub stwórz go ze swojego profilu FidMe, wybierając wpierw Ochrona Danych, a następnie naciskając Wyodrębnij moje dane.</string>
+    <string name="importFidme">Importuj z FidMe</string>
+    <string name="importCatimaMessage">Wybierz swój <i>catima.zip</i> z Catima, aby zaimportować.
+\nLub utwórz go z menu Importuj/Eksportuj innej aplikacji Catima, wpierw klikając tam Eksportuj.</string>
+    <string name="importCatima">Importuj z Catima</string>
+    <string name="accept">Zaakceptuj</string>
+    <string name="privacy_policy_popup_text">Informacja o polityce prywatności (wymagana przez niektóre sklepy z aplikacjami):
+\n
+\nŻADNE DANE NIE SĄ ZBIERANE, co może potwierdzić każdy, gdyż nasza aplikacja jest wolnym oprogramowaniem.</string>
+    <string name="privacy_policy">Polityka prywatności</string>
+    <string name="app_loyalty_card_keychain">Loyalty Card Keychain</string>
+    <string name="chooseImportType">Importuj dane z ...\?</string>
+    <string name="parsingBalanceFailed"><xliff:g>%s</xliff:g> nie wydaje się być prawidłową wartością.</string>
+    <string name="points">Punkty</string>
+    <string name="currency">Waluta</string>
+    <string name="balance">Saldo</string>
+    <string name="errorReadingImage">Nie udało się odczytać zdjęcia</string>
+    <string name="noBarcodeFound">Nie znaleziono kodu kreskowego</string>
+    <string name="moveBarcodeToCenterOfScreen">Wyśrodkuj kod kreskowy na ekranie</string>
+    <string name="moveBarcodeToTopOfScreen">Przenieś kod kreskowy na górę ekranu</string>
+    <string name="chooseExpiryDate">Wybierz datę ważności</string>
+    <string name="never">Nigdy</string>
+    <string name="expiryDate">Data wygaśnięcia</string>
+    <string name="editBarcode">Edytuj kod kreskowy</string>
+    <string name="barcode">Kod kreskowy</string>
+    <string name="card">Karta</string>
+    <string name="balancePoints"><xliff:g>%s</xliff:g> punkty</string>
+    <string name="balanceSentence">Saldo: <xliff:g>%s</xliff:g></string>
+    <string name="expiryStateSentenceExpired">Wygasło: <xliff:g>%s</xliff:g></string>
+    <string name="expiryStateSentence">Wygasa: <xliff:g>%s</xliff:g></string>
+    <string name="groupsList">Grupy: <xliff:g>%s</xliff:g></string>
+    <string name="addFromImage">Wybierz zdjęcie z galerii</string>
+    <string name="addManually">Wpisz ręcznie ID karty</string>
+    <string name="leaveWithoutSaveConfirmation">Wyjść bez zapisywania\?</string>
+    <string name="leaveWithoutSaveTitle">Wyjdź</string>
+    <string name="moveDown">Przesuń w dół</string>
+    <string name="moveUp">Przesuń w górę</string>
+    <string name="failedOpeningFileManager">Najpierw zainstaluj menadżera plików.</string>
+    <plurals name="groupCardCount">
+        <item quantity="one"><xliff:g>%d</xliff:g> karta</item>
+        <item quantity="few"><xliff:g>%d</xliff:g> karty</item>
+        <item quantity="many"><xliff:g>%d</xliff:g> kart</item>
+        <item quantity="other"><xliff:g>%d</xliff:g> kart</item>
+    </plurals>
+    <string name="noGroupCards">Ta grupa nie zawiera żadnych kart</string>
+    <string name="settings_disable_lockscreen_while_viewing_card">Zapobiegaj blokowaniu ekranu</string>
+    <string name="settings_keep_screen_on">Pozostaw ekran włączony</string>
+    <string name="settings_max_font_size_scale">Maks. rozmiar czcionki</string>
+    <string name="app_resources">Otwarte zewnętrzne zasoby: <xliff:g id="app_resources_list">%s</xliff:g></string>
+    <string name="app_libraries">Otwarte zewnętrzne biblioteki: <xliff:g id="app_libraries_list">%s</xliff:g></string>
+    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Wszelkie prawa zastrzeżone © 2019–<xliff:g>%d</xliff:g> Sylvia van Os.</string>
+    <string name="card_ids_copied">Skopiowano ID karty</string>
+    <plurals name="deleteCardsConfirmation">
+        <item quantity="one">Usunąć tą <xliff:g>%d</xliff:g> kartę permamentnie\?</item>
+        <item quantity="few">Usunąć te <xliff:g>%d</xliff:g> karty permamentnie\?</item>
+        <item quantity="many">Usunąć tych <xliff:g>%d</xliff:g> kart permamentnie\?</item>
+        <item quantity="other">Usunąć tych <xliff:g>%d</xliff:g> kart permamentnie\?</item>
+    </plurals>
+    <plurals name="deleteCardsTitle">
+        <item quantity="one">Usuń <xliff:g>%d</xliff:g> kartę</item>
+        <item quantity="few">Usuń <xliff:g>%d</xliff:g> karty</item>
+        <item quantity="many">Usuń <xliff:g>%d</xliff:g> kart</item>
+        <item quantity="other">Usuń <xliff:g>%d</xliff:g> kart</item>
+    </plurals>
+    <plurals name="selectedCardCount">
+        <item quantity="one"><xliff:g>%d</xliff:g> wybrana karta</item>
+        <item quantity="few"><xliff:g>%d</xliff:g> wybrane karty</item>
+        <item quantity="many"><xliff:g>%d</xliff:g> wybranych kart</item>
+        <item quantity="other"><xliff:g>%d</xliff:g> wybranych kart</item>
+    </plurals>
 </resources>

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

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="action_add">Acrescentar</string>
+    <string name="importOptionFilesystemExplanation">Escolha um ficheiro específico a partir do sistema de ficheiros.</string>
+    <string name="action_search">Pesquisa</string>
+    <string name="star">Adicionar aos favoritos</string>
+    <string name="noMatchingGiftCards">Não encontrei nada. Tente alterar a sua pesquisa.</string>
+    <string name="storeName">Nome</string>
+    <string name="note">Nota</string>
+    <string name="barcodeType">Tipo de código de barras</string>
+    <string name="barcodeNoBarcode">Este cartão não tem código de barras</string>
+    <string name="cancel">Cancelar</string>
+    <string name="save">Guardar</string>
+    <string name="edit">Edição</string>
+    <string name="noGiftCards">Clique no botão + + para adicionar um cartão, ou importe algum do menu ⋮ primeiro.</string>
+    <string name="noBarcode">Não há código de barras</string>
+    <string name="unstar">Retirar dos favoritos</string>
+    <string name="importOptionFilesystemButton">Do sistema de arquivo</string>
+    <string name="importOptionApplicationTitle">Use outro aplicativo</string>
+    <string name="importOptionApplicationExplanation">Utilize qualquer aplicação ou o seu gestor de ficheiros favorito para abrir um ficheiro.</string>
+    <string name="importOptionApplicationButton">Utilize outro aplicativo</string>
+    <string name="about">Sobre</string>
+    <string name="app_license">Copylefted software livre, licenciado GPLv3+</string>
+</resources>

app/src/main/res/values-ro-rRO/strings.xml

@@ -1,4 +1,102 @@
-<resources
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-
-    </resources>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="barcodeType">Tip cod de bare</string>
+    <string name="cardId">Cardului ID</string>
+    <string name="note">Notă</string>
+    <string name="storeName">Numele</string>
+    <string name="noMatchingGiftCards">Nu am găsit nimic. Încearcă să schimbi căutarea.</string>
+    <string name="noGiftCards">Faceți clic pe butonul + plus pentru a adăuga o carte sau importați mai întâi câteva din meniul ⋮.</string>
+    <string name="action_add">Adăugați</string>
+    <string name="action_search">Căutare</string>
+    <string name="sendLabel">Trimiteți…</string>
+    <string name="share">Împărtășiți</string>
+    <string name="copy_to_clipboard">Copiați ID-ul în clipboard</string>
+    <string name="deleteConfirmation">Să șterg definitiv acest card\?</string>
+    <string name="deleteTitle">Ștergeți cardul</string>
+    <string name="unlockScreen">Deblocarea rotației</string>
+    <string name="lockScreen">Rotația blocurilor</string>
+    <string name="confirm">Confirmați</string>
+    <string name="delete">Ștergeți</string>
+    <string name="edit">Editați</string>
+    <string name="save">Salvați</string>
+    <string name="cancel">Anulează</string>
+    <string name="unstar">Eliminați din favorite</string>
+    <string name="star">Adaugă la favorite</string>
+    <string name="noBarcode">Fără cod de bare</string>
+    <string name="barcodeNoBarcode">Acest card nu are cod de bare</string>
+    <string name="moveDown">Mutarea în jos</string>
+    <string name="card">Cardul</string>
+    <string name="settings_theme">Tema</string>
+    <string name="all">Toate</string>
+    <string name="noCardsMessage">Adăugați mai întâi o carte</string>
+    <string name="noCardExistsError">Nu a putut găsi cardul</string>
+    <string name="failedParsingImportUriError">Nu s-a putut analiza URI-ul de import</string>
+    <string name="importExport">Importație/Export</string>
+    <string name="exportName">Exportați</string>
+    <string name="importSuccessfulTitle">Importat</string>
+    <string name="importFailedTitle">Importul a eșuat</string>
+    <string name="importFailed">Nu s-a putut importa carduri</string>
+    <string name="noCardIdError">Nu s-a introdus niciun ID de card</string>
+    <string name="exportFailed">Nu s-a putut exporta carduri</string>
+    <string name="importing">Importul…</string>
+    <string name="exporting">Exportul…</string>
+    <string name="noExternalStoragePermissionError">Acordați mai întâi permisiunea de stocare externă pentru a importa sau exporta carduri</string>
+    <string name="exportOptionExplanation">Datele vor fi scrise într-o locație aleasă de dumneavoastră.</string>
+    <string name="importOptionFilesystemTitle">Import din sistemul de fișiere</string>
+    <string name="importOptionApplicationTitle">Utilizați o altă aplicație</string>
+    <string name="starImage">Steaua preferată</string>
+    <string name="settings">Setări</string>
+    <string name="settings_category_title_ui">Interfață utilizator</string>
+    <string name="intent_import_card_from_url_share_text">Vreau să împărtășesc o carte cu tine</string>
+    <string name="moveUp">Mutarea în sus</string>
+    <string name="editCardTitle">Editare card</string>
+    <string name="addCardTitle">Adaugă card</string>
+    <string name="importOptionFilesystemButton">Din sistemul de fișiere</string>
+    <string name="importOptionApplicationExplanation">Utilizați orice aplicație sau managerul de fișiere preferat pentru a deschide un fișier.</string>
+    <string name="about">Despre</string>
+    <string name="app_license">Software liber cu copyleft, licențiat GPLv3+</string>
+    <string name="enterBarcodeInstructions">Introduceți ID-ul cardului și alegeți fie tipul de cod de bare de mai jos, fie \"Acest card nu are cod de bare\".</string>
+    <string name="settings_system_theme">Sistemul</string>
+    <string name="settings_light_theme">Lumină</string>
+    <string name="settings_dark_theme">Întuneric</string>
+    <string name="noBarcodeFound">Nu a fost găsit niciun cod de bare</string>
+    <string name="settings_max_font_size_scale">Mărimea maximă a fontului</string>
+    <string name="settings_display_barcode_max_brightness">Luminați vizualizarea codurilor de bare</string>
+    <string name="settings_lock_barcode_orientation">Blocare orientare cod de bare</string>
+    <string name="settings_keep_screen_on">Păstrați ecranul pornit</string>
+    <string name="settings_disable_lockscreen_while_viewing_card">Evitați ecranul de blocare</string>
+    <string name="balance">Balanță</string>
+    <string name="importSuccessful">Date de card importate</string>
+    <string name="exportSuccessful">Datele cardului exportate</string>
+    <string name="noGroups">Faceți clic pe butonul + plus pentru a adăuga mai întâi grupuri pentru clasificare.</string>
+    <string name="deleteConfirmationGroup">Ștergeți grupul\?</string>
+    <string name="failedOpeningFileManager">Instalați mai întâi un manager de fișiere.</string>
+    <string name="leaveWithoutSaveTitle">Ieșire</string>
+    <string name="addManually">Introduceți manual ID-ul cardului</string>
+    <string name="barcode">Cod de bare</string>
+    <string name="currency">Monedă</string>
+    <string name="editBarcode">Editarea codului de bare</string>
+    <string name="chooseExpiryDate">Alegeți data de expirare</string>
+    <string name="moveBarcodeToCenterOfScreen">Centrați codul de bare pe ecran</string>
+    <string name="copy_to_clipboard_toast">ID-ul cardului copiat în clipboard</string>
+    <string name="noStoreError">Nici un nume introdus</string>
+    <string name="selectBarcodeTitle">Selectare cod de bare</string>
+    <string name="noGroupCards">Acest grup nu conține nicio carte</string>
+    <string name="addFromImage">Selectați imaginea din galerie</string>
+    <string name="never">Niciodată</string>
+    <string name="groups">Grupuri</string>
+    <string name="leaveWithoutSaveConfirmation">Să pleci fără să salvezi\?</string>
+    <string name="expiryDate">Data expirării</string>
+    <string name="moveBarcodeToTopOfScreen">Mutați codul de bare în partea de sus a ecranului</string>
+    <string name="errorReadingImage">Nu s-a putut citi imaginea</string>
+    <string name="points">Puncte</string>
+    <string name="cardShortcut">Scurtătură de card</string>
+    <string name="scanCardBarcode">Scanarea codului de bare al cardului</string>
+    <string name="importExportHelp">Copierea de rezervă a cardurilor vă permite să le mutați pe un alt dispozitiv.</string>
+    <string name="exportSuccessfulTitle">Exportată</string>
+    <string name="exportFailedTitle">Export eșuat</string>
+    <string name="importOptionFilesystemExplanation">Alegeți un anumit fișier din sistemul de fișiere.</string>
+    <string name="importOptionApplicationButton">Utilizați o altă aplicație</string>
+    <string name="thumbnailDescription">Miniatură pentru card</string>
+    <string name="enter_group_name">Introduceți numele grupului</string>
+</resources>

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

@@ -9,7 +9,7 @@
     <string name="cardId">Номер карты</string>
     <string name="barcodeType">Тип штрих-кода</string>
     <string name="barcodeNoBarcode">Эта карта без штрих-кода</string>
-    <string name="cancel">Отменить</string>
+    <string name="cancel">Отмена</string>
     <string name="save">Сохранить</string>
     <string name="edit">Изменить</string>
     <string name="delete">Удалить карту</string>
@@ -25,14 +25,13 @@
     <string name="scanCardBarcode">Отсканируйте штрих-код</string>
     <string name="cardShortcut">Ярлык карты</string>
     <string name="noCardsMessage">Сначала добавьте карту</string>
-    <string name="barcodeImageDescription">Изображение штрих-кода карты</string>
     <string name="noStoreError">Название не указано</string>
     <string name="noCardIdError">Номер карты не указан</string>
     <string name="noCardExistsError">Карта не найдена</string>
     <string name="failedParsingImportUriError">Невозможно разобрать импортируемый URI</string>
     <string name="importExport">Импорт/Экспорт</string>
     <string name="exportName">Экспорт</string>
-    <string name="importExportHelp">Резервное копирование карт позволяет переместить их на другое устройство.</string>
+    <string name="importExportHelp">Резервное копирование карт позволяет перенести их на другое устройство.</string>
     <string name="importSuccessfulTitle">Импортировано</string>
     <string name="importFailedTitle">Импорт не выполнен</string>
     <string name="importFailed">Невозможно импортировать карты</string>
@@ -50,12 +49,12 @@
     <string name="importOptionApplicationExplanation">Используйте любое приложение или ваш любимый файловый менеджер, чтобы открыть файл.</string>
     <string name="importOptionApplicationButton">Использовать другое приложение</string>
     <string name="about">О приложении</string>
-    <string name="app_license">Авторское лево свободного программного обеспечения, лицензия GPLv3+.</string>
+    <string name="app_license">Авторское лево свободного программного обеспечения, лицензия GPLv3+</string>
     <string name="about_title_fmt">О приложении <xliff:g id="app_name">%s</xliff:g></string>
     <string name="debug_version_fmt">Версия: <xliff:g id="version">%s</xliff:g></string>
     <string name="app_revision_fmt">Информация о версиях: <xliff:g id="app_revision_url">%s</xliff:g></string>
     <string name="selectBarcodeTitle">Выбор штрих-кода</string>
-    <string name="enterBarcodeInstructions">Введите номер карты и выберите тип штрих-кода. Или выберите \"Эта карта без штрих-кода\".</string>
+    <string name="enterBarcodeInstructions">Введите номер карты и выберите тип штрих-кода (или выберите \"Эта карта без штрих-кода\").</string>
     <string name="copy_to_clipboard_toast">Номер карты скопирован в буфер обмена</string>
     <string name="thumbnailDescription">Логотип карты</string>
     <string name="settings">Настройки</string>
@@ -75,7 +74,7 @@
     <string name="importSuccessful">Данные карт успешно импортированы</string>
     <string name="starImage">Звезда избранного</string>
     <string name="app_copyright_old">На основе Loyalty Card Keychain
-\nавторские права © 2016–2020 Branden Archer.</string>
+\nавторские права © 2016–2020 Branden Archer</string>
     <string name="unstar">Удалить из избранного</string>
     <string name="star">Добавить в избранное</string>
     <string name="noBarcode">Нет штрих-кода</string>
@@ -118,16 +117,16 @@
         <item quantity="other"><xliff:g>%d</xliff:g> карт</item>
     </plurals>
     <string name="accept">Принять</string>
-    <string name="importVoucherVaultMessage">Выберите файл для импортирования, именуемый <i>vouchervault.json</i>.
-\nФайл экспорта можно создать в приложении Voucher Vault, нажав кнопку \"Экспорт\".</string>
+    <string name="importVoucherVaultMessage">Выберите для импортирования файл <i>vouchervault.json</i>.
+\nФайл можно создать в приложении Voucher Vault, нажав кнопку \"Экспорт\".</string>
     <string name="importVoucherVault">Импорт из Voucher Vault</string>
-    <string name="importFidmeMessage">Выберите файл для импортирования, именуемый <i>fidme-export-request-xxxxxx.zip</i>, а затем вручную укажите типы штрих-кодов.
-\nФайл экспорта можно создать в приложении FidMe, перейдя в свой профиль, выбрав функцию \"Защита данных\", и затем нажав кнопку \"Извлечь мои данные\".</string>
-    <string name="importLoyaltyCardKeychainMessage">Выберите файл экспорта, именуемый <i>LoyaltyCardKeychain.csv</i>.
-\nФайл экспорта можно создать в приложении Loyalty Card Keychain, перейдя в меню \"Импорт/Экспорт\" и нажав кнопку \"Экспорт\".</string>
+    <string name="importFidmeMessage">Выберите для импортирования файл <i>fidme-export-request-xxxxxx.zip</i>, а затем вручную укажите типы штрих-кодов.
+\nФайл можно создать в приложении FidMe, перейдя в свой профиль, выбрав функцию \"Защита данных\", и затем нажав кнопку \"Извлечь мои данные\".</string>
+    <string name="importLoyaltyCardKeychainMessage">Выберите для импортирования файл <i>LoyaltyCardKeychain.csv</i>.
+\nФайл можно создать в приложении Loyalty Card Keychain, перейдя в меню \"Импорт/Экспорт\" и нажав кнопку \"Экспорт\".</string>
     <string name="importLoyaltyCardKeychain">Импорт из Loyalty Card Keychain</string>
-    <string name="importCatimaMessage">Выберите файл для импортирования, именуемый <i>Catima.zip</i>.
-\nФайл экспорта можно создать в другой копии Catima, перейдя в меню \"Импорт/Экспорт\" и нажав кнопку \"Экспорт\".</string>
+    <string name="importCatimaMessage">Выберите для импортирования файл <i>Catima.zip</i>.
+\nФайл можно создать в другой копии Catima, перейдя в меню \"Импорт/Экспорт\" и нажав кнопку \"Экспорт\".</string>
     <string name="importFidme">Импорт из FidMe</string>
     <string name="importCatima">Импорт из Catima</string>
     <string name="errorReadingImage">Невозможно считать изображение</string>
@@ -141,7 +140,7 @@
     <string name="wrongValueForBarcodeType">Недопустимое значение для выбранного типа штрих-кода</string>
     <string name="app_resources">Свободные сторонние ресурсы: <xliff:g id="app_resources_list">%s</xliff:g></string>
     <string name="app_libraries">Свободные сторонние библиотеки: <xliff:g id="app_libraries_list">%s</xliff:g></string>
-    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Авторские права © 2019–<xliff:g>%d</xliff:g> Sylvia van Os.</string>
+    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Авторские права © 2019–<xliff:g>%d</xliff:g> Sylvia van Os</string>
     <string name="intent_import_card_from_url_share_multiple_text">Поделиться картами</string>
     <string name="card_ids_copied">Скопированные номера карт</string>
     <string name="copy_to_clipboard_multiple_toast">Номера карт скопированы в буфер обмена</string>
@@ -156,7 +155,7 @@
     <string name="backImageDescription">Задняя сторона карты</string>
     <string name="frontImageDescription">Лицевая сторона карты</string>
     <string name="photos">Фотографии</string>
-    <string name="importStocardMessage">Выберите файл <i>***-sync.zip</i> для импортирования.
+    <string name="importStocardMessage">Выберите для импортирования файл <i>***-sync.zip</i>.
 \nЭтот файл можно получить по электронной почте от support@stocardapp.com, предварительно запросив экспорт ваших данных.</string>
     <string name="passwordRequired">Введите пароль</string>
     <string name="importStocard">Импорт из Stocard</string>
@@ -183,4 +182,40 @@
         <item quantity="many">Удаление <xliff:g>%d</xliff:g> карт</item>
         <item quantity="other">Удаление <xliff:g>%d</xliff:g> карт</item>
     </plurals>
+    <string name="settings_system_locale">Системный</string>
+    <string name="settings_locale">Язык</string>
+    <string name="settings_sky_blue_theme">Голубой</string>
+    <string name="settings_catima_theme">Catima</string>
+    <string name="settings_brown_theme">Коричневый</string>
+    <string name="settings_grey_theme">Серый</string>
+    <string name="settings_green_theme">Зелёный</string>
+    <string name="settings_blue_theme">Синий</string>
+    <string name="settings_violet_theme">Фиолетовый</string>
+    <string name="settings_magenta_theme">Пурпурный</string>
+    <string name="settings_pink_theme">Розовый</string>
+    <string name="settings_theme_color">Цвет темы</string>
+    <string name="app_contributors">Создано при поддержке: <xliff:g id="app_contributors">%s</xliff:g></string>
+    <string name="noGroupCards">В группе нет карт</string>
+    <string name="barcodeImageDescriptionWithType">Изображение штрих-кода карты типа <xliff:g>%s</xliff:g></string>
+    <string name="toggleMoreInfo">Переключение отображения дополнительной информации</string>
+    <string name="swipeToSwitchImages">Смахивание или долгое нажатие для переключения изображений</string>
+    <string name="sort_by_expiry">Срок действия</string>
+    <string name="sort_by">Сортировать по</string>
+    <string name="reverse">Обратный порядок</string>
+    <string name="sort_by_balance">Баланс</string>
+    <string name="sort_by_most_recently_used">Частота использования</string>
+    <string name="sort_by_name">Название</string>
+    <string name="sort">Сортировка</string>
+    <string name="credits">Благодарности</string>
+    <string name="version_history">История версий</string>
+    <string name="on_github">на GitHub</string>
+    <string name="rate_this_app">Оценить приложение</string>
+    <string name="and_data_usage">и использование данных</string>
+    <string name="report_error">Отчёт об ошибке</string>
+    <string name="on_google_play">в Google Play</string>
+    <string name="source_repository">Исходный код</string>
+    <string name="license">Лицензия</string>
+    <string name="help_translate_this_app">Помощь в переводе приложения</string>
+    <string name="exportPassword">Защитить файл экспорта паролем (необязательно)</string>
+    <string name="exportPasswordHint">Введите пароль</string>
 </resources>

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

@@ -1,8 +1,6 @@
-<resources
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="action_add">Pridať</string>
-
     <string name="noGiftCards">Zatiaľ nemáte žiadne vernostné karty. Kliknite na tlačidlo \"+\" (plus) vyššie a začnite.\n\nAplikácia Vernostné karty umožňuje nosiť svoje vernostné karty v telefóne, kde sú vždy na dosah.</string>
     <string name="storeName">Obchod</string>
     <string name="note">Poznámka</string>
@@ -16,15 +14,12 @@
     <string name="unlockScreen">Povoliť rotáciu</string>
     <string name="ok">Áno</string>
     <string name="copy_to_clipboard">Kopírovať ID do schránky</string>
-    <string name="sendLabel">Odoslať&#8230;</string>
+    <string name="sendLabel">Odoslať…</string>
     <string name="editCardTitle">Upraviť kartu</string>
     <string name="addCardTitle">Pridať kartu</string>
     <string name="scanCardBarcode">Zosnímajte čiarový kód na karte</string>
     <string name="cardShortcut">Skratka</string>
     <string name="noCardsMessage">Nie sú uložené žiadne karty, vložte prvú</string>
-
-    <string name="barcodeImageDescription">Obrázok čiarového kódu karty</string>
-
     <string name="noStoreError">Nebol zadaný obchod</string>
     <string name="noCardIdError">Nebolo zadané ID karty</string>
     <string name="noCardExistsError">Nie je možné vyhľadať vernostnú kartu</string>
@@ -37,31 +32,73 @@
     <string name="exportSuccessfulTitle">Export bol úspešný</string>
     <string name="exportFailedTitle">Export zlyhal</string>
     <string name="exportFailed">Zlyhal export</string>
-    <string name="importing">Importujem&#8230;</string>
-    <string name="exporting">Exportujem&#8230;</string>
+    <string name="importing">Importujem…</string>
+    <string name="exporting">Exportujem…</string>
     <string name="noExternalStoragePermissionError">Nie je možné importovať a exportovať karty bez prístupu k externému úložisku</string>
-    <string name="importOptionFilesystemTitle">Import zo súborového systému.</string>
+    <string name="importOptionFilesystemTitle">Import zo súborového systému</string>
     <string name="importOptionFilesystemExplanation">Vyberte súbor zo súborového systému.</string>
     <string name="importOptionFilesystemButton">Zo súborového systému</string>
     <string name="importOptionApplicationTitle">Použite externú aplikáciu</string>
     <string name="importOptionApplicationExplanation">Na otvorenie súboru použite externú aplikáciu, ako Dropbox, Disk Google, alebo Vášho obľúbeného správcu súborov.</string>
     <string name="importOptionApplicationButton">Použiť externú aplikáciu</string>
-
     <string name="about">O aplikácii</string>
     <string name="app_license">Licencované GPLv3.</string>
     <string name="about_title_fmt">O <xliff:g id="app_name">%s</xliff:g></string>
     <string name="debug_version_fmt">Verzia: <xliff:g id="version">%s</xliff:g></string>
     <string name="app_revision_fmt">Informácia pri revízii: <xliff:g id="app_revision_url">%s</xliff:g></string>
-
     <string name="selectBarcodeTitle">Vyberte čiarový kód</string>
     <string name="copy_to_clipboard_toast">ID karty skopírované do schránky</string>
-
     <string name="thumbnailDescription">Náhľad karty</string>
-
     <string name="settings">Nastavenia</string>
     <string name="settings_category_title_ui">Používateľské prostredie</string>
     <string name="settings_display_barcode_max_brightness">Zvýšiť jas pri zobrazení čiarového kódu </string>
     <string name="settings_lock_barcode_orientation">Uzamkni orientáciu čiarového kódu</string>
     <string name="deleteTitle">Odstrániť kartu</string>
     <string name="deleteConfirmation">Naozaj chcete túto kartu odstrániť?</string>
-</resources>
+    <string name="star">Pridať k obľúbeným</string>
+    <string name="noBarcode">Žiadny čiarový kód</string>
+    <string name="barcodeNoBarcode">Táto karta nemá čiarový kód</string>
+    <string name="barcodeType">Typ čiarových kódov</string>
+    <string name="noMatchingGiftCards">Nenašiel som nič. Skúste zmeniť vyhľadávanie.</string>
+    <string name="action_search">Vyhľadávanie</string>
+    <string name="chooseImportType">Importovať údaje z\?</string>
+    <string name="points">Body</string>
+    <string name="currency">Mena</string>
+    <string name="balance">Vyváženie</string>
+    <string name="errorReadingImage">Obrázok sa nepodarilo prečítať</string>
+    <string name="noBarcodeFound">Nenašiel sa žiadny čiarový kód</string>
+    <string name="moveBarcodeToCenterOfScreen">Vycentrovanie čiarového kódu na obrazovke</string>
+    <string name="moveBarcodeToTopOfScreen">Presun čiarového kódu do hornej časti obrazovky</string>
+    <string name="chooseExpiryDate">Zvoľte dátum skončenia platnosti</string>
+    <string name="never">Nikdy</string>
+    <string name="addFromImage">Vyberte obrázok z galérie</string>
+    <string name="addManually">Ručné zadanie ID karty</string>
+    <string name="leaveWithoutSaveConfirmation">Odísť bez uloženia\?</string>
+    <string name="leaveWithoutSaveTitle">Výstup</string>
+    <string name="moveDown">Pohyb smerom nadol</string>
+    <string name="moveUp">Pohyb smerom nahor</string>
+    <string name="failedOpeningFileManager">Najprv nainštalujte správcu súborov.</string>
+    <string name="deleteConfirmationGroup">Vymazať skupinu\?</string>
+    <string name="all">Všetky</string>
+    <string name="noGroupCards">Táto skupina neobsahuje karty</string>
+    <string name="noGroups">Ak chcete najprv pridať skupiny na kategorizáciu, kliknite na tlačidlo + plus.</string>
+    <string name="groups">Skupiny</string>
+    <string name="enter_group_name">Zadajte názov skupiny</string>
+    <string name="exportSuccessful">Export údajov z karty</string>
+    <string name="importSuccessful">Import údajov z karty</string>
+    <string name="intent_import_card_from_url_share_text">Chcem sa s vami podeliť o pohľadnicu</string>
+    <string name="settings_disable_lockscreen_while_viewing_card">Zabráňte uzamknutiu obrazovky</string>
+    <string name="settings_keep_screen_on">Nechajte obrazovku zapnutú</string>
+    <string name="settings_max_font_size_scale">Maximálna veľkosť písma</string>
+    <string name="card_ids_copied">Skopírované ID karty</string>
+    <string name="unstar">Odstrániť z obľúbených</string>
+    <string name="settings_dark_theme">Tmavé</string>
+    <string name="settings_light_theme">Svetlo</string>
+    <string name="settings_system_theme">Systém</string>
+    <string name="settings_theme">Téma</string>
+    <string name="starImage">Obľúbená hviezda</string>
+    <string name="enterBarcodeInstructions">Zadajte ID karty a vyberte typ čiarového kódu nižšie alebo \"Táto karta nemá čiarový kód\".</string>
+    <string name="exportOptionExplanation">Údaje sa zapíšu na vami zvolené miesto.</string>
+    <string name="failedParsingImportUriError">Nepodarilo sa analyzovať import URI</string>
+    <string name="share">Zdieľať</string>
+</resources>

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

@@ -19,14 +19,13 @@
     <string name="addCardTitle">Dodaj kartico zvestobe</string>
     <string name="scanCardBarcode">Skeniraj črtno kodo</string>
     <string name="cardShortcut">Bližnjica do kartice</string>
-    <string name="noCardsMessage">Trenutno ni na voljo nobene kartice. Najprej jih je potrebno dodati.</string>
-    <string name="barcodeImageDescription">Slika črtne kode na kartici</string>
+    <string name="noCardsMessage">Najprej dodajte kartico</string>
     <string name="noStoreError">Ime trgovine ni bilo vnešeno</string>
     <string name="noCardIdError">Številka kartice ni bila vnešena</string>
     <string name="noCardExistsError">Te kartice zvestobe ni bilo moč najti</string>
     <string name="importExport">Uvozi/izvozi</string>
     <string name="exportName">Izvozi</string>
-    <string name="importExportHelp">Varnostna kopija omogoča varen prenos kartic na druge telefonske naprave.</string>
+    <string name="importExportHelp">Varnostna kopija omogoča varen prenos kartic na druge naprave.</string>
     <string name="importSuccessfulTitle">Uvoz je bil uspešen</string>
     <string name="importFailedTitle">Uvoz ni uspel</string>
     <string name="importFailed">Napaka pri uvozu</string>
@@ -37,10 +36,10 @@
     <string name="exporting">Izvažanje…</string>
     <string name="noExternalStoragePermissionError">Izvažanje in uvažanje je nemogoče brez omogočenega dostopa do zunanje shrambe</string>
     <string name="importOptionFilesystemTitle">Uvozi iz datotečnega sistema</string>
-    <string name="importOptionFilesystemExplanation">Izberite specifično datoteko iz datotečnega sistema</string>
+    <string name="importOptionFilesystemExplanation">Izberite specifično datoteko iz datotečnega sistema.</string>
     <string name="importOptionFilesystemButton">Iz datotečnega sistema</string>
     <string name="importOptionApplicationTitle">Uporabi zunanjo aplikacijo</string>
-    <string name="importOptionApplicationExplanation">Uporabi zunanjo aplikacijo, kot npr. Dropbox, Google Drive ali ostale upravljalnike datotek, za odpiranje datoteko.</string>
+    <string name="importOptionApplicationExplanation">Uporabi zunanjo aplikacijo, kot npr. Dropbox, Google Drive ali ostale upravljalnike datotek, za odpiranje datoteke.</string>
     <string name="importOptionApplicationButton">Uporabi zunanjo aplikacijo</string>
     <string name="about">Več o aplikaciji</string>
     <string name="app_license">Licencirano s skladu z GPLv3.</string>
@@ -55,5 +54,111 @@
     <string name="settings_display_barcode_max_brightness">Povečaj osvetljenost prikaza črtne kode</string>
     <string name="settings_lock_barcode_orientation">Zakleni orientacijo črtne kode</string>
     <string name="deleteTitle">Odstrani kartico zvestobe</string>
-    <string name="deleteConfirmation">Prosim potrdite, če želite izbrisati to kartico.</string>
+    <string name="deleteConfirmation">Prosim potrdite, če želite izbrisati to kartico\?</string>
+    <string name="card">Kartica</string>
+    <string name="addFromImage">Izberite sliko iz galerije</string>
+    <string name="addManually">Ročno vnesite št. kartice</string>
+    <string name="leaveWithoutSaveConfirmation">Zapustite brez shranjevanja\?</string>
+    <string name="leaveWithoutSaveTitle">Izhod</string>
+    <string name="moveDown">Premikanje navzdol</string>
+    <string name="moveUp">Premik navzgor</string>
+    <string name="failedOpeningFileManager">Najprej namestite upravitelja datotek.</string>
+    <string name="deleteConfirmationGroup">Brisanje skupine\?</string>
+    <string name="all">Vse</string>
+    <string name="noGroupCards">Ta skupina ne vsebuje kartic</string>
+    <string name="noGroups">Kliknite gumb + plus, če želite najprej dodati skupine za kategorizacijo.</string>
+    <string name="groups">Skupine</string>
+    <string name="enter_group_name">Vnesite ime skupine</string>
+    <string name="exportSuccessful">Izvoženi podatki o karticah</string>
+    <string name="importSuccessful">Uvoženi podatki o karticah</string>
+    <string name="intent_import_card_from_url_share_text">Z vami želim deliti kartico</string>
+    <string name="settings_disable_lockscreen_while_viewing_card">Preprečitev zaklepanja zaslona</string>
+    <string name="settings_keep_screen_on">Ohranite zaslon vklopljen</string>
+    <string name="enterBarcodeInstructions">Vnesite ID kartice in spodaj izberite vrsto črtne kode ali \"Ta kartica nima črtne kode\".</string>
+    <string name="settings_max_font_size_scale">Največja velikost pisave</string>
+    <string name="settings_dark_theme">Temno</string>
+    <string name="settings_light_theme">Svetlo</string>
+    <string name="settings_system_theme">Sistem</string>
+    <string name="settings_theme">Tema</string>
+    <string name="starImage">Zvezdica za priljubljene</string>
+    <string name="app_copyright_old">Na podlagi aplikacije Loyalty Card Keychain  copyright © 2016-2020 Branden Archer.</string>
+    <string name="exportOptionExplanation">Podatki bodo zapisani na izbrano mesto.</string>
+    <string name="failedParsingImportUriError">Ni bilo mogoče razčleniti URI uvoza</string>
+    <string name="card_ids_copied">Kopirana kartica ID(s)</string>
+    <string name="share">Delite</string>
+    <string name="unstar">Odstrani iz priljubljenih</string>
+    <string name="star">Dodaj med priljubljene</string>
+    <string name="noBarcode">Brez črtne kode</string>
+    <string name="barcodeNoBarcode">Ta kartica nima črtne kode</string>
+    <string name="barcodeType">Vrsta črtne kode</string>
+    <string name="noMatchingGiftCards">Ničesar nisem našel. Poskusite spremeniti iskanje.</string>
+    <string name="action_search">Iskanje</string>
+    <string name="exportPasswordHint">Vnesite geslo</string>
+    <string name="exportPassword">Izberite geslo za zaščito izvoza (neobvezno)</string>
+    <string name="help_translate_this_app">Pomagajte pri prevajanju aplikacije</string>
+    <string name="version_history">Zgodovina različic</string>
+    <string name="settings_brown_theme">Rjava</string>
+    <string name="settings_grey_theme">Siva</string>
+    <string name="settings_green_theme">Zelena</string>
+    <string name="settings_sky_blue_theme">Sinje modra</string>
+    <string name="settings_blue_theme">Modra</string>
+    <string name="settings_violet_theme">Vijolična</string>
+    <string name="settings_magenta_theme">Magenta</string>
+    <string name="settings_pink_theme">Roza</string>
+    <string name="settings_theme_color">Barva teme</string>
+    <string name="settings_system_locale">Sistem</string>
+    <string name="settings_locale">Jezik</string>
+    <string name="barcodeImageDescriptionWithType">Slika črtne kode tipa <xliff:g>%s</xliff:g></string>
+    <string name="swipeToSwitchImages">Povlecite ali dolgo pritisnite da zamenjate slike</string>
+    <string name="sort_by">Razvrsti po</string>
+    <string name="reverse">Obratno</string>
+    <string name="sort_by_balance">Stanje</string>
+    <string name="sort_by_expiry">Potek</string>
+    <string name="sort_by_most_recently_used">Nazadnje uporabljene</string>
+    <string name="sort_by_name">Ime</string>
+    <string name="sort">Razvrsti</string>
+    <string name="license">Licence</string>
+    <string name="on_github">na GitHubu</string>
+    <string name="rate_this_app">Ocenite aplikacijo</string>
+    <string name="report_error">Prijavite napako</string>
+    <string name="on_google_play">na Trgovini Google Play</string>
+    <string name="and_data_usage">in uporaba podatkov</string>
+    <string name="source_repository">Izvorna koda</string>
+    <string name="points">Točke</string>
+    <string name="currency">Valuta</string>
+    <string name="balance">Stanje na računu</string>
+    <string name="errorReadingImage">Slike ni bilo mogoče prebrati</string>
+    <string name="noBarcodeFound">Črtna koda ni bila najdena</string>
+    <string name="balancePoints"><xliff:g>%s</xliff:g> točk</string>
+    <string name="balanceSentence">Stanje: <xliff:g>%s</xliff:g></string>
+    <string name="chooseImportType">Uvoz iz?</string>
+    <string name="importCatima">Izvoz iz aplikacije Catima</string>
+    <string name="importStocard">Izvoz iz aplikacije Stocard</string>
+    <string name="importVoucherVault">Izvoz iz aplikacije Voucher Vault</string>
+    <string name="privacy_policy">Politika zasebnosti</string>
+    <string name="turn_flashlight_off">Izklop svetilke</string>
+    <string name="turn_flashlight_on">Vklop svetilke</string>
+    <string name="passwordRequired">Vnesite geslo</string>
+    <string name="accept">Sprejmi</string>
+    <string name="importLoyaltyCardKeychain">Uvoz iz aplikacije Loyalty Card Keychain</string>
+    <string name="barcodeId">Vsebina črtne kode</string>
+    <string name="sameAsCardId">Enaka kot številka kartice</string>
+    <string name="setBarcodeId">Nastavi vsebino črtne kode</string>
+    <string name="wrongValueForBarcodeType">Ta vrednost ni veljavna pri izbranem tipu čtne kode</string>
+    <string name="takePhoto">Naredi fotografijo</string>
+    <string name="intent_import_card_from_url_share_multiple_text">Z vami želim deliti kartice zvestobe</string>
+    <string name="copy_to_clipboard_multiple_toast">Številke kartic kopirane v odložišče</string>
+    <string name="importFidme">Uvoz iz aplikacije FidMe</string>
+    <string name="no">Ne</string>
+    <string name="yes">Da</string>
+    <string name="frontImageDescription">Slika sprednje strani</string>
+    <string name="backImageDescription">Slika zadnje strani</string>
+    <string name="parsingBalanceFailed"><xliff:g>%s</xliff:g> ni veljavno stanje.</string>
+    <string name="setBackImage">Nastavi sliko sprednje strani</string>
+    <string name="setFrontImage">Nastavi sliko sprednje strani</string>
+    <string name="photos">Fotografije</string>
+    <string name="updateBarcodeQuestionText">Spremenili ste številko kartice. Želite posodobiti tudi črtno kodo na enako vrednost?</string>
+    <string name="updateBarcodeQuestionTitle">Posodobi črtno kodo?</string>
+    <string name="removeImage">Odstrani sliko</string>
+    <string name="unsupportedBarcodeType">Te vrste črtne kode aplikacija ne more prikazati. Morda bo to možno v prihodnosti.</string>
 </resources>

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

@@ -0,0 +1,209 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" xmlns:tools="http://schemas.android.com/tools">
+    <string name="settings_lock_barcode_orientation">Lås streckkodens riktning</string>
+    <string name="settings_display_barcode_max_brightness">Gör streckkodsvyn ljusare</string>
+    <string name="settings_max_font_size_scale">Max. teckenstorlek</string>
+    <string name="settings_keep_screen_on">Håll skärmen påslagen</string>
+    <string name="enterBarcodeInstructions">Ange kortets ID och välj antingen streckkodstyp nedan, eller \"Detta kort har ingen streckkod\".</string>
+    <string name="importFidmeMessage">Välj den exporterade <i>fidme-export-request-xxxxxx.zip</i> från FidMe som du vill importera och välj streckkodstyper manuellt efteråt.
+\nSkapa den från din FidMe-profil först genom att välja \"Data Protection\" och sen trycka på \"Extract my data\".</string>
+    <string name="importOptionApplicationExplanation">Använd vilken app som helst eller den filhanterare du föredrar för att öppna en fil.</string>
+    <string name="importOptionApplicationButton">Använd en annan app</string>
+    <string name="intent_import_card_from_url_share_text">Jag vill dela ett kort med dig</string>
+    <string name="noGroups">Klicka på plus(+)-knappen för att lägga till kategorigrupper först.</string>
+    <string name="groupsList">Grupper: <xliff:g>%s</xliff:g></string>
+    <string name="errorReadingImage">Kunde inte läsa bilden</string>
+    <string name="currency">Valuta</string>
+    <string name="failedGeneratingShareURL">Kunde inte skapa en delningsbar URL. Var snäll och rapportera detta.</string>
+    <string name="card_ids_copied">Kopierade kort ID:n</string>
+    <plurals name="selectedCardCount">
+        <item quantity="one"><xliff:g>%d</xliff:g> kort valt</item>
+        <item quantity="other"><xliff:g>%d</xliff:g> kort valda</item>
+    </plurals>
+    <string name="app_loyalty_card_keychain">Loyalty Card Keychain</string>
+    <string name="importLoyaltyCardKeychainMessage">Välj den exporterade <i>LoyaltyCardKeychain.csv</i> från Loyalty Card Keychain som du vill importera.
+\nSkapa den från Import/Export-menyn i Loyalty Card Keychain först genom att trycka på Exportera.</string>
+    <string name="importVoucherVaultMessage">Välj den exporterade <i>vouchervault.json</i> från Voucher Vault som du vill importera.
+\nSkapa den först genom att trycka på Exportera i Voucher Vault.</string>
+    <string name="importStocardMessage">Välj den exporterade <i>***-sync.zip</i> från Stocard som du vill importera.
+\nSkaffa den först genom att skicka e-post till support@stocardapp.com och be om att få dina data exporterade.</string>
+    <string name="enter_group_name">Ange gruppnamn</string>
+    <string name="groups">Grupper</string>
+    <plurals name="groupCardCount">
+        <item quantity="one"><xliff:g>%d</xliff:g> kort</item>
+        <item quantity="other"><xliff:g>%d</xliff:g> korten</item>
+    </plurals>
+    <string name="all">Alla</string>
+    <string name="deleteConfirmationGroup">Ta bort grupp\?</string>
+    <string name="failedOpeningFileManager">Installera en filhanterare först.</string>
+    <string name="moveUp">Flytta uppåt</string>
+    <string name="moveDown">Flytta nedåt</string>
+    <string name="leaveWithoutSaveTitle">Avsluta</string>
+    <string name="leaveWithoutSaveConfirmation">Avsluta utan att spara\?</string>
+    <string name="addManually">Ange kort-ID manuellt</string>
+    <string name="addFromImage">Välj bild från galleriet</string>
+    <string name="balancePoints"><xliff:g>%s</xliff:g> poäng</string>
+    <string name="card">Kort</string>
+    <string name="barcode">Streckkod</string>
+    <string name="editBarcode">Redigera streckkod</string>
+    <string name="never">Aldrig</string>
+    <string name="moveBarcodeToTopOfScreen">Flytta streckkoden högst upp på skärmen</string>
+    <string name="moveBarcodeToCenterOfScreen">Centrera streckkoden på skärmen</string>
+    <string name="noBarcodeFound">Hittade ingen streckkod</string>
+    <string name="points">Poäng</string>
+    <string name="chooseImportType">Importera data från...\?</string>
+    <string name="accept">Acceptera</string>
+    <string name="importCatima">Importera från Catima</string>
+    <string name="importFidme">Importera från FidMe</string>
+    <string name="importLoyaltyCardKeychain">Importera från Loyalty Card Keychain</string>
+    <string name="importStocard">Importera from Stocard</string>
+    <string name="importVoucherVault">Importera från Voucher Vault</string>
+    <string name="barcodeId">Streckkodsvärde</string>
+    <string name="passwordRequired">Var snäll och ange lösenordet</string>
+    <string name="no">Nej</string>
+    <string name="yes">Ja</string>
+    <string name="updateBarcodeQuestionText">Du ändrade kortets ID. Vill du uppdatera så att streckkoden också använder samma värde\?</string>
+    <string name="updateBarcodeQuestionTitle">Uppdatera streckkodsvärde\?</string>
+    <string name="takePhoto">Ta ett foto</string>
+    <string name="removeImage">Ta bort bild</string>
+    <string name="setBackImage">Ange baksidesbild</string>
+    <string name="setFrontImage">Ange framsidesbild</string>
+    <string name="photos">Foton</string>
+    <string name="backImageDescription">Bild av kortets baksida</string>
+    <string name="frontImageDescription">Bild av kortets framsida</string>
+    <string name="intent_import_card_from_url_share_multiple_text">Jag vill dela några kort med dig</string>
+    <string name="copy_to_clipboard_multiple_toast">Kort-ID:n kopierades till Urklipp</string>
+    <string name="wrongValueForBarcodeType">Värdet är inte giltigt för den valda streckkodstypen</string>
+    <string name="unsupportedBarcodeType">Denna streckkodstyp kan ännu inte visas. Den kan komma att stödjas i en senare version av appen.</string>
+    <string name="setBarcodeId">Ange streckkodsvärde</string>
+    <string name="sameAsCardId">Samma som kort-ID</string>
+    <string name="turn_flashlight_on">Sätt på ficklampa</string>
+    <string name="turn_flashlight_off">Stäng av ficklampa</string>
+    <string name="settings_dark_theme">Mörkt</string>
+    <string name="settings_light_theme">Ljust</string>
+    <string name="settings_theme">Tema</string>
+    <string name="settings_category_title_ui">Användargränssnitt</string>
+    <string name="settings">Inställningar</string>
+    <string name="thumbnailDescription">Miniatyrbild av kort</string>
+    <string name="copy_to_clipboard_toast">Kort-ID kopierat till Urklipp</string>
+    <string name="selectBarcodeTitle">Välj streckkod</string>
+    <string name="debug_version_fmt">Version: <xliff:g id="version">%s</xliff:g></string>
+    <string name="about_title_fmt">Om <xliff:g id="app_name">%s</xliff:g></string>
+    <string name="app_copyright_old">Baserad på Loyalty Card Keychain
+\ncopyright © 2016–2020 Branden Archer</string>
+    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Copyright © 2019–<xliff:g>%d</xliff:g> Sylvia van Os</string>
+    <string name="about">Om</string>
+    <string name="importOptionApplicationTitle">Använd en annan app</string>
+    <string name="importOptionFilesystemButton">Från filsystemet</string>
+    <string name="importOptionFilesystemExplanation">Välj en specifik fil från filsystemet.</string>
+    <string name="importOptionFilesystemTitle">Importera från filsystem</string>
+    <string name="exporting">Exporterar…</string>
+    <string name="importing">Importerar…</string>
+    <string name="exportFailed">Kunde inte exportera kort</string>
+    <string name="importFailed">Kunde inte importera kort</string>
+    <string name="importSuccessfulTitle">Importen lyckades</string>
+    <string name="importFailedTitle">Importen misslyckades</string>
+    <string name="importExportHelp">Säkerhetskopiering av dina kort låter dig flytta dem till en annan enhet.</string>
+    <string name="importExport">Importera/Exportera</string>
+    <string name="noCardExistsError">Kunde inte hitta kort</string>
+    <string name="noCardIdError">Inget kort-ID har angivits</string>
+    <string name="noStoreError">Inget namn har angivits</string>
+    <string name="noCardsMessage">Lägg till ett kort först</string>
+    <string name="cardShortcut">Kort-genväg</string>
+    <string name="addCardTitle">Lägg till kort</string>
+    <string name="editCardTitle">Redigera kort</string>
+    <string name="sendLabel">Skicka…</string>
+    <string name="share">Dela</string>
+    <string name="copy_to_clipboard">Kopiera ID till Urklipp</string>
+    <string name="ok">OK</string>
+    <plurals name="deleteCardsConfirmation">
+        <item quantity="one">Ta bort detta <xliff:g>%d</xliff:g> kort permanent\?</item>
+        <item quantity="other">Ta bort dessa <xliff:g>%d</xliff:g> kort permanent\?</item>
+    </plurals>
+    <string name="deleteConfirmation">Ta bort detta kort permanent\?</string>
+    <plurals name="deleteCardsTitle">
+        <item quantity="one">Ta bort <xliff:g>%d</xliff:g> kort</item>
+        <item quantity="other">Ta bort <xliff:g>%d</xliff:g> kort</item>
+    </plurals>
+    <string name="deleteTitle">Ta bort kort</string>
+    <string name="confirm">Bekräfta</string>
+    <string name="delete">Ta bort</string>
+    <string name="edit">Redigera</string>
+    <string name="save">Spara</string>
+    <string name="cancel">Avbryt</string>
+    <string name="unstar">Ta bort från favoriter</string>
+    <string name="star">Lägg till i favoriter</string>
+    <string name="noBarcode">Ingen streckkod</string>
+    <string name="barcodeNoBarcode">Detta kort har ingen streckkod</string>
+    <string name="barcodeType">Streckkodstyp</string>
+    <string name="cardId">Kort-ID</string>
+    <string name="storeName">Namn</string>
+    <string name="noMatchingGiftCards">Hittade ingenting. Försök justera din sökning.</string>
+    <string name="noGiftCards">Klicka på plus(+)-knappen för att lägga till ett kort, eller importera några från ⋮-menyn först.</string>
+    <string name="action_add">Lägg till</string>
+    <string name="action_search">Sök</string>
+    <string name="exportOptionExplanation">Datan kommer att sparas till en plats som du väljer.</string>
+    <string name="exportName">Exportera</string>
+    <string name="exportFailedTitle">Exporten misslyckades</string>
+    <string name="exportSuccessfulTitle">Exporten lyckades</string>
+    <string name="scanCardBarcode">Skanna streckkod på kort</string>
+    <string name="settings_system_theme">Systemtemat</string>
+    <string name="app_revision_fmt">Ändringsinfo: <xliff:g id="app_revision_url">%s</xliff:g></string>
+    <string name="privacy_policy_popup_text">Notis rörande integritetspolicy (krävs av vissa appbutiker):
+\n
+\nINGEN DATA ALLS SAMLAS IN, vilket vem som helst kan bekräfta eftersom vår app är fri programvara.</string>
+    <string name="unlockScreen">Tillåt rotation</string>
+    <string name="privacy_policy">Integritetspolicy</string>
+    <string name="expiryStateSentenceExpired">Förföll: <xliff:g>%s</xliff:g></string>
+    <string name="chooseExpiryDate">Välj förfallodatum</string>
+    <string name="expiryDate">Förfallodatum</string>
+    <string name="starImage">Favoritstjärna</string>
+    <string name="app_license">Copyleftad fri programvara, under GPLv3+-licens</string>
+    <string name="app_resources">Fria tredjepartsresurser: <xliff:g id="app_resources_list">%s</xliff:g></string>
+    <string name="app_libraries">Fria tredjepartsbibliotek: <xliff:g id="app_libraries_list">%s</xliff:g></string>
+    <string name="parsingBalanceFailed"><xliff:g>%s</xliff:g> verkar inte vara ett giltigt saldo.</string>
+    <string name="balance">Saldo</string>
+    <string name="balanceSentence">Saldo: <xliff:g>%s</xliff:g></string>
+    <string name="settings_disable_lockscreen_while_viewing_card">Förhindra skärmlåsning</string>
+    <string name="lockScreen">Förhindra rotation</string>
+    <string name="importCatimaMessage">Välj den exporterade <i>catima.zip</i> från Catima som du vill importera.
+\nSkapa den från Import/Export-menyn i en annan Catima-app genom att trycka på Exportera där först.</string>
+    <string name="expiryStateSentence">Giltigt till: <xliff:g>%s</xliff:g></string>
+    <string name="exportSuccessful">Kortdata exporterad</string>
+    <string name="importSuccessful">Kortdata importerad</string>
+    <string name="failedParsingImportUriError">Kunde inte tolka import-URI:n</string>
+    <string name="note">Anteckning</string>
+    <string name="settings_system_locale">System</string>
+    <string name="settings_locale">Språk</string>
+    <string name="noExternalStoragePermissionError">Bevilja tillstånd för extern lagring för att först importera eller exportera kort</string>
+    <string name="app_contributors">Möjliggjordes av: <xliff:g id="app_contributors">%s</xliff:g></string>
+    <string name="settings_brown_theme">Brunt</string>
+    <string name="settings_grey_theme">Grått</string>
+    <string name="settings_green_theme">Grönt</string>
+    <string name="settings_sky_blue_theme">Himmelblått</string>
+    <string name="settings_blue_theme">Blått</string>
+    <string name="settings_violet_theme">Violett</string>
+    <string name="settings_magenta_theme">Magenta</string>
+    <string name="settings_pink_theme">Rosa</string>
+    <string name="settings_catima_theme">Catima</string>
+    <string name="settings_theme_color">Temafärg</string>
+    <string name="noGroupCards">Denna grupp innehåller inga kort</string>
+    <string name="toggleMoreInfo">Växla mellan att visa mer info</string>
+    <string name="barcodeImageDescriptionWithType">Bild av kortstreckkod av typen <xliff:g>%s</xliff:g></string>
+    <string name="swipeToSwitchImages">Svep eller tryck länge för att växla bild</string>
+    <string name="reverse">Vänd ordning</string>
+    <string name="sort_by">Sortera efter</string>
+    <string name="sort_by_balance">Saldo</string>
+    <string name="sort_by_expiry">Förfallodag</string>
+    <string name="sort_by_most_recently_used">Senast använda</string>
+    <string name="sort_by_name">Namn</string>
+    <string name="sort">Sortera</string>
+    <string name="license">Licens</string>
+    <string name="and_data_usage">och dataanvändning</string>
+    <string name="rate_this_app">Betygsätt den här appen</string>
+    <string name="on_google_play">på Google Play</string>
+    <string name="report_error">Rapportera ett fel</string>
+    <string name="version_history">Versionshistorik</string>
+    <string name="help_translate_this_app">Hjälp till med översättningen av appen</string>
+    <string name="on_github">på GitHub</string>
+</resources>

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

@@ -0,0 +1,213 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" xmlns:tools="http://schemas.android.com/tools">
+    <string name="swipeToSwitchImages">Resimler arasında geçiş yapmak için kaydırın veya uzun basın</string>
+    <string name="toggleMoreInfo">Daha fazla bilgi göstermeyi aç/kapat</string>
+    <string name="app_contributors">Katkıda bulunanlar: <xliff:g id="app_contributors">%s</xliff:g></string>
+    <string name="settings_brown_theme">Kahverengi</string>
+    <string name="settings_grey_theme">Gri</string>
+    <string name="settings_green_theme">Yeşil</string>
+    <string name="settings_sky_blue_theme">Gök mavisi</string>
+    <string name="settings_blue_theme">Mavi</string>
+    <string name="settings_violet_theme">Mor</string>
+    <string name="settings_magenta_theme">Eflatun</string>
+    <string name="settings_pink_theme">Pembe</string>
+    <string name="settings_catima_theme">Catima</string>
+    <string name="settings_theme_color">Tema rengi</string>
+    <string name="settings_system_locale">Sistem</string>
+    <string name="settings_locale">Dil</string>
+    <string name="turn_flashlight_off">El fenerini kapat</string>
+    <string name="turn_flashlight_on">El fenerini aç</string>
+    <string name="failedGeneratingShareURL">Paylaşılabilir URL oluşturulamadı. Lütfen bunu bildirin.</string>
+    <string name="passwordRequired">Lütfen parolayı girin</string>
+    <string name="no">Hayır</string>
+    <string name="yes">Evet</string>
+    <string name="updateBarcodeQuestionText">Kart numarasını değiştirdiniz. Aynı değeri kullanmak için barkodu da güncellemek ister misiniz\?</string>
+    <string name="updateBarcodeQuestionTitle">Barkod değeri güncellensin mi\?</string>
+    <string name="takePhoto">Fotoğraf çek</string>
+    <string name="backImageDescription">Kartın arka resmi</string>
+    <string name="frontImageDescription">Kartın ön resmi</string>
+    <string name="removeImage">Resmi kaldır</string>
+    <string name="setBackImage">Arka resmi ayarla</string>
+    <string name="setFrontImage">Ön resmi ayarla</string>
+    <string name="photos">Fotoğraflar</string>
+    <string name="intent_import_card_from_url_share_multiple_text">Seninle birkaç kart paylaşmak istiyorum</string>
+    <string name="copy_to_clipboard_multiple_toast">Kart numaraları panoya kopyalandı</string>
+    <string name="wrongValueForBarcodeType">Değer, seçilen barkod türü için geçerli değil</string>
+    <string name="unsupportedBarcodeType">Bu barkod türü henüz görüntülenemiyor. Uygulamanın sonraki bir sürümünde desteklenebilir.</string>
+    <string name="setBarcodeId">Barkod değerini ayarla</string>
+    <string name="sameAsCardId">Kart numarasıyla aynı</string>
+    <string name="barcodeId">Barkod değeri</string>
+    <string name="importVoucherVaultMessage">İçe aktarmak için Voucher Vault\'tan dışa aktardığınız <i>vouchervault.json</i> dosyasını seçin.
+\nÖnce Voucher Vault\'ta \"Dışa aktar\" düğmesine basarak bir tane oluşturun.</string>
+    <string name="importVoucherVault">Voucher Vault\'tan içe aktar</string>
+    <string name="importStocardMessage">İçe aktarmak için Stocard\'dan dışa aktardığınız <i>***-sync.zip</i> dosyasını seçin.
+\nsupport@stocardapp.com adresine e-posta göndererek verilerinizin dışa aktarılmasını isteyerek edinin.</string>
+    <string name="importStocard">Stocard\'dan içe aktar</string>
+    <string name="importLoyaltyCardKeychainMessage">İçe aktarmak için Loyalty Card Keychain\'den dışa aktardığınız <i>LoyaltyCardKeychain.csv</i> dosyasını seçin.
+\nLoyalty Card Keychain uygulamasının İçe/Dışa aktar menüsündeki \"Dışa aktar\" düğmesine basarak bir tane oluşturun.</string>
+    <string name="importLoyaltyCardKeychain">Loyalty Card Keychain\'den içe aktar</string>
+    <string name="importFidmeMessage">FidMe\'den içe aktarmak için dışa aktardığınız <i>fidme-export-request-xxxxxx.zip</i> dosyasını seçin ve ardından barkod türlerini elle seçin.
+\nFidMe profilinizden Veri Koruma seçeneğini seçip ardından \"Verilerimi çıkar\" düğmesine basarak bir tane oluşturun.</string>
+    <string name="importFidme">FidMe\'den içe aktar</string>
+    <string name="importCatimaMessage">İçe aktarmak için Catima\'dan dışa aktardığınız <i>catima.zip</i> dosyasını seçin.
+\nBaşka bir Catima uygulamasının İçe/Dışa aktar menüsündeki \"Dışa aktar\" düğmesine basarak bir tane oluşturun.</string>
+    <string name="importCatima">Catima\'dan içe aktar</string>
+    <string name="accept">Kabul et</string>
+    <string name="privacy_policy_popup_text">Gizlilik politikası bildirimi (bazı uygulama mağazaları için gerekli):
+\n
+\nHİÇBİR VERİ TOPLANMAMAKTADIR ve uygulamamız özgür yazılım olduğu için bunu herkes doğrulayabilir.</string>
+    <string name="privacy_policy">Gizlilik Politikası</string>
+    <string name="app_loyalty_card_keychain">Loyalty Card Keychain</string>
+    <string name="chooseImportType">Veriler nereden içe aktarılsın\?</string>
+    <string name="parsingBalanceFailed"><xliff:g>%s</xliff:g> geçerli bir bakiye gibi görünmüyor.</string>
+    <string name="points">Puan</string>
+    <string name="currency">Para birimi</string>
+    <string name="balance">Bakiye</string>
+    <string name="errorReadingImage">Resim okunamadı</string>
+    <string name="noBarcodeFound">Barkod bulunamadı</string>
+    <string name="moveBarcodeToCenterOfScreen">Barkodu ekranda ortala</string>
+    <string name="moveBarcodeToTopOfScreen">Barkodu ekranın en üstüne taşı</string>
+    <string name="chooseExpiryDate">Son kullanma tarihi seç</string>
+    <string name="never">Hiçbir zaman</string>
+    <string name="expiryDate">Son kullanma tarihi</string>
+    <string name="editBarcode">Barkodu düzenle</string>
+    <string name="barcode">Barkod</string>
+    <string name="card">Kart</string>
+    <string name="balancePoints"><xliff:g>%s</xliff:g> puan</string>
+    <string name="balanceSentence">Bakiye: <xliff:g>%s</xliff:g></string>
+    <string name="expiryStateSentenceExpired">Süresi doldu: <xliff:g>%s</xliff:g></string>
+    <string name="expiryStateSentence">Son kullanma tarihi: <xliff:g>%s</xliff:g></string>
+    <string name="groupsList">Gruplar: <xliff:g>%s</xliff:g></string>
+    <string name="addFromImage">Galeriden resim seç</string>
+    <string name="addManually">Kart numarasını elle gir</string>
+    <string name="leaveWithoutSaveConfirmation">Kaydetmeden çıkılsın mı\?</string>
+    <string name="leaveWithoutSaveTitle">Çıkış</string>
+    <string name="moveDown">Aşağı git</string>
+    <string name="moveUp">Yukarı git</string>
+    <string name="failedOpeningFileManager">Önce bir dosya yöneticisi kurun.</string>
+    <string name="deleteConfirmationGroup">Grup silinsin mi\?</string>
+    <string name="all">Tümü</string>
+    <plurals name="groupCardCount">
+        <item quantity="one"><xliff:g>%d</xliff:g> kart</item>
+        <item quantity="other"><xliff:g>%d</xliff:g> kart</item>
+    </plurals>
+    <string name="noGroupCards">Bu grup hiç kart içermiyor</string>
+    <string name="noGroups">Önce kategorilere ayırmak üzere gruplar eklemek için + artı düğmesine tıklayın.</string>
+    <string name="groups">Gruplar</string>
+    <string name="enter_group_name">Grup adını girin</string>
+    <string name="exportSuccessful">Kart verileri dışa aktarıldı</string>
+    <string name="importSuccessful">Kart verileri içe aktarıldı</string>
+    <string name="intent_import_card_from_url_share_text">Seninle bir kart paylaşmak istiyorum</string>
+    <string name="settings_disable_lockscreen_while_viewing_card">Ekran kilidini engelle</string>
+    <string name="settings_keep_screen_on">Ekranı açık tut</string>
+    <string name="settings_lock_barcode_orientation">Barkod yönünü kilitle</string>
+    <string name="settings_display_barcode_max_brightness">Barkod görünümünü aydınlat</string>
+    <string name="settings_max_font_size_scale">Azami yazı tipi boyutu</string>
+    <string name="settings_dark_theme">Koyu</string>
+    <string name="settings_light_theme">Açık</string>
+    <string name="settings_system_theme">Sistem</string>
+    <string name="settings_theme">Tema</string>
+    <string name="settings_category_title_ui">Kullanıcı arayüzü</string>
+    <string name="settings">Ayarlar</string>
+    <string name="starImage">Sık kullanılan yıldız</string>
+    <string name="thumbnailDescription">Kart için küçük resim</string>
+    <string name="copy_to_clipboard_toast">Kart numarası panoya kopyalandı</string>
+    <string name="enterBarcodeInstructions">Kart numarasını girin ve aşağıdan barkod türünü veya “Bu kartın barkodu yok” seçeneğini seçin.</string>
+    <string name="selectBarcodeTitle">Barkod Seç</string>
+    <string name="app_resources">Özgür üçüncü taraf kaynakları: <xliff:g id="app_resources_list">%s</xliff:g></string>
+    <string name="app_libraries">Özgür üçüncü taraf kütüphaneleri: <xliff:g id="app_libraries_list">%s</xliff:g></string>
+    <string name="app_revision_fmt">Değişiklik Bilgileri: <xliff:g id="app_revision_url">%s</xliff:g></string>
+    <string name="debug_version_fmt">Sürüm: <xliff:g id="version">%s</xliff:g></string>
+    <string name="about_title_fmt"><xliff:g id="app_name">%s</xliff:g> hakkında</string>
+    <string name="app_license">GPLv3+ altında lisanslanan copyleft özgür yazılım</string>
+    <string name="app_copyright_old">Loyalty Card Keychain temel alınmıştır
+\nTelif Hakkı © 2016–2020 Branden Archer</string>
+    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Telif Hakkı © 2019–<xliff:g>%d</xliff:g> Sylvia van Os</string>
+    <string name="about">Hakkında</string>
+    <string name="importOptionApplicationButton">Başka bir uygulama kullan</string>
+    <string name="importOptionApplicationExplanation">Bir dosyayı açmak için herhangi bir uygulamayı veya en sevdiğiniz dosya yöneticisini kullanın.</string>
+    <string name="importOptionApplicationTitle">Başka bir uygulama kullan</string>
+    <string name="importOptionFilesystemButton">Dosya sisteminden</string>
+    <string name="importOptionFilesystemExplanation">Dosya sisteminden belirli bir dosya seçin.</string>
+    <string name="importOptionFilesystemTitle">Dosya sisteminden içe aktar</string>
+    <string name="exportOptionExplanation">Veriler seçtiğiniz bir konuma yazılacak.</string>
+    <string name="noExternalStoragePermissionError">Kartları içe veya dışa aktarmak için önce harici depolama izni verin</string>
+    <string name="exporting">Dışa aktarılıyor…</string>
+    <string name="importing">İçe aktarılıyor…</string>
+    <string name="exportFailed">Kartlar dışa aktarılamadı</string>
+    <string name="exportFailedTitle">Dışa aktarılamadı</string>
+    <string name="exportSuccessfulTitle">Dışa aktarıldı</string>
+    <string name="importFailed">Kartlar içe aktarılamadı</string>
+    <string name="importFailedTitle">İçe aktarılamadı</string>
+    <string name="importSuccessfulTitle">İçe aktarıldı</string>
+    <string name="importExportHelp">Kartlarınızı yedeklemek, onları başka bir aygıta taşımanıza olanak tanır.</string>
+    <string name="exportName">Dışa aktar</string>
+    <string name="importExport">İçe/Dışa aktar</string>
+    <string name="failedParsingImportUriError">İçe aktarma URI\'si ayrıştırılamadı</string>
+    <string name="noCardExistsError">Kart bulunamadı</string>
+    <string name="noCardIdError">Kart numarası girilmedi</string>
+    <string name="noStoreError">Ad girilmedi</string>
+    <string name="barcodeImageDescriptionWithType"><xliff:g>%s</xliff:g> türündeki kart barkodunun görüntüsü</string>
+    <string name="card_ids_copied">Kart numara(lar)ı kopyalandı</string>
+    <string name="copy_to_clipboard">Numarayı panoya kopyala</string>
+    <string name="cardId">Kart numarası</string>
+    <string name="noCardsMessage">Önce bir kart ekleyin</string>
+    <string name="cardShortcut">Kart Kısayolu</string>
+    <string name="scanCardBarcode">Kart Barkodunu Tara</string>
+    <string name="addCardTitle">Kart Ekle</string>
+    <string name="editCardTitle">Kartı Düzenle</string>
+    <string name="sendLabel">Gönder…</string>
+    <string name="share">Paylaş</string>
+    <string name="ok">Tamam</string>
+    <plurals name="deleteCardsConfirmation">
+        <item quantity="one">Bu <xliff:g>%d</xliff:g> kart kalıcı olarak silinsin mi\?</item>
+        <item quantity="other">Bu <xliff:g>%d</xliff:g> kart kalıcı olarak silinsin mi\?</item>
+    </plurals>
+    <string name="deleteConfirmation">Bu kart kalıcı olarak silinsin mi\?</string>
+    <plurals name="deleteCardsTitle">
+        <item quantity="one"><xliff:g>%d</xliff:g> kartı sil</item>
+        <item quantity="other"><xliff:g>%d</xliff:g> kartı sil</item>
+    </plurals>
+    <string name="deleteTitle">Kartı sil</string>
+    <string name="unlockScreen">Döndürme Engelini Kaldır</string>
+    <string name="lockScreen">Döndürmeyi Engelle</string>
+    <string name="confirm">Doğrula</string>
+    <string name="delete">Sil</string>
+    <string name="edit">Düzenle</string>
+    <string name="save">Kaydet</string>
+    <string name="cancel">İptal</string>
+    <string name="unstar">Sık kullanılanlardan kaldır</string>
+    <string name="star">Sık kullanılanlara ekle</string>
+    <string name="noBarcode">Barkod yok</string>
+    <string name="barcodeNoBarcode">Bu kartın barkodu yok</string>
+    <string name="barcodeType">Barkod türü</string>
+    <string name="note">Not</string>
+    <string name="storeName">Ad</string>
+    <string name="noMatchingGiftCards">Hiçbir şey bulunamadı. Aramanızı değiştirmeyi deneyin.</string>
+    <string name="noGiftCards">Bir kart eklemek için + artı düğmesine tıklayın veya önce ⋮ menüsünden birkaçını içe aktarın.</string>
+    <plurals name="selectedCardCount">
+        <item quantity="one"><xliff:g>%d</xliff:g> kart seçildi</item>
+        <item quantity="other"><xliff:g>%d</xliff:g> kart seçildi</item>
+    </plurals>
+    <string name="action_add">Ekle</string>
+    <string name="action_search">Ara</string>
+    <string name="sort_by">Sıralama ölçütü</string>
+    <string name="reverse">Ters</string>
+    <string name="sort_by_balance">Bakiye</string>
+    <string name="sort_by_expiry">Son kullanma tarihi</string>
+    <string name="sort_by_most_recently_used">En Son Kullanılan</string>
+    <string name="sort_by_name">Ad</string>
+    <string name="sort">Sırala</string>
+    <string name="report_error">Hata Bildir</string>
+    <string name="on_google_play">Google Play\'de</string>
+    <string name="rate_this_app">Bu uygulamayı değerlendir</string>
+    <string name="and_data_usage">ve veri kullanımı</string>
+    <string name="on_github">GitHub\'da</string>
+    <string name="source_repository">Kaynak Deposu</string>
+    <string name="license">Lisans</string>
+    <string name="help_translate_this_app">Bu uygulamayı çevirmeye yardımcı olun</string>
+    <string name="credits">Emeği Geçenler</string>
+    <string name="version_history">Sürüm Geçmişi</string>
+    <string name="exportPassword">Dışa aktarmanızı korumak için bir parola belirleyin (isteğe bağlı)</string>
+    <string name="exportPasswordHint">Parola girin</string>
+</resources>

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

@@ -7,7 +7,6 @@
     <string name="settings_display_barcode_max_brightness">Яскравіший штрих-код</string>
     <string name="enterBarcodeInstructions">Введіть ID карти та оберіть тип штрих-коду чи \"Ця карта не має штрих-коду\".</string>
     <string name="selectBarcodeTitle">Оберіть штрих-код</string>
-    <string name="barcodeImageDescription">Зображення штрих-коду карти</string>
     <string name="scanCardBarcode">Відсканувати штрих-код карти</string>
     <string name="noBarcode">Без штрих-коду</string>
     <string name="barcodeNoBarcode">Ця карта не має штрих-коду</string>
@@ -28,15 +27,15 @@
     <string name="sameAsCardId">Таке ж як ID картки</string>
     <string name="barcodeId">Значення штрих-коду</string>
     <string name="importVoucherVaultMessage">Оберіть Voucher Vault експорт-файл названий <i>vouchervault.json</i> для імпортування.
-\nЧи створіть його натиснувши \"Експорт\" у Voucher Vault.</string>
+\nСтворіть його натиснувши \"Експорт\" у Voucher Vault.</string>
     <string name="importVoucherVault">Імпорт з Voucher Vault</string>
     <string name="importLoyaltyCardKeychainMessage">Знайдіть файл названий <i>LoyaltyCardKeychain.csv</i> для імпортування.
-\nЧи створіть його у меню імпорту/експорту Loyalty Card Keychain натиснувши \"Експорт\".</string>
+\nСтворіть його у меню імпорту/експорту Loyalty Card Keychain натиснувши \"Експорт\".</string>
     <string name="importCatimaMessage">Оберіть експорт-файл названий <i>catima.zip</i> для імпортування.
-\nЧи створіть його з меню імпорту/експорту у іншій Catima, натиснувши \"Експорт\".</string>
+\nСтворіть його з меню імпорту/експорту у іншій Catima, натиснувши \"Експорт\".</string>
     <string name="importLoyaltyCardKeychain">Імпорт з Loyalty Card Keychain</string>
     <string name="importFidmeMessage">Оберіть FidMe експорт-файл названий <i>fidme-export-request-xxxxxx.zip</i> для імпортування і оберіть типи штрих-кодів вручну пізніше.
-\nЧи створіть його у вашому FidMe профілі обравши \"Захист даних -&gt; Витяг даних\".</string>
+\nСтворіть його у вашому FidMe профілі обравши \"Захист даних -&gt; Витяг даних\".</string>
     <string name="importFidme">Імпорт з FidMe</string>
     <string name="importCatima">Імпорт з Catima</string>
     <string name="accept">Прийняти</string>
@@ -51,7 +50,7 @@
     <string name="noBarcodeFound">Жодного штрих-коду не знайдено</string>
     <string name="moveBarcodeToCenterOfScreen">Відцентрувати штрих-код на екрані</string>
     <string name="moveBarcodeToTopOfScreen">Посунути штрих-код наверх екрану</string>
-    <string name="chooseExpiryDate">Оберіть дату закінчення терміну дії</string>
+    <string name="chooseExpiryDate">Оберіть дату</string>
     <string name="never">Ніколи</string>
     <string name="expiryDate">Дата закінчення терміну дії</string>
     <string name="editBarcode">Редагувати штрих-код</string>
@@ -76,14 +75,14 @@
     <string name="enter_group_name">Введіть ім\'я групи</string>
     <string name="exportSuccessful">Дані картки/карток експортовано</string>
     <string name="importSuccessful">Дані картки/карток імпортовано</string>
-    <string name="intent_import_card_from_url_share_text">Я хочу поділитися картою з тобою</string>
+    <string name="intent_import_card_from_url_share_text">Я хочу поділитися з тобою картою</string>
     <string name="settings_disable_lockscreen_while_viewing_card">Не блокувати екран</string>
     <string name="settings_keep_screen_on">Не вимикати екран</string>
     <string name="settings_lock_barcode_orientation">Заблокувати орієнтацію штрих-коду</string>
     <string name="settings_max_font_size_scale">Макс. розмір шрифту</string>
     <string name="settings_dark_theme">Темна</string>
     <string name="settings_light_theme">Світла</string>
-    <string name="settings_system_theme">Система</string>
+    <string name="settings_system_theme">Системна</string>
     <string name="settings_theme">Тема</string>
     <string name="settings_category_title_ui">Інтерфейс користувача</string>
     <string name="settings">Налаштування</string>
@@ -97,17 +96,17 @@
     <string name="app_revision_fmt">Інформація про випуск: <xliff:g id="app_revision_url">%s</xliff:g></string>
     <string name="debug_version_fmt">Версія: <xliff:g id="version">%s</xliff:g></string>
     <string name="about_title_fmt">Про <xliff:g id="app_name">%s</xliff:g></string>
-    <string name="app_license">Копілефт вільне програмне забезпечення, ліцензоване під GPLv3+.</string>
+    <string name="app_license">Копілефт вільне програмне забезпечення, ліцензоване під GPLv3+</string>
     <string name="app_copyright_old">Створено на основі Loyalty Card Keychain
-\nавторські права © 2016–2020 Branden Archer.</string>
-    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Авторські права © 2019–<xliff:g>%d</xliff:g> Sylvia van Os.</string>
+\nавторські права © 2016–2020 Branden Archer</string>
+    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Авторські права © 2019–<xliff:g>%d</xliff:g> Sylvia van Os</string>
     <string name="about">Про програму</string>
-    <string name="importOptionApplicationButton">Використайте іншу програму</string>
+    <string name="importOptionApplicationButton">Вибір програми</string>
     <string name="importOptionApplicationExplanation">Використайте іншу програму чи ваш улюблений файл-менеджер для відкриття файлу.</string>
-    <string name="importOptionApplicationTitle">Використати іншу програму</string>
-    <string name="importOptionFilesystemButton">З провідника</string>
-    <string name="importOptionFilesystemExplanation">Оберіть конкретний файл у провіднику.</string>
-    <string name="importOptionFilesystemTitle">Імпорт з провідника</string>
+    <string name="importOptionApplicationTitle">З іншої програми</string>
+    <string name="importOptionFilesystemButton">Обрати файл</string>
+    <string name="importOptionFilesystemExplanation">Оберіть файл у провіднику.</string>
+    <string name="importOptionFilesystemTitle">Імпорт з файлу</string>
     <string name="exportOptionExplanation">Дані буде записано до локації обраної вами.</string>
     <string name="noExternalStoragePermissionError">Надайте дозвіл на доступ до пам\'яті пристрою для імпорту чи експорту карток</string>
     <string name="exporting">Експортуємо…</string>
@@ -140,7 +139,7 @@
     <string name="delete">Видалити</string>
     <string name="edit">Редагувати</string>
     <string name="save">Зберегти</string>
-    <string name="cancel">Відмінити</string>
+    <string name="cancel">Скасувати</string>
     <string name="unstar">Видалити з улюблених</string>
     <string name="star">Додати до улюблених</string>
     <string name="cardId">ID картки</string>
@@ -157,18 +156,66 @@
     <string name="removeImage">Видалити зображення</string>
     <string name="setBackImage">Встановити зображення тильної сторони</string>
     <string name="setFrontImage">Встановити зображення лицьової сторони</string>
-    <string name="photos">Фотографії</string>
+    <string name="photos">Фото</string>
     <string name="backImageDescription">Тильна сторона карти</string>
     <string name="frontImageDescription">Лицьова сторона карти</string>
-    <string name="importStocardMessage">Оберіть Stocard експорт-файл, названий <i>***-sync.zip</i> для імпортування і оберіть типи штрих-кодів вручну пізніше.
-\nЧи отримайте його надіславши електронного листа із запитом на експортування ваших даних до support@stocardapp.com.</string>
+    <string name="importStocardMessage">Виберіть експорт <i> ***-sync.zip </i> зі Stocard для імпорту.
+\nОтримайте його, надіславши електронною поштою support@stocardapp.com з проханням експортувати ваші дані.</string>
     <string name="importStocard">Імпорт із Stocard</string>
     <plurals name="selectedCardCount">
         <item quantity="one">Обрано: <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="many">Обрано: <xliff:g>%d</xliff:g> карток</item>
+        <item quantity="other">Обрано: <xliff:g>%d</xliff:g> карток</item>
     </plurals>
-    <string name="deleteTitle">Видалити карту</string>
+    <string name="deleteTitle">Видалити картку</string>
     <string name="deleteConfirmation">Бажаєте видалити карту\?</string>
-</resources>
+    <plurals name="deleteCardsTitle">
+        <item quantity="one">Видалити <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="one">Видаліть цю <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>
+    <string name="settings_blue_theme">Синій</string>
+    <string name="settings_violet_theme">Фіолетовий</string>
+    <string name="settings_magenta_theme">Пурпуровий</string>
+    <string name="settings_pink_theme">Рожевий</string>
+    <string name="settings_catima_theme">Catima</string>
+    <string name="settings_theme_color">Колір теми</string>
+    <string name="settings_system_locale">Системна</string>
+    <string name="settings_locale">Мова</string>
+    <string name="settings_brown_theme">Коричневий</string>
+    <string name="settings_grey_theme">Сірий</string>
+    <string name="settings_green_theme">Зелений</string>
+    <string name="settings_sky_blue_theme">Небесно-синій</string>
+    <string name="app_contributors">Стало можливим завдяки: <xliff:g id="app_contributors">%s</xliff:g></string>
+    <string name="noGroupCards">Ця група не містить жодних карток</string>
+    <string name="toggleMoreInfo">Показувати додаткову інформацію</string>
+    <string name="barcodeImageDescriptionWithType">Зображення штрих-коду карти типу <xliff:g>%s</xliff:g></string>
+    <string name="swipeToSwitchImages">Свайп чи довге натискання для зміни зображень</string>
+    <string name="sort_by">Сортувати за</string>
+    <string name="reverse">Зворотній порядок</string>
+    <string name="sort_by_balance">Баланс</string>
+    <string name="sort_by_expiry">Термін дії</string>
+    <string name="sort_by_most_recently_used">Часто використовувані</string>
+    <string name="sort_by_name">Назва</string>
+    <string name="sort">Сортування</string>
+    <string name="version_history">Історія версій</string>
+    <string name="help_translate_this_app">Допомогти з перекладом програми</string>
+    <string name="license">Ліцензія</string>
+    <string name="source_repository">Вихідний код</string>
+    <string name="on_github">на GitHub</string>
+    <string name="and_data_usage">та використання даних</string>
+    <string name="credits">Подяки</string>
+    <string name="rate_this_app">Оцінити програму</string>
+    <string name="on_google_play">у Google Play</string>
+    <string name="report_error">Повідомити про помилку</string>
+    <string name="exportPassword">Встановіть пароль для захисту експорту (необов\'язково)</string>
+    <string name="exportPasswordHint">Введіть пароль</string>
+</resources>

app/src/main/res/values-w600dp/integers.xml

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

app/src/main/res/values-w820dp/dimens.xml

@@ -1,6 +0,0 @@
-<resources>
-    <!-- Example customization of dimensions originally defined in res/values/dimens.xml
-         (such as screen margins) for screens with more than 820dp of available width. This
-         would include 7" and 10" devices in landscape (~960dp and ~1280dp respectively). -->
-    <dimen name="activity_horizontal_margin">64dp</dimen>
-</resources>

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

@@ -15,7 +15,6 @@
     <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Copyright © 2019–<xliff:g>%d</xliff:g> Sylvia van Os.</string>
     <string name="importOptionApplicationButton">使用其他应用</string>
     <string name="importOptionFilesystemButton">从文件系统</string>
-    <string name="barcodeImageDescription">卡片二维码图像</string>
     <string name="unstar">从收藏中删除</string>
     <string name="intent_import_card_from_url_share_multiple_text">我想和你分享一些卡片</string>
     <string name="copy_to_clipboard_multiple_toast">已将卡号复制到剪贴板</string>
@@ -24,16 +23,16 @@
     <string name="setBarcodeId">设置条形码值</string>
     <string name="sameAsCardId">与卡号相同</string>
     <string name="barcodeId">条形码值</string>
-    <string name="importVoucherVaultMessage">找到一个可能名为<i>vouchervault.json</i>的文件进行导入。
+    <string name="importVoucherVaultMessage">选择从Voucher Vault导出的文件：<i>vouchervault.json</i>进行导入。
 \n或者先在Voucher Vault中按下导出键来创建导出。</string>
     <string name="importVoucherVault">从 Voucher Vault 导入</string>
-    <string name="importLoyaltyCardKeychainMessage">找到一个很可能名为<i>LoyaltyCardKeychain.csv</i>的文件来导入。
+    <string name="importLoyaltyCardKeychainMessage">选择从Loyalty Card Keychain导出的文件：<i>LoyaltyCardKeychain.csv</i>来导入。
 \n或者先从Loyalty Card Keychain的Import/Export菜单中选择Export来导出。</string>
     <string name="importLoyaltyCardKeychain">从 Loyalty Card Keychain 导入</string>
-    <string name="importFidmeMessage">找到一个可能名为<i>fidme-export-request-xxxxxx.zip</i>的文件进行导入，之后再手动选择条码类型。
+    <string name="importFidmeMessage">选择从Fidme导出的文件：<i>fidme-export-request-xxxxxx.zip</i>进行导入，之后再手动选择条码类型。
 \n或者从你的FidMe配置文件中选择数据保护，然后按提取我的数据来创建导出。</string>
     <string name="importFidme">从 FidMe 导入</string>
-    <string name="importCatimaMessage">找到一个可能名为<i>Catima.csv</i>的文件来导入。
+    <string name="importCatimaMessage">选择从Catima导出的文件：<i>Catima.zip</i>来导入。
 \n或者先从另一个Catima应用程序的导入/导出菜单中，来创建导出。</string>
     <string name="importCatima">从 Catima 导入</string>
     <string name="accept">接受</string>
@@ -143,4 +142,32 @@
     <string name="action_search">搜索</string>
     <string name="deleteConfirmation">删除此卡？</string>
     <string name="deleteTitle">移除卡片</string>
+    <string name="starImage">最喜欢的星星</string>
+    <string name="importStocardMessage">选择你从Stocard导出的<i>****-sync.zip</i>来导入。
+\n或者发电子邮件给support@stocardapp.com，要求导出你的数据，从而获得此文件。</string>
+    <plurals name="deleteCardsConfirmation">
+        <item quantity="other">确定永久删除 <xliff:g>%d</xliff:g> 这些卡片？</item>
+    </plurals>
+    <plurals name="selectedCardCount">
+        <item quantity="other">已选择 <xliff:g>%d</xliff:g> 张卡片</item>
+    </plurals>
+    <plurals name="deleteCardsTitle">
+        <item quantity="other">删除 <xliff:g>%d</xliff:g> 张卡片</item>
+    </plurals>
+    <string name="turn_flashlight_off">关上手电筒</string>
+    <string name="turn_flashlight_on">开启手电筒</string>
+    <string name="failedGeneratingShareURL">无法生成可分享的URL。请向开发者报告。</string>
+    <string name="passwordRequired">请输入密码</string>
+    <string name="no">否</string>
+    <string name="yes">是</string>
+    <string name="updateBarcodeQuestionText">您改变了卡片的ID。是否需要同时更新条形码，以使用相同的值？</string>
+    <string name="updateBarcodeQuestionTitle">是否要更新条形码的值？</string>
+    <string name="takePhoto">拍照</string>
+    <string name="removeImage">移除图像</string>
+    <string name="setBackImage">设置背面图像</string>
+    <string name="setFrontImage">设置正面图像</string>
+    <string name="photos">照片</string>
+    <string name="backImageDescription">卡片的背面图像</string>
+    <string name="frontImageDescription">卡片的正面图像</string>
+    <string name="importStocard">从Stocard导入</string>
 </resources>

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

@@ -0,0 +1,207 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" xmlns:tools="http://schemas.android.com/tools">
+    <string name="app_revision_url">https://github.com/TheLastProject/Catima/releases</string>
+    <string name="action_search">搜尋</string>
+    <string name="action_add">新增</string>
+    <string name="noGiftCards">點選 + 按鈕以新增卡片\n或從 ⋮ 選單中匯入卡片</string>
+    <string name="noMatchingGiftCards">沒有找到任何東西。試試其他關鍵字。</string>
+    <string name="storeName">名稱</string>
+    <string name="note">註記</string>
+    <string name="cardId">卡片 ID</string>
+    <string name="barcodeType">條碼種類</string>
+    <string name="barcodeNoBarcode">此卡片沒有可用的條碼</string>
+    <string name="noBarcode">無條碼</string>
+    <string name="privacy_policy_popup_text">隱私權政策（某些應用程式商店需要此條目）:  我們並不會收集任何資料！任何人都可以檢視我們的原始碼並驗證這點。</string>
+    <string name="star">新增至收藏</string>
+    <string name="app_license">公共版權 (Copylefted) 的自由軟體，許可 GPLv3+</string>
+    <string name="unstar">從收藏中移除</string>
+    <string name="cancel">取消</string>
+    <string name="save">儲存</string>
+    <string name="edit">編輯</string>
+    <string name="delete">刪除</string>
+    <string name="confirm">確認</string>
+    <string name="about">關於</string>
+    <string name="about_title_fmt">關於 <xliff:g id="app_name">%s</xliff:g></string>
+    <string name="accept">接受</string>
+    <string name="addCardTitle">新增卡片</string>
+    <string name="addFromImage">從圖庫中選擇圖片</string>
+    <string name="addManually">手動輸入卡片 ID</string>
+    <string name="all">全部</string>
+    <string name="balance">餘額</string>
+    <string name="balanceSentence">餘額: <xliff:g>%s</xliff:g></string>
+    <string name="balancePoints"><xliff:g>%s</xliff:g> 點</string>
+    <string name="app_copyright_old">基於 Loyalty Card Keychain\n著作權所有 © 2016–2020 Branden Archer</string>
+    <string name="barcode">條碼</string>
+    <string name="barcodeId">條碼內容</string>
+    <string name="barcodeImageDescriptionWithType">條碼種類 <xliff:g>%s</xliff:g> 的圖片</string>
+    <string name="card">卡片</string>
+    <string name="card_ids_copied">已複製卡片 ID(s)</string>
+    <string name="cardShortcut">卡片捷徑</string>
+    <string name="chooseExpiryDate">選擇逾期日期</string>
+    <string name="chooseImportType">從哪裡匯入資料？</string>
+    <string name="copy_to_clipboard">已複製 ID 至剪貼簿中</string>
+    <string name="copy_to_clipboard_multiple_toast">已複製多個卡片 ID 至剪貼簿中</string>
+    <string name="copy_to_clipboard_toast">已複製卡片 ID 至剪貼簿中</string>
+    <string name="credits">貢獻者</string>
+    <string name="currency">幣別</string>
+    <string name="debug_version_fmt">版本：<xliff:g id="version">%s</xliff:g></string>
+    <string name="deleteConfirmation">永久刪除此卡片？</string>
+    <string name="deleteConfirmationGroup">刪除此群組？</string>
+    <string name="deleteTitle">刪除卡片</string>
+    <string name="editBarcode">編輯條碼</string>
+    <string name="editCardTitle">編輯圖片</string>
+    <string name="enter_group_name">輸入群組名稱</string>
+    <string name="enterBarcodeInstructions">輸入卡片 ID、選擇條碼種類、或選擇「此卡片沒有可用的條碼」。</string>
+    <string name="errorReadingImage">無法讀取此圖片</string>
+    <string name="expiryDate">逾期日期</string>
+    <string name="expiryStateSentence">逾期於：<xliff:g>%s</xliff:g></string>
+    <string name="expiryStateSentenceExpired">已逾期：<xliff:g>%s</xliff:g></string>
+    <string name="exportFailed">無法匯出卡片</string>
+    <string name="exportFailedTitle">匯出失敗</string>
+    <string name="exporting">匯出中…</string>
+    <string name="exportName">匯出</string>
+    <string name="exportOptionExplanation">資料將寫至您所選的位置。</string>
+    <string name="exportPassword">透過密碼保護您的匯出檔 (選用)</string>
+    <string name="exportPasswordHint">輸入密碼</string>
+    <string name="exportSuccessful">已匯出卡片資訊</string>
+    <string name="exportSuccessfulTitle">已匯出</string>
+    <string name="failedOpeningFileManager">請先安裝檔案管理員。</string>
+    <string name="failedParsingImportUriError">無法讀取匯入 URI</string>
+    <string name="frontImageDescription">卡片 (正面)</string>
+    <string name="groups">群組</string>
+    <string name="groupsList">群組：<xliff:g>%s</xliff:g></string>
+    <string name="help_translate_this_app">幫助翻譯本程式</string>
+    <string name="importExport">匯入/匯出</string>
+    <string name="importFailedTitle">匯入失敗</string>
+    <string name="importFailed">無法匯入卡片</string>
+    <string name="importing">匯入中…</string>
+    <string name="importSuccessfulTitle">已匯入</string>
+    <string name="intent_import_card_from_url_share_multiple_text">我想要分享些卡片給你</string>
+    <string name="intent_import_card_from_url_share_text">我想要分享張卡片給你</string>
+    <string name="leaveWithoutSaveConfirmation">不保存就離開？</string>
+    <string name="leaveWithoutSaveTitle">離開</string>
+    <string name="license">許可</string>
+    <string name="never">永不</string>
+    <string name="no">否</string>
+    <string name="noBarcodeFound">找不到可用的條碼</string>
+    <string name="noCardExistsError">無法找到卡片</string>
+    <string name="noCardIdError">尚未輸入卡片 ID</string>
+    <string name="noCardsMessage">請先新增卡片</string>
+    <string name="sort">排列</string>
+    <string name="settings_catima_theme">Catima</string>
+    <string name="settings_pink_theme">粉紅</string>
+    <string name="settings_magenta_theme">品紅</string>
+    <string name="settings_violet_theme">紫色</string>
+    <string name="settings_blue_theme">藍色</string>
+    <string name="settings_sky_blue_theme">天空藍</string>
+    <string name="settings_green_theme">綠色</string>
+    <string name="settings_grey_theme">灰色</string>
+    <string name="settings_brown_theme">棕色</string>
+    <string name="sort_by_name">名稱</string>
+    <string name="sort_by_most_recently_used">最近使用</string>
+    <string name="sort_by_expiry">逾期日期</string>
+    <string name="sort_by_balance">餘額</string>
+    <string name="reverse">反序</string>
+    <string name="sort_by">排列方式</string>
+    <string name="version_history">版本歷史</string>
+    <string name="source_repository">原始碼版本庫</string>
+    <string name="on_github">於 GitHub</string>
+    <string name="and_data_usage">及資料使用</string>
+    <string name="rate_this_app">替本 App 評分</string>
+    <string name="on_google_play">於 Google Play</string>
+    <string name="report_error">回報錯誤</string>
+    <string name="setBarcodeId">設定條碼內容</string>
+    <string name="sameAsCardId">與卡片 ID 相同</string>
+    <string name="photos">圖片</string>
+    <string name="setFrontImage">設定正面圖片</string>
+    <string name="setBackImage">設定背面圖片</string>
+    <string name="removeImage">移除圖片</string>
+    <string name="takePhoto">拍照</string>
+    <string name="updateBarcodeQuestionTitle">更新條碼內容？</string>
+    <string name="yes">是</string>
+    <string name="passwordRequired">請輸入密碼</string>
+    <string name="turn_flashlight_on">開啟手電筒</string>
+    <string name="turn_flashlight_off">關閉手電筒</string>
+    <string name="settings_locale">語言</string>
+    <string name="settings_system_locale">系統語言</string>
+    <string name="settings_theme_color">主題顏色</string>
+    <string name="app_contributors">感謝以下貢獻者: <xliff:g id="app_contributors">%s</xliff:g></string>
+    <string name="privacy_policy">隱私權政策</string>
+    <plurals name="selectedCardCount">
+        <item quantity="other">已選取 <xliff:g>%d</xliff:g> 張卡片</item>
+    </plurals>
+    <plurals name="deleteCardsTitle">
+        <item quantity="other">刪除 <xliff:g>%d</xliff:g> 張卡片</item>
+    </plurals>
+    <plurals name="deleteCardsConfirmation">
+        <item quantity="other">永久刪除 <xliff:g>%d</xliff:g> 張卡片?</item>
+    </plurals>
+    <plurals name="groupCardCount">
+        <item quantity="other"><xliff:g>%d</xliff:g> 張卡片</item>
+    </plurals>
+    <string name="settings">設定</string>
+    <string name="share">分享</string>
+    <string name="settings_system_theme">系統主題</string>
+    <string name="settings_theme">主題</string>
+    <string name="thumbnailDescription">卡片縮圖</string>
+    <string name="noGroupCards">此群組中無任何卡片</string>
+    <string name="settings_category_title_ui">用戶界面</string>
+    <string name="settings_max_font_size_scale">最大字體大小</string>
+    <string name="settings_light_theme">淺色</string>
+    <string name="settings_dark_theme">深色</string>
+    <string name="settings_display_barcode_max_brightness">調高條碼介面螢幕亮度</string>
+    <string name="settings_lock_barcode_orientation">鎖定條碼螢幕方向</string>
+    <string name="settings_keep_screen_on">螢幕恆亮</string>
+    <string name="settings_disable_lockscreen_while_viewing_card">防止螢幕鎖定</string>
+    <string name="importSuccessful">已匯入卡片資訊</string>
+    <string name="moveUp">往上移動</string>
+    <string name="moveDown">往下移動</string>
+    <string name="lockScreen">禁止旋轉</string>
+    <string name="unlockScreen">允許旋轉</string>
+    <string name="ok">OK</string>
+    <string name="sendLabel">送出…</string>
+    <string name="scanCardBarcode">掃描卡片條碼</string>
+    <string name="noStoreError">尚未輸入卡片名稱</string>
+    <string name="importExportHelp">備份您的卡片以將這些卡片移至其他裝置中。</string>
+    <string name="noExternalStoragePermissionError">在匯入及匯出卡片前，請先允許外部儲存裝置存取權限</string>
+    <string name="importOptionFilesystemTitle">自檔案系統中匯入</string>
+    <string name="importOptionFilesystemExplanation">自檔案系統中選取檔案。</string>
+    <string name="importOptionFilesystemButton">自檔案系統</string>
+    <string name="importOptionApplicationTitle">使用其他應用程式</string>
+    <string name="importOptionApplicationButton">使用其他應用程式</string>
+    <string name="importOptionApplicationExplanation">使用任何應用程式選擇您所想要匯入的檔案。</string>
+    <string name="app_copyright_fmt">著作權所有 © 2019–<xliff:g>%d</xliff:g> Sylvia van Os</string>
+    <string name="importVoucherVault">自 Voucher Vault 中匯入</string>
+    <string name="importVoucherVaultMessage">選取您自 Voucher Vault 匯出的 <i>vouchervault.json</i> 檔案以進行匯入。
+\n請您先透過 Voucher Vault 進行匯出。</string>
+    <string name="importStocard">自 Stocard 中匯入</string>
+    <string name="importStocardMessage">>選取您自 Stocard 匯出的  <i>***-sync.zip</i> 檔案以進行匯入。
+\n請您寫封 Email 至 support@stocardapp.com 索取您的資料。</string>
+    <string name="importLoyaltyCardKeychain">自 Loyalty Card Keychain 中匯入</string>
+    <string name="importLoyaltyCardKeychainMessage">選取您自 Loyalty Card Keychain <i>LoyaltyCardKeychain.csv</i> 檔案以進行匯入。
+\n請您先透過 Loyalty Card Keychain 的匯入/匯出選單進行匯出。</string>
+    <string name="importFidme">自 FidMe 匯入</string>
+    <string name="importFidmeMessage">選取您自 FidMe 匯出的<i>fidme-export-request-xxxxxx.zip</i> 檔案以進行匯入，並手動選擇條碼種類。
+\n請您先透過您的 FidMe 個人檔案選取『Data Protection』，並選擇『Extract my data』。</string>
+    <string name="importCatima">自 Catima 匯入</string>
+    <string name="importCatimaMessage">選取您自 Catima 匯出的 <i>catima.zip</i> 檔案以進行匯入。
+\n您可透過其他裝置的 Catima 程式中的匯入/匯出選單進行匯出。</string>
+    <string name="points">點</string>
+    <string name="parsingBalanceFailed"><xliff:g>%s</xliff:g> 似乎不是個可用的餘額數值。</string>
+    <string name="app_revision_fmt">修訂版本資訊：<xliff:g id="app_revision_url">%s</xliff:g></string>
+    <string name="app_libraries">第三方自由函示庫：<xliff:g id="app_libraries_list">%s</xliff:g></string>
+    <string name="app_resources">第三方自由資源：<xliff:g id="app_resources_list">%s</xliff:g></string>
+    <string name="selectBarcodeTitle">選擇條碼</string>
+    <string name="noGroups">請先點選 + 加號按鈕新增群組。</string>
+    <string name="moveBarcodeToTopOfScreen">將條碼移至螢幕上方</string>
+    <string name="moveBarcodeToCenterOfScreen">將條碼移至螢幕中央</string>
+    <string name="app_loyalty_card_keychain">Loyalty Card Keychain</string>
+    <string name="unsupportedBarcodeType">尚支援此條碼種類，但未來版本的應用程式可能會支援此條碼種類。</string>
+    <string name="wrongValueForBarcodeType">條碼內容不適用於此條碼種類</string>
+    <string name="backImageDescription">卡片 (背面)</string>
+    <string name="updateBarcodeQuestionText">您已更新了條碼 ID，是否要更新條碼內容以匹配此 ID？</string>
+    <string name="failedGeneratingShareURL">無法建立可分享的 URL，請回報此錯誤。</string>
+    <string name="toggleMoreInfo">切換顯示更多內容</string>
+    <string name="swipeToSwitchImages">滑動或長按以切換圖片</string>
+    <string name="starImage">收藏標示</string>
+</resources>

app/src/main/res/values/arrays.xml

@@ -7,4 +7,10 @@
         <item>Stocard</item>
         <item>Voucher Vault</item>
     </string-array>
+
+    <string-array name="sort_types_array">
+        <item>@string/sort_by_name</item>
+        <item>@string/sort_by_most_recently_used</item>
+        <item>@string/sort_by_expiry</item>
+    </string-array>
 </resources>

app/src/main/res/values/colors.xml

@@ -4,6 +4,7 @@
     <color name="colorPrimary">#B53F3F</color>
     <color name="colorPrimaryLight">#E87575</color>
     <color name="colorPrimaryDark">#840000</color>
+    <color name="colorPrimaryDisabled">#484848</color>
     <color name="colorSecondary">#ffc107</color>
     <color name="colorSecondaryLight">#fff350</color>
     <color name="colorSecondaryDark">#c79100</color>
@@ -20,4 +21,6 @@
     <color name="iconColor">#000000</color>
 
     <color name="alert">#FF0000</color>
+
+    <color name="mainLoyaltyCardBackground">#F8F8F8</color>
 </resources>

app/src/main/res/values/integers.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <integer name="main_view_card_columns">1</integer>
+</resources>