Experiment: Use Extended Floating Action Buttons

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,15 +17,25 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: set up JDK 1.8
-      uses: actions/setup-java@v1
+    - 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
       with:
-        java-version: 1.8
+        distribution: 'adopt'
+        java-version: '11'
     - name: Build
       run: ./gradlew assembleRelease
     - name: Check lint
       run: ./gradlew lintRelease
     - name: Run unit tests
-      run: ./gradlew testReleaseUnitTest
-    - name: FindBugs
-      run: ./gradlew findbugs
+      run: ./gradlew testReleaseUnitTest || ./gradlew testReleaseUnitTest
+    - name: SpotBugs
+      run: ./gradlew spotbugsRelease
+    - name: Archive test results
+      if: always()
+      uses: actions/upload-artifact@v2
+      with:
+        name: test-results
+        path: app/build/reports

.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

@@ -1,8 +1,10 @@
 *.iml
 .gradle
-/local.properties
-/.idea/workspace.xml
-/.idea/libraries
+local.properties
+.idea/
 .DS_Store
-/build
-/captures
+build/
+captures/
+**/release
+**/debug
+app/*.log

.scripts/changelog_to_fastlane.py

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

CHANGELOG.md

@@ -1,36 +1,330 @@
 # Changelog
 
-## v1.2.0 (2020-11-17)
+## Unreleased - 101
 
-Changes:
+- Fix cropper not using theme colour
+- Fix minor theming issues
+- Add pure black dark theme for OLED screens
+
+## v2.14.1 - 100 (2022-01-15)
+
+- Hide search, expand and sort icons until there is at least 1 card
+- Various theming fixes
+
+## v2.14.0 - 99 (2022-01-14)
+
+- Material You redesign
+
+## v2.13.1 - 98 (2022-01-09)
+
+- Fix various TalkBack-related bugs
+
+## v2.13.0 - 97 (2022-01-03)
+
+- Fixed pressing the save button multiple times creating multiple entries
+- Lower card header size when hiding details to fit even more cards
+- Restructure edit screen
+- Improve star icon contrast in main view
+
+## v2.12.0 - 96 (2021-12-23)
+
+- Add CODE 93 support
+- Various minor bugfixes and improvements
+
+## v2.11.2 - 95 (2021-12-04)
+
+- Fix crash on sharing card
+
+## v2.11.1 - 94 (2021-11-30)
+
+- Fix blurriness of main screen letter icons
+- Fix icons sometimes disappearing after selection
+- Fix status bar icons possibly being invisible on Android 5
+
+## v2.11.0 - 93 (2021-11-28)
+
+- Add Catima to [Quick Access Device Controls](https://developer.android.com/guide/topics/ui/device-control)
+- Fix some groups not showing up correctly in group management screen
+
+## v2.10.0 - 92 (2021-11-20)
+
+- New main screen layout
+- Fix bottomsheet sizing issues when switching in and out of fullscreen
+
+## v2.9.0 - 91 (2021-11-14)
+
+- Improved group management support
+- Support cropping images
+- Fix image data loss when saving after rotating in edit view
+- Ability to set a custom image as card icon
+
+## v2.8.1 - 90 (2021-10-27)
+
+- Fix dots in card view having the wrong colour when changing theme manually
+- Fix crash in card view on rotation/theme change
+- Fix flashing of cards list
+- Fix text overlaying star icon
+
+## v2.8.0 - 89 (2021-10-25)
+
+- 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 - 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 - 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 - 74 (2021-07-27)
+
+- Fix shortcut creation
+- Generate card-specific shortcut icon
+- Fix ability to change loyalty card colour
+
+## v2.0.3 - 73 (2021-07-25)
+
+- Fix loading photos when editing existing card
+
+## v2.0.2 - 72 (2021-07-25)
+
+- Fix inability to configure photos in new loyalty card
+
+## 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 - 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
+- Support importing password-protected zip files
+- Support importing from Stocard (Beta)
+- Fix useless whitespace in notes from Fidme import
+- Support new Voucher Vault export format
+- Fix Floating Action Buttons being behind other UI elements on Android 4
+- Fix loyalty card viewer appbar top margin
+
+## 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 - 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 - 67 (2021-04-10)
+
+- Add option to set a separate barcode value from card ID
+- Simplify font sizing configuration
+- Several small UI fixes
+- Use letter icon for shortcuts too
+- Always show all barcode types in manual entry
+- Remove privacy policy first start dialog
+
+## 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 - 64 (2021-03-21)
+
+- Add privacy policy dialog on first start (required by Huawei)
+
+## 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 - 62 (2021-02-24)
+
+- Fix parsing balance for countries using space as separator
+
+## v1.9.1 - 61 (2021-02-23)
+
+- Improve balance parsing logic
+- Fix currency decimal display on main screen
+
+## v1.9 - 59 (2021-02-22)
+
+- Add balance support
+- Reorganize barcode tab of edit view
+
+## v1.8.1 - 58 (2021-02-12)
+
+- Fix Crash on versions before Android 7
+
+## 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 - 56 (2021-01-18)
+
+- Fix crash on switching to barcode tab in edit view if there is no barcode
+
+## 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 - 54 (2021-01-04)
+
+- Fix edit button or more info bottom sheet drawing over barcode ID
+
+## v1.6.1 - 64 (2020-12-16)
+
+- Fix regression causing manual barcode entry to not be saved
+
+## 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 - 51 (2020-12-03)
+
+- Fix bottomsheet background being transparent
+
+## 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 - 49 (2020-12-01)
+
+- Improved translations
+- Small UI fixes
+
+## 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 - 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 - 46 (2020-11-19)
+
+- Remember active group tab between screens and sessions
+
+## v1.2.1 - 45 (2020-11-17)
+
+- Fix home screen swiping triggering during vertical swipes too
+
+## 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
@@ -39,31 +333,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))
@@ -80,57 +366,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))
@@ -138,87 +408,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))
@@ -226,37 +472,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))
@@ -264,15 +500,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".
 
@@ -282,55 +516,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
@@ -347,13 +562,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.

FUNDING.yml

@@ -0,0 +1,3 @@
+github: TheLastProject
+custom:
+  - "https://paypal.me/sylviavanos"

Gemfile.lock

@@ -1,58 +1,75 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (3.0.2)
-    addressable (2.7.0)
+    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/.gitignore

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

app/build.gradle

@@ -1,77 +1,122 @@
-apply plugin: 'com.android.application'
-apply plugin: 'findbugs'
+import com.github.spotbugs.snom.SpotBugsTask
 
-findbugs {
-    sourceSets = []
+apply plugin: 'com.android.application'
+apply plugin: 'com.github.spotbugs'
+
+spotbugs {
     ignoreFailures = false
+    effort = 'max'
+    excludeFilter = file("./config/spotbugs/exclude.xml")
+    reportsDir = file("$buildDir/reports/spotbugs/")
 }
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 31
+    buildToolsVersion "31.0.0"
 
     defaultConfig {
         applicationId "me.hackerchick.catima"
-        minSdkVersion 16
-        targetSdkVersion 29
-        versionCode 44
-        versionName "1.2.0"
+        minSdkVersion 21
+        targetSdkVersion 31
+        versionCode 100
+        versionName "2.14.1"
+
+        vectorDrawables.useSupportLibrary true
+        multiDexEnabled true
     }
+
     buildTypes {
         release {
-            minifyEnabled false
+            minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            resValue "string", "app_name", "Catima"
         }
         debug {
             applicationIdSuffix ".debug"
+            resValue "string", "app_name", "Catima Debug"
         }
     }
+
+    bundle {
+        language {
+            enableSplit = false
+        }
+    }
+
+    compileOptions {
+        encoding "UTF-8"
+
+        // Flag to enable support for the new language APIs
+        coreLibraryDesugaringEnabled true
+
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
+    }
+
     lintOptions {
-        disable "GoogleAppIndexingWarning"
-        disable "ButtonStyle"
-        disable "AlwaysShowAction"
-        disable "MissingTranslation"
-        disable "MissingPrefix"
+        disable "GoogleAppIndexingWarning", "ButtonStyle", "AlwaysShowAction",
+                "MissingTranslation", "MissingPrefix"
+    }
+
+    sourceSets {
+        test {
+            resources.srcDirs += ['src/test/res']
+        }
     }
 
     // Starting with Android Studio 3 Robolectric is unable to find resources.
     // The following allows it to find the resources.
     testOptions {
         unitTests {
-            includeAndroidResources = true
+            all {
+                testLogging {
+                    events 'started', 'passed', 'skipped', 'failed'
+                }
+            }
+            includeAndroidResources true
         }
     }
 }
 
 dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'com.google.android.material:material:1.2.1'
-    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'com.journeyapps:zxing-android-embedded:3.5.0@aar'
-    implementation 'com.google.zxing:core:3.3.0'
-    implementation 'org.apache.commons:commons-csv:1.5'
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
-    implementation 'com.jaredrummler:colorpicker:1.0.2'
-    implementation group: 'com.google.guava', name: 'guava', version: '20.0'
-    implementation 'com.github.apl-devs:appintro:v4.2.0'
-    implementation "com.vanniktech:vntnumberpickerpreference:1.0.0"
-    implementation 'androidx.cardview:cardview:1.0.0'
-    testImplementation 'junit:junit:4.12'
-    testImplementation "org.robolectric:robolectric:4.0.2"
+// AndroidX
+    implementation 'androidx.appcompat:appcompat:1.4.1'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
+    implementation 'androidx.exifinterface:exifinterface:1.3.3'
+    implementation 'androidx.palette:palette:1.0.0'
+    implementation 'androidx.preference:preference:1.2.0'
+    implementation 'com.google.android.material:material:1.5.0'
+    implementation 'com.github.yalantis:ucrop:2.2.8'
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
+
+// Splash Screen
+    implementation 'androidx.core:core-splashscreen:1.0.0-beta01'
+
+// Third-party
+    implementation 'com.journeyapps:zxing-android-embedded:4.3.0@aar'
+    implementation 'com.google.zxing:core:3.4.1'
+    implementation 'org.apache.commons:commons-csv:1.9.0'
+    implementation 'com.jaredrummler:colorpicker:1.1.0'
+    implementation 'com.github.invissvenska:NumberPickerPreference:1.0.4'
+    implementation 'net.lingala.zip4j:zip4j:2.9.1'
+
+// SpotBugs
+    implementation 'io.wcm.tooling.spotbugs:io.wcm.tooling.spotbugs.annotations:1.0.0'
+
+// Testing
+    testImplementation 'androidx.test:core:1.4.0'
+    testImplementation 'junit:junit:4.13.2'
+    testImplementation 'org.robolectric:robolectric:4.7.3'
 }
 
-task findbugs(type: FindBugs, dependsOn: 'assembleDebug') {
+tasks.withType(SpotBugsTask) {
 
-    description 'Run findbugs'
+    description 'Run spotbugs'
     group 'verification'
 
-    classes = fileTree('build/intermediates/javac/debug/compileDebugJavaWithJavac/classes')
-    source = fileTree('src/main/java')
-    classpath = files()
-
-    effort = 'max'
-
-    excludeFilter = file("./config/findbugs/exclude.xml")
+    //classes = fileTree('build/intermediates/javac/debug/compileDebugJavaWithJavac/classes')
+    //source = fileTree('src/main/java')
+    //classpath = files()
 
     reports {
         xml.enabled = false

app/release/output.json

@@ -1 +0,0 @@
-[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":41,"versionName":"1.0","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]

app/src/androidTest/java/protect/card_locker/ApplicationTest.java

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

app/src/main/AndroidManifest.xml

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="protect.card_locker"
-          xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    package="protect.card_locker">
 
-    <uses-permission
-        android:name="android.permission.CAMERA"/>
-    <uses-permission
-        android:name="android.permission.READ_EXTERNAL_STORAGE"/>
-    <uses-permission
-        android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    <uses-sdk tools:overrideLibrary="com.google.zxing.client.android" />
+
+    <uses-permission android:name="android.permission.CAMERA" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
     <uses-feature
         android:name="android.hardware.camera"
@@ -24,74 +24,117 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
         <activity
-            android:name="protect.card_locker.MainActivity"
+            android:name=".MainActivity"
+            android:exported="true"
             android:label="@string/app_name"
-            android:theme="@style/AppTheme.NoActionBar">
+            android:theme="@style/Theme.App.Starting">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
+                <action android:name="android.intent.action.MAIN" />
 
-                <category android:name="android.intent.category.LAUNCHER"/>
+                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        <activity
+            android:name=".AboutActivity"
+            android:label="@string/about"
+            android:theme="@style/AppTheme.NoActionBar" />
         <activity
             android:name=".ManageGroupsActivity"
             android:label="@string/groups"
-            android:theme="@style/AppTheme.NoActionBar">
-        </activity>
+            android:theme="@style/AppTheme.NoActionBar" />
+        <activity
+            android:name=".ManageGroupActivity"
+            android:label="@string/group_edit"
+            android:theme="@style/AppTheme.NoActionBar"/>
         <activity
             android:name=".LoyaltyCardViewActivity"
+            android:exported="true"
             android:theme="@style/AppTheme.NoActionBar"
-            android:label=""
-            android:windowSoftInputMode="stateHidden"
-            android:exported="true"/>
+            android:windowSoftInputMode="stateHidden" />
         <activity
             android:name=".LoyaltyCardEditActivity"
+            android:exported="true"
             android:theme="@style/AppTheme.NoActionBar"
-            android:windowSoftInputMode="stateHidden"
-            android:exported="true">
-            <intent-filter android:label="@string/app_name">
+            android:windowSoftInputMode="stateHidden">
+            <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" />
-                <!-- Accepts URIs that begin with "https://github.com/brarcher/loyalty-card-locker/” -->
-                <data android:scheme="https"
-                    android:host="@string/intent_import_card_from_url_host"
-                    android:pathPrefix="@string/intent_import_card_from_url_path_prefix" />
-                <data android:scheme="https"
-                    android:host="@string/intent_import_card_from_url_host_old"
-                    android:pathPrefix="@string/intent_import_card_from_url_path_prefix_old" />
+                <!-- 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" />
+                <!-- Old card sharing URIs -->
+                <data android:scheme="http" />
+                <data android:scheme="https" />
+                <data
+                    android:host="@string/intent_import_card_from_url_host_thelastproject"
+                    android:pathPrefix="@string/intent_import_card_from_url_path_prefix_thelastproject" />
+                <data
+                    android:host="@string/intent_import_card_from_url_host_brarcher"
+                    android:pathPrefix="@string/intent_import_card_from_url_path_prefix_brarcher" />
             </intent-filter>
         </activity>
+        <activity
+            android:name=".ScanActivity"
+            android:label="@string/scanCardBarcode"
+            android:theme="@style/AppTheme.NoActionBar" />
         <activity
             android:name=".BarcodeSelectorActivity"
             android:label="@string/selectBarcodeTitle"
             android:theme="@style/AppTheme.NoActionBar"
-            android:windowSoftInputMode="stateHidden"/>
+            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"
-            android:theme="@style/AppTheme.NoActionBar"/>
+            android:theme="@style/AppTheme.NoActionBar" />
         <activity
             android:name=".CardShortcutConfigure"
+            android:exported="true"
             android:label="@string/cardShortcut"
             android:theme="@style/AppTheme.NoActionBar">
             <intent-filter>
-                <action android:name="android.intent.action.CREATE_SHORTCUT"/>
-                <category android:name="android.intent.category.DEFAULT"/>
+                <action android:name="android.intent.action.CREATE_SHORTCUT" />
+
+                <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
+
+        <activity
+            android:name="com.yalantis.ucrop.UCropActivity"
+            android:theme="@style/AppTheme.NoActionBar" />
+
         <provider
             android:name="androidx.core.content.FileProvider"
-            android:grantUriPermissions="true"
+            android:authorities="${applicationId}"
             android:exported="false"
-            android:authorities="${applicationId}">
+            android:grantUriPermissions="true">
             <meta-data
                 android:name="android.support.FILE_PROVIDER_PATHS"
-                android:resource="@xml/file_provider_paths"/>
+                android:resource="@xml/file_provider_paths" />
         </provider>
+        <service android:name=".CardsOnPowerScreenService" android:label="@string/app_name"
+            android:permission="android.permission.BIND_CONTROLS" android:exported="true">
+            <intent-filter>
+                <action android:name="android.service.controls.ControlsProviderService" />
+            </intent-filter>
+        </service>
+
     </application>
 
-</manifest>
+</manifest>

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

@@ -0,0 +1,172 @@
+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.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.AlertDialog;
+import androidx.appcompat.widget.Toolbar;
+import androidx.constraintlayout.widget.ConstraintLayout;
+import androidx.core.text.HtmlCompat;
+
+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);
+        ActionBar actionBar = getSupportActionBar();
+        if (actionBar != null) {
+            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"));
+        USED_LIBRARIES.add(new ThirdPartyInfo("NumberPickerPreference", "https://github.com/invissvenska/NumberPickerPreference", "GNU LGPL 3.0"));
+        USED_LIBRARIES.add(new ThirdPartyInfo("Zip4j", "https://github.com/srikanth-lingala/zip4j", "Apache 2.0"));
+        USED_LIBRARIES.add(new ThirdPartyInfo("ZXing", "https://github.com/zxing/zxing", "Apache 2.0"));
+        USED_LIBRARIES.add(new ThirdPartyInfo("ZXing Android Embedded", "https://github.com/journeyapps/zxing-android-embedded", "Apache 2.0"));
+
+        final List<ThirdPartyInfo> USED_ASSETS = new ArrayList<>();
+        USED_ASSETS.add(new ThirdPartyInfo("Android icons", "https://fonts.google.com/icons?selected=Material+Icons", "Apache 2.0"));
+
+        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(")");
+        }
+
+        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(")");
+        }
+
+        String appName = getString(R.string.app_name);
+        int year = Calendar.getInstance().get(Calendar.YEAR);
+
+        String version = "?";
+        try {
+            PackageInfo pi = getPackageManager().getPackageInfo(getPackageName(), 0);
+            version = pi.versionName;
+        } catch (PackageManager.NameNotFoundException e) {
+            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));
+
+        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/CatimaLoyalty/Android/blob/master/LICENSE";
+        } else if (id == R.id.repo) {
+            url = "https://github.com/CatimaLoyalty/Android/";
+        } else if (id == R.id.privacy) {
+            url = "https://catima.app/privacy-policy/";
+        } else if (id == R.id.report_error) {
+            url = "https://github.com/CatimaLoyalty/Android/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,28 +1,34 @@
 package protect.card_locker;
 
+import android.content.Context;
 import android.graphics.Bitmap;
-import android.os.AsyncTask;
+import android.graphics.Color;
+import android.graphics.PorterDuff;
 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
     // squished, whereas 2D barcodes look fine.
     private static final int MAX_WIDTH_1D = 1500;
@@ -30,14 +36,23 @@ class BarcodeImageWriterTask extends AsyncTask<Void, Void, Bitmap>
 
     private final WeakReference<ImageView> imageViewReference;
     private final WeakReference<TextView> textViewReference;
-    private final String cardId;
-    private final BarcodeFormat format;
+    private String cardId;
+    private final CatimaBarcode format;
     private final int imageHeight;
     private final int imageWidth;
+    private final boolean showFallback;
+    private final Runnable callback;
+
+    BarcodeImageWriterTask(
+            Context context, ImageView imageView, String cardIdString,
+            CatimaBarcode barcodeFormat, TextView textView,
+            boolean showFallback, Runnable callback
+    ) {
+        mContext = context;
+
+        isSuccesful = true;
+        this.callback = callback;
 
-    BarcodeImageWriterTask(ImageView imageView, String cardIdString,
-                           BarcodeFormat barcodeFormat, TextView textView)
-    {
         // Use a WeakReference to ensure the ImageView can be garbage collected
         imageViewReference = new WeakReference<>(imageView);
         textViewReference = new WeakReference<>(textView);
@@ -47,29 +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;
     }
 
-    BarcodeImageWriterTask(ImageView imageView, String cardIdString, BarcodeFormat barcodeFormat)
-    {
-        this(imageView, cardIdString, barcodeFormat, null);
-    }
-
-    private int getMaxWidth(BarcodeFormat format)
-    {
-        switch(format)
-        {
+    private int getMaxWidth(CatimaBarcode format) {
+        switch (format.format()) {
             // 2D barcodes
             case AZTEC:
             case DATA_MATRIX:
@@ -96,23 +103,53 @@ class BarcodeImageWriterTask extends AsyncTask<Void, Void, Bitmap>
         }
     }
 
-    public Bitmap doInBackground(Void... params)
-    {
-        if (cardId.isEmpty())
-        {
+    private String getFallbackString(CatimaBarcode format) {
+        switch (format.format()) {
+            // 2D barcodes
+            case AZTEC:
+                return "AZTEC";
+            case DATA_MATRIX:
+                return "DATA_MATRIX";
+            case PDF_417:
+                return "PDF_417";
+            case QR_CODE:
+                return "QR_CODE";
+
+            // 1D barcodes:
+            case CODABAR:
+                return "C0C";
+            case CODE_39:
+                return "CODE_39";
+            case CODE_93:
+                return "CODE_93";
+            case CODE_128:
+                return "CODE_128";
+            case EAN_8:
+                return "32123456";
+            case EAN_13:
+                return "5901234123457";
+            case ITF:
+                return "1003";
+            case UPC_A:
+                return "123456789012";
+            case UPC_E:
+                return "0123456";
+            default:
+                throw new IllegalArgumentException("No fallback known for this barcode type");
+        }
+    }
+
+    private Bitmap generate() {
+        if (cardId.isEmpty()) {
             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.
@@ -127,11 +164,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;
                 }
@@ -151,57 +186,103 @@ 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);
+                    + imageWidth + "x" + imageHeight + ", " + format.name()
+                    + ", length=" + cardId.length(), e);
         }
 
         return null;
     }
 
-    protected void onPostExecute(Bitmap result)
-    {
+    public Bitmap doInBackground(Void... params) {
+        // Only do the hard tasks if we've not already been cancelled
+        if (!Thread.currentThread().isInterrupted()) {
+            Bitmap bitmap = generate();
+
+            if (bitmap == null) {
+                isSuccesful = false;
+
+                if (showFallback && !Thread.currentThread().isInterrupted()) {
+                    Log.i(TAG, "Barcode generation failed, generating fallback...");
+                    cardId = getFallbackString(format);
+                    bitmap = generate();
+                    return bitmap;
+                }
+            } else {
+                return bitmap;
+            }
+        }
+
+        // We've been interrupted - create a empty fallback
+        Bitmap.Config config = Bitmap.Config.ARGB_8888;
+        return Bitmap.createBitmap(imageWidth, imageHeight, config);
+    }
+
+    public void onPostExecute(Object castResult) {
+        Bitmap result = (Bitmap) castResult;
+
         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);
 
+            if (isSuccesful) {
+                imageView.setColorFilter(null);
+            } else {
+                imageView.setColorFilter(Color.LTGRAY, PorterDuff.Mode.LIGHTEN);
+            }
+
             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) {
                 textView.setVisibility(View.GONE);
             }
         }
+
+        if (callback != null) {
+            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,31 +2,22 @@ package protect.card_locker;
 
 import android.app.Activity;
 import android.content.Intent;
-import android.os.AsyncTask;
-import android.os.Build;
 import android.os.Bundle;
-import androidx.appcompat.app.ActionBar;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.widget.Toolbar;
-import android.text.Editable;
-import android.text.TextWatcher;
+import android.os.Handler;
+import android.os.Looper;
 import android.util.Log;
-import android.util.Pair;
 import android.view.MenuItem;
 import android.view.View;
-import android.view.ViewTreeObserver;
 import android.widget.EditText;
-import android.widget.ImageView;
-import android.widget.TextView;
+import android.widget.ListView;
+import android.widget.Toast;
 
-import com.google.common.collect.ImmutableMap;
 import com.google.zxing.BarcodeFormat;
 
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.LinkedList;
-import java.util.Map;
+import java.util.ArrayList;
+
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.widget.Toolbar;
 
 /**
  * This activity is callable and will allow a user to enter
@@ -34,193 +25,89 @@ import java.util.Map;
  * 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 implements BarcodeSelectorAdapter.BarcodeSelectorListener {
     private static final String TAG = "Catima";
 
     // Result this activity will return
     public static final String BARCODE_CONTENTS = "contents";
     public static final String BARCODE_FORMAT = "format";
 
-    // These are all the barcode types that the zxing library
-    // is able to generate a barcode for, and thus should be
-    // the only barcodes which we should attempt to scan.
-    public static final Collection<String> SUPPORTED_BARCODE_TYPES = Collections.unmodifiableList(
-        Arrays.asList(
-                BarcodeFormat.AZTEC.name(),
-                BarcodeFormat.CODE_39.name(),
-                BarcodeFormat.CODE_128.name(),
-                BarcodeFormat.CODABAR.name(),
-                BarcodeFormat.DATA_MATRIX.name(),
-                BarcodeFormat.EAN_8.name(),
-                BarcodeFormat.EAN_13.name(),
-                BarcodeFormat.ITF.name(),
-                BarcodeFormat.PDF_417.name(),
-                BarcodeFormat.QR_CODE.name(),
-                BarcodeFormat.UPC_A.name()
-        ));
+    private final Handler typingDelayHandler = new Handler(Looper.getMainLooper());
+    public static final Integer INPUT_DELAY = 250;
 
-    private Map<String, Pair<Integer, Integer>> barcodeViewMap;
-    private LinkedList<AsyncTask> barcodeGeneratorTasks = new LinkedList<>();
+    private BarcodeSelectorAdapter mAdapter;
 
     @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);
         }
 
-        barcodeViewMap = ImmutableMap.<String, Pair<Integer, Integer>>builder()
-                .put(BarcodeFormat.AZTEC.name(), new Pair<>(R.id.aztecBarcode, R.id.aztecBarcodeText))
-                .put(BarcodeFormat.CODE_39.name(), new Pair<>(R.id.code39Barcode, R.id.code39BarcodeText))
-                .put(BarcodeFormat.CODE_128.name(), new Pair<>(R.id.code128Barcode, R.id.code128BarcodeText))
-                .put(BarcodeFormat.CODABAR.name(), new Pair<>(R.id.codabarBarcode, R.id.codabarBarcodeText))
-                .put(BarcodeFormat.DATA_MATRIX.name(), new Pair<>(R.id.datamatrixBarcode, R.id.datamatrixBarcodeText))
-                .put(BarcodeFormat.EAN_8.name(), new Pair<>(R.id.ean8Barcode, R.id.ean8BarcodeText))
-                .put(BarcodeFormat.EAN_13.name(), new Pair<>(R.id.ean13Barcode, R.id.ean13BarcodeText))
-                .put(BarcodeFormat.ITF.name(), new Pair<>(R.id.itfBarcode, R.id.itfBarcodeText))
-                .put(BarcodeFormat.PDF_417.name(), new Pair<>(R.id.pdf417Barcode, R.id.pdf417BarcodeText))
-                .put(BarcodeFormat.QR_CODE.name(), new Pair<>(R.id.qrcodeBarcode, R.id.qrcodeBarcodeText))
-                .put(BarcodeFormat.UPC_A.name(), new Pair<>(R.id.upcaBarcode, R.id.upcaBarcodeText))
-                .build();
-
         EditText cardId = findViewById(R.id.cardId);
-        cardId.addTextChangedListener(new TextWatcher()
-        {
+        ListView mBarcodeList = findViewById(R.id.barcodes);
+        mAdapter = new BarcodeSelectorAdapter(this, new ArrayList<>(), this);
+        mBarcodeList.setAdapter(mAdapter);
+
+        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);
 
-                // Stop any async tasks which may not have been started yet
-                for(AsyncTask task : barcodeGeneratorTasks)
-                {
-                    task.cancel(false);
-                }
-                barcodeGeneratorTasks.clear();
+                    runOnUiThread(() -> {
+                        generateBarcodes(s.toString());
 
-                // Update barcodes
-                for(String key : barcodeViewMap.keySet())
-                {
-                    ImageView image = findViewById(barcodeViewMap.get(key).first);
-                    TextView text = findViewById(barcodeViewMap.get(key).second);
-                    createBarcodeOption(image, key, s.toString(), text);
-                }
-
-                View noBarcodeButtonView = findViewById(R.id.noBarcode);
-                setButtonListener(noBarcodeButtonView, s.toString());
-                noBarcodeButtonView.setEnabled(s.length() > 0);
-            }
-
-            @Override
-            public void afterTextChanged(Editable s)
-            {
-                // Noting to do
+                        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("");
         }
     }
 
-    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 generateBarcodes(String value) {
+        // Update barcodes
+        ArrayList<CatimaBarcodeWithValue> barcodes = new ArrayList<>();
+        for (BarcodeFormat barcodeFormat : CatimaBarcode.barcodeFormats) {
+            CatimaBarcode catimaBarcode = CatimaBarcode.fromBarcode(barcodeFormat);
+            barcodes.add(new CatimaBarcodeWithValue(catimaBarcode, value));
+        }
+        mAdapter.setBarcodes(barcodes);
     }
 
-    private void createBarcodeOption(final ImageView image, final String formatType, final String cardId, final TextView text)
-    {
-        final BarcodeFormat format = BarcodeFormat.valueOf(formatType);
-        if(format == null)
-        {
-            Log.w(TAG, "Unsupported barcode format: " + formatType);
-            return;
-        }
-
-        image.setImageBitmap(null);
-        image.setOnClickListener(new View.OnClickListener()
-        {
-            @Override
-            public void onClick(View v)
-            {
-                Log.d(TAG, "Selected barcode type " + formatType);
-                Intent result = new Intent();
-                result.putExtra(BARCODE_FORMAT, formatType);
-                result.putExtra(BARCODE_CONTENTS, cardId);
-                BarcodeSelectorActivity.this.setResult(RESULT_OK, result);
-                finish();
-            }
+    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();
         });
-
-        if(image.getHeight() == 0)
-        {
-            // The size of the ImageView is not yet available as it has not
-            // yet been drawn. Wait for it to be drawn so the size is available.
-            image.getViewTreeObserver().addOnGlobalLayoutListener(
-                new ViewTreeObserver.OnGlobalLayoutListener()
-                {
-                    @Override
-                    public void onGlobalLayout()
-                    {
-                        Log.d(TAG, "Global layout finished, type: + " + formatType + ", width: " + image.getWidth());
-                        if (Build.VERSION.SDK_INT < 16)
-                        {
-                            image.getViewTreeObserver().removeGlobalOnLayoutListener(this);
-                        }
-                        else
-                        {
-                            image.getViewTreeObserver().removeOnGlobalLayoutListener(this);
-                        }
-
-                        Log.d(TAG, "Generating barcode for type " + formatType);
-                        BarcodeImageWriterTask task = new BarcodeImageWriterTask(image, cardId, format, text);
-                        barcodeGeneratorTasks.add(task);
-                        task.execute();
-                    }
-                });
-        }
-        else
-        {
-            Log.d(TAG, "Generating barcode for type " + formatType);
-            BarcodeImageWriterTask task = new BarcodeImageWriterTask(image, cardId, format, text);
-            barcodeGeneratorTasks.add(task);
-            task.execute();
-        }
     }
 
     @Override
-    public boolean onOptionsItemSelected(MenuItem item)
-    {
-        if (item.getItemId() == android.R.id.home)
-        {
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == android.R.id.home) {
             setResult(Activity.RESULT_CANCELED);
             finish();
             return true;
@@ -228,4 +115,26 @@ public class BarcodeSelectorActivity extends AppCompatActivity
 
         return super.onOptionsItemSelected(item);
     }
+
+    @Override
+    public void onRowClicked(int inputPosition, View view) {
+        CatimaBarcodeWithValue barcodeWithValue = mAdapter.getItem(inputPosition);
+        CatimaBarcode catimaBarcode = barcodeWithValue.catimaBarcode();
+
+        if (!mAdapter.isValid(view)) {
+            Toast.makeText(this, getString(R.string.wrongValueForBarcodeType), Toast.LENGTH_LONG).show();
+            return;
+        }
+
+        String barcodeFormat = catimaBarcode.format().name();
+        String value = barcodeWithValue.value();
+
+        Log.d(TAG, "Selected barcode type " + barcodeFormat);
+
+        Intent result = new Intent();
+        result.putExtra(BARCODE_FORMAT, barcodeFormat);
+        result.putExtra(BARCODE_CONTENTS, value);
+        BarcodeSelectorActivity.this.setResult(RESULT_OK, result);
+        finish();
+    }
 }

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

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

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

@@ -0,0 +1,23 @@
+package protect.card_locker;
+
+public class BarcodeValues {
+    private final String mFormat;
+    private final String mContent;
+
+    public BarcodeValues(String format, String content) {
+        mFormat = format;
+        mContent = content;
+    }
+
+    public String format() {
+        return mFormat;
+    }
+
+    public String content() {
+        return mContent;
+    }
+
+    public boolean isEmpty() {
+        return mFormat == null && mContent == null;
+    }
+}

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

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

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

@@ -1,83 +1,78 @@
 package protect.card_locker;
 
-import android.content.Intent;
 import android.database.Cursor;
+import android.database.sqlite.SQLiteDatabase;
 import android.os.Bundle;
-import android.os.Parcelable;
+import android.util.Log;
+import android.widget.Toast;
+
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
-import android.util.Log;
-import android.view.View;
-import android.widget.AdapterView;
-import android.widget.ListView;
-import android.widget.Toast;
+import androidx.core.content.pm.ShortcutInfoCompat;
+import androidx.core.content.pm.ShortcutManagerCompat;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 
 /**
  * The configuration screen for creating a shortcut.
  */
-public class CardShortcutConfigure extends AppCompatActivity
-{
+public class CardShortcutConfigure extends AppCompatActivity implements LoyaltyCardCursorAdapter.CardAdapterListener {
     static final String TAG = "Catima";
+    private SQLiteDatabase mDatabase;
 
     @Override
-    public void onCreate(Bundle bundle)
-    {
+    public void onCreate(Bundle bundle) {
         super.onCreate(bundle);
 
+        mDatabase = new DBHelper(this).getReadableDatabase();
+
         // Set the result to CANCELED.  This will cause nothing to happen if the
         // aback button is pressed.
         setResult(RESULT_CANCELED);
 
-        setContentView(R.layout.main_activity);
+        setContentView(R.layout.simple_toolbar_list_activity);
         Toolbar toolbar = findViewById(R.id.toolbar);
-        toolbar.setVisibility(View.GONE);
-
-        final DBHelper db = new DBHelper(this);
+        toolbar.setTitle(R.string.shortcutSelectCard);
 
         // If there are no cards, bail
-        if(db.getLoyaltyCardCount() == 0)
-        {
+        if (DBHelper.getLoyaltyCardCount(mDatabase) == 0) {
             Toast.makeText(this, R.string.noCardsMessage, Toast.LENGTH_LONG).show();
             finish();
         }
 
-        final ListView cardList = findViewById(R.id.list);
-        cardList.setVisibility(View.VISIBLE);
+        final RecyclerView cardList = findViewById(R.id.list);
+        GridLayoutManager layoutManager = (GridLayoutManager) cardList.getLayoutManager();
+        if (layoutManager != null) {
+            layoutManager.setSpanCount(getResources().getInteger(R.integer.main_view_card_columns));
+        }
 
-        Cursor cardCursor = db.getLoyaltyCardCursor();
-
-        final LoyaltyCardCursorAdapter adapter = new LoyaltyCardCursorAdapter(this, cardCursor);
+        Cursor cardCursor = DBHelper.getLoyaltyCardCursor(mDatabase);
+        final LoyaltyCardCursorAdapter adapter = new LoyaltyCardCursorAdapter(this, cardCursor, this);
         cardList.setAdapter(adapter);
+    }
 
-        cardList.setOnItemClickListener(new AdapterView.OnItemClickListener()
-        {
-            @Override
-            public void onItemClick(AdapterView<?> parent, View view, int position, long id)
-            {
-                Cursor selected = (Cursor) parent.getItemAtPosition(position);
-                LoyaltyCard loyaltyCard = LoyaltyCard.toLoyaltyCard(selected);
+    private void onClickAction(int position) {
+        Cursor selected = DBHelper.getLoyaltyCardCursor(mDatabase);
+        selected.moveToPosition(position);
+        LoyaltyCard loyaltyCard = LoyaltyCard.toLoyaltyCard(selected);
 
-                Log.d(TAG, "Creating shortcut for card " + loyaltyCard.store + "," + loyaltyCard.id);
+        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();
 
-                Parcelable icon = Intent.ShortcutIconResource.fromContext(CardShortcutConfigure.this, R.mipmap.ic_launcher);
-                Intent intent = new Intent();
-                intent.putExtra(Intent.EXTRA_SHORTCUT_INTENT, shortcutIntent);
-                intent.putExtra(Intent.EXTRA_SHORTCUT_NAME, loyaltyCard.store);
-                intent.putExtra(Intent.EXTRA_SHORTCUT_ICON_RESOURCE, icon);
-                setResult(RESULT_OK, intent);
+        setResult(RESULT_OK, ShortcutManagerCompat.createShortcutResultIntent(CardShortcutConfigure.this, shortcut));
 
-                finish();
-            }
-        });
+        finish();
+    }
+
+
+    @Override
+    public void onRowClicked(int inputPosition) {
+        onClickAction(inputPosition);
+    }
+
+    @Override
+    public void onRowLongClicked(int inputPosition) {
+        // do nothing
     }
 }

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

@@ -0,0 +1,167 @@
+package protect.card_locker;
+
+import android.annotation.SuppressLint;
+import android.app.PendingIntent;
+import android.content.Context;
+import android.content.Intent;
+import android.database.Cursor;
+import android.database.sqlite.SQLiteDatabase;
+import android.graphics.Bitmap;
+import android.graphics.drawable.Icon;
+import android.os.Build;
+import android.service.controls.Control;
+import android.service.controls.ControlsProviderService;
+import android.service.controls.DeviceTypes;
+import android.service.controls.actions.ControlAction;
+import android.service.controls.templates.StatelessTemplate;
+import android.util.Log;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.RequiresApi;
+
+import java.util.List;
+import java.util.concurrent.Flow;
+import java.util.function.Consumer;
+
+@RequiresApi(Build.VERSION_CODES.R)
+public class CardsOnPowerScreenService extends ControlsProviderService {
+
+    public static final String PREFIX = "catima-";
+    static final String TAG = "Catima";
+    private SQLiteDatabase mDatabase;
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+
+        mDatabase = new DBHelper(this).getReadableDatabase();
+    }
+
+    @NonNull
+    @Override
+    public Flow.Publisher<Control> createPublisherForAllAvailable() {
+        Cursor loyaltyCardCursor = DBHelper.getLoyaltyCardCursor(mDatabase);
+        return subscriber -> {
+            while (loyaltyCardCursor.moveToNext()) {
+                LoyaltyCard card = LoyaltyCard.toLoyaltyCard(loyaltyCardCursor);
+                Intent openIntent = new Intent(this, LoyaltyCardViewActivity.class)
+                        .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                        .putExtra("id", card.id);
+                PendingIntent pendingIntent = PendingIntent.getActivity(getBaseContext(), card.id, openIntent, PendingIntent.FLAG_IMMUTABLE);
+                subscriber.onNext(
+                        new Control.StatelessBuilder(PREFIX + card.id, pendingIntent)
+                                .setControlId(PREFIX + card.id)
+                                .setTitle(card.store)
+                                .setDeviceType(DeviceTypes.TYPE_GENERIC_OPEN_CLOSE)
+                                .setSubtitle(card.note)
+                                .setCustomIcon(Icon.createWithBitmap(getIcon(this, card)))
+                                .build()
+                );
+            }
+            subscriber.onComplete();
+        };
+    }
+
+    @NonNull
+    @Override
+    public Flow.Publisher<Control> createPublisherFor(@NonNull List<String> controlIds) {
+        return subscriber -> {
+            subscriber.onSubscribe(new NoOpSubscription());
+            for (String controlId : controlIds) {
+                Control control;
+
+                try {
+                    Integer cardId = this.controlIdToCardId(controlId);
+                    LoyaltyCard card = DBHelper.getLoyaltyCard(mDatabase, cardId);
+                    Intent openIntent = new Intent(this, LoyaltyCardViewActivity.class)
+                            .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                            .putExtra("id", card.id);
+                    PendingIntent pendingIntent = PendingIntent.getActivity(getBaseContext(), card.id, openIntent, PendingIntent.FLAG_IMMUTABLE);
+                    control = new Control.StatefulBuilder(controlId, pendingIntent)
+                            .setTitle(card.store)
+                            .setDeviceType(DeviceTypes.TYPE_GENERIC_OPEN_CLOSE)
+                            .setSubtitle(card.note)
+                            .setStatus(Control.STATUS_OK)
+                            .setControlTemplate(new StatelessTemplate(controlId))
+                            .setCustomIcon(Icon.createWithBitmap(getIcon(this, card)))
+                            .build();
+                } catch (NullPointerException ignored) {
+                    Intent mainScreenIntent = new Intent(this, MainActivity.class)
+                            .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                    PendingIntent pendingIntent = PendingIntent.getActivity(getBaseContext(), -1, mainScreenIntent, PendingIntent.FLAG_IMMUTABLE);
+                    control = new Control.StatefulBuilder(controlId, pendingIntent)
+                            .setStatus(Control.STATUS_NOT_FOUND)
+                            .build();
+                }
+                Log.d(TAG, "Dispatching widget " + controlId);
+                subscriber.onNext(control);
+            }
+            subscriber.onComplete();
+        };
+    }
+
+    private Bitmap getIcon(Context context, LoyaltyCard loyaltyCard) {
+        Bitmap cardIcon = Utils.retrieveCardImage(context, loyaltyCard.id, ImageLocationType.icon);
+
+        if (cardIcon != null) {
+            return cardIcon;
+        }
+
+        return Utils.generateIcon(this, loyaltyCard.store, loyaltyCard.headerColor).getLetterTile();
+    }
+
+    private Integer controlIdToCardId(String controlId) {
+        if (controlId == null)
+            return null;
+        if (!controlId.startsWith(PREFIX)) {
+            Log.w(TAG, "Unsupported control ID format: " + controlId);
+            return null;
+        }
+        controlId = controlId.substring(PREFIX.length());
+        try {
+            return Integer.parseInt(controlId);
+        } catch (RuntimeException ex) {
+            Log.e(TAG, "Unsupported control ID format. Expected numeric after prefix, found: " + controlId);
+            return null;
+        }
+    }
+
+    @Override
+    public void performControlAction(@NonNull String controlId, @NonNull ControlAction action, @NonNull Consumer<Integer> consumer) {
+        consumer.accept(ControlAction.RESPONSE_OK);
+        Intent openIntent = new Intent(this, LoyaltyCardViewActivity.class)
+                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                .putExtra("id", controlIdToCardId(controlId));
+        startActivity(openIntent);
+
+        closePowerScreenOnAndroid11();
+    }
+
+    @SuppressLint({"MissingPermission", "deprecation"})
+    private void closePowerScreenOnAndroid11() {
+        // Android 12 will auto-close the power screen, but earlier versions won't
+        // Lint complains about this but on Android 11 the permission is not needed
+        // On Android 12, we don't need it, and Google will probably get angry if we ask for it
+        if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.R) {
+            sendBroadcast(new Intent(Intent.ACTION_CLOSE_SYSTEM_DIALOGS));
+        }
+    }
+
+    /**
+     * A no-op subscription.
+     * <p>
+     * Flow.Subscriptions are made to last during time and receive periodic updates.
+     * Our app does not require sending periodic updates of loyalty cards, so we are just ignoring anything in the subscription
+     * Also, our db is quick enough to respond that the Publisher is immediately sending and completing data.
+     * This facility is overkill, but if we don't call onSubscribe the service won't work
+     */
+    private static class NoOpSubscription implements Flow.Subscription {
+        @Override
+        public void request(long l) {
+        }
+
+        @Override
+        public void cancel() {
+        }
+    }
+}

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

@@ -0,0 +1,47 @@
+package protect.card_locker;
+
+import android.content.Context;
+import android.graphics.Color;
+import android.os.Build;
+import android.os.Bundle;
+import android.view.View;
+
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+
+public class CatimaAppCompatActivity extends AppCompatActivity {
+    @Override
+    protected void attachBaseContext(Context base) {
+        // Apply chosen language
+        super.attachBaseContext(Utils.updateBaseContextLocale(base));
+    }
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        // XXX on the splash screen activity, aka the main activity, this has to be executed after applying dynamic colors, not before
+        // so running this only on non main for now
+        if (!this.getClass().getSimpleName().equals(MainActivity.class.getSimpleName())) {
+            Utils.patchOledDarkTheme(this);
+        }
+    }
+
+    @Override
+    protected void onPostCreate(@Nullable Bundle savedInstanceState) {
+        super.onPostCreate(savedInstanceState);
+        // material 3 designer does not consider status bar colors
+        // XXX changing this in onCreate causes issues with the splash screen activity, so doing this here
+        if (Build.VERSION.SDK_INT >= 23) {
+            getWindow().setStatusBarColor(Color.TRANSPARENT);
+            getWindow().getDecorView().setSystemUiVisibility(Utils.isDarkModeEnabled(this) ? 0 : View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
+        } else {
+            // icons are always white back then
+            getWindow().setStatusBarColor(Utils.isDarkModeEnabled(this) ? Color.TRANSPARENT : Color.argb(127, 0, 0, 0));
+        }
+        // XXX android 9 and below has a nasty rendering bug if the theme was patched earlier
+        // the splash screen activity needs the fix regardless to solve a dynamic color api issue
+        if (!this.getClass().getSimpleName().equals(MainActivity.class.getSimpleName())) {
+            Utils.postPatchOledDarkTheme(this);
+        }
+    }
+}

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

@@ -0,0 +1,92 @@
+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_93,
+            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 93",
+            "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/CatimaBarcodeWithValue.java

@@ -0,0 +1,19 @@
+package protect.card_locker;
+
+public class CatimaBarcodeWithValue {
+    private final CatimaBarcode mCatimaBarcode;
+    private final String mValue;
+
+    public CatimaBarcodeWithValue(CatimaBarcode catimaBarcode, String value) {
+        mCatimaBarcode = catimaBarcode;
+        mValue = value;
+    }
+
+    public CatimaBarcode catimaBarcode() {
+        return mCatimaBarcode;
+    }
+
+    public String value() {
+        return mValue;
+    }
+}

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

@@ -0,0 +1,25 @@
+package protect.card_locker;
+
+import android.app.Activity;
+import android.content.Context;
+import android.widget.Toast;
+
+import com.journeyapps.barcodescanner.CaptureManager;
+import com.journeyapps.barcodescanner.DecoratedBarcodeView;
+
+public class CatimaCaptureManager extends CaptureManager {
+    private final Context mContext;
+
+    public CatimaCaptureManager(Activity activity, DecoratedBarcodeView barcodeView) {
+        super(activity, barcodeView);
+
+        mContext = activity.getApplicationContext();
+    }
+
+    @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(mContext, message, Toast.LENGTH_LONG).show();
+    }
+}

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

@@ -1,106 +0,0 @@
-package protect.card_locker;
-
-import android.database.Cursor;
-
-import org.apache.commons.csv.CSVFormat;
-import org.apache.commons.csv.CSVPrinter;
-
-import java.io.IOException;
-import java.io.OutputStreamWriter;
-
-/**
- * Class for exporting the database into CSV (Comma Separate Values)
- * format.
- */
-public class CsvDatabaseExporter implements DatabaseExporter
-{
-    public void exportData(DBHelper db, OutputStreamWriter output) throws IOException, InterruptedException
-    {
-        CSVPrinter printer = new CSVPrinter(output, CSVFormat.RFC4180);
-
-        // Print the version
-        printer.printRecord("2");
-
-        printer.println();
-
-        // Print the header for groups
-        printer.printRecord(DBHelper.LoyaltyCardDbGroups.ID);
-
-        Cursor groupCursor = db.getGroupCursor();
-
-        while(groupCursor.moveToNext())
-        {
-            Group group = Group.toGroup(groupCursor);
-
-            printer.printRecord(group._id);
-
-            if(Thread.currentThread().isInterrupted())
-            {
-                throw new InterruptedException();
-            }
-        }
-
-        groupCursor.close();
-
-        // Print an empty line
-        printer.println();
-
-        // Print the header for cards
-        printer.printRecord(DBHelper.LoyaltyCardDbIds.ID,
-                DBHelper.LoyaltyCardDbIds.STORE,
-                DBHelper.LoyaltyCardDbIds.NOTE,
-                DBHelper.LoyaltyCardDbIds.CARD_ID,
-                DBHelper.LoyaltyCardDbIds.HEADER_COLOR,
-                DBHelper.LoyaltyCardDbIds.BARCODE_TYPE,
-                DBHelper.LoyaltyCardDbIds.STAR_STATUS);
-
-        Cursor cardCursor = db.getLoyaltyCardCursor();
-
-        while(cardCursor.moveToNext())
-        {
-            LoyaltyCard card = LoyaltyCard.toLoyaltyCard(cardCursor);
-
-            printer.printRecord(card.id,
-                    card.store,
-                    card.note,
-                    card.cardId,
-                    card.headerColor,
-                    card.barcodeType,
-                    card.starStatus);
-
-            if(Thread.currentThread().isInterrupted())
-            {
-                throw new InterruptedException();
-            }
-        }
-
-        cardCursor.close();
-
-        // Print an empty line
-        printer.println();
-
-        // Print the header for card group mappings
-        printer.printRecord(DBHelper.LoyaltyCardDbIdsGroups.cardID,
-                DBHelper.LoyaltyCardDbIdsGroups.groupID);
-
-        Cursor cardCursor2 = db.getLoyaltyCardCursor();
-
-        while(cardCursor2.moveToNext())
-        {
-            LoyaltyCard card = LoyaltyCard.toLoyaltyCard(cardCursor2);
-
-            for (Group group : db.getLoyaltyCardGroups(card.id)) {
-                printer.printRecord(card.id, group._id);
-            }
-
-            if(Thread.currentThread().isInterrupted())
-            {
-                throw new InterruptedException();
-            }
-        }
-
-        cardCursor2.close();
-
-        printer.close();
-    }
-}

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

@@ -1,320 +0,0 @@
-package protect.card_locker;
-
-import android.database.sqlite.SQLiteDatabase;
-
-import org.apache.commons.csv.CSVFormat;
-import org.apache.commons.csv.CSVParser;
-import org.apache.commons.csv.CSVRecord;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.StringReader;
-import java.util.List;
-
-/**
- * Class for importing a database from CSV (Comma Separate Values)
- * formatted data.
- *
- * 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 CsvDatabaseImporter implements DatabaseImporter
-{
-    public void importData(DBHelper db, InputStreamReader input) throws IOException, FormatException, InterruptedException
-    {
-        BufferedReader bufferedReader = new BufferedReader(input);
-
-        bufferedReader.mark(100);
-
-        Integer version = 1;
-
-        try {
-            version = Integer.parseInt(bufferedReader.readLine());
-        } catch (NumberFormatException _e) {
-            // Assume version 1
-        }
-
-        bufferedReader.reset();
-
-        switch (version) {
-            case 1:
-                parseV1(db, bufferedReader);
-                break;
-            case 2:
-                parseV2(db, bufferedReader);
-                break;
-            default:
-                throw new FormatException(String.format("No code to parse version %s", version));
-        }
-    }
-
-    public void parseV1(DBHelper db, BufferedReader input) throws IOException, FormatException, InterruptedException
-    {
-        final CSVParser parser = new CSVParser(input, CSVFormat.RFC4180.withHeader());
-
-        SQLiteDatabase database = db.getWritableDatabase();
-        database.beginTransaction();
-
-        try
-        {
-            for (CSVRecord record : parser)
-            {
-                importLoyaltyCard(database, db, record);
-
-                if(Thread.currentThread().isInterrupted())
-                {
-                    throw new InterruptedException();
-                }
-            }
-
-            parser.close();
-            database.setTransactionSuccessful();
-        }
-        catch(IllegalArgumentException|IllegalStateException e)
-        {
-            throw new FormatException("Issue parsing CSV data", e);
-        }
-        finally
-        {
-            database.endTransaction();
-            database.close();
-        }
-    }
-
-    public void parseV2(DBHelper db, BufferedReader input) throws IOException, FormatException, InterruptedException
-    {
-        SQLiteDatabase database = db.getWritableDatabase();
-        database.beginTransaction();
-
-        Integer part = 0;
-        String stringPart = "";
-
-        try {
-            while (true) {
-                String tmp = input.readLine();
-
-                if (tmp == null || tmp.isEmpty()) {
-                    switch (part) {
-                        case 0:
-                            // This is the version info, ignore
-                            break;
-                        case 1:
-                            parseV2Groups(db, database, stringPart);
-                            break;
-                        case 2:
-                            parseV2Cards(db, database, stringPart);
-                            break;
-                        case 3:
-                            parseV2CardGroups(db, database, stringPart);
-                            break;
-                        default:
-                            throw new FormatException("Issue parsing CSV data, too many parts for v2 parsing");
-                    }
-
-                    if (tmp == null) {
-                        break;
-                    }
-
-                    part += 1;
-                    stringPart = "";
-                } else {
-                    stringPart += tmp + "\n";
-                }
-            }
-            database.setTransactionSuccessful();
-        } catch (FormatException e) {
-            throw new FormatException("Issue parsing CSV data", e);
-        } finally {
-            database.endTransaction();
-            database.close();
-        }
-    }
-
-
-    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());
-
-        try {
-            for (CSVRecord record : groupParser) {
-                importGroup(database, db, record);
-
-                if (Thread.currentThread().isInterrupted()) {
-                    throw new InterruptedException();
-                }
-            }
-
-            groupParser.close();
-        } catch (IllegalArgumentException | IllegalStateException e) {
-            throw new FormatException("Issue parsing CSV data", e);
-        }
-    }
-
-    public void parseV2Cards(DBHelper db, SQLiteDatabase database, String data) throws IOException, FormatException, InterruptedException
-    {
-        // Parse cards
-        final CSVParser cardParser = new CSVParser(new StringReader(data), CSVFormat.RFC4180.withHeader());
-
-        try {
-            for (CSVRecord record : cardParser) {
-                importLoyaltyCard(database, db, record);
-
-                if (Thread.currentThread().isInterrupted()) {
-                    throw new InterruptedException();
-                }
-            }
-
-            cardParser.close();
-        } catch (IllegalArgumentException | IllegalStateException e) {
-            throw new FormatException("Issue parsing CSV data", e);
-        }
-    }
-
-    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());
-
-        try {
-            for (CSVRecord record : cardGroupParser) {
-                importCardGroupMapping(database, db, record);
-
-                if (Thread.currentThread().isInterrupted()) {
-                    throw new InterruptedException();
-                }
-            }
-
-            cardGroupParser.close();
-        } catch (IllegalArgumentException | IllegalStateException e) {
-            throw new FormatException("Issue parsing CSV data", e);
-        }
-    }
-
-    /**
-     * Extract a string from the items array. The index into the array
-     * is determined by looking up the index in the fields map using the
-     * "key" as the key. If no such key exists, defaultValue is returned
-     * if it is not null. Otherwise, a FormatException is thrown.
-     */
-    private String extractString(String key, CSVRecord record, String defaultValue)
-            throws FormatException
-    {
-        String toReturn = defaultValue;
-
-        if(record.isMapped(key))
-        {
-            toReturn = record.get(key);
-        }
-        else
-        {
-            if(defaultValue == null)
-            {
-                throw new FormatException("Field not used but expected: " + key);
-            }
-        }
-
-        return toReturn;
-    }
-
-    /**
-     * Extract an integer from the items array. The index into the array
-     * is determined by looking up the index in the fields map using the
-     * "key" as the key. If no such key exists, or the data is not a valid
-     * int, a FormatException is thrown.
-     */
-    private Integer extractInt(String key, CSVRecord record, boolean nullIsOk)
-            throws FormatException
-    {
-        if(record.isMapped(key) == false)
-        {
-            throw new FormatException("Field not used but expected: " + key);
-        }
-
-        String value = record.get(key);
-        if(value.isEmpty() && nullIsOk)
-        {
-            return null;
-        }
-
-        try
-        {
-            return Integer.parseInt(record.get(key));
-        }
-        catch(NumberFormatException e)
-        {
-            throw new FormatException("Failed to parse field: " + key, e);
-        }
-    }
-
-    /**
-     * Import a single loyalty card into the database using the given
-     * session.
-     */
-    private void importLoyaltyCard(SQLiteDatabase database, DBHelper helper, CSVRecord record)
-            throws IOException, FormatException
-    {
-        int id = extractInt(DBHelper.LoyaltyCardDbIds.ID, record, false);
-
-        String store = extractString(DBHelper.LoyaltyCardDbIds.STORE, record, "");
-        if(store.isEmpty())
-        {
-            throw new FormatException("No store listed, but is required");
-        }
-
-        String note = extractString(DBHelper.LoyaltyCardDbIds.NOTE, record, "");
-
-        String cardId = extractString(DBHelper.LoyaltyCardDbIds.CARD_ID, record, "");
-        if(cardId.isEmpty())
-        {
-            throw new FormatException("No card ID listed, but is required");
-        }
-
-        String barcodeType = extractString(DBHelper.LoyaltyCardDbIds.BARCODE_TYPE, record, "");
-
-        Integer headerColor = null;
-
-        if(record.isMapped(DBHelper.LoyaltyCardDbIds.HEADER_COLOR))
-        {
-            headerColor = extractInt(DBHelper.LoyaltyCardDbIds.HEADER_COLOR, record, true);
-        }
-
-        int starStatus = 0;
-        try {
-            starStatus = extractInt(DBHelper.LoyaltyCardDbIds.STAR_STATUS, record, false);
-        } 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, cardId, barcodeType, headerColor, starStatus);
-    }
-
-    /**
-     * Import a single group into the database using the given
-     * session.
-     */
-    private void importGroup(SQLiteDatabase database, DBHelper helper, CSVRecord record)
-            throws IOException, FormatException
-    {
-        String id = extractString(DBHelper.LoyaltyCardDbGroups.ID, record, null);
-
-        helper.insertGroup(database, id);
-    }
-
-    /**
-     * Import a single card to group mapping into the database using the given
-     * session.
-     */
-    private void importCardGroupMapping(SQLiteDatabase database, DBHelper helper, CSVRecord record)
-            throws IOException, FormatException
-    {
-        Integer cardId = extractInt(DBHelper.LoyaltyCardDbIdsGroups.cardID, record, false);
-        String groupId = extractString(DBHelper.LoyaltyCardDbIdsGroups.groupID, record, null);
-
-        List<Group> cardGroups = helper.getLoyaltyCardGroups(cardId);
-        cardGroups.add(helper.getGroup(groupId));
-        helper.setLoyaltyCardGroups(database, cardId, cardGroups);
-    }
-}

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

@@ -1,8 +0,0 @@
-package protect.card_locker;
-
-public enum DataFormat
-{
-    CSV,
-
-    ;
-}

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

@@ -1,17 +0,0 @@
-package protect.card_locker;
-
-import java.io.IOException;
-import java.io.OutputStreamWriter;
-
-/**
- * Interface for a class which can export the contents of the database
- * in a given format.
- */
-public interface DatabaseExporter
-{
-    /**
-     * Export the database to the output stream in a given format.
-     * @throws IOException
-     */
-    void exportData(DBHelper db, OutputStreamWriter output) throws IOException, InterruptedException;
-}

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

@@ -1,19 +0,0 @@
-package protect.card_locker;
-
-import java.io.IOException;
-import java.io.InputStreamReader;
-
-/**
- * Interface for a class which can import the contents of a stream
- * into the database.
- */
-public interface DatabaseImporter
-{
-    /**
-     * Import data from the input stream in a given format into
-     * the database.
-     * @throws IOException
-     * @throws FormatException
-     */
-    void importData(DBHelper db, InputStreamReader input) throws IOException, FormatException, InterruptedException;
-}

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

@@ -5,15 +5,12 @@ package protect.card_locker;
  * encountered with the format of data being
  * imported or exported.
  */
-public class FormatException extends Exception
-{
-    public FormatException(String message)
-    {
+public class FormatException extends Exception {
+    public FormatException(String message) {
         super(message);
     }
 
-    public FormatException(String message, Exception rootCause)
-    {
+    public FormatException(String message, Exception rootCause) {
         super(message, rootCause);
     }
 }

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

@@ -2,19 +2,39 @@ package protect.card_locker;
 
 import android.database.Cursor;
 
-public class Group
-{
-    public final String _id;
+import androidx.annotation.Nullable;
 
-    public Group(final String _id)
-    {
+public class Group {
+    public final String _id;
+    public final int order;
+
+    public Group(final String _id, final int order) {
         this._id = _id;
+        this.order = order;
     }
 
-    public static Group toGroup(Cursor cursor)
-    {
+    public static Group toGroup(Cursor cursor) {
         String _id = cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbGroups.ID));
+        int order = cursor.getInt(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbGroups.ORDER));
 
-        return new Group(_id);
+        return new Group(_id, order);
+    }
+
+    @Override
+    public boolean equals(@Nullable Object obj) {
+        if (obj == null) {
+            return false;
+        }
+        if (!(obj instanceof Group)) {
+            return false;
+        }
+        Group anotherGroup = (Group) obj;
+        return _id.equals(anotherGroup._id) && order == anotherGroup.order;
+    }
+
+    @Override
+    public int hashCode() {
+        String combined = _id + "_" + order;
+        return combined.hashCode();
     }
 }

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

@@ -2,52 +2,84 @@ package protect.card_locker;
 
 import android.content.Context;
 import android.database.Cursor;
+import android.database.sqlite.SQLiteDatabase;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.CursorAdapter;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
+import androidx.appcompat.widget.AppCompatImageButton;
+import androidx.recyclerview.widget.RecyclerView;
 import protect.card_locker.preferences.Settings;
 
-class GroupCursorAdapter extends CursorAdapter
-{
-    Settings settings;
-    DBHelper db;
+public class GroupCursorAdapter extends BaseCursorAdapter<GroupCursorAdapter.GroupListItemViewHolder> {
+    Settings mSettings;
+    private final Context mContext;
+    private final GroupAdapterListener mListener;
+    SQLiteDatabase mDatabase;
 
-    public GroupCursorAdapter(Context context, Cursor cursor)
-    {
-        super(context, cursor, 0);
-        settings = new Settings(context);
+    public GroupCursorAdapter(Context inputContext, Cursor inputCursor, GroupAdapterListener inputListener) {
+        super(inputCursor, DBHelper.LoyaltyCardDbGroups.ORDER);
+        setHasStableIds(true);
+        mSettings = new Settings(inputContext);
+        mContext = inputContext.getApplicationContext();
+        mListener = inputListener;
+        mDatabase = new DBHelper(inputContext).getReadableDatabase();
 
-        db = new DBHelper(context);
+        swapCursor(inputCursor);
     }
 
-    // The newView method is used to inflate a new view and return it,
-    // you don't bind any data to the view at this point.
+    @NonNull
     @Override
-    public View newView(Context context, Cursor cursor, ViewGroup parent)
-    {
-        return LayoutInflater.from(context).inflate(R.layout.group_layout, parent, false);
+    public GroupCursorAdapter.GroupListItemViewHolder onCreateViewHolder(ViewGroup inputParent, int inputViewType) {
+        View itemView = LayoutInflater.from(inputParent.getContext()).inflate(R.layout.group_layout, inputParent, false);
+        return new GroupListItemViewHolder(itemView);
     }
 
-    // The bindView method is used to bind all data to a given view
-    // such as setting the text on a TextView.
-    @Override
-    public void bindView(View view, Context context, Cursor cursor)
-    {
-        // Find fields to populate in inflated template
-        TextView nameField = (TextView) view.findViewById(R.id.name);
-        TextView countField = (TextView) view.findViewById(R.id.cardCount);
+    public void onBindViewHolder(GroupListItemViewHolder inputHolder, Cursor inputCursor) {
+        Group group = Group.toGroup(inputCursor);
 
-        // Extract properties from cursor
-        Group group = Group.toGroup(cursor);
+        inputHolder.mName.setText(group._id);
 
-        // Populate fields with extracted properties
-        nameField.setText(group._id);
-        countField.setText(String.format(context.getString(R.string.groupCardCount), db.getGroupCardCount(group._id)));
+        int groupCardCount = DBHelper.getGroupCardCount(mDatabase, group._id);
+        inputHolder.mCardCount.setText(mContext.getResources().getQuantityString(R.plurals.groupCardCount, groupCardCount, groupCardCount));
 
-        nameField.setTextSize(settings.getCardTitleListFontSize());
-        countField.setTextSize(settings.getCardNoteListFontSize());
+        inputHolder.mName.setTextSize(mSettings.getFontSizeMax(mSettings.getMediumFont()));
+        inputHolder.mCardCount.setTextSize(mSettings.getFontSizeMax(mSettings.getSmallFont()));
+
+        applyClickEvents(inputHolder);
+    }
+
+    private void applyClickEvents(GroupListItemViewHolder inputHolder) {
+        inputHolder.mMoveDown.setOnClickListener(view -> mListener.onMoveDownButtonClicked(inputHolder.itemView));
+        inputHolder.mMoveUp.setOnClickListener(view -> mListener.onMoveUpButtonClicked(inputHolder.itemView));
+        inputHolder.mEdit.setOnClickListener(view -> mListener.onEditButtonClicked(inputHolder.itemView));
+        inputHolder.mDelete.setOnClickListener(view -> mListener.onDeleteButtonClicked(inputHolder.itemView));
+    }
+
+    public interface GroupAdapterListener {
+        void onMoveDownButtonClicked(View view);
+
+        void onMoveUpButtonClicked(View view);
+
+        void onEditButtonClicked(View view);
+
+        void onDeleteButtonClicked(View view);
+    }
+
+    public static class GroupListItemViewHolder extends RecyclerView.ViewHolder {
+        public TextView mName, mCardCount;
+        public AppCompatImageButton mMoveUp, mMoveDown, mEdit, mDelete;
+
+        public GroupListItemViewHolder(View inputView) {
+            super(inputView);
+            mName = inputView.findViewById(R.id.name);
+            mCardCount = inputView.findViewById(R.id.cardCount);
+            mMoveUp = inputView.findViewById(R.id.moveUp);
+            mMoveDown = inputView.findViewById(R.id.moveDown);
+            mEdit = inputView.findViewById(R.id.edit);
+            mDelete = inputView.findViewById(R.id.delete);
+        }
     }
 }

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

@@ -0,0 +1,7 @@
+package protect.card_locker;
+
+public enum ImageLocationType {
+    front,
+    back,
+    icon
+}

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

@@ -2,56 +2,67 @@ package protect.card_locker;
 
 import android.Manifest;
 import android.content.ActivityNotFoundException;
-import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
 import android.net.Uri;
-import android.os.AsyncTask;
 import android.os.Bundle;
-
-import androidx.core.app.ActivityCompat;
-import androidx.core.content.ContextCompat;
-import androidx.appcompat.app.ActionBar;
-import androidx.appcompat.app.AlertDialog;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.widget.Toolbar;
-
+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 androidx.activity.result.ActivityResultLauncher;
+import androidx.activity.result.contract.ActivityResultContracts;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.widget.Toolbar;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
+
 import 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;
 import java.util.List;
 
-public class ImportExportActivity extends AppCompatActivity
-{
+import protect.card_locker.async.TaskHandler;
+import protect.card_locker.importexport.DataFormat;
+import protect.card_locker.importexport.ImportExportResult;
+
+public class ImportExportActivity extends CatimaAppCompatActivity {
     private static final String TAG = "Catima";
 
     private static final int PERMISSIONS_EXTERNAL_STORAGE = 1;
-    private static final int CHOOSE_EXPORT_LOCATION = 2;
-    private static final int CHOOSE_EXPORTED_FILE = 3;
 
     private ImportExportTask importExporter;
 
+    private String importAlertTitle;
+    private String importAlertMessage;
+    private DataFormat importDataFormat;
+    private String exportPassword;
+
+    private ActivityResultLauncher<Intent> fileCreateLauncher;
+    private ActivityResultLauncher<String> fileOpenLauncher;
+    private ActivityResultLauncher<Intent> filePickerLauncher;
+
+    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);
         }
 
@@ -60,126 +71,248 @@ 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);
         }
 
+        // would use ActivityResultContracts.CreateDocument() but mime type cannot be set
+        fileCreateLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), result -> {
+            Intent intent = result.getData();
+            if (intent == null) {
+                Log.e(TAG, "Activity returned NULL data");
+                return;
+            }
+            Uri uri = intent.getData();
+            if (uri == null) {
+                Log.e(TAG, "Activity returned NULL uri");
+                return;
+            }
+            try {
+                OutputStream writer = getContentResolver().openOutputStream(uri);
+                Log.e(TAG, "Starting file export with: " + result.toString());
+                startExport(writer, uri, exportPassword.toCharArray(), true);
+            } catch (IOException e) {
+                Log.e(TAG, "Failed to export file: " + result.toString(), e);
+                onExportComplete(ImportExportResult.GenericFailure, uri);
+            }
+
+        });
+        fileOpenLauncher = registerForActivityResult(new ActivityResultContracts.GetContent(), result -> {
+            if (result == null) {
+                Log.e(TAG, "Activity returned NULL data");
+                return;
+            }
+            openFileForImport(result, null);
+        });
+        filePickerLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), result -> {
+            Intent intent = result.getData();
+            if (intent == null) {
+                Log.e(TAG, "Activity returned NULL data");
+                return;
+            }
+            Uri uri = intent.getData();
+            if (uri == null) {
+                Log.e(TAG, "Activity returned NULL uri");
+                return;
+            }
+            openFileForImport(intent.getData(), null);
+        });
+
         // Check that there is a file manager available
         final Intent intentCreateDocumentAction = new Intent(Intent.ACTION_CREATE_DOCUMENT);
         intentCreateDocumentAction.addCategory(Intent.CATEGORY_OPENABLE);
-        intentCreateDocumentAction.setType("text/csv");
-        intentCreateDocumentAction.putExtra(Intent.EXTRA_TITLE, "Catima.csv");
+        intentCreateDocumentAction.setType("application/zip");
+        intentCreateDocumentAction.putExtra(Intent.EXTRA_TITLE, "catima.zip");
 
         Button exportButton = findViewById(R.id.exportButton);
-        exportButton.setOnClickListener(new View.OnClickListener()
-        {
-            @Override
-            public void onClick(View v)
-            {
-                chooseFileWithIntent(intentCreateDocumentAction, CHOOSE_EXPORT_LOCATION);
-            }
+        exportButton.setOnClickListener(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();
+                try {
+                    fileCreateLauncher.launch(intentCreateDocumentAction);
+                } catch (ActivityNotFoundException e) {
+                    Toast.makeText(getApplicationContext(), R.string.failedOpeningFileManager, Toast.LENGTH_LONG).show();
+                    Log.e(TAG, "No activity found to handle intent", e);
+                }
+            });
+            builder.setNegativeButton(R.string.cancel, (dialogInterface, i) -> dialogInterface.cancel());
+            builder.show();
+
         });
 
         // Check that there is a file manager available
-        final Intent intentGetContentAction = new Intent(Intent.ACTION_GET_CONTENT);
-        intentGetContentAction.addCategory(Intent.CATEGORY_OPENABLE);
-        intentGetContentAction.setType("*/*");
-
         Button importFilesystem = findViewById(R.id.importOptionFilesystemButton);
-        importFilesystem.setOnClickListener(new View.OnClickListener()
-        {
-            @Override
-            public void onClick(View v)
-            {
-                chooseFileWithIntent(intentGetContentAction, CHOOSE_EXPORTED_FILE);
-            }
-        });
-
-        if(isCallable(getApplicationContext(), intentGetContentAction) == false)
-        {
-            findViewById(R.id.dividerImportFilesystem).setVisibility(View.GONE);
-            findViewById(R.id.importOptionFilesystemTitle).setVisibility(View.GONE);
-            findViewById(R.id.importOptionFilesystemExplanation).setVisibility(View.GONE);
-            importFilesystem.setVisibility(View.GONE);
-        }
+        importFilesystem.setOnClickListener(v -> chooseImportType(false));
 
         // Check that there is an app that data can be imported from
-        final Intent intentPickAction = new Intent(Intent.ACTION_PICK);
-
         Button importApplication = findViewById(R.id.importOptionApplicationButton);
-        importApplication.setOnClickListener(new View.OnClickListener()
-        {
-            @Override
-            public void onClick(View v)
-            {
-                chooseFileWithIntent(intentPickAction, CHOOSE_EXPORTED_FILE);
-            }
-        });
+        importApplication.setOnClickListener(v -> chooseImportType(true));
+    }
 
-        if(isCallable(getApplicationContext(), intentPickAction) == false)
-        {
-            findViewById(R.id.dividerImportApplication).setVisibility(View.GONE);
-            findViewById(R.id.importOptionApplicationTitle).setVisibility(View.GONE);
-            findViewById(R.id.importOptionApplicationExplanation).setVisibility(View.GONE);
-            importApplication.setVisibility(View.GONE);
+    private void openFileForImport(Uri uri, char[] password) {
+        try {
+            InputStream reader = getContentResolver().openInputStream(uri);
+            Log.e(TAG, "Starting file import with: " + uri.toString());
+            startImport(reader, uri, importDataFormat, password, true);
+        } catch (IOException e) {
+            Log.e(TAG, "Failed to import file: " + uri.toString(), e);
+            onImportComplete(ImportExportResult.GenericFailure, uri, importDataFormat);
         }
     }
 
-    private void startImport(final InputStream target, final Uri targetUri)
-    {
-        ImportExportTask.TaskCompleteListener listener = new ImportExportTask.TaskCompleteListener()
-        {
-            @Override
-            public void onTaskComplete(boolean success)
-            {
-                onImportComplete(success, targetUri);
-            }
-        };
+    private void chooseImportType(boolean choosePicker) {
+        List<CharSequence> betaImportOptions = new ArrayList<>();
+        betaImportOptions.add("Fidme");
+        betaImportOptions.add("Stocard");
+        List<CharSequence> importOptions = new ArrayList<>();
 
-        importExporter = new ImportExportTask(ImportExportActivity.this,
-                DataFormat.CSV, target, listener);
-        importExporter.execute();
+        for (String importOption : getResources().getStringArray(R.array.import_types_array)) {
+            if (betaImportOptions.contains(importOption)) {
+                importOption = importOption + " (BETA)";
+            }
+
+            importOptions.add(importOption);
+        }
+
+        AlertDialog.Builder builder = new AlertDialog.Builder(this);
+        builder.setTitle(R.string.chooseImportType)
+                .setItems(importOptions.toArray(new CharSequence[importOptions.size()]), (dialog, which) -> {
+                    switch (which) {
+                        // Catima
+                        case 0:
+                            importAlertTitle = getString(R.string.importCatima);
+                            importAlertMessage = getString(R.string.importCatimaMessage);
+                            importDataFormat = DataFormat.Catima;
+                            break;
+                        // Fidme
+                        case 1:
+                            importAlertTitle = getString(R.string.importFidme);
+                            importAlertMessage = getString(R.string.importFidmeMessage);
+                            importDataFormat = DataFormat.Fidme;
+                            break;
+                        // Loyalty Card Keychain
+                        case 2:
+                            importAlertTitle = getString(R.string.importLoyaltyCardKeychain);
+                            importAlertMessage = getString(R.string.importLoyaltyCardKeychainMessage);
+                            importDataFormat = DataFormat.Catima;
+                            break;
+                        // Stocard
+                        case 3:
+                            importAlertTitle = getString(R.string.importStocard);
+                            importAlertMessage = getString(R.string.importStocardMessage);
+                            importDataFormat = DataFormat.Stocard;
+                            break;
+                        // Voucher Vault
+                        case 4:
+                            importAlertTitle = getString(R.string.importVoucherVault);
+                            importAlertMessage = getString(R.string.importVoucherVaultMessage);
+                            importDataFormat = DataFormat.VoucherVault;
+                            break;
+                        default:
+                            throw new IllegalArgumentException("Unknown DataFormat");
+                    }
+
+                    new AlertDialog.Builder(this)
+                            .setTitle(importAlertTitle)
+                            .setMessage(importAlertMessage)
+                            .setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
+                                @Override
+                                public void onClick(DialogInterface dialog, int which) {
+                                    try {
+                                        if (choosePicker) {
+                                            final Intent intentPickAction = new Intent(Intent.ACTION_PICK);
+                                            filePickerLauncher.launch(intentPickAction);
+                                        } else {
+                                            fileOpenLauncher.launch("*/*");
+                                        }
+                                    } catch (ActivityNotFoundException e) {
+                                        Toast.makeText(getApplicationContext(), R.string.failedOpeningFileManager, Toast.LENGTH_LONG).show();
+                                        Log.e(TAG, "No activity found to handle intent", e);
+                                    }
+                                }
+                            })
+                            .setNegativeButton(R.string.cancel, null)
+                            .show();
+                });
+        builder.show();
     }
 
-    private void startExport(final OutputStream target, final Uri targetUri)
-    {
-        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(boolean success)
-            {
-                onExportComplete(success, targetUri);
+            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.CSV, target, listener);
-        importExporter.execute();
+                dataFormat, target, password, listener);
+        mTasks.executeTask(TaskHandler.TYPE.IMPORT, importExporter);
+    }
+
+    private void startExport(final OutputStream target, final Uri targetUri, char[] password, final boolean closeWhenDone) {
+        mTasks.flushTaskList(TaskHandler.TYPE.EXPORT, true, false, false);
+        ImportExportTask.TaskCompleteListener listener = new ImportExportTask.TaskCompleteListener() {
+            @Override
+            public void onTaskComplete(ImportExportResult result, DataFormat dataFormat) {
+                onExportComplete(result, targetUri);
+                if (closeWhenDone) {
+                    try {
+                        target.close();
+                    } catch (IOException ioException) {
+                        ioException.printStackTrace();
+                    }
+                }
+            }
+        };
+
+        importExporter = new ImportExportTask(ImportExportActivity.this,
+                DataFormat.Catima, target, password, listener);
+        mTasks.executeTask(TaskHandler.TYPE.EXPORT, importExporter);
     }
 
     @Override
-    public void onRequestPermissionsResult(int requestCode, String permissions[], int[] grantResults)
-    {
-        if(requestCode == PERMISSIONS_EXTERNAL_STORAGE)
-        {
+    public void onRequestPermissionsResult(int requestCode, String permissions[], int[] grantResults) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+
+        if (requestCode == PERMISSIONS_EXTERNAL_STORAGE) {
             // If request is cancelled, the result arrays are empty.
             boolean success = grantResults.length > 0;
 
-            for(int grant : grantResults)
-            {
-                if(grant != PackageManager.PERMISSION_GRANTED)
-                {
+            for (int grant : grantResults) {
+                if (grant != PackageManager.PERMISSION_GRANTED) {
                     success = false;
                 }
             }
 
-            if(success == false)
-            {
+            if (!success) {
                 // External storage permission rejected, inform user that
                 // import/export is prevented
                 Toast.makeText(getApplicationContext(), R.string.noExternalStoragePermissionError,
@@ -190,22 +323,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;
         }
@@ -213,28 +341,46 @@ public class ImportExportActivity extends AppCompatActivity
         return super.onOptionsItemSelected(item);
     }
 
-    private void onImportComplete(boolean success, Uri path)
-    {
+    private void retryWithPassword(DataFormat dataFormat, Uri uri) {
+        AlertDialog.Builder builder = new AlertDialog.Builder(this);
+        builder.setTitle(R.string.passwordRequired);
+
+        final EditText input = new EditText(this);
+        input.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD);
+        builder.setView(input);
+
+        builder.setPositiveButton(R.string.ok, (dialogInterface, i) -> {
+            openFileForImport(uri, input.getText().toString().toCharArray());
+        });
+        builder.setNegativeButton(R.string.cancel, (dialogInterface, i) -> dialogInterface.cancel());
+
+        builder.show();
+    }
+
+    private void onImportComplete(ImportExportResult result, Uri path, DataFormat dataFormat) {
+        if (result == ImportExportResult.BadPassword) {
+            retryWithPassword(dataFormat, path);
+            return;
+        }
+
         AlertDialog.Builder builder = new AlertDialog.Builder(this);
 
-        if(success)
-        {
+        int messageId;
+
+        if (result == ImportExportResult.Success) {
             builder.setTitle(R.string.importSuccessfulTitle);
-        }
-        else
-        {
+            messageId = R.string.importSuccessful;
+        } else {
             builder.setTitle(R.string.importFailedTitle);
+            messageId = R.string.importFailed;
         }
 
-        int messageId = success ? R.string.importSuccessful : R.string.importFailed;
         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();
             }
         });
@@ -242,158 +388,42 @@ public class ImportExportActivity extends AppCompatActivity
         builder.create().show();
     }
 
-    private void onExportComplete(boolean success, final Uri path)
-    {
+    private void onExportComplete(ImportExportResult result, final Uri path) {
         AlertDialog.Builder builder = new AlertDialog.Builder(this);
 
-        if(success)
-        {
+        int messageId;
+
+        if (result == ImportExportResult.Success) {
             builder.setTitle(R.string.exportSuccessfulTitle);
-        }
-        else
-        {
+            messageId = R.string.exportSuccessful;
+        } else {
             builder.setTitle(R.string.exportFailedTitle);
+            messageId = R.string.exportFailed;
         }
 
-        int messageId = success ? R.string.exportSuccessful : R.string.exportFailed;
         final String message = getResources().getString(messageId);
 
         builder.setMessage(message);
-        builder.setNeutralButton(R.string.ok, new DialogInterface.OnClickListener()
-        {
-            @Override
-            public void onClick(DialogInterface dialog, int which)
-            {
-                dialog.dismiss();
-            }
-        });
+        builder.setNeutralButton(R.string.ok, (dialog, which) -> dialog.dismiss());
 
-        if(success)
-        {
+        if (result == ImportExportResult.Success) {
             final CharSequence sendLabel = ImportExportActivity.this.getResources().getText(R.string.sendLabel);
 
-            builder.setPositiveButton(sendLabel, new DialogInterface.OnClickListener()
-            {
-                @Override
-                public void onClick(DialogInterface dialog, int which)
-                {
-                    Intent sendIntent = new Intent(Intent.ACTION_SEND);
-                    sendIntent.putExtra(Intent.EXTRA_STREAM, path);
-                    sendIntent.setType("text/csv");
+            builder.setPositiveButton(sendLabel, (dialog, which) -> {
+                Intent sendIntent = new Intent(Intent.ACTION_SEND);
+                sendIntent.putExtra(Intent.EXTRA_STREAM, path);
+                sendIntent.setType("text/csv");
 
-                    // set flag to give temporary permission to external app to use the FileProvider
-                    sendIntent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
+                // set flag to give temporary permission to external app to use the FileProvider
+                sendIntent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
 
-                    ImportExportActivity.this.startActivity(Intent.createChooser(sendIntent,
-                            sendLabel));
+                ImportExportActivity.this.startActivity(Intent.createChooser(sendIntent,
+                        sendLabel));
 
-                    dialog.dismiss();
-                }
+                dialog.dismiss();
             });
         }
 
         builder.create().show();
     }
-
-    /**
-     * Determines if there is at least one activity that can perform the given intent
-     */
-    private boolean isCallable(Context context, final Intent intent)
-    {
-        PackageManager manager = context.getPackageManager();
-        if(manager == null)
-        {
-            return false;
-        }
-
-        List<ResolveInfo> list = manager.queryIntentActivities(intent, PackageManager.MATCH_DEFAULT_ONLY);
-
-        for(ResolveInfo info : list)
-        {
-            if(info.activityInfo.exported)
-            {
-                // There is one activity which is available to be called
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    private void chooseFileWithIntent(Intent intent, int requestCode)
-    {
-        try
-        {
-            startActivityForResult(intent, requestCode);
-        }
-        catch (ActivityNotFoundException e)
-        {
-            Log.e(TAG, "No activity found to handle intent", e);
-        }
-    }
-
-    @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data)
-    {
-        super.onActivityResult(requestCode, resultCode, data);
-
-        if (resultCode != RESULT_OK || (requestCode != CHOOSE_EXPORT_LOCATION && requestCode != CHOOSE_EXPORTED_FILE))
-        {
-            Log.w(TAG, "Failed onActivityResult(), result=" + resultCode);
-            return;
-        }
-
-        Uri uri = data.getData();
-        if(uri == null)
-        {
-            Log.e(TAG, "Activity returned a NULL URI");
-            return;
-        }
-
-        try
-        {
-            if (requestCode == CHOOSE_EXPORT_LOCATION)
-            {
-                OutputStream writer;
-                if (uri.getScheme() != null)
-                {
-                    writer = getContentResolver().openOutputStream(uri);
-                }
-                else
-                {
-                    writer = new FileOutputStream(new File(uri.toString()));
-                }
-
-                Log.e(TAG, "Starting file export with: " + uri.toString());
-                startExport(writer, uri);
-            }
-            else
-            {
-                InputStream reader;
-                if(uri.getScheme() != null)
-                {
-                    reader = getContentResolver().openInputStream(uri);
-                }
-                else
-                {
-                    reader = new FileInputStream(new File(uri.toString()));
-                }
-
-                Log.e(TAG, "Starting file export with: " + uri.toString());
-                startImport(reader, uri);
-            }
-        }
-        catch(FileNotFoundException e)
-        {
-            Log.e(TAG, "Failed to import/export file: " + uri.toString(), e);
-            if (requestCode == CHOOSE_EXPORT_LOCATION)
-            {
-                onExportComplete(false, uri);
-            }
-            else
-            {
-                onImportComplete(false, uri);
-            }
-        }
-    }
 }

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

@@ -2,19 +2,24 @@ package protect.card_locker;
 
 import android.app.Activity;
 import android.app.ProgressDialog;
+import android.content.Context;
 import android.content.DialogInterface;
-import android.os.AsyncTask;
+import android.database.sqlite.SQLiteDatabase;
 import android.util.Log;
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
-import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 
-class ImportExportTask extends AsyncTask<Void, Void, Boolean>
-{
+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;
+
+public class ImportExportTask implements CompatCallable<ImportExportResult> {
     private static final String TAG = "Catima";
 
     private Activity activity;
@@ -22,6 +27,7 @@ class ImportExportTask extends AsyncTask<Void, Void, Boolean>
     private DataFormat format;
     private OutputStream outputStream;
     private InputStream inputStream;
+    private char[] password;
     private TaskCompleteListener listener;
 
     private ProgressDialog progress;
@@ -29,63 +35,47 @@ class ImportExportTask extends AsyncTask<Void, Void, Boolean>
     /**
      * 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;
     }
 
     /**
      * Constructor which will setup a task for importing from the given InputStream.
      */
-    ImportExportTask(Activity activity, DataFormat format, InputStream input,
-                            TaskCompleteListener listener)
-    {
+    ImportExportTask(Activity activity, DataFormat format, InputStream input, char[] password,
+                     TaskCompleteListener listener) {
         super();
         this.activity = activity;
         this.doImport = true;
         this.format = format;
         this.inputStream = input;
+        this.password = password;
         this.listener = listener;
     }
 
-    private boolean performImport(InputStream stream, DBHelper db)
-    {
-        boolean result = false;
+    private ImportExportResult performImport(Context context, InputStream stream, SQLiteDatabase database, char[] password) {
+        ImportExportResult importResult = MultiFormatImporter.importData(context, database, stream, format, password);
 
-        try
-        {
-            InputStreamReader reader = new InputStreamReader(stream, Charset.forName("UTF-8"));
-            result = MultiFormatImporter.importData(db, reader, format);
-            reader.close();
-        }
-        catch(IOException e)
-        {
-            Log.e(TAG, "Unable to import file", e);
-        }
+        Log.i(TAG, "Import result: " + importResult.name());
 
-        Log.i(TAG, "Import result: " + result);
-
-        return result;
+        return importResult;
     }
 
-    private boolean performExport(OutputStream stream, DBHelper db)
-    {
-        boolean result = false;
+    private ImportExportResult performExport(Context context, OutputStream stream, SQLiteDatabase database, char[] password) {
+        ImportExportResult result = ImportExportResult.GenericFailure;
 
-        try
-        {
-            OutputStreamWriter writer = new OutputStreamWriter(stream, Charset.forName("UTF-8"));
-            result = MultiFormatExporter.exportData(db, writer, format);
+        try {
+            OutputStreamWriter writer = new OutputStreamWriter(stream, StandardCharsets.UTF_8);
+            result = MultiFormatExporter.exportData(context, database, stream, format, password);
             writer.close();
-        }
-        catch (IOException e)
-        {
+        } catch (IOException e) {
             Log.e(TAG, "Unable to export file", e);
         }
 
@@ -94,56 +84,58 @@ class ImportExportTask extends AsyncTask<Void, Void, Boolean>
         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 Boolean doInBackground(Void... nothing)
-    {
-        final DBHelper db = new DBHelper(activity);
-        boolean result;
+    protected ImportExportResult doInBackground(Void... nothing) {
+        final SQLiteDatabase database = new DBHelper(activity).getWritableDatabase();
+        ImportExportResult result;
 
-        if(doImport)
-        {
-            result = performImport(inputStream, db);
-        }
-        else
-        {
-            result = performExport(outputStream, db);
+        if (doImport) {
+            result = performImport(activity.getApplicationContext(), inputStream, database, password);
+        } else {
+            result = performExport(activity.getApplicationContext(), outputStream, database, password);
         }
 
+        database.close();
+
         return result;
     }
 
-    protected void onPostExecute(Boolean result)
-    {
-        listener.onTaskComplete(result);
+    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
-    {
-        void onTaskComplete(boolean success);
+
+    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

@@ -3,93 +3,201 @@ package protect.card_locker;
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
+
 import java.io.InvalidObjectException;
+import java.io.UnsupportedEncodingException;
+import java.math.BigDecimal;
+import java.net.URLDecoder;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+import java.util.Currency;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
 
 public class ImportURIHelper {
     private static final String STORE = DBHelper.LoyaltyCardDbIds.STORE;
     private static final String NOTE = DBHelper.LoyaltyCardDbIds.NOTE;
+    private static final String EXPIRY = DBHelper.LoyaltyCardDbIds.EXPIRY;
+    private static final String BALANCE = DBHelper.LoyaltyCardDbIds.BALANCE;
+    private static final String BALANCE_TYPE = DBHelper.LoyaltyCardDbIds.BALANCE_TYPE;
     private static final String CARD_ID = DBHelper.LoyaltyCardDbIds.CARD_ID;
+    private static final String BARCODE_ID = DBHelper.LoyaltyCardDbIds.BARCODE_ID;
     private static final String BARCODE_TYPE = DBHelper.LoyaltyCardDbIds.BARCODE_TYPE;
-
     private static final String HEADER_COLOR = DBHelper.LoyaltyCardDbIds.HEADER_COLOR;
 
     private final Context context;
-    private final String host;
-    private final String path;
-    private final String oldHost;
-    private final String oldPath;
+    private final String[] hosts = new String[3];
+    private final String[] paths = new String[3];
     private final String shareText;
+    private final String shareMultipleText;
 
     public ImportURIHelper(Context context) {
-        this.context = context;
-        host = context.getResources().getString(R.string.intent_import_card_from_url_host);
-        path = context.getResources().getString(R.string.intent_import_card_from_url_path_prefix);
-        oldHost = "brarcher.github.io";
-        oldPath = "/loyalty-card-locker/share";
+        this.context = context.getApplicationContext();
+        hosts[0] = context.getResources().getString(R.string.intent_import_card_from_url_host_catima_app);
+        paths[0] = context.getResources().getString(R.string.intent_import_card_from_url_path_prefix_catima_app);
+        hosts[1] = context.getResources().getString(R.string.intent_import_card_from_url_host_thelastproject);
+        paths[1] = context.getResources().getString(R.string.intent_import_card_from_url_path_prefix_thelastproject);
+        hosts[2] = context.getResources().getString(R.string.intent_import_card_from_url_host_brarcher);
+        paths[2] = context.getResources().getString(R.string.intent_import_card_from_url_path_prefix_brarcher);
         shareText = context.getResources().getString(R.string.intent_import_card_from_url_share_text);
+        shareMultipleText = context.getResources().getString(R.string.intent_import_card_from_url_share_multiple_text);
     }
 
     private boolean isImportUri(Uri uri) {
-        return (uri.getHost().equals(host) && uri.getPath().equals(path)) || (uri.getHost().equals(oldHost) && uri.getPath().equals(oldPath));
+        for (int i = 0; i < hosts.length; i++) {
+            if (uri.getHost().equals(hosts[i]) && uri.getPath().equals(paths[i])) {
+                return true;
+            }
+        }
+
+        return false;
     }
 
     public LoyaltyCard parse(Uri uri) throws InvalidObjectException {
-        if(!isImportUri(uri)) {
+        if (!isImportUri(uri)) {
             throw new InvalidObjectException("Not an import URI");
         }
 
         try {
             // These values are allowed to be null
+            CatimaBarcode barcodeType = null;
+            Date expiry = null;
+            BigDecimal balance = new BigDecimal("0");
+            Currency balanceType = null;
             Integer headerColor = null;
-            Integer headerTextColor = null;
 
-            String store = uri.getQueryParameter(STORE);
-            String note = uri.getQueryParameter(NOTE);
-            String cardId = uri.getQueryParameter(CARD_ID);
-            String barcodeType = uri.getQueryParameter(BARCODE_TYPE);
-            if (store == null || note == null || cardId == null || barcodeType == null) throw new InvalidObjectException("Not a valid import URI");
+            // Store everything in a simple key/value hashmap
+            HashMap<String, String> kv = new HashMap<>();
 
-            String unparsedHeaderColor = uri.getQueryParameter(HEADER_COLOR);
-            if(unparsedHeaderColor != null)
-            {
+            // First, grab all query parameters (backwards compatibility)
+            for (String key : uri.getQueryParameterNames()) {
+                kv.put(key, uri.getQueryParameter(key));
+            }
+
+            // Then, parse the new and more private fragment part
+            // Overriding old format entries if they exist
+            String fragment = uri.getFragment();
+            if (fragment != null) {
+                for (String fragmentPart : fragment.split("&")) {
+                    String[] fragmentData = fragmentPart.split("=", 2);
+                    kv.put(fragmentData[0], URLDecoder.decode(fragmentData[1], StandardCharsets.UTF_8.name()));
+                }
+            }
+
+            // Then use all values we care about
+            String store = kv.get(STORE);
+            String note = kv.get(NOTE);
+            String cardId = kv.get(CARD_ID);
+            String barcodeId = kv.get(BARCODE_ID);
+            if (store == null || note == null || cardId == null)
+                throw new InvalidObjectException("Not a valid import URI: " + uri.toString());
+
+            String unparsedBarcodeType = kv.get(BARCODE_TYPE);
+            if (unparsedBarcodeType != null && !unparsedBarcodeType.equals("")) {
+                barcodeType = CatimaBarcode.fromName(unparsedBarcodeType);
+            }
+
+            String unparsedBalance = kv.get(BALANCE);
+            if (unparsedBalance != null && !unparsedBalance.equals("")) {
+                balance = new BigDecimal(unparsedBalance);
+            }
+            String unparsedBalanceType = kv.get(BALANCE_TYPE);
+            if (unparsedBalanceType != null && !unparsedBalanceType.equals("")) {
+                balanceType = Currency.getInstance(unparsedBalanceType);
+            }
+            String unparsedExpiry = kv.get(EXPIRY);
+            if (unparsedExpiry != null && !unparsedExpiry.equals("")) {
+                expiry = new Date(Long.parseLong(unparsedExpiry));
+            }
+
+            String unparsedHeaderColor = kv.get(HEADER_COLOR);
+            if (unparsedHeaderColor != null) {
                 headerColor = Integer.parseInt(unparsedHeaderColor);
             }
 
-            return new LoyaltyCard(-1, store, note, cardId, barcodeType, headerColor, headerTextColor, 0);
-        } catch (NullPointerException | NumberFormatException ex) {
+            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");
         }
     }
 
+    private StringBuilder appendFragment(StringBuilder fragment, String key, String value) throws UnsupportedEncodingException {
+        if (fragment.length() > 0) {
+            fragment.append("&");
+        }
+
+        // Double-encode the value to make sure it can't accidentally contain symbols that'll break the parser
+        fragment.append(key).append("=").append(URLEncoder.encode(value, StandardCharsets.UTF_8.name()));
+
+        return fragment;
+    }
+
     // Protected for usage in tests
-    protected Uri toUri(LoyaltyCard loyaltyCard) {
+    protected Uri toUri(LoyaltyCard loyaltyCard) throws UnsupportedEncodingException {
         Uri.Builder uriBuilder = new Uri.Builder();
         uriBuilder.scheme("https");
-        uriBuilder.authority(host);
-        uriBuilder.path(path);
-        uriBuilder.appendQueryParameter(STORE, loyaltyCard.store);
-        uriBuilder.appendQueryParameter(NOTE, loyaltyCard.note);
-        uriBuilder.appendQueryParameter(CARD_ID, loyaltyCard.cardId);
-        uriBuilder.appendQueryParameter(BARCODE_TYPE, loyaltyCard.barcodeType);
-        if(loyaltyCard.headerColor != null)
-        {
-            uriBuilder.appendQueryParameter(HEADER_COLOR, loyaltyCard.headerColor.toString());
+        uriBuilder.authority(hosts[0]);
+        uriBuilder.path(paths[0]);
+
+        // Use fragment instead of QueryParameter to not leak this data to the server
+        StringBuilder fragment = new StringBuilder();
+
+        fragment = appendFragment(fragment, STORE, loyaltyCard.store);
+        fragment = appendFragment(fragment, NOTE, loyaltyCard.note);
+        fragment = appendFragment(fragment, BALANCE, loyaltyCard.balance.toString());
+        if (loyaltyCard.balanceType != null) {
+            fragment = appendFragment(fragment, BALANCE_TYPE, loyaltyCard.balanceType.getCurrencyCode());
         }
-        //StarStatus will not be exported
+        if (loyaltyCard.expiry != null) {
+            fragment = appendFragment(fragment, EXPIRY, String.valueOf(loyaltyCard.expiry.getTime()));
+        }
+        fragment = appendFragment(fragment, CARD_ID, loyaltyCard.cardId);
+        if (loyaltyCard.barcodeId != null) {
+            fragment = appendFragment(fragment, BARCODE_ID, loyaltyCard.barcodeId);
+        }
+
+        if (loyaltyCard.barcodeType != null) {
+            fragment = appendFragment(fragment, BARCODE_TYPE, loyaltyCard.barcodeType.name());
+        }
+        if (loyaltyCard.headerColor != null) {
+            fragment = appendFragment(fragment, HEADER_COLOR, loyaltyCard.headerColor.toString());
+        }
+        // Star status will not be exported
+        // Front and back pictures are often too big to fit into a message in base64 nicely, not sharing either...
+
+        uriBuilder.fragment(fragment.toString());
         return uriBuilder.build();
     }
 
-    private void startShareIntent(Uri uri) {
+    public void startShareIntent(List<LoyaltyCard> loyaltyCards) throws UnsupportedEncodingException {
+        int loyaltyCardCount = loyaltyCards.size();
+
+        StringBuilder text = new StringBuilder();
+        if (loyaltyCardCount == 1) {
+            text.append(shareText);
+        } else {
+            text.append(shareMultipleText);
+        }
+        text.append("\n\n");
+
+        for (int i = 0; i < loyaltyCardCount; i++) {
+            LoyaltyCard loyaltyCard = loyaltyCards.get(i);
+
+            text.append(loyaltyCard.store + ": " + toUri(loyaltyCard));
+
+            if (i < (loyaltyCardCount - 1)) {
+                text.append("\n\n");
+            }
+        }
+
         Intent sendIntent = new Intent();
         sendIntent.setAction(Intent.ACTION_SEND);
-        sendIntent.putExtra(Intent.EXTRA_TEXT, shareText + "\n" + uri.toString());
+        sendIntent.putExtra(Intent.EXTRA_TEXT, text.toString());
         sendIntent.setType("text/plain");
 
         Intent shareIntent = Intent.createChooser(sendIntent, null);
+        shareIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         context.startActivity(shareIntent);
     }
-
-    public void startShareIntent(LoyaltyCard loyaltyCard) {
-        startShareIntent(toUri(loyaltyCard));
-    }
 }

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

@@ -18,8 +18,7 @@ import android.text.TextPaint;
  * alphabet or digit, if there is no letter or digit available, a default image
  * is shown instead.
  */
-class LetterBitmap
-{
+class LetterBitmap {
 
     /**
      * The number of available tile colors
@@ -37,39 +36,32 @@ class LetterBitmap
     /**
      * Constructor for <code>LetterTileProvider</code>
      *
-     * @param context The {@link Context} to use
-     * @param displayName The name used to create the letter for the tile
-     * @param key         The key used to generate the background color for the tile
+     * @param context            The {@link Context} to use
+     * @param displayName        The name used to create the letter for the tile
+     * @param key                The key used to generate the background color for the tile
      * @param tileLetterFontSize The font size used to display the letter
-     * @param width       The desired width of the tile
-     * @param height      The desired height of the tile
-     * @param backgroundColor  (optional) color to use for background.
-     * @param textColor  (optional) color to use for text.
+     * @param width              The desired width of the tile
+     * @param height             The desired height of the tile
+     * @param backgroundColor    (optional) color to use for background.
+     * @param textColor          (optional) color to use for text.
      */
     public LetterBitmap(Context context, String displayName, String key, int tileLetterFontSize,
-                        int width, int height, Integer backgroundColor, Integer textColor)
-    {
+                        int width, int height, Integer backgroundColor, Integer textColor) {
         TextPaint paint = new TextPaint();
         paint.setTypeface(Typeface.create("sans-serif-light", Typeface.BOLD));
 
-        if(textColor != null)
-        {
+        if (textColor != null) {
             paint.setColor(textColor);
-        }
-        else
-        {
+        } else {
             paint.setColor(Color.WHITE);
         }
 
         paint.setTextAlign(Paint.Align.CENTER);
         paint.setAntiAlias(true);
 
-        if(backgroundColor == null)
-        {
+        if (backgroundColor == null) {
             mColor = getDefaultColor(context, key);
-        }
-        else
-        {
+        } else {
             mColor = backgroundColor;
         }
 
@@ -80,7 +72,7 @@ class LetterBitmap
         c.setBitmap(mBitmap);
         c.drawColor(mColor);
 
-        char [] firstCharArray = new char[1];
+        char[] firstCharArray = new char[1];
         firstCharArray[0] = firstChar.toUpperCase().charAt(0);
         paint.setTextSize(tileLetterFontSize);
 
@@ -97,16 +89,14 @@ class LetterBitmap
      * alphabet or digit, if there is no letter or digit available, a
      * default image is shown instead
      */
-    public Bitmap getLetterTile()
-    {
+    public Bitmap getLetterTile() {
         return mBitmap;
     }
 
     /**
      * @return background color used for letter title.
      */
-    public int getBackgroundColor()
-    {
+    public int getBackgroundColor() {
         return mColor;
     }
 
@@ -115,8 +105,7 @@ class LetterBitmap
      * @return A new or previously chosen color for <code>key</code> used as the
      * tile background color
      */
-    private static int pickColor(String key, TypedArray colors)
-    {
+    private static int pickColor(String key, TypedArray colors) {
         // String.hashCode() is not supposed to change across java versions, so
         // this should guarantee the same key always maps to the same color
         final int color = Math.abs(key.hashCode()) % NUM_OF_TILE_COLORS;
@@ -127,8 +116,7 @@ class LetterBitmap
      * Determine the color which the letter tile will use if no default
      * color is provided.
      */
-    public static int getDefaultColor(Context context, String key)
-    {
+    public static int getDefaultColor(Context context, String key) {
         final Resources res = context.getResources();
 
         TypedArray colors = res.obtainTypedArray(R.array.letter_tile_colors);

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

@@ -1,65 +1,146 @@
 package protect.card_locker;
 
 import android.database.Cursor;
+import android.os.Parcel;
+import android.os.Parcelable;
+
+import java.math.BigDecimal;
+import java.util.Currency;
+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;
+    public final Date expiry;
+    public final BigDecimal balance;
+    public final Currency balanceType;
     public final String cardId;
-    public final String barcodeType;
+
+    @Nullable
+    public final String barcodeId;
+
+    @Nullable
+    public final CatimaBarcode barcodeType;
 
     @Nullable
     public final Integer headerColor;
 
-    @Nullable
-    public final Integer headerTextColor;
-
     public final int starStatus;
+    public final long lastUsed;
+    public int zoomLevel;
 
-    public LoyaltyCard(final int id, final String store, final String note, final String cardId,
-                       final String barcodeType, final Integer headerColor, final Integer headerTextColor,
-                       final int starStatus)
-    {
+    public LoyaltyCard(final int id, final String store, final String note, final Date expiry,
+                       final BigDecimal balance, final Currency balanceType, final String cardId,
+                       @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;
         this.note = note;
+        this.expiry = expiry;
+        this.balance = balance;
+        this.balanceType = balanceType;
         this.cardId = cardId;
+        this.barcodeId = barcodeId;
         this.barcodeType = barcodeType;
         this.headerColor = headerColor;
-        this.headerTextColor = headerTextColor;
         this.starStatus = starStatus;
+        this.lastUsed = lastUsed;
+        this.zoomLevel = zoomLevel;
     }
 
-    public static LoyaltyCard toLoyaltyCard(Cursor cursor)
-    {
+    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) {
         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));
+        long expiryLong = cursor.getLong(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.EXPIRY));
+        BigDecimal balance = new BigDecimal(cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.BALANCE)));
         String cardId = cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.CARD_ID));
-        String barcodeType = cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.BARCODE_TYPE));
+        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);
-        int headerTextColorColumn = cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.HEADER_TEXT_COLOR);
 
+        CatimaBarcode barcodeType = null;
+        Currency balanceType = null;
+        Date expiry = null;
         Integer headerColor = null;
-        Integer headerTextColor = null;
 
-        if(cursor.isNull(headerColorColumn) == false)
-        {
+        if (cursor.isNull(barcodeTypeColumn) == false) {
+            barcodeType = CatimaBarcode.fromName(cursor.getString(barcodeTypeColumn));
+        }
+
+        if (cursor.isNull(balanceTypeColumn) == false) {
+            balanceType = Currency.getInstance(cursor.getString(balanceTypeColumn));
+        }
+
+        if (expiryLong > 0) {
+            expiry = new Date(expiryLong);
+        }
+
+        if (cursor.isNull(headerColorColumn) == false) {
             headerColor = cursor.getInt(headerColorColumn);
         }
 
-        if(cursor.isNull(headerTextColorColumn) == false)
-        {
-            headerTextColor = cursor.getInt(headerTextColorColumn);
+        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);
         }
 
-        return new LoyaltyCard(id, store, note, cardId, barcodeType, headerColor, headerTextColor, starred);
-    }
+        @Override
+        public LoyaltyCard[] newArray(int size) {
+            return new LoyaltyCard[size];
+        }
+    };
 }

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

@@ -1,76 +1,346 @@
 package protect.card_locker;
 
 import android.content.Context;
+import android.content.res.Resources;
 import android.database.Cursor;
+import android.graphics.Bitmap;
 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;
 import android.view.ViewGroup;
-import android.widget.CursorAdapter;
 import android.widget.ImageView;
 import android.widget.TextView;
+
+import androidx.constraintlayout.widget.ConstraintLayout;
+import androidx.core.content.ContextCompat;
+import androidx.core.graphics.BlendModeColorFilterCompat;
+import androidx.core.graphics.BlendModeCompat;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.google.android.material.card.MaterialCardView;
+
+import java.math.BigDecimal;
+import java.text.DateFormat;
+import java.util.ArrayList;
+import java.util.Currency;
+import java.util.Date;
+
 import protect.card_locker.preferences.Settings;
 
-class LoyaltyCardCursorAdapter extends CursorAdapter
-{
-    Settings settings;
-    boolean darkModeEnabled;
+public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCursorAdapter.LoyaltyCardListItemViewHolder> {
+    private int mCurrentSelectedIndex = -1;
+    Settings mSettings;
+    boolean mDarkModeEnabled;
+    private final Context mContext;
+    private final CardAdapterListener mListener;
+    protected SparseBooleanArray mSelectedItems;
+    protected SparseBooleanArray mAnimationItemsIndex;
+    private boolean mReverseAllAnimations = false;
+    private boolean mShowDetails = true;
 
-    public LoyaltyCardCursorAdapter(Context context, Cursor cursor)
-    {
-        super(context, cursor, 0);
-        settings = new Settings(context);
-        darkModeEnabled= MainActivity.isDarkModeEnabled(context);
+    public LoyaltyCardCursorAdapter(Context inputContext, Cursor inputCursor, CardAdapterListener inputListener) {
+        super(inputCursor, DBHelper.LoyaltyCardDbIds.ID);
+        setHasStableIds(true);
+        mSettings = new Settings(inputContext);
+        mContext = inputContext.getApplicationContext();
+        mListener = inputListener;
+        mSelectedItems = new SparseBooleanArray();
+        mAnimationItemsIndex = new SparseBooleanArray();
 
+        mDarkModeEnabled = Utils.isDarkModeEnabled(inputContext);
+
+        swapCursor(inputCursor);
     }
 
-    // The newView method is used to inflate a new view and return it,
-    // you don't bind any data to the view at this point.
-    @Override
-    public View newView(Context context, Cursor cursor, ViewGroup parent)
-    {
-        return LayoutInflater.from(context).inflate(R.layout.loyalty_card_layout, parent, false);
+    public void showDetails(boolean show) {
+        mShowDetails = show;
+        notifyDataSetChanged();
+    }
+
+    public boolean showingDetails() {
+        return mShowDetails;
     }
 
-    // The bindView method is used to bind all data to a given view
-    // such as setting the text on a TextView.
     @Override
-    public void bindView(View view, Context context, Cursor cursor)
-    {
-        // Find fields to populate in inflated template
-        ImageView thumbnail = view.findViewById(R.id.thumbnail);
-        TextView storeField = view.findViewById(R.id.store);
-        TextView noteField = view.findViewById(R.id.note);
-        ImageView star = view.findViewById(R.id.star);
+    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, mListener);
+    }
 
-        if(darkModeEnabled)
-        {
-            star.setColorFilter(Color.WHITE, PorterDuff.Mode.SRC_ATOP);
+    public LoyaltyCard getCard(int position) {
+        mCursor.moveToPosition(position);
+        return LoyaltyCard.toLoyaltyCard(mCursor);
+    }
+
+    public void onBindViewHolder(LoyaltyCardListItemViewHolder inputHolder, Cursor inputCursor) {
+        // Invisible until we want to show something more
+        inputHolder.mDivider.setVisibility(View.GONE);
+
+        LoyaltyCard loyaltyCard = LoyaltyCard.toLoyaltyCard(inputCursor);
+
+        inputHolder.setStoreField(loyaltyCard.store);
+        if (mShowDetails && !loyaltyCard.note.isEmpty()) {
+            inputHolder.setNoteField(loyaltyCard.note);
+        } else {
+            inputHolder.setNoteField(null);
         }
 
-        // Extract properties from cursor
-        LoyaltyCard loyaltyCard = LoyaltyCard.toLoyaltyCard(cursor);
-
-        // Populate fields with extracted properties
-        storeField.setText(loyaltyCard.store);
-
-        storeField.setTextSize(settings.getCardTitleListFontSize());
-
-        if(!loyaltyCard.note.isEmpty())
-        {
-            noteField.setVisibility(View.VISIBLE);
-            noteField.setText(loyaltyCard.note);
-            noteField.setTextSize(settings.getCardNoteListFontSize());
-        }
-        else
-        {
-            noteField.setVisibility(View.GONE);
+        if (mShowDetails && !loyaltyCard.balance.equals(new BigDecimal("0"))) {
+            inputHolder.setBalanceField(loyaltyCard.balance, loyaltyCard.balanceType);
+        } else {
+            inputHolder.setBalanceField(null, null);
         }
 
-        if (loyaltyCard.starStatus!=0) star.setVisibility(View.VISIBLE);
-            else star.setVisibility(View.GONE);
+        if (mShowDetails && loyaltyCard.expiry != null) {
+            inputHolder.setExpiryField(loyaltyCard.expiry);
+        } else {
+            inputHolder.setExpiryField(null);
+        }
 
-        thumbnail.setImageBitmap(Utils.generateIcon(context, loyaltyCard.store, loyaltyCard.headerColor).getLetterTile());
+        setHeaderHeight(inputHolder, mShowDetails);
+        Bitmap cardIcon = Utils.retrieveCardImage(mContext, loyaltyCard.id, ImageLocationType.icon);
+        if (cardIcon != null) {
+            inputHolder.mCardIcon.setImageBitmap(cardIcon);
+            inputHolder.mCardIcon.setScaleType(ImageView.ScaleType.CENTER_CROP);
+        } else {
+            inputHolder.mCardIcon.setImageBitmap(Utils.generateIcon(mContext, loyaltyCard.store, loyaltyCard.headerColor).getLetterTile());
+            inputHolder.mCardIcon.setScaleType(ImageView.ScaleType.FIT_CENTER);
+        }
+        inputHolder.setIconBackgroundColor(loyaltyCard.headerColor != null ? loyaltyCard.headerColor : R.attr.colorPrimary);
+
+        inputHolder.toggleStar(loyaltyCard.starStatus != 0, itemSelected(inputCursor.getPosition()));
+
+        inputHolder.itemView.setActivated(mSelectedItems.get(inputCursor.getPosition(), false));
+        applyIconAnimation(inputHolder, inputCursor.getPosition());
+        applyClickEvents(inputHolder, inputCursor.getPosition());
+
+        // Force redraw to fix size not shrinking after data change
+        inputHolder.mRow.requestLayout();
+    }
+
+    private void setHeaderHeight(LoyaltyCardListItemViewHolder inputHolder, boolean expanded) {
+        int iconHeight;
+        if (expanded) {
+            iconHeight = ViewGroup.LayoutParams.MATCH_PARENT;
+        } else {
+            iconHeight = (int) mContext.getResources().getDimension(R.dimen.cardThumbnailSize);
+        }
+
+        inputHolder.mIconLayout.getLayoutParams().height = expanded ? 0 : iconHeight;
+        inputHolder.mCardIcon.getLayoutParams().height = iconHeight;
+        inputHolder.mTickIcon.getLayoutParams().height = iconHeight;
+    }
+
+    private void applyClickEvents(LoyaltyCardListItemViewHolder inputHolder, final int inputPosition) {
+        inputHolder.mRow.setOnClickListener(inputView -> mListener.onRowClicked(inputPosition));
+
+        inputHolder.mRow.setOnLongClickListener(inputView -> {
+            mListener.onRowLongClicked(inputPosition);
+            inputView.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS);
+            return true;
+        });
+    }
+
+    private boolean itemSelected(int inputPosition) {
+        return mSelectedItems.get(inputPosition, false);
+    }
+
+    private void applyIconAnimation(LoyaltyCardListItemViewHolder inputHolder, int inputPosition) {
+        if (itemSelected(inputPosition)) {
+            inputHolder.mCardIcon.setVisibility(View.GONE);
+            inputHolder.mTickIcon.setVisibility(View.VISIBLE);
+            if (mCurrentSelectedIndex == inputPosition) {
+                resetCurrentIndex();
+            }
+        } else {
+            inputHolder.mTickIcon.setVisibility(View.GONE);
+            inputHolder.mCardIcon.setVisibility(View.VISIBLE);
+            if ((mReverseAllAnimations && mAnimationItemsIndex.get(inputPosition, false)) || mCurrentSelectedIndex == inputPosition) {
+                resetCurrentIndex();
+            }
+        }
+    }
+
+    public void toggleSelection(int inputPosition) {
+        mCurrentSelectedIndex = inputPosition;
+        if (mSelectedItems.get(inputPosition, false)) {
+            mSelectedItems.delete(inputPosition);
+            mAnimationItemsIndex.delete(inputPosition);
+        } else {
+            mSelectedItems.put(inputPosition, true);
+            mAnimationItemsIndex.put(inputPosition, true);
+        }
+        notifyDataSetChanged();
+    }
+
+    public void clearSelections() {
+        mReverseAllAnimations = true;
+        mSelectedItems.clear();
+        notifyDataSetChanged();
+    }
+
+    public int getSelectedItemCount() {
+        return mSelectedItems.size();
+    }
+
+    public ArrayList<LoyaltyCard> getSelectedItems() {
+
+        ArrayList<LoyaltyCard> result = new ArrayList<>();
+
+        int i;
+        for (i = 0; i < mSelectedItems.size(); i++) {
+            mCursor.moveToPosition(mSelectedItems.keyAt(i));
+            result.add(LoyaltyCard.toLoyaltyCard(mCursor));
+        }
+
+        return result;
+    }
+
+    private void resetCurrentIndex() {
+        mCurrentSelectedIndex = -1;
+    }
+
+    public interface CardAdapterListener {
+        void onRowClicked(int inputPosition);
+
+        void onRowLongClicked(int inputPosition);
+    }
+
+    public class LoyaltyCardListItemViewHolder extends RecyclerView.ViewHolder {
+
+        public TextView mStoreField, mNoteField, mBalanceField, mExpiryField;
+        public ImageView mCardIcon, mStarBackground, mStarBorder, mTickIcon;
+        public MaterialCardView mRow, mIconLayout;
+        public ConstraintLayout mStar;
+        public View mDivider;
+
+        private int mIconBackgroundColor;
+
+        protected LoyaltyCardListItemViewHolder(View inputView, CardAdapterListener inputListener) {
+            super(inputView);
+            mRow = inputView.findViewById(R.id.row);
+            mDivider = inputView.findViewById(R.id.info_divider);
+            mStoreField = inputView.findViewById(R.id.store);
+            mNoteField = inputView.findViewById(R.id.note);
+            mBalanceField = inputView.findViewById(R.id.balance);
+            mExpiryField = inputView.findViewById(R.id.expiry);
+
+            mIconLayout = inputView.findViewById(R.id.icon_layout);
+            mCardIcon = inputView.findViewById(R.id.thumbnail);
+            mStar = inputView.findViewById(R.id.star);
+            mStarBackground = inputView.findViewById(R.id.star_background);
+            mStarBorder = inputView.findViewById(R.id.star_border);
+            mTickIcon = inputView.findViewById(R.id.selected_thumbnail);
+            inputView.setOnLongClickListener(view -> {
+                inputListener.onRowClicked(getAdapterPosition());
+                inputView.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS);
+                return true;
+            });
+        }
+
+        public void setStoreField(String text) {
+            mStoreField.setText(text);
+            mStoreField.setTextSize(mSettings.getFontSizeMax(mSettings.getMediumFont()));
+            mStoreField.requestLayout();
+        }
+
+        public void setNoteField(String text) {
+            if (text == null) {
+                mNoteField.setVisibility(View.GONE);
+            } else {
+                mNoteField.setVisibility(View.VISIBLE);
+                mNoteField.setText(text);
+                mNoteField.setTextSize(mSettings.getFontSizeMax(mSettings.getSmallFont()));
+            }
+            mNoteField.requestLayout();
+        }
+
+        public void setBalanceField(BigDecimal balance, Currency balanceType) {
+            if (balance == null) {
+                mBalanceField.setVisibility(View.GONE);
+            } else {
+                int size = mSettings.getFontSizeMax(mSettings.getSmallFont());
+                int drawableSize = dpToPx((size * 24) / 14, mContext);
+                mDivider.setVisibility(View.VISIBLE);
+                mBalanceField.setVisibility(View.VISIBLE);
+                Drawable balanceIcon = mBalanceField.getCompoundDrawables()[0];
+                balanceIcon.setBounds(0, 0, drawableSize, drawableSize);
+                mBalanceField.setCompoundDrawablesRelative(balanceIcon, null, null, null);
+                if (mDarkModeEnabled) {
+                    balanceIcon.setColorFilter(BlendModeColorFilterCompat.createBlendModeColorFilterCompat(Color.WHITE, BlendModeCompat.SRC_ATOP));
+                }
+                mBalanceField.setText(Utils.formatBalance(mContext, balance, balanceType));
+                mBalanceField.setTextSize(size);
+            }
+            mBalanceField.requestLayout();
+        }
+
+        public void setExpiryField(Date expiry) {
+            if (expiry == null) {
+                mExpiryField.setVisibility(View.GONE);
+            } else {
+                int size = mSettings.getFontSizeMax(mSettings.getSmallFont());
+                int drawableSize = dpToPx((size * 24) / 14, mContext);
+                mDivider.setVisibility(View.VISIBLE);
+                mExpiryField.setVisibility(View.VISIBLE);
+                Drawable expiryIcon = mExpiryField.getCompoundDrawables()[0];
+                expiryIcon.setBounds(0, 0, drawableSize, drawableSize);
+                mExpiryField.setCompoundDrawablesRelative(expiryIcon, null, null, null);
+                if (Utils.hasExpired(expiry)) {
+                    expiryIcon.setColorFilter(BlendModeColorFilterCompat.createBlendModeColorFilterCompat(Color.RED, BlendModeCompat.SRC_ATOP));
+                    mExpiryField.setTextColor(Color.RED);
+                } else if (mDarkModeEnabled) {
+                    expiryIcon.setColorFilter(BlendModeColorFilterCompat.createBlendModeColorFilterCompat(Color.WHITE, BlendModeCompat.SRC_ATOP));
+                }
+                mExpiryField.setText(DateFormat.getDateInstance(DateFormat.LONG).format(expiry));
+                mExpiryField.setTextSize(size);
+            }
+            mExpiryField.requestLayout();
+        }
+
+        public void toggleStar(boolean enable, boolean colorByTheme) {
+            /* the below code does not work in android 5! hence the change of drawable instead
+            boolean needDarkForeground = Utils.needsDarkForeground(mIconBackgroundColor);
+            Drawable borderDrawable = mStarBorder.getDrawable().mutate();
+            Drawable backgroundDrawable = mStarBackground.getDrawable().mutate();
+            DrawableCompat.setTint(borderDrawable, needsDarkForeground ? Color.BLACK : Color.WHITE);
+            DrawableCompat.setTint(backgroundDrawable, needsDarkForeground ? Color.BLACK : Color.WHITE);
+            mStarBorder.setImageDrawable(borderDrawable);
+            mStarBackground.setImageDrawable(backgroundDrawable);
+            */
+            boolean dark = Utils.needsDarkForeground(mIconBackgroundColor);
+            if (colorByTheme) {
+                dark = !mDarkModeEnabled;
+            }
+            if (dark) {
+                mStarBorder.setImageResource(R.drawable.ic_unstarred_white);
+                mStarBackground.setImageResource(R.drawable.ic_starred_black);
+            } else {
+                mStarBorder.setImageResource(R.drawable.ic_unstarred_black);
+                mStarBackground.setImageResource(R.drawable.ic_starred_white);
+            }
+            if (enable) {
+                mStar.setVisibility(View.VISIBLE);
+            } else {
+                mStar.setVisibility(View.GONE);
+            }
+            mStarBorder.invalidate();
+            mStarBackground.invalidate();
+        }
+
+        public void setIconBackgroundColor(int color) {
+            mIconBackgroundColor = color;
+            mCardIcon.setBackgroundColor(color);
+        }
+    }
+
+    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/LoyaltyCardField.java

@@ -0,0 +1,15 @@
+package protect.card_locker;
+
+public enum LoyaltyCardField {
+    id,
+    store,
+    note,
+    expiry,
+    balance,
+    balanceType,
+    cardId,
+    barcodeId,
+    barcodeType,
+    headerColor,
+    starStatus
+}

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

@@ -1,15 +1,21 @@
 package protect.card_locker;
 
 import android.app.Application;
+
 import androidx.appcompat.app.AppCompatDelegate;
 
+import com.google.android.material.color.DynamicColors;
+
 import protect.card_locker.preferences.Settings;
 
 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());
+        DynamicColors.applyToActivitiesIfAvailable(this);
     }
 }

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

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

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

@@ -0,0 +1,111 @@
+package protect.card_locker;
+
+import android.content.Context;
+import android.database.Cursor;
+import android.database.sqlite.SQLiteDatabase;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import androidx.recyclerview.widget.RecyclerView;
+
+public class ManageGroupCursorAdapter extends LoyaltyCardCursorAdapter {
+    private HashMap<Integer, Integer> mIndexCardMap;
+    private HashMap<Integer, Boolean> mInGroupOverlay;
+    private HashMap<Integer, Boolean> mIsLoyaltyCardInGroupCache;
+    private HashMap<Integer, List<Group>> mGetGroupCache;
+    final private Group mGroup;
+    final private SQLiteDatabase mDatabase;
+
+    public ManageGroupCursorAdapter(Context inputContext, Cursor inputCursor, CardAdapterListener inputListener, Group group) {
+        super(inputContext, inputCursor, inputListener);
+        mGroup = new Group(group._id, group.order);
+        mInGroupOverlay = new HashMap<>();
+        mDatabase = new DBHelper(inputContext).getWritableDatabase();
+    }
+
+    @Override
+    public void swapCursor(Cursor inputCursor) {
+        super.swapCursor(inputCursor);
+        mIndexCardMap = new HashMap<>();
+        mIsLoyaltyCardInGroupCache = new HashMap<>();
+        mGetGroupCache = new HashMap<>();
+    }
+
+    @Override
+    public void onBindViewHolder(LoyaltyCardListItemViewHolder inputHolder, Cursor inputCursor) {
+        LoyaltyCard loyaltyCard = LoyaltyCard.toLoyaltyCard(inputCursor);
+        Boolean overlayValue = mInGroupOverlay.get(loyaltyCard.id);
+        if ((overlayValue != null ? overlayValue : isLoyaltyCardInGroup(loyaltyCard.id))) {
+            mAnimationItemsIndex.put(inputCursor.getPosition(), true);
+            mSelectedItems.put(inputCursor.getPosition(), true);
+        }
+        mIndexCardMap.put(inputCursor.getPosition(), loyaltyCard.id);
+        super.onBindViewHolder(inputHolder, inputCursor);
+    }
+
+    private List<Group> getGroups(int cardId) {
+        List<Group> cache = mGetGroupCache.get(cardId);
+        if (cache != null) {
+            return cache;
+        }
+        List<Group> groups = DBHelper.getLoyaltyCardGroups(mDatabase, cardId);
+        mGetGroupCache.put(cardId, groups);
+        return groups;
+    }
+
+    private boolean isLoyaltyCardInGroup(int cardId) {
+        Boolean cache = mIsLoyaltyCardInGroupCache.get(cardId);
+        if (cache != null) {
+            return cache;
+        }
+        List<Group> groups = getGroups(cardId);
+        if (groups.contains(mGroup)) {
+            mIsLoyaltyCardInGroupCache.put(cardId, true);
+            return true;
+        }
+        mIsLoyaltyCardInGroupCache.put(cardId, false);
+        return false;
+    }
+
+    @Override
+    public void toggleSelection(int inputPosition) {
+        super.toggleSelection(inputPosition);
+        Integer cardId = mIndexCardMap.get(inputPosition);
+        if (cardId == null) {
+            throw (new RuntimeException("cardId should not be null here"));
+        }
+        Boolean overlayValue = mInGroupOverlay.get(cardId);
+        if (overlayValue == null) {
+            mInGroupOverlay.put(cardId, !isLoyaltyCardInGroup(cardId));
+        } else {
+            mInGroupOverlay.remove(cardId);
+        }
+    }
+
+    public boolean hasChanged() {
+        return mInGroupOverlay.size() > 0;
+    }
+
+    public void commitToDatabase() {
+        for (Map.Entry<Integer, Boolean> entry : mInGroupOverlay.entrySet()) {
+            int cardId = entry.getKey();
+            List<Group> groups = getGroups(cardId);
+            if (entry.getValue()) {
+                groups.add(mGroup);
+            } else {
+                groups.remove(mGroup);
+            }
+            DBHelper.setLoyaltyCardGroups(mDatabase, cardId, groups);
+        }
+    }
+
+    public void importInGroupState(HashMap<Integer, Boolean> cardIdInGroupMap) {
+        mInGroupOverlay = new HashMap<>(cardIdInGroupMap);
+    }
+
+    public HashMap<Integer, Boolean> exportInGroupState() {
+        return new HashMap<>(mInGroupOverlay);
+    }
+}

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

@@ -1,61 +1,72 @@
 package protect.card_locker;
 
-import android.content.DialogInterface;
-import android.database.Cursor;
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.database.sqlite.SQLiteDatabase;
 import android.os.Bundle;
 import android.text.InputType;
 import android.view.MenuItem;
 import android.view.View;
+import android.view.WindowManager;
 import android.widget.EditText;
-import android.widget.LinearLayout;
-import android.widget.ListView;
 import android.widget.TextView;
+import android.widget.Toast;
 
-import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton;
+
+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
-{
+public class ManageGroupsActivity extends CatimaAppCompatActivity implements GroupCursorAdapter.GroupAdapterListener {
     private static final String TAG = "Catima";
 
-    private AlertDialog newGroupDialog;
-    private final DBHelper db = new DBHelper(this);
+    private SQLiteDatabase mDatabase;
+    private TextView mHelpText;
+    private RecyclerView mGroupList;
+    GroupCursorAdapter mAdapter;
 
     @Override
-    protected void onCreate(Bundle savedInstanceState)
-    {
+    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);
         ActionBar actionBar = getSupportActionBar();
-        if(actionBar != null)
-        {
+        if (actionBar != null) {
             actionBar.setDisplayHomeAsUpEnabled(true);
         }
 
-        newGroupDialog = createNewGroupDialog();
-
-        updateGroupList();
+        mDatabase = new DBHelper(this).getWritableDatabase();
     }
 
     @Override
     protected void onResume() {
         super.onResume();
 
-        updateGroupList();
+        ExtendedFloatingActionButton addButton = findViewById(R.id.fabAdd);
+        addButton.setOnClickListener(v -> createGroup());
+        addButton.bringToFront();
 
-        FloatingActionButton addButton = findViewById(R.id.fabAdd);
-        addButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                newGroupDialog.show();
-            }
-        });
+        mGroupList = findViewById(R.id.list);
+        mHelpText = findViewById(R.id.helpText);
+
+        // Init group list
+        RecyclerView.LayoutManager mLayoutManager = new LinearLayoutManager(getApplicationContext());
+        mGroupList.setLayoutManager(mLayoutManager);
+        mGroupList.setItemAnimator(new DefaultItemAnimator());
+
+        mAdapter = new GroupCursorAdapter(this, null, this);
+        mGroupList.setAdapter(mAdapter);
+
+        updateGroupList();
     }
 
     @Override
@@ -63,34 +74,31 @@ public class ManageGroupsActivity extends AppCompatActivity
         super.onBackPressed();
     }
 
-    private void updateGroupList()
-    {
-        final ListView groupList = findViewById(R.id.list);
-        final TextView helpText = findViewById(R.id.helpText);
-        final DBHelper db = new DBHelper(this);
+    private void updateGroupList() {
+        mAdapter.swapCursor(DBHelper.getGroupCursor(mDatabase));
 
-        if(db.getGroupCount() > 0)
-        {
-            groupList.setVisibility(View.VISIBLE);
-            helpText.setVisibility(View.GONE);
-        }
-        else
-        {
-            groupList.setVisibility(View.GONE);
-            helpText.setVisibility(View.VISIBLE);
+        if (DBHelper.getGroupCount(mDatabase) == 0) {
+            mGroupList.setVisibility(View.GONE);
+            mHelpText.setVisibility(View.VISIBLE);
+
+            return;
         }
 
-        Cursor groupCursor = db.getGroupCursor();
+        mGroupList.setVisibility(View.VISIBLE);
+        mHelpText.setVisibility(View.GONE);
+    }
 
-        final GroupCursorAdapter adapter = new GroupCursorAdapter(this, groupCursor);
-        groupList.setAdapter(adapter);
-
-        registerForContextMenu(groupList);
+    private void invalidateHomescreenActiveTab() {
+        SharedPreferences activeTabPref = getApplicationContext().getSharedPreferences(
+                getString(R.string.sharedpreference_active_tab),
+                Context.MODE_PRIVATE);
+        SharedPreferences.Editor activeTabPrefEditor = activeTabPref.edit();
+        activeTabPrefEditor.putInt(getString(R.string.sharedpreference_active_tab), 0);
+        activeTabPrefEditor.apply();
     }
 
     @Override
-    public boolean onOptionsItemSelected(MenuItem item)
-    {
+    public boolean onOptionsItemSelected(MenuItem item) {
         int id = item.getItemId();
 
         if (id == android.R.id.home) {
@@ -100,87 +108,103 @@ public class ManageGroupsActivity extends AppCompatActivity
         return super.onOptionsItemSelected(item);
     }
 
-    public void editGroup(View view) {
-        LinearLayout parentRow = (LinearLayout) view.getParent();
-
-        TextView groupNameTextView = (TextView) parentRow.findViewById(R.id.name);
-
-        final String groupName = (String) groupNameTextView.getText();
-
+    private void createGroup() {
         AlertDialog.Builder builder = new AlertDialog.Builder(this);
         builder.setTitle(R.string.enter_group_name);
         final EditText input = new EditText(this);
         input.setInputType(InputType.TYPE_CLASS_TEXT);
-        input.setText(groupName);
         builder.setView(input);
 
-        builder.setPositiveButton(getString(R.string.ok), new DialogInterface.OnClickListener() {
-            @Override
-            public void onClick(DialogInterface dialog, int which) {
-                db.updateGroup(groupName, input.getText().toString());
-                updateGroupList();
+        builder.setPositiveButton(getString(R.string.ok), (dialog, which) -> {
+            String inputString = input.getText().toString().trim();
+            if (inputString.length() == 0) {
+                Toast.makeText(getApplicationContext(), R.string.group_name_is_empty, Toast.LENGTH_SHORT).show();
+                return;
             }
-        });
-        builder.setNegativeButton(getString(R.string.cancel), new DialogInterface.OnClickListener() {
-            @Override
-            public void onClick(DialogInterface dialog, int which) {
-                dialog.cancel();
+            if (DBHelper.getGroup(mDatabase, inputString) != null) {
+                Toast.makeText(getApplicationContext(), R.string.group_name_already_in_use, Toast.LENGTH_SHORT).show();
+                return;
             }
+            DBHelper.insertGroup(mDatabase, inputString);
+            updateGroupList();
         });
+        builder.setNegativeButton(getString(R.string.cancel), (dialog, which) -> dialog.cancel());
         AlertDialog dialog = builder.create();
         dialog.show();
+        dialog.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE);
+        input.requestFocus();
     }
 
-    public void deleteGroup(View view) {
-        LinearLayout parentRow = (LinearLayout) view.getParent();
+    private String getGroupName(View view) {
+        TextView groupNameTextView = view.findViewById(R.id.name);
+        return (String) groupNameTextView.getText();
+    }
 
-        TextView groupNameTextView = (TextView) parentRow.findViewById(R.id.name);
+    private void moveGroup(View view, boolean up) {
+        List<Group> groups = DBHelper.getGroups(mDatabase);
+        final String groupName = getGroupName(view);
 
-        final String groupName = (String) groupNameTextView.getText();
+        int currentIndex = DBHelper.getGroup(mDatabase, groupName).order;
+        int newIndex;
+
+        // Reinsert group in correct position
+        if (up) {
+            newIndex = currentIndex - 1;
+        } else {
+            newIndex = currentIndex + 1;
+        }
+
+        // Don't try to move out of bounds
+        if (newIndex < 0 || newIndex >= groups.size()) {
+            return;
+        }
+
+        Group group = groups.remove(currentIndex);
+        groups.add(newIndex, group);
+
+        // Update database
+        DBHelper.reorderGroups(mDatabase, groups);
+
+        // Update UI
+        updateGroupList();
+
+        // Ordering may have changed, so invalidate
+        invalidateHomescreenActiveTab();
+    }
+
+    @Override
+    public void onMoveDownButtonClicked(View view) {
+        moveGroup(view, false);
+    }
+
+    @Override
+    public void onMoveUpButtonClicked(View view) {
+        moveGroup(view, true);
+    }
+
+    @Override
+    public void onEditButtonClicked(View view) {
+        Intent intent = new Intent(this, ManageGroupActivity.class);
+        intent.putExtra("group", getGroupName(view));
+        startActivity(intent);
+    }
+
+    @Override
+    public void onDeleteButtonClicked(View view) {
+        final String groupName = getGroupName(view);
 
         AlertDialog.Builder builder = new AlertDialog.Builder(this);
         builder.setTitle(R.string.deleteConfirmationGroup);
         builder.setMessage(groupName);
 
-        builder.setPositiveButton(getString(R.string.ok), new DialogInterface.OnClickListener() {
-            @Override
-            public void onClick(DialogInterface dialog, int which) {
-                db.deleteGroup(groupName);
-                updateGroupList();
-            }
-        });
-        builder.setNegativeButton(getString(R.string.cancel), new DialogInterface.OnClickListener() {
-            @Override
-            public void onClick(DialogInterface dialog, int which) {
-                dialog.cancel();
-            }
+        builder.setPositiveButton(getString(R.string.ok), (dialog, which) -> {
+            DBHelper.deleteGroup(mDatabase, groupName);
+            updateGroupList();
+            // Delete may change ordering, so invalidate
+            invalidateHomescreenActiveTab();
         });
+        builder.setNegativeButton(getString(R.string.cancel), (dialog, which) -> dialog.cancel());
         AlertDialog dialog = builder.create();
         dialog.show();
     }
-
-    private AlertDialog createNewGroupDialog() {
-        AlertDialog.Builder builder = new AlertDialog.Builder(this);
-        builder.setTitle(R.string.enter_group_name);
-        final EditText input = new EditText(this);
-        input.setInputType(InputType.TYPE_CLASS_TEXT);
-        builder.setView(input);
-
-        builder.setPositiveButton(getString(R.string.ok), new DialogInterface.OnClickListener() {
-            @Override
-            public void onClick(DialogInterface dialog, int which) {
-                db.insertGroup(input.getText().toString());
-                updateGroupList();
-            }
-        });
-        builder.setNegativeButton(getString(R.string.cancel), new DialogInterface.OnClickListener() {
-            @Override
-            public void onClick(DialogInterface dialog, int which) {
-                dialog.cancel();
-            }
-        });
-        AlertDialog dialog = builder.create();
-
-        return dialog;
-    }
 }

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

@@ -1,57 +0,0 @@
-package protect.card_locker;
-
-import android.util.Log;
-
-import java.io.IOException;
-import java.io.OutputStreamWriter;
-
-public class MultiFormatExporter
-{
-    private static final String TAG = "Catima";
-
-    /**
-     * Attempts to export data to the output stream in the
-     * given format, if possible.
-     *
-     * The output stream is closed on success.
-     *
-     * @return true if the database was successfully exported,
-     * false otherwise. If false, partial data may have been
-     * written to the output stream, and it should be discarded.
-     */
-    public static boolean exportData(DBHelper db, OutputStreamWriter output, DataFormat format)
-    {
-        DatabaseExporter exporter = null;
-
-        switch(format)
-        {
-            case CSV:
-                exporter = new CsvDatabaseExporter();
-                break;
-        }
-
-        if(exporter != null)
-        {
-            try
-            {
-                exporter.exportData(db, output);
-                return true;
-            }
-            catch(IOException e)
-            {
-                Log.e(TAG, "Failed to export data", e);
-            }
-            catch(InterruptedException e)
-            {
-                Log.e(TAG, "Failed to export data", e);
-            }
-
-            return false;
-        }
-        else
-        {
-            Log.e(TAG, "Unsupported data format exported: " + format.name());
-            return false;
-        }
-    }
-}

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

@@ -1,62 +0,0 @@
-package protect.card_locker;
-
-import android.util.Log;
-
-import java.io.IOException;
-import java.io.InputStreamReader;
-
-public class MultiFormatImporter
-{
-    private static final String TAG = "Catima";
-
-    /**
-     * Attempts to import data from the input stream of the
-     * given format into the database.
-     *
-     * The input stream is not closed, and doing so is the
-     * responsibility of the caller.
-     *
-     * @return true if the database was successfully imported,
-     * false otherwise. If false, no data was written to
-     * the database.
-     */
-    public static boolean importData(DBHelper db, InputStreamReader input, DataFormat format)
-    {
-        DatabaseImporter importer = null;
-
-        switch(format)
-        {
-            case CSV:
-                importer = new CsvDatabaseImporter();
-                break;
-        }
-
-        if(importer != null)
-        {
-            try
-            {
-                importer.importData(db, input);
-                return true;
-            }
-            catch(IOException e)
-            {
-                Log.e(TAG, "Failed to input data", e);
-            }
-            catch(FormatException e)
-            {
-                Log.e(TAG, "Failed to input data", e);
-            }
-            catch(InterruptedException e)
-            {
-                Log.e(TAG, "Failed to input data", e);
-            }
-
-            return false;
-        }
-        else
-        {
-            Log.e(TAG, "Unsupported data format imported: " + format.name());
-            return false;
-        }
-    }
-}

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

@@ -0,0 +1,211 @@
+package protect.card_locker;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.os.Bundle;
+import android.util.Log;
+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;
+import com.journeyapps.barcodescanner.BarcodeCallback;
+import com.journeyapps.barcodescanner.BarcodeResult;
+import com.journeyapps.barcodescanner.CaptureManager;
+import com.journeyapps.barcodescanner.DecoratedBarcodeView;
+
+import java.util.List;
+
+import androidx.activity.result.ActivityResultLauncher;
+import androidx.activity.result.contract.ActivityResultContracts;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.widget.Toolbar;
+
+/**
+ * Custom Scannner Activity extending from Activity to display a custom layout form scanner view.
+ * <p>
+ * Based on https://github.com/journeyapps/zxing-android-embedded/blob/0fdfbce9fb3285e985bad9971c5f7c0a7a334e7b/sample/src/main/java/example/zxing/CustomScannerActivity.java
+ * originally licensed under Apache 2.0
+ */
+public class ScanActivity extends CatimaAppCompatActivity {
+    private static final String TAG = "Catima";
+
+    private CaptureManager capture;
+    private DecoratedBarcodeView barcodeScannerView;
+
+    private String cardId;
+    private String addGroup;
+    private boolean torch = false;
+
+    private ActivityResultLauncher<Intent> manualAddLauncher;
+    // can't use the pre-made contract because that launches the file manager for image type instead of gallery
+    private ActivityResultLauncher<Intent> photoPickerLauncher;
+
+    private void extractIntentFields(Intent intent) {
+        final Bundle b = intent.getExtras();
+        cardId = b != null ? b.getString(LoyaltyCardEditActivity.BUNDLE_CARDID) : null;
+        addGroup = b != null ? b.getString(LoyaltyCardEditActivity.BUNDLE_ADDGROUP) : null;
+        Log.d(TAG, "Scan activity: id=" + cardId);
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setTitle(R.string.scanCardBarcode);
+        setContentView(R.layout.scan_activity);
+        Toolbar toolbar = findViewById(R.id.toolbar);
+        setSupportActionBar(toolbar);
+        ActionBar actionBar = getSupportActionBar();
+        if (actionBar != null) {
+            actionBar.setDisplayHomeAsUpEnabled(true);
+        }
+
+        extractIntentFields(getIntent());
+
+        manualAddLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), result -> handleActivityResult(Utils.SELECT_BARCODE_REQUEST, result.getResultCode(), result.getData()));
+        photoPickerLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), result -> handleActivityResult(Utils.BARCODE_IMPORT_FROM_IMAGE_FILE, result.getResultCode(), result.getData()));
+        findViewById(R.id.add_from_image).setOnClickListener(this::addFromImage);
+        findViewById(R.id.add_manually).setOnClickListener(this::addManually);
+
+        barcodeScannerView = findViewById(R.id.zxing_barcode_scanner);
+
+        // Even though we do the actual decoding with the barcodeScannerView
+        // CaptureManager needs to be running to show the camera and scanning bar
+        capture = new CatimaCaptureManager(this, barcodeScannerView);
+        Intent captureIntent = new Intent();
+        Bundle captureIntentBundle = new Bundle();
+        captureIntentBundle.putBoolean(Intents.Scan.BEEP_ENABLED, false);
+        captureIntent.putExtras(captureIntentBundle);
+        capture.initializeFromIntent(captureIntent, savedInstanceState);
+
+        barcodeScannerView.decodeSingle(new BarcodeCallback() {
+            @Override
+            public void barcodeResult(BarcodeResult result) {
+                Intent scanResult = new Intent();
+                Bundle scanResultBundle = new Bundle();
+                scanResultBundle.putString(BarcodeSelectorActivity.BARCODE_CONTENTS, result.getText());
+                scanResultBundle.putString(BarcodeSelectorActivity.BARCODE_FORMAT, result.getBarcodeFormat().name());
+                if (addGroup != null) {
+                    scanResultBundle.putString(LoyaltyCardEditActivity.BUNDLE_ADDGROUP, addGroup);
+                }
+                scanResult.putExtras(scanResultBundle);
+                ScanActivity.this.setResult(RESULT_OK, scanResult);
+                finish();
+            }
+
+            @Override
+            public void possibleResultPoints(List<ResultPoint> resultPoints) {
+
+            }
+        });
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        capture.onResume();
+    }
+
+    @Override
+    protected void onPause() {
+        super.onPause();
+        capture.onPause();
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        capture.onDestroy();
+    }
+
+    @Override
+    protected void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+        capture.onSaveInstanceState(outState);
+    }
+
+    @Override
+    public boolean onKeyDown(int keyCode, KeyEvent event) {
+        return barcodeScannerView.onKeyDown(keyCode, event) || super.onKeyDown(keyCode, event);
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        if (getPackageManager().hasSystemFeature(PackageManager.FEATURE_CAMERA_FLASH)) {
+            getMenuInflater().inflate(R.menu.scan_menu, menu);
+        }
+
+        barcodeScannerView.setTorchOff();
+
+        return super.onCreateOptionsMenu(menu);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == android.R.id.home) {
+            setResult(Activity.RESULT_CANCELED);
+            finish();
+            return true;
+        } else if (item.getItemId() == R.id.action_toggle_flashlight) {
+            if (torch) {
+                torch = false;
+                barcodeScannerView.setTorchOff();
+                item.setTitle(R.string.turn_flashlight_on);
+                item.setIcon(R.drawable.ic_flashlight_off_white_24dp);
+            } else {
+                torch = true;
+                barcodeScannerView.setTorchOn();
+                item.setTitle(R.string.turn_flashlight_off);
+                item.setIcon(R.drawable.ic_flashlight_on_white_24dp);
+            }
+        }
+
+        return super.onOptionsItemSelected(item);
+    }
+
+    private void handleActivityResult(int requestCode, int resultCode, Intent intent) {
+        super.onActivityResult(requestCode, resultCode, intent);
+
+        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();
+            Bundle manualResultBundle = new Bundle();
+            manualResultBundle.putString(BarcodeSelectorActivity.BARCODE_CONTENTS, barcodeValues.content());
+            manualResultBundle.putString(BarcodeSelectorActivity.BARCODE_FORMAT, barcodeValues.format());
+            if (addGroup != null) {
+                manualResultBundle.putString(LoyaltyCardEditActivity.BUNDLE_ADDGROUP, addGroup);
+            }
+            manualResult.putExtras(manualResultBundle);
+            ScanActivity.this.setResult(RESULT_OK, manualResult);
+            finish();
+        }
+    }
+
+    public void addManually(View view) {
+        Intent i = new Intent(getApplicationContext(), BarcodeSelectorActivity.class);
+        if (cardId != null) {
+            final Bundle b = new Bundle();
+            b.putString("initialCardId", cardId);
+            i.putExtras(b);
+        }
+        manualAddLauncher.launch(i);
+    }
+
+    public void addFromImage(View view) {
+        Intent photoPickerIntent = new Intent(Intent.ACTION_PICK);
+        photoPickerIntent.setType("image/*");
+        photoPickerLauncher.launch(photoPickerIntent);
+    }
+}

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

@@ -1,20 +1,26 @@
 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.drawable.Icon;
-import android.os.Build;
+import android.database.sqlite.SQLiteDatabase;
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.os.Bundle;
+
+import org.jetbrains.annotations.NotNull;
 
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.LinkedList;
 import java.util.List;
 
-class ShortcutHelper
-{
+import androidx.core.content.pm.ShortcutInfoCompat;
+import androidx.core.content.pm.ShortcutManagerCompat;
+import androidx.core.graphics.ColorUtils;
+import androidx.core.graphics.drawable.IconCompat;
+
+class ShortcutHelper {
     // Android documentation says that no more than 5 shortcuts
     // are supported. However, that may be too many, as not all
     // launcher will show all 5. Instead, the number is limited
@@ -22,6 +28,14 @@ class ShortcutHelper
     // chance of being shown.
     private static final int MAX_SHORTCUTS = 3;
 
+    // https://developer.android.com/reference/android/graphics/drawable/AdaptiveIconDrawable.html
+    private static final int ADAPTIVE_BITMAP_SCALE = 1;
+    private static final int ADAPTIVE_BITMAP_SIZE = 108 * ADAPTIVE_BITMAP_SCALE;
+    private static final int ADAPTIVE_BITMAP_VISIBLE_SIZE = 72 * ADAPTIVE_BITMAP_SCALE;
+    private static final int ADAPTIVE_BITMAP_IMAGE_SIZE = ADAPTIVE_BITMAP_VISIBLE_SIZE + 5 * ADAPTIVE_BITMAP_SCALE;
+    private static final int PADDING_COLOR = Color.argb(255, 255, 255, 255);
+    private static final int PADDING_COLOR_OVERLAY = Color.argb(127, 0, 0, 0);
+
     /**
      * Add a card to the app shortcuts, and maintain a list of the most
      * recently used cards. If there is already a shortcut for the card,
@@ -29,125 +43,117 @@ 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)
-    {
-        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.N_MR1)
-        {
-            ShortcutManager shortcutManager = context.getSystemService(ShortcutManager.class);
-            LinkedList<ShortcutInfo> list = new LinkedList<>(shortcutManager.getDynamicShortcuts());
+    static void updateShortcuts(Context context, LoyaltyCard card) {
+        LinkedList<ShortcutInfoCompat> list = new LinkedList<>(ShortcutManagerCompat.getDynamicShortcuts(context));
 
-            String shortcutId = Integer.toString(card.id);
+        SQLiteDatabase database = new DBHelper(context).getReadableDatabase();
 
-            // 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>()
-            {
-                @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;
-                    }
-                }
-            });
+        String shortcutId = Integer.toString(card.id);
 
-            Integer foundIndex = null;
+        // 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));
 
-            for(int index = 0; index < list.size(); index++)
-            {
-                if(list.get(index).getId().equals(shortcutId))
-                {
-                    // Found the item already
-                    foundIndex = index;
-                    break;
-                }
+        Integer foundIndex = null;
+
+        for (int index = 0; index < list.size(); index++) {
+            if (list.get(index).getId().equals(shortcutId)) {
+                // Found the item already
+                foundIndex = index;
+                break;
+            }
+        }
+
+        if (foundIndex != null) {
+            // If the item is already found, then the list needs to be
+            // reordered, so that the selected item now has the lowest
+            // rank, thus letting it survive longer.
+            ShortcutInfoCompat found = list.remove(foundIndex.intValue());
+            list.addFirst(found);
+        } else {
+            // The item is new to the list. 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();
             }
 
-            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)
+            list.addFirst(shortcut);
+        }
+
+        LinkedList<ShortcutInfoCompat> 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);
+
+            LoyaltyCard loyaltyCard = DBHelper.getLoyaltyCard(database, Integer.parseInt(prevShortcut.getId()));
+
+            ShortcutInfoCompat updatedShortcut = createShortcutBuilder(context, loyaltyCard)
+                    .setRank(index)
                     .build();
 
-                list.addFirst(shortcut);
-            }
-
-            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++)
-            {
-                ShortcutInfo prevShortcut = list.get(index);
-
-                Intent shortcutIntent = prevShortcut.getIntent();
-
-                // 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.createWithResource(context, R.drawable.circle))
-                        .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)
-        {
-            ShortcutManager shortcutManager = context.getSystemService(ShortcutManager.class);
-            List<ShortcutInfo> list = shortcutManager.getDynamicShortcuts();
+    static void removeShortcut(Context context, int cardId) {
+        List<ShortcutInfoCompat> list = ShortcutManagerCompat.getDynamicShortcuts(context);
 
-            String shortcutId = Integer.toString(cardId);
+        String shortcutId = Integer.toString(cardId);
 
-            for(int index = 0; index < list.size(); index++)
-            {
-                if(list.get(index).getId().equals(shortcutId))
-                {
-                    list.remove(index);
-                    break;
-                }
+        for (int index = 0; index < list.size(); index++) {
+            if (list.get(index).getId().equals(shortcutId)) {
+                list.remove(index);
+                break;
             }
-
-            shortcutManager.setDynamicShortcuts(list);
         }
+
+        ShortcutManagerCompat.setDynamicShortcuts(context, list);
+    }
+
+    static @NotNull
+    Bitmap createAdaptiveBitmap(@NotNull Bitmap in, int paddingColor) {
+        Bitmap ret = Bitmap.createBitmap(ADAPTIVE_BITMAP_SIZE, ADAPTIVE_BITMAP_SIZE, Bitmap.Config.ARGB_8888);
+        Canvas output = new Canvas(ret);
+        output.drawColor(ColorUtils.compositeColors(PADDING_COLOR_OVERLAY, paddingColor));
+        Bitmap resized = Utils.resizeBitmap(in, ADAPTIVE_BITMAP_IMAGE_SIZE);
+        output.drawBitmap(resized, (ADAPTIVE_BITMAP_SIZE - resized.getWidth()) / 2f, (ADAPTIVE_BITMAP_SIZE - resized.getHeight()) / 2f, null);
+        return ret;
+    }
+
+    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.retrieveCardImage(context, loyaltyCard.id, ImageLocationType.icon);
+        if (iconBitmap == null) {
+            iconBitmap = Utils.generateIcon(context, loyaltyCard, true).getLetterTile();
+        } else {
+            iconBitmap = createAdaptiveBitmap(iconBitmap, loyaltyCard.headerColor == null ? PADDING_COLOR : loyaltyCard.headerColor);
+        }
+
+        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,18 @@
+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/ThirdPartyInfo.java

@@ -0,0 +1,25 @@
+package protect.card_locker;
+
+public class ThirdPartyInfo {
+    private final String mName;
+    private final String mUrl;
+    private final String mLicense;
+
+    public ThirdPartyInfo(String name, String url, String license) {
+        mName = name;
+        mUrl = url;
+        mLicense = license;
+    }
+
+    public String name() {
+        return mName;
+    }
+
+    public String url() {
+        return mUrl;
+    }
+
+    public String license() {
+        return mLicense;
+    }
+}

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

@@ -1,20 +1,93 @@
 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.os.Build;
+import android.os.LocaleList;
+import android.provider.MediaStore;
+import android.util.Log;
+import android.util.TypedValue;
+import android.widget.Toast;
 
+import com.google.zxing.BinaryBitmap;
+import com.google.zxing.LuminanceSource;
+import com.google.zxing.MultiFormatReader;
+import com.google.zxing.NotFoundException;
+import com.google.zxing.RGBLuminanceSource;
+import com.google.zxing.Result;
+import com.google.zxing.common.HybridBinarizer;
+
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.text.NumberFormat;
+import java.util.Calendar;
+import java.util.Currency;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.Locale;
+import java.util.Map;
+
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatDelegate;
 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";
+
+    // Activity request codes
+    public static final int MAIN_REQUEST = 1;
+    public static final int SELECT_BARCODE_REQUEST = 2;
+    public static final int BARCODE_SCAN = 3;
+    public static final int BARCODE_IMPORT_FROM_IMAGE_FILE = 4;
+    public static final int CARD_IMAGE_FROM_CAMERA_FRONT = 5;
+    public static final int CARD_IMAGE_FROM_CAMERA_BACK = 6;
+    public static final int CARD_IMAGE_FROM_CAMERA_ICON = 7;
+    public static final int CARD_IMAGE_FROM_FILE_FRONT = 8;
+    public static final int CARD_IMAGE_FROM_FILE_BACK = 9;
+    public static final int CARD_IMAGE_FROM_FILE_ICON = 10;
+
     static final double LUMINANCE_MIDPOINT = 0.5;
 
+    static final int BITMAP_SIZE_SMALL = 512;
+    static final int BITMAP_SIZE_BIG = 2048;
+
+    static public LetterBitmap generateIcon(Context context, LoyaltyCard loyaltyCard, boolean forShortcut) {
+        return generateIcon(context, loyaltyCard.store, loyaltyCard.headerColor, forShortcut);
+    }
+
     static public LetterBitmap generateIcon(Context context, String store, Integer backgroundColor) {
+        return generateIcon(context, store, backgroundColor, false);
+    }
+
+    static public LetterBitmap generateIcon(Context context, String store, Integer backgroundColor, boolean forShortcut) {
         if (store.length() == 0) {
             return null;
         }
 
-        int tileLetterFontSize = context.getResources().getDimensionPixelSize(R.dimen.tileLetterFontSize);
-        int pixelSize = context.getResources().getDimensionPixelSize(R.dimen.cardThumbnailSize);
+        int tileLetterFontSize;
+        if (forShortcut) {
+            tileLetterFontSize = context.getResources().getDimensionPixelSize(R.dimen.tileLetterFontSizeForShortcut);
+        } else {
+            tileLetterFontSize = context.getResources().getDimensionPixelSize(R.dimen.tileLetterFontSize);
+        }
+
+        int pixelSize = context.getResources().getDimensionPixelSize(R.dimen.tileLetterImageSize);
 
         if (backgroundColor == null) {
             backgroundColor = LetterBitmap.getDefaultColor(context, store);
@@ -27,4 +100,385 @@ public class Utils {
     static public boolean needsDarkForeground(Integer backgroundColor) {
         return ColorUtils.calculateLuminance(backgroundColor) > LUMINANCE_MIDPOINT;
     }
+
+    static public BarcodeValues parseSetBarcodeActivityResult(int requestCode, int resultCode, Intent intent, Context context) {
+        String contents;
+        String format;
+
+        if (resultCode != Activity.RESULT_OK) {
+            return new BarcodeValues(null, null);
+        }
+
+        if (requestCode == Utils.BARCODE_IMPORT_FROM_IMAGE_FILE) {
+            Log.i(TAG, "Received image file with possible barcode");
+
+            Bitmap bitmap;
+            try {
+                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();
+                Toast.makeText(context, R.string.errorReadingImage, Toast.LENGTH_LONG).show();
+                return new BarcodeValues(null, null);
+            }
+
+            BarcodeValues barcodeFromBitmap = getBarcodeFromBitmap(bitmap);
+
+            if (barcodeFromBitmap.isEmpty()) {
+                Log.i(TAG, "No barcode found in image file");
+                Toast.makeText(context, R.string.noBarcodeFound, Toast.LENGTH_LONG).show();
+            }
+
+            Log.i(TAG, "Read barcode id: " + barcodeFromBitmap.content());
+            Log.i(TAG, "Read format: " + barcodeFromBitmap.format());
+
+            return barcodeFromBitmap;
+        }
+
+        if (requestCode == Utils.BARCODE_SCAN || requestCode == Utils.SELECT_BARCODE_REQUEST) {
+            if (requestCode == Utils.BARCODE_SCAN) {
+                Log.i(TAG, "Received barcode information from camera");
+            } else if (requestCode == Utils.SELECT_BARCODE_REQUEST) {
+                Log.i(TAG, "Received barcode information from typing it");
+            }
+
+            contents = intent.getStringExtra(BarcodeSelectorActivity.BARCODE_CONTENTS);
+            format = intent.getStringExtra(BarcodeSelectorActivity.BARCODE_FORMAT);
+
+            Log.i(TAG, "Read barcode id: " + contents);
+            Log.i(TAG, "Read format: " + format);
+
+            return new BarcodeValues(format, contents);
+        }
+
+        throw new UnsupportedOperationException("Unknown request code for parseSetBarcodeActivityResult");
+    }
+
+    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());
+
+        // ...and then turned into a binary bitmap from its luminance
+        LuminanceSource source = new RGBLuminanceSource(bitmap.getWidth(), bitmap.getHeight(), intArray);
+        BinaryBitmap binaryBitmap = new BinaryBitmap(new HybridBinarizer(source));
+
+        try {
+            Result barcodeResult = new MultiFormatReader().decode(binaryBitmap);
+
+            return new BarcodeValues(barcodeResult.getBarcodeFormat().name(), barcodeResult.getText());
+        } catch (NotFoundException e) {
+            return new BarcodeValues(null, null);
+        }
+    }
+
+    static public Boolean hasExpired(Date expiryDate) {
+        // today
+        Calendar date = new GregorianCalendar();
+        // reset hour, minutes, seconds and millis
+        date.set(Calendar.HOUR_OF_DAY, 0);
+        date.set(Calendar.MINUTE, 0);
+        date.set(Calendar.SECOND, 0);
+        date.set(Calendar.MILLISECOND, 0);
+
+        return expiryDate.before(date.getTime());
+    }
+
+    static public String formatBalance(Context context, BigDecimal value, Currency currency) {
+        NumberFormat numberFormat = NumberFormat.getInstance();
+
+        if (currency == null) {
+            numberFormat.setMaximumFractionDigits(0);
+            return context.getResources().getQuantityString(R.plurals.balancePoints, value.intValue(), numberFormat.format(value));
+        }
+
+        NumberFormat currencyFormat = NumberFormat.getCurrencyInstance();
+        currencyFormat.setCurrency(currency);
+        currencyFormat.setMinimumFractionDigits(currency.getDefaultFractionDigits());
+        currencyFormat.setMaximumFractionDigits(currency.getDefaultFractionDigits());
+
+        return currencyFormat.format(value);
+    }
+
+    static public String formatBalanceWithoutCurrencySymbol(BigDecimal value, Currency currency) {
+        NumberFormat numberFormat = NumberFormat.getInstance();
+
+        if (currency == null) {
+            numberFormat.setMaximumFractionDigits(0);
+            return numberFormat.format(value);
+        }
+
+        numberFormat.setMinimumFractionDigits(currency.getDefaultFractionDigits());
+        numberFormat.setMaximumFractionDigits(currency.getDefaultFractionDigits());
+
+        return numberFormat.format(value);
+    }
+
+    static public Boolean currencyHasDecimals(Currency currency) {
+        if (currency == null) {
+            return false;
+        }
+
+        return currency.getDefaultFractionDigits() != 0;
+    }
+
+    static public BigDecimal parseCurrency(String value, Boolean hasDecimals) throws NumberFormatException {
+        // If there are no decimals expected, remove all separators before parsing
+        if (!hasDecimals) {
+            value = value.replaceAll("[^0-9]", "");
+            return new BigDecimal(value);
+        }
+
+        // There are many ways users can write a currency, so we fix it up a bit
+        // 1. Replace all non-numbers with dots
+        value = value.replaceAll("[^0-9]", ".");
+
+        // 2. Remove all but the last dot
+        while (value.split("\\.").length > 2) {
+            value = value.replaceFirst("\\.", "");
+        }
+
+        // Parse as BigDecimal
+        return new BigDecimal(value);
+    }
+
+    static public byte[] bitmapToByteArray(Bitmap bitmap) {
+        if (bitmap == null) {
+            return null;
+        }
+
+        ByteArrayOutputStream bos = new ByteArrayOutputStream();
+        bitmap.compress(Bitmap.CompressFormat.PNG, 100, bos);
+        return bos.toByteArray();
+    }
+
+    static public Bitmap resizeBitmap(Bitmap bitmap, double maxSize) {
+        if (bitmap == null) {
+            return null;
+        }
+
+        double width = bitmap.getWidth();
+        double height = bitmap.getHeight();
+
+        if (height > width) {
+            double scale = height / maxSize;
+            height = maxSize;
+            width = width / scale;
+        } else if (width > height) {
+            double scale = width / maxSize;
+            width = maxSize;
+            height = height / scale;
+        } else {
+            height = maxSize;
+            width = maxSize;
+        }
+
+        return Bitmap.createScaledBitmap(bitmap, (int) Math.round(width), (int) Math.round(height), true);
+    }
+
+    static public Bitmap rotateBitmap(Bitmap bitmap, ExifInterface exifInterface) {
+        switch (exifInterface.getAttributeInt(ExifInterface.TAG_ORIENTATION, ExifInterface.ORIENTATION_UNDEFINED)) {
+            case ExifInterface.ORIENTATION_ROTATE_90:
+                return rotateBitmap(bitmap, 90f);
+            case ExifInterface.ORIENTATION_ROTATE_180:
+                return rotateBitmap(bitmap, 180f);
+            case ExifInterface.ORIENTATION_ROTATE_270:
+                return rotateBitmap(bitmap, 270f);
+            default:
+                return bitmap;
+        }
+    }
+
+    static public Bitmap rotateBitmap(Bitmap bitmap, float rotation) {
+        if (rotation == 0) {
+            return bitmap;
+        }
+
+        Matrix matrix = new Matrix();
+        matrix.postRotate(rotation);
+        return Bitmap.createBitmap(bitmap, 0, 0, bitmap.getWidth(), bitmap.getHeight(), matrix, true);
+    }
+
+    static public String getCardImageFileName(int loyaltyCardId, ImageLocationType type) {
+        StringBuilder cardImageFileNameBuilder = new StringBuilder();
+
+        cardImageFileNameBuilder.append("card_");
+        cardImageFileNameBuilder.append(loyaltyCardId);
+        cardImageFileNameBuilder.append("_");
+        if (type == ImageLocationType.front) {
+            cardImageFileNameBuilder.append("front");
+        } else if (type == ImageLocationType.back) {
+            cardImageFileNameBuilder.append("back");
+        } else if (type == ImageLocationType.icon) {
+            cardImageFileNameBuilder.append("icon");
+        } else {
+            throw new IllegalArgumentException("Unknown image type");
+        }
+        cardImageFileNameBuilder.append(".png");
+
+        return cardImageFileNameBuilder.toString();
+    }
+
+    static public void saveCardImage(Context context, Bitmap bitmap, String fileName) throws FileNotFoundException {
+        if (bitmap == null) {
+            context.deleteFile(fileName);
+            return;
+        }
+
+        FileOutputStream out = context.openFileOutput(fileName, Context.MODE_PRIVATE);
+
+        bitmap.compress(Bitmap.CompressFormat.PNG, 100, out);
+    }
+
+    static public void saveCardImage(Context context, Bitmap bitmap, int loyaltyCardId, ImageLocationType type) throws FileNotFoundException {
+        saveCardImage(context, bitmap, getCardImageFileName(loyaltyCardId, type));
+    }
+
+    static public Bitmap retrieveCardImage(Context context, String fileName) {
+        FileInputStream in;
+        try {
+            in = context.openFileInput(fileName);
+        } catch (FileNotFoundException e) {
+            return null;
+        }
+
+        return BitmapFactory.decodeStream(in);
+    }
+
+    static public Bitmap retrieveCardImage(Context context, int loyaltyCardId, ImageLocationType type) {
+        return retrieveCardImage(context, getCardImageFileName(loyaltyCardId, type));
+    }
+
+    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 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;
+    }
+
+    static public boolean isDarkModeEnabled(Context inputContext) {
+        int nightModeSetting = new Settings(inputContext).getTheme();
+        if (nightModeSetting == AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM) {
+            Configuration config = inputContext.getResources().getConfiguration();
+            int currentNightMode = config.uiMode & Configuration.UI_MODE_NIGHT_MASK;
+            return (currentNightMode == Configuration.UI_MODE_NIGHT_YES);
+        } else {
+            return nightModeSetting == AppCompatDelegate.MODE_NIGHT_YES;
+        }
+    }
+
+    public static File createTempFile(Context context, String name) {
+        return new File(context.getCacheDir() + "/" + name);
+    }
+
+    public static String saveTempImage(Context context, Bitmap in, String name, Bitmap.CompressFormat format) {
+        File image = createTempFile(context, name);
+        try (FileOutputStream out = new FileOutputStream(image)) {
+            in.compress(format, 100, out);
+            return image.getAbsolutePath();
+        } catch (IOException e) {
+            Log.d("store temp image", "failed writing temp file for temporary image, name: " + name);
+            return null;
+        }
+    }
+
+    public static Bitmap loadImage(String path) {
+        try {
+            return BitmapFactory.decodeStream(new FileInputStream(path));
+        } catch (IOException e) {
+            Log.d("load image", "failed loading image from " + path);
+            return null;
+        }
+    }
+
+    public static Bitmap loadTempImage(Context context, String name) {
+        return loadImage(context.getCacheDir() + "/" + name);
+    }
+
+    // https://stackoverflow.com/a/59324801/8378787
+    public static int getComplementaryColor(int color) {
+        int R = color & 255;
+        int G = (color >> 8) & 255;
+        int B = (color >> 16) & 255;
+        int A = (color >> 24) & 255;
+        R = 255 - R;
+        G = 255 - G;
+        B = 255 - B;
+        return R + (G << 8) + (B << 16) + (A << 24);
+    }
+
+    // replace colors in the current theme
+    // use before views are inflated, after dynamic color
+    public static void patchOledDarkTheme(AppCompatActivity activity) {
+        if (isDarkModeEnabled(activity) && new Settings(activity).getOledDark()) {
+            activity.getTheme().applyStyle(R.style.DarkBackground, true);
+        }
+    }
+
+    // XXX android 9 and below has issues with patched theme where the background becomes a
+    // rendering mess
+    // use after views are inflated
+    public static void postPatchOledDarkTheme(AppCompatActivity activity) {
+        if (isDarkModeEnabled(activity) && new Settings(activity).getOledDark()) {
+            TypedValue typedValue = new TypedValue();
+            activity.getTheme().resolveAttribute(android.R.attr.colorBackground, typedValue, true);
+            activity.findViewById(android.R.id.content).setBackgroundColor(typedValue.data);
+        }
+    }
 }

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

@@ -0,0 +1,35 @@
+package protect.card_locker;
+
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+
+import net.lingala.zip4j.io.inputstream.ZipInputStream;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.nio.charset.StandardCharsets;
+
+public class ZipUtils {
+    static public String read(ZipInputStream zipInputStream) throws IOException {
+        StringBuilder stringBuilder = new StringBuilder();
+        Reader reader = new BufferedReader(new InputStreamReader(zipInputStream, StandardCharsets.UTF_8));
+        int c;
+        while ((c = reader.read()) != -1) {
+            stringBuilder.append((char) c);
+        }
+        return stringBuilder.toString();
+    }
+
+    static public Bitmap readImage(ZipInputStream zipInputStream) {
+        return BitmapFactory.decodeStream(zipInputStream);
+    }
+
+    static public JSONObject readJSON(ZipInputStream zipInputStream) throws IOException, JSONException {
+        return new JSONObject(read(zipInputStream));
+    }
+}

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

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

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

@@ -0,0 +1,175 @@
+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.
+ * <p>
+ * 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
+ * <p>
+ * 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/CSVHelpers.java

@@ -0,0 +1,76 @@
+package protect.card_locker.importexport;
+
+import org.apache.commons.csv.CSVRecord;
+
+import protect.card_locker.FormatException;
+
+public class CSVHelpers {
+    /**
+     * Extract a string from the items array. The index into the array
+     * is determined by looking up the index in the fields map using the
+     * "key" as the key. If no such key exists, defaultValue is returned
+     * if it is not null. Otherwise, a FormatException is thrown.
+     */
+    static String extractString(String key, CSVRecord record, String defaultValue)
+            throws FormatException {
+        String toReturn = defaultValue;
+
+        if (record.isMapped(key)) {
+            toReturn = record.get(key);
+        } else {
+            if (defaultValue == null) {
+                throw new FormatException("Field not used but expected: " + key);
+            }
+        }
+
+        return toReturn;
+    }
+
+    /**
+     * Extract an integer from the items array. The index into the array
+     * is determined by looking up the index in the fields map using the
+     * "key" as the key. If no such key exists, or the data is not a valid
+     * int, a FormatException is thrown.
+     */
+    static Integer extractInt(String key, CSVRecord record, boolean nullIsOk)
+            throws FormatException {
+        if (record.isMapped(key) == false) {
+            throw new FormatException("Field not used but expected: " + key);
+        }
+
+        String value = record.get(key);
+        if (value.isEmpty() && nullIsOk) {
+            return null;
+        }
+
+        try {
+            return Integer.parseInt(record.get(key));
+        } catch (NumberFormatException e) {
+            throw new FormatException("Failed to parse field: " + key, e);
+        }
+    }
+
+    /**
+     * Extract a long from the items array. The index into the array
+     * is determined by looking up the index in the fields map using the
+     * "key" as the key. If no such key exists, or the data is not a valid
+     * int, a FormatException is thrown.
+     */
+    static Long extractLong(String key, CSVRecord record, boolean nullIsOk)
+            throws FormatException {
+        if (record.isMapped(key) == false) {
+            throw new FormatException("Field not used but expected: " + key);
+        }
+
+        String value = record.get(key);
+        if (value.isEmpty() && nullIsOk) {
+            return null;
+        }
+
+        try {
+            return Long.parseLong(record.get(key));
+        } catch (NumberFormatException e) {
+            throw new FormatException("Failed to parse field: " + key, e);
+        }
+    }
+}

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

@@ -0,0 +1,190 @@
+package protect.card_locker.importexport;
+
+import android.content.Context;
+import android.database.Cursor;
+import android.database.sqlite.SQLiteDatabase;
+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;
+import org.apache.commons.csv.CSVPrinter;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.nio.charset.StandardCharsets;
+
+import protect.card_locker.DBHelper;
+import protect.card_locker.Group;
+import protect.card_locker.ImageLocationType;
+import protect.card_locker.LoyaltyCard;
+import protect.card_locker.Utils;
+
+/**
+ * Class for exporting the database into CSV (Comma Separate Values)
+ * format.
+ */
+public class CatimaExporter implements Exporter {
+    public void exportData(Context context, SQLiteDatabase database, OutputStream output, char[] password) throws IOException, InterruptedException {
+        // Necessary vars
+        int readLen;
+        byte[] readBuffer = new byte[InternalZipConstants.BUFF_SIZE];
+
+        // Create zip output stream
+        ZipOutputStream zipOutputStream;
+
+        if (password != null && password.length > 0) {
+            zipOutputStream = new ZipOutputStream(output, password);
+        } else {
+            zipOutputStream = new ZipOutputStream(output);
+        }
+
+        // Generate CSV
+        ByteArrayOutputStream catimaOutputStream = new ByteArrayOutputStream();
+        OutputStreamWriter catimaOutputStreamWriter = new OutputStreamWriter(catimaOutputStream, StandardCharsets.UTF_8);
+        writeCSV(database, catimaOutputStreamWriter);
+
+        // Add CSV to zip file
+        ZipParameters csvZipParameters = createZipParameters("catima.csv", password);
+        zipOutputStream.putNextEntry(csvZipParameters);
+        InputStream csvInputStream = new ByteArrayInputStream(catimaOutputStream.toByteArray());
+        while ((readLen = csvInputStream.read(readBuffer)) != -1) {
+            zipOutputStream.write(readBuffer, 0, readLen);
+        }
+        zipOutputStream.closeEntry();
+
+        // Loop over all cards again
+        Cursor cardCursor = DBHelper.getLoyaltyCardCursor(database);
+        while (cardCursor.moveToNext()) {
+            // For each card
+            LoyaltyCard card = LoyaltyCard.toLoyaltyCard(cardCursor);
+
+            // For each image
+            for (ImageLocationType imageLocationType : ImageLocationType.values()) {
+                // If it exists, add to the .zip file
+                Bitmap image = Utils.retrieveCardImage(context, card.id, imageLocationType);
+                if (image != null) {
+                    ZipParameters imageZipParameters = createZipParameters(Utils.getCardImageFileName(card.id, imageLocationType), password);
+                    zipOutputStream.putNextEntry(imageZipParameters);
+                    InputStream imageInputStream = new ByteArrayInputStream(Utils.bitmapToByteArray(image));
+                    while ((readLen = imageInputStream.read(readBuffer)) != -1) {
+                        zipOutputStream.write(readBuffer, 0, readLen);
+                    }
+                    zipOutputStream.closeEntry();
+                }
+            }
+        }
+
+        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(SQLiteDatabase database, OutputStreamWriter output) throws IOException, InterruptedException {
+        CSVPrinter printer = new CSVPrinter(output, CSVFormat.RFC4180);
+
+        // Print the version
+        printer.printRecord("2");
+
+        printer.println();
+
+        // Print the header for groups
+        printer.printRecord(DBHelper.LoyaltyCardDbGroups.ID);
+
+        Cursor groupCursor = DBHelper.getGroupCursor(database);
+
+        while (groupCursor.moveToNext()) {
+            Group group = Group.toGroup(groupCursor);
+
+            printer.printRecord(group._id);
+
+            if (Thread.currentThread().isInterrupted()) {
+                throw new InterruptedException();
+            }
+        }
+
+        groupCursor.close();
+
+        // Print an empty line
+        printer.println();
+
+        // Print the header for cards
+        printer.printRecord(DBHelper.LoyaltyCardDbIds.ID,
+                DBHelper.LoyaltyCardDbIds.STORE,
+                DBHelper.LoyaltyCardDbIds.NOTE,
+                DBHelper.LoyaltyCardDbIds.EXPIRY,
+                DBHelper.LoyaltyCardDbIds.BALANCE,
+                DBHelper.LoyaltyCardDbIds.BALANCE_TYPE,
+                DBHelper.LoyaltyCardDbIds.CARD_ID,
+                DBHelper.LoyaltyCardDbIds.BARCODE_ID,
+                DBHelper.LoyaltyCardDbIds.BARCODE_TYPE,
+                DBHelper.LoyaltyCardDbIds.HEADER_COLOR,
+                DBHelper.LoyaltyCardDbIds.STAR_STATUS,
+                DBHelper.LoyaltyCardDbIds.LAST_USED);
+
+        Cursor cardCursor = DBHelper.getLoyaltyCardCursor(database);
+
+        while (cardCursor.moveToNext()) {
+            LoyaltyCard card = LoyaltyCard.toLoyaltyCard(cardCursor);
+
+            printer.printRecord(card.id,
+                    card.store,
+                    card.note,
+                    card.expiry != null ? card.expiry.getTime() : "",
+                    card.balance,
+                    card.balanceType,
+                    card.cardId,
+                    card.barcodeId,
+                    card.barcodeType != null ? card.barcodeType.name() : "",
+                    card.headerColor,
+                    card.starStatus,
+                    card.lastUsed);
+
+            if (Thread.currentThread().isInterrupted()) {
+                throw new InterruptedException();
+            }
+        }
+
+        cardCursor.close();
+
+        // Print an empty line
+        printer.println();
+
+        // Print the header for card group mappings
+        printer.printRecord(DBHelper.LoyaltyCardDbIdsGroups.cardID,
+                DBHelper.LoyaltyCardDbIdsGroups.groupID);
+
+        Cursor cardCursor2 = DBHelper.getLoyaltyCardCursor(database);
+
+        while (cardCursor2.moveToNext()) {
+            LoyaltyCard card = LoyaltyCard.toLoyaltyCard(cardCursor2);
+
+            for (Group group : DBHelper.getLoyaltyCardGroups(database, card.id)) {
+                printer.printRecord(card.id, group._id);
+            }
+
+            if (Thread.currentThread().isInterrupted()) {
+                throw new InterruptedException();
+            }
+        }
+
+        cardCursor2.close();
+
+        printer.close();
+    }
+}

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

@@ -0,0 +1,357 @@
+package protect.card_locker.importexport;
+
+import android.content.Context;
+import android.database.sqlite.SQLiteDatabase;
+import android.net.Uri;
+
+import net.lingala.zip4j.io.inputstream.ZipInputStream;
+import net.lingala.zip4j.model.LocalFileHeader;
+
+import org.apache.commons.csv.CSVFormat;
+import org.apache.commons.csv.CSVParser;
+import org.apache.commons.csv.CSVRecord;
+
+import java.io.BufferedInputStream;
+import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.StringReader;
+import java.math.BigDecimal;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+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;
+import protect.card_locker.Utils;
+import protect.card_locker.ZipUtils;
+
+/**
+ * Class for importing a database from CSV (Comma Separate Values)
+ * formatted data.
+ * <p>
+ * The database's loyalty cards are expected to appear in the CSV data.
+ * A header is expected for the each table showing the names of the columns.
+ */
+public class CatimaImporter implements Importer {
+    public void importData(Context context, SQLiteDatabase database, InputStream input, char[] password) throws IOException, FormatException, InterruptedException {
+        InputStream bufferedInputStream = new BufferedInputStream(input);
+        bufferedInputStream.mark(100);
+
+        // First, check if this is a zip file
+        ZipInputStream zipInputStream = new ZipInputStream(bufferedInputStream, password);
+
+        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, database, 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, database, bufferedInputStream);
+        }
+    }
+
+    public void importCSV(Context context, SQLiteDatabase database, InputStream input) throws IOException, FormatException, InterruptedException {
+        BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(input, StandardCharsets.UTF_8));
+
+        bufferedReader.mark(100);
+
+        Integer version = 1;
+
+        try {
+            version = Integer.parseInt(bufferedReader.readLine());
+        } catch (NumberFormatException _e) {
+            // Assume version 1
+        }
+
+        bufferedReader.reset();
+
+        switch (version) {
+            case 1:
+                parseV1(context, database, bufferedReader);
+                break;
+            case 2:
+                parseV2(context, database, bufferedReader);
+                break;
+            default:
+                throw new FormatException(String.format("No code to parse version %s", version));
+        }
+
+        bufferedReader.close();
+    }
+
+    public void parseV1(Context context, SQLiteDatabase database, BufferedReader input) throws IOException, FormatException, InterruptedException {
+        final CSVParser parser = new CSVParser(input, CSVFormat.RFC4180.builder().setHeader().build());
+
+        try {
+            for (CSVRecord record : parser) {
+                importLoyaltyCard(context, database, record);
+
+                if (Thread.currentThread().isInterrupted()) {
+                    throw new InterruptedException();
+                }
+            }
+
+            parser.close();
+        } catch (IllegalArgumentException | IllegalStateException e) {
+            throw new FormatException("Issue parsing CSV data", e);
+        }
+    }
+
+    public void parseV2(Context context, SQLiteDatabase database, BufferedReader input) throws IOException, FormatException, InterruptedException {
+        Integer part = 0;
+        String stringPart = "";
+
+        try {
+            while (true) {
+                String tmp = input.readLine();
+
+                if (tmp == null || tmp.isEmpty()) {
+                    boolean sectionParsed = false;
+
+                    switch (part) {
+                        case 0:
+                            // This is the version info, ignore
+                            sectionParsed = true;
+                            break;
+                        case 1:
+                            try {
+                                parseV2Groups(database, stringPart);
+                                sectionParsed = true;
+                            } catch (FormatException e) {
+                                // We may have a multiline field, try again
+                            }
+                            break;
+                        case 2:
+                            try {
+                                parseV2Cards(context, database, stringPart);
+                                sectionParsed = true;
+                            } catch (FormatException e) {
+                                // We may have a multiline field, try again
+                            }
+                            break;
+                        case 3:
+                            try {
+                                parseV2CardGroups(database, stringPart);
+                                sectionParsed = true;
+                            } catch (FormatException e) {
+                                // We may have a multiline field, try again
+                            }
+                            break;
+                        default:
+                            throw new FormatException("Issue parsing CSV data, too many parts for v2 parsing");
+                    }
+
+                    if (tmp == null) {
+                        break;
+                    }
+
+                    if (sectionParsed) {
+                        part += 1;
+                        stringPart = "";
+                    } else {
+                        stringPart += tmp + "\n";
+                    }
+                } else {
+                    stringPart += tmp + "\n";
+                }
+            }
+        } catch (FormatException e) {
+            throw new FormatException("Issue parsing CSV data", e);
+        }
+    }
+
+    public void parseV2Groups(SQLiteDatabase database, String data) throws IOException, FormatException, InterruptedException {
+        // Parse groups
+        final CSVParser groupParser = new CSVParser(new StringReader(data), CSVFormat.RFC4180.builder().setHeader().build());
+
+        List<CSVRecord> records = new ArrayList<>();
+
+        try {
+            for (CSVRecord record : groupParser) {
+                records.add(record);
+
+                if (Thread.currentThread().isInterrupted()) {
+                    throw new InterruptedException();
+                }
+            }
+        } catch (IllegalArgumentException | IllegalStateException e) {
+            throw new FormatException("Issue parsing CSV data", e);
+        } finally {
+            groupParser.close();
+        }
+
+        for (CSVRecord record : records) {
+            importGroup(database, record);
+        }
+    }
+
+    public void parseV2Cards(Context context, SQLiteDatabase database, String data) throws IOException, FormatException, InterruptedException {
+        // Parse cards
+        final CSVParser cardParser = new CSVParser(new StringReader(data), CSVFormat.RFC4180.builder().setHeader().build());
+
+        List<CSVRecord> records = new ArrayList<>();
+
+        try {
+            for (CSVRecord record : cardParser) {
+                records.add(record);
+
+                if (Thread.currentThread().isInterrupted()) {
+                    throw new InterruptedException();
+                }
+            }
+        } catch (IllegalArgumentException | IllegalStateException e) {
+            throw new FormatException("Issue parsing CSV data", e);
+        } finally {
+            cardParser.close();
+        }
+
+        for (CSVRecord record : records) {
+            importLoyaltyCard(context, database, record);
+        }
+    }
+
+    public void parseV2CardGroups(SQLiteDatabase database, String data) throws IOException, FormatException, InterruptedException {
+        // Parse card group mappings
+        final CSVParser cardGroupParser = new CSVParser(new StringReader(data), CSVFormat.RFC4180.builder().setHeader().build());
+
+        List<CSVRecord> records = new ArrayList<>();
+
+        try {
+            for (CSVRecord record : cardGroupParser) {
+                records.add(record);
+
+                if (Thread.currentThread().isInterrupted()) {
+                    throw new InterruptedException();
+                }
+            }
+        } catch (IllegalArgumentException | IllegalStateException e) {
+            throw new FormatException("Issue parsing CSV data", e);
+        } finally {
+            cardGroupParser.close();
+        }
+
+        for (CSVRecord record : records) {
+            importCardGroupMapping(database, record);
+        }
+    }
+
+    /**
+     * Import a single loyalty card into the database using the given
+     * session.
+     */
+    private void importLoyaltyCard(Context context, SQLiteDatabase database, CSVRecord record)
+            throws IOException, FormatException {
+        int id = CSVHelpers.extractInt(DBHelper.LoyaltyCardDbIds.ID, record, false);
+
+        String store = CSVHelpers.extractString(DBHelper.LoyaltyCardDbIds.STORE, record, "");
+        if (store.isEmpty()) {
+            throw new FormatException("No store listed, but is required");
+        }
+
+        String note = CSVHelpers.extractString(DBHelper.LoyaltyCardDbIds.NOTE, record, "");
+        Date expiry = null;
+        try {
+            expiry = new Date(CSVHelpers.extractLong(DBHelper.LoyaltyCardDbIds.EXPIRY, record, true));
+        } catch (NullPointerException | FormatException e) {
+        }
+
+        BigDecimal balance;
+        try {
+            balance = new BigDecimal(CSVHelpers.extractString(DBHelper.LoyaltyCardDbIds.BALANCE, record, null));
+        } catch (FormatException _e) {
+            // These fields did not exist in versions 1.8.1 and before
+            // We catch this exception so we can still import old backups
+            balance = new BigDecimal("0");
+        }
+
+        Currency balanceType = null;
+        String unparsedBalanceType = CSVHelpers.extractString(DBHelper.LoyaltyCardDbIds.BALANCE_TYPE, record, "");
+        if (!unparsedBalanceType.isEmpty()) {
+            balanceType = Currency.getInstance(unparsedBalanceType);
+        }
+
+        String cardId = CSVHelpers.extractString(DBHelper.LoyaltyCardDbIds.CARD_ID, record, "");
+        if (cardId.isEmpty()) {
+            throw new FormatException("No card ID listed, but is required");
+        }
+
+        String barcodeId = CSVHelpers.extractString(DBHelper.LoyaltyCardDbIds.BARCODE_ID, record, "");
+        if (barcodeId.isEmpty()) {
+            barcodeId = null;
+        }
+
+        CatimaBarcode barcodeType = null;
+        String unparsedBarcodeType = CSVHelpers.extractString(DBHelper.LoyaltyCardDbIds.BARCODE_TYPE, record, "");
+        if (!unparsedBarcodeType.isEmpty()) {
+            barcodeType = CatimaBarcode.fromName(unparsedBarcodeType);
+        }
+
+        Integer headerColor = null;
+
+        if (record.isMapped(DBHelper.LoyaltyCardDbIds.HEADER_COLOR)) {
+            headerColor = CSVHelpers.extractInt(DBHelper.LoyaltyCardDbIds.HEADER_COLOR, record, true);
+        }
+
+        int starStatus = 0;
+        try {
+            starStatus = CSVHelpers.extractInt(DBHelper.LoyaltyCardDbIds.STAR_STATUS, record, false);
+        } 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;
+
+        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
+        }
+
+        DBHelper.insertLoyaltyCard(database, id, store, note, expiry, balance, balanceType, cardId, barcodeId, barcodeType, headerColor, starStatus, lastUsed);
+    }
+
+    /**
+     * Import a single group into the database using the given
+     * session.
+     */
+    private void importGroup(SQLiteDatabase database, CSVRecord record) throws FormatException {
+        String id = CSVHelpers.extractString(DBHelper.LoyaltyCardDbGroups.ID, record, null);
+
+        DBHelper.insertGroup(database, id);
+    }
+
+    /**
+     * Import a single card to group mapping into the database using the given
+     * session.
+     */
+    private void importCardGroupMapping(SQLiteDatabase database, CSVRecord record) throws FormatException {
+        Integer cardId = CSVHelpers.extractInt(DBHelper.LoyaltyCardDbIdsGroups.cardID, record, false);
+        String groupId = CSVHelpers.extractString(DBHelper.LoyaltyCardDbIdsGroups.groupID, record, null);
+
+        List<Group> cardGroups = DBHelper.getLoyaltyCardGroups(database, cardId);
+        cardGroups.add(DBHelper.getGroup(database, groupId));
+        DBHelper.setLoyaltyCardGroups(database, cardId, cardGroups);
+    }
+}

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

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

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

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

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

@@ -0,0 +1,127 @@
+package protect.card_locker.importexport;
+
+import android.content.Context;
+import android.database.sqlite.SQLiteDatabase;
+
+import net.lingala.zip4j.io.inputstream.ZipInputStream;
+import net.lingala.zip4j.model.LocalFileHeader;
+
+import org.apache.commons.csv.CSVFormat;
+import org.apache.commons.csv.CSVParser;
+import org.apache.commons.csv.CSVRecord;
+import org.json.JSONException;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.StringReader;
+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;
+
+/**
+ * Class for importing a database from CSV (Comma Separate Values)
+ * formatted data.
+ * <p>
+ * The database's loyalty cards are expected to appear in the CSV data.
+ * A header is expected for the each table showing the names of the columns.
+ */
+public class FidmeImporter implements Importer {
+    public void importData(Context context, SQLiteDatabase database, InputStream input, char[] password) throws IOException, FormatException, JSONException, ParseException {
+        // We actually retrieve a .zip file
+        ZipInputStream zipInputStream = new ZipInputStream(input, password);
+
+        StringBuilder loyaltyCards = new StringBuilder();
+        byte[] buffer = new byte[1024];
+        int read = 0;
+
+        LocalFileHeader localFileHeader;
+
+        while ((localFileHeader = zipInputStream.getNextEntry()) != null) {
+            if (localFileHeader.getFileName().equals("loyalty_programs.csv")) {
+                while ((read = zipInputStream.read(buffer, 0, 1024)) >= 0) {
+                    loyaltyCards.append(new String(buffer, 0, read, StandardCharsets.UTF_8));
+                }
+            }
+        }
+
+        if (loyaltyCards.length() == 0) {
+            throw new FormatException("Couldn't find loyalty_programs.csv in zip file or it is empty");
+        }
+
+        final CSVParser fidmeParser = new CSVParser(new StringReader(loyaltyCards.toString()), CSVFormat.RFC4180.builder().setDelimiter(';').setHeader().build());
+
+        try {
+            for (CSVRecord record : fidmeParser) {
+                importLoyaltyCard(database, record);
+
+                if (Thread.currentThread().isInterrupted()) {
+                    throw new InterruptedException();
+                }
+            }
+        } catch (IllegalArgumentException | IllegalStateException | InterruptedException e) {
+            throw new FormatException("Issue parsing CSV data", e);
+        } finally {
+            fidmeParser.close();
+        }
+
+        zipInputStream.close();
+    }
+
+    /**
+     * Import a single loyalty card into the database using the given
+     * session.
+     */
+    private void importLoyaltyCard(SQLiteDatabase database, CSVRecord record)
+            throws FormatException {
+        // A loyalty card export from Fidme contains the following fields:
+        // Retailer (store name)
+        // Program (program name)
+        // Added at (YYYY-MM-DD HH:MM:SS UTC)
+        // Reference (card ID)
+        // Firstname (card holder first name)
+        // Lastname (card holder last name)
+
+        // The store is called Retailer
+        String store = CSVHelpers.extractString("Retailer", record, "");
+
+        if (store.isEmpty()) {
+            throw new FormatException("No store listed, but is required");
+        }
+
+        // There seems to be no note field in the CSV? So let's combine other fields instead...
+        String program = CSVHelpers.extractString("Program", record, "").trim();
+        String addedAt = CSVHelpers.extractString("Added At", record, "").trim();
+        String firstName = CSVHelpers.extractString("Firstname", record, "").trim();
+        String lastName = CSVHelpers.extractString("Lastname", record, "").trim();
+
+        String combinedName = String.format("%s %s", firstName, lastName).trim();
+
+        StringBuilder noteBuilder = new StringBuilder();
+        if (!program.isEmpty()) noteBuilder.append(program).append('\n');
+        if (!addedAt.isEmpty()) noteBuilder.append(addedAt).append('\n');
+        if (!combinedName.isEmpty()) noteBuilder.append(combinedName).append('\n');
+        String note = noteBuilder.toString().trim();
+
+        // The ID is called reference
+        String cardId = CSVHelpers.extractString("Reference", record, "");
+        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
+        CatimaBarcode barcodeType = null;
+
+        // No favourite data in the export either
+        int starStatus = 0;
+
+        // TODO: Front and back image
+
+        DBHelper.insertLoyaltyCard(database, store, note, null, BigDecimal.valueOf(0), null, cardId, null, barcodeType, null, starStatus, null);
+    }
+}

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

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

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

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

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

@@ -0,0 +1,51 @@
+package protect.card_locker.importexport;
+
+import android.content.Context;
+import android.database.sqlite.SQLiteDatabase;
+import android.util.Log;
+
+import java.io.IOException;
+import java.io.OutputStream;
+
+public class MultiFormatExporter {
+    private static final String TAG = "Catima";
+
+    /**
+     * Attempts to export data to the output stream in the
+     * given format, if possible.
+     * <p>
+     * The output stream is closed on success.
+     *
+     * @return ImportExportResult.Success if the database was successfully exported,
+     * 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, SQLiteDatabase database, OutputStream output, DataFormat format, char[] password) {
+        Exporter exporter = null;
+
+        switch (format) {
+            case Catima:
+                exporter = new CatimaExporter();
+                break;
+            default:
+                Log.e(TAG, "Failed to export data, unknown format " + format.name());
+                break;
+        }
+
+        if (exporter != null) {
+            try {
+                exporter.exportData(context, database, output, password);
+                return ImportExportResult.Success;
+            } catch (IOException e) {
+                Log.e(TAG, "Failed to export data", e);
+            } catch (InterruptedException e) {
+                Log.e(TAG, "Failed to export data", e);
+            }
+
+            return ImportExportResult.GenericFailure;
+        } else {
+            Log.e(TAG, "Unsupported data format exported: " + format.name());
+            return ImportExportResult.GenericFailure;
+        }
+    }
+}

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

@@ -0,0 +1,68 @@
+package protect.card_locker.importexport;
+
+import android.content.Context;
+import android.database.sqlite.SQLiteDatabase;
+import android.util.Log;
+
+import net.lingala.zip4j.exception.ZipException;
+
+import org.json.JSONException;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.text.ParseException;
+
+import protect.card_locker.FormatException;
+
+public class MultiFormatImporter {
+    private static final String TAG = "Catima";
+
+    /**
+     * Attempts to import data from the input stream of the
+     * given format into the database.
+     * <p>
+     * The input stream is not closed, and doing so is the
+     * responsibility of the caller.
+     *
+     * @return ImportExportResult.Success if the database was successfully imported,
+     * or another result otherwise. If no Success, no data was written to
+     * the database.
+     */
+    public static ImportExportResult importData(Context context, SQLiteDatabase database, InputStream input, DataFormat format, char[] password) {
+        Importer importer = null;
+
+        switch (format) {
+            case Catima:
+                importer = new CatimaImporter();
+                break;
+            case Fidme:
+                importer = new FidmeImporter();
+                break;
+            case Stocard:
+                importer = new StocardImporter();
+                break;
+            case VoucherVault:
+                importer = new VoucherVaultImporter();
+                break;
+        }
+
+        if (importer != null) {
+            database.beginTransaction();
+            try {
+                importer.importData(context, database, input, password);
+                database.setTransactionSuccessful();
+                return ImportExportResult.Success;
+            } catch (ZipException e) {
+                return ImportExportResult.BadPassword;
+            } catch (IOException | FormatException | InterruptedException | JSONException | ParseException | NullPointerException e) {
+                Log.e(TAG, "Failed to import data", e);
+            } finally {
+                database.endTransaction();
+            }
+        } else {
+            Log.e(TAG, "Unsupported data format imported: " + format.name());
+        }
+
+        return ImportExportResult.GenericFailure;
+    }
+}

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

@@ -0,0 +1,211 @@
+package protect.card_locker.importexport;
+
+import android.content.Context;
+import android.database.sqlite.SQLiteDatabase;
+import android.graphics.Bitmap;
+
+import com.google.zxing.BarcodeFormat;
+
+import net.lingala.zip4j.io.inputstream.ZipInputStream;
+import net.lingala.zip4j.model.LocalFileHeader;
+
+import org.apache.commons.csv.CSVFormat;
+import org.apache.commons.csv.CSVParser;
+import org.apache.commons.csv.CSVRecord;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.math.BigDecimal;
+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.ImageLocationType;
+import protect.card_locker.R;
+import protect.card_locker.Utils;
+import protect.card_locker.ZipUtils;
+
+/**
+ * Class for importing a database from CSV (Comma Separate Values)
+ * formatted data.
+ * <p>
+ * The database's loyalty cards are expected to appear in the CSV data.
+ * A header is expected for the each table showing the names of the columns.
+ */
+public class StocardImporter implements Importer {
+    public void importData(Context context, SQLiteDatabase database, InputStream input, char[] password) throws IOException, FormatException, JSONException, ParseException {
+        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.builder().setHeader().build());
+
+        try {
+            for (CSVRecord record : parser) {
+                HashMap<String, String> recordData = new HashMap<>();
+                recordData.put("name", record.get("name"));
+                recordData.put("barcodeFormat", record.get("barcodeFormat"));
+
+                providers.put(record.get("_id"), recordData);
+            }
+
+            parser.close();
+        } catch (IllegalArgumentException | IllegalStateException e) {
+            throw new FormatException("Issue parsing CSV data", e);
+        }
+
+        ZipInputStream zipInputStream = new ZipInputStream(input, password);
+
+        String[] providersFileName = null;
+        String[] cardBaseName = null;
+        String cardName = "";
+        LocalFileHeader localFileHeader;
+        while ((localFileHeader = zipInputStream.getNextEntry()) != null) {
+            String fileName = localFileHeader.getFileName();
+            String[] nameParts = fileName.split("/");
+
+            if (providersFileName == null) {
+                providersFileName = new String[]{
+                        nameParts[0],
+                        "sync",
+                        "data",
+                        "users",
+                        nameParts[0],
+                        "analytics-properties.json"
+                };
+                cardBaseName = new String[]{
+                        nameParts[0],
+                        "sync",
+                        "data",
+                        "users",
+                        nameParts[0],
+                        "loyalty-cards"
+                };
+            }
+
+            if (startsWith(nameParts, cardBaseName, 1)) {
+                // Extract cardName
+                cardName = nameParts[cardBaseName.length].split("\\.", 2)[0];
+
+                // This is the card itself
+                if (nameParts.length == cardBaseName.length + 1) {
+                    // Ignore the .txt file
+                    if (fileName.endsWith(".json")) {
+                        JSONObject jsonObject = ZipUtils.readJSON(zipInputStream);
+
+                        loyaltyCardHashMap = appendToLoyaltyCardHashMap(
+                                loyaltyCardHashMap,
+                                cardName,
+                                "cardId",
+                                jsonObject.getString("input_id")
+                        );
+                        loyaltyCardHashMap = appendToLoyaltyCardHashMap(
+                                loyaltyCardHashMap,
+                                cardName,
+                                "_providerId",
+                                jsonObject
+                                        .getJSONObject("input_provider_reference")
+                                        .getString("identifier")
+                                        .substring("/loyalty-card-providers/".length())
+                        );
+
+                        if (jsonObject.has("input_barcode_format")) {
+                            loyaltyCardHashMap = appendToLoyaltyCardHashMap(
+                                    loyaltyCardHashMap,
+                                    cardName,
+                                    "barcodeType",
+                                    jsonObject.getString("input_barcode_format")
+                            );
+                        }
+                    }
+                } else if (fileName.endsWith("notes/default.json")) {
+                    loyaltyCardHashMap = appendToLoyaltyCardHashMap(
+                            loyaltyCardHashMap,
+                            cardName,
+                            "note",
+                            ZipUtils.readJSON(zipInputStream)
+                                    .getString("content")
+                    );
+                } else if (fileName.endsWith("/images/front.png")) {
+                    loyaltyCardHashMap = appendToLoyaltyCardHashMap(
+                            loyaltyCardHashMap,
+                            cardName,
+                            "frontImage",
+                            ZipUtils.readImage(zipInputStream)
+                    );
+                } else if (fileName.endsWith("/images/back.png")) {
+                    loyaltyCardHashMap = appendToLoyaltyCardHashMap(
+                            loyaltyCardHashMap,
+                            cardName,
+                            "backImage",
+                            ZipUtils.readImage(zipInputStream)
+                    );
+                }
+            }
+        }
+
+        if (loyaltyCardHashMap.keySet().size() == 0) {
+            throw new FormatException("Couldn't find any loyalty cards in this Stocard export.");
+        }
+
+        for (HashMap<String, Object> loyaltyCardData : loyaltyCardHashMap.values()) {
+            String providerId = (String) loyaltyCardData.get("_providerId");
+            HashMap<String, String> providerData = providers.get(providerId);
+
+            String store = providerData != null ? providerData.get("name") : providerId;
+            String note = (String) Utils.mapGetOrDefault(loyaltyCardData, "note", "");
+            String cardId = (String) loyaltyCardData.get("cardId");
+            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 = CatimaBarcode.fromBarcode(BarcodeFormat.RSS_EXPANDED);
+                } else {
+                    barcodeType = CatimaBarcode.fromName(barcodeTypeString);
+                }
+            }
+
+            long loyaltyCardInternalId = DBHelper.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, ImageLocationType.front);
+            }
+            if (loyaltyCardData.containsKey("backImage")) {
+                Utils.saveCardImage(context, (Bitmap) loyaltyCardData.get("backImage"), (int) loyaltyCardInternalId, ImageLocationType.back);
+            }
+        }
+
+        zipInputStream.close();
+    }
+
+    private boolean startsWith(String[] full, String[] start, int minExtraLength) {
+        if (full.length - minExtraLength < start.length) {
+            return false;
+        }
+
+        for (int i = 0; i < start.length; i++) {
+            if (!start[i].contentEquals(full[i])) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    private HashMap<String, HashMap<String, Object>> appendToLoyaltyCardHashMap(HashMap<String, HashMap<String, Object>> loyaltyCardHashMap, String cardID, String key, Object value) {
+        HashMap<String, Object> loyaltyCardData = loyaltyCardHashMap.get(cardID);
+        if (loyaltyCardData == null) {
+            loyaltyCardData = new HashMap<>();
+        }
+
+        loyaltyCardData.put(key, value);
+        loyaltyCardHashMap.put(cardID, loyaltyCardData);
+
+        return loyaltyCardHashMap;
+    }
+}

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

@@ -0,0 +1,134 @@
+package protect.card_locker.importexport;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.database.sqlite.SQLiteDatabase;
+import android.graphics.Color;
+
+import com.google.zxing.BarcodeFormat;
+
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.math.BigDecimal;
+import java.nio.charset.StandardCharsets;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+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)
+ * formatted data.
+ * <p>
+ * The database's loyalty cards are expected to appear in the CSV data.
+ * A header is expected for the each table showing the names of the columns.
+ */
+public class VoucherVaultImporter implements Importer {
+    public void importData(Context context, SQLiteDatabase database, InputStream input, char[] password) throws IOException, FormatException, JSONException, ParseException {
+        BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(input, StandardCharsets.UTF_8));
+
+        StringBuilder sb = new StringBuilder();
+        String line;
+        while ((line = bufferedReader.readLine()) != null) {
+            sb.append(line);
+        }
+        JSONArray jsonArray = new JSONArray(sb.toString());
+
+        // See https://github.com/tim-smart/vouchervault/issues/4#issuecomment-788226503 for more info
+        for (int i = 0; i < jsonArray.length(); i++) {
+            JSONObject jsonCard = jsonArray.getJSONObject(i);
+
+            String store = jsonCard.getString("description");
+
+            Date expiry = null;
+            if (!jsonCard.isNull("expires")) {
+                @SuppressLint("SimpleDateFormat") SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS");
+                dateFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
+                expiry = dateFormat.parse(jsonCard.getString("expires"));
+            }
+
+            BigDecimal balance = new BigDecimal("0");
+            if (jsonCard.has("balanceMilliunits")) {
+                if (!jsonCard.isNull("balanceMilliunits")) {
+                    balance = new BigDecimal(String.valueOf(jsonCard.getInt("balanceMilliunits") / 1000.0));
+                }
+            } else if (!jsonCard.isNull("balance")) {
+                balance = new BigDecimal(String.valueOf(jsonCard.getDouble("balance")));
+            }
+
+            Currency balanceType = Currency.getInstance("USD");
+
+            String cardId = jsonCard.getString("code");
+
+            CatimaBarcode barcodeType = null;
+
+            String codeTypeFromJSON = jsonCard.getString("codeType");
+            switch (codeTypeFromJSON) {
+                case "CODE128":
+                    barcodeType = CatimaBarcode.fromBarcode(BarcodeFormat.CODE_128);
+                    break;
+                case "CODE39":
+                    barcodeType = CatimaBarcode.fromBarcode(BarcodeFormat.CODE_39);
+                    break;
+                case "EAN13":
+                    barcodeType = CatimaBarcode.fromBarcode(BarcodeFormat.EAN_13);
+                    break;
+                case "PDF417":
+                    barcodeType = CatimaBarcode.fromBarcode(BarcodeFormat.PDF_417);
+                    break;
+                case "QR":
+                    barcodeType = CatimaBarcode.fromBarcode(BarcodeFormat.QR_CODE);
+                    break;
+                case "TEXT":
+                    break;
+                default:
+                    throw new FormatException("Unknown barcode type found: " + codeTypeFromJSON);
+            }
+
+            int headerColor;
+
+            String colorFromJSON = jsonCard.getString("color");
+            switch (colorFromJSON) {
+                case "GREY":
+                    headerColor = Color.GRAY;
+                    break;
+                case "BLUE":
+                    headerColor = Color.BLUE;
+                    break;
+                case "GREEN":
+                    headerColor = Color.GREEN;
+                    break;
+                case "ORANGE":
+                    headerColor = Color.rgb(255, 165, 0);
+                    break;
+                case "PURPLE":
+                    headerColor = Color.rgb(128, 0, 128);
+                    break;
+                case "RED":
+                    headerColor = Color.RED;
+                    break;
+                case "YELLOW":
+                    headerColor = Color.YELLOW;
+                    break;
+                default:
+                    throw new FormatException("Unknown colour type found: " + colorFromJSON);
+            }
+
+            DBHelper.insertLoyaltyCard(database, store, "", expiry, balance, balanceType, cardId, null, barcodeType, headerColor, 0, Utils.getUnixTime());
+        }
+
+        bufferedReader.close();
+    }
+}

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

@@ -2,97 +2,109 @@ package protect.card_locker.preferences;
 
 import android.content.Context;
 import android.content.SharedPreferences;
-import android.preference.PreferenceManager;
+
+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
-{
-    private Context context;
-    private SharedPreferences settings;
+public class Settings {
+    private final Context mContext;
+    private SharedPreferences mSettings;
 
-    public Settings(Context context)
-    {
-        this.context = context;
-        this.settings = PreferenceManager.getDefaultSharedPreferences(context);
+    public Settings(Context context) {
+        mContext = context.getApplicationContext();
+        mSettings = PreferenceManager.getDefaultSharedPreferences(context);
     }
 
-    private String getResString(@StringRes int resId)
-    {
-        return context.getString(resId);
+    private String getResString(@StringRes int resId) {
+        return mContext.getString(resId);
     }
 
-    private int getResInt(@IntegerRes int resId)
-    {
-        return context.getResources().getInteger(resId);
+    private int getResInt(@IntegerRes int resId) {
+        return mContext.getResources().getInteger(resId);
     }
 
-    private String getString(@StringRes int keyId, String defaultValue)
-    {
-        return settings.getString(getResString(keyId), defaultValue);
+    private String getString(@StringRes int keyId, String defaultValue) {
+        return mSettings.getString(getResString(keyId), defaultValue);
     }
 
-    private int getInt(@StringRes int keyId, @IntegerRes int defaultId)
-    {
-        return settings.getInt(getResString(keyId), getResInt(defaultId));
+    private int getInt(@StringRes int keyId, @IntegerRes int defaultId) {
+        return mSettings.getInt(getResString(keyId), getResInt(defaultId));
     }
 
-    private boolean getBoolean(@StringRes int keyId, boolean defaultValue)
-    {
-        return settings.getBoolean(getResString(keyId), defaultValue);
+    private boolean getBoolean(@StringRes int keyId, boolean defaultValue) {
+        return mSettings.getBoolean(getResString(keyId), defaultValue);
     }
 
-    public int getTheme()
-    {
+    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));
 
-        if(value.equals(getResString(R.string.settings_key_light_theme)))
-        {
+        if (value.equals(getResString(R.string.settings_key_light_theme))) {
             return AppCompatDelegate.MODE_NIGHT_NO;
-        }
-        else if(value.equals(getResString(R.string.settings_key_dark_theme)))
-        {
+        } else if (value.equals(getResString(R.string.settings_key_dark_theme))) {
             return AppCompatDelegate.MODE_NIGHT_YES;
         }
 
         return AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM;
     }
 
-    public int getCardTitleListFontSize()
-    {
-        return getInt(R.string.settings_key_card_title_list_font_size, R.integer.settings_card_title_list_font_size_sp);
+    public double getFontSizeScale() {
+        return getInt(R.string.settings_key_max_font_size_scale, R.integer.settings_max_font_size_scale_pct) / 100.0;
     }
 
-    public int getCardNoteListFontSize()
-    {
-        return getInt(R.string.settings_key_card_note_list_font_size, R.integer.settings_card_note_list_font_size_sp);
+    public int getSmallFont() {
+        return 14;
     }
 
-    public int getCardTitleFontSize()
-    {
-        return getInt(R.string.settings_key_card_title_font_size, R.integer.settings_card_title_font_size_sp);
+    public int getMediumFont() {
+        return 28;
     }
 
-    public int getCardIdFontSize()
-    {
-        return getInt(R.string.settings_key_card_id_font_size, R.integer.settings_card_id_font_size_sp);
+    public int getLargeFont() {
+        return 40;
     }
 
-    public int getCardNoteFontSize()
-    {
-        return getInt(R.string.settings_key_card_note_font_size, R.integer.settings_card_note_font_size_sp);
+    public int getFontSizeMin(int fontSize) {
+        return (int) (Math.round(fontSize / 2.0) - 1);
     }
 
-    public boolean useMaxBrightnessDisplayingBarcode()
-    {
+    public int getFontSizeMax(int fontSize) {
+        return (int) Math.round(fontSize * getFontSizeScale());
+    }
+
+    public boolean useMaxBrightnessDisplayingBarcode() {
         return getBoolean(R.string.settings_key_display_barcode_max_brightness, true);
     }
 
-    public boolean getLockBarcodeScreenOrientation()
-    {
+    public boolean getLockBarcodeScreenOrientation() {
         return getBoolean(R.string.settings_key_lock_barcode_orientation, false);
     }
+
+    public boolean getKeepScreenOn() {
+        return getBoolean(R.string.settings_key_keep_screen_on, true);
+    }
+
+    public boolean getDisableLockscreenWhileViewingCard() {
+        return getBoolean(R.string.settings_key_disable_lockscreen_while_viewing_card, true);
+    }
+
+    public boolean getOledDark() {
+        return getBoolean(R.string.settings_key_oled_dark, false);
+    }
 }

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

@@ -1,80 +1,172 @@
 package protect.card_locker.preferences;
 
+
+import android.app.Activity;
+import android.content.Intent;
 import android.os.Bundle;
-import android.preference.Preference;
-import android.preference.PreferenceFragment;
-import androidx.appcompat.app.ActionBar;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.app.AppCompatDelegate;
 import android.view.MenuItem;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AppCompatDelegate;
+import androidx.appcompat.widget.Toolbar;
+import androidx.fragment.app.DialogFragment;
+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.MainActivity;
 import protect.card_locker.R;
+import protect.card_locker.Utils;
+
+public class SettingsActivity extends CatimaAppCompatActivity {
+
+    private final static String RELOAD_MAIN_STATE = "mReloadMain";
+    private SettingsFragment fragment;
 
-public class SettingsActivity extends AppCompatActivity
-{
     @Override
-    protected void onCreate(Bundle savedInstanceState)
-    {
+    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)
-        {
-            getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+        if (actionBar != null) {
+            actionBar.setDisplayHomeAsUpEnabled(true);
         }
 
         // Display the fragment as the main content.
-        getFragmentManager().beginTransaction()
-                .replace(android.R.id.content, new SettingsFragment())
+        fragment = new SettingsFragment();
+        getSupportFragmentManager().beginTransaction()
+                .replace(R.id.settings_container, fragment)
                 .commit();
+
+        // restore reload main state
+        if (savedInstanceState != null) {
+            fragment.mReloadMain = savedInstanceState.getBoolean(RELOAD_MAIN_STATE);
+        }
     }
 
     @Override
-    public boolean onOptionsItemSelected(MenuItem item)
-    {
+    protected void onSaveInstanceState(@NonNull Bundle outState) {
+        super.onSaveInstanceState(outState);
+        outState.putBoolean(RELOAD_MAIN_STATE, fragment.mReloadMain);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
         int id = item.getItemId();
 
-        if(id == android.R.id.home)
-        {
-            finish();
+        if (id == android.R.id.home) {
+            finishSettingsActivity();
             return true;
         }
 
         return super.onOptionsItemSelected(item);
     }
 
-    public static class SettingsFragment extends PreferenceFragment
-    {
-        @Override
-        public void onCreate(final Bundle savedInstanceState)
-        {
-            super.onCreate(savedInstanceState);
+    @Override
+    public void onBackPressed() {
+        finishSettingsActivity();
+    }
 
+    private void finishSettingsActivity() {
+        if (fragment.mReloadMain) {
+            Intent intent = new Intent();
+            intent.putExtra(MainActivity.RESTART_ACTIVITY_INTENT, true);
+            setResult(Activity.RESULT_OK, intent);
+        } else {
+            setResult(Activity.RESULT_OK);
+        }
+        finish();
+    }
+
+    public static class SettingsFragment extends PreferenceFragmentCompat {
+        private static final String DIALOG_FRAGMENT_TAG = "SettingsFragment";
+
+        public boolean mReloadMain;
+
+        @Override
+        public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
             // Load the preferences from an XML resource
             addPreferencesFromResource(R.xml.preferences);
 
-            findPreference(getResources().getString(R.string.settings_key_theme)).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);
-                    }
-
-                    getActivity().recreate();
-                    return true;
+            // 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((preference, o) -> {
+                if (o.toString().equals(getResources().getString(R.string.settings_key_light_theme))) {
+                    AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
+                } else if (o.toString().equals(getResources().getString(R.string.settings_key_dark_theme))) {
+                    AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
+                } else {
+                    AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM);
+                }
+
+                return true;
             });
+
+            localePreference.setOnPreferenceChangeListener((preference, newValue) -> {
+                refreshActivity(true);
+                return true;
+            });
+
+            Preference oledDarkPreference = findPreference(getResources().getString(R.string.settings_key_oled_dark));
+            assert oledDarkPreference != null;
+            oledDarkPreference.setOnPreferenceChangeListener((preference, newValue) -> {
+                refreshActivity(true);
+                return true;
+            });
+        }
+
+        private void refreshActivity(boolean reloadMain) {
+            mReloadMain = reloadMain || mReloadMain;
+            Activity activity = getActivity();
+            if (activity != null) {
+                activity.recreate();
+            }
+        }
+
+        @Override
+        public void onDisplayPreferenceDialog(Preference preference) {
+            if (preference instanceof NumberDialogPreference) {
+                NumberDialogPreference dialogPreference = (NumberDialogPreference) preference;
+                DialogFragment dialogFragment = NumberPickerPreferenceDialogFragment
+                        .newInstance(
+                                dialogPreference.getKey(),
+                                dialogPreference.getMinValue(),
+                                dialogPreference.getMaxValue(),
+                                dialogPreference.getStepValue(),
+                                dialogPreference.getUnitText()
+                        );
+                dialogFragment.setTargetFragment(this, 0);
+                dialogFragment.show(getParentFragmentManager(), DIALOG_FRAGMENT_TAG);
+            } else {
+                super.onDisplayPreferenceDialog(preference);
+            }
         }
     }
 }