Release v1.14

Translations update from Weblate

.github/workflows/android.yml

@@ -0,0 +1,34 @@
+name: Android CI
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - uses: gradle/wrapper-validation-action@v1
+    - name: set up JDK 1.8
+      uses: actions/setup-java@v1
+      with:
+        java-version: 1.8
+    - name: Build
+      run: ./gradlew assembleRelease
+    - name: Check lint
+      run: ./gradlew lintRelease
+    - name: Run unit tests
+      run: ./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/calibreapp-image-actions.yml

@@ -0,0 +1,31 @@
+name: Compress Images on Push to Master
+on:
+  push:
+    branches:
+      - master
+    paths:
+      - '**.jpg'
+      - '**.jpeg'
+      - '**.png'
+      - '**.webp'
+jobs:
+  build:
+    name: calibreapp/image-actions
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Repo
+        uses: actions/checkout@master
+      - name: Compress Images
+        id: calibre
+        uses: calibreapp/image-actions@master
+        with:
+          githubToken: ${{ secrets.GITHUB_TOKEN }}
+          compressOnly: true
+      - name: Create New Pull Request If Needed
+        if: steps.calibre.outputs.markdown != ''
+        uses: peter-evans/create-pull-request@master
+        with:
+          title: Compressed Images
+          branch-suffix: timestamp
+          commit-message: Compressed Images
+          body: ${{ steps.calibre.outputs.markdown }}

.gitignore

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

.travis.yml

@@ -1,16 +0,0 @@
-language: android
-sudo: true
-
-install:
-- echo y | android update sdk -u -a -t tools
-- echo y | android update sdk -u -a -t platform-tools
-- echo y | android update sdk -u -a -t build-tools-25.0.2
-- echo y | android update sdk -u -a -t android-25
-- echo y | android update sdk -u -a -t extra-google-m2repository
-- echo y | android update sdk -u -a -t extra-android-m2repository
-
-script: ./gradlew assembleRelease testReleaseUnitTest lintRelease findbugs
-
-after_failure:
-- cat app/build/reports/findbugs/findbugs.html
-- cat app/build/reports/tests/debug/index.html

CHANGELOG.md

@@ -1,43 +1,434 @@
+# Changelog
+
+## v1.14 (2021-06-07)
+
+Changes:
+
+- Support new PDF417 export from Voucher Vault
+- Support copying multiple barcodes at once
+- Support sharing multiple loyalty cards at once
+- Ask to update barcode value if card ID changes
+
+## v1.13 (2021-04-10)
+
+Changes:
+
+- 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 (2021-03-30)
+
+Changes:
+
+- Support importing [Fidme](https://play.google.com/store/apps/details?id=fr.snapp.fidme) exports
+- Allow importing a card from a picture stored in the user's Android gallery
+- Fix multiline note cutoff
+- Change "Thank you" text on privacy dialog to "Accept" because Huawei is overly pedantic
+
+## v1.11 (2021-03-21)
+
+Changes:
+
+- Add privacy policy dialog on first start (required by Huawei)
+
+## v1.10 (2021-03-07)
+
+Changes:
+
+- Support importing [Voucher Vault](https://github.com/tim-smart/vouchervault/) exports
+- Option to keep the screen on while viewing a loyalty card
+- Option to suspend the lock screen while viewing a loyalty card
+
+## v1.9.2 (2021-02-24)
+
+Changes:
+
+- Fix parsing balance for countries using space as separator
+
+## v1.9.1 (2021-02-23)
+
+Changes:
+
+- Improve balance parsing logic
+- Fix currency decimal display on main screen
+
+## v1.9 (2021-02-22)
+
+Changes:
+
+- Add balance support
+- Reorganize barcode tab of edit view
+
+## v1.8.1 (2021-02-12)
+
+Changes:
+
+- Fix Crash on versions before Android 7
+
+## v1.8 (2021-01-28)
+
+Changes:
+
+- Add support for scaling the barcode when moving to top to fit even more small scanners
+- Fix bottom sheet jumping after switching to fullscreen
+- Make header in loyalty card view small in landscape mode
+- Fix cards not staying in group when group gets renamed
+
+## v1.7.1 (2021-01-18)
+
+Changes:
+
+- Fix crash on switching to barcode tab in edit view if there is no barcode
+
+## v1.7.0 (2021-01-18)
+
+Changes:
+
+- Separate edit UI in tabs to make it feel more spacious
+- Add expiry field support
+
+## v1.6.2 (2021-01-04)
+
+Changes:
+
+- Fix edit button or more info bottom sheet drawing over barcode ID
+
+## v1.6.1 (2020-12-16)
+
+Changes:
+
+- Fix regression causing manual barcode entry to not be saved
+
+## v1.6.0 (2020-12-15)
+
+Changes:
+
+- Automatically focus text field when creating or editing a group
+- Fix blurry icons (use SVG everywhere)
+- Always open camera but add manual scan button to camera view
+
+## v1.5.1 (2020-12-03)
+
+Changes:
+
+- Fix bottomsheet background being transparent
+
+## v1.5.0 (2020-12-03)
+
+Changes:
+
+- Improve contrast by always using white text on red buttons
+- Draggable bottom sheet in loyalty card view
+
+## v1.4.1 (2020-12-01)
+
+Changes:
+
+- Improved translations
+- Small UI fixes
+
+## v1.4.0 (2020-11-28)
+
+Changes:
+
+- Move About screen into its own activity
+- Ask user if they want to use their camera or manually enter ID on add/edit card
+- Make group ordering manual instead of forced alphabetically
+
+## v1.3.0 (2020-11-22)
+
+Changes:
+
+- Always show all import/export options and show a toast on actual issues (improves compat with XPrivacyLua)
+- Ask for confirmation when leaving edit view after making changes without saving
+
+## v1.2.2 (2020-11-19)
+
+Changes:
+
+- Remember active group tab between screens and sessions
+
+## v1.2.1 (2020-11-17)
+
+Changes:
+
+- Fix home screen swiping triggering during vertical swipes too
+
+## v1.2.0 (2020-11-17)
+
+Changes:
+
+- Add swiping between groups on the home screen
+- Fix crash with cards lacking header colour
+
+## v1.1.0 (2020-11-11)
+
+Changes:
+
+- Improved edit UI
+- Removed header text colour option (now automatically generated based on brightness)
+- Updated translations
+
+## v1.0.1 (2020-11-07)
+
+Changes:
+
+- Fix crash in search with no groups
+
+## v1.0 (2020-11-06)
+
+Changes:
+
+- Added rounded edges to card icons on main overview
+- Added support for grouping entries
+
+## v0.29 (2020-10-29)
+
+Changes:
+
+- Rebrand to Catima
+- Removed intro
+- Add floating action buttons
+- Fix Android 5 crash when opening About screen
+- Add favourites support
+- Fix disabled auto-rotate being ignored
+
+## v0.28 (2020-03-09)
+
+Changes:
+
+- 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:
+
+- 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:
+
+- Fix issue with sharing cards without background color ([#343](https://github.com/brarcher/loyalty-card-locker/pull/343))
+
+## v0.26 (2020-01-05)
+
+Changes:
+
+- 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))
+- Dark mode support ([#322](https://github.com/brarcher/loyalty-card-locker/pull/322))
+- Loyalty cards can now be barcodeless (e.g. not have a barcode) ([#324](https://github.com/brarcher/loyalty-card-locker/pull/324))
+- Notes can span multiple lines ([#326](https://github.com/brarcher/loyalty-card-locker/pull/326))
+- Improvements with the sizing of notes ([#319](https://github.com/brarcher/loyalty-card-locker/pull/319))
+- Improve notification and app icon visibility ([#330](https://github.com/brarcher/loyalty-card-locker/pull/330))
+- Update target SDK to Android 10
+- Improve the following translations:
+  - German
+  - Italian
+  - Dutch
+  - Polish
+  - Russian
+
+## v0.25.4 (2019-10-04)
+
+Changes:
+
+- Enable app backups
+- Update French and Slovenian translations
+
+## v0.25.3 (2019-03-02)
+
+Changes:
+
+- Update Russian translations
+
+## v0.25.2 (2019-01-05)
+
+Changes:
+
+- Update and add translations
+
+## v0.25.1 (2018-10-14)
+
+Changes:
+
+- 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:
+
+- 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:
+
+- 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:
+
+- 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:
+
+- Added translations
+  - Polish ([pull #232](https://github.com/brarcher/loyalty-card-locker/pull/232))
+  - Spanish ([pull #232](https://github.com/brarcher/loyalty-card-locker/pull/232))
+  - 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:
+
+- 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:
+
+- 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:
+
+- 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:
+
+- 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:
+
+- 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:
+
+- 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:
+
+- 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:
+
+- 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:
+
+- 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:
+
+- 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:
+
+- 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:
+
+- 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))
+- Fix exporting backups on Android 7+. ([pull #153](https://github.com/brarcher/loyalty-card-locker/pull/153))
+- 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:
-- Add support for app shortcuts (Android 7.1+), where the most recently used cards will appear as shortcuts. (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. (https://github.com/brarcher/loyalty-card-locker/pull/142)
+
+- 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:
-- 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. (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. (https://github.com/brarcher/loyalty-card-locker/pull/132)
-- Fix case where layout IDs for intro wizard could not be found. (https://github.com/brarcher/loyalty-card-locker/pull/128)
+
+- 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:
 
-- 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. (https://github.com/brarcher/loyalty-card-locker/pull/126)
-- Update German and French translations. (https://github.com/brarcher/loyalty-card-locker/pull/122, https://github.com/brarcher/loyalty-card-locker/pull/124, https://github.com/brarcher/loyalty-card-locker/pull/125)
+- 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:
+
 - Prevent a crash when rotation the screen in the first run intro wizard.
 
 ## v0.11 (2017-06-26)
 
 Improvements:
-- When editing a card ID, pre-populate the existing ID to start. (https://github.com/brarcher/loyalty-card-locker/pull/94)
-- Limit the width of generated barcodes to reduce memory usage and out of memory errors. (https://github.com/brarcher/loyalty-card-locker/pull/103)
-- When editing a card, change the "Enter Card" button to say "Edit Card" if a card ID already exists. (https://github.com/brarcher/loyalty-card-locker/pull/104)
-- Change the color scheme to be softer and compatible with the app icon, and change the layout when viewing a card to be cleaner. (https://github.com/brarcher/loyalty-card-locker/pull/107)
-- Add an intro wizard which launches on the app's first launch. (https://github.com/brarcher/loyalty-card-locker/pull/108)
+
+- 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))
+- When editing a card, change the "Enter Card" button to say "Edit Card" if a card ID already exists. ([pull #104](https://github.com/brarcher/loyalty-card-locker/pull/104))
+- 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:
-- Changed the default import/export filename. (https://github.com/brarcher/loyalty-card-locker/pull/84)
-- Correct string on the import/export page. (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. (https://github.com/brarcher/loyalty-card-locker/pull/91)
+
+- 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)
 
@@ -45,43 +436,50 @@ The "Locker" part of the name was not intuitive. To help remedy this a new appli
 
 Additional features/improvements:
 
-- Importing/Exporting cards was changed to be more flexible. (https://github.com/brarcher/loyalty-card-locker/pull/76)
-- Translations for Lithuanian added. (https://github.com/brarcher/loyalty-card-locker/pull/62)
-- Translations for French added. (https://github.com/brarcher/loyalty-card-locker/pull/80)
+- Importing/Exporting cards was changed to be more flexible. ([pull #76](https://github.com/brarcher/loyalty-card-locker/pull/76))
+- 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:
-- Screen brightness increased to its maximum when displaying a card, to help barcode scanners successfully capture the barcode. (https://github.com/brarcher/loyalty-card-locker/pull/54)
-- Add a delete confirmation when deleting a card. (https://github.com/brarcher/loyalty-card-locker/pull/55)
-- Add translations for German (https://github.com/brarcher/loyalty-card-locker/pull/57) and Czech (https://github.com/brarcher/loyalty-card-locker/pull/58).
-- Clarification change for Italian translation. (https://github.com/brarcher/loyalty-card-locker/pull/66)
+
+- 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:
-- Long-click of a card brings up option to copy card ID to the clipboard. (https://github.com/brarcher/loyalty-card-locker/issues/49)
+
+- 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:
-- 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. https://github.com/brarcher/loyalty-card-locker/issues/33, https://github.com/brarcher/loyalty-card-locker/pull/44 
+
+- 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. (https://github.com/brarcher/loyalty-card-locker/issues/37)
+
+- 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:
-- An about dialog can be opened from the main screen, which gives details about the application and project on GitHub (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 (https://github.com/brarcher/loyalty-card-locker/issues/36 https://github.com/brarcher/loyalty-card-locker/issues/20)
+
+- 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:
+
 - Dutch translation
 - Allow name field to be editable after adding loyalty card
 - Add an optional note field
@@ -93,17 +491,18 @@ Bug fixes:
 ## v0.3 (2016-02-11)
 
 - Now officially supports the following list of 1D and 2D barcodes:
-  * AZTEC
-  * CODABAR
-  * CODE_39
-  * CODE_128
-  * DATA_MATRIX
-  * EAN_8
-  * EAN_13
-  * ITF
-  * PDF_417
-  * QR_CODE
- * UPC_A
+  - AZTEC
+  - CODABAR
+  - CODE_39
+  - CODE_128
+  - DATA_MATRIX
+  - EAN_8
+  - EAN_13
+  - ITF
+  - PDF_417
+  - QR_CODE
+  - UPC_A
+
 - Generated barcodes are larger, easier to scan from a scanning device
 
 ## v0.2 (2016-02-07)
@@ -112,7 +511,6 @@ Bug fixes:
 - 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)
 
 - Ability to create/edit/delete loyalty cards

CONTRIBUTING.md

@@ -0,0 +1,91 @@
+How to Submit Patches to the Loyalty Card Keychain Project
+===============================================================================
+https://github.com/brarcher/budget-watch
+
+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
+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.
+
+## Test Your Code
+
+There are four possible tests you can run to verify your code.  The first
+is unit tests, which check the basic functionality of the application, and
+can be run by gradle using:
+
+    # ./gradlew testReleaseUnitTest
+
+The second and third check for common problems using static analysis.
+These are the Android lint checker, run using:
+
+    # ./gradlew lintRelease
+
+and FindBugs, run using:
+
+    # ./gradlew findbugs
+
+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 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.
+
+## Explain Your Work
+
+At the top of every patch you should include a description of the problem you
+are trying to solve, how you solved it, and why you chose the solution you
+implemented.  If you are submitting a bug fix, it is also incredibly helpful
+if you can describe/include a reproducer for the problem in the description as
+well as instructions on how to test for the bug and verify that it has been
+fixed.
+
+## Sign Your Work
+
+The sign-off is a simple line at the end of the patch description, which
+certifies that you wrote it or otherwise have the right to pass it on as an
+open-source patch.  The "Developer's Certificate of Origin" pledge is taken
+from the Linux Kernel and the rules are pretty simple:
+
+	Developer's Certificate of Origin 1.1
+
+	By making a contribution to this project, I certify that:
+
+	(a) The contribution was created in whole or in part by me and I
+	    have the right to submit it under the open source license
+	    indicated in the file; or
+
+	(b) The contribution is based upon previous work that, to the best
+	    of my knowledge, is covered under an appropriate open source
+	    license and I have the right under that license to submit that
+	    work with modifications, whether created in whole or in part
+	    by me, under the same open source license (unless I am
+	    permitted to submit under a different license), as indicated
+	    in the file; or
+
+	(c) The contribution was provided directly to me by some other
+	    person who certified (a), (b) or (c) and I have not modified
+	    it.
+
+	(d) I understand and agree that this project and the contribution
+	    are public and that a record of the contribution (including all
+	    personal information I submit with it, including my sign-off) is
+	    maintained indefinitely and may be redistributed consistent with
+	    this project or the open source license(s) involved.
+
+... then you just add a line to the bottom of your patch description, with
+your real name, saying:
+
+	Signed-off-by: Random J Developer <random@developer.example.org>
+
+## Submit Patch(es) for Review
+
+Finally, you will need to submit your patches so that they can be reviewed
+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.
+Changes need to apply cleanly onto the master branch and pass all
+unit tests and produce no errors during static analysis.

Gemfile

@@ -0,0 +1,3 @@
+source "https://rubygems.org"
+
+gem "fastlane"

Gemfile.lock

@@ -0,0 +1,180 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    CFPropertyList (3.0.2)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
+    atomos (0.1.3)
+    aws-eventstream (1.1.0)
+    aws-partitions (1.388.0)
+    aws-sdk-core (3.109.1)
+      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-sigv4 (~> 1.1)
+    aws-sdk-s3 (1.83.1)
+      aws-sdk-core (~> 3, >= 3.109.0)
+      aws-sdk-kms (~> 1)
+      aws-sigv4 (~> 1.1)
+    aws-sigv4 (1.2.2)
+      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)
+    declarative (0.0.20)
+    declarative-option (0.1.0)
+    digest-crc (0.6.1)
+      rake (~> 13.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)
+      multipart-post (>= 1.2, < 3)
+      ruby2_keywords
+    faraday-cookie_jar (0.0.7)
+      faraday (>= 0.8.0)
+      http-cookie (~> 1.0.0)
+    faraday_middleware (1.0.0)
+      faraday (~> 1.0)
+    fastimage (2.2.0)
+    fastlane (2.165.0)
+      CFPropertyList (>= 2.3, < 4.0.0)
+      addressable (>= 2.3, < 3.0.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)
+      dotenv (>= 2.1.1, < 3.0.0)
+      emoji_regex (>= 0.1, < 4.0)
+      excon (>= 0.71.0, < 1.0.0)
+      faraday (~> 1.0)
+      faraday-cookie_jar (~> 0.0.6)
+      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)
+      json (< 3.0.0)
+      jwt (>= 2.1.0, < 3)
+      mini_magick (>= 4.9.4, < 5.0.0)
+      multipart-post (~> 2.0.0)
+      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)
+      tty-spinner (>= 0.8.0, < 1.0.0)
+      word_wrap (~> 1.0.0)
+      xcodeproj (>= 1.13.0, < 2.0.0)
+      xcpretty (~> 0.3.0)
+      xcpretty-travis-formatter (>= 0.0.3)
+    gh_inspector (1.1.3)
+    google-api-client (0.38.0)
+      addressable (~> 2.5, >= 2.5.1)
+      googleauth (~> 0.9)
+      httpclient (>= 2.8.1, < 3.0)
+      mini_mime (~> 1.0)
+      representable (~> 3.0)
+      retriable (>= 2.0, < 4.0)
+      signet (~> 0.12)
+    google-cloud-core (1.5.0)
+      google-cloud-env (~> 1.0)
+      google-cloud-errors (~> 1.0)
+    google-cloud-env (1.4.0)
+      faraday (>= 0.17.3, < 2.0)
+    google-cloud-errors (1.0.1)
+    google-cloud-storage (1.29.1)
+      addressable (~> 2.5)
+      digest-crc (~> 0.4)
+      google-api-client (~> 0.33)
+      google-cloud-core (~> 1.2)
+      googleauth (~> 0.9)
+      mini_mime (~> 1.0)
+    googleauth (0.14.0)
+      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)
+      domain_name (~> 0.5)
+    httpclient (2.8.3)
+    jmespath (1.4.0)
+    json (2.3.1)
+    jwt (2.2.2)
+    memoist (0.16.2)
+    mini_magick (4.10.1)
+    mini_mime (1.0.2)
+    multi_json (1.15.0)
+    multipart-post (2.0.0)
+    nanaimo (0.3.0)
+    naturally (2.2.0)
+    os (1.1.1)
+    plist (3.5.0)
+    public_suffix (4.0.6)
+    rake (13.0.1)
+    representable (3.0.4)
+      declarative (< 0.1.0)
+      declarative-option (< 0.2.0)
+      uber (< 0.2.0)
+    retriable (3.1.2)
+    rouge (2.0.7)
+    ruby2_keywords (0.0.2)
+    rubyzip (2.3.0)
+    security (0.1.3)
+    signet (0.14.0)
+      addressable (~> 2.3)
+      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)
+    tty-cursor (0.7.1)
+    tty-screen (0.8.1)
+    tty-spinner (0.9.3)
+      tty-cursor (~> 0.7)
+    uber (0.1.0)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.7.7)
+    unicode-display_width (1.7.0)
+    word_wrap (1.0.0)
+    xcodeproj (1.19.0)
+      CFPropertyList (>= 2.3.3, < 4.0)
+      atomos (~> 0.1.3)
+      claide (>= 1.0.2, < 2.0)
+      colored2 (~> 3.1)
+      nanaimo (~> 0.3.0)
+    xcpretty (0.3.0)
+      rouge (~> 2.0.7)
+    xcpretty-travis-formatter (1.0.0)
+      xcpretty (~> 0.2, >= 0.0.7)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  fastlane
+
+BUNDLED WITH
+   2.1.4

README.md

@@ -1,58 +0,0 @@
-# Loyalty Card Keychain
-[![Build Status](https://travis-ci.org/brarcher/loyalty-card-locker.svg?branch=master)](https://travis-ci.org/brarcher/loyalty-card-locker)
-
-<a href="https://f-droid.org/repository/browse/?fdid=protect.card_locker" target="_blank">
-<img src="https://f-droid.org/badge/get-it-on.png" alt="Get it on F-Droid" height="90"/></a>
-<a href="https://play.google.com/store/apps/details?id=protect.card_locker" target="_blank">
-<img src="https://play.google.com/intl/en_us/badges/images/generic/en-play-badge.png" alt="Get it on Google Play" height="90"/></a>
-
-Stores all of your store loyalty cards on your phone, removing the need to carry them around.  Currently the following barcode types are supported:
-
-- AZTEC
-- CODABAR
-- CODE_39
-- CODE_128
-- DATA_MATRIX
-- EAN_8
-- EAN_13
-- ITF
-- PDF_417
-- QR_CODE
-- UPC_A
-
-If there is any interest in improving this project, kindly submit a pull request with
-proposed changes.
-
-# Screenshots
-
-[<img src="https://user-images.githubusercontent.com/5264535/27416124-79b09162-56d9-11e7-967b-8923177dc228.png" width=250>](https://user-images.githubusercontent.com/5264535/27416124-79b09162-56d9-11e7-967b-8923177dc228.png)
-[<img src="https://user-images.githubusercontent.com/5264535/27416127-7baea332-56d9-11e7-8a10-5be90bb02225.png" width=250>](https://user-images.githubusercontent.com/5264535/27416127-7baea332-56d9-11e7-8a10-5be90bb02225.png)
-[<img src="https://user-images.githubusercontent.com/5264535/27416128-7d50f7b2-56d9-11e7-9833-1dd962f9cf66.png" width=250>](https://user-images.githubusercontent.com/5264535/27416128-7d50f7b2-56d9-11e7-9833-1dd962f9cf66.png)
-
-[<img src="https://user-images.githubusercontent.com/5264535/27416132-7ea6272c-56d9-11e7-9a52-d73424bf902c.png" width=250>](https://user-images.githubusercontent.com/5264535/27416132-7ea6272c-56d9-11e7-9a52-d73424bf902c.png)
-[<img src="https://user-images.githubusercontent.com/5264535/27416137-800aee90-56d9-11e7-9cc9-2a7dc63bb4fb.png" width=250>](https://user-images.githubusercontent.com/5264535/27416137-800aee90-56d9-11e7-9cc9-2a7dc63bb4fb.png)
-[<img src="https://user-images.githubusercontent.com/5264535/27416140-82d8211a-56d9-11e7-8031-c71d3077bdc6.png" width=250>](https://user-images.githubusercontent.com/5264535/27416140-82d8211a-56d9-11e7-8031-c71d3077bdc6.png)
-
-# Building
-
-To build, use the gradle wrapper scripts provided in the top level directory of the project. The following will
-compile the application and run all unit tests:
-
-GNU/Linux, OSX, UNIX:
-```
-./gradlew build
-```
-
-Windows:
-```
-./gradlew.bat build
-```
-
-# Translating
-
-If you are interested in translating this application to another language, create a pull request with changes or find the project listing on  [Transifex](https://www.transifex.com/na-243/loyalty-card-locker).
-
-# Thanks
-
-This application uses the following image:
-- [Save](https://thenounproject.com/term/save/716011) by [Bernar Novalyi](https://thenounproject.com/bernar.novalyi)

app/.gitignore

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

app/build.gradle

@@ -1,64 +1,101 @@
-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 25
-    buildToolsVersion "25.0.2"
+    compileSdkVersion 29
+    buildToolsVersion "30.0.3"
 
     defaultConfig {
-        applicationId "protect.card_locker"
-        minSdkVersion 17
-        targetSdkVersion 25
-        versionCode 15
-        versionName "0.14"
-    }
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-        }
-    }
-    lintOptions {
-        disable "GoogleAppIndexingWarning"
-        disable "ButtonStyle"
-        disable "AlwaysShowAction"
-        disable "MissingTranslation"
+        applicationId "me.hackerchick.catima"
+        minSdkVersion 19
+        targetSdkVersion 29
+        versionCode 68
+        versionName "1.14"
+
+        vectorDrawables.useSupportLibrary true
     }
 
-    // This is for Robolectric support for SDK 23
-    useLibrary 'org.apache.http.legacy'
+    buildTypes {
+        release {
+            minifyEnabled true
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            resValue "string", "app_name", "Catima"
+        }
+        debug {
+            applicationIdSuffix ".debug"
+            resValue "string", "app_name", "Catima Debug"
+        }
+    }
+
+    compileOptions {
+        encoding "UTF-8"
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+    lintOptions {
+        disable "GoogleAppIndexingWarning", "ButtonStyle", "AlwaysShowAction",
+                "MissingTranslation", "MissingPrefix"
+    }
+
+    // Starting with Android Studio 3 Robolectric is unable to find resources.
+    // The following allows it to find the resources.
+    testOptions {
+        unitTests {
+            all {
+                testLogging {
+                    events 'started', 'passed', 'skipped', 'failed'
+                }
+            }
+            includeAndroidResources true
+        }
+    }
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:appcompat-v7:25.3.1'
-    compile 'com.android.support:design:25.3.1'
-    compile 'com.journeyapps:zxing-android-embedded:3.5.0@aar'
-    compile 'com.google.zxing:core:3.3.0'
-    compile 'org.apache.commons:commons-csv:1.2'
-    compile group: 'com.google.guava', name: 'guava', version: '20.0'
-    compile 'com.github.apl-devs:appintro:v4.2.0'
-    testCompile 'junit:junit:4.12'
-    testCompile "org.robolectric:robolectric:3.3.2"
+// AndroidX
+    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation 'androidx.cardview:cardview:1.0.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
+    implementation 'androidx.preference:preference:1.1.1'
+    implementation 'com.google.android.material:material:1.3.0'
+
+// Third-party
+    implementation 'com.journeyapps:zxing-android-embedded:4.1.0@aar'
+    // Do not upgrade past 3.3.3! Causes a crash on versions before Android Nougat
+    //noinspection GradleDependency
+    implementation 'com.google.zxing:core:3.3.3'
+    implementation 'org.apache.commons:commons-csv:1.8'
+    implementation 'com.jaredrummler:colorpicker:1.1.0'
+    implementation 'com.google.guava:guava:30.1.1-jre'
+    implementation 'com.github.invissvenska:NumberPickerPreference:1.0.2'
+
+// SpotBugs
+    implementation 'io.wcm.tooling.spotbugs:io.wcm.tooling.spotbugs.annotations:1.0.0'
+
+// Testing
+    testImplementation 'androidx.test:core:1.3.0'
+    testImplementation 'junit:junit:4.13.2'
+    testImplementation 'org.robolectric:robolectric:4.4'
 }
 
-task findbugs(type: FindBugs, dependsOn: assembleDebug) {
+tasks.withType(SpotBugsTask) {
 
-    description 'Run findbugs'
+    description 'Run spotbugs'
     group 'verification'
 
-    classes = fileTree('build/intermediates/classes/debug/')
-    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/proguard-rules.pro

@@ -15,3 +15,10 @@
 #-keepclassmembers class fqcn.of.javascript.interface.for.webview {
 #   public *;
 #}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+-keepattributes SourceFile,LineNumberTable
+
+# This keep the class and method names the same, for debugging stack traces
+-dontobfuscate

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,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest package="protect.card_locker"
-          xmlns:android="http://schemas.android.com/apk/res/android">
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission
         android:name="android.permission.CAMERA"/>
@@ -16,8 +17,11 @@
         android:name="android.hardware.camera.autofocus"
         android:required="false" />
 
+    <uses-sdk tools:overrideLibrary="com.google.zxing.client.android" />
+
     <application
-        android:allowBackup="false"
+        android:name=".LoyaltyCardLockerApplication"
+        android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:supportsRtl="true"
@@ -32,41 +36,73 @@
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
+        <activity
+            android:name=".AboutActivity"
+            android:label="@string/about"
+            android:theme="@style/AppTheme.NoActionBar">
+        </activity>
+        <activity
+            android:name=".ManageGroupsActivity"
+            android:label="@string/groups"
+            android:theme="@style/AppTheme.NoActionBar">
+        </activity>
         <activity
             android:name=".LoyaltyCardViewActivity"
             android:theme="@style/AppTheme.NoActionBar"
-            android:configChanges="orientation|screenSize"
-            android:windowSoftInputMode="stateHidden"/>
+            android:windowSoftInputMode="stateHidden"
+            android:exported="true"/>
+        <activity
+            android:name=".LoyaltyCardEditActivity"
+            android:theme="@style/AppTheme.NoActionBar"
+            android:windowSoftInputMode="stateHidden"
+            android:exported="true">
+            <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" />
+                <!-- 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" />
+            </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:configChanges="orientation|screenSize"
             android:windowSoftInputMode="stateHidden"/>
+        <activity
+            android:name=".preferences.SettingsActivity"
+            android:label="@string/settings"/>
         <activity
             android:name=".ImportExportActivity"
             android:label="@string/importExport"
-            android:configChanges="orientation|screenSize"
             android:theme="@style/AppTheme.NoActionBar"/>
         <activity
-            android:name=".intro.IntroActivity"
-            android:label=""
-            android:configChanges="orientation|screenSize"
-            android:theme="@style/AppTheme.NoActionBar"/>
-
-        <receiver android:name=".appwidget.CardAppWidgetProvider">
-            <meta-data android:name="android.appwidget.provider"
-                       android:resource="@xml/appwidget_provider" />
+            android:name=".CardShortcutConfigure"
+            android:label="@string/cardShortcut"
+            android:theme="@style/AppTheme.NoActionBar">
             <intent-filter>
-                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
-            </intent-filter>
-        </receiver>
-
-        <activity android:name=".appwidget.CardAppWidgetConfigure">
-            <intent-filter>
-                <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
+                <action android:name="android.intent.action.CREATE_SHORTCUT"/>
+                <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
         </activity>
+        <provider
+            android:name="androidx.core.content.FileProvider"
+            android:grantUriPermissions="true"
+            android:exported="false"
+            android:authorities="${applicationId}">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/file_provider_paths"/>
+        </provider>
     </application>
 
 </manifest>

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

@@ -0,0 +1,107 @@
+package protect.card_locker;
+
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.os.Bundle;
+import android.text.method.LinkMovementMethod;
+import android.util.Log;
+import android.view.MenuItem;
+import android.widget.TextView;
+
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.List;
+
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+import androidx.core.text.HtmlCompat;
+
+public class AboutActivity extends AppCompatActivity
+{
+    private static final String TAG = "Catima";
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState)
+    {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.about_activity);
+        Toolbar toolbar = findViewById(R.id.toolbar);
+        setSupportActionBar(toolbar);
+        ActionBar actionBar = getSupportActionBar();
+        if(actionBar != null)
+        {
+            actionBar.setDisplayHomeAsUpEnabled(true);
+        }
+
+        final List<ThirdPartyInfo> USED_LIBRARIES = new ArrayList<>();
+        USED_LIBRARIES.add(new ThirdPartyInfo("Commons CSV", "https://commons.apache.org/proper/commons-csv/", "Apache 2.0"));
+        USED_LIBRARIES.add(new ThirdPartyInfo("Guava", "https://github.com/google/guava", "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"));
+        USED_LIBRARIES.add(new ThirdPartyInfo("Color Picker", "https://github.com/jaredrummler/ColorPicker", "Apache 2.0"));
+        USED_LIBRARIES.add(new ThirdPartyInfo("NumberPickerPreference", "https://github.com/invissvenska/NumberPickerPreference", "GNU LGPL 3.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(")<br/>");
+        }
+
+        StringBuilder resources = new StringBuilder().append("<br/>");
+        for (ThirdPartyInfo entry : USED_ASSETS)
+        {
+            resources.append("<br/><a href=\"").append(entry.url()).append("\">").append(entry.name()).append("</a> (").append(entry.license()).append(")<br/>");
+        }
+
+        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);
+        }
+
+        setTitle(String.format(getString(R.string.about_title_fmt), appName));
+
+        TextView aboutTextView = findViewById(R.id.aboutText);
+        aboutTextView.setText(HtmlCompat.fromHtml(String.format(getString(R.string.debug_version_fmt), version) +
+                "<br/><br/>" +
+                String.format(getString(R.string.app_revision_fmt),
+                        "<a href=\"" + getString(R.string.app_revision_url) + "\">" +
+                                "GitHub" +
+                                "</a>") +
+                "<br/><br/>" +
+                String.format(getString(R.string.app_copyright_fmt), year) +
+                "<br/><br/>" +
+                getString(R.string.app_copyright_old) +
+                "<br/><br/>" +
+                getString(R.string.app_license) +
+                "<br/><br/>" +
+                String.format(getString(R.string.app_libraries), libs.toString()) +
+                "<br/><br/>" +
+                String.format(getString(R.string.app_resources), resources.toString()), HtmlCompat.FROM_HTML_MODE_COMPACT));
+        aboutTextView.setMovementMethod(LinkMovementMethod.getInstance());
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item)
+    {
+        int id = item.getItemId();
+
+        if (id == android.R.id.home) {
+            finish();
+        }
+
+        return super.onOptionsItemSelected(item);
+    }
+}

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

@@ -1,10 +1,13 @@
 package protect.card_locker;
 
 import android.graphics.Bitmap;
+import android.graphics.Color;
+import android.graphics.PorterDuff;
 import android.os.AsyncTask;
 import android.util.Log;
 import android.view.View;
 import android.widget.ImageView;
+import android.widget.TextView;
 
 import com.google.zxing.BarcodeFormat;
 import com.google.zxing.MultiFormatWriter;
@@ -20,24 +23,41 @@ import java.lang.ref.WeakReference;
  */
 class BarcodeImageWriterTask extends AsyncTask<Void, Void, Bitmap>
 {
-    private static final String TAG = "LoyaltyCardLocker";
-    private static final int MAX_WIDTH = 500;
+    private static final String TAG = "Catima";
+
+    private static final int IS_VALID = 999;
+    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;
+    private static final int MAX_WIDTH_2D = 500;
 
     private final WeakReference<ImageView> imageViewReference;
-    private final String cardId;
+    private final WeakReference<TextView> textViewReference;
+    private String cardId;
     private final BarcodeFormat format;
     private final int imageHeight;
     private final int imageWidth;
+    private final boolean showFallback;
+    private final Runnable callback;
 
     BarcodeImageWriterTask(ImageView imageView, String cardIdString,
-                                  BarcodeFormat barcodeFormat)
+                           BarcodeFormat barcodeFormat, TextView textView,
+                           boolean showFallback, Runnable callback)
     {
+        isSuccesful = true;
+        this.callback = callback;
+
         // Use a WeakReference to ensure the ImageView can be garbage collected
         imageViewReference = new WeakReference<>(imageView);
+        textViewReference = new WeakReference<>(textView);
 
         cardId = cardIdString;
         format = barcodeFormat;
 
+        final int MAX_WIDTH = getMaxWidth(format);
+
         if(imageView.getWidth() < MAX_WIDTH)
         {
             imageHeight = imageView.getHeight();
@@ -50,10 +70,81 @@ class BarcodeImageWriterTask extends AsyncTask<Void, Void, Bitmap>
             double ratio = (double)MAX_WIDTH / (double)imageView.getWidth();
             imageHeight = (int)(imageView.getHeight() * ratio);
         }
+
+        this.showFallback = showFallback;
     }
 
-    public Bitmap doInBackground(Void... params)
+    private int getMaxWidth(BarcodeFormat format)
     {
+        switch(format)
+        {
+            // 2D barcodes
+            case AZTEC:
+            case DATA_MATRIX:
+            case MAXICODE:
+            case PDF_417:
+            case QR_CODE:
+                return MAX_WIDTH_2D;
+
+            // 1D barcodes:
+            case CODABAR:
+            case CODE_39:
+            case CODE_93:
+            case CODE_128:
+            case EAN_8:
+            case EAN_13:
+            case ITF:
+            case UPC_A:
+            case UPC_E:
+            case RSS_14:
+            case RSS_EXPANDED:
+            case UPC_EAN_EXTENSION:
+            default:
+                return MAX_WIDTH_1D;
+        }
+    }
+
+    private String getFallbackString(BarcodeFormat format)
+    {
+        switch(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_128:
+                return "CODE_128";
+            case EAN_8:
+                return "32123456";
+            case EAN_13:
+                return "5901234123457";
+            case ITF:
+                return "1003";
+            case UPC_A:
+                return "123456789012";
+            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
@@ -113,10 +204,33 @@ class BarcodeImageWriterTask extends AsyncTask<Void, Void, Bitmap>
         {
             Log.e(TAG, "Failed to generate barcode of type " + format + ": " + cardId, e);
         }
+        catch(OutOfMemoryError e)
+        {
+            Log.w(TAG, "Insufficient memory to render barcode, "
+                    + imageWidth + "x" + imageHeight + ", " + format.name()
+                    + ", length=" + cardId.length(), e);
+        }
 
         return null;
     }
 
+    public Bitmap doInBackground(Void... params)
+    {
+        Bitmap bitmap = generate();
+
+        if (bitmap == null) {
+            isSuccesful = false;
+
+            if (showFallback) {
+                Log.i(TAG, "Barcode generation failed, generating fallback...");
+                cardId = getFallbackString(format);
+                bitmap = generate();
+            }
+        }
+
+        return bitmap;
+    }
+
     protected void onPostExecute(Bitmap result)
     {
         Log.i(TAG, "Finished generating barcode image of type " + format + ": " + cardId);
@@ -127,17 +241,38 @@ class BarcodeImageWriterTask extends AsyncTask<Void, Void, Bitmap>
             return;
         }
 
+        imageView.setTag(isSuccesful);
+
         imageView.setImageBitmap(result);
+        TextView textView = textViewReference.get();
 
         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());
+            }
         }
         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();
         }
     }
-}
+}

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

@@ -3,19 +3,18 @@ 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 android.support.v7.app.ActionBar;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
 import android.text.Editable;
 import android.text.TextWatcher;
 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.Toast;
 
 import com.google.common.collect.ImmutableMap;
 import com.google.zxing.BarcodeFormat;
@@ -26,6 +25,10 @@ import java.util.Collections;
 import java.util.LinkedList;
 import java.util.Map;
 
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+
 /**
  * This activity is callable and will allow a user to enter
  * barcode data and generate all barcodes possible for
@@ -34,7 +37,7 @@ import java.util.Map;
  */
 public class BarcodeSelectorActivity extends AppCompatActivity
 {
-    private static final String TAG = "LoyaltyCardLocker";
+    private static final String TAG = "Catima";
 
     // Result this activity will return
     public static final String BARCODE_CONTENTS = "contents";
@@ -58,7 +61,7 @@ public class BarcodeSelectorActivity extends AppCompatActivity
                 BarcodeFormat.UPC_A.name()
         ));
 
-    private Map<String, Integer> barcodeViewMap;
+    private Map<String, Pair<Integer, Integer>> barcodeViewMap;
     private LinkedList<AsyncTask> barcodeGeneratorTasks = new LinkedList<>();
 
     @Override
@@ -67,7 +70,7 @@ public class BarcodeSelectorActivity extends AppCompatActivity
         super.onCreate(savedInstanceState);
 
         setContentView(R.layout.barcode_selector_activity);
-        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+        Toolbar toolbar = findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
         ActionBar actionBar = getSupportActionBar();
         if(actionBar != null)
@@ -75,21 +78,21 @@ public class BarcodeSelectorActivity extends AppCompatActivity
             actionBar.setDisplayHomeAsUpEnabled(true);
         }
 
-        barcodeViewMap = ImmutableMap.<String, Integer>builder()
-                .put(BarcodeFormat.AZTEC.name(), R.id.aztecBarcode)
-                .put(BarcodeFormat.CODE_39.name(), R.id.code39Barcode)
-                .put(BarcodeFormat.CODE_128.name(), R.id.code128Barcode)
-                .put(BarcodeFormat.CODABAR.name(), R.id.codabarBarcode)
-                .put(BarcodeFormat.DATA_MATRIX.name(), R.id.datamatrixBarcode)
-                .put(BarcodeFormat.EAN_8.name(), R.id.ean8Barcode)
-                .put(BarcodeFormat.EAN_13.name(), R.id.ean13Barcode)
-                .put(BarcodeFormat.ITF.name(), R.id.itfBarcode)
-                .put(BarcodeFormat.PDF_417.name(), R.id.pdf417Barcode)
-                .put(BarcodeFormat.QR_CODE.name(), R.id.qrcodeBarcode)
-                .put(BarcodeFormat.UPC_A.name(), R.id.upcaBarcode)
+        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 = (EditText) findViewById(R.id.cardId);
+        EditText cardId = findViewById(R.id.cardId);
         cardId.addTextChangedListener(new TextWatcher()
         {
             @Override
@@ -103,19 +106,11 @@ public class BarcodeSelectorActivity extends AppCompatActivity
             {
                 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();
+                generateBarcodes(s.toString());
 
-                // Update barcodes
-                for(String key : barcodeViewMap.keySet())
-                {
-                    ImageView image = (ImageView)findViewById(barcodeViewMap.get(key));
-                    createBarcodeOption(image, key, s.toString());
-                }
+                View noBarcodeButtonView = findViewById(R.id.noBarcode);
+                setButtonListener(noBarcodeButtonView, s.toString());
+                noBarcodeButtonView.setEnabled(s.length() > 0);
             }
 
             @Override
@@ -131,10 +126,44 @@ public class BarcodeSelectorActivity extends AppCompatActivity
         if(initialCardId != null)
         {
             cardId.setText(initialCardId);
+        } else {
+            generateBarcodes("");
         }
     }
 
-    private void createBarcodeOption(final ImageView image, final String formatType, final String cardId)
+    private void generateBarcodes(String value) {
+        // Stop any async tasks which may not have been started yet
+        for(AsyncTask task : barcodeGeneratorTasks)
+        {
+            task.cancel(false);
+        }
+        barcodeGeneratorTasks.clear();
+
+        // Update barcodes
+        for(Map.Entry<String, Pair<Integer, Integer>> entry : barcodeViewMap.entrySet())
+        {
+            ImageView image = findViewById(entry.getValue().first);
+            TextView text = findViewById(entry.getValue().second);
+            createBarcodeOption(image, entry.getKey(), value, text);
+        }
+    }
+
+    private void setButtonListener(final View button, final String cardId)
+    {
+        button.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                Log.d(TAG, "Selected no barcode");
+                Intent result = new Intent();
+                result.putExtra(BARCODE_FORMAT, "");
+                result.putExtra(BARCODE_CONTENTS, cardId);
+                BarcodeSelectorActivity.this.setResult(RESULT_OK, result);
+                finish();
+            }
+        });
+    }
+
+    private void createBarcodeOption(final ImageView image, final String formatType, final String cardId, final TextView text)
     {
         final BarcodeFormat format = BarcodeFormat.valueOf(formatType);
         if(format == null)
@@ -150,6 +179,12 @@ public class BarcodeSelectorActivity extends AppCompatActivity
             public void onClick(View v)
             {
                 Log.d(TAG, "Selected barcode type " + formatType);
+
+                if (!((boolean) image.getTag())) {
+                    Toast.makeText(BarcodeSelectorActivity.this, getString(R.string.wrongValueForBarcodeType), Toast.LENGTH_LONG).show();
+                    return;
+                }
+
                 Intent result = new Intent();
                 result.putExtra(BARCODE_FORMAT, formatType);
                 result.putExtra(BARCODE_CONTENTS, cardId);
@@ -169,17 +204,10 @@ public class BarcodeSelectorActivity extends AppCompatActivity
                     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);
-                        }
+                        image.getViewTreeObserver().removeOnGlobalLayoutListener(this);
 
                         Log.d(TAG, "Generating barcode for type " + formatType);
-                        BarcodeImageWriterTask task = new BarcodeImageWriterTask(image, cardId, format);
+                        BarcodeImageWriterTask task = new BarcodeImageWriterTask(image, cardId, format, text, true, null);
                         barcodeGeneratorTasks.add(task);
                         task.execute();
                     }
@@ -188,7 +216,7 @@ public class BarcodeSelectorActivity extends AppCompatActivity
         else
         {
             Log.d(TAG, "Generating barcode for type " + formatType);
-            BarcodeImageWriterTask task = new BarcodeImageWriterTask(image, cardId, format);
+            BarcodeImageWriterTask task = new BarcodeImageWriterTask(image, cardId, format, text, true, null);
             barcodeGeneratorTasks.add(task);
             task.execute();
         }

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,87 @@
+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>
+{
+    private Cursor mCursor;
+    private boolean mDataValid;
+    private int mRowIDColumn;
+
+    public BaseCursorAdapter(Cursor inputCursor)
+    {
+        setHasStableIds(true);
+        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;
+            mDataValid = true;
+            notifyDataSetChanged();
+        }
+        else
+        {
+            notifyItemRangeRemoved(0, getItemCount());
+            mCursor = null;
+            mRowIDColumn = -1;
+            mDataValid = false;
+        }
+    }
+}

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

@@ -0,0 +1,99 @@
+package protect.card_locker;
+
+import android.content.Intent;
+import android.database.Cursor;
+import android.os.Bundle;
+import android.os.Parcelable;
+import android.util.Log;
+import android.view.View;
+import android.widget.Toast;
+
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+import androidx.recyclerview.widget.RecyclerView;
+
+/**
+ * The configuration screen for creating a shortcut.
+ */
+public class CardShortcutConfigure extends AppCompatActivity implements LoyaltyCardCursorAdapter.CardAdapterListener
+{
+    static final String TAG = "Catima";
+    final DBHelper mDb = new DBHelper(this);
+
+    @Override
+    public void onCreate(Bundle bundle) {
+        super.onCreate(bundle);
+
+        // 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);
+        Toolbar toolbar = findViewById(R.id.toolbar);
+        toolbar.setVisibility(View.GONE);
+
+        // Hide new button because it won't work here anyway
+        FloatingActionButton newFab = findViewById(R.id.fabAdd);
+        newFab.setVisibility(View.GONE);
+
+        final DBHelper db = new DBHelper(this);
+
+        // If there are no cards, bail
+        if (db.getLoyaltyCardCount() == 0) {
+            Toast.makeText(this, R.string.noCardsMessage, Toast.LENGTH_LONG).show();
+            finish();
+        }
+
+        final RecyclerView cardList = findViewById(R.id.list);
+        cardList.setVisibility(View.VISIBLE);
+
+        Cursor cardCursor = db.getLoyaltyCardCursor();
+
+        final LoyaltyCardCursorAdapter adapter = new LoyaltyCardCursorAdapter(this, cardCursor, this);
+        cardList.setAdapter(adapter);
+    }
+
+    private void onClickAction(int position) {
+        Cursor selected = mDb.getLoyaltyCardCursor();
+        selected.moveToPosition(position);
+        LoyaltyCard loyaltyCard = LoyaltyCard.toLoyaltyCard(selected);
+
+        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);
+
+        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);
+
+        finish();
+    }
+
+    @Override
+    public void onIconClicked(int inputPosition) {
+        onClickAction(inputPosition);
+    }
+
+    @Override
+    public void onRowClicked(int inputPosition) {
+        onClickAction(inputPosition);
+    }
+
+    @Override
+    public void onRowLongClicked(int inputPosition) {
+        // do nothing
+    }
+}

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

@@ -1,50 +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 header
-        printer.printRecord(DBHelper.LoyaltyCardDbIds.ID,
-                DBHelper.LoyaltyCardDbIds.STORE,
-                DBHelper.LoyaltyCardDbIds.NOTE,
-                DBHelper.LoyaltyCardDbIds.CARD_ID,
-                DBHelper.LoyaltyCardDbIds.BARCODE_TYPE);
-
-        Cursor cursor = db.getLoyaltyCardCursor();
-
-        while(cursor.moveToNext())
-        {
-            LoyaltyCard card = LoyaltyCard.toLoyaltyCard(cursor);
-
-            printer.printRecord(card.id,
-                    card.store,
-                    card.note,
-                    card.cardId,
-                    card.barcodeType);
-
-            if(Thread.currentThread().isInterrupted())
-            {
-                throw new InterruptedException();
-            }
-        }
-
-        cursor.close();
-
-        printer.close();
-    }
-}

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

@@ -1,135 +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.IOException;
-import java.io.InputStreamReader;
-
-/**
- * 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
-    {
-        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 e)
-        {
-            throw new FormatException("Issue parsing CSV data", e);
-        }
-        finally
-        {
-            database.endTransaction();
-            database.close();
-        }
-    }
-
-    /**
-     * 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 int extractInt(String key, CSVRecord record)
-            throws FormatException
-    {
-        if(record.isMapped(key) == false)
-        {
-            throw new FormatException("Field not used but expected: " + key);
-        }
-
-        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);
-
-        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, "");
-        if(barcodeType.isEmpty())
-        {
-            throw new FormatException("No barcode type listed, but is required");
-        }
-
-        helper.insertLoyaltyCard(database, id, store, note, cardId, barcodeType);
-    }
-}

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

@@ -1,26 +1,55 @@
 package protect.card_locker;
 
-
 import android.content.ContentValues;
 import android.content.Context;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
+import android.database.sqlite.SQLiteException;
 import android.database.sqlite.SQLiteOpenHelper;
 
+import com.google.zxing.BarcodeFormat;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Currency;
+import java.util.Date;
+import java.util.List;
+
 public class DBHelper extends SQLiteOpenHelper
 {
-    public static final String DATABASE_NAME = "LoyaltyCards.db";
+    public static final String DATABASE_NAME = "Catima.db";
     public static final int ORIGINAL_DATABASE_VERSION = 1;
-    public static final int DATABASE_VERSION = 2;
+    public static final int DATABASE_VERSION = 10;
 
-    static class LoyaltyCardDbIds
+    public static class LoyaltyCardDbGroups
+    {
+        public static final String TABLE = "groups";
+        public static final String ID = "_id";
+        public static final String ORDER = "orderId";
+    }
+
+    public static class LoyaltyCardDbIds
     {
         public static final String TABLE = "cards";
         public static final String ID = "_id";
         public static final String STORE = "store";
+        public static final String EXPIRY = "expiry";
+        public static final String BALANCE = "balance";
+        public static final String BALANCE_TYPE = "balancetype";
         public static final String NOTE = "note";
+        public static final String HEADER_COLOR = "headercolor";
+        public static final String HEADER_TEXT_COLOR = "headertextcolor";
         public static final String CARD_ID = "cardid";
+        public static final String BARCODE_ID = "barcodeid";
         public static final String BARCODE_TYPE = "barcodetype";
+        public static final String STAR_STATUS = "starstatus";
+    }
+
+    public static class LoyaltyCardDbIdsGroups
+    {
+        public static final String TABLE = "cardsGroups";
+        public static final String cardID = "cardId";
+        public static final String groupID = "groupId";
     }
 
     public DBHelper(Context context)
@@ -31,13 +60,31 @@ public class DBHelper extends SQLiteOpenHelper
     @Override
     public void onCreate(SQLiteDatabase db)
     {
-        // create table for gift cards
+        // create table for card groups
+        db.execSQL("create table " + LoyaltyCardDbGroups.TABLE + "(" +
+                LoyaltyCardDbGroups.ID + " TEXT primary key not null," +
+                LoyaltyCardDbGroups.ORDER + " INTEGER DEFAULT '0')");
+
+        // create table for cards
+        // Balance is TEXT and not REAL to be able to store a BigDecimal without precision loss
         db.execSQL("create table " + LoyaltyCardDbIds.TABLE + "(" +
                 LoyaltyCardDbIds.ID + " INTEGER primary key autoincrement," +
                 LoyaltyCardDbIds.STORE + " TEXT not null," +
                 LoyaltyCardDbIds.NOTE + " TEXT not null," +
+                LoyaltyCardDbIds.EXPIRY + " INTEGER," +
+                LoyaltyCardDbIds.BALANCE + " TEXT not null DEFAULT '0'," +
+                LoyaltyCardDbIds.BALANCE_TYPE + " TEXT," +
+                LoyaltyCardDbIds.HEADER_COLOR + " INTEGER," +
                 LoyaltyCardDbIds.CARD_ID + " TEXT not null," +
-                LoyaltyCardDbIds.BARCODE_TYPE + " TEXT not null)");
+                LoyaltyCardDbIds.BARCODE_ID + " TEXT," +
+                LoyaltyCardDbIds.BARCODE_TYPE + " TEXT," +
+                LoyaltyCardDbIds.STAR_STATUS + " INTEGER DEFAULT '0' )");
+
+        // create associative table for cards in groups
+        db.execSQL("create table " + LoyaltyCardDbIdsGroups.TABLE + "(" +
+                LoyaltyCardDbIdsGroups.cardID + " INTEGER," +
+                LoyaltyCardDbIdsGroups.groupID + " TEXT," +
+                "primary key (" + LoyaltyCardDbIdsGroups.cardID + "," + LoyaltyCardDbIdsGroups.groupID +"))");
     }
 
     @Override
@@ -49,45 +96,250 @@ public class DBHelper extends SQLiteOpenHelper
             db.execSQL("ALTER TABLE " + LoyaltyCardDbIds.TABLE
                     + " ADD COLUMN " + LoyaltyCardDbIds.NOTE + " TEXT not null default ''");
         }
+
+        // Upgrade from version 2 to version 3
+        if(oldVersion < 3 && newVersion >= 3)
+        {
+            db.execSQL("ALTER TABLE " + LoyaltyCardDbIds.TABLE
+                    + " ADD COLUMN " + LoyaltyCardDbIds.HEADER_COLOR + " INTEGER");
+            db.execSQL("ALTER TABLE " + LoyaltyCardDbIds.TABLE
+                    + " ADD COLUMN " + LoyaltyCardDbIds.HEADER_TEXT_COLOR + " INTEGER");
+        }
+
+        // Upgrade from version 3 to version 4
+        if(oldVersion < 4 && newVersion >= 4)
+        {
+            db.execSQL("ALTER TABLE " + LoyaltyCardDbIds.TABLE
+                    + " ADD COLUMN " + LoyaltyCardDbIds.STAR_STATUS + " INTEGER DEFAULT '0'");
+        }
+
+        // Upgrade from version 4 to version 5
+        if(oldVersion < 5 && newVersion >= 5)
+        {
+            db.execSQL("create table " + LoyaltyCardDbGroups.TABLE + "(" +
+                    LoyaltyCardDbGroups.ID + " TEXT primary key not null)");
+
+            db.execSQL("create table " + LoyaltyCardDbIdsGroups.TABLE + "(" +
+                    LoyaltyCardDbIdsGroups.cardID + " INTEGER," +
+                    LoyaltyCardDbIdsGroups.groupID + " TEXT," +
+                    "primary key (" + LoyaltyCardDbIdsGroups.cardID + "," + LoyaltyCardDbIdsGroups.groupID +"))");
+        }
+
+        // Upgrade from version 5 to 6
+        if(oldVersion < 6 && newVersion >= 6)
+        {
+            db.execSQL("ALTER TABLE " + LoyaltyCardDbGroups.TABLE
+                    + " ADD COLUMN " + LoyaltyCardDbGroups.ORDER + " INTEGER DEFAULT '0'");
+        }
+
+        if(oldVersion < 7 && newVersion >= 7)
+        {
+            db.execSQL("ALTER TABLE " + LoyaltyCardDbIds.TABLE
+                    + " ADD COLUMN " + LoyaltyCardDbIds.EXPIRY + " INTEGER");
+        }
+
+        if(oldVersion < 8 && newVersion >= 8)
+        {
+            db.execSQL("ALTER TABLE " + LoyaltyCardDbIds.TABLE
+                    + " ADD COLUMN " + LoyaltyCardDbIds.BALANCE + " TEXT not null DEFAULT '0'");
+            db.execSQL("ALTER TABLE " + LoyaltyCardDbIds.TABLE
+                    + " ADD COLUMN " + LoyaltyCardDbIds.BALANCE_TYPE + " TEXT");
+        }
+
+        if(oldVersion < 9 && newVersion >= 9)
+        {
+            db.execSQL("ALTER TABLE " + LoyaltyCardDbIds.TABLE
+                    + " ADD COLUMN " + LoyaltyCardDbIds.BARCODE_ID + " TEXT");
+        }
+
+        if(oldVersion < 10 && newVersion >= 10)
+        {
+            // SQLite doesn't support modify column
+            // So we need to create a temp column to make barcode type nullable
+            // Let's drop header text colour too while we're at it
+            // https://www.sqlite.org/faq.html#q11
+            db.beginTransaction();
+
+            db.execSQL("CREATE TEMPORARY TABLE tmp (" +
+                    LoyaltyCardDbIds.ID + " INTEGER primary key autoincrement," +
+                    LoyaltyCardDbIds.STORE + " TEXT not null," +
+                    LoyaltyCardDbIds.NOTE + " TEXT not null," +
+                    LoyaltyCardDbIds.EXPIRY + " INTEGER," +
+                    LoyaltyCardDbIds.BALANCE + " TEXT not null DEFAULT '0'," +
+                    LoyaltyCardDbIds.BALANCE_TYPE + " TEXT," +
+                    LoyaltyCardDbIds.HEADER_COLOR + " INTEGER," +
+                    LoyaltyCardDbIds.CARD_ID + " TEXT not null," +
+                    LoyaltyCardDbIds.BARCODE_ID + " TEXT," +
+                    LoyaltyCardDbIds.BARCODE_TYPE + " TEXT," +
+                    LoyaltyCardDbIds.STAR_STATUS + " INTEGER DEFAULT '0' )");
+
+            db.execSQL("INSERT INTO tmp (" +
+                    LoyaltyCardDbIds.ID + " ," +
+                    LoyaltyCardDbIds.STORE + " ," +
+                    LoyaltyCardDbIds.NOTE + " ," +
+                    LoyaltyCardDbIds.EXPIRY + " ," +
+                    LoyaltyCardDbIds.BALANCE + " ," +
+                    LoyaltyCardDbIds.BALANCE_TYPE + " ," +
+                    LoyaltyCardDbIds.HEADER_COLOR + " ," +
+                    LoyaltyCardDbIds.CARD_ID + " ," +
+                    LoyaltyCardDbIds.BARCODE_ID + " ," +
+                    LoyaltyCardDbIds.BARCODE_TYPE + " ," +
+                    LoyaltyCardDbIds.STAR_STATUS + ")" +
+                    " SELECT " +
+                    LoyaltyCardDbIds.ID + " ," +
+                    LoyaltyCardDbIds.STORE + " ," +
+                    LoyaltyCardDbIds.NOTE + " ," +
+                    LoyaltyCardDbIds.EXPIRY + " ," +
+                    LoyaltyCardDbIds.BALANCE + " ," +
+                    LoyaltyCardDbIds.BALANCE_TYPE + " ," +
+                    LoyaltyCardDbIds.HEADER_COLOR + " ," +
+                    LoyaltyCardDbIds.CARD_ID + " ," +
+                    LoyaltyCardDbIds.BARCODE_ID + " ," +
+                    " NULLIF(" + LoyaltyCardDbIds.BARCODE_TYPE + ",'') ," +
+                    LoyaltyCardDbIds.STAR_STATUS +
+                    " FROM " + LoyaltyCardDbIds.TABLE);
+
+            db.execSQL("DROP TABLE " + LoyaltyCardDbIds.TABLE);
+
+            db.execSQL("create table " + LoyaltyCardDbIds.TABLE + "(" +
+                    LoyaltyCardDbIds.ID + " INTEGER primary key autoincrement," +
+                    LoyaltyCardDbIds.STORE + " TEXT not null," +
+                    LoyaltyCardDbIds.NOTE + " TEXT not null," +
+                    LoyaltyCardDbIds.EXPIRY + " INTEGER," +
+                    LoyaltyCardDbIds.BALANCE + " TEXT not null DEFAULT '0'," +
+                    LoyaltyCardDbIds.BALANCE_TYPE + " TEXT," +
+                    LoyaltyCardDbIds.HEADER_COLOR + " INTEGER," +
+                    LoyaltyCardDbIds.CARD_ID + " TEXT not null," +
+                    LoyaltyCardDbIds.BARCODE_ID + " TEXT," +
+                    LoyaltyCardDbIds.BARCODE_TYPE + " TEXT," +
+                    LoyaltyCardDbIds.STAR_STATUS + " INTEGER DEFAULT '0' )");
+
+            db.execSQL("INSERT INTO " + LoyaltyCardDbIds.TABLE + "(" +
+                    LoyaltyCardDbIds.ID + " ," +
+                    LoyaltyCardDbIds.STORE + " ," +
+                    LoyaltyCardDbIds.NOTE + " ," +
+                    LoyaltyCardDbIds.EXPIRY + " ," +
+                    LoyaltyCardDbIds.BALANCE + " ," +
+                    LoyaltyCardDbIds.BALANCE_TYPE + " ," +
+                    LoyaltyCardDbIds.HEADER_COLOR + " ," +
+                    LoyaltyCardDbIds.CARD_ID + " ," +
+                    LoyaltyCardDbIds.BARCODE_ID + " ," +
+                    LoyaltyCardDbIds.BARCODE_TYPE + " ," +
+                    LoyaltyCardDbIds.STAR_STATUS + ")" +
+                    " SELECT " +
+                    LoyaltyCardDbIds.ID + " ," +
+                    LoyaltyCardDbIds.STORE + " ," +
+                    LoyaltyCardDbIds.NOTE + " ," +
+                    LoyaltyCardDbIds.EXPIRY + " ," +
+                    LoyaltyCardDbIds.BALANCE + " ," +
+                    LoyaltyCardDbIds.BALANCE_TYPE + " ," +
+                    LoyaltyCardDbIds.HEADER_COLOR + " ," +
+                    LoyaltyCardDbIds.CARD_ID + " ," +
+                    LoyaltyCardDbIds.BARCODE_ID + " ," +
+                    LoyaltyCardDbIds.BARCODE_TYPE + " ," +
+                    LoyaltyCardDbIds.STAR_STATUS +
+                    " FROM tmp");
+
+            db.execSQL("DROP TABLE tmp");
+
+            db.setTransactionSuccessful();
+            db.endTransaction();
+        }
     }
 
-    public boolean insertLoyaltyCard(final String store, final String note, final String cardId,
-                                     final String barcodeType)
+    public long insertLoyaltyCard(final String store, final String note, final Date expiry,
+                                  final BigDecimal balance, final Currency balanceType,
+                                  final String cardId, final String barcodeId,
+                                  final BarcodeFormat barcodeType, final Integer headerColor,
+                                  final int starStatus)
     {
         SQLiteDatabase db = getWritableDatabase();
         ContentValues contentValues = new ContentValues();
         contentValues.put(LoyaltyCardDbIds.STORE, store);
         contentValues.put(LoyaltyCardDbIds.NOTE, note);
+        contentValues.put(LoyaltyCardDbIds.EXPIRY, expiry != null ? expiry.getTime() : null);
+        contentValues.put(LoyaltyCardDbIds.BALANCE, balance.toString());
+        contentValues.put(LoyaltyCardDbIds.BALANCE_TYPE, balanceType != null ? balanceType.getCurrencyCode() : null);
         contentValues.put(LoyaltyCardDbIds.CARD_ID, cardId);
-        contentValues.put(LoyaltyCardDbIds.BARCODE_TYPE, barcodeType);
+        contentValues.put(LoyaltyCardDbIds.BARCODE_ID, barcodeId);
+        contentValues.put(LoyaltyCardDbIds.BARCODE_TYPE, barcodeType != null ? barcodeType.toString() : null);
+        contentValues.put(LoyaltyCardDbIds.HEADER_COLOR, headerColor);
+        contentValues.put(LoyaltyCardDbIds.STAR_STATUS, starStatus);
+        final long newId = db.insert(LoyaltyCardDbIds.TABLE, null, contentValues);
+        return newId;
+    }
+
+    public boolean insertLoyaltyCard(final SQLiteDatabase db, final String store,
+                                     final String note, final Date expiry, final BigDecimal balance,
+                                     final Currency balanceType, final String cardId,
+                                     final String barcodeId, final BarcodeFormat barcodeType,
+                                     final Integer headerColor, final int starStatus)
+    {
+        ContentValues contentValues = new ContentValues();
+        contentValues.put(LoyaltyCardDbIds.STORE, store);
+        contentValues.put(LoyaltyCardDbIds.NOTE, note);
+        contentValues.put(LoyaltyCardDbIds.EXPIRY, expiry != null ? expiry.getTime() : null);
+        contentValues.put(LoyaltyCardDbIds.BALANCE, balance.toString());
+        contentValues.put(LoyaltyCardDbIds.BALANCE_TYPE, balanceType != null ? balanceType.getCurrencyCode() : null);
+        contentValues.put(LoyaltyCardDbIds.CARD_ID, cardId);
+        contentValues.put(LoyaltyCardDbIds.BARCODE_ID, barcodeId);
+        contentValues.put(LoyaltyCardDbIds.BARCODE_TYPE, barcodeType != null ? barcodeType.toString() : null);
+        contentValues.put(LoyaltyCardDbIds.HEADER_COLOR, headerColor);
+        contentValues.put(LoyaltyCardDbIds.STAR_STATUS,starStatus);
         final long newId = db.insert(LoyaltyCardDbIds.TABLE, null, contentValues);
         return (newId != -1);
     }
 
-    public boolean insertLoyaltyCard(final SQLiteDatabase db, final int id,
-                                     final String store, final String note, final String cardId,
-                                     final String barcodeType)
+    public boolean insertLoyaltyCard(final SQLiteDatabase db, final int id, final String store,
+                                     final String note, final Date expiry, final BigDecimal balance,
+                                     final Currency balanceType, final String cardId,
+                                     final String barcodeId, final BarcodeFormat barcodeType,
+                                     final Integer headerColor, final int starStatus)
     {
         ContentValues contentValues = new ContentValues();
         contentValues.put(LoyaltyCardDbIds.ID, id);
         contentValues.put(LoyaltyCardDbIds.STORE, store);
         contentValues.put(LoyaltyCardDbIds.NOTE, note);
+        contentValues.put(LoyaltyCardDbIds.EXPIRY, expiry != null ? expiry.getTime() : null);
+        contentValues.put(LoyaltyCardDbIds.BALANCE, balance.toString());
+        contentValues.put(LoyaltyCardDbIds.BALANCE_TYPE, balanceType != null ? balanceType.getCurrencyCode() : null);
         contentValues.put(LoyaltyCardDbIds.CARD_ID, cardId);
-        contentValues.put(LoyaltyCardDbIds.BARCODE_TYPE, barcodeType);
+        contentValues.put(LoyaltyCardDbIds.BARCODE_ID, barcodeId);
+        contentValues.put(LoyaltyCardDbIds.BARCODE_TYPE, barcodeType != null ? barcodeType.toString() : null);
+        contentValues.put(LoyaltyCardDbIds.HEADER_COLOR, headerColor);
+        contentValues.put(LoyaltyCardDbIds.STAR_STATUS,starStatus);
         final long newId = db.insert(LoyaltyCardDbIds.TABLE, null, contentValues);
         return (newId != -1);
     }
 
-
     public boolean updateLoyaltyCard(final int id, final String store, final String note,
-                                     final String cardId, final String barcodeType)
+                                     final Date expiry, final BigDecimal balance,
+                                     final Currency balanceType, final String cardId,
+                                     final String barcodeId, final BarcodeFormat barcodeType,
+                                     final Integer headerColor)
     {
         SQLiteDatabase db = getWritableDatabase();
         ContentValues contentValues = new ContentValues();
         contentValues.put(LoyaltyCardDbIds.STORE, store);
         contentValues.put(LoyaltyCardDbIds.NOTE, note);
+        contentValues.put(LoyaltyCardDbIds.EXPIRY, expiry != null ? expiry.getTime() : null);
+        contentValues.put(LoyaltyCardDbIds.BALANCE, balance.toString());
+        contentValues.put(LoyaltyCardDbIds.BALANCE_TYPE, balanceType != null ? balanceType.getCurrencyCode() : null);
         contentValues.put(LoyaltyCardDbIds.CARD_ID, cardId);
-        contentValues.put(LoyaltyCardDbIds.BARCODE_TYPE, barcodeType);
+        contentValues.put(LoyaltyCardDbIds.BARCODE_ID, barcodeId);
+        contentValues.put(LoyaltyCardDbIds.BARCODE_TYPE, barcodeType != null ? barcodeType.toString() : null);
+        contentValues.put(LoyaltyCardDbIds.HEADER_COLOR, headerColor);
+        int rowsUpdated = db.update(LoyaltyCardDbIds.TABLE, contentValues,
+                LoyaltyCardDbIds.ID + "=?",
+                new String[]{Integer.toString(id)});
+        return (rowsUpdated == 1);
+    }
+
+    public boolean updateLoyaltyCardStarStatus(final int id, final int starStatus)
+    {
+        SQLiteDatabase db = getWritableDatabase();
+        ContentValues contentValues = new ContentValues();
+        contentValues.put(LoyaltyCardDbIds.STAR_STATUS,starStatus);
         int rowsUpdated = db.update(LoyaltyCardDbIds.TABLE, contentValues,
                 LoyaltyCardDbIds.ID + "=?",
                 new String[]{Integer.toString(id)});
@@ -105,6 +357,7 @@ public class DBHelper extends SQLiteOpenHelper
         if(data.getCount() == 1)
         {
             data.moveToFirst();
+
             card = LoyaltyCard.toLoyaltyCard(data);
         }
 
@@ -113,27 +366,391 @@ public class DBHelper extends SQLiteOpenHelper
         return card;
     }
 
+    public List<Group> getLoyaltyCardGroups(final int id)
+    {
+        SQLiteDatabase db = getReadableDatabase();
+        Cursor data = db.rawQuery("select * from " + LoyaltyCardDbGroups.TABLE + " g " +
+                " LEFT JOIN " + LoyaltyCardDbIdsGroups.TABLE + " ig ON ig." + LoyaltyCardDbIdsGroups.groupID + " = g." + LoyaltyCardDbGroups.ID +
+                " where " + LoyaltyCardDbIdsGroups.cardID + "=?" +
+                " ORDER BY " + LoyaltyCardDbIdsGroups.groupID, new String[]{String.format("%d", id)});
+
+        List<Group> groups = new ArrayList<>();
+
+        if (!data.moveToFirst()) {
+            data.close();
+            return groups;
+        }
+
+        groups.add(Group.toGroup(data));
+
+        while (data.moveToNext()) {
+            groups.add(Group.toGroup(data));
+        }
+
+        data.close();
+
+        return groups;
+    }
+
+    public void setLoyaltyCardGroups(final int id, List<Group> groups)
+    {
+        SQLiteDatabase db = getWritableDatabase();
+
+        // First delete lookup table entries associated with this card
+        db.delete(LoyaltyCardDbIdsGroups.TABLE,
+                LoyaltyCardDbIdsGroups.cardID + " = ? ",
+                new String[]{String.format("%d", id)});
+
+        // Then create entries for selected values
+        for (Group group : groups) {
+            ContentValues contentValues = new ContentValues();
+            contentValues.put(LoyaltyCardDbIdsGroups.cardID, id);
+            contentValues.put(LoyaltyCardDbIdsGroups.groupID, group._id);
+            db.insert(LoyaltyCardDbIdsGroups.TABLE, null, contentValues);
+        }
+    }
+
+    public void setLoyaltyCardGroups(final SQLiteDatabase db, final int id, List<Group> groups)
+    {
+        // First delete lookup table entries associated with this card
+        db.delete(LoyaltyCardDbIdsGroups.TABLE,
+                LoyaltyCardDbIdsGroups.cardID + " = ? ",
+                new String[]{String.format("%d", id)});
+
+        // Then create entries for selected values
+        for (Group group : groups) {
+            ContentValues contentValues = new ContentValues();
+            contentValues.put(LoyaltyCardDbIdsGroups.cardID, id);
+            contentValues.put(LoyaltyCardDbIdsGroups.groupID, group._id);
+            db.insert(LoyaltyCardDbIdsGroups.TABLE, null, contentValues);
+        }
+    }
+
     public boolean deleteLoyaltyCard (final int id)
     {
         SQLiteDatabase db = getWritableDatabase();
-        int rowsDeleted =  db.delete(LoyaltyCardDbIds.TABLE,
+        // Delete card
+        int rowsDeleted = db.delete(LoyaltyCardDbIds.TABLE,
                 LoyaltyCardDbIds.ID + " = ? ",
                 new String[]{String.format("%d", id)});
+
+        // And delete lookup table entries associated with this card
+        db.delete(LoyaltyCardDbIdsGroups.TABLE,
+                LoyaltyCardDbIdsGroups.cardID + " = ? ",
+                new String[]{String.format("%d", id)});
+
         return (rowsDeleted == 1);
     }
 
     public Cursor getLoyaltyCardCursor()
     {
+        // An empty string will match everything
+        return getLoyaltyCardCursor("");
+    }
+
+    /**
+     * Returns a cursor to all loyalty cards with the filter text in either the store or note.
+     *
+     * @param filter
+     * @return Cursor
+     */
+    public Cursor getLoyaltyCardCursor(final String filter)
+    {
+        return getLoyaltyCardCursor(filter, null);
+    }
+
+    /**
+     * Returns a cursor to all loyalty cards with the filter text in either the store or note in a certain group.
+     *
+     * @param filter
+     * @param group
+     * @return Cursor
+     */
+    public Cursor getLoyaltyCardCursor(final String filter, Group group)
+    {
+        String actualFilter = String.format("%%%s%%", filter);
+        String[] selectionArgs = { actualFilter, actualFilter };
+        StringBuilder groupFilter = new StringBuilder();
+        String limitString = "";
+
         SQLiteDatabase db = getReadableDatabase();
-        Cursor res =  db.rawQuery("select * from " + LoyaltyCardDbIds.TABLE +
-                " ORDER BY " + LoyaltyCardDbIds.STORE, null);
+
+        if (group != null) {
+            List<Integer> allowedIds = getGroupCardIds(group._id);
+
+            // Empty group
+            if (allowedIds.size() > 0) {
+                groupFilter.append("AND (");
+
+                for (int i = 0; i < allowedIds.size(); i++) {
+                    groupFilter.append(LoyaltyCardDbIds.ID + " = " + allowedIds.get(i));
+                    if (i != allowedIds.size() - 1) {
+                        groupFilter.append(" OR ");
+                    }
+                }
+                groupFilter.append(") ");
+            } else {
+                limitString = "LIMIT 0";
+            }
+        }
+
+        Cursor res = db.rawQuery("select * from " + LoyaltyCardDbIds.TABLE +
+                " WHERE (" + LoyaltyCardDbIds.STORE + "  LIKE ? " +
+                " OR " + LoyaltyCardDbIds.NOTE + " LIKE ? )" +
+                groupFilter.toString() +
+                " ORDER BY " + LoyaltyCardDbIds.STAR_STATUS + " DESC," + LoyaltyCardDbIds.STORE + " COLLATE NOCASE ASC " +
+                limitString, selectionArgs, null);
+
         return res;
     }
 
     public int getLoyaltyCardCount()
     {
+        // An empty string will match everything
+        return getLoyaltyCardCount("");
+    }
+
+    /**
+     * Returns the amount of loyalty cards with the filter text in either the store or note.
+     *
+     * @param filter
+     * @return Integer
+     */
+    public int getLoyaltyCardCount(String filter)
+    {
+        String actualFilter = String.format("%%%s%%", filter);
+        String[] selectionArgs = { actualFilter, actualFilter };
+
         SQLiteDatabase db = getReadableDatabase();
-        Cursor data =  db.rawQuery("SELECT Count(*) FROM " + LoyaltyCardDbIds.TABLE, null);
+        Cursor data =  db.rawQuery("SELECT Count(*) FROM " + LoyaltyCardDbIds.TABLE +
+                " WHERE " + LoyaltyCardDbIds.STORE + "  LIKE ? " +
+                " OR " + LoyaltyCardDbIds.NOTE + " LIKE ? "
+                , selectionArgs, null);
+
+        int numItems = 0;
+
+        if(data.getCount() == 1)
+        {
+            data.moveToFirst();
+            numItems = data.getInt(0);
+        }
+
+        data.close();
+
+        return numItems;
+    }
+
+    /**
+     * Returns a cursor to all groups.
+     *
+     * @return Cursor
+     */
+    public Cursor getGroupCursor()
+    {
+        SQLiteDatabase db = getReadableDatabase();
+
+        Cursor res = db.rawQuery("select * from " + LoyaltyCardDbGroups.TABLE +
+                " ORDER BY " + LoyaltyCardDbGroups.ORDER + " ASC," + LoyaltyCardDbGroups.ID + " COLLATE NOCASE ASC", null, null);
+        return res;
+    }
+
+    public List<Group> getGroups() {
+        Cursor data = getGroupCursor();
+
+        List<Group> groups = new ArrayList<>();
+
+        if (!data.moveToFirst()) {
+            data.close();
+            return groups;
+        }
+
+        groups.add(Group.toGroup(data));
+
+        while (data.moveToNext()) {
+            groups.add(Group.toGroup(data));
+        }
+
+        data.close();
+
+        return groups;
+    }
+
+    public void reorderGroups(final List<Group> groups)
+    {
+        Integer order = 0;
+
+        SQLiteDatabase db = getWritableDatabase();
+        ContentValues contentValues;
+
+        for (Group group : groups)
+        {
+            contentValues = new ContentValues();
+            contentValues.put(LoyaltyCardDbGroups.ORDER, order);
+
+            db.update(LoyaltyCardDbGroups.TABLE, contentValues,
+                    LoyaltyCardDbGroups.ID + "=?",
+                    new String[]{group._id});
+
+            order++;
+        }
+    }
+
+    public Group getGroup(final String groupName)
+    {
+        SQLiteDatabase db = getReadableDatabase();
+        Cursor data = db.rawQuery("select * from " + LoyaltyCardDbGroups.TABLE +
+                " where " + LoyaltyCardDbGroups.ID + "=?", new String[]{groupName});
+
+        Group group = null;
+
+        if(data.getCount() == 1)
+        {
+            data.moveToFirst();
+
+            group = Group.toGroup(data);
+        }
+
+        data.close();
+
+        return group;
+    }
+
+    public int getGroupCount()
+    {
+        SQLiteDatabase db = getReadableDatabase();
+        Cursor data =  db.rawQuery("SELECT Count(*) FROM " + LoyaltyCardDbGroups.TABLE, null);
+
+        int numItems = 0;
+
+        if(data.getCount() == 1)
+        {
+            data.moveToFirst();
+            numItems = data.getInt(0);
+        }
+
+        data.close();
+
+        return numItems;
+    }
+
+    public List<Integer> getGroupCardIds(final String groupName)
+    {
+        SQLiteDatabase db = getReadableDatabase();
+        Cursor data =  db.rawQuery("SELECT " + LoyaltyCardDbIdsGroups.cardID +
+                " FROM " + LoyaltyCardDbIdsGroups.TABLE +
+                " WHERE " + LoyaltyCardDbIdsGroups.groupID + " =? ", new String[]{groupName});
+
+        List<Integer> cardIds = new ArrayList<>();
+
+        if (!data.moveToFirst()) {
+            return cardIds;
+        }
+
+        cardIds.add(data.getInt(0));
+
+        while (data.moveToNext()) {
+            cardIds.add(data.getInt(0));
+        }
+
+        data.close();
+
+        return cardIds;
+    }
+
+    public long insertGroup(final String name)
+    {
+        if (name.isEmpty()) return -1;
+
+        SQLiteDatabase db = getWritableDatabase();
+        ContentValues contentValues = new ContentValues();
+        contentValues.put(LoyaltyCardDbGroups.ID, name);
+        contentValues.put(LoyaltyCardDbGroups.ORDER, getGroupCount());
+        final long newId = db.insert(LoyaltyCardDbGroups.TABLE, null, contentValues);
+        return newId;
+    }
+
+    public boolean insertGroup(final SQLiteDatabase db, final String name)
+    {
+        ContentValues contentValues = new ContentValues();
+        contentValues.put(LoyaltyCardDbGroups.ID, name);
+        contentValues.put(LoyaltyCardDbGroups.ORDER, getGroupCount());
+        final long newId = db.insert(LoyaltyCardDbGroups.TABLE, null, contentValues);
+        return (newId != -1);
+    }
+
+    public boolean updateGroup(final String groupName, final String newName)
+    {
+        if (newName.isEmpty()) return false;
+
+        boolean success = false;
+
+        SQLiteDatabase db = getWritableDatabase();
+        ContentValues groupContentValues = new ContentValues();
+        groupContentValues.put(LoyaltyCardDbGroups.ID, newName);
+
+        ContentValues lookupContentValues = new ContentValues();
+        lookupContentValues.put(LoyaltyCardDbIdsGroups.groupID, newName);
+
+        db.beginTransaction();
+        try {
+            // Update group name
+            int groupsChanged = db.update(LoyaltyCardDbGroups.TABLE, groupContentValues,
+                    LoyaltyCardDbGroups.ID + "=?",
+                    new String[]{groupName});
+
+            // Also update lookup tables
+            db.update(LoyaltyCardDbIdsGroups.TABLE, lookupContentValues,
+                    LoyaltyCardDbIdsGroups.groupID + "=?",
+                    new String[]{groupName});
+
+            if (groupsChanged == 1) {
+                db.setTransactionSuccessful();
+                success = true;
+            }
+        } catch (SQLiteException e) {
+        } finally {
+            db.endTransaction();
+        }
+
+        return success;
+    }
+
+    public boolean deleteGroup(final String groupName)
+    {
+        boolean success = false;
+
+        SQLiteDatabase db = getWritableDatabase();
+
+        db.beginTransaction();
+        try {
+            // Delete group
+            int groupsDeleted = db.delete(LoyaltyCardDbGroups.TABLE,
+                    LoyaltyCardDbGroups.ID + " = ? ",
+                    new String[]{groupName});
+
+            // And delete lookup table entries associated with this group
+            db.delete(LoyaltyCardDbIdsGroups.TABLE,
+                    LoyaltyCardDbIdsGroups.groupID + " = ? ",
+                    new String[]{groupName});
+
+            if (groupsDeleted == 1) {
+                db.setTransactionSuccessful();
+                success = true;
+            }
+        } finally {
+            db.endTransaction();
+        }
+
+        return success;
+    }
+
+    public int getGroupCardCount(final String groupName)
+    {
+        SQLiteDatabase db = getReadableDatabase();
+
+        Cursor data =  db.rawQuery("SELECT Count(*) FROM " + LoyaltyCardDbIdsGroups.TABLE +
+                " where " + LoyaltyCardDbIdsGroups.groupID + "=?",
+                new String[]{groupName});
 
         int numItems = 0;
 

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

@@ -2,7 +2,8 @@ package protect.card_locker;
 
 public enum DataFormat
 {
-    CSV,
-
+    Catima,
+    Fidme,
+    VoucherVault
     ;
 }

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

@@ -0,0 +1,20 @@
+package protect.card_locker;
+
+import android.database.Cursor;
+
+public class Group
+{
+    public final String _id;
+
+    public Group(final String _id)
+    {
+        this._id = _id;
+    }
+
+    public static Group toGroup(Cursor cursor)
+    {
+        String _id = cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbGroups.ID));
+
+        return new Group(_id);
+    }
+}

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

@@ -0,0 +1,56 @@
+package protect.card_locker;
+
+import android.content.Context;
+import android.database.Cursor;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.CursorAdapter;
+import android.widget.TextView;
+
+import protect.card_locker.preferences.Settings;
+
+class GroupCursorAdapter extends CursorAdapter
+{
+    Settings settings;
+    DBHelper db;
+
+    public GroupCursorAdapter(Context context, Cursor cursor)
+    {
+        super(context, cursor, 0);
+        settings = new Settings(context);
+
+        db = new DBHelper(context);
+    }
+
+    // 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.group_layout, parent, false);
+    }
+
+    // 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 = view.findViewById(R.id.name);
+        TextView countField = view.findViewById(R.id.cardCount);
+
+        // Extract properties from cursor
+        Group group = Group.toGroup(cursor);
+
+        Integer groupCardCount = db.getGroupCardCount(group._id);
+
+        // Populate fields with extracted properties
+        nameField.setText(group._id);
+
+        countField.setText(context.getResources().getQuantityString(R.plurals.groupCardCount, groupCardCount, groupCardCount));
+
+        nameField.setTextSize(settings.getFontSizeMax(settings.getMediumFont()));
+        countField.setTextSize(settings.getFontSizeMax(settings.getSmallFont()));
+    }
+}

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

@@ -2,21 +2,12 @@ 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 android.os.Environment;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
 import android.util.Log;
 import android.view.MenuItem;
 import android.view.View;
@@ -24,26 +15,39 @@ import android.widget.Button;
 import android.widget.Toast;
 
 import java.io.File;
-import java.util.List;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
 
 public class ImportExportActivity extends AppCompatActivity
 {
-    private static final String TAG = "LoyaltyCardLocker";
+    private static final String TAG = "Catima";
 
     private static final int PERMISSIONS_EXTERNAL_STORAGE = 1;
-    private static final int CHOOSE_EXPORT_FILE = 2;
+    private static final int CHOOSE_EXPORT_LOCATION = 2;
+    private static final int IMPORT = 3;
 
     private ImportExportTask importExporter;
 
-    private final File sdcardDir = Environment.getExternalStorageDirectory();
-    private final File exportFile = new File(sdcardDir, "LoyaltyCardKeychain.csv");
+    private String importAlertTitle;
+    private String importAlertMessage;
+    private DataFormat importDataFormat;
 
     @Override
     protected void onCreate(Bundle savedInstanceState)
     {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.import_export_activity);
-        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+        Toolbar toolbar = findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
         ActionBar actionBar = getSupportActionBar();
         if(actionBar != null)
@@ -65,107 +69,128 @@ public class ImportExportActivity extends AppCompatActivity
                     PERMISSIONS_EXTERNAL_STORAGE);
         }
 
+        // 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");
 
-        Button exportButton = (Button)findViewById(R.id.exportButton);
+        Button exportButton = findViewById(R.id.exportButton);
         exportButton.setOnClickListener(new View.OnClickListener()
         {
             @Override
             public void onClick(View v)
             {
-                startExport();
+                chooseFileWithIntent(intentCreateDocumentAction, CHOOSE_EXPORT_LOCATION);
             }
         });
 
+        // Check that there is a file manager available
+        final Intent intentGetContentAction = new Intent(Intent.ACTION_GET_CONTENT);
+        intentGetContentAction.addCategory(Intent.CATEGORY_OPENABLE);
+        intentGetContentAction.setType("*/*");
 
-        // Check that there is an activity that can bring up a file chooser
-        final Intent intentPickAction = new Intent(Intent.ACTION_PICK);
-        intentPickAction.setData(Uri.parse("file://"));
-
-        Button importFilesystem = (Button) findViewById(R.id.importOptionFilesystemButton);
+        Button importFilesystem = findViewById(R.id.importOptionFilesystemButton);
         importFilesystem.setOnClickListener(new View.OnClickListener()
         {
             @Override
             public void onClick(View v)
             {
-                chooseFileWithIntent(intentPickAction);
+                chooseImportType(intentGetContentAction);
             }
         });
 
-        if(isCallable(getApplicationContext(), intentPickAction) == 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);
-        }
+        // Check that there is an app that data can be imported from
+        final Intent intentPickAction = new Intent(Intent.ACTION_PICK);
 
-
-        // Check that there is an application that can find content
-        final Intent intentGetContentAction = new Intent(Intent.ACTION_GET_CONTENT);
-        intentGetContentAction.addCategory(Intent.CATEGORY_OPENABLE);
-        intentGetContentAction.setType("*/*");
-
-        Button importApplication = (Button) findViewById(R.id.importOptionApplicationButton);
+        Button importApplication = findViewById(R.id.importOptionApplicationButton);
         importApplication.setOnClickListener(new View.OnClickListener()
         {
             @Override
             public void onClick(View v)
             {
-                chooseFileWithIntent(intentGetContentAction);
-            }
-        });
-
-        if(isCallable(getApplicationContext(), intentGetContentAction) == 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);
-        }
-
-
-        // This option, to import from the fixed location, should always be present
-
-        Button importButton = (Button)findViewById(R.id.importOptionFixedButton);
-        importButton.setOnClickListener(new View.OnClickListener()
-        {
-            @Override
-            public void onClick(View v)
-            {
-                startImport(exportFile);
+                chooseImportType(intentPickAction);
             }
         });
     }
 
-    private void startImport(File target)
+    private void chooseImportType(Intent baseIntent) {
+        AlertDialog.Builder builder = new AlertDialog.Builder(this);
+        builder.setTitle(R.string.chooseImportType)
+                .setItems(R.array.import_types_array, (dialog, which) -> {
+                    switch (which) {
+                        // Catima
+                        case 0:
+                            importAlertTitle = getString(R.string.importCatima);
+                            importAlertMessage = getString(R.string.importCatimaMessage);
+                            importDataFormat = DataFormat.Catima;
+                            break;
+                        // Fidme
+                        case 1:
+                            importAlertTitle = getString(R.string.importFidme);
+                            importAlertMessage = getString(R.string.importFidmeMessage);
+                            importDataFormat = DataFormat.Fidme;
+                            break;
+                        // Loyalty Card Keychain
+                        case 2:
+                            importAlertTitle = getString(R.string.importLoyaltyCardKeychain);
+                            importAlertMessage = getString(R.string.importLoyaltyCardKeychainMessage);
+                            importDataFormat = DataFormat.Catima;
+                            break;
+                        // Voucher Vault
+                        case 3:
+                            importAlertTitle = getString(R.string.importVoucherVault);
+                            importAlertMessage = getString(R.string.importVoucherVaultMessage);
+                            importDataFormat = DataFormat.VoucherVault;
+                            break;
+                        default:
+                            throw new IllegalArgumentException("Unknown DataFormat");
+                    }
+
+                    new AlertDialog.Builder(this)
+                            .setTitle(importAlertTitle)
+                            .setMessage(importAlertMessage)
+                            .setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
+                                        @Override
+                                        public void onClick(DialogInterface dialog, int which) {
+                                            chooseFileWithIntent(baseIntent, IMPORT);
+                                        }
+                                    })
+                            .setNegativeButton(R.string.cancel, null)
+                            .show();
+                });
+        builder.show();
+    }
+
+    private void startImport(final InputStream target, final Uri targetUri, final DataFormat dataFormat)
     {
         ImportExportTask.TaskCompleteListener listener = new ImportExportTask.TaskCompleteListener()
         {
             @Override
-            public void onTaskComplete(boolean success, File file)
+            public void onTaskComplete(boolean success)
             {
-                onImportComplete(success, file);
+                onImportComplete(success, targetUri);
             }
         };
 
         importExporter = new ImportExportTask(ImportExportActivity.this,
-                true, DataFormat.CSV, target, listener);
+                dataFormat, target, listener);
         importExporter.execute();
     }
 
-    private void startExport()
+    private void startExport(final OutputStream target, final Uri targetUri)
     {
         ImportExportTask.TaskCompleteListener listener = new ImportExportTask.TaskCompleteListener()
         {
             @Override
-            public void onTaskComplete(boolean success, File file)
+            public void onTaskComplete(boolean success)
             {
-                onExportComplete(success, file);
+                onExportComplete(success, targetUri);
             }
         };
 
         importExporter = new ImportExportTask(ImportExportActivity.this,
-                false, DataFormat.CSV, exportFile, listener);
+                DataFormat.Catima, target, listener);
         importExporter.execute();
     }
 
@@ -220,7 +245,7 @@ public class ImportExportActivity extends AppCompatActivity
         return super.onOptionsItemSelected(item);
     }
 
-    private void onImportComplete(boolean success, File path)
+    private void onImportComplete(boolean success, Uri path)
     {
         AlertDialog.Builder builder = new AlertDialog.Builder(this);
 
@@ -233,10 +258,9 @@ public class ImportExportActivity extends AppCompatActivity
             builder.setTitle(R.string.importFailedTitle);
         }
 
-        int messageId = success ? R.string.importedFrom : R.string.importFailed;
+        int messageId = success ? R.string.importSuccessful : R.string.importFailed;
+        final String message = getResources().getString(messageId);
 
-        final String template = getResources().getString(messageId);
-        final String message = String.format(template, path.getAbsolutePath());
         builder.setMessage(message);
         builder.setNeutralButton(R.string.ok, new DialogInterface.OnClickListener()
         {
@@ -250,7 +274,7 @@ public class ImportExportActivity extends AppCompatActivity
         builder.create().show();
     }
 
-    private void onExportComplete(boolean success, final File path)
+    private void onExportComplete(boolean success, final Uri path)
     {
         AlertDialog.Builder builder = new AlertDialog.Builder(this);
 
@@ -263,10 +287,9 @@ public class ImportExportActivity extends AppCompatActivity
             builder.setTitle(R.string.exportFailedTitle);
         }
 
-        int messageId = success ? R.string.exportedTo : R.string.exportFailed;
+        int messageId = success ? R.string.exportSuccessful : R.string.exportFailed;
+        final String message = getResources().getString(messageId);
 
-        final String template = getResources().getString(messageId);
-        final String message = String.format(template, path.getAbsolutePath());
         builder.setMessage(message);
         builder.setNeutralButton(R.string.ok, new DialogInterface.OnClickListener()
         {
@@ -286,10 +309,12 @@ public class ImportExportActivity extends AppCompatActivity
                 @Override
                 public void onClick(DialogInterface dialog, int which)
                 {
-                    Uri outputUri = Uri.fromFile(path);
                     Intent sendIntent = new Intent(Intent.ACTION_SEND);
-                    sendIntent.putExtra(Intent.EXTRA_STREAM, outputUri);
-                    sendIntent.setType("text/plain");
+                    sendIntent.putExtra(Intent.EXTRA_STREAM, path);
+                    sendIntent.setType("text/csv");
+
+                    // set flag to give temporary permission to external app to use the FileProvider
+                    sendIntent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
 
                     ImportExportActivity.this.startActivity(Intent.createChooser(sendIntent,
                             sendLabel));
@@ -302,39 +327,15 @@ public class ImportExportActivity extends AppCompatActivity
         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)
+    private void chooseFileWithIntent(Intent intent, int requestCode)
     {
         try
         {
-            startActivityForResult(intent, CHOOSE_EXPORT_FILE);
+            startActivityForResult(intent, requestCode);
         }
         catch (ActivityNotFoundException e)
         {
+            Toast.makeText(getApplicationContext(), R.string.failedOpeningFileManager, Toast.LENGTH_LONG).show();
             Log.e(TAG, "No activity found to handle intent", e);
         }
     }
@@ -344,34 +345,64 @@ public class ImportExportActivity extends AppCompatActivity
     {
         super.onActivityResult(requestCode, resultCode, data);
 
-        if (resultCode == RESULT_OK && requestCode == CHOOSE_EXPORT_FILE)
+        if (resultCode != RESULT_OK)
         {
-            String path = null;
+            Log.w(TAG, "Failed onActivityResult(), result=" + resultCode);
+            return;
+        }
 
-            Uri uri = data.getData();
-            if(uri != null && uri.toString().startsWith("/"))
-            {
-                uri = Uri.parse("file://" + uri.toString());
-            }
+        Uri uri = data.getData();
+        if(uri == null)
+        {
+            Log.e(TAG, "Activity returned a NULL URI");
+            return;
+        }
 
-            if(uri != null)
+        try
+        {
+            if (requestCode == CHOOSE_EXPORT_LOCATION)
             {
-                path = uri.getPath();
-            }
+                OutputStream writer;
+                if (uri.getScheme() != null)
+                {
+                    writer = getContentResolver().openOutputStream(uri);
+                }
+                else
+                {
+                    writer = new FileOutputStream(new File(uri.toString()));
+                }
 
-            if(path != null)
-            {
-                Log.e(TAG, "Starting file import with: " + uri.toString());
-                startImport(new File(path));
+                Log.e(TAG, "Starting file export with: " + uri.toString());
+                startExport(writer, uri);
             }
             else
             {
-                Log.e(TAG, "Fail to make sense of URI returned from activity: " + (uri != null ? uri.toString() : "null"));
+                InputStream reader;
+                if(uri.getScheme() != null)
+                {
+                    reader = getContentResolver().openInputStream(uri);
+                }
+                else
+                {
+                    reader = new FileInputStream(new File(uri.toString()));
+                }
+
+                Log.e(TAG, "Starting file import with: " + uri.toString());
+
+                startImport(reader, uri, importDataFormat);
             }
         }
-        else
+        catch(FileNotFoundException e)
         {
-            Log.w(TAG, "Failed onActivityResult(), result=" + resultCode);
+            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

@@ -4,70 +4,77 @@ import android.app.Activity;
 import android.app.ProgressDialog;
 import android.content.DialogInterface;
 import android.os.AsyncTask;
-import android.os.Environment;
 import android.util.Log;
-import android.widget.Toast;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
 import java.io.IOException;
-import java.io.InputStreamReader;
+import java.io.InputStream;
+import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.nio.charset.Charset;
 
+import protect.card_locker.importexport.MultiFormatExporter;
+import protect.card_locker.importexport.MultiFormatImporter;
+
 class ImportExportTask extends AsyncTask<Void, Void, Boolean>
 {
-    private static final String TAG = "LoyaltyCardLocker";
+    private static final String TAG = "Catima";
 
     private Activity activity;
     private boolean doImport;
     private DataFormat format;
-    private File target;
+    private OutputStream outputStream;
+    private InputStream inputStream;
     private TaskCompleteListener listener;
 
     private ProgressDialog progress;
 
-    public ImportExportTask(Activity activity, boolean doImport, DataFormat format, File target,
+    /**
+     * Constructor which will setup a task for exporting to the given file
+     */
+    ImportExportTask(Activity activity, DataFormat format, OutputStream output,
             TaskCompleteListener listener)
     {
         super();
         this.activity = activity;
-        this.doImport = doImport;
+        this.doImport = false;
         this.format = format;
-        this.target = target;
+        this.outputStream = output;
         this.listener = listener;
     }
 
-    private boolean performImport(File importFile, DBHelper db)
+    /**
+     * Constructor which will setup a task for importing from the given InputStream.
+     */
+    ImportExportTask(Activity activity, DataFormat format, InputStream input,
+                            TaskCompleteListener listener)
+    {
+        super();
+        this.activity = activity;
+        this.doImport = true;
+        this.format = format;
+        this.inputStream = input;
+        this.listener = listener;
+    }
+
+    private boolean performImport(InputStream stream, DBHelper db)
     {
         boolean result = false;
 
-        try
-        {
-            FileInputStream fileReader = new FileInputStream(importFile);
-            InputStreamReader reader = new InputStreamReader(fileReader, 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 of '" + importFile.getAbsolutePath() + "' result: " + result);
+        result = MultiFormatImporter.importData(db, stream, format);
+
+        Log.i(TAG, "Import result: " + result);
 
         return result;
     }
 
-    private boolean performExport(File exportFile, DBHelper db)
+    private boolean performExport(OutputStream stream, DBHelper db)
     {
         boolean result = false;
 
         try
         {
-            FileOutputStream fileWriter = new FileOutputStream(exportFile);
-            OutputStreamWriter writer = new OutputStreamWriter(fileWriter, Charset.forName("UTF-8"));
+            OutputStreamWriter writer = new OutputStreamWriter(stream, Charset.forName("UTF-8"));
             result = MultiFormatExporter.exportData(db, writer, format);
             writer.close();
         }
@@ -76,7 +83,7 @@ class ImportExportTask extends AsyncTask<Void, Void, Boolean>
             Log.e(TAG, "Unable to export file", e);
         }
 
-        Log.i(TAG, "Export of '" + exportFile.getAbsolutePath() + "' result: " + result);
+        Log.i(TAG, "Export result: " + result);
 
         return result;
     }
@@ -105,11 +112,11 @@ class ImportExportTask extends AsyncTask<Void, Void, Boolean>
 
         if(doImport)
         {
-            result = performImport(target, db);
+            result = performImport(inputStream, db);
         }
         else
         {
-            result = performExport(target, db);
+            result = performExport(outputStream, db);
         }
 
         return result;
@@ -117,7 +124,7 @@ class ImportExportTask extends AsyncTask<Void, Void, Boolean>
 
     protected void onPostExecute(Boolean result)
     {
-        listener.onTaskComplete(result, target);
+        listener.onTaskComplete(result);
 
         progress.dismiss();
         Log.i(TAG, (doImport ? "Import" : "Export") + " Complete");
@@ -130,7 +137,7 @@ class ImportExportTask extends AsyncTask<Void, Void, Boolean>
     }
     interface TaskCompleteListener
     {
-        void onTaskComplete(boolean success, File file);
+        void onTaskComplete(boolean success);
     }
 
 }

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

@@ -0,0 +1,161 @@
+package protect.card_locker;
+
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+
+import com.google.zxing.BarcodeFormat;
+
+import java.io.InvalidObjectException;
+import java.math.BigDecimal;
+import java.util.Currency;
+import java.util.Date;
+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 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";
+        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));
+    }
+
+    public LoyaltyCard parse(Uri uri) throws InvalidObjectException {
+        if(!isImportUri(uri)) {
+            throw new InvalidObjectException("Not an import URI");
+        }
+
+        try {
+            // These values are allowed to be null
+            BarcodeFormat barcodeType = null;
+            Date expiry = null;
+            BigDecimal balance = new BigDecimal("0");
+            Currency balanceType = null;
+            Integer headerColor = null;
+
+            String store = uri.getQueryParameter(STORE);
+            String note = uri.getQueryParameter(NOTE);
+            String cardId = uri.getQueryParameter(CARD_ID);
+            String barcodeId = uri.getQueryParameter(BARCODE_ID);
+            if (store == null || note == null || cardId == null) throw new InvalidObjectException("Not a valid import URI");
+
+            String unparsedBarcodeType = uri.getQueryParameter(BARCODE_TYPE);
+            if(unparsedBarcodeType != null && !unparsedBarcodeType.equals(""))
+            {
+                barcodeType = BarcodeFormat.valueOf(unparsedBarcodeType);
+            }
+
+            String unparsedBalance = uri.getQueryParameter(BALANCE);
+            if(unparsedBalance != null && !unparsedBalance.equals(""))
+            {
+                balance = new BigDecimal(unparsedBalance);
+            }
+            String unparsedBalanceType = uri.getQueryParameter(BALANCE_TYPE);
+            if (unparsedBalanceType != null && !unparsedBalanceType.equals(""))
+            {
+                balanceType = Currency.getInstance(unparsedBalanceType);
+            }
+            String unparsedExpiry = uri.getQueryParameter(EXPIRY);
+            if(unparsedExpiry != null && !unparsedExpiry.equals(""))
+            {
+                expiry = new Date(Long.parseLong(unparsedExpiry));
+            }
+
+            String unparsedHeaderColor = uri.getQueryParameter(HEADER_COLOR);
+            if(unparsedHeaderColor != null)
+            {
+                headerColor = Integer.parseInt(unparsedHeaderColor);
+            }
+
+            return new LoyaltyCard(-1, store, note, expiry, balance, balanceType, cardId, barcodeId, barcodeType, headerColor, 0);
+        } catch (NullPointerException | NumberFormatException ex) {
+            throw new InvalidObjectException("Not a valid import URI");
+        }
+    }
+
+    // Protected for usage in tests
+    protected Uri toUri(LoyaltyCard loyaltyCard) {
+        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(BALANCE, loyaltyCard.balance.toString());
+        if (loyaltyCard.balanceType != null) {
+            uriBuilder.appendQueryParameter(BALANCE_TYPE, loyaltyCard.balanceType.getCurrencyCode());
+        }
+        if (loyaltyCard.expiry != null) {
+            uriBuilder.appendQueryParameter(EXPIRY, String.valueOf(loyaltyCard.expiry.getTime()));
+        }
+        uriBuilder.appendQueryParameter(CARD_ID, loyaltyCard.cardId);
+        if(loyaltyCard.barcodeId != null) {
+            uriBuilder.appendQueryParameter(BARCODE_ID, loyaltyCard.barcodeId);
+        }
+
+        if(loyaltyCard.barcodeType != null) {
+            uriBuilder.appendQueryParameter(BARCODE_TYPE, loyaltyCard.barcodeType.toString());
+        }
+        if(loyaltyCard.headerColor != null) {
+            uriBuilder.appendQueryParameter(HEADER_COLOR, loyaltyCard.headerColor.toString());
+        }
+        //StarStatus will not be exported
+        return uriBuilder.build();
+    }
+
+    public void startShareIntent(List<LoyaltyCard> loyaltyCards) {
+        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, text.toString());
+        sendIntent.setType("text/plain");
+
+        Intent shareIntent = Intent.createChooser(sendIntent, null);
+        context.startActivity(shareIntent);
+    }
+}

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

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

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

@@ -2,21 +2,50 @@ package protect.card_locker;
 
 import android.database.Cursor;
 
+import com.google.zxing.BarcodeFormat;
+
+import java.math.BigDecimal;
+import java.util.Currency;
+import java.util.Date;
+
+import androidx.annotation.Nullable;
+
 public class LoyaltyCard
 {
     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;
 
-    public LoyaltyCard(final int id, final String store, final String note, final String cardId, final String barcodeType)
+    @Nullable
+    public final String barcodeId;
+
+    public final BarcodeFormat barcodeType;
+
+    @Nullable
+    public final Integer headerColor;
+
+    public 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,
+                       final String barcodeId, final BarcodeFormat barcodeType, final Integer headerColor,
+                       final int starStatus)
     {
         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.starStatus = starStatus;
     }
 
     public static LoyaltyCard toLoyaltyCard(Cursor cursor)
@@ -24,9 +53,41 @@ public class LoyaltyCard
         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));
 
-        return new LoyaltyCard(id, store, note, cardId, barcodeType);
+        int barcodeTypeColumn = cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.BARCODE_TYPE);
+        int balanceTypeColumn = cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.BALANCE_TYPE);
+        int headerColorColumn = cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.HEADER_COLOR);
+
+        BarcodeFormat barcodeType = null;
+        Currency balanceType = null;
+        Date expiry = null;
+        Integer headerColor = null;
+
+        if (cursor.isNull(barcodeTypeColumn) == false)
+        {
+            barcodeType = BarcodeFormat.valueOf(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);
+        }
+
+        return new LoyaltyCard(id, store, note, expiry, balance, balanceType, cardId, barcodeId, barcodeType, headerColor, starred);
     }
 }

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

@@ -0,0 +1,37 @@
+package protect.card_locker;
+
+import android.animation.AnimatorInflater;
+import android.animation.AnimatorSet;
+import android.content.Context;
+import android.view.View;
+
+public class LoyaltyCardAnimator {
+
+    private static AnimatorSet selectedViewIn, defaultViewOut, selectedViewOut, defaultViewIn;
+
+    public static void flipView(Context inputContext, final View inputSelectedView, final View inputDefaultView, boolean inputItemSelected) {
+
+        selectedViewIn = (AnimatorSet) AnimatorInflater.loadAnimator(inputContext, R.animator.flip_left_in);
+        defaultViewOut = (AnimatorSet) AnimatorInflater.loadAnimator(inputContext, R.animator.flip_right_out);
+        selectedViewOut = (AnimatorSet) AnimatorInflater.loadAnimator(inputContext, R.animator.flip_left_out);
+        defaultViewIn = (AnimatorSet) AnimatorInflater.loadAnimator(inputContext, R.animator.flip_right_in);
+
+        final AnimatorSet showFrontAnim = new AnimatorSet();
+        final AnimatorSet showBackAnim = new AnimatorSet();
+
+        selectedViewIn.setTarget(inputSelectedView);
+        defaultViewOut.setTarget(inputDefaultView);
+        showFrontAnim.playTogether(selectedViewIn, defaultViewOut);
+
+        selectedViewOut.setTarget(inputSelectedView);
+        defaultViewIn.setTarget(inputDefaultView);
+        showBackAnim.playTogether(defaultViewIn, selectedViewOut);
+
+        if (inputItemSelected) {
+            showFrontAnim.start();
+        } else {
+            showBackAnim.start();
+        }
+    }
+
+}

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

@@ -2,52 +2,296 @@ package protect.card_locker;
 
 import android.content.Context;
 import android.database.Cursor;
+import android.graphics.Color;
+import android.graphics.PorterDuff;
+import android.util.SparseBooleanArray;
+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.LinearLayout;
+import android.widget.RelativeLayout;
 import android.widget.TextView;
 
-public class LoyaltyCardCursorAdapter extends CursorAdapter
+import java.math.BigDecimal;
+import java.text.DateFormat;
+import java.util.ArrayList;
+
+import androidx.cardview.widget.CardView;
+import androidx.constraintlayout.widget.ConstraintLayout;
+import androidx.recyclerview.widget.RecyclerView;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import protect.card_locker.preferences.Settings;
+
+public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCursorAdapter.LoyaltyCardListItemViewHolder>
 {
-    public LoyaltyCardCursorAdapter(Context context, Cursor cursor)
+    private static int mCurrentSelectedIndex = -1;
+    private Cursor mCursor;
+    Settings mSettings;
+    boolean mDarkModeEnabled;
+    private Context mContext;
+    private CardAdapterListener mListener;
+    private SparseBooleanArray mSelectedItems;
+    private SparseBooleanArray mAnimationItemsIndex;
+    private boolean mReverseAllAnimations = false;
+
+    public LoyaltyCardCursorAdapter(Context inputContext, Cursor inputCursor, CardAdapterListener inputListener)
     {
-        super(context, cursor, 0);
+        super(inputCursor);
+        mSettings = new Settings(inputContext);
+        mCursor = inputCursor;
+        mContext = inputContext;
+        mListener = inputListener;
+        mSelectedItems = new SparseBooleanArray();
+        mAnimationItemsIndex = new SparseBooleanArray();
+
+        mDarkModeEnabled = MainActivity.isDarkModeEnabled(inputContext);
     }
 
-    // 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)
+    public LoyaltyCardListItemViewHolder onCreateViewHolder(ViewGroup inputParent, int inputViewType)
     {
-        return LayoutInflater.from(context).inflate(R.layout.loyalty_card_layout, parent, false);
+        View itemView = LayoutInflater.from(inputParent.getContext()).inflate(R.layout.loyalty_card_layout, inputParent, false);
+        return new LoyaltyCardListItemViewHolder(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)
+    public Cursor getCursor()
     {
-        // Find fields to populate in inflated template
-        TextView storeField = (TextView) view.findViewById(R.id.store);
-        TextView cardIdField = (TextView) view.findViewById(R.id.cardId);
+        return mCursor;
+    }
 
-        // Extract properties from cursor
-        LoyaltyCard loyaltyCard = LoyaltyCard.toLoyaltyCard(cursor);
-
-        // Populate fields with extracted properties
-        String storeAndNote = loyaltyCard.store;
-        if(loyaltyCard.note.isEmpty() == false)
-        {
-            String storeNameAndNoteFormat = view.getResources().getString(R.string.storeNameAndNoteFormat);
-            storeAndNote = String.format(storeNameAndNoteFormat, loyaltyCard.store, loyaltyCard.note);
+    public void onBindViewHolder(LoyaltyCardListItemViewHolder inputHolder, Cursor inputCursor) {
+        if (mDarkModeEnabled) {
+            inputHolder.mStarIcon.setColorFilter(Color.WHITE, PorterDuff.Mode.SRC_ATOP);
         }
 
-        storeField.setText(storeAndNote);
+        LoyaltyCard loyaltyCard = LoyaltyCard.toLoyaltyCard(inputCursor);
+
+        inputHolder.mStoreField.setText(loyaltyCard.store);
+        inputHolder.mStoreField.setTextSize(mSettings.getFontSizeMax(mSettings.getMediumFont()));
+        if (!loyaltyCard.note.isEmpty()) {
+            inputHolder.mNoteField.setVisibility(View.VISIBLE);
+            inputHolder.mNoteField.setText(loyaltyCard.note);
+            inputHolder.mNoteField.setTextSize(mSettings.getFontSizeMax(mSettings.getSmallFont()));
+        } else {
+            inputHolder.mNoteField.setVisibility(View.GONE);
+        }
+
+        if (!loyaltyCard.balance.equals(new BigDecimal("0"))) {
+            inputHolder.mBalanceField.setVisibility(View.VISIBLE);
+            inputHolder.mBalanceField.setText(mContext.getString(R.string.balanceSentence, Utils.formatBalance(mContext, loyaltyCard.balance, loyaltyCard.balanceType)));
+            inputHolder.mBalanceField.setTextSize(mSettings.getFontSizeMax(mSettings.getSmallFont()));
+        } else {
+            inputHolder.mBalanceField.setVisibility(View.GONE);
+        }
+
+        if (loyaltyCard.expiry != null)
+        {
+            inputHolder.mExpiryField.setVisibility(View.VISIBLE);
+            int expiryString = R.string.expiryStateSentence;
+            if(Utils.hasExpired(loyaltyCard.expiry)) {
+                expiryString = R.string.expiryStateSentenceExpired;
+                inputHolder.mExpiryField.setTextColor(mContext.getResources().getColor(R.color.alert));
+            }
+            inputHolder.mExpiryField.setText(mContext.getString(expiryString, DateFormat.getDateInstance(DateFormat.LONG).format(loyaltyCard.expiry)));
+            inputHolder.mExpiryField.setTextSize(mSettings.getFontSizeMax(mSettings.getSmallFont()));
+        } else {
+            inputHolder.mExpiryField.setVisibility(View.GONE);
+        }
+
+        inputHolder.mStarIcon.setVisibility((loyaltyCard.starStatus != 0) ? View.VISIBLE : View.GONE);
+        inputHolder.mCardIcon.setImageBitmap(Utils.generateIcon(mContext, loyaltyCard.store, loyaltyCard.headerColor).getLetterTile());
+
+        inputHolder.itemView.setActivated(mSelectedItems.get(inputCursor.getPosition(), false));
+        applyIconAnimation(inputHolder, inputCursor.getPosition());
+        applyClickEvents(inputHolder, inputCursor.getPosition());
 
-        String cardIdFormat = view.getResources().getString(R.string.cardIdFormat);
-        String cardIdLabel = view.getResources().getString(R.string.cardId);
-        String cardIdText = String.format(cardIdFormat, cardIdLabel, loyaltyCard.cardId);
-        cardIdField.setText(cardIdText);
     }
-}
+
+    private void applyClickEvents(LoyaltyCardListItemViewHolder inputHolder, final int inputPosition)
+    {
+        inputHolder.mThumbnailContainer.setOnClickListener(new View.OnClickListener()
+        {
+            @Override
+            public void onClick(View inputView)
+            {
+                mListener.onIconClicked(inputPosition);
+            }
+        });
+
+        inputHolder.mRow.setOnClickListener(new View.OnClickListener()
+        {
+            @Override
+            public void onClick(View inputView)
+            {
+                mListener.onRowClicked(inputPosition);
+            }
+        });
+
+        inputHolder.mInformationContainer.setOnClickListener(new View.OnClickListener()
+        {
+            @Override
+            public void onClick(View inputView)
+            {
+                mListener.onRowClicked(inputPosition);
+            }
+        });
+
+        inputHolder.mRow.setOnLongClickListener(new View.OnLongClickListener()
+        {
+            @Override
+            public boolean onLongClick(View inputView)
+            {
+                mListener.onRowLongClicked(inputPosition);
+                inputView.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS);
+                return true;
+            }
+        });
+
+        inputHolder.mInformationContainer.setOnLongClickListener(new View.OnLongClickListener()
+        {
+            @Override
+            public boolean onLongClick(View inputView)
+            {
+                mListener.onRowLongClicked(inputPosition);
+                inputView.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS);
+                return true;
+            }
+        });
+    }
+
+    private void applyIconAnimation(LoyaltyCardListItemViewHolder inputHolder, int inputPosition)
+    {
+        if (mSelectedItems.get(inputPosition, false))
+        {
+            inputHolder.mThumbnailFrontContainer.setVisibility(View.GONE);
+            resetIconYAxis(inputHolder.mThumbnailBackContainer);
+            inputHolder.mThumbnailBackContainer.setVisibility(View.VISIBLE);
+            inputHolder.mThumbnailBackContainer.setAlpha(1);
+            if (mCurrentSelectedIndex == inputPosition)
+            {
+                LoyaltyCardAnimator.flipView(mContext, inputHolder.mThumbnailBackContainer, inputHolder.mThumbnailFrontContainer, true);
+                resetCurrentIndex();
+            }
+        }
+        else
+        {
+            inputHolder.mThumbnailBackContainer.setVisibility(View.GONE);
+            resetIconYAxis(inputHolder.mThumbnailFrontContainer);
+            inputHolder.mThumbnailFrontContainer.setVisibility(View.VISIBLE);
+            inputHolder.mThumbnailFrontContainer.setAlpha(1);
+            if ((mReverseAllAnimations && mAnimationItemsIndex.get(inputPosition, false)) || mCurrentSelectedIndex == inputPosition)
+            {
+                LoyaltyCardAnimator.flipView(mContext, inputHolder.mThumbnailBackContainer, inputHolder.mThumbnailFrontContainer, false);
+                resetCurrentIndex();
+            }
+        }
+    }
+
+    private void resetIconYAxis(View inputView)
+    {
+        if (inputView.getRotationY() != 0)
+        {
+            inputView.setRotationY(0);
+        }
+    }
+
+    public void resetAnimationIndex()
+    {
+        mReverseAllAnimations = false;
+        mAnimationItemsIndex.clear();
+    }
+
+    @SuppressFBWarnings("ST_WRITE_TO_STATIC_FROM_INSTANCE_METHOD")
+    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);
+        }
+        notifyItemChanged(inputPosition);
+    }
+
+    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 onIconClicked(int inputPosition);
+        void onRowClicked(int inputPosition);
+        void onRowLongClicked(int inputPosition);
+    }
+
+    public class LoyaltyCardListItemViewHolder extends RecyclerView.ViewHolder implements View.OnLongClickListener
+    {
+
+        public TextView mStoreField, mNoteField, mBalanceField, mExpiryField;
+        public LinearLayout mInformationContainer;
+        public ImageView mCardIcon, mStarIcon;
+        public CardView mThumbnailContainer;
+        public ConstraintLayout mRow;
+        public RelativeLayout mThumbnailFrontContainer, mThumbnailBackContainer;
+
+        public LoyaltyCardListItemViewHolder(View inputView)
+        {
+            super(inputView);
+            mThumbnailContainer = inputView.findViewById(R.id.thumbnail_container);
+            mRow = inputView.findViewById(R.id.row);
+            mThumbnailFrontContainer = inputView.findViewById(R.id.thumbnail_front);
+            mThumbnailBackContainer = inputView.findViewById(R.id.thumbnail_back);
+            mInformationContainer = inputView.findViewById(R.id.information_container);
+            mStoreField = inputView.findViewById(R.id.store);
+            mNoteField = inputView.findViewById(R.id.note);
+            mBalanceField = inputView.findViewById(R.id.balance);
+            mExpiryField = inputView.findViewById(R.id.expiry);
+            mCardIcon = inputView.findViewById(R.id.thumbnail);
+            mStarIcon = inputView.findViewById(R.id.star);
+            inputView.setOnLongClickListener(this);
+        }
+
+        @Override
+        public boolean onLongClick(View inputView)
+        {
+            mListener.onRowLongClicked(getAdapterPosition());
+            inputView.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS);
+            return true;
+        }
+    }
+}

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

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

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

@@ -1,59 +1,225 @@
 package protect.card_locker;
 
+import android.app.SearchManager;
 import android.content.ClipData;
-import android.content.DialogInterface;
-import android.content.Intent;
 import android.content.ClipboardManager;
+import android.content.Context;
+import android.content.Intent;
 import android.content.SharedPreferences;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.ShortcutInfo;
-import android.content.pm.ShortcutManager;
+import android.content.res.Configuration;
 import android.database.Cursor;
-import android.os.Build;
+import android.net.Uri;
 import android.os.Bundle;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
 import android.util.Log;
-import android.view.ContextMenu;
+import android.view.GestureDetector;
 import android.view.Menu;
-import android.view.MenuInflater;
 import android.view.MenuItem;
+import android.view.MotionEvent;
 import android.view.View;
-import android.webkit.WebView;
-import android.widget.AdapterView;
-import android.widget.ListView;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.google.common.collect.ImmutableMap;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import com.google.android.material.tabs.TabLayout;
 
-import java.util.Calendar;
 import java.util.List;
-import java.util.Map;
 
-import protect.card_locker.intro.IntroActivity;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.view.ActionMode;
+import androidx.appcompat.widget.SearchView;
+import androidx.appcompat.widget.Toolbar;
+import androidx.recyclerview.widget.DefaultItemAnimator;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import protect.card_locker.preferences.SettingsActivity;
 
-public class MainActivity extends AppCompatActivity
+public class MainActivity extends AppCompatActivity implements LoyaltyCardCursorAdapter.CardAdapterListener, GestureDetector.OnGestureListener
 {
-    private static final String TAG = "LoyaltyCardLocker";
+    private static final String TAG = "Catima";
+
+    private final DBHelper mDB = new DBHelper(this);
+    private LoyaltyCardCursorAdapter mAdapter;
+    private ActionMode mCurrentActionMode;
+    private Menu mMenu;
+    private GestureDetector mGestureDetector;
+    protected String mFilter = "";
+    protected int selectedTab = 0;
+    private RecyclerView mCardList;
+
+    private ActionMode.Callback mCurrentActionModeCallback = new ActionMode.Callback()
+    {
+        @Override
+        public boolean onCreateActionMode(ActionMode inputMode, Menu inputMenu)
+        {
+            inputMode.getMenuInflater().inflate(R.menu.card_longclick_menu, inputMenu);
+            return true;
+        }
+
+        @Override
+        public boolean onPrepareActionMode(ActionMode inputMode, Menu inputMenu)
+        {
+            return false;
+        }
+
+        @Override
+        public boolean onActionItemClicked(ActionMode inputMode, MenuItem inputItem)
+        {
+            if (inputItem.getItemId() == R.id.action_copy_to_clipboard)
+            {
+                ClipboardManager clipboard = (ClipboardManager) getSystemService(CLIPBOARD_SERVICE);
+
+                String clipboardData;
+                int cardCount = mAdapter.getSelectedItemCount();
+
+                if (cardCount == 1) {
+                    clipboardData = mAdapter.getSelectedItems().get(0).cardId;
+                } else {
+                    StringBuilder cardIds = new StringBuilder();
+
+                    for (int i = 0; i < cardCount; i++) {
+                        LoyaltyCard loyaltyCard = mAdapter.getSelectedItems().get(i);
+
+                        cardIds.append(loyaltyCard.store + ": " + loyaltyCard.cardId);
+                        if (i < (cardCount - 1)) {
+                            cardIds.append("\n");
+                        }
+                    }
+
+                    clipboardData = cardIds.toString();
+                }
+
+                ClipData clip = ClipData.newPlainText(getString(R.string.card_ids_copied), clipboardData);
+                clipboard.setPrimaryClip(clip);
+                Toast.makeText(MainActivity.this, cardCount > 1 ? R.string.copy_to_clipboard_multiple_toast : R.string.copy_to_clipboard_toast, Toast.LENGTH_LONG).show();
+                inputMode.finish();
+                return true;
+            }
+            else if (inputItem.getItemId() == R.id.action_share)
+            {
+                final ImportURIHelper importURIHelper = new ImportURIHelper(MainActivity.this);
+                importURIHelper.startShareIntent(mAdapter.getSelectedItems());
+                inputMode.finish();
+                return true;
+            }
+            else if(inputItem.getItemId() == R.id.action_edit)
+            {
+                if (mAdapter.getSelectedItemCount() != 1) {
+                    throw new IllegalArgumentException("Cannot edit more than 1 card at a time");
+                }
+
+                Intent intent = new Intent(getApplicationContext(), LoyaltyCardEditActivity.class);
+                Bundle bundle = new Bundle();
+                bundle.putInt("id", mAdapter.getSelectedItems().get(0).id);
+                bundle.putBoolean("update", true);
+                intent.putExtras(bundle);
+                startActivity(intent);
+                inputMode.finish();
+                return true;
+            }
+
+            return false;
+        }
+
+        @Override
+        public void onDestroyActionMode(ActionMode inputMode)
+        {
+            mAdapter.clearSelections();
+            mCurrentActionMode = null;
+            mCardList.post(new Runnable()
+            {
+                @Override
+                public void run()
+                {
+                    mAdapter.resetAnimationIndex();
+                }
+            });
+        }
+    };
 
     @Override
-    protected void onCreate(Bundle savedInstanceState)
+    protected void onCreate(Bundle inputSavedInstanceState)
     {
-        super.onCreate(savedInstanceState);
+        super.onCreate(inputSavedInstanceState);
         setContentView(R.layout.main_activity);
-        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+        Toolbar toolbar = findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
 
-        updateLoyaltyCardList();
+        updateLoyaltyCardList(mFilter, null);
 
-        SharedPreferences prefs = getSharedPreferences("protect.card_locker", MODE_PRIVATE);
-        if (prefs.getBoolean("firstrun", true)) {
-            startIntro();
-            prefs.edit().putBoolean("firstrun", false).commit();
+        TabLayout groupsTabLayout = findViewById(R.id.groups);
+        groupsTabLayout.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
+            @Override
+            public void onTabSelected(TabLayout.Tab tab) {
+                selectedTab = tab.getPosition();
+                updateLoyaltyCardList(mFilter, tab.getTag());
+
+                // Store active tab in Shared Preference to restore next app launch
+                SharedPreferences activeTabPref = getApplicationContext().getSharedPreferences(
+                        getString(R.string.sharedpreference_active_tab),
+                        Context.MODE_PRIVATE);
+                SharedPreferences.Editor activeTabPrefEditor = activeTabPref.edit();
+                activeTabPrefEditor.putInt(getString(R.string.sharedpreference_active_tab), selectedTab);
+                activeTabPrefEditor.apply();
+            }
+
+            @Override
+            public void onTabUnselected(TabLayout.Tab tab) {
+
+            }
+
+            @Override
+            public void onTabReselected(TabLayout.Tab tab) {
+
+            }
+        });
+
+        mGestureDetector = new GestureDetector(this, this);
+
+        View.OnTouchListener gestureTouchListener = new View.OnTouchListener() {
+            @Override
+            public boolean onTouch(final View v, final MotionEvent event){
+                return mGestureDetector.onTouchEvent(event);
+            }
+        };
+
+        final View helpText = findViewById(R.id.helpText);
+        final View noMatchingCardsText = findViewById(R.id.noMatchingCardsText);
+        final View list = findViewById(R.id.list);
+
+        helpText.setOnTouchListener(gestureTouchListener);
+        noMatchingCardsText.setOnTouchListener(gestureTouchListener);
+        list.setOnTouchListener(gestureTouchListener);
+
+        /*
+         * This was added for Huawei, but Huawei is just too much of a fucking pain.
+         * Just leaving this commented out if needed for the future idk
+         * https://twitter.com/SylvieLorxu/status/1379437902741012483
+         *
+
+        // Show privacy policy on first run
+        SharedPreferences privacyPolicyShownPref = getApplicationContext().getSharedPreferences(
+                getString(R.string.sharedpreference_privacy_policy_shown),
+                Context.MODE_PRIVATE);
+
+
+        if (privacyPolicyShownPref.getInt(getString(R.string.sharedpreference_privacy_policy_shown), 0) == 0) {
+            SharedPreferences.Editor privacyPolicyShownPrefEditor = privacyPolicyShownPref.edit();
+            privacyPolicyShownPrefEditor.putInt(getString(R.string.sharedpreference_privacy_policy_shown), 1);
+            privacyPolicyShownPrefEditor.apply();
+
+            new AlertDialog.Builder(this)
+                    .setTitle(R.string.privacy_policy)
+                    .setMessage(R.string.privacy_policy_popup_text)
+                    .setPositiveButton(R.string.accept, null)
+                    .setNegativeButton(R.string.privacy_policy, new DialogInterface.OnClickListener() {
+                        public void onClick(DialogInterface dialog, int whichButton) {
+                            openPrivacyPolicy();
+                        }
+                    })
+                    .setIcon(android.R.drawable.ic_dialog_info)
+                    .show();
         }
+         */
     }
 
     @Override
@@ -61,217 +227,444 @@ public class MainActivity extends AppCompatActivity
     {
         super.onResume();
 
-        updateLoyaltyCardList();
-    }
-
-    private void updateLoyaltyCardList()
-    {
-        final ListView cardList = (ListView) findViewById(R.id.list);
-        final TextView helpText = (TextView) findViewById(R.id.helpText);
-        final DBHelper db = new DBHelper(this);
-
-        if(db.getLoyaltyCardCount() > 0)
+        if(mCurrentActionMode != null)
         {
-            cardList.setVisibility(View.VISIBLE);
-            helpText.setVisibility(View.GONE);
-        }
-        else
-        {
-            cardList.setVisibility(View.GONE);
-            helpText.setVisibility(View.VISIBLE);
+            mAdapter.clearSelections();
+            mCurrentActionMode.finish();
         }
 
-        Cursor cardCursor = db.getLoyaltyCardCursor();
+        if (mMenu != null)
+        {
+            SearchView searchView = (SearchView) mMenu.findItem(R.id.action_search).getActionView();
 
-        final LoyaltyCardCursorAdapter adapter = new LoyaltyCardCursorAdapter(this, cardCursor);
-        cardList.setAdapter(adapter);
+            if (!searchView.isIconified())
+            {
+                mFilter = searchView.getQuery().toString();
+            }
+        }
 
-        registerForContextMenu(cardList);
+        // Start of active tab logic
+        TabLayout groupsTabLayout = findViewById(R.id.groups);
+        updateTabGroups(groupsTabLayout);
 
-        cardList.setOnItemClickListener(new AdapterView.OnItemClickListener()
+        // Restore active tab from Shared Preference
+        SharedPreferences activeTabPref = getApplicationContext().getSharedPreferences(
+                getString(R.string.sharedpreference_active_tab),
+                Context.MODE_PRIVATE);
+        selectedTab = activeTabPref.getInt(getString(R.string.sharedpreference_active_tab), 0);
+
+        Object group = null;
+
+        if (groupsTabLayout.getTabCount() != 0) {
+            TabLayout.Tab tab = groupsTabLayout.getTabAt(selectedTab);
+            if (tab == null) {
+                tab = groupsTabLayout.getTabAt(0);
+            }
+
+            groupsTabLayout.selectTab(tab);
+            assert tab != null;
+            group = tab.getTag();
+        }
+        updateLoyaltyCardList(mFilter, group);
+        // End of active tab logic
+
+        FloatingActionButton addButton = findViewById(R.id.fabAdd);
+        addButton.setOnClickListener(new View.OnClickListener()
         {
             @Override
-            public void onItemClick(AdapterView<?> parent, View view, int position, long id)
-            {
-                Cursor selected = (Cursor) parent.getItemAtPosition(position);
-                LoyaltyCard loyaltyCard = LoyaltyCard.toLoyaltyCard(selected);
-
-                Intent i = new Intent(view.getContext(), LoyaltyCardViewActivity.class);
-                i.setAction("");
-                final Bundle b = new Bundle();
-                b.putInt("id", loyaltyCard.id);
-                b.putBoolean("view", true);
-                i.putExtras(b);
-
-                ShortcutHelper.updateShortcuts(MainActivity.this, loyaltyCard, i);
-
-                startActivity(i);
+            public void onClick(View v) {
+                Intent i = new Intent(getApplicationContext(), ScanActivity.class);
+                startActivityForResult(i, Utils.BARCODE_SCAN);
             }
         });
     }
 
     @Override
-    public void onCreateContextMenu(ContextMenu menu, View v, ContextMenu.ContextMenuInfo menuInfo)
-    {
-        super.onCreateContextMenu(menu, v, menuInfo);
-        if (v.getId()==R.id.list)
-        {
-            MenuInflater inflater = getMenuInflater();
-            inflater.inflate(R.menu.card_longclick_menu, menu);
+    protected void onActivityResult(int requestCode, int resultCode, Intent intent) {
+        super.onActivityResult(requestCode, resultCode, intent);
+
+        if (requestCode == Utils.MAIN_REQUEST) {
+            // We're coming back from another view so clear the search
+            // We only do this now to prevent a flash of all entries right after picking one
+            mFilter = "";
+            if (mMenu != null)
+            {
+                MenuItem searchItem = mMenu.findItem(R.id.action_search);
+                searchItem.collapseActionView();
+            }
+            recreate();
+
+            return;
+        }
+
+        BarcodeValues barcodeValues = Utils.parseSetBarcodeActivityResult(requestCode, resultCode, intent, this);
+
+        if(!barcodeValues.isEmpty()) {
+            Intent newIntent = new Intent(getApplicationContext(), LoyaltyCardEditActivity.class);
+            Bundle newBundle = new Bundle();
+            newBundle.putString("barcodeType", barcodeValues.format());
+            newBundle.putString("cardId", barcodeValues.content());
+            newIntent.putExtras(newBundle);
+            startActivity(newIntent);
         }
     }
 
     @Override
-    public boolean onContextItemSelected(MenuItem item)
+    public void onBackPressed()
     {
-        AdapterView.AdapterContextMenuInfo info = (AdapterView.AdapterContextMenuInfo) item.getMenuInfo();
-        ListView listView = (ListView) findViewById(R.id.list);
-
-        Cursor cardCursor = (Cursor)listView.getItemAtPosition(info.position);
-        LoyaltyCard card = LoyaltyCard.toLoyaltyCard(cardCursor);
-
-        if(card != null && item.getItemId() == R.id.action_clipboard)
+        if (mMenu == null)
         {
-            ClipboardManager clipboard = (ClipboardManager) getSystemService(CLIPBOARD_SERVICE);
-            ClipData clip = ClipData.newPlainText(card.store, card.cardId);
-            clipboard.setPrimaryClip(clip);
+            super.onBackPressed();
+            return;
+        }
 
-            Toast.makeText(this, R.string.copy_to_clipboard_toast, Toast.LENGTH_LONG).show();
+        SearchView searchView = (SearchView) mMenu.findItem(R.id.action_search).getActionView();
+
+        if (!searchView.isIconified())
+        {
+            searchView.setIconified(true);
+        } else {
+            TabLayout groupsTabLayout = findViewById(R.id.groups);
+
+            if (groupsTabLayout.getVisibility() == View.VISIBLE && selectedTab != 0) {
+                selectedTab = 0;
+                groupsTabLayout.selectTab(groupsTabLayout.getTabAt(0));
+            } else {
+                super.onBackPressed();
+            }
+        }
+    }
+
+    private void updateLoyaltyCardList(String filterText, Object tag)
+    {
+        Group group = null;
+        if (tag != null) {
+            group = (Group) tag;
+        }
+
+        mCardList = findViewById(R.id.list);
+        RecyclerView.LayoutManager mLayoutManager = new LinearLayoutManager(getApplicationContext());
+        mCardList.setLayoutManager(mLayoutManager);
+        mCardList.setItemAnimator(new DefaultItemAnimator());
+
+        final TextView helpText = findViewById(R.id.helpText);
+        final TextView noMatchingCardsText = findViewById(R.id.noMatchingCardsText);
+
+        Cursor cardCursor = mDB.getLoyaltyCardCursor(filterText, group);
+
+        mAdapter = new LoyaltyCardCursorAdapter(this, cardCursor, this);
+        mCardList.setAdapter(mAdapter);
+
+        registerForContextMenu(mCardList);
+
+        if(mDB.getLoyaltyCardCount() > 0)
+        {
+            // We want the cardList to be visible regardless of the filtered match count
+            // to ensure that the noMatchingCardsText doesn't end up being shown below
+            // the keyboard
+            mCardList.setVisibility(View.VISIBLE);
+            helpText.setVisibility(View.GONE);
+            if(mAdapter.getItemCount() > 0)
+            {
+                noMatchingCardsText.setVisibility(View.GONE);
+            }
+            else
+            {
+                noMatchingCardsText.setVisibility(View.VISIBLE);
+            }
+        }
+        else
+        {
+            mCardList.setVisibility(View.GONE);
+            helpText.setVisibility(View.VISIBLE);
+            noMatchingCardsText.setVisibility(View.GONE);
+        }
+
+        if (mCurrentActionMode != null) {
+            mCurrentActionMode.finish();
+        }
+    }
+
+    public void updateTabGroups(TabLayout groupsTabLayout)
+    {
+        final DBHelper db = new DBHelper(this);
+
+        List<Group> newGroups = db.getGroups();
+
+        if (newGroups.size() == 0) {
+            groupsTabLayout.removeAllTabs();
+            groupsTabLayout.setVisibility(View.GONE);
+            return;
+        }
+
+        groupsTabLayout.removeAllTabs();
+
+        TabLayout.Tab allTab = groupsTabLayout.newTab();
+        allTab.setText(R.string.all);
+        allTab.setTag(null);
+        groupsTabLayout.addTab(allTab, false);
+
+        for (Group group : newGroups) {
+            TabLayout.Tab tab = groupsTabLayout.newTab();
+            tab.setText(group._id);
+            tab.setTag(group);
+            groupsTabLayout.addTab(tab, false);
+        }
+
+        groupsTabLayout.setVisibility(View.VISIBLE);
+    }
+
+    private void openPrivacyPolicy() {
+        Intent browserIntent = new Intent(
+                Intent.ACTION_VIEW,
+                Uri.parse("https://thelastproject.github.io/Catima/privacy-policy")
+        );
+        startActivity(browserIntent);
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu inputMenu)
+    {
+        this.mMenu = inputMenu;
+
+        getMenuInflater().inflate(R.menu.main_menu, inputMenu);
+
+        SearchManager searchManager = (SearchManager) getSystemService(Context.SEARCH_SERVICE);
+        if (searchManager != null)
+        {
+            SearchView searchView = (SearchView) inputMenu.findItem(R.id.action_search).getActionView();
+            searchView.setSearchableInfo(searchManager.getSearchableInfo(getComponentName()));
+            searchView.setSubmitButtonEnabled(false);
+
+            searchView.setOnCloseListener(new SearchView.OnCloseListener()
+            {
+                @Override
+                public boolean onClose()
+                {
+                    invalidateOptionsMenu();
+                    return false;
+                }
+            });
+
+            searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener()
+            {
+                @Override
+                public boolean onQueryTextSubmit(String query)
+                {
+                    return false;
+                }
+
+                @Override
+                public boolean onQueryTextChange(String newText)
+                {
+                    mFilter = newText;
+
+                    TabLayout groupsTabLayout = findViewById(R.id.groups);
+                    TabLayout.Tab currentTab = groupsTabLayout.getTabAt(groupsTabLayout.getSelectedTabPosition());
+
+                    updateLoyaltyCardList(
+                        mFilter,
+                        currentTab != null ? currentTab.getTag() : null
+                    );
+
+                    return true;
+                }
+            });
+        }
+        return super.onCreateOptionsMenu(inputMenu);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem inputItem)
+    {
+        int id = inputItem.getItemId();
+
+        if (id == R.id.action_manage_groups)
+        {
+            Intent i = new Intent(getApplicationContext(), ManageGroupsActivity.class);
+            startActivityForResult(i, Utils.MAIN_REQUEST);
             return true;
         }
 
-        return super.onContextItemSelected(item);
-    }
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu)
-    {
-        getMenuInflater().inflate(R.menu.main_menu, menu);
-        return super.onCreateOptionsMenu(menu);
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item)
-    {
-        int id = item.getItemId();
-
-        if (id == R.id.action_add)
-        {
-            Intent i = new Intent(getApplicationContext(), LoyaltyCardViewActivity.class);
-            startActivity(i);
-            return true;
-        }
-
-        if(id == R.id.action_import_export)
+        if (id == R.id.action_import_export)
         {
             Intent i = new Intent(getApplicationContext(), ImportExportActivity.class);
-            startActivity(i);
+            startActivityForResult(i, Utils.MAIN_REQUEST);
             return true;
         }
 
-        if(id == R.id.action_intro)
+        if (id == R.id.action_settings)
         {
-            startIntro();
+            Intent i = new Intent(getApplicationContext(), SettingsActivity.class);
+            startActivityForResult(i, Utils.MAIN_REQUEST);
             return true;
         }
 
-        if(id == R.id.action_about)
+        if(id == R.id.action_privacy_policy)
         {
-            displayAboutDialog();
+            openPrivacyPolicy();
             return true;
         }
 
-        return super.onOptionsItemSelected(item);
+        if (id == R.id.action_about)
+        {
+            Intent i = new Intent(getApplicationContext(), AboutActivity.class);
+            startActivityForResult(i, Utils.MAIN_REQUEST);
+            return true;
+        }
+
+        return super.onOptionsItemSelected(inputItem);
     }
 
-    private void displayAboutDialog()
+    protected static boolean isDarkModeEnabled(Context inputContext)
     {
-        final Map<String, String> USED_LIBRARIES = ImmutableMap.of
-        (
-            "Commons CSV", "https://commons.apache.org/proper/commons-csv/",
-            "Guava", "https://github.com/google/guava",
-            "ZXing", "https://github.com/zxing/zxing",
-            "ZXing Android Embedded", "https://github.com/journeyapps/zxing-android-embedded",
-            "AppIntro", "https://github.com/apl-devs/AppIntro"
-        );
-
-        final Map<String, String> USED_ASSETS = ImmutableMap.of
-        (
-            "Save by Bernar Novalyi", "https://thenounproject.com/term/save/716011"
-        );
-
-        StringBuilder libs = new StringBuilder().append("<ul>");
-        for (Map.Entry<String, String> entry : USED_LIBRARIES.entrySet())
-        {
-            libs.append("<li><a href=\"").append(entry.getValue()).append("\">").append(entry.getKey()).append("</a></li>");
-        }
-        libs.append("</ul>");
-
-        StringBuilder resources = new StringBuilder().append("<ul>");
-        for (Map.Entry<String, String> entry : USED_ASSETS.entrySet())
-        {
-            resources.append("<li><a href=\"").append(entry.getValue()).append("\">").append(entry.getKey()).append("</a></li>");
-        }
-        resources.append("</ul>");
-
-        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);
-        }
-
-        WebView wv = new WebView(this);
-        String html =
-            "<meta http-equiv=\"content-type\" content=\"text/html; charset=utf-8\" />" +
-            "<img src=\"file:///android_res/mipmap/ic_launcher.png\" alt=\"" + appName + "\"/>" +
-            "<h1>" +
-            String.format(getString(R.string.about_title_fmt),
-                    "<a href=\"" + getString(R.string.app_webpage_url)) + "\">" +
-            appName +
-            "</a>" +
-            "</h1><p>" +
-            appName +
-            " " +
-            String.format(getString(R.string.debug_version_fmt), version) +
-            "</p><p>" +
-            String.format(getString(R.string.app_revision_fmt),
-                    "<a href=\"" + getString(R.string.app_revision_url) + "\">" +
-                            getString(R.string.app_revision_url) +
-                            "</a>") +
-            "</p><hr/><p>" +
-            String.format(getString(R.string.app_copyright_fmt), year) +
-            "</p><hr/><p>" +
-            getString(R.string.app_license) +
-            "</p><hr/><p>" +
-            String.format(getString(R.string.app_libraries), appName, libs.toString()) +
-            "</p><hr/><p>" +
-            String.format(getString(R.string.app_resources), appName, resources.toString());
-
-        wv.loadDataWithBaseURL("file:///android_res/drawable/", html, "text/html", "utf-8", null);
-        new AlertDialog.Builder(this)
-            .setView(wv)
-            .setCancelable(true)
-            .setPositiveButton(R.string.ok, new DialogInterface.OnClickListener()
-            {
-                public void onClick(DialogInterface dialog, int which)
-                {
-                    dialog.dismiss();
-                }
-            })
-            .show();
+        Configuration config = inputContext.getResources().getConfiguration();
+        int currentNightMode = config.uiMode & Configuration.UI_MODE_NIGHT_MASK;
+        return (currentNightMode == Configuration.UI_MODE_NIGHT_YES);
     }
 
-    private void startIntro()
+    @Override
+    public boolean onDown(MotionEvent e) {
+        return false;
+    }
+
+    @Override
+    public void onShowPress(MotionEvent e) {
+
+    }
+
+    @Override
+    public boolean onSingleTapUp(MotionEvent e) {
+        return false;
+    }
+
+    @Override
+    public boolean onScroll(MotionEvent e1, MotionEvent e2, float distanceX, float distanceY) {
+        return false;
+    }
+
+    @Override
+    public void onLongPress(MotionEvent e) {
+
+    }
+
+    @Override
+    public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX, float velocityY) {
+        Log.d(TAG, "On fling");
+
+        // Don't swipe if we have too much vertical movement
+        if (Math.abs(velocityY) > (0.75 * Math.abs(velocityX))) {
+            return false;
+        }
+
+        TabLayout groupsTabLayout = findViewById(R.id.groups);
+        if (groupsTabLayout.getTabCount() < 2) {
+            return false;
+        }
+
+        Integer currentTab = groupsTabLayout.getSelectedTabPosition();
+
+        // Swipe right
+        if (velocityX < -150) {
+            Integer nextTab = currentTab + 1;
+
+            if (nextTab == groupsTabLayout.getTabCount()) {
+                groupsTabLayout.selectTab(groupsTabLayout.getTabAt(0));
+            } else {
+                groupsTabLayout.selectTab(groupsTabLayout.getTabAt(nextTab));
+            }
+
+            return true;
+        }
+
+        // Swipe left
+        if (velocityX > 150) {
+            Integer nextTab = currentTab - 1;
+
+            if (nextTab < 0) {
+                groupsTabLayout.selectTab(groupsTabLayout.getTabAt(groupsTabLayout.getTabCount() - 1));
+            } else {
+                groupsTabLayout.selectTab(groupsTabLayout.getTabAt(nextTab));
+            }
+
+            return true;
+        }
+
+        return false;
+    }
+
+    @Override
+    public void onRowLongClicked(int inputPosition)
     {
-        Intent intent = new Intent(this, IntroActivity.class);
-        startActivity(intent);
+        enableActionMode(inputPosition);
+    }
+
+    private void enableActionMode(int inputPosition)
+    {
+        if (mCurrentActionMode == null)
+        {
+            mCurrentActionMode = startSupportActionMode(mCurrentActionModeCallback);
+        }
+        toggleSelection(inputPosition);
+    }
+
+    private void toggleSelection(int inputPosition)
+    {
+        mAdapter.toggleSelection(inputPosition);
+        int count = mAdapter.getSelectedItemCount();
+
+        if (count == 0) {
+            mCurrentActionMode.finish();
+        } else {
+            mCurrentActionMode.setTitle("Selected: " + count + " Cards");
+
+            MenuItem editItem = mCurrentActionMode.getMenu().findItem(R.id.action_edit);
+            if (count == 1) {
+                editItem.setVisible(true);
+                editItem.setEnabled(true);
+            } else {
+                editItem.setVisible(false);
+                editItem.setEnabled(false);
+            }
+
+            mCurrentActionMode.invalidate();
+        }
+    }
+
+    @Override
+    public void onIconClicked(int inputPosition)
+    {
+        if (mCurrentActionMode == null)
+        {
+            mCurrentActionMode = startSupportActionMode(mCurrentActionModeCallback);
+        }
+
+        toggleSelection(inputPosition);
+    }
+
+    @Override
+    public void onRowClicked(int inputPosition)
+    {
+
+        if (mAdapter.getSelectedItemCount() > 0)
+        {
+            enableActionMode(inputPosition);
+        }
+        else
+        {
+            Cursor selected = mAdapter.getCursor();
+            selected.moveToPosition(inputPosition);
+            LoyaltyCard loyaltyCard = LoyaltyCard.toLoyaltyCard(selected);
+
+            Intent i = new Intent(this, LoyaltyCardViewActivity.class);
+            i.setAction("");
+            final Bundle b = new Bundle();
+            b.putInt("id", loyaltyCard.id);
+            i.putExtras(b);
+
+            ShortcutHelper.updateShortcuts(MainActivity.this, loyaltyCard, i);
+
+            startActivityForResult(i, Utils.MAIN_REQUEST);
+        }
     }
 }

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

@@ -0,0 +1,255 @@
+package protect.card_locker;
+
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.SharedPreferences;
+import android.database.Cursor;
+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 com.google.android.material.floatingactionbutton.FloatingActionButton;
+
+import java.util.List;
+
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+
+public class ManageGroupsActivity extends AppCompatActivity
+{
+    private static final String TAG = "Catima";
+
+    private final DBHelper db = new DBHelper(this);
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState)
+    {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.manage_groups_activity);
+        Toolbar toolbar = findViewById(R.id.toolbar);
+        setSupportActionBar(toolbar);
+        ActionBar actionBar = getSupportActionBar();
+        if(actionBar != null)
+        {
+            actionBar.setDisplayHomeAsUpEnabled(true);
+        }
+
+        updateGroupList();
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+
+        updateGroupList();
+
+        FloatingActionButton addButton = findViewById(R.id.fabAdd);
+        addButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                createGroup();
+            }
+        });
+    }
+
+    @Override
+    public void onBackPressed() {
+        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);
+
+        if(db.getGroupCount() > 0)
+        {
+            groupList.setVisibility(View.VISIBLE);
+            helpText.setVisibility(View.GONE);
+        }
+        else
+        {
+            groupList.setVisibility(View.GONE);
+            helpText.setVisibility(View.VISIBLE);
+        }
+
+        Cursor groupCursor = db.getGroupCursor();
+
+        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)
+    {
+        int id = item.getItemId();
+
+        if (id == android.R.id.home) {
+            finish();
+        }
+
+        return super.onOptionsItemSelected(item);
+    }
+
+    public void moveGroupUp(View view) {
+        moveGroup(view, true);
+    }
+
+    public void moveGroupDown(View view) {
+        moveGroup(view, false);
+    }
+
+    public void editGroup(View view) {
+        final String groupName = getGroupname(view);
+
+        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.setNegativeButton(getString(R.string.cancel), new DialogInterface.OnClickListener() {
+            @Override
+            public void onClick(DialogInterface dialog, int 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) {
+        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();
+                // Delete may change ordering, so invalidate
+                invalidateHomescreenActiveTab();
+            }
+        });
+        builder.setNegativeButton(getString(R.string.cancel), new DialogInterface.OnClickListener() {
+            @Override
+            public void onClick(DialogInterface dialog, int which) {
+                dialog.cancel();
+            }
+        });
+        AlertDialog dialog = builder.create();
+        dialog.show();
+    }
+
+    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);
+        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();
+        dialog.show();
+        dialog.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE);
+        input.requestFocus();
+    }
+
+    private String getGroupname(View view) {
+        LinearLayout parentRow = (LinearLayout) view.getParent().getParent();
+        TextView groupNameTextView = parentRow.findViewById(R.id.name);
+        return (String) groupNameTextView.getText();
+    }
+
+    private void moveGroup(View view, boolean up) {
+        final String groupName = getGroupname(view);
+
+        List<Group> groups = db.getGroups();
+
+        int currentIndex = -1;
+        Integer newIndex;
+
+        // Get current index in group list
+        for (int i = 0; i < groups.size(); i++) {
+            if (groups.get(i)._id.equals(groupName)) {
+                currentIndex = i;
+
+                break;
+            }
+        }
+
+        if (currentIndex == -1) {
+            throw new IndexOutOfBoundsException();
+        }
+
+        // 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
+        db.reorderGroups(groups);
+
+        // Update UI
+        updateGroupList();
+
+        // Ordering may have changed, so invalidate
+        invalidateHomescreenActiveTab();
+    }
+}

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

@@ -0,0 +1,163 @@
+package protect.card_locker;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.KeyEvent;
+import android.view.MenuItem;
+import android.view.View;
+
+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.appcompat.app.ActionBar;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+
+/**
+ * Custom Scannner Activity extending from Activity to display a custom layout form scanner view.
+ *
+ * Based on https://github.com/journeyapps/zxing-android-embedded/blob/0fdfbce9fb3285e985bad9971c5f7c0a7a334e7b/sample/src/main/java/example/zxing/CustomScannerActivity.java
+ * originally licensed under Apache 2.0
+ */
+public class ScanActivity extends AppCompatActivity {
+    private static final String TAG = "Catima";
+
+    private CaptureManager capture;
+    private DecoratedBarcodeView barcodeScannerView;
+
+    private String cardId;
+
+    private void extractIntentFields(Intent intent) {
+        final Bundle b = intent.getExtras();
+        cardId = b != null ? b.getString("cardId") : null;
+        Log.d(TAG, "Scan activity: id=" + cardId);
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.scan_activity);
+        Toolbar toolbar = findViewById(R.id.toolbar);
+        setSupportActionBar(toolbar);
+        ActionBar actionBar = getSupportActionBar();
+        if(actionBar != null)
+        {
+            actionBar.setDisplayHomeAsUpEnabled(true);
+        }
+
+        extractIntentFields(getIntent());
+
+        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 CaptureManager(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().toString());
+                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 onOptionsItemSelected(MenuItem item)
+    {
+        if (item.getItemId() == android.R.id.home)
+        {
+            setResult(Activity.RESULT_CANCELED);
+            finish();
+            return true;
+        }
+
+        return super.onOptionsItemSelected(item);
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent intent)
+    {
+        super.onActivityResult(requestCode, resultCode, intent);
+
+        BarcodeValues barcodeValues = Utils.parseSetBarcodeActivityResult(requestCode, resultCode, intent, this);
+
+        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());
+            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);
+        }
+        startActivityForResult(i, Utils.SELECT_BARCODE_REQUEST);
+    }
+
+    public void addFromImage(View view) {
+        Intent photoPickerIntent = new Intent(Intent.ACTION_PICK);
+        photoPickerIntent.setType("image/*");
+        startActivityForResult(photoPickerIntent, Utils.BARCODE_IMPORT_FROM_IMAGE_FILE);
+    }
+}

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

@@ -103,10 +103,16 @@ class ShortcutHelper
             {
                 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(prevShortcut.getIntent())
+                        .setIntent(shortcutIntent)
                         .setIcon(Icon.createWithResource(context, R.drawable.circle))
                         .setRank(index)
                         .build();

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

@@ -0,0 +1,211 @@
+package protect.card_locker;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.graphics.Bitmap;
+import android.graphics.Color;
+import android.provider.MediaStore;
+import android.util.Log;
+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.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 androidx.core.graphics.ColorUtils;
+
+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;
+
+    static final double LUMINANCE_MIDPOINT = 0.5;
+
+    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;
+        if (forShortcut) {
+            tileLetterFontSize = context.getResources().getDimensionPixelSize(R.dimen.tileLetterFontSizeForShortcut);
+        } else {
+            tileLetterFontSize = context.getResources().getDimensionPixelSize(R.dimen.tileLetterFontSize);
+        }
+
+        int pixelSize = context.getResources().getDimensionPixelSize(R.dimen.cardThumbnailSize);
+
+        if (backgroundColor == null) {
+            backgroundColor = LetterBitmap.getDefaultColor(context, store);
+        }
+
+        return new LetterBitmap(context, store, store,
+                tileLetterFontSize, pixelSize, pixelSize, backgroundColor, needsDarkForeground(backgroundColor) ? Color.BLACK : Color.WHITE);
+    }
+
+    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 {
+                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) {
+        // 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.getString(R.string.balancePoints, 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);
+    }
+}

app/src/main/java/protect/card_locker/appwidget/CardAppWidgetConfigure.java

@@ -1,130 +0,0 @@
-package protect.card_locker.appwidget;
-
-import android.appwidget.AppWidgetManager;
-import android.content.Context;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.database.Cursor;
-import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
-import android.util.Log;
-import android.view.View;
-import android.widget.AdapterView;
-import android.widget.ListView;
-
-import protect.card_locker.DBHelper;
-import protect.card_locker.LoyaltyCard;
-import protect.card_locker.LoyaltyCardCursorAdapter;
-import protect.card_locker.R;
-
-/**
- * The configuration screen for the CardAppWidgetProvider widget.
- */
-public class CardAppWidgetConfigure extends AppCompatActivity
-{
-    static final String TAG = "LoyaltyCardLocker";
-
-    private static final String PREFS_NAME
-            = "protect.card_locker.appwidget.CardAppWidgetProvider";
-    private static final String PREF_PREFIX_KEY = "prefix_";
-
-    int appWidgetId_ = AppWidgetManager.INVALID_APPWIDGET_ID;
-
-    @Override
-    public void onCreate(Bundle bundle)
-    {
-        super.onCreate(bundle);
-
-        // Set the result to CANCELED.  This will cause the widget host to cancel
-        // out of the widget placement if they press the back button.
-        setResult(RESULT_CANCELED);
-
-        setContentView(R.layout.main_activity);
-        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
-        toolbar.setVisibility(View.GONE);
-
-        setTitle(R.string.selectCardTitle);
-
-        // Find the widget id from the intent.
-        Intent intent = getIntent();
-        Bundle extras = intent.getExtras();
-        if (extras != null)
-        {
-            appWidgetId_ = extras.getInt(
-                    AppWidgetManager.EXTRA_APPWIDGET_ID, AppWidgetManager.INVALID_APPWIDGET_ID);
-        }
-
-        // If they gave us an intent without the widget id, just bail.
-        if (appWidgetId_ == AppWidgetManager.INVALID_APPWIDGET_ID)
-        {
-            finish();
-        }
-
-        final DBHelper db = new DBHelper(this);
-
-        // If there are no cards, bail
-        if(db.getLoyaltyCardCount() == 0)
-        {
-            finish();
-        }
-
-        final ListView cardList = (ListView) findViewById(R.id.list);
-        cardList.setVisibility(View.VISIBLE);
-
-        Cursor cardCursor = db.getLoyaltyCardCursor();
-
-        final LoyaltyCardCursorAdapter adapter = new LoyaltyCardCursorAdapter(this, cardCursor);
-        cardList.setAdapter(adapter);
-
-        cardList.setOnItemClickListener(new AdapterView.OnItemClickListener()
-        {
-            @Override
-            public void onItemClick(AdapterView<?> parent, View view, int position, long id)
-            {
-                Context context = CardAppWidgetConfigure.this;
-                Cursor selected = (Cursor) parent.getItemAtPosition(position);
-                LoyaltyCard loyaltyCard = LoyaltyCard.toLoyaltyCard(selected);
-
-                Log.d(TAG, "Saving card " + loyaltyCard.store + "," + loyaltyCard.id + " at " + appWidgetId_);
-
-                // Save the association of the card to the widget
-                saveIdPref(context, appWidgetId_, loyaltyCard.id);
-
-                // Push widget update to surface with newly set association
-                AppWidgetManager appWidgetManager = AppWidgetManager.getInstance(context);
-                CardAppWidgetProvider.updateAppWidget(context, appWidgetManager, appWidgetId_);
-
-                // Make sure we pass back the original appWidgetId
-                Intent resultValue = new Intent();
-                resultValue.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetId_);
-                setResult(RESULT_OK, resultValue);
-                finish();
-            }
-        });
-    }
-
-    // Write the prefix to the SharedPreferences object for this widget
-    static void saveIdPref(Context context, int appWidgetId, int id)
-    {
-        SharedPreferences.Editor prefs = context.getSharedPreferences(PREFS_NAME, 0).edit();
-        prefs.putInt(PREF_PREFIX_KEY + appWidgetId, id);
-        prefs.commit();
-    }
-
-    // Read the prefix from the SharedPreferences object for this widget.
-    // If there is no preference saved, get the default from a resource
-    static Integer loadIdPref(Context context, int appWidgetId)
-    {
-        SharedPreferences prefs = context.getSharedPreferences(PREFS_NAME, 0);
-        int id = prefs.getInt(PREF_PREFIX_KEY + appWidgetId, -1);
-        if(id >= 0)
-        {
-            return id;
-        }
-        else
-        {
-            return null;
-        }
-    }
-}

app/src/main/java/protect/card_locker/appwidget/CardAppWidgetProvider.java

@@ -1,79 +0,0 @@
-package protect.card_locker.appwidget;
-
-import android.app.PendingIntent;
-import android.appwidget.AppWidgetManager;
-import android.appwidget.AppWidgetProvider;
-import android.content.Context;
-import android.content.Intent;
-
-import android.os.Bundle;
-import android.util.Log;
-import android.widget.RemoteViews;
-
-import protect.card_locker.DBHelper;
-import protect.card_locker.LoyaltyCard;
-import protect.card_locker.LoyaltyCardViewActivity;
-import protect.card_locker.R;
-
-public class CardAppWidgetProvider extends AppWidgetProvider
-{
-    private static final String TAG = "LoyaltyCardLocker";
-
-    @Override
-    public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds)
-    {
-        Log.d(TAG, "CardAppWidgetProvider onUpdate");
-        // For each widget that needs an update, get the text that we should display:
-        //   - Create a RemoteViews object for it
-        //   - Set the text in the RemoteViews object
-        //   - Tell the AppWidgetManager to show that views object for the widget.
-        for (int appWidgetId : appWidgetIds)
-        {
-            updateAppWidget(context, appWidgetManager, appWidgetId);
-        }
-    }
-
-    static void updateAppWidget(Context context, AppWidgetManager appWidgetManager, int appWidgetId)
-    {
-        Log.d(TAG, "updateAppWidget appWidgetId=" + appWidgetId);
-
-        LoyaltyCard card = null;
-        DBHelper db = new DBHelper(context);
-
-        Integer id = CardAppWidgetConfigure.loadIdPref(context, appWidgetId);
-        if(id != null)
-        {
-            Log.d(TAG, "updateAppWidget Retrieved id " + id);
-            card = db.getLoyaltyCard(id);
-        }
-
-        if(card != null)
-        {
-            Log.d(TAG, "updateAppWidget Updating widget  " + appWidgetId + " to load " + card.store);
-
-            // Construct the RemoteViews object.  It takes the package name (in our case, it's our
-            // package, but it needs this because on the other side it's the widget host inflating
-            // the layout from our package).
-            RemoteViews views = new RemoteViews(context.getPackageName(), R.layout.appwidget_provider);
-            views.setTextViewText(R.id.title, card.store);
-
-            // Launch the view activity when clicked
-            Intent intent = new Intent(context, LoyaltyCardViewActivity.class);
-            Bundle extras = new Bundle();
-            extras.putInt("id", id);
-            extras.putBoolean("view", true);
-            intent.putExtras(extras);
-            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-            PendingIntent pendingIntent = PendingIntent.getActivity(context, 0, intent, 0);
-            views.setOnClickPendingIntent(R.id.widget, pendingIntent);
-
-            // Tell the widget manager
-            appWidgetManager.updateAppWidget(appWidgetId, views);
-        }
-        else
-        {
-            Log.d(TAG, "updateAppWidget, no card ID associated with widget " + appWidgetId
-                + ", ignoring update");
-        }
-    }
-}

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

@@ -0,0 +1,93 @@
+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/CsvDatabaseExporter.java

@@ -0,0 +1,116 @@
+package protect.card_locker.importexport;
+
+import android.database.Cursor;
+
+import org.apache.commons.csv.CSVFormat;
+import org.apache.commons.csv.CSVPrinter;
+
+import java.io.IOException;
+import java.io.OutputStreamWriter;
+
+import protect.card_locker.DBHelper;
+import protect.card_locker.Group;
+import protect.card_locker.LoyaltyCard;
+
+/**
+ * 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.EXPIRY,
+                DBHelper.LoyaltyCardDbIds.BALANCE,
+                DBHelper.LoyaltyCardDbIds.BALANCE_TYPE,
+                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.expiry != null ? card.expiry.getTime() : "",
+                    card.balance,
+                    card.balanceType,
+                    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/importexport/CsvDatabaseImporter.java

@@ -0,0 +1,306 @@
+package protect.card_locker.importexport;
+
+import android.database.sqlite.SQLiteDatabase;
+
+import com.google.zxing.BarcodeFormat;
+
+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.InputStream;
+import java.io.InputStreamReader;
+import java.io.StringReader;
+import java.math.BigDecimal;
+import java.nio.charset.StandardCharsets;
+import java.util.Currency;
+import java.util.Date;
+import java.util.List;
+
+import protect.card_locker.DBHelper;
+import protect.card_locker.FormatException;
+import protect.card_locker.Group;
+
+/**
+ * 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, 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(db, bufferedReader);
+                break;
+            case 2:
+                parseV2(db, bufferedReader);
+                break;
+            default:
+                throw new FormatException(String.format("No code to parse version %s", version));
+        }
+
+        bufferedReader.close();
+    }
+
+    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();
+                }
+            }
+        } catch (IllegalArgumentException | IllegalStateException e) {
+            throw new FormatException("Issue parsing CSV data", e);
+        } finally {
+            groupParser.close();
+        }
+    }
+
+    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();
+                }
+            }
+        } catch (IllegalArgumentException | IllegalStateException e) {
+            throw new FormatException("Issue parsing CSV data", e);
+        } finally {
+            cardParser.close();
+        }
+    }
+
+    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();
+                }
+            }
+        } catch (IllegalArgumentException | IllegalStateException e) {
+            throw new FormatException("Issue parsing CSV data", e);
+        } finally {
+            cardGroupParser.close();
+        }
+    }
+
+    /**
+     * 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 = 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;
+        }
+
+        BarcodeFormat barcodeType = null;
+        String unparsedBarcodeType = CSVHelpers.extractString(DBHelper.LoyaltyCardDbIds.BARCODE_TYPE, record, "");
+        if(!unparsedBarcodeType.isEmpty())
+        {
+            barcodeType = BarcodeFormat.valueOf(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;
+        helper.insertLoyaltyCard(database, id, store, note, expiry, balance, balanceType, cardId, barcodeId, 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 = CSVHelpers.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 = CSVHelpers.extractInt(DBHelper.LoyaltyCardDbIdsGroups.cardID, record, false);
+        String groupId = CSVHelpers.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/importexport/DatabaseExporter.java

@@ -1,8 +1,10 @@
-package protect.card_locker;
+package protect.card_locker.importexport;
 
 import java.io.IOException;
 import java.io.OutputStreamWriter;
 
+import protect.card_locker.DBHelper;
+
 /**
  * Interface for a class which can export the contents of the database
  * in a given format.

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

@@ -0,0 +1,25 @@
+package protect.card_locker.importexport;
+
+import org.json.JSONException;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.text.ParseException;
+
+import protect.card_locker.DBHelper;
+import protect.card_locker.FormatException;
+
+/**
+ * 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, InputStream input) throws IOException, FormatException, InterruptedException, JSONException, ParseException;
+}

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

@@ -0,0 +1,135 @@
+package protect.card_locker.importexport;
+
+import android.database.sqlite.SQLiteDatabase;
+
+import com.google.zxing.BarcodeFormat;
+
+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 java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
+
+import protect.card_locker.DBHelper;
+import protect.card_locker.FormatException;
+
+/**
+ * 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 FidmeImporter implements DatabaseImporter
+{
+    public void importData(DBHelper db, InputStream input) throws IOException, FormatException, JSONException, ParseException {
+        // We actually retrieve a .zip file
+        ZipInputStream zipInputStream = new ZipInputStream(input);
+
+        StringBuilder loyaltyCards = new StringBuilder();
+        byte[] buffer = new byte[1024];
+        int read = 0;
+
+        ZipEntry zipEntry;
+
+        while ((zipEntry = zipInputStream.getNextEntry()) != null) {
+            if (zipEntry.getName().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");
+        }
+
+        SQLiteDatabase database = db.getWritableDatabase();
+        database.beginTransaction();
+
+        final CSVParser fidmeParser = new CSVParser(new StringReader(loyaltyCards.toString()), CSVFormat.RFC4180.withDelimiter(';').withHeader());
+
+        try {
+            for (CSVRecord record : fidmeParser) {
+                importLoyaltyCard(database, db, record);
+
+                if (Thread.currentThread().isInterrupted()) {
+                    throw new InterruptedException();
+                }
+            }
+        } catch (IllegalArgumentException | IllegalStateException | InterruptedException e) {
+            throw new FormatException("Issue parsing CSV data", e);
+        } finally {
+            fidmeParser.close();
+        }
+
+        database.setTransactionSuccessful();
+        database.endTransaction();
+        database.close();
+
+        zipInputStream.close();
+    }
+
+    /**
+     * Import a single loyalty card into the database using the given
+     * session.
+     */
+    private void importLoyaltyCard(SQLiteDatabase database, DBHelper helper, CSVRecord record)
+            throws IOException, 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, "");
+        String addedAt = CSVHelpers.extractString("Added At", record, "");
+        String firstName = CSVHelpers.extractString("Firstname", record, "");
+        String lastName = CSVHelpers.extractString("Lastname", record, "");
+
+        String combinedName = String.format("%s %s", firstName, lastName);
+
+        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();
+
+        // 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
+        BarcodeFormat barcodeType = null;
+
+        // No favourite data in the export either
+        int starStatus = 0;
+
+        helper.insertLoyaltyCard(database, store, note, null, BigDecimal.valueOf(0), null, cardId, null, barcodeType, null, starStatus);
+    }
+}

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

@@ -1,13 +1,16 @@
-package protect.card_locker;
+package protect.card_locker.importexport;
 
 import android.util.Log;
 
 import java.io.IOException;
 import java.io.OutputStreamWriter;
 
+import protect.card_locker.DBHelper;
+import protect.card_locker.DataFormat;
+
 public class MultiFormatExporter
 {
-    private static final String TAG = "LoyaltyCardLocker";
+    private static final String TAG = "Catima";
 
     /**
      * Attempts to export data to the output stream in the
@@ -25,9 +28,12 @@ public class MultiFormatExporter
 
         switch(format)
         {
-            case CSV:
+            case Catima:
                 exporter = new CsvDatabaseExporter();
                 break;
+            default:
+                Log.e(TAG, "Failed to export data, unknown format " + format.name());
+                break;
         }
 
         if(exporter != null)

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

@@ -1,13 +1,20 @@
-package protect.card_locker;
+package protect.card_locker.importexport;
 
 import android.util.Log;
 
+import org.json.JSONException;
+
 import java.io.IOException;
-import java.io.InputStreamReader;
+import java.io.InputStream;
+import java.text.ParseException;
+
+import protect.card_locker.DBHelper;
+import protect.card_locker.DataFormat;
+import protect.card_locker.FormatException;
 
 public class MultiFormatImporter
 {
-    private static final String TAG = "LoyaltyCardLocker";
+    private static final String TAG = "Catima";
 
     /**
      * Attempts to import data from the input stream of the
@@ -20,43 +27,40 @@ public class MultiFormatImporter
      * false otherwise. If false, no data was written to
      * the database.
      */
-    public static boolean importData(DBHelper db, InputStreamReader input, DataFormat format)
+    public static boolean importData(DBHelper db, InputStream input, DataFormat format)
     {
         DatabaseImporter importer = null;
 
         switch(format)
         {
-            case CSV:
+            case Catima:
                 importer = new CsvDatabaseImporter();
                 break;
+            case Fidme:
+                importer = new FidmeImporter();
+                break;
+            case VoucherVault:
+                importer = new VoucherVaultImporter();
+                break;
         }
 
-        if(importer != null)
+        if (importer != null)
         {
             try
             {
                 importer.importData(db, input);
                 return true;
             }
-            catch(IOException e)
+            catch(IOException | FormatException | InterruptedException | JSONException | ParseException 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);
+                Log.e(TAG, "Failed to import data", e);
             }
 
-            return false;
         }
         else
         {
             Log.e(TAG, "Unsupported data format imported: " + format.name());
-            return false;
         }
+        return false;
     }
 }

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

@@ -0,0 +1,137 @@
+package protect.card_locker.importexport;
+
+import android.annotation.SuppressLint;
+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.DBHelper;
+import protect.card_locker.FormatException;
+
+/**
+ * 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 VoucherVaultImporter implements DatabaseImporter
+{
+    public void importData(DBHelper db, InputStream input) 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());
+
+        SQLiteDatabase database = db.getWritableDatabase();
+        database.beginTransaction();
+
+        // 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;
+            if (!jsonCard.isNull("balance")) {
+                balance = new BigDecimal(String.valueOf(jsonCard.getDouble("balance")));
+            } else {
+                balance = new BigDecimal("0");
+            }
+
+            Currency balanceType = Currency.getInstance("USD");
+
+            String cardId = jsonCard.getString("code");
+
+            BarcodeFormat barcodeType = null;
+
+            String codeTypeFromJSON = jsonCard.getString("codeType");
+            switch (codeTypeFromJSON) {
+                case "CODE128":
+                    barcodeType = BarcodeFormat.CODE_128;
+                    break;
+                case "CODE39":
+                    barcodeType = BarcodeFormat.CODE_39;
+                    break;
+                case "EAN13":
+                    barcodeType = BarcodeFormat.EAN_13;
+                    break;
+                case "PDF417":
+                    barcodeType = BarcodeFormat.PDF_417;
+                    break;
+                case "QR":
+                    barcodeType = 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 foun: " + colorFromJSON);
+            }
+
+            db.insertLoyaltyCard(store, "", expiry, balance, balanceType, cardId, null, barcodeType, headerColor, 0);
+        }
+
+        database.setTransactionSuccessful();
+        database.endTransaction();
+        database.close();
+
+        bufferedReader.close();
+    }
+}

app/src/main/java/protect/card_locker/intro/IntroActivity.java

@@ -1,36 +0,0 @@
-package protect.card_locker.intro;
-
-import android.os.Bundle;
-import android.support.annotation.LayoutRes;
-import android.support.v4.app.Fragment;
-
-import com.github.paolorotolo.appintro.AppIntro;
-
-import protect.card_locker.R;
-
-
-public class IntroActivity extends AppIntro
-{
-    @Override
-    public void init(Bundle savedInstanceState)
-    {
-        addSlide(new IntroSlide1());
-        addSlide(new IntroSlide2());
-        addSlide(new IntroSlide3());
-        addSlide(new IntroSlide4());
-        addSlide(new IntroSlide5());
-        addSlide(new IntroSlide6());
-    }
-
-    @Override
-    public void onSkipPressed(Fragment fragment) {
-        finish();
-    }
-
-    @Override
-    public void onDonePressed(Fragment fragment) {
-        finish();
-    }
-}
-
-

app/src/main/java/protect/card_locker/intro/IntroSlide1.java

@@ -1,19 +0,0 @@
-package protect.card_locker.intro;
-
-import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import protect.card_locker.R;
-
-public class IntroSlide1 extends Fragment
-{
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState)
-    {
-        View v = inflater.inflate(R.layout.intro1_layout, container, false);
-        return v;
-    }
-}

app/src/main/java/protect/card_locker/intro/IntroSlide2.java

@@ -1,20 +0,0 @@
-package protect.card_locker.intro;
-
-import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import protect.card_locker.R;
-
-public class IntroSlide2 extends Fragment
-{
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState)
-    {
-        View v = inflater.inflate(R.layout.intro2_layout, container, false);
-        return v;
-    }
-}

app/src/main/java/protect/card_locker/intro/IntroSlide3.java

@@ -1,19 +0,0 @@
-package protect.card_locker.intro;
-
-import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import protect.card_locker.R;
-
-public class IntroSlide3 extends Fragment
-{
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState)
-    {
-        View v = inflater.inflate(R.layout.intro3_layout, container, false);
-        return v;
-    }
-}

app/src/main/java/protect/card_locker/intro/IntroSlide4.java

@@ -1,19 +0,0 @@
-package protect.card_locker.intro;
-
-import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import protect.card_locker.R;
-
-public class IntroSlide4 extends Fragment
-{
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState)
-    {
-        View v = inflater.inflate(R.layout.intro4_layout, container, false);
-        return v;
-    }
-}

app/src/main/java/protect/card_locker/intro/IntroSlide5.java

@@ -1,19 +0,0 @@
-package protect.card_locker.intro;
-
-import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import protect.card_locker.R;
-
-public class IntroSlide5 extends Fragment
-{
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState)
-    {
-        View v = inflater.inflate(R.layout.intro5_layout, container, false);
-        return v;
-    }
-}

app/src/main/java/protect/card_locker/intro/IntroSlide6.java

@@ -1,19 +0,0 @@
-package protect.card_locker.intro;
-
-import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import protect.card_locker.R;
-
-public class IntroSlide6 extends Fragment
-{
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState)
-    {
-        View v = inflater.inflate(R.layout.intro6_layout, container, false);
-        return v;
-    }
-}

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

@@ -0,0 +1,113 @@
+package protect.card_locker.preferences;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+
+import androidx.annotation.IntegerRes;
+import androidx.annotation.StringRes;
+import androidx.appcompat.app.AppCompatDelegate;
+import androidx.preference.PreferenceManager;
+import protect.card_locker.R;
+
+public class Settings
+{
+    private Context context;
+    private SharedPreferences settings;
+
+    public Settings(Context context)
+    {
+        this.context = context;
+        this.settings = PreferenceManager.getDefaultSharedPreferences(context);
+    }
+
+    private String getResString(@StringRes int resId)
+    {
+        return context.getString(resId);
+    }
+
+    private int getResInt(@IntegerRes int resId)
+    {
+        return context.getResources().getInteger(resId);
+    }
+
+    private String getString(@StringRes int keyId, String defaultValue)
+    {
+        return settings.getString(getResString(keyId), defaultValue);
+    }
+
+    private int getInt(@StringRes int keyId, @IntegerRes int defaultId)
+    {
+        return settings.getInt(getResString(keyId), getResInt(defaultId));
+    }
+
+    private boolean getBoolean(@StringRes int keyId, boolean defaultValue)
+    {
+        return settings.getBoolean(getResString(keyId), defaultValue);
+    }
+
+    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)))
+        {
+            return AppCompatDelegate.MODE_NIGHT_NO;
+        }
+        else if(value.equals(getResString(R.string.settings_key_dark_theme)))
+        {
+            return AppCompatDelegate.MODE_NIGHT_YES;
+        }
+
+        return AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM;
+    }
+
+    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 getSmallFont()
+    {
+        return 14;
+    }
+
+    public int getMediumFont()
+    {
+        return 28;
+    }
+
+    public int getLargeFont()
+    {
+        return 40;
+    }
+
+    public int getFontSizeMin(int fontSize)
+    {
+        return (int) (Math.round(fontSize / 2.0) - 1);
+    }
+
+    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()
+    {
+        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);
+    }
+}

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

@@ -0,0 +1,113 @@
+package protect.card_locker.preferences;
+
+import android.os.Bundle;
+import android.view.MenuItem;
+
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatDelegate;
+import androidx.fragment.app.DialogFragment;
+import androidx.fragment.app.FragmentActivity;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceFragmentCompat;
+import nl.invissvenska.numberpickerpreference.NumberDialogPreference;
+import nl.invissvenska.numberpickerpreference.NumberPickerPreferenceDialogFragment;
+import protect.card_locker.R;
+
+public class SettingsActivity extends AppCompatActivity
+{
+    @Override
+    protected void onCreate(Bundle savedInstanceState)
+    {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.settings_activity);
+
+        ActionBar actionBar = getSupportActionBar();
+        if(actionBar != null)
+        {
+            actionBar.setDisplayHomeAsUpEnabled(true);
+        }
+
+        // Display the fragment as the main content.
+        getSupportFragmentManager().beginTransaction()
+                .replace(R.id.settings_container, new SettingsFragment())
+                .commit();
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item)
+    {
+        int id = item.getItemId();
+
+        if(id == android.R.id.home)
+        {
+            finish();
+            return true;
+        }
+
+        return super.onOptionsItemSelected(item);
+    }
+
+    public static class SettingsFragment extends PreferenceFragmentCompat
+    {
+        private static final String DIALOG_FRAGMENT_TAG = "SettingsFragment";
+        @Override
+        public void onCreatePreferences(Bundle savedInstanceState, String rootKey)
+        {
+            // Load the preferences from an XML resource
+            addPreferencesFromResource(R.xml.preferences);
+
+            Preference themePreference = findPreference(getResources().getString(R.string.settings_key_theme));
+            assert themePreference != null;
+            themePreference.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener()
+            {
+                @Override
+                public boolean onPreferenceChange(Preference preference, Object o)
+                {
+                    if(o.toString().equals(getResources().getString(R.string.settings_key_light_theme)))
+                    {
+                        AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
+                    }
+                    else if(o.toString().equals(getResources().getString(R.string.settings_key_dark_theme)))
+                    {
+                        AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
+                    }
+                    else
+                    {
+                        AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM);
+                    }
+
+                    FragmentActivity activity = getActivity();
+                    if (activity != null) {
+                        activity.recreate();
+                    }
+                    return true;
+                }
+            });
+        }
+
+        @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);
+            }
+        }
+    }
+}
+

app/src/main/res/animator/flip_left_in.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+   <objectAnimator
+        android:duration="0"
+        android:propertyName="alpha"
+        android:valueFrom="1.0"
+        android:valueTo="0.0" />
+
+    <objectAnimator
+        android:duration="@integer/full_rotation_duration"
+        android:interpolator="@android:interpolator/accelerate_decelerate"
+        android:propertyName="rotationY"
+        android:valueFrom="-180"
+        android:valueTo="0" />
+
+    <objectAnimator
+        android:duration="1"
+        android:propertyName="alpha"
+        android:startOffset="@integer/half_rotation_duration"
+        android:valueFrom="0.0"
+        android:valueTo="1.0" />
+</set>

app/src/main/res/animator/flip_left_out.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <objectAnimator
+        android:duration="@integer/full_rotation_duration"
+        android:interpolator="@android:interpolator/accelerate_decelerate"
+        android:propertyName="rotationY"
+        android:valueFrom="0"
+        android:valueTo="180" />
+
+   <objectAnimator
+        android:duration="1"
+        android:propertyName="alpha"
+        android:startOffset="@integer/half_rotation_duration"
+        android:valueFrom="1.0"
+        android:valueTo="0.0" />
+</set>

app/src/main/res/animator/flip_right_in.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+   <objectAnimator
+        android:duration="0"
+        android:propertyName="alpha"
+        android:valueFrom="1.0"
+        android:valueTo="0.0" />
+
+    <objectAnimator
+        android:duration="@integer/full_rotation_duration"
+        android:interpolator="@android:interpolator/accelerate_decelerate"
+        android:propertyName="rotationY"
+        android:valueFrom="180"
+        android:valueTo="0" />
+
+    <objectAnimator
+        android:duration="1"
+        android:propertyName="alpha"
+        android:startOffset="@integer/half_rotation_duration"
+        android:valueFrom="0.0"
+        android:valueTo="1.0" />
+</set>

app/src/main/res/animator/flip_right_out.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <objectAnimator
+        android:duration="@integer/full_rotation_duration"
+        android:interpolator="@android:interpolator/accelerate_decelerate"
+        android:propertyName="rotationY"
+        android:valueFrom="0"
+        android:valueTo="-180" />
+
+    <objectAnimator
+        android:duration="1"
+        android:propertyName="alpha"
+        android:startOffset="@integer/half_rotation_duration"
+        android:valueFrom="1.0"
+        android:valueTo="0.0" />
+</set>